diff options
| -rw-r--r-- | modules/contact/contact.module | 2 | ||||
| -rw-r--r-- | modules/syslog/syslog.module | 23 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
3 files changed, 12 insertions, 15 deletions
diff --git a/modules/contact/contact.module b/modules/contact/contact.module index cb3f7712a..e22bd1a55 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -544,7 +544,7 @@ function contact_mail_page_submit($form_id, $form_values) { // Log the operation: flood_register_event('contact'); - watchdog('mail', '%name-from sent an e-mail regarding %category.', array('%name-from' => $form_values['name'] ." <$from>", '%category' => $contact->category)); + watchdog('mail', '%name-from sent an e-mail regarding %category.', array('%name-from' => $form_values['name'] ." [$from]", '%category' => $contact->category)); // Update user: drupal_set_message(t('Your message has been sent.')); diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module index 1807b415d..8e55664e1 100644 --- a/modules/syslog/syslog.module +++ b/modules/syslog/syslog.module @@ -88,18 +88,15 @@ function syslog_theme() { function theme_syslog_format($entry) { global $base_url; - $message = t('@base_url|@timestamp|@type|@uid|@ip|@request_uri|@referer_uri|@link|@message', - array( - '@base_url' => $base_url, - '@timestamp' => $entry['timestamp'], - '@type' => $entry['type'], - '@ip' => $entry['ip'], - '@request_uri' => $entry['request_uri'], - '@referer_uri' => $entry['referer'], - '@uid' => $entry['user']->uid, - '@link' => strip_tags($entry['link']), - // Keep message English, but replace variable components, if present. - '@message' => strip_tags(is_null($entry['variables']) ? $entry['message'] : strtr($entry['message'], $entry['variables'])), - )); + $message = $base_url; + $message .= '|' . $entry['timestamp']; + $message .= '|' . $entry['type']; + $message .= '|' . $entry['ip']; + $message .= '|' . $entry['request_uri']; + $message .= '|' . $entry['referer']; + $message .= '|' . $entry['user']->uid; + $message .= '|' . strip_tags($entry['link']); + $message .= '|' . strip_tags(is_null($entry['variables']) ? $entry['message'] : strtr($entry['message'], $entry['variables'])); + return $message; } diff --git a/modules/user/user.module b/modules/user/user.module index 9816155fa..ac83715ee 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1367,7 +1367,7 @@ function user_register_submit($form_id, $form_values) { $merge_data['status'] = variable_get('user_register', 1) == 1; } $account = user_save('', array_merge($form_values, $merge_data)); - watchdog('user', 'New user: %name %email.', array('%name' => $name, '%email' => '<'. $mail .'>'), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit')); + watchdog('user', 'New user: %name (%email).', array('%name' => $name, '%email' => $mail), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit')); $variables = array('!username' => $name, '!site' => variable_get('site_name', 'Drupal'), '!password' => $pass, '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $mail, '!date' => format_date(time()), '!login_uri' => url('user', array('absolute' => TRUE)), '!edit_uri' => url('user/'. $account->uid .'/edit', array('absolute' => TRUE)), '!login_url' => user_pass_reset_url($account)); |