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

#54151, nicer formatting for contact.module, patch by Zen.

4.7.x
Gerhard Killesreiter 2006-03-21 07:31:50 +00:00
parent dae2bdbb3b
commit d12faf546d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/contact.module
View File

@ -95,8 +95,12 @@ function contact_menu($may_cache) {
}
else {
if (arg(0) == 'user' && is_numeric(arg(1))) {
$items[] = array('path' => "user/". arg(1) ."/contact", 'title' => t('contact'),
'callback' => 'contact_mail_user', 'type' => MENU_LOCAL_TASK, 'weight' => 2);
$items[] = array('path' => "user/". arg(1) ."/contact",
'title' => t('contact'),
'callback' => 'contact_mail_user',
'type' => MENU_LOCAL_TASK,
'weight' => 2,
);
}
}
@ -201,7 +205,7 @@ function contact_admin_edit_validate($form_id, $form_values) {
$recipients = explode(',', $form_values['recipients']);
foreach($recipients as $recipient) {
if (!valid_email_address(trim($recipient))) {
form_set_error('recipients',t('%recipient is an invalid e-mail address.', array('%recipient' => theme('placeholder', $recipient))));
form_set_error('recipients', t('%recipient is an invalid e-mail address.', array('%recipient' => theme('placeholder', $recipient))));
}
}
}

10
modules/contact/contact.module
View File

@ -95,8 +95,12 @@ function contact_menu($may_cache) {
}
else {
if (arg(0) == 'user' && is_numeric(arg(1))) {
$items[] = array('path' => "user/". arg(1) ."/contact", 'title' => t('contact'),
'callback' => 'contact_mail_user', 'type' => MENU_LOCAL_TASK, 'weight' => 2);
$items[] = array('path' => "user/". arg(1) ."/contact",
'title' => t('contact'),
'callback' => 'contact_mail_user',
'type' => MENU_LOCAL_TASK,
'weight' => 2,
);
}
}
@ -201,7 +205,7 @@ function contact_admin_edit_validate($form_id, $form_values) {
$recipients = explode(',', $form_values['recipients']);
foreach($recipients as $recipient) {
if (!valid_email_address(trim($recipient))) {
form_set_error('recipients',t('%recipient is an invalid e-mail address.', array('%recipient' => theme('placeholder', $recipient))));
form_set_error('recipients', t('%recipient is an invalid e-mail address.', array('%recipient' => theme('placeholder', $recipient))));
}
}
}