diff options
Diffstat (limited to 'modules/profile/profile.module')
| -rw-r--r-- | modules/profile/profile.module | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/modules/profile/profile.module b/modules/profile/profile.module index bb32b15bc..0c49d69df 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -207,7 +207,7 @@ function profile_user($type, &$edit, &$user, $category = NULL) { /** * Menu callback: Generate a form to add/edit a user profile field. */ -function profile_field_form($arg = NULL) { +function profile_field_form(&$form_state, $arg = NULL) { if (arg(3) == 'edit') { if (is_numeric($arg)) { $fid = $arg; @@ -331,28 +331,28 @@ Unless you know what you are doing, it is highly recommended that you prefix the /** * Validate profile_field_form submissions. */ -function profile_field_form_validate($form, &$form_state, $form_values) { +function profile_field_form_validate($form, &$form_state) { // Validate the 'field name': - if (preg_match('/[^a-zA-Z0-9_-]/', $form_values['name'])) { + if (preg_match('/[^a-zA-Z0-9_-]/', $form_state['values']['name'])) { form_set_error('name', t('The specified form name contains one or more illegal characters. Spaces or any other special characters except dash (-) and underscore (_) are not allowed.')); } - if (in_array($form_values['name'], user_fields())) { + if (in_array($form_state['values']['name'], user_fields())) { form_set_error('name', t('The specified form name is reserved for use by Drupal.')); } // Validate the category: - if (!$form_values['category']) { + if (!$form_state['values']['category']) { form_set_error('category', t('You must enter a category.')); } - if ($form_values['category'] == 'account') { + if ($form_state['values']['category'] == 'account') { form_set_error('category', t('The specified category name is reserved for use by Drupal.')); } - $args1 = array($form_values['title'], $form_values['category']); - $args2 = array($form_values['name']); + $args1 = array($form_state['values']['title'], $form_state['values']['category']); + $args2 = array($form_state['values']['name']); $query_suffix = ''; - if (isset($form_values['fid'])) { - $args1[] = $args2[] = $form_values['fid']; + if (isset($form_state['values']['fid'])) { + $args1[] = $args2[] = $form_state['values']['fid']; $query_suffix = ' AND fid != %d'; } @@ -367,15 +367,15 @@ function profile_field_form_validate($form, &$form_state, $form_values) { /** * Process profile_field_form submissions. */ -function profile_field_form_submit($form, &$form_state, $form_values) { - if (!isset($form_values['fid'])) { - db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s')", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['type'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['autocomplete'], $form_values['options'], $form_values['page']); +function profile_field_form_submit($form, &$form_state) { + if (!isset($form_state['values']['fid'])) { + db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s')", $form_state['values']['title'], $form_state['values']['name'], $form_state['values']['explanation'], $form_state['values']['category'], $form_state['values']['type'], $form_state['values']['weight'], $form_state['values']['required'], $form_state['values']['register'], $form_state['values']['visibility'], $form_state['values']['autocomplete'], $form_state['values']['options'], $form_state['values']['page']); drupal_set_message(t('The field has been created.')); - watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_values['title'], '%category' => $form_values['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile')); + watchdog('profile', 'Profile field %field added under category %category.', array('%field' => $form_state['values']['title'], '%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile')); } else { - db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, register = %d, visibility = %d, autocomplete = %d, options = '%s', page = '%s' WHERE fid = %d", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['autocomplete'], $form_values['options'], $form_values['page'], $form_values['fid']); + db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, register = %d, visibility = %d, autocomplete = %d, options = '%s', page = '%s' WHERE fid = %d", $form_state['values']['title'], $form_state['values']['name'], $form_state['values']['explanation'], $form_state['values']['category'], $form_state['values']['weight'], $form_state['values']['required'], $form_state['values']['register'], $form_state['values']['visibility'], $form_state['values']['autocomplete'], $form_state['values']['options'], $form_state['values']['page'], $form_state['values']['fid']); drupal_set_message(t('The field has been updated.')); } @@ -407,14 +407,14 @@ function profile_field_delete($fid) { /** * Process a field delete form submission. */ -function profile_field_delete_submit($form, &$form_state, $form_values) { - db_query('DELETE FROM {profile_fields} WHERE fid = %d', $form_values['fid']); - db_query('DELETE FROM {profile_values} WHERE fid = %d', $form_values['fid']); +function profile_field_delete_submit($form, &$form_state) { + db_query('DELETE FROM {profile_fields} WHERE fid = %d', $form_state['values']['fid']); + db_query('DELETE FROM {profile_values} WHERE fid = %d', $form_state['values']['fid']); cache_clear_all(); - drupal_set_message(t('The field %field has been deleted.', array('%field' => $form_values['title']))); - watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_values['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile')); + drupal_set_message(t('The field %field has been deleted.', array('%field' => $form_state['values']['title']))); + watchdog('profile', 'Profile field %field deleted.', array('%field' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile')); $form_state['redirect'] = 'admin/user/profile'; return; |