BOINC / boinc

drupal/sites/default/boinc/modules/boincuser/includes/boincuser.helpers.inc

Switch Indentation +365 added lines, -365 removed lines

@@ -11,12 +11,12 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 if (!function_exists('user_load_by_mail')) {
-  /**
+/**
    * user_load_by_mail will be broken out of user_load
    */
-  function user_load_by_mail($mail) {
-    return user_load(array('mail' => $mail));
-  }
+function user_load_by_mail($mail) {
+return user_load(array('mail' => $mail));
+}
 }
  
 
@@ -28,14 +28,14 @@ 
  * Get an image object from a given file and cck field
  */ 
 function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = FALSE) {
-  $field = content_fields($field_name, $content_type); 
-  $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
-  if ($ignore_resolution) {
-    unset($validators['filefield_validate_image_resolution']);
-  }
-  $target_path = filefield_widget_file_path($field);
-  // Create the image object
-  return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
+$field = content_fields($field_name, $content_type); 
+$validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
+if ($ignore_resolution) {
+unset($validators['filefield_validate_image_resolution']);
+}
+$target_path = filefield_widget_file_path($field);
+// Create the image object
+return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
 }
 
 
@@ -47,73 +47,73 @@ 
  * 
  */
 function boincuser_check_credit_requirements() {
-  global $user;
-  if (!$user->uid) {
-    return FALSE;
-  }
-  $account = user_load($user->uid);
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $community_role = array_search('community member', user_roles(true));
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
+global $user;
+if (!$user->uid) {
+return FALSE;
+}
+$account = user_load($user->uid);
+$min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+$community_role = array_search('community member', user_roles(true));
+$unrestricted_role = array_search('verified contributor', user_roles(true));
   
-  // Set user roles based on current penalty status...
-  if ($account->boincuser_penalty_expiration > time()) {
-    drupal_set_message(bts(
-      'You are banned from community participation until @date',
-      array('@date' => format_date($account->boincuser_penalty_expiration))
-    ), 'warning', FALSE);
-    if (isset($account->roles[$community_role])) {
-      // Remove from the community role, if not already
-      unset($account->roles[$community_role]);
-    }
-    if (isset($account->roles[$unrestricted_role])) {
-      // Likewise, revoke extra privileges
-      unset($account->roles[$unrestricted_role]);
-    }
+// Set user roles based on current penalty status...
+if ($account->boincuser_penalty_expiration > time()) {
+drupal_set_message(bts(
+  'You are banned from community participation until @date',
+  array('@date' => format_date($account->boincuser_penalty_expiration))
+), 'warning', FALSE);
+if (isset($account->roles[$community_role])) {
+  // Remove from the community role, if not already
+  unset($account->roles[$community_role]);
+}
+if (isset($account->roles[$unrestricted_role])) {
+  // Likewise, revoke extra privileges
+  unset($account->roles[$unrestricted_role]);
+}
+user_save($account, array('roles' => $account->roles));
+}
+else {
+if (!isset($account->roles[$community_role])) {
+  // The user should be a 'community member' role. If the user was
+  // previously banned, this will restore that role.
+  $account->roles[$community_role] = 'community member';
+  user_save($account, array('roles' => $account->roles));
+}
+
+// ... and total credit.
+if ($account->boincuser_total_credit >= $min_credit_to_post) {
+  if (!isset($account->roles[$unrestricted_role])) {
+    // This user is now above the credit threshold and is allowed full
+    // privileges
+    $account->roles[$unrestricted_role] = 'verified contributor';
     user_save($account, array('roles' => $account->roles));
   }
-  else {
-    if (!isset($account->roles[$community_role])) {
-      // The user should be a 'community member' role. If the user was
-      // previously banned, this will restore that role.
-      $account->roles[$community_role] = 'community member';
-      user_save($account, array('roles' => $account->roles));
-    }
-
-    // ... and total credit.
-    if ($account->boincuser_total_credit >= $min_credit_to_post) {
-      if (!isset($account->roles[$unrestricted_role])) {
-        // This user is now above the credit threshold and is allowed full
-        // privileges
-        $account->roles[$unrestricted_role] = 'verified contributor';
-        user_save($account, array('roles' => $account->roles));
-      }
-    }
-    else {
-      drupal_set_message(bts(
-        'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
-        array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
-      ), 'warning', FALSE);
-      if (isset($account->roles[$unrestricted_role])) {
-        // Either the threshold has been raised or credits have been revoked;
-        // this user no longer qualifies for full privileges
-        unset($account->roles[$unrestricted_role]);
-        user_save($account, array('roles' => $account->roles));
-      }
-    }
-
+}
+else {
+  drupal_set_message(bts(
+    'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
+    array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
+  ), 'warning', FALSE);
+  if (isset($account->roles[$unrestricted_role])) {
+    // Either the threshold has been raised or credits have been revoked;
+    // this user no longer qualifies for full privileges
+    unset($account->roles[$unrestricted_role]);
+    user_save($account, array('roles' => $account->roles));
   }
 }
 
+}
+}
+
 /**
  * Get the cid of the first comment the user has not seen on a given node
  */
 function boincuser_get_first_unread_comment_id($nid, $uid = NULL) {
-  if (!$uid) {
-    global $user;
-    $uid = $user->uid;
-  }
-  return db_result(db_query("
+if (!$uid) {
+global $user;
+$uid = $user->uid;
+}
+return db_result(db_query("
     SELECT c.cid
     FROM {node} n
     INNER JOIN {comments} c ON c.nid = n.nid
@@ -123,41 +123,41 @@ 
     AND c.timestamp > h.timestamp
     ORDER BY c.timestamp ASC
     LIMIT 1",
-    $uid, $nid
-  ));
+$uid, $nid
+));
 }
 
 /**
  * Choose and set the user of the day
  */
 function boincuser_select_user_of_the_day() {
-  // First get a list of users with recent credit
-  db_set_active('boinc_rw');
-  $users_with_credit = db_query("
+// First get a list of users with recent credit
+db_set_active('boinc_rw');
+$users_with_credit = db_query("
     SELECT
       id
     FROM {user} u
     JOIN {profile} p ON p.userid = u.id
     WHERE expavg_credit > 1
     ORDER BY uotd_time ASC, RAND()"
-  );
-  db_set_active('default');
-  $active_users = array();
-  while ($user_with_credit = db_fetch_object($users_with_credit)) {
-    $active_users[] = $user_with_credit->id;
-  }
-  $active_users = implode(',', $active_users);
-  // Limit to users who have never been user of the day, if there are any
-  $never_been_picked = db_result(db_query("
+);
+db_set_active('default');
+$active_users = array();
+while ($user_with_credit = db_fetch_object($users_with_credit)) {
+$active_users[] = $user_with_credit->id;
+}
+$active_users = implode(',', $active_users);
+// Limit to users who have never been user of the day, if there are any
+$never_been_picked = db_result(db_query("
     SELECT COUNT(*)
     FROM {boincuser} bu
     WHERE bu.uotd_time = 0
     " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')
-  ));
-  $new_uotd_uid = 0;
-  while (!$new_uotd_uid) {
-    // Select a user of the day randomly from the pool
-      $new_uotd_uid = db_result(db_query("
+));
+$new_uotd_uid = 0;
+while (!$new_uotd_uid) {
+// Select a user of the day randomly from the pool
+  $new_uotd_uid = db_result(db_query("
       SELECT
         n.uid
       FROM {node} n
@@ -169,33 +169,33 @@ 
       " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
       ORDER BY RAND()
       LIMIT 1"
-    ));
-    if (!$new_uotd_uid) {
-      // Can't find a user with a profile; remove constraints on the pool
-      if ($never_been_picked) {
-        // Allow users who have been previously selected
-        $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
-        // Allow users who are not even active (getting desperate)
-        $active_users = FALSE;
-      }
-      else {
-        // Process failed...
-        return FALSE;
-      }
-    }
+));
+if (!$new_uotd_uid) {
+  // Can't find a user with a profile; remove constraints on the pool
+  if ($never_been_picked) {
+    // Allow users who have been previously selected
+    $never_been_picked = FALSE;
   }
-  $uotd = user_load($new_uotd_uid);
-  if ($uotd->uid) {
-    db_query("
+  elseif ($active_users) {
+    // Allow users who are not even active (getting desperate)
+    $active_users = FALSE;
+  }
+  else {
+    // Process failed...
+    return FALSE;
+  }
+}
+}
+$uotd = user_load($new_uotd_uid);
+if ($uotd->uid) {
+db_query("
       UPDATE {boincuser}
       SET uotd_time = '%d'
       WHERE uid = '%d'",
-      time(), $uotd->uid
-    );
-  }
-  return $uotd;
+  time(), $uotd->uid
+);
+}
+return $uotd;
 }
 
 
@@ -213,71 +213,71 @@ 
  * new and prev email.
  */
 function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
-  require_boinc('token');
-  module_load_include('inc', 'rules', 'modules/system.rules');
-
-  global $base_url;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
+require_boinc('token');
+module_load_include('inc', 'rules', 'modules/system.rules');
 
-  if (is_null($new_email)) {
-    $new_email = $account->mail;
-  }
-  if (is_null($prev_email)) {
-    $prev_email = $account->boincuser_previous_email_addr;
-  }
+global $base_url;
+$site_name = variable_get('site_name', 'Drupal-BOINC');
 
-  // @todo - set constant in drupal, or use BOINC contsants
-  $duration = TOKEN_DURATION_ONE_WEEK;
-  $changedate = date('F j, Y \a\t G:i T', time());
-  $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
-  $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
-  if ($adminuser) {
-    $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
-    $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. You will not be able to change your email address "
-      . "until {$newdate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
+if (is_null($new_email)) {
+$new_email = $account->mail;
+}
+if (is_null($prev_email)) {
+$prev_email = $account->boincuser_previous_email_addr;
+}
 
-  // Send email #1 to current address
-  $mysubject = "Notification of email change at {$site_name}";
-  $mymessage = ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . $graf1
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
-    'from' => '',
-    'to' => $new_email,
-    'subject' => $mysubject,
-    'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  // Send email #2 to previous address.
-  $mymessage = ''
-      . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
-      . "\n"
-      . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
-    'from' => '',
-    'to' => $prev_email,
-    'subject' => $mysubject,
-    'message' => $mymessage,
-  );
+// @todo - set constant in drupal, or use BOINC contsants
+$duration = TOKEN_DURATION_ONE_WEEK;
+$changedate = date('F j, Y \a\t G:i T', time());
+$newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
+$token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
+if ($adminuser) {
+$graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
+  . "on {$changedate}. If you need to reverse this change, please look for "
+  . "an email send to the email address: {$prev_email}.\n";
+}
+else {
+$graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
+  . "on {$changedate}. You will not be able to change your email address "
+  . "until {$newdate}. If you need to reverse this change, please look for "
+  . "an email send to the email address: {$prev_email}.\n";
+}
 
-  rules_action_mail($settings);
+// Send email #1 to current address
+$mysubject = "Notification of email change at {$site_name}";
+$mymessage = ''
+  . "{$account->boincuser_name},\n"
+  . "\n"
+  . $graf1
+  . "\n"
+  . "Thanks, \n"
+  . "{$site_name} support team\n";
+
+$settings = array(
+'from' => '',
+'to' => $new_email,
+'subject' => $mysubject,
+'message' => $mymessage,
+);
+rules_action_mail_to_user($account, $settings);
+
+// Send email #2 to previous address.
+$mymessage = ''
+  . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
+  . "\n"
+  . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
+  . "\n"
+  . "Thanks, \n"
+  . "{$site_name} support team\n";
+
+$settings = array(
+'from' => '',
+'to' => $prev_email,
+'subject' => $mysubject,
+'message' => $mymessage,
+);
+
+rules_action_mail($settings);
 }
 
 /**
@@ -287,32 +287,32 @@ 
  *
  */
 function create_proper_drupalname($requested_name) {
-  if (!$requested_name) {
-    // If the name is empty, set it
-    $requested_name = 'anonymous';
-  }
-  $same_name_tally = 1;
-
-  // Remove extra spaces
-  $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
-  // Remove any non-valid characters
-  $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
-  // Truncate name
-  $name_length = strlen($cleaned_name);
-  if ($name_length > 56) {
-    // Name is limited to 60 characters, but we want to leave space to add a
-    // tally if needed (for users with duplicate names); Limit to 56 chars and
-    // replace the middle of the string with "..." if too long
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
-  }
+if (!$requested_name) {
+// If the name is empty, set it
+$requested_name = 'anonymous';
+}
+$same_name_tally = 1;
+
+// Remove extra spaces
+$name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
+// Remove any non-valid characters
+$cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
+// Truncate name
+$name_length = strlen($cleaned_name);
+if ($name_length > 56) {
+// Name is limited to 60 characters, but we want to leave space to add a
+// tally if needed (for users with duplicate names); Limit to 56 chars and
+// replace the middle of the string with "..." if too long
+$cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
+}
 
-  // Determine if there are duplicate names, if so append a number to end.
-  $unique_name = $cleaned_name;
-  while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
-    $same_name_tally++;
-    $unique_name = "{$cleaned_name}_{$same_name_tally}";
-  }
-  return $unique_name;
+// Determine if there are duplicate names, if so append a number to end.
+$unique_name = $cleaned_name;
+while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
+$same_name_tally++;
+$unique_name = "{$cleaned_name}_{$same_name_tally}";
+}
+return $unique_name;
 }
 
 
@@ -326,9 +326,9 @@ 
  *
  */
 function boincuser_check_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
-  return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
+require_boinc('consent');
+$boinc_user = boincuser_load($user->uid, TRUE);
+return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
 /**
@@ -339,27 +339,27 @@ 
  *
  */
 function boincuser_consentto_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
-
-  list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
-  if ($checkct) {
-    $rc1 = consent_to_a_policy($boinc_user, $ctid, 1, 0, 'Webform', time());
-    if (!$rc1) {
-      drupal_set_message(
-        bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. Please contact site administrators.",
-        array('@id' => $boinc_user->id),
-        'NULL', 'boinc:consent-termsofuse'),
-      'error');
-    }
-    return $rc1;
-  }
-  else {
-    drupal_set_message(
-      bts('ERROR: Consent type for enrollment not found. Please contact site administrators.', array(), 'NULL', 'boinc:consent-termsofuse'),
-    'error');
-  }
-  return FALSE;
+require_boinc('consent');
+$boinc_user = boincuser_load($user->uid, TRUE);
+
+list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
+if ($checkct) {
+$rc1 = consent_to_a_policy($boinc_user, $ctid, 1, 0, 'Webform', time());
+if (!$rc1) {
+  drupal_set_message(
+    bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. Please contact site administrators.",
+    array('@id' => $boinc_user->id),
+    'NULL', 'boinc:consent-termsofuse'),
+  'error');
+}
+return $rc1;
+}
+else {
+drupal_set_message(
+  bts('ERROR: Consent type for enrollment not found. Please contact site administrators.', array(), 'NULL', 'boinc:consent-termsofuse'),
+'error');
+}
+return FALSE;
 }
 
 /**
@@ -368,16 +368,16 @@ 
  */
 function _boincuser_ignore_paths($path, $paths_to_ignore) {
 
-  foreach ($paths_to_ignore as $pi) {
-    // @todo Currently this function uses {} as PHP regexp
-    // delimiters. Curly brace is not really allowed un URLs, but a
-    // more robust function would first check for these curly braces
-    // in the path_to_ignore patterms, just in case.
-    if (preg_match('{' . $pi . '}', $path)) {
-      return TRUE;
-    }
-  }
-  return FALSE;
+foreach ($paths_to_ignore as $pi) {
+// @todo Currently this function uses {} as PHP regexp
+// delimiters. Curly brace is not really allowed un URLs, but a
+// more robust function would first check for these curly braces
+// in the path_to_ignore patterms, just in case.
+if (preg_match('{' . $pi . '}', $path)) {
+  return TRUE;
+}
+}
+return FALSE;
 }
 
 /**
@@ -385,20 +385,20 @@ 
  * Drupal's recover email path.
  */
 function _boincuser_redirect_recover_email() {
-  $params = array(
-    'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
-    'token' => isset($_GET['token']) ? $_GET['token'] : ''
-  );
-
-  // If boincid or token is not present, then go to the home page.
-  if (empty($params['boincid']) or empty($params['token'])) {
-    $redirect = '';
-  }
-  else {
-    $uid = boincuser_lookup_uid($params['boincid']);
-    $redirect = "/user/${uid}/recoveremail/${params['token']}";
-  }
-  drupal_goto($redirect);
+$params = array(
+'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
+'token' => isset($_GET['token']) ? $_GET['token'] : ''
+);
+
+// If boincid or token is not present, then go to the home page.
+if (empty($params['boincid']) or empty($params['token'])) {
+$redirect = '';
+}
+else {
+$uid = boincuser_lookup_uid($params['boincid']);
+$redirect = "/user/${uid}/recoveremail/${params['token']}";
+}
+drupal_goto($redirect);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -409,17 +409,17 @@ 
  * Require BOINC library
  */
 function require_boinc($libraries) {
-  if ($include_dir = boinc_get_path('html_inc')) {
-    $working_dir = getcwd();
-    chdir($include_dir);
-    if (!is_array($libraries)) {
-      $libraries = array($libraries);
-    }
-    foreach ($libraries as $library) {
-      require_once("{$library}.inc");
-    }
-    chdir($working_dir);
-  }
+if ($include_dir = boinc_get_path('html_inc')) {
+$working_dir = getcwd();
+chdir($include_dir);
+if (!is_array($libraries)) {
+  $libraries = array($libraries);
+}
+foreach ($libraries as $library) {
+  require_once("{$library}.inc");
+}
+chdir($working_dir);
+}
 }
 
 /**
@@ -427,92 +427,92 @@ 
  * The path from the BOINC html root must be included (e.g. user/file.php)
  */
 function include_boinc($file) {
-  if ($include_dir = boinc_get_path()) {
-    $include_dir .= '/html';
-    $workingDir = getcwd();
-    $path = dirname($file);
-    $file = basename($file);
-    chdir("{$include_dir}/{$path}");
-    include($file);
-    chdir($workingDir);
-  }
+if ($include_dir = boinc_get_path()) {
+$include_dir .= '/html';
+$workingDir = getcwd();
+$path = dirname($file);
+$file = basename($file);
+chdir("{$include_dir}/{$path}");
+include($file);
+chdir($workingDir);
+}
 }
 
 /**
  * Get the BOINC include path
  */
 function boinc_get_path($type = 'root') {
-  $dir = "boinc_{$type}_dir";
-  if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
-    return $include_dir;
-  }
-  else {
-    // Don't show errors on blacklisted pages
-    $page_blacklist = array(
-      'admin/boinc/environment'
-    );
-    if (!in_array($_GET['q'], $page_blacklist)) {
-      watchdog('boincuser', 'The BOINC environment is not configured. Please
+$dir = "boinc_{$type}_dir";
+if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
+return $include_dir;
+}
+else {
+// Don't show errors on blacklisted pages
+$page_blacklist = array(
+  'admin/boinc/environment'
+);
+if (!in_array($_GET['q'], $page_blacklist)) {
+  watchdog('boincuser', 'The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
-            'admin/boinc/environment')), WATCHDOG_WARNING);
-      if (user_access('administer site configuration')) {
-        drupal_set_message(t('The BOINC environment is not configured. Please
+        'admin/boinc/environment')), WATCHDOG_WARNING);
+  if (user_access('administer site configuration')) {
+    drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
-            'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
-        drupal_set_message(t('There is a problem with the site. Please contact
+        'admin/boinc/environment'))), 'warning', FALSE);
+  }
+  else {
+    drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
-      }
-      // Redirect home to display the error message and avoid fatal errors
-      // (unless on a blacklisted page)
-      $redirect_blacklist = array(
-        'admin/settings/performance',
-        'admin/boinc/environment',
-        'home',
-        ''
-      );
-      if (!in_array($_GET['q'], $redirect_blacklist)) {
-        drupal_goto('');
-      }
-    }
-    else {
-      // Clear the messages on the environment config page
-      drupal_get_messages();
-    }
   }
-  return FALSE;
+  // Redirect home to display the error message and avoid fatal errors
+  // (unless on a blacklisted page)
+  $redirect_blacklist = array(
+    'admin/settings/performance',
+    'admin/boinc/environment',
+    'home',
+    ''
+  );
+  if (!in_array($_GET['q'], $redirect_blacklist)) {
+    drupal_goto('');
+  }
+}
+else {
+  // Clear the messages on the environment config page
+  drupal_get_messages();
+}
+}
+return FALSE;
 }
 
 /**
  * Get the configured scheduler tags
  */
 function boinc_get_scheduler_tags() {
-  // Don't generate messages for blacklisted pages
-  $page_blacklist = array(
-    'admin/boinc/environment',
-    'admin/boinc/scheduler'
-  );
-  if ($url_config = variable_get('boinc_scheduler_urls', '')) {
-    return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
-    watchdog('boincuser', 'The BOINC scheduling server settings are not yet
+// Don't generate messages for blacklisted pages
+$page_blacklist = array(
+'admin/boinc/environment',
+'admin/boinc/scheduler'
+);
+if ($url_config = variable_get('boinc_scheduler_urls', '')) {
+return explode("\r\n", $url_config);
+}
+elseif (!in_array($_GET['q'], $page_blacklist)) {
+watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
-            t('and') . '</strong> ' . t('save the configuration'),
-            'admin/boinc/scheduler', array('html' => TRUE))
-          ), WATCHDOG_WARNING);
-    if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC scheduling server settings are not yet
+      array('!verify' => l(t('verify the default values') . ' <strong>' . 
+        t('and') . '</strong> ' . t('save the configuration'),
+        'admin/boinc/scheduler', array('html' => TRUE))
+      ), WATCHDOG_WARNING);
+if (user_access('administer site configuration')) {
+  drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
-            array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
-              'admin/boinc/scheduler', array('html' => TRUE))
-            )), 'warning', FALSE);
-    }
-  }
-  return array();
+        array('!verify' => l(t('verify the default values') . ' <strong>' . 
+          t('and') . '</strong> ' . t('save the configuration'),
+          'admin/boinc/scheduler', array('html' => TRUE))
+        )), 'warning', FALSE);
+}
+}
+return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -524,41 +524,41 @@ 
  * Determine if a BOINC ID matches the logged in user
  */
 function is_current_boinc_user($boinc_id) {
-  global $user;
-  if (!$user->uid) {
-    return FALSE;
-  }
-  // boincuser_id is not stored in the global user, so load a new instance
-  $drupuser = user_load($user->uid);
-  return ($boinc_id == $drupuser->boincuser_id);
+global $user;
+if (!$user->uid) {
+return FALSE;
+}
+// boincuser_id is not stored in the global user, so load a new instance
+$drupuser = user_load($user->uid);
+return ($boinc_id == $drupuser->boincuser_id);
 }
 
 /**
  * Convert a BOINC ID to a Drupal ID
  */
 function boincuser_lookup_uid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
-  return $drupal_id;
+$drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
+return $drupal_id;
 }
 function get_drupal_id($boinc_id) {
-  return boincuser_lookup_uid($boinc_id);
+return boincuser_lookup_uid($boinc_id);
 }
 
 /**
  * Get a BOINC user object
  */
 function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
-  if (!$user_id) {
-    global $user;
-    $user_id = $user->uid;
-    $is_drupal_id = TRUE;
-  }
-  if ($is_drupal_id) {
-    $account = user_load($user_id);
-    $user_id = $account->boincuser_id;
-  }
-  require_boinc('boinc_db');
-  return BoincUser::lookup_id($user_id);
+if (!$user_id) {
+global $user;
+$user_id = $user->uid;
+$is_drupal_id = TRUE;
+}
+if ($is_drupal_id) {
+$account = user_load($user_id);
+$user_id = $account->boincuser_id;
+}
+require_boinc('boinc_db');
+return BoincUser::lookup_id($user_id);
 }
 
 /**
@@ -568,10 +568,10 @@ 
  * page, delete button.
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
-  $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
-  $afterq = 'destination=account';
-  drupal_goto($deleteurl, $afterq);
+$node = $form['#node'];
+$deleteurl = 'node/'. $node->nid .'/delete';
+$afterq = 'destination=account';
+drupal_goto($deleteurl, $afterq);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -582,8 +582,8 @@ 
  * Wrapper for boinc_version() function
  */
 function get_boinc_version($x) {
-  require_boinc('host');
-  return function_exists('boinc_version') ? boinc_version($x) : 'err!';
+require_boinc('host');
+return function_exists('boinc_version') ? boinc_version($x) : 'err!';
 }
   
 
@@ -595,12 +595,12 @@ 
   * Generate the friend block header
   */
 function boincuser_views_friends_block_header($context = null) {
-  // Get the friend count for the user being viewed
-  $view = views_get_current_view();
-  $account_id = $view->args[0];
-  $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
-    array('@count' => $friend_count)) . '</h2>';
+// Get the friend count for the user being viewed
+$view = views_get_current_view();
+$account_id = $view->args[0];
+$friend_count = flag_friend_get_friend_count($account_id);
+return '<h2 class="pane-title">' . bts('Friends (@count)', 
+array('@count' => $friend_count)) . '</h2>';
 }
 
 /**
@@ -608,13 +608,13 @@ 
  * database.
  */
 function _boincuser_user_name_autocomplete($string) {
-  $matches = array();
-  db_set_active('boinc_ro');
-  $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
-  db_set_active('default');
-  while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
-  }
+$matches = array();
+db_set_active('boinc_ro');
+$result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
+db_set_active('default');
+while ($user = db_fetch_object($result)) {
+  $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+}
 
-  drupal_json((object)$matches);
+drupal_json((object)$matches);
 }

drupal/sites/default/boinc/modules/boincwork/includes/boincwork.helpers.inc

Switch Indentation +27 added lines, -27 removed lines

@@ -643,9 +643,9 @@ 
     }
     break;
     
-    default:
-      // Don't generate form elements for things that aren't explicitly form
-      // elements (i.e. 'title', '@attributes' keys, and the like)
+  default:
+    // Don't generate form elements for things that aren't explicitly form
+    // elements (i.e. 'title', '@attributes' keys, and the like)
   }
 }
 
@@ -1990,29 +1990,29 @@ 
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
   switch ($appverid) {
-    case ANON_PLATFORM_UNKNOWN:
-      return "Anonymous platform";
-    case ANON_PLATFORM_CPU:
-      return "Anonymous platform CPU";
-    case ANON_PLATFORM_NVIDIA:
-      return "Anonymous platform NVIDIA GPU";
-    case ANON_PLATFORM_ATI:
-      return "Anonymous platform AMD GPU";
-    case ANON_PLATFORM_INTEL:
-      return "Anonymous platform Intel GPU";
-    case 0:
-      return "---";
-    default:
-      // Handle the case where the appversid is still negative. This
-      // may be cause BOINC has introduced a new anonymous platform
-      // that is not handled by the above case statements.
-      if ($appverid < 0) {
-        return "Unknown Anonymous platform";
-      }
-      else {
-        $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
-        $prettyc = ($plan_class) ? "($av->plan_class)" : '';
-        return "v$prettyv $prettyc $plfm";
-      }
+  case ANON_PLATFORM_UNKNOWN:
+    return "Anonymous platform";
+  case ANON_PLATFORM_CPU:
+    return "Anonymous platform CPU";
+  case ANON_PLATFORM_NVIDIA:
+    return "Anonymous platform NVIDIA GPU";
+  case ANON_PLATFORM_ATI:
+    return "Anonymous platform AMD GPU";
+  case ANON_PLATFORM_INTEL:
+    return "Anonymous platform Intel GPU";
+  case 0:
+    return "---";
+  default:
+    // Handle the case where the appversid is still negative. This
+    // may be cause BOINC has introduced a new anonymous platform
+    // that is not handled by the above case statements.
+    if ($appverid < 0) {
+      return "Unknown Anonymous platform";
+    }
+    else {
+      $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
+      $prettyc = ($plan_class) ? "($av->plan_class)" : '';
+      return "v$prettyv $prettyc $plfm";
+    }
   }
 }