Conservancy/voting
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show contacts in the mail even if it's only a renewal; we want to have

Browse source 
2007-04-28  Vincent Untz  <vuntz@gnome.org>

	* foundation.gnome.org/membership/application.wml: show contacts in
	the mail even if it's only a renewal; we want to have summary AND
	details, not summary and optionally details

svn path=/trunk/; revision=403
This commit is contained in:
Vincent Untz 2007-04-28 16:12:45 +00:00 committed by Vincent Untz
parent df487ab153
commit a0c2b07364
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-04-28 Vincent Untz <vuntz@gnome.org>
* foundation.gnome.org/membership/application.wml: show contacts in
the mail even if it's only a renewal; we want to have summary AND
details, not summary and optionally details
2007-04-19 Glynn Foster <glynn.foster@sun.com> 2007-04-19 Glynn Foster <glynn.foster@sun.com>
* foundation.gnome.org/index.wml: Add news item for Canonical joining * foundation.gnome.org/index.wml: Add news item for Canonical joining

17
foundation.gnome.org/membership/application.wml
View file

@ -46,11 +46,13 @@
$errors[] = "Please enter an email address we can use to contact you."; $errors[] = "Please enter an email address we can use to contact you.";
} }
$obfuscated_email = preg_replace("/@/", " AT ", $email); $obfuscated_email = preg_replace("/@/", " AT ", $email);
$obfuscated_contacts = preg_replace("/@/", " AT ", $contacts);
if (!$previousmember) { if (!$previousmember) {
if (!$summary || $summary == "") { if (!$summary || $summary == "") {
$bad_elements[] = "summary"; $bad_elements[] = "summary";
$errors[] = "Please enter a list of areas of GNOME to which you have made a non-trivial contribution."; $errors[] = "Please enter a list of areas of GNOME to which you have made a non-trivial contribution.";
} else if (!$details || $details == "") { }
if (!$details || $details == "") {
$bad_elements[] = "details"; $bad_elements[] = "details";
$errors[] = "Please enter a more detailed description of your contributions."; $errors[] = "Please enter a more detailed description of your contributions.";
} }
@ -58,11 +60,10 @@
$bad_elements[] = "contacts"; $bad_elements[] = "contacts";
$errors[] = "Please enter a list of individuals with their e-mails who can confirm your contributions or indicate us how the membership committee can verify your contributions."; $errors[] = "Please enter a list of individuals with their e-mails who can confirm your contributions or indicate us how the membership committee can verify your contributions.";
} }
if ($contacts && $contacts != "" && (strpos ($contacts, '@') === FALSE)) { if ($contacts && $contacts != "" && (strpos ($contacts, '@') === FALSE)) {
$bad_elements[] = "contacts"; $bad_elements[] = "contacts";
$errors[] = "Please provide e-mails of the contacts you've provided."; $errors[] = "Please provide e-mails of the contacts you've provided.";
} }
$obfuscated_contacts = preg_replace("/@/", " AT ", $contacts);
} }
if ($spam != "not spam") { if ($spam != "not spam") {
$bad_elements[] = "spam"; $bad_elements[] = "spam";
@ -120,7 +121,7 @@
Thank you for your submission. It has been forwarded to the Thank you for your submission. It has been forwarded to the
membership committee, which will inform you when it has been membership committee, which will inform you when it has been
processed. The membership committee tries to process applications processed. The membership committee tries to process applications
within a month after their reception. within a month after their reception.
</p> </p>
<p> <p>
As a confirmation, you should receive your application by mail too. As a confirmation, you should receive your application by mail too.
@ -261,7 +262,7 @@
committee determine your eligibility. You should provide their committee determine your eligibility. You should provide their
name, e-mail address, and a brief description of their role as a name, e-mail address, and a brief description of their role as a
reference. To continue the earlier example: "<i>Dan Mueth reference. To continue the earlier example: "<i>Dan Mueth
(d-mueth&#64;uchicago&#46;edu) (GDP coordinator); Russell Steinthal (d-mueth&#64;uchicago&#46;edu) (GDP coordinator); Russell Steinthal
(rms39&#64;columbia&#46;edu) (gnome-pim maintainer)</i>".<br /> (rms39&#64;columbia&#46;edu) (gnome-pim maintainer)</i>".<br />
<b>Beware that applications without contacts take relatively <b>Beware that applications without contacts take relatively
longer to process.</b> longer to process.</b>