diff --git a/del_block_users.module b/del_block_users.module index cc9a379..bfceb84 100644 --- a/del_block_users.module +++ b/del_block_users.module @@ -5,13 +5,12 @@ */ /** - * Implements hook_form_alter(). + * Implements hook_form_FORM_ID_alter(). */ function del_block_users_form_user_filter_form_alter(&$form, &$form_state) { - $form['del_block_users'] = array( '#type' => 'fieldset', - '#title' => t('Cancel all block users accounts override update options.'), + '#title' => t('Cancel all blocked users\' accounts.'), '#attributes' => array('id' => array('del-block-user')), ); @@ -19,12 +18,12 @@ function del_block_users_form_user_filter_form_alter(&$form, &$form_state) { '#type' => 'textfield', '#title' => t('Select user ids from blocked users to exclude from deletion.'), '#attributes' => array('class' => array('selectusers')), - '#description' => t('To specify multiple users, separate with a comma. If no uids erase all blocked.'), + '#description' => t('To specify multiple user ids, separate with a comma. If none are specified, all blocked users are deleted.'), ); $form['del_block_users']['chkbox'] = array( '#type' => 'checkbox', - '#title' => t('Confirm for delete all block users.'), + '#title' => t('Confirm deletion of all blocked users.'), '#default_value' => FALSE, ); @@ -37,7 +36,7 @@ function del_block_users_form_user_filter_form_alter(&$form, &$form_state) { $form['#validate'][] = 'del_block_users_validate'; - $form['#attached']['css'][] = current_path() . '/del_block_users.css'; + $form['#attached']['css'][] = drupal_get_path('module', 'del_block_users') . '/del_block_users.css'; } /** @@ -61,18 +60,23 @@ function _del_block_users($form, $form_state) { db_delete('users') ->condition('uid', $users, 'IN') ->execute(); - drupal_set_message(t('!count blocked users erased!.', array('!count' => $count))); + drupal_set_message(t('@count blocked users erased.', array('@count' => $count))); } else { - form_set_error('name', t('You have select the checkbox to delete users!')); + form_set_error('name', t('Please select this checkbox to confirm deletion of blocked users.')); } } /** - * Custom function callback for validate numbers and comas only. + * Validates that the user provided a string containing only a list of + * (optionally comma-separated) numbers. */ function del_block_users_validate($form, &$form_state) { - if (preg_match('/[^\d,]+/', $form_state['values']['selectusers'])) { - form_set_error('name', t('Only a numbers separate with comas!')); + $uids = array_map('trim', explode(",", $form_state['del_block_users']['selectusers'])) + foreach ($uids as $uid) { + if (preg_match('/^\d+$/', $uid)) { + form_set_error('name', t('The field must contain only numerals, optionally separated by commas and whitespace.')); + } + break; } } diff --git a/drush/del_block_users.drush.inc b/drush/del_block_users.drush.inc index 3678ce0..0e09707 100644 --- a/drush/del_block_users.drush.inc +++ b/drush/del_block_users.drush.inc @@ -10,11 +10,11 @@ */ function del_block_users_drush_command() { $items['del_block_users'] = array( - 'description' => dt('Delete all block users in site.'), + 'description' => dt('Delete all blocked users.'), 'aliases' => array('dbu'), - 'examples' => array('drush del_block_users' => 'Delete all block users in site.'), + 'examples' => array('drush del_block_users' => dt('Delete all blocked users.')), 'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_FULL, - 'arguments' => array('uids' => 'uid/s of users to no delete, separate with a comma.'), + 'arguments' => array('uids' => dt('uids of users to not delete. Comma separated.')), 'required-arguments' => FALSE, ); return $items; @@ -25,7 +25,7 @@ function del_block_users_drush_command() { * Implements hook_drush_help(). */ function del_block_users_drush_help() { - return dt('Delete all block users in site, caution for manual block user. You can select uid for no delete.'); + return dt('Delete all blocked users. You can optionally exclude uids which should not be deleted.'); } /** @@ -48,5 +48,5 @@ function drush_del_block_users($uids) { ->condition('uid', $users, 'IN') ->execute(); - drush_log(dt("Delete !count block users.", array('!count' => $count)), 'success'); + drush_log(dt("Deleted @count blocked users.", array('@count' => $count)), 'success'); }