diff options
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 60ec40052..c3df981c4 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -318,7 +318,7 @@ function user_validate_mail($mail) { } } -function user_validate_picture(&$form_values, $form, &$form_state) { +function user_validate_picture(&$form, &$form_state, $form_values) { // If required, validate the uploaded picture. if (isset($form['picture']) && ($file = file_check_upload('picture_upload'))) { // Check that uploaded file is an image, with a maximum file size @@ -1066,7 +1066,7 @@ function user_login($msg = '') { return $form; } -function user_login_validate($form_values, $form, &$form_state) { +function user_login_validate($form, &$form_state, $form_values) { if ($form_values['name']) { if (user_is_blocked($form_values['name'])) { // blocked in user administration @@ -1087,7 +1087,7 @@ function user_login_validate($form_values, $form, &$form_state) { } } -function user_login_submit($form_values, $form, &$form_state) { +function user_login_submit($form, &$form_state, $form_values) { global $user; if ($user->uid) { watchdog('user', 'Session opened for %name.', array('%name' => $user->name)); @@ -1182,7 +1182,7 @@ function user_pass() { return $form; } -function user_pass_validate($form_values, $form, &$form_state) { +function user_pass_validate($form, &$form_state, $form_values) { $name = trim($form_values['name']); if (valid_email_address($name)) { $account = user_load(array('mail' => $name, 'status' => 1)); @@ -1198,7 +1198,7 @@ function user_pass_validate($form_values, $form, &$form_state) { } } -function user_pass_submit($form_values, $form, &$form_state) { +function user_pass_submit($form, &$form_state, $form_values) { $account = $form_values['account']; // Mail one time login URL and instructions. $mail_success = _user_mail_notify('password_reset', $account); @@ -1335,11 +1335,11 @@ function user_register() { return $form; } -function user_register_validate($form_values, $form, &$form_state) { +function user_register_validate($form, &$form_state, $form_values) { user_module_invoke('validate', $form_values, $form_values, 'account'); } -function user_register_submit($form_values, $form, &$form_state) { +function user_register_submit($form, &$form_state, $form_values) { global $base_url; $admin = user_access('administer users'); @@ -1618,7 +1618,7 @@ function user_delete($edit, $uid) { module_invoke_all('user', 'delete', $edit, $account); } -function user_edit_validate($form_values, $form, &$form_state) { +function user_edit_validate($form, &$form_state, $form_values) { user_module_invoke('validate', $form_values, $form_values['_account'], $form_values['_category']); // Validate input to ensure that non-privileged users can't alter protected data. if ((!user_access('administer users') && array_intersect(array_keys($form_values), array('uid', 'init', 'session'))) || (!user_access('administer access control') && isset($form_values['roles']))) { @@ -1628,7 +1628,7 @@ function user_edit_validate($form_values, $form, &$form_state) { } } -function user_edit_submit($form_values, $form, &$form_state) { +function user_edit_submit($form, &$form_state, $form_values) { $account = $form_values['_account']; $category = $form_values['_category']; unset($form_values['_account'], $form_values['op'], $form_values['submit'], $form_values['delete'], $form_values['form_token'], $form_values['form_id'], $form_values['_category']); @@ -1752,13 +1752,13 @@ function user_admin_access_check() { return $output; } -function user_admin_access_check_validate($form_values, $form, &$form_state) { +function user_admin_access_check_validate($form, &$form_state, $form_values) { if (empty($form_values['test'])) { form_set_error($form_values['type'], t('No value entered. Please enter a test string and try again.')); } } -function user_admin_access_check_submit($form_values, $form, &$form_state) { +function user_admin_access_check_submit($form, &$form_state, $form_values) { switch ($form_values['type']) { case 'user': if (drupal_is_denied('user', $form_values['test'])) { @@ -1829,7 +1829,7 @@ function user_admin_access_delete_confirm($aid = 0) { return $output; } -function user_admin_access_delete_confirm_submit($form_values, $form, &$form_state) { +function user_admin_access_delete_confirm_submit($form, &$form_state, $form_values) { db_query('DELETE FROM {access} WHERE aid = %d', $form_values['aid']); drupal_set_message(t('The access rule has been deleted.')); $form_state['redirect'] = 'admin/user/rules'; @@ -2022,7 +2022,7 @@ function theme_user_admin_perm($form) { return $output; } -function user_admin_perm_submit($form_values, $form, &$form_state) { +function user_admin_perm_submit($form, &$form_state, $form_values) { // Save permissions: $result = db_query('SELECT * FROM {role}'); while ($role = db_fetch_object($result)) { @@ -2093,7 +2093,7 @@ function user_admin_role() { return $form; } -function user_admin_role_validate($form_values, $form, &$form_state) { +function user_admin_role_validate($form, &$form_state, $form_values) { if ($form_values['name']) { if ($form_values['op'] == t('Save role')) { if (db_result(db_query("SELECT COUNT(*) FROM {role} WHERE name = '%s' AND rid != %d", $form_values['name'], $form_values['rid']))) { @@ -2111,7 +2111,7 @@ function user_admin_role_validate($form_values, $form, &$form_state) { } } -function user_admin_role_submit($form_values, $form, &$form_state) { +function user_admin_role_submit($form, &$form_state, $form_values) { if ($form_values['op'] == t('Save role')) { db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $form_values['name'], $form_values['rid']); drupal_set_message(t('The role has been renamed.')); @@ -2263,7 +2263,7 @@ function theme_user_admin_account($form) { /** * Submit the user administration update form. */ -function user_admin_account_submit($form_values, $form, &$form_state) { +function user_admin_account_submit($form, &$form_state, $form_values) { $operations = module_invoke_all('user_operations'); $operation = $operations[$form_values['operation']]; // Filter out unchecked accounts. @@ -2282,7 +2282,7 @@ function user_admin_account_submit($form_values, $form, &$form_state) { } } -function user_admin_account_validate($form_values, $form, &$form_state) { +function user_admin_account_validate($form, &$form_state, $form_values) { $form_values['accounts'] = array_filter($form_values['accounts']); if (count($form_values['accounts']) == 0) { form_set_error('', t('No users selected.')); @@ -2434,7 +2434,7 @@ function user_multiple_delete_confirm() { t('Delete all'), t('Cancel')); } -function user_multiple_delete_confirm_submit($form_values, $form, &$form_state) { +function user_multiple_delete_confirm_submit($form, &$form_state, $form_values) { if ($form_values['confirm']) { foreach ($form_values['accounts'] as $uid => $value) { user_delete($form_values, $uid); @@ -3012,7 +3012,7 @@ function theme_user_filters($form) { /** * Process result from user administration filter form. */ -function user_filter_form_submit($form_values, $form, &$form_state) { +function user_filter_form_submit($form, &$form_state, $form_values) { $op = $form_values['op']; $filters = user_filters(); switch ($op) { |