Commit 7179b3bf authored by Ryan Aslett's avatar Ryan Aslett
Browse files

Issue #2725059: Renames blocked to blacklist

parent a11aad8e

distil_registration.module

+3 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ function distil_registration_form_validate($form, &$form_state) { 
  $result = $query->execute()->fetchCol();



  //Do not allow registration for a black listed distil IID

  if ($result == 'blocked') {

  if ($result == 'blacklist') {

    form_set_error('form', filter_xss(variable_get('distil_registration_errormsg')));

    watchdog('distil_registration', 'User %user using email %email denied registration: Blacklisted D_IID: %diid ', array('%user' => $form['account']['name']['#value'], '%email' => $form['account']['mail']['#value'], '%diid' => $distil_iid));

  }
@@ -262,12 +262,11 @@ function distil_registration_field_group_info() { 
/**

 * Menu callback for distil iid management

 */

function distil_registration_manage_status($distil_iid, $status)

{

function distil_registration_manage_status($distil_iid, $status) {



  global $user;

  $timestamp = time();

  if (!in_array($status, ['whitelist', 'blocked', 'unsure'])) {

  if (!in_array($status, ['whitelist', 'blacklist', 'unsure'])) {

    return MENU_ACCESS_DENIED;

  }