Added a new field for pointers;

Obfuscated contacts;
Updated contacts text;

svn path=/trunk/; revision=388
This commit is contained in:
Baris Cicek 2007-03-02 12:48:23 +00:00
parent 246d81853a
commit 643776189c

View file

@ -45,7 +45,6 @@
$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);
if (!$previousmember) { if (!$previousmember) {
if (!$summary || $summary == "") { if (!$summary || $summary == "") {
$bad_elements[] = "summary"; $bad_elements[] = "summary";
@ -54,14 +53,15 @@
$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.";
} }
if (!$contacts || $contacts == "") { if ((!$contacts || $contacts == "") && $pointers != "") {
$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_contact = pref_replace("/@", " AT ", $email);
if ($spam != "not spam") { if ($spam != "not spam") {
$bad_elements[] = "spam"; $bad_elements[] = "spam";
@ -90,7 +90,9 @@
$formmail .= "\n"; $formmail .= "\n";
$formmail .= "Detailed description:\n" . $details . "\n"; $formmail .= "Detailed description:\n" . $details . "\n";
$formmail .= "\n"; $formmail .= "\n";
$formmail .= "Contacts:\n" . $contacts . "\n"; $formmail .= "Contacts:\n" . $obfuscated_contacts . "\n";
$formmail .= "\n";
$formmail .= "Pointers:\n" . $pointers . "\n";
$formmail .= "\n"; $formmail .= "\n";
$formmail .= "Other comments:\n---------------\n"; $formmail .= "Other comments:\n---------------\n";
$formmail .= $comments . "\n"; $formmail .= $comments . "\n";
@ -254,18 +256,21 @@
<p> <p>
Please list individuals (frequently, but not necessarily, project Please list individuals (frequently, but not necessarily, project
maintainers) who can help the membership committee determine your maintainers and foundation members) who can help the membership
eligibility. You should provide their name, e-mail address, and a brief committee determine your eligibility. You should provide their
description of their role as a reference. If there is nobody you can name, e-mail address, and a brief description of their role as a
think to list, feel free to suggest another way for the committee to reference. If there is nobody you can think to list, feel free to
verify your contributions, such as a pointer to a project ChangeLog, suggest another way for the committee to verify your contributions
etc. To continue the earlier example: "Dan Mueth clearly, such as a pointer to a project ChangeLog, etc. into second
(d-mueth&#64;uchicago&#46;edu) (GDP coordinator); Russell Steinthal field. Beware that applications without contacts take relatively
(rms39&#64;columbia&#46;edu) (gnome-pim maintainer); packaging logs at longer to process. To continue the earlier example: "Dan Mueth
http://www.debian.org/packages/gnome/": (d-mueth&#64;uchicago&#46;edu) (GDP coordinator); Russell Steinthal
(rms39&#64;columbia&#46;edu) (gnome-pim maintainer); packaging logs
at http://www.debian.org/packages/gnome/":
</p> </p>
<textarea name="contacts" rows="5" cols="50"><?php if ($contacts) { echo $contacts; } ?></textarea> <textarea name="contacts" rows="5" cols="50"><?php if ($contacts) { echo $contacts; } ?></textarea>
<textarea name="pointers" rows="5" cols="50"><?php if ($pointers) { echo $pointers; } ?></textarea>OA
<h3>Other Comments</h3> <h3>Other Comments</h3>