Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Improvement: avoid people hitting 'Send message' without checking the category/subject.

4.7.x
Dries Buytaert 2005-05-16 11:17:41 +00:00
parent 85cbb1be6e
commit ecd7cfed48
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/contact.module
View File

@ -237,7 +237,10 @@ function contact_mail_page() {
if (!$edit['message']) { if (!$edit['message']) {
form_set_error('message', t('You must enter a message.')); form_set_error('message', t('You must enter a message.'));
} }
if (!$edit['subject']) {
form_set_error('subject', t('You must select a valid subject.'));
}
if (!form_get_errors()) { if (!form_get_errors()) {
// Prepare the sender: // Prepare the sender:
$from = $edit['mail']; $from = $edit['mail'];
@ -285,6 +288,7 @@ function contact_mail_page() {
} }
$result = db_query('SELECT subject FROM contact ORDER BY subject'); $result = db_query('SELECT subject FROM contact ORDER BY subject');
$subjects[] = '--';
while ($subject = db_fetch_object($result)) { while ($subject = db_fetch_object($result)) {
$subjects[$subject->subject] = $subject->subject; $subjects[$subject->subject] = $subject->subject;
} }
@ -293,7 +297,7 @@ function contact_mail_page() {
$output = variable_get('contact_form_information', t('You can leave us a message using the contact form below.')); $output = variable_get('contact_form_information', t('You can leave us a message using the contact form below.'));
$output .= form_textfield(t('Name'), 'name', $edit['name'], 50, 255, NULL, NULL, TRUE); $output .= form_textfield(t('Name'), 'name', $edit['name'], 50, 255, NULL, NULL, TRUE);
$output .= form_textfield(t('E-mail'), 'mail', $edit['mail'], 50, 255, NULL, NULL, TRUE); $output .= form_textfield(t('E-mail'), 'mail', $edit['mail'], 50, 255, NULL, NULL, TRUE);
$output .= form_select(t('Subject'), 'subject', $edit['subject'], $subjects); $output .= form_select(t('Subject'), 'subject', $edit['subject'], $subjects, NULL, NULL, NULL, TRUE);
$output .= form_textarea(t('Message'), 'message', $edit['message'], 70, 8, NULL, NULL, TRUE); $output .= form_textarea(t('Message'), 'message', $edit['message'], 70, 8, NULL, NULL, TRUE);
$output .= form_submit(t('Send e-mail')); $output .= form_submit(t('Send e-mail'));
$output = form($output); $output = form($output);

8
modules/contact/contact.module
View File

@ -237,7 +237,10 @@ function contact_mail_page() {
if (!$edit['message']) { if (!$edit['message']) {
form_set_error('message', t('You must enter a message.')); form_set_error('message', t('You must enter a message.'));
} }
if (!$edit['subject']) {
form_set_error('subject', t('You must select a valid subject.'));
}
if (!form_get_errors()) { if (!form_get_errors()) {
// Prepare the sender: // Prepare the sender:
$from = $edit['mail']; $from = $edit['mail'];
@ -285,6 +288,7 @@ function contact_mail_page() {
} }
$result = db_query('SELECT subject FROM contact ORDER BY subject'); $result = db_query('SELECT subject FROM contact ORDER BY subject');
$subjects[] = '--';
while ($subject = db_fetch_object($result)) { while ($subject = db_fetch_object($result)) {
$subjects[$subject->subject] = $subject->subject; $subjects[$subject->subject] = $subject->subject;
} }
@ -293,7 +297,7 @@ function contact_mail_page() {
$output = variable_get('contact_form_information', t('You can leave us a message using the contact form below.')); $output = variable_get('contact_form_information', t('You can leave us a message using the contact form below.'));
$output .= form_textfield(t('Name'), 'name', $edit['name'], 50, 255, NULL, NULL, TRUE); $output .= form_textfield(t('Name'), 'name', $edit['name'], 50, 255, NULL, NULL, TRUE);
$output .= form_textfield(t('E-mail'), 'mail', $edit['mail'], 50, 255, NULL, NULL, TRUE); $output .= form_textfield(t('E-mail'), 'mail', $edit['mail'], 50, 255, NULL, NULL, TRUE);
$output .= form_select(t('Subject'), 'subject', $edit['subject'], $subjects); $output .= form_select(t('Subject'), 'subject', $edit['subject'], $subjects, NULL, NULL, NULL, TRUE);
$output .= form_textarea(t('Message'), 'message', $edit['message'], 70, 8, NULL, NULL, TRUE); $output .= form_textarea(t('Message'), 'message', $edit['message'], 70, 8, NULL, NULL, TRUE);
$output .= form_submit(t('Send e-mail')); $output .= form_submit(t('Send e-mail'));
$output = form($output); $output = form($output);