BOINC / boinc

drupal/sites/default/boinc/modules/boincuser/boincuser.module

Switch Indentation +346 added lines, -346 removed lines

@@ -27,198 +27,198 @@ 
  * with defined URL paths
  */
 function boincuser_menu() {
-  $items['account/posts'] = array(
-    'title' => 'Recent posts',
-    'description' => '',
-    'page callback' => 'boincuser_goto_recent_posts',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_CALLBACK,
-  );
-  $items['account/profile'] = array(
-    'title' => '',
-    'description' => '',
-    'page callback' => 'boincuser_view_profile',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_NORMAL_ITEM
-  );
-  $items['account/profile/view'] = array(
-    'title' => 'View',
-    'description' => 'Show a user profile',
-    'page callback' => 'boincuser_view_profile',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => 0
-  );
-  $items['account/profile/edit'] = array(
-    'title' => 'Edit',
-    'description' => 'Edit a user profile',
-    'page callback' => 'boincuser_edit_profile',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 5
-  );
-  $items['account/team'] = array(
-    'title' => 'User team',
-    'description' => '',
-    'page callback' => 'boincuser_goto_team',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_CALLBACK,
-  );
-  $items['moderate/profile/%user/approve'] = array(
-    'title' => 'Profile approval',
-    'description' => 'Approve profile content',
-    'page callback' => 'boincuser_moderate_profile_approve',
-    'page arguments' => array(2),
-    'access arguments' => array('edit any profile content'),
-    'type' => MENU_CALLBACK,
-    'weight' => 5
-  );
-  $items['moderate/profile/%user/edit'] = array(
-    'title' => 'Profile editor',
-    'description' => 'Edit a user profile',
-    'page callback' => 'boincuser_edit_profile',
-    'page arguments' => array(2),
-    'access arguments' => array('edit any profile content'),
-    'type' => MENU_CALLBACK,
-    'weight' => 5
-  );
-  $items['moderate/profile/%/reject'] = array(
-    'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
-    'description' => 'Reject profile content',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_moderate_profile_reject_form', 2),
-    'access arguments' => array('edit any profile content'),
-    'type' => MENU_CALLBACK,
-    'weight' => 5
-  );
-  $items['moderate/user/%/ban'] = array(
-    'title' => bts('Ban user', array(), NULL, 'boinc:moderate-ban-user'),
-    'description' => 'Ban a user from using community features',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_moderate_user_ban_form', 2),
-    'access callback' => 'boincuser_moderate_community_access',
-    'type' => MENU_CALLBACK,
-  );
-  $items['join'] = array(
-    'title' => '',
-    'description' => '',
-    'page callback' => 'join_page',
-    'access arguments' => array('access content'),
-    'type' => MENU_NORMAL_ITEM
-  );
-  $items['join/new'] = array(
-    'title' => bts("I'm new"),
-    'page callback' => 'join_page',
-    'page arguments' => array(1),
-    'access arguments' => array('access content'),
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => 0
-  );
-  $items['join/boinc'] = array(
-    'title' => bts("I'm a BOINC user"),
-    'page callback' => 'join_page',
-    'page arguments' => array(1),
-    'access arguments' => array('access content'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 5
-  );
-  $items['user/login/auth'] = array(
-    'title' => bts('Authenticator login', array(), NULL, 'boinc:authenticator-login-page'),
-    'description' => 'Log in using a user authenticator',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_authloginform'),
-    'access arguments' => array('access content'),
-    'type' => MENU_CALLBACK,
-  );
-  $items['user_control'] = array(
-    'page callback' => 'boincuser_control',
-    'access arguments' => array('access user profiles'),
-    'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc'] = array(
-    'title' => 'BOINC configuration',
-    'position' => 'right',
-    'weight' => -8,
-    'page callback' => 'system_admin_menu_block_page',
-    'access arguments' => array('administer site configuration'),
-    'file' => 'system.admin.inc',
-    'file path' => drupal_get_path('module', 'system'),
-  );
-  $items['admin/boinc/environment'] = array(
-    'title' => 'Environment: General',
-    'description' => 'Set paths to BOINC functions and any other necessary
+$items['account/posts'] = array(
+'title' => 'Recent posts',
+'description' => '',
+'page callback' => 'boincuser_goto_recent_posts',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_CALLBACK,
+);
+$items['account/profile'] = array(
+'title' => '',
+'description' => '',
+'page callback' => 'boincuser_view_profile',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_NORMAL_ITEM
+);
+$items['account/profile/view'] = array(
+'title' => 'View',
+'description' => 'Show a user profile',
+'page callback' => 'boincuser_view_profile',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_DEFAULT_LOCAL_TASK,
+'weight' => 0
+);
+$items['account/profile/edit'] = array(
+'title' => 'Edit',
+'description' => 'Edit a user profile',
+'page callback' => 'boincuser_edit_profile',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_LOCAL_TASK,
+'weight' => 5
+);
+$items['account/team'] = array(
+'title' => 'User team',
+'description' => '',
+'page callback' => 'boincuser_goto_team',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_CALLBACK,
+);
+$items['moderate/profile/%user/approve'] = array(
+'title' => 'Profile approval',
+'description' => 'Approve profile content',
+'page callback' => 'boincuser_moderate_profile_approve',
+'page arguments' => array(2),
+'access arguments' => array('edit any profile content'),
+'type' => MENU_CALLBACK,
+'weight' => 5
+);
+$items['moderate/profile/%user/edit'] = array(
+'title' => 'Profile editor',
+'description' => 'Edit a user profile',
+'page callback' => 'boincuser_edit_profile',
+'page arguments' => array(2),
+'access arguments' => array('edit any profile content'),
+'type' => MENU_CALLBACK,
+'weight' => 5
+);
+$items['moderate/profile/%/reject'] = array(
+'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
+'description' => 'Reject profile content',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_moderate_profile_reject_form', 2),
+'access arguments' => array('edit any profile content'),
+'type' => MENU_CALLBACK,
+'weight' => 5
+);
+$items['moderate/user/%/ban'] = array(
+'title' => bts('Ban user', array(), NULL, 'boinc:moderate-ban-user'),
+'description' => 'Ban a user from using community features',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_moderate_user_ban_form', 2),
+'access callback' => 'boincuser_moderate_community_access',
+'type' => MENU_CALLBACK,
+);
+$items['join'] = array(
+'title' => '',
+'description' => '',
+'page callback' => 'join_page',
+'access arguments' => array('access content'),
+'type' => MENU_NORMAL_ITEM
+);
+$items['join/new'] = array(
+'title' => bts("I'm new"),
+'page callback' => 'join_page',
+'page arguments' => array(1),
+'access arguments' => array('access content'),
+'type' => MENU_DEFAULT_LOCAL_TASK,
+'weight' => 0
+);
+$items['join/boinc'] = array(
+'title' => bts("I'm a BOINC user"),
+'page callback' => 'join_page',
+'page arguments' => array(1),
+'access arguments' => array('access content'),
+'type' => MENU_LOCAL_TASK,
+'weight' => 5
+);
+$items['user/login/auth'] = array(
+'title' => bts('Authenticator login', array(), NULL, 'boinc:authenticator-login-page'),
+'description' => 'Log in using a user authenticator',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_authloginform'),
+'access arguments' => array('access content'),
+'type' => MENU_CALLBACK,
+);
+$items['user_control'] = array(
+'page callback' => 'boincuser_control',
+'access arguments' => array('access user profiles'),
+'type' => MENU_CALLBACK
+);
+$items['admin/boinc'] = array(
+'title' => 'BOINC configuration',
+'position' => 'right',
+'weight' => -8,
+'page callback' => 'system_admin_menu_block_page',
+'access arguments' => array('administer site configuration'),
+'file' => 'system.admin.inc',
+'file path' => drupal_get_path('module', 'system'),
+);
+$items['admin/boinc/environment'] = array(
+'title' => 'Environment: General',
+'description' => 'Set paths to BOINC functions and any other necessary
       variables that establish a BOINC environment.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_admin_environment'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/scheduler'] = array(
-    'title' => 'Environment: Scheduling server URLs',
-    'description' => 'Set BOINC scheduler options.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_admin_scheduler'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/weboptions'] = array(
-    'title' => 'Environment: Website Options',
-    'description' => 'Set options configuring this Drupal-BOINC Web site.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_admin_weboptions'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'boincuser.admin.inc'
-  );
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_admin_environment'),
+'access arguments' => array('administer site configuration'),
+'type' => MENU_NORMAL_ITEM,
+'file' => 'boincuser.admin.inc'
+);
+$items['admin/boinc/scheduler'] = array(
+'title' => 'Environment: Scheduling server URLs',
+'description' => 'Set BOINC scheduler options.',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_admin_scheduler'),
+'access arguments' => array('administer site configuration'),
+'type' => MENU_NORMAL_ITEM,
+'file' => 'boincuser.admin.inc'
+);
+$items['admin/boinc/weboptions'] = array(
+'title' => 'Environment: Website Options',
+'description' => 'Set options configuring this Drupal-BOINC Web site.',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_admin_weboptions'),
+'access arguments' => array('administer site configuration'),
+'type' => MENU_NORMAL_ITEM,
+'file' => 'boincuser.admin.inc'
+);
   
-  $items['create_account.php'] = array(
-    'title' => 'Create Account RPC',
-    'description' => 'RPC for creating user accounts.',
-    'page callback' => 'boincuser_create_account',
-    'access callback' => TRUE,
-    'type' => MENU_CALLBACK
-  );
-  $items['account_finish.php'] = array(
-    'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
-    'description' => 'RPC for after a user has created an account.',
-    'page callback' => 'boincuser_account_finish',
-    'access callback' => TRUE,
-    'type' => MENU_CALLBACK,
-  );
-  $items['boincuser/autocomplete'] = array(
-    'page callback' => '_boincuser_user_name_autocomplete',
-    'access callback' => TRUE,
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
+$items['create_account.php'] = array(
+'title' => 'Create Account RPC',
+'description' => 'RPC for creating user accounts.',
+'page callback' => 'boincuser_create_account',
+'access callback' => TRUE,
+'type' => MENU_CALLBACK
+);
+$items['account_finish.php'] = array(
+'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
+'description' => 'RPC for after a user has created an account.',
+'page callback' => 'boincuser_account_finish',
+'access callback' => TRUE,
+'type' => MENU_CALLBACK,
+);
+$items['boincuser/autocomplete'] = array(
+'page callback' => '_boincuser_user_name_autocomplete',
+'access callback' => TRUE,
+'type' => MENU_CALLBACK,
+);
+return $items;
 }
 
 /**
  *
  */
 function boincuser_init() {
-  // Skip this check for charts, which are loaded separately
-  // (may get duplicate or unexpected messages otherwise)
-  if (substr($_GET['q'], 0, 7) == 'charts/') {
-    return;
-  }
+// Skip this check for charts, which are loaded separately
+// (may get duplicate or unexpected messages otherwise)
+if (substr($_GET['q'], 0, 7) == 'charts/') {
+return;
+}
 
-  // If admin user, do some basic site functionality checks
-  if (user_access('administer site configuration')) {
-    // Ensure we have a configured BOINC environment
-    boinc_get_path();
-    boinc_get_scheduler_tags();
-  }
+// If admin user, do some basic site functionality checks
+if (user_access('administer site configuration')) {
+// Ensure we have a configured BOINC environment
+boinc_get_path();
+boinc_get_scheduler_tags();
+}
   
-  // Check credits for the verified contributor role
-  boincuser_check_credit_requirements();
+// Check credits for the verified contributor role
+boincuser_check_credit_requirements();
   
-  if (module_exists('boincteam')) {
-    // Display any persistent team messages
-    boincteam_show_messages();
-  }
+if (module_exists('boincteam')) {
+// Display any persistent team messages
+boincteam_show_messages();
+}
 }
 
 /**
@@ -226,20 +226,20 @@ 
  * Drupal user operations
  */
 function boincuser_user($op, &$edit, &$account, $category = NULL) {
-  // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
-  if ($account->uid > 1) {
-    switch($op) {
-    case 'load':
-      // User loading; insert BOINC data into the user object
-      $drupal_user = db_fetch_object(db_query("
+// Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
+if ($account->uid > 1) {
+switch($op) {
+case 'load':
+// User loading; insert BOINC data into the user object
+$drupal_user = db_fetch_object(db_query("
         SELECT boinc_id, penalty_expiration
         FROM {boincuser} WHERE uid = %d",
-        $account->uid
-      ));
-      $account->boincuser_id = $drupal_user->boinc_id;
-      $account->boincuser_penalty_expiration = $drupal_user->penalty_expiration;
-      db_set_active('boinc_rw');
-      $boinc_user = db_fetch_object(db_query("
+$account->uid
+));
+$account->boincuser_id = $drupal_user->boinc_id;
+$account->boincuser_penalty_expiration = $drupal_user->penalty_expiration;
+db_set_active('boinc_rw');
+$boinc_user = db_fetch_object(db_query("
         SELECT
           name,
           authenticator,
@@ -252,28 +252,28 @@ 
           venue
         FROM {user}
         WHERE id = %d",
-        $account->boincuser_id
-      ));
-      $account->boincuser_name = $boinc_user->name;
-      $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
-      $account->boincuser_total_credit = round($boinc_user->total_credit);
-      $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
-      $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
-      $account->boincuser_default_pref_set = $boinc_user->venue;
-      $account->boincteam_id = $boinc_user->teamid;
-      db_set_active('default');
-      // Set Drupal team ID
-      $account->team = NULL;
-      if ($account->boincteam_id) {
-        $account->team = db_result(db_query("
+$account->boincuser_id
+));
+$account->boincuser_name = $boinc_user->name;
+$account->boincuser_account_key = $boinc_user->authenticator;
+$account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+$account->boincuser_total_credit = round($boinc_user->total_credit);
+$account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
+$account->boincuser_expavg_time = round($boinc_user->expavg_time);
+$account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+$account->boincuser_default_pref_set = $boinc_user->venue;
+$account->boincteam_id = $boinc_user->teamid;
+db_set_active('default');
+// Set Drupal team ID
+$account->team = NULL;
+if ($account->boincteam_id) {
+$account->team = db_result(db_query("
           SELECT nid FROM {boincteam} WHERE team_id = %d",
-          $account->boincteam_id
-        ));
-      }
-      // Set post count
-      $account->post_count = db_result(db_query("
+$account->boincteam_id
+));
+}
+// Set post count
+$account->post_count = db_result(db_query("
         SELECT COUNT(*) +
         (
           SELECT COUNT(*) FROM {node}
@@ -285,13 +285,13 @@ 
         INNER JOIN node ON comments.nid = node.nid
         WHERE comments.uid = '%d'
         AND node.status = 1",
-        $account->uid, $account->uid
-      ));
-      break;
+$account->uid, $account->uid
+));
+break;
       
-    case 'view':
-      // SAMPLE: Add BOINC data to the user profile
-      /*$account->content['summary']['boinc_id'] = array(
+case 'view':
+// SAMPLE: Add BOINC data to the user profile
+/*$account->content['summary']['boinc_id'] = array(
         '#type' => 'user_profile_item',
         '#title' => bts('BIONC ID'),
         '#value' => $account->boincuser_id,
@@ -305,137 +305,137 @@ 
         '#attributes' => array('class' => 'boinc-data'),
         '#weight' => 10
       );*/
-      break;
+break;
       
-    case 'validate':
-      if (isset($edit['validation_source'])) {
-        switch ($edit['validation_source']) {
-        case 'user_register':
-          // Information being checked before adding a user
-          if (!boincuser_register_validate($edit)) {
-            // BOINC user validation failed for registration; set an error accordingly
-            form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $edit['mail'], '@project' => PROJECT), NULL, 'boinc:add-new-user'));
-          }
-          else {
-            // Save profile information for use during Insert
-            $_SESSION['profileInfo'] = array(
-              'country' => $edit['field_country'][0]['value'],
-              'zip' => $edit['field_zip'][0]['value'],                  
-              'url' => $edit['field_url'][0]['value'],
-              'background' => $edit['field_background'][0]['value'],
-              'opinions' => $edit['field_opinions'][0]['value']
-            );
-            // With BOINC validation passed, make sure name is unique
-            $edit['name'] = create_proper_drupalname($edit['boincuser_name']);
-          }
-          break;
+case 'validate':
+if (isset($edit['validation_source'])) {
+switch ($edit['validation_source']) {
+case 'user_register':
+// Information being checked before adding a user
+if (!boincuser_register_validate($edit)) {
+// BOINC user validation failed for registration; set an error accordingly
+form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $edit['mail'], '@project' => PROJECT), NULL, 'boinc:add-new-user'));
+}
+else {
+// Save profile information for use during Insert
+$_SESSION['profileInfo'] = array(
+'country' => $edit['field_country'][0]['value'],
+'zip' => $edit['field_zip'][0]['value'],                  
+'url' => $edit['field_url'][0]['value'],
+'background' => $edit['field_background'][0]['value'],
+'opinions' => $edit['field_opinions'][0]['value']
+);
+// With BOINC validation passed, make sure name is unique
+$edit['name'] = create_proper_drupalname($edit['boincuser_name']);
+}
+break;
           
-        case 'user_account':
-          // Validate data before updating user account info
-          boincuser_account_validate($edit, $account);
-          break;
+case 'user_account':
+// Validate data before updating user account info
+boincuser_account_validate($edit, $account);
+break;
         
-        default:
+default:
           
-        }
-        // We don't want to save validation source, so remove it
-        $edit['validation_source'] = null;
-      }
-      break;
+}
+    // We don't want to save validation source, so remove it
+    $edit['validation_source'] = null;
+  }
+  break;
       
-    case 'insert':
-      // New user being added to the system
-      $profile_info = $_SESSION['profileInfo'];
-      $imported = $_SESSION['importedUser'];
-      unset($_SESSION['profileInfo']);
-      unset($_SESSION['importedUser']);
+case 'insert':
+  // New user being added to the system
+  $profile_info = $_SESSION['profileInfo'];
+  $imported = $_SESSION['importedUser'];
+  unset($_SESSION['profileInfo']);
+  unset($_SESSION['importedUser']);
       
-      watchdog(
-        'boincuser',
-        'Creating user account for %email_addr',
-        array('%email_addr' => $edit['mail']),
-        WATCHDOG_NOTICE
-      );
+  watchdog(
+    'boincuser',
+    'Creating user account for %email_addr',
+    array('%email_addr' => $edit['mail']),
+    WATCHDOG_NOTICE
+  );
       
-      // NOTE: Registrations are normally handled via the create_account RPC,
-      // so the following will not run (kept in case form registration is used)
+  // NOTE: Registrations are normally handled via the create_account RPC,
+  // so the following will not run (kept in case form registration is used)
       
-      // If from the registration form, create a BOINC user and relationships
+  // If from the registration form, create a BOINC user and relationships
       
-      if ($profile_info and !$imported) {
-        // Create a BOINC account unless importing from BOINC
-        $user_params = array(
-          'email_addr' => $edit['mail'],
-          'name' => $edit['boincuser_name'],
-          'passwd_hash' => md5($edit['pass'].$edit['mail']),
-          'country' => $profile_info['country'],
-          'postal_code' => $profile_info['zip']
-        );
-        $boinc_user = boincuser_register_make_user($user_params);
-        if (!$boinc_user) {
-          // Account exists with this email addr
-          form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
-          return;
-        }
-        // Add user to community role by default (not banned)
-        $unrestricted_role = array_search('community member', user_roles(true)); 
-        $edit['roles'] = array(
-          $unrestricted_role => ''
-        );
-        // Set profile data in BOINC db
-        db_set_active('boinc_rw');
-        // TODO: add language, image support; error handling
-        $reference = db_query("INSERT INTO {profile} SET userid='%d', response1='%s', response2='%s', verification=0", $boinc_user->id, $profile_info['background'], $profile_info['opinions']);
-        if (!$reference) {
-          drupal_set_message(t('Error creating BOINC profile.'), 'error');
-        }
-        $reference = db_query("UPDATE {user} SET url='%s' WHERE id='%d'", $profile_info['url'], $boinc_user->id);
-        if (!$reference) {
-          drupal_set_message(t('Error updating BOINC account.'), 'error');
-        }
-        db_set_active('default');
-        // Cross reference Drupal account with BOINC
-        $reference = db_query("INSERT INTO {boincuser} SET uid='%d', boinc_id='%d'", $account->uid, $boinc_user->id);
-        if (!$reference) {
-          drupal_set_message(t('Error connecting BOINC account.'), 'error');
-          return;
-        }
-        // Don't save custom fields to the Drupal user object
-        $edit['boincuser_name'] = null;
-      }
-      break;
+  if ($profile_info and !$imported) {
+    // Create a BOINC account unless importing from BOINC
+    $user_params = array(
+      'email_addr' => $edit['mail'],
+      'name' => $edit['boincuser_name'],
+      'passwd_hash' => md5($edit['pass'].$edit['mail']),
+      'country' => $profile_info['country'],
+      'postal_code' => $profile_info['zip']
+    );
+    $boinc_user = boincuser_register_make_user($user_params);
+    if (!$boinc_user) {
+      // Account exists with this email addr
+      form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
+      return;
+    }
+    // Add user to community role by default (not banned)
+    $unrestricted_role = array_search('community member', user_roles(true)); 
+    $edit['roles'] = array(
+      $unrestricted_role => ''
+    );
+    // Set profile data in BOINC db
+    db_set_active('boinc_rw');
+    // TODO: add language, image support; error handling
+    $reference = db_query("INSERT INTO {profile} SET userid='%d', response1='%s', response2='%s', verification=0", $boinc_user->id, $profile_info['background'], $profile_info['opinions']);
+    if (!$reference) {
+      drupal_set_message(t('Error creating BOINC profile.'), 'error');
+    }
+    $reference = db_query("UPDATE {user} SET url='%s' WHERE id='%d'", $profile_info['url'], $boinc_user->id);
+    if (!$reference) {
+      drupal_set_message(t('Error updating BOINC account.'), 'error');
+    }
+    db_set_active('default');
+    // Cross reference Drupal account with BOINC
+    $reference = db_query("INSERT INTO {boincuser} SET uid='%d', boinc_id='%d'", $account->uid, $boinc_user->id);
+    if (!$reference) {
+      drupal_set_message(t('Error connecting BOINC account.'), 'error');
+      return;
+    }
+    // Don't save custom fields to the Drupal user object
+    $edit['boincuser_name'] = null;
+  }
+  break;
       
-    case 'update':
-      if (isset($edit['update_source'])) {
-        require_boinc('boinc_db');
-        $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-        switch ($edit['update_source']) {
-        case 'user_account':
-          // Ensure that BOINC data is altered
-          $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-          $changing_email = ($edit['mail'] AND $edit['mail'] != $boinc_user->email_addr) ? true : false;
-          $changing_pass = ($edit['pass']) ? true : false;
-          if ($changing_email OR $changing_pass) {
-            // Set password hash appropriately
-            $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $passwd_hash = md5($passwd.$edit['mail']);
-            $email_addr = $edit['mail'];
-            // Update user account information
-            $result = $boinc_user->update(
-                "email_addr='{$email_addr}', passwd_hash='{$passwd_hash}'"
-            );
-          }
-          break;
-        case 'user_profile':
-          if ($edit['boincuser_name'] != $boinc_user->name) {
-            $boincuser_name = $edit['boincuser_name'];
-            $result = $boinc_user->update(
-                "name='{$boincuser_name}'"
-            );
-          }
-          break;
-        default:
-        }
+case 'update':
+  if (isset($edit['update_source'])) {
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    switch ($edit['update_source']) {
+    case 'user_account':
+    // Ensure that BOINC data is altered
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $changing_email = ($edit['mail'] AND $edit['mail'] != $boinc_user->email_addr) ? true : false;
+    $changing_pass = ($edit['pass']) ? true : false;
+    if ($changing_email OR $changing_pass) {
+    // Set password hash appropriately
+    $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
+    $passwd_hash = md5($passwd.$edit['mail']);
+    $email_addr = $edit['mail'];
+    // Update user account information
+    $result = $boinc_user->update(
+    "email_addr='{$email_addr}', passwd_hash='{$passwd_hash}'"
+    );
+    }
+    break;
+    case 'user_profile':
+    if ($edit['boincuser_name'] != $boinc_user->name) {
+    $boincuser_name = $edit['boincuser_name'];
+    $result = $boinc_user->update(
+    "name='{$boincuser_name}'"
+    );
+    }
+    break;
+    default:
+    }
         // We don't want to save update source or duplicate custom fields, so
         // remove them before continuing to core Drupal routines
         $edit['update_source'] = null;
@@ -443,12 +443,12 @@ 
       }
       break;
 
-    case 'delete':
-      // Function is forward compatible to Drupal 7
-      boincuser_user_delete($account);
-      break;
+case 'delete':
+  // Function is forward compatible to Drupal 7
+  boincuser_user_delete($account);
+  break;
 
-    default:
+default:
       
     }
   }

drupal/sites/default/boinc/modules/boincuser/boincuser.views.inc

Switch Indentation +254 added lines, -254 removed lines

@@ -13,255 +13,255 @@ 
  */
 function boincuser_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for user table
-  // -----------------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------------------------
+// Definition for user table
+// -----------------------------------------------------------------------------------------------
   
-  $data['user']['table']['group'] = t('BOINC');
+$data['user']['table']['group'] = t('BOINC');
   
-  $data['user']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC user'),
-      'help' => t('BOINC account data for a user'),
-      'database' => 'boinc_ro'
-  );
+$data['user']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC user'),
+  'help' => t('BOINC account data for a user'),
+  'database' => 'boinc_ro'
+);
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+// Describe each of the individual fields in this table to Views. For
+// each field, you may define what field, sort, argument, and/or filter
+// handlers it supports. This will determine where in the Views interface you
+// may use the field.
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
   
-  $data['user']['id'] = array(
-    'title' => bts('Id', array(), NULL, 'boinc:user-id'),
-    'help' => t('The BOINC ID of the user account.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
-    'help' => t('The ID of the user\'s team.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['user']['id'] = array(
+'title' => bts('Id', array(), NULL, 'boinc:user-id'),
+'help' => t('The BOINC ID of the user account.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument_boincuser_id', // custom handler
+  'name field' => 'title', // the field to display in the summary.
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['teamid'] = array(
+'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+'help' => t('The ID of the user\'s team.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+),
+'argument' => array(
+  'handler' => 'views_handler_argument_boincteam_id', // custom handler
+  'name field' => 'title', // the field to display in the summary.
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of general host fields (alphabetized)
+// Descriptions of general host fields (alphabetized)
   
-  $data['user']['authenticator'] = array(
-    'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
-    'help' => t('The BOINC account key of the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['country'] = array(
-    'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
-    'help' => t('The country of the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['create_time'] = array(
-    'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
-    'help' => t('When the BOINC account was created.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['user']['cross_project_id'] = array(
-    'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
-    'help' => t('The cross project user identifier.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
-    'help' => t('The BOINC account email address.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['expavg_credit'] = array(
-    'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
-    'help' => t('A decaying average of credit per day for the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
-    'help' => t('The BOINC account user name.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )                           
-  );
-  $data['user']['passwd_hash'] = array(
-    'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
-    'help' => t('The user password hash'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['postal_code'] = array(
-    'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
-    'help' => t('The postal code of the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['send_email'] = array(
-    'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
-    'help' => t('User preference to allow email communications.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['show_hosts'] = array(
-    'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
-    'help' => t('User preference to display owned computers.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
-    'help' => t('The total accumulated BOINC credit for the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['url'] = array(
-    'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
-    'help' => t('The URL provided by the user'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
+$data['user']['authenticator'] = array(
+'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
+'help' => t('The BOINC account key of the user.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['country'] = array(
+'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+'help' => t('The country of the user.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['create_time'] = array(
+'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
+'help' => t('When the BOINC account was created.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['user']['cross_project_id'] = array(
+'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
+'help' => t('The cross project user identifier.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['email_addr'] = array(
+  'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+'help' => t('The BOINC account email address.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['expavg_credit'] = array(
+'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
+'help' => t('A decaying average of credit per day for the user.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+'help' => t('The BOINC account user name.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)                           
+);
+$data['user']['passwd_hash'] = array(
+'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
+'help' => t('The user password hash'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['postal_code'] = array(
+'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
+'help' => t('The postal code of the user.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['send_email'] = array(
+'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
+'help' => t('User preference to allow email communications.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['show_hosts'] = array(
+'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
+'help' => t('User preference to display owned computers.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['total_credit'] = array(
+'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+'help' => t('The total accumulated BOINC credit for the user.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['url'] = array(
+'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
+'help' => t('The URL provided by the user'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
   
-  return $data;
+return $data;
 }
 
 /*
@@ -272,17 +272,17 @@ 
  */
 
 function boincuser_views_handlers() {
-  return array(
-    'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
-    ),
-    'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
-        'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_argument_boincteam_id' => array(
-        'parent' => 'views_handler_argument_numeric'
-      ),
-    )
-  );
+return array(
+'info' => array(
+  'path' => drupal_get_path('module', 'boincuser') . '/views',
+),
+'handlers' => array(
+  'views_handler_argument_boincuser_id' => array(
+    'parent' => 'views_handler_argument_numeric'
+  ),
+  'views_handler_argument_boincteam_id' => array(
+    'parent' => 'views_handler_argument_numeric'
+  ),
+)
+);
 }

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

@@ -50,47 +50,47 @@ 
             }
             $resultLength = 0;
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = PASSWORD_BCRYPT_DEFAULT_COST;
-                    if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
-                        if ($cost < 4 || $cost > 31) {
-                            trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
-                            return null;
-                        }
+            case PASSWORD_BCRYPT:
+                $cost = PASSWORD_BCRYPT_DEFAULT_COST;
+                if (isset($options['cost'])) {
+                    $cost = (int) $options['cost'];
+                    if ($cost < 4 || $cost > 31) {
+                        trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
+                        return null;
                     }
-                    // The length of salt to generate
-                    $raw_salt_len = 16;
-                    // The length required in the final serialization
-                    $required_salt_len = 22;
-                    $hash_format = sprintf("$2y$%02d$", $cost);
-                    // The expected length of the final crypt() output
-                    $resultLength = 60;
-                    break;
-                default:
-                    trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
-                    return null;
+                }
+                // The length of salt to generate
+                $raw_salt_len = 16;
+                // The length required in the final serialization
+                $required_salt_len = 22;
+                $hash_format = sprintf("$2y$%02d$", $cost);
+                // The expected length of the final crypt() output
+                $resultLength = 60;
+                break;
+            default:
+                trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
+                return null;
             }
             $salt_req_encoding = false;
             if (isset($options['salt'])) {
                 switch (gettype($options['salt'])) {
-                    case 'NULL':
-                    case 'boolean':
-                    case 'integer':
-                    case 'double':
-                    case 'string':
+                case 'NULL':
+                case 'boolean':
+                case 'integer':
+                case 'double':
+                case 'string':
+                    $salt = (string) $options['salt'];
+                    break;
+                case 'object':
+                    if (method_exists($options['salt'], '__tostring')) {
                         $salt = (string) $options['salt'];
                         break;
-                    case 'object':
-                        if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
-                            break;
-                        }
-                    case 'array':
-                    case 'resource':
-                    default:
-                        trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
-                        return null;
+                    }
+                case 'array':
+                case 'resource':
+                default:
+                    trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
+                    return null;
                 }
                 if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
                     trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
@@ -212,12 +212,12 @@ 
                 return true;
             }
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
-                    if ($cost !== $info['options']['cost']) {
-                        return true;
-                    }
-                    break;
+            case PASSWORD_BCRYPT:
+                $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                if ($cost !== $info['options']['cost']) {
+                    return true;
+                }
+                break;
             }
             return false;
         }