BOINC / boinc

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

Switch Indentation +452 added lines, -452 removed lines

@@ -27,295 +27,295 @@ 
  * 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 arguments' => array('edit own profile content'),
-    '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/termsofuse'] = array(
-    'title' => bts('Terms of Use', array(), NULL, 'boinc:termsofuse-form'),
-    'description' => 'A site\'s term of use.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_termsofuse_form'),
-    'access callback' => 'user_is_logged_in',
-    '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 arguments' => array('edit own profile content'),
+'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/termsofuse'] = array(
+'title' => bts('Terms of Use', array(), NULL, 'boinc:termsofuse-form'),
+'description' => 'A site\'s term of use.',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_termsofuse_form'),
+'access callback' => 'user_is_logged_in',
+'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,
-  );
-  $items['user/%user/recoveremail/%'] = array(
-    'title' => t('Recover previous email'),
-    'description' => t('Form to revert email to previous address.'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_revertemail', 3),
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_CALLBACK,
-  );
-  $items['recover_email.php'] = array(
-    'title' => t('Recover previous email'),
-    'description' => t('redirect'),
-    'page callback' => '_boincuser_redirect_recover_email',
-    '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,
+);
+$items['user/%user/recoveremail/%'] = array(
+'title' => t('Recover previous email'),
+'description' => t('Form to revert email to previous address.'),
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_revertemail', 3),
+'access callback' => 'user_is_logged_in',
+'type' => MENU_CALLBACK,
+);
+$items['recover_email.php'] = array(
+'title' => t('Recover previous email'),
+'description' => t('redirect'),
+'page callback' => '_boincuser_redirect_recover_email',
+'access callback' => TRUE,
+'type' => MENU_CALLBACK,
+);
+return $items;
 }
 
 /**
  * Implementation of hook_init()
  */
 function boincuser_init() {
-  global $user;
-  // Skip this check for charts, which are loaded separately
-  // (may get duplicate or unexpected messages otherwise)
-  if (substr($_GET['q'], 0, 7) == 'charts/') {
-    return;
-  }
+global $user;
+// 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();
+}
 
-  // Check if user has agreed to the terms of use. If not, send the
-  // user to the terms-of-use form. This is only makes sense if the
-  // termsofuse is enabled, by having text in the termsofuse variable.
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
-    if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
-
-      // Admins are exempt, otherwise the admin may not be able to
-      // access the site!
-      $administrator_role = array_search('administrator', user_roles(true));
-      if (!isset($user->roles[$administrator_role])) {
-        $path = drupal_get_path_alias($_GET['q']);
-
-        // Any paths that should NOT be redirected go here.
-        // The site will not function correctly if these are not exempt!
-        $paths0 = array(
-          'user/termsofuse',
-          'logout',
-          'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
-          'recover_email.php',
-        );
-        if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
-        }
+// Check if user has agreed to the terms of use. If not, send the
+// user to the terms-of-use form. This is only makes sense if the
+// termsofuse is enabled, by having text in the termsofuse variable.
+$existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+$termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+if ( (!empty($termsofuse)) and ($user->uid) ) {
+if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
+
+  // Admins are exempt, otherwise the admin may not be able to
+  // access the site!
+  $administrator_role = array_search('administrator', user_roles(true));
+  if (!isset($user->roles[$administrator_role])) {
+    $path = drupal_get_path_alias($_GET['q']);
+
+    // Any paths that should NOT be redirected go here.
+    // The site will not function correctly if these are not exempt!
+    $paths0 = array(
+      'user/termsofuse',
+      'logout',
+      'account/info/edit',
+      'user/' . $user->uid . '/edit',
+      'user/' . $user->uid . '/recoveremail/*',
+      'recover_email.php',
+    );
+    if (module_exists('boincuser_delete')) {
+      $paths0[] = 'user/' . $user->uid . '/delete';
+      $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
+      $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+    }
 
-        // Paths added by the admin
-        $paths1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_pathstoignore', "moderation\ncontent/moderation\nprivacy"));
-        $paths2 = array();
-        if (is_array($paths1)) {
-          $paths2 = array_map('strtolower', $paths1);
-        }
+    // Paths added by the admin
+    $paths1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_pathstoignore', "moderation\ncontent/moderation\nprivacy"));
+    $paths2 = array();
+    if (is_array($paths1)) {
+      $paths2 = array_map('strtolower', $paths1);
+    }
 
-        // paths to ignore
-        $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
+    // paths to ignore
+    $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
 
-        if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
-          drupal_goto('user/termsofuse');
-        }
-      }
+    if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
+      drupal_goto('user/termsofuse');
     }
   }
 }
+}
+}
 
 /**
  * Implementation of hook_user(); add custom actions to standard
  * Drupal user operations
  */
 function boincuser_user($op, &$edit, &$account, $category = NULL) {
-  require_boinc('boinc_db');
-  require_boinc('user');
-  require_boinc('xml');
-
-  require_boinc('password_compat/password');
-  // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
-  if (isset($account->uid) && ($account->uid > 1)) {
-    switch($op) {
-    case 'load':
-      // User loading; insert BOINC data into the user object
-      $drupal_user = db_fetch_object(db_query("
+require_boinc('boinc_db');
+require_boinc('user');
+require_boinc('xml');
+
+require_boinc('password_compat/password');
+// Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
+if (isset($account->uid) && ($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,
@@ -330,30 +330,30 @@ 
           email_addr_change_time
         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;
-      $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
-      $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
-      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;
+$account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
+$account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
+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}
@@ -365,13 +365,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,
@@ -385,174 +385,174 @@ 
         '#attributes' => array('class' => 'boinc-data'),
         '#weight' => 10
       );*/
-      break;
+break;
       
-    case 'validate':
-      if (isset($edit['validation_source'])) {
-        switch ($edit['validation_source']) {
-        case 'user_account':
-          // Validate data before updating user account info
-          boincuser_account_validate($edit, $account);
-          break;
+case 'validate':
+if (isset($edit['validation_source'])) {
+switch ($edit['validation_source']) {
+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
-      $imported = $_SESSION['importedUser'];
-      unset($_SESSION['importedUser']);
+case 'insert':
+  // New user being added to the system
+  $imported = $_SESSION['importedUser'];
+  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
+  );
       
-      // The create_acount RPC will call this block of code when
-      // user_save() is used. If user is registering using the Web
-      // registration form, create a BOINC user and relationships.
-      // Create a BOINC account unless importing from BOINC.
-      if (!$imported) {
+  // The create_acount RPC will call this block of code when
+  // user_save() is used. If user is registering using the Web
+  // registration form, create a BOINC user and relationships.
+  // Create a BOINC account unless importing from BOINC.
+  if (!$imported) {
 
-        // set email address lower-case
-        $lower_email_addr = strtolower($edit['mail']);
+    // set email address lower-case
+    $lower_email_addr = strtolower($edit['mail']);
 
-        if ($edit['boincuser_name']) {
-          $myname = $edit['boincuser_name'];
-        }
-        else if ($edit['name']) {
-          $myname = $edit['name'];
-        }
-        else {
-          $myname = 'noname';
-        }
+    if ($edit['boincuser_name']) {
+      $myname = $edit['boincuser_name'];
+    }
+    else if ($edit['name']) {
+      $myname = $edit['name'];
+    }
+    else {
+      $myname = 'noname';
+    }
 
-        $user_params = array(
-          'email_addr' => $lower_email_addr,
-          'name' => $myname,
-        );
+    $user_params = array(
+      'email_addr' => $lower_email_addr,
+      'name' => $myname,
+    );
 
-        // If the 'pass' variable is already a hash, then don't hash it again.
-        if ($edit['boinchash_flag']) {
-          $user_params['passwd_hash'] = $edit['pass'];
-        }
-        else {
-          // The passwd_hash here is only the md5() hash. This is
-          // because BOINC make_user(), called later, will run
-          // password_hash() on this md5 hash.
-          $user_params['passwd_hash'] = md5($edit['pass'].$lower_email_addr);
-        }
+    // If the 'pass' variable is already a hash, then don't hash it again.
+    if ($edit['boinchash_flag']) {
+      $user_params['passwd_hash'] = $edit['pass'];
+    }
+    else {
+      // The passwd_hash here is only the md5() hash. This is
+      // because BOINC make_user(), called later, will run
+      // password_hash() on this md5 hash.
+      $user_params['passwd_hash'] = md5($edit['pass'].$lower_email_addr);
+    }
 
-        $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;
-        }
+    $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 => ''
-        );
+    // Add user to community role by default (not banned)
+    $unrestricted_role = array_search('community member', user_roles(true)); 
+    $edit['roles'] = array(
+      $unrestricted_role => ''
+    );
 
-        // Disable show_hosts flag, set to TRUE by default
-        db_set_active('boinc_rw');
-        db_query("UPDATE {user} SET show_hosts=0 WHERE id='%d'", $boinc_user->id);
-        db_set_active('default');
+    // Disable show_hosts flag, set to TRUE by default
+    db_set_active('boinc_rw');
+    db_query("UPDATE {user} SET show_hosts=0 WHERE id='%d'", $boinc_user->id);
+    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;
-        }
+    // 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;
+    }
 
-        // if terms of use exist, the user must agree.
-        $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-        if (!empty($termsofuse)) {
-          $reference2 = boincuser_consentto_termsofuse($account);
-        }
+    // if terms of use exist, the user must agree.
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    if (!empty($termsofuse)) {
+      $reference2 = boincuser_consentto_termsofuse($account);
+    }
 
-        // Don't save custom fields to the Drupal user object
-        $edit['boincuser_name'] = null;
-        $edit['boinchash_flag'] = null;
-        // Set email address to lower case in Drupal users table
-        if ($account) {
-          user_save($account, array('mail' => $lower_email_addr));
-        }
-      }
-      break;
+    // Don't save custom fields to the Drupal user object
+    $edit['boincuser_name'] = null;
+    $edit['boinchash_flag'] = null;
+    // Set email address to lower case in Drupal users table
+    if ($account) {
+      user_save($account, array('mail' => $lower_email_addr));
+    }
+  }
+  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
-
-          $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 email address to lower-case
-            $lower_email_addr = strtolower($edit['mail']);
-
-            // Set password hash appropriately
-            $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
-            // Algorithm for changing email and/or password
-            if ($changing_email) {
-              // locally store current email to set as previous email
-              $prev_email = $account->mail;
-              $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
-              $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
-            }
-            else {
-              $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
-            }
-
-            // Update user account information
-            $result = $boinc_user->update($querypart);
-
-            if ($changing_email) {
-              // reload account
-              $account = user_load($account->uid);
-              _boincuser_send_emailchange($account, $lower_email_addr, $prev_email, user_access('administer users'));
-            }
-
-            // Change email to edit to lower-case version, this sets
-            // email in Drupal database to the lower-case email
-            // address.
-            $edit['mail'] = strtolower($lower_email_addr);
-          }
-
-          // Change boinc username
-          if ($edit['boincuser_name'] and ($edit['boincuser_name'] != $boinc_user->name)) {
-            $boincuser_name = $edit['boincuser_name'];
-            $result = $boinc_user->update(
-                "name='{$boincuser_name}'"
-            );
-          }
-
-          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
+
+    $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 email address to lower-case
+    $lower_email_addr = strtolower($edit['mail']);
+
+    // Set password hash appropriately
+    $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
+    $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
+    // Algorithm for changing email and/or password
+    if ($changing_email) {
+    // locally store current email to set as previous email
+    $prev_email = $account->mail;
+    $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
+    $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
+    }
+    else {
+    $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
+    }
+
+    // Update user account information
+    $result = $boinc_user->update($querypart);
+
+    if ($changing_email) {
+    // reload account
+    $account = user_load($account->uid);
+    _boincuser_send_emailchange($account, $lower_email_addr, $prev_email, user_access('administer users'));
+    }
+
+    // Change email to edit to lower-case version, this sets
+    // email in Drupal database to the lower-case email
+    // address.
+    $edit['mail'] = strtolower($lower_email_addr);
+    }
+
+    // Change boinc username
+    if ($edit['boincuser_name'] and ($edit['boincuser_name'] != $boinc_user->name)) {
+    $boincuser_name = $edit['boincuser_name'];
+    $result = $boinc_user->update(
+    "name='{$boincuser_name}'"
+    );
+    }
+
+    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;
@@ -560,17 +560,17 @@ 
       }
       break;
 
-    case 'login':
-      // Function is forward compatible to Drupal 7
-      boincuser_user_login($edit, $account);
-      break;
+case 'login':
+  // Function is forward compatible to Drupal 7
+  boincuser_user_login($edit, $account);
+  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:
       
     }
   }