diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-01-22 04:43:32 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-01-22 04:43:32 +0000 |
| commit | a8c0d79fae58b3e0f149c685e1fcf7c0ae6a84ba (patch) | |
| tree | 30b7787db7abbb7408cbcdbb0795c162b5ac9ad6 /modules | |
| parent | 9f54383f8de7b91d2d9d61a51556f4a553537f27 (diff) | |
| download | brdo-a8c0d79fae58b3e0f149c685e1fcf7c0ae6a84ba.tar.gz brdo-a8c0d79fae58b3e0f149c685e1fcf7c0ae6a84ba.tar.bz2 | |
#357591 by sun: Add watchdog calls for user cancel operations.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user/user.module | 4 | ||||
| -rw-r--r-- | modules/user/user.pages.inc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 6995d8a4a..d2e720758 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1786,6 +1786,7 @@ function _user_cancel($edit, $account, $method) { } db_update('users')->fields(array('status' => 0))->condition('uid', $account->uid)->execute(); drupal_set_message(t('%name has been disabled.', array('%name' => $account->name))); + watchdog('user', 'Blocked user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE); break; case 'user_cancel_reassign': @@ -1798,8 +1799,7 @@ function _user_cancel($edit, $account, $method) { db_delete('users_roles')->condition('uid', $account->uid)->execute(); db_delete('authmap')->condition('uid', $account->uid)->execute(); drupal_set_message(t('%name has been deleted.', array('%name' => $account->name))); - $variables = array('%name' => $account->name, '%email' => '<' . $account->mail . '>'); - watchdog('user', 'Deleted user: %name %email.', $variables, WATCHDOG_NOTICE); + watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE); break; } diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc index f58b24427..00e8a00d2 100644 --- a/modules/user/user.pages.inc +++ b/modules/user/user.pages.inc @@ -400,6 +400,7 @@ function user_cancel_confirm_form_submit($form, &$form_state) { $account = user_save($account, $edit); _user_mail_notify('cancel_confirm', $account); drupal_set_message(t('A confirmation request to cancel your account has been sent to your e-mail address.')); + watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE); if (!isset($_REQUEST['destination'])) { $form_state['redirect'] = "user/$account->uid"; |