BOINC / boinc

html/user/show_user.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 // Object-caching and full-file caching is used to speed up queries
 // for data from this page.
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 require_once("../inc/cache.inc");
 require_once("../inc/util.inc");
@@ -39,12 +39,12 @@ 
 }
 $format = get_str("format", true);
 
-if ($format=="xml"){
+if ($format == "xml") {
     // don't do caching for XML
     xml_header();
     $retval = db_init_xml();
     if ($retval) xml_error($retval);
-    if ($auth){
+    if ($auth) {
         $user = BoincUser::lookup_auth($auth);
         $show_hosts = true;
     } else {
@@ -58,9 +58,9 @@ 
     // The page may be presented in many different languages,
     // so here we cache the data instead
     //
-    $cache_args="userid=".$id;
+    $cache_args = "userid=".$id;
     $cached_data = get_cached_data(USER_PAGE_TTL, $cache_args);
-    if ($cached_data){
+    if ($cached_data) {
         // We found some old but non-stale data, let's use it
         $data = unserialize($cached_data);
         $user = $data->user;
@@ -76,7 +76,7 @@ 
         }
         BoincForumPrefs::lookup($user);
         $user = @get_other_projects($user);
-        $community_links =  get_community_links_object($user);
+        $community_links = get_community_links_object($user);
 
         $data = new StdClass;
         $data->user = $user;

Braces +3 added lines, -3 removed lines

@@ -39,12 +39,12 @@ 
 }
 $format = get_str("format", true);
 
-if ($format=="xml"){
+if ($format=="xml") {
     // don't do caching for XML
     xml_header();
     $retval = db_init_xml();
     if ($retval) xml_error($retval);
-    if ($auth){
+    if ($auth) {
         $user = BoincUser::lookup_auth($auth);
         $show_hosts = true;
     } else {
@@ -60,7 +60,7 @@ 
     //
     $cache_args="userid=".$id;
     $cached_data = get_cached_data(USER_PAGE_TTL, $cache_args);
-    if ($cached_data){
+    if ($cached_data) {
         // We found some old but non-stale data, let's use it
         $data = unserialize($cached_data);
         $user = $data->user;

html/user/notify_rss.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 } else {
     $last_mod_time = time();
 }
-$create_date  = gmdate('D, d M Y H:i:s', $last_mod_time) . ' GMT';
+$create_date = gmdate('D, d M Y H:i:s', $last_mod_time).' GMT';
 
 header("Expires: ".gmdate('D, d M Y H:i:s', time())." GMT");
 header("Last-Modified: ".$create_date);

html/ops/bbcode_convert_signature.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $forum_preferencess = _mysql_query("select * from forum_preferences where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)){
+    $i = 0;
+    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 forum_preferencess
-            echo $forum_preferences->userid.". "; flush();   // print out where we are
+            echo $forum_preferences->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($forum_preferences->userid > $start_id){
+        if ($forum_preferences->userid > $start_id) {
             fix_forum_preferences($forum_preferences);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -43,14 +43,15 @@
     $forum_preferencess = _mysql_query("select * from forum_preferences where userid>$start_id order by userid");
     echo _mysql_error();
     $i=0;
-    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)){
+    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 forum_preferencess
+        if ($i%100 == 0) {
+//For every 100 forum_preferencess
             echo $forum_preferences->userid.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($forum_preferences->userid > $start_id){
+        if ($forum_preferences->userid > $start_id) {
             fix_forum_preferences($forum_preferences);
         }
     }

html/ops/user_graph.php

Spacing +5 added lines, -5 removed lines

@@ -26,13 +26,13 @@ 
 
 
     // Create the graph. These two calls are always required
-    $graph = new Graph(350,250,"auto");
+    $graph = new Graph(350, 250, "auto");
     //$graph->SetScale("lin");
     //$graph->SetScale("textlin");
     $graph->SetScale("loglin");
 
     // Create the linear plot
-    $lineplot=new BarPlot($arr, $xarr);
+    $lineplot = new BarPlot($arr, $xarr);
     $lineplot->SetColor("blue");
 
     // Add the plot to the graph
@@ -44,7 +44,7 @@ 
 
 function show_text($xarr, $yarr) {
     $n = sizeof($xarr);
-    for ($i=0; $i<$n; $i++) {
+    for ($i = 0; $i < $n; $i++) {
         echo "<br>$xarr[$i] $yarr[$i]\n";
     }
 }
@@ -90,9 +90,9 @@ 
         if ($ind > $maxind) $maxind = $ind;
     }
     $xarr = array();
-    for ($i=0; $i<=$maxind; $i++) {
+    for ($i = 0; $i <= $maxind; $i++) {
         $xarr[$i] = $i;
-        if (is_null($yarr[$i])) $yarr[$i]=0;
+        if (is_null($yarr[$i])) $yarr[$i] = 0;
     }
     if ($show_text) {
         show_text($xarr, $yarr);

html/ops/bbcode_convert.php

Spacing +4 added lines, -4 removed lines

@@ -44,15 +44,15 @@
     $start_id = 0; //Set this to something else if you like
     $posts = _mysql_query("select * from post where id>$start_id order by id");
     echo _mysql_error();
-    $i=0;
-    while ($post = _mysql_fetch_object($posts)){
+    $i = 0;
+    while ($post = _mysql_fetch_object($posts)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 posts
-            echo $post->id.". "; flush();   // print out where we are
+            echo $post->id.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($post->id > $start_id){
+        if ($post->id > $start_id) {
             fix_post($post);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -45,14 +45,15 @@
     $posts = _mysql_query("select * from post where id>$start_id order by id");
     echo _mysql_error();
     $i=0;
-    while ($post = _mysql_fetch_object($posts)){
+    while ($post = _mysql_fetch_object($posts)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 posts
+        if ($i%100 == 0) {
+//For every 100 posts
             echo $post->id.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($post->id > $start_id){
+        if ($post->id > $start_id) {
             fix_post($post);
         }
     }

html/ops/db_form.php

Indentation +6 added lines, -6 removed lines

@@ -35,10 +35,10 @@ 
 start_table();
 
 switch($table){
-	case "platform":
-		break;
-	case "app":
-		break;
+    case "platform":
+        break;
+    case "app":
+        break;
     case "app_version":
         print_detail_field();
         print_query_field();
@@ -89,8 +89,8 @@ 
     case "user":
         print_query_field();
         break;
-	default:
-		echo "Unknown table name\n";
+    default:
+        echo "Unknown table name\n";
         exit();
 }
 

Switch Indentation +50 added lines, -50 removed lines

@@ -35,63 +35,63 @@
 start_table();
 
 switch($table){
-	case "platform":
-		break;
-	case "app":
-		break;
-    case "app_version":
-        print_detail_field();
-        print_query_field();
-        break;
-    case "host":
-        echo "
+case "platform":
+	break;
+case "app":
+	break;
+case "app_version":
+    print_detail_field();
+    print_query_field();
+    break;
+case "host":
+    echo "
             <tr>
             <td align=\"right\">Show Aggregate Information</td>
             <td>
         ";
-        print_checkbox("", "show_aggregate", $show_aggregate);
-        echo "
+    print_checkbox("", "show_aggregate", $show_aggregate);
+    echo "
             </td>
             </tr>
         ";
-        print_detail_field();
-        print_query_field();
-        break;
-    case "workunit":
-        print_detail_field();
-        print_query_field();
-        echo "<input type=\"hidden\" name=\"sort_by\" value=\"id\">\n";
-        break;
-    case "result":
-        echo "<tr><td align=\"right\">Server state</td><td> ";
-        server_state_select();
-        echo "</td></tr>\n";
-        //print_text_field( "Batch number:", "batch", $batch );
-        echo "<tr><td align=\"right\">Outcome</td><td>";
-        outcome_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Client state</td><td>";
-        client_state_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Validate state</td><td>";
-        validate_state_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Sort by</td><td>";
-        result_sort_select();
-        sort_order_select();
-        echo "</td></tr>\n";
-        print_detail_field();
-        print_query_field();
-        break;
-    case "team":
-        print_query_field();
-        break;
-    case "user":
-        print_query_field();
-        break;
-	default:
-		echo "Unknown table name\n";
-        exit();
+    print_detail_field();
+    print_query_field();
+    break;
+case "workunit":
+    print_detail_field();
+    print_query_field();
+    echo "<input type=\"hidden\" name=\"sort_by\" value=\"id\">\n";
+    break;
+case "result":
+    echo "<tr><td align=\"right\">Server state</td><td> ";
+    server_state_select();
+    echo "</td></tr>\n";
+    //print_text_field( "Batch number:", "batch", $batch );
+    echo "<tr><td align=\"right\">Outcome</td><td>";
+    outcome_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Client state</td><td>";
+    client_state_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Validate state</td><td>";
+    validate_state_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Sort by</td><td>";
+    result_sort_select();
+    sort_order_select();
+    echo "</td></tr>\n";
+    print_detail_field();
+    print_query_field();
+    break;
+case "team":
+    print_query_field();
+    break;
+case "user":
+    print_query_field();
+    break;
+default:
+	echo "Unknown table name\n";
+       exit();
 }
 
 row2("Number of entries to show", "<input name=\"nresults\" value=\"20\">");

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 
 start_table();
 
-switch($table){
+switch ($table) {
 	case "platform":
 		break;
 	case "app":
@@ -102,5 +102,5 @@ 
 print_describe_table($table, 4);
 
 admin_page_tail();
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 start_table();
 
-switch($table){
+switch($table) {
 	case "platform":
 		break;
 	case "app":

html/ops/db_update.php

Spacing +5 added lines, -5 removed lines

@@ -276,7 +276,7 @@ 
     do_query("alter table host add max_results_day integer not null");
 }
 
-function update_4_20_2005(){
+function update_4_20_2005() {
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -286,7 +286,7 @@ 
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
 }
 
-function update_4_30_2005(){
+function update_4_30_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
 }
 
@@ -313,7 +313,7 @@ 
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
 }
 
-function update_11_24_2005(){
+function update_11_24_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
 }
@@ -618,7 +618,7 @@ 
     ");
 }
 
-function update_10_05_2008(){
+function update_10_05_2008() {
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
 }
 
@@ -1244,7 +1244,7 @@ 
 // This used to be the Subversion version#,
 // but with Git we just use sequential integers
 //
-$db_updates = array (
+$db_updates = array(
     array(18490, "update_6_16_2009"),
     array(19001, "update_9_3_2009"),
     array(20807, "update_3_5_2010"),

Braces +4 added lines, -4 removed lines

@@ -276,7 +276,7 @@ 
     do_query("alter table host add max_results_day integer not null");
 }
 
-function update_4_20_2005(){
+function update_4_20_2005() {
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -286,7 +286,7 @@ 
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
 }
 
-function update_4_30_2005(){
+function update_4_30_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
 }
 
@@ -313,7 +313,7 @@ 
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
 }
 
-function update_11_24_2005(){
+function update_11_24_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
 }
@@ -618,7 +618,7 @@ 
     ");
 }
 
-function update_10_05_2008(){
+function update_10_05_2008() {
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
 }
 

html/ops/bbcode_convert_response2.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    $i = 0;
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 profiles
-            echo $profile->userid.". "; flush();   // print out where we are
+            echo $profile->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -43,14 +43,15 @@
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
     $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 profiles
+        if ($i%100 == 0) {
+//For every 100 profiles
             echo $profile->userid.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

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

Indentation +245 added lines, -245 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) {
+    /**
+     * user_load_by_mail will be broken out of user_load
+     */
+    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) {
+    $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);
+    }
+    $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) {
+    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()) {
+    }
+    $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))
+        '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]);
+        // 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]);
+        // Likewise, revoke extra privileges
+        unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+    }
+    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));
+        // 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])) {
+        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(
+        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])) {
+        ), '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) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  return db_result(db_query("
+    }
+    return db_result(db_query("
     SELECT c.cid
     FROM {node} n
     INNER JOIN {comments} c ON c.nid = n.nid
@@ -124,40 +124,40 @@ 
     ORDER BY c.timestamp ASC
     LIMIT 1",
     $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)) {
+    );
+    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("
+    }
+    $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) {
+    ));
+    $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 = db_result(db_query("
       SELECT
         n.uid
       FROM {node} n
@@ -171,31 +171,31 @@ 
       LIMIT 1"
     ));
     if (!$new_uotd_uid) {
-      // Can't find a user with a profile; remove constraints on the pool
-      if ($never_been_picked) {
+        // 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) {
+        }
+        elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+        }
+        else {
         // Process failed...
         return FALSE;
-      }
+        }
     }
-  }
-  $uotd = user_load($new_uotd_uid);
-  if ($uotd->uid) {
+    }
+    $uotd = user_load($new_uotd_uid);
+    if ($uotd->uid) {
     db_query("
       UPDATE {boincuser}
       SET uotd_time = '%d'
       WHERE uid = '%d'",
-      time(), $uotd->uid
+        time(), $uotd->uid
     );
-  }
-  return $uotd;
+    }
+    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');
+    require_boinc('token');
+    module_load_include('inc', 'rules', 'modules/system.rules');
 
-  global $base_url;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
+    global $base_url;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
 
-  if (is_null($new_email)) {
+    if (is_null($new_email)) {
     $new_email = $account->mail;
-  }
-  if (is_null($prev_email)) {
+    }
+    if (is_null($prev_email)) {
     $prev_email = $account->boincuser_previous_email_addr;
-  }
-
-  // @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) {
+    }
+
+    // @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 {
+        . "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";
-  }
-
-  // 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(
+        . "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";
+    }
+
+    // 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(
+    );
+    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);
+    rules_action_mail($settings);
 }
 
 /**
@@ -287,32 +287,32 @@ 
  *
  */
 function create_proper_drupalname($requested_name) {
-  if (!$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) {
+    }
+    $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"))) {
+    // 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;
+    }
+    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,33 +339,33 @@ 
  *
  */
 function boincuser_consentto_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
 
-  list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
-  if ($checkct) {
+    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(
+        drupal_set_message(
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. The @project administrators have been notified.",
         array(
-          '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+            '@id' => $boinc_user->id,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
-      'error');
-      rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
+        'error');
+        rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
+        bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -374,16 +374,16 @@ 
  */
 function _boincuser_ignore_paths($path, $paths_to_ignore) {
 
-  foreach ($paths_to_ignore as $pi) {
+    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 TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -391,20 +391,20 @@ 
  * Drupal's recover email path.
  */
 function _boincuser_redirect_recover_email() {
-  $params = array(
+    $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'])) {
+    // If boincid or token is not present, then go to the home page.
+    if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+    }
+    else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
-  }
-  drupal_goto($redirect);
+    }
+    drupal_goto($redirect);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -415,17 +415,17 @@ 
  * Require BOINC library
  */
 function require_boinc($libraries) {
-  if ($include_dir = boinc_get_path('html_inc')) {
+    if ($include_dir = boinc_get_path('html_inc')) {
     $working_dir = getcwd();
     chdir($include_dir);
     if (!is_array($libraries)) {
-      $libraries = array($libraries);
+        $libraries = array($libraries);
     }
     foreach ($libraries as $library) {
-      require_once("{$library}.inc");
+        require_once("{$library}.inc");
     }
     chdir($working_dir);
-  }
+    }
 }
 
 /**
@@ -433,7 +433,7 @@ 
  * 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()) {
+    if ($include_dir = boinc_get_path()) {
     $include_dir .= '/html';
     $workingDir = getcwd();
     $path = dirname($file);
@@ -441,84 +441,84 @@ 
     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", '')) {
+    $dir = "boinc_{$type}_dir";
+    if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+    }
+    else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
-      'admin/boinc/environment'
+        'admin/boinc/environment'
     );
     if (!in_array($_GET['q'], $page_blacklist)) {
-      watchdog('boincuser', 'The BOINC environment is not configured. Please
+        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')) {
+        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 {
+        }
+        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(
+        }
+        // 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)) {
+        );
+        if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
-      }
+        }
     }
     else {
-      // Clear the messages on the environment config page
-      drupal_get_messages();
+        // Clear the messages on the environment config page
+        drupal_get_messages();
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Get the configured scheduler tags
  */
 function boinc_get_scheduler_tags() {
-  // Don't generate messages for blacklisted pages
-  $page_blacklist = array(
+    // Don't generate messages for blacklisted pages
+    $page_blacklist = array(
     'admin/boinc/environment',
     'admin/boinc/scheduler'
-  );
-  if ($url_config = variable_get('boinc_scheduler_urls', '')) {
+    );
+    if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+    }
+    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>' .
+            array('!verify' => l(t('verify the default values') . ' <strong>' .
             t('and') . '</strong> ' . t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
-          ), WATCHDOG_WARNING);
+            ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC scheduling server settings are not yet
+        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))
+                t('and') . '</strong> ' . t('save the configuration'),
+                'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
-  }
-  return array();
+    }
+    return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -530,41 +530,41 @@ 
  * Determine if a BOINC ID matches the logged in user
  */
 function is_current_boinc_user($boinc_id) {
-  global $user;
-  if (!$user->uid) {
+    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);
+    }
+    // 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) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
     $is_drupal_id = TRUE;
-  }
-  if ($is_drupal_id) {
+    }
+    if ($is_drupal_id) {
     $account = user_load($user_id);
     $user_id = $account->boincuser_id;
-  }
-  require_boinc('boinc_db');
-  return BoincUser::lookup_id($user_id);
+    }
+    require_boinc('boinc_db');
+    return BoincUser::lookup_id($user_id);
 }
 
 /**
@@ -574,10 +574,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);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -588,8 +588,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!';
 }
 
 
@@ -598,14 +598,14 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Generate the friend block header
-  */
+ * 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)',
+    // 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>';
 }
 
@@ -614,13 +614,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 . ')';
-  }
-
-  drupal_json((object)$matches);
+    $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);
 }

Spacing +13 added lines, -13 removed lines

@@ -165,8 +165,8 @@ 
       WHERE n.type = 'profile'
       AND n.status = 1
       AND n.moderate = 0
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
       ORDER BY RAND()
       LIMIT 1"
     ));
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -303,7 +303,7 @@ 
     // 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);
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
   }
 
   // Determine if there are duplicate names, if so append a number to end.
@@ -379,7 +379,7 @@ 
     // 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)) {
+    if (preg_match('{'.$pi.'}', $path)) {
       return TRUE;
     }
   }
@@ -505,15 +505,15 @@ 
   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'),
+          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'),
+            array('!verify' => l(t('verify the default values').' <strong>'.
+              t('and').'</strong> '.t('save the configuration'),
               'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
@@ -575,7 +575,7 @@ 
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
   $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
+  $deleteurl = 'node/'.$node->nid.'/delete';
   $afterq = 'destination=account';
   drupal_goto($deleteurl, $afterq);
 }
@@ -605,8 +605,8 @@ 
   $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>';
+  return '<h2 class="pane-title">'.bts('Friends (@count)',
+    array('@count' => $friend_count)).'</h2>';
 }
 
 /**
@@ -619,7 +619,7 @@ 
   $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[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
   }
 
   drupal_json((object)$matches);

Braces +11 added lines, -22 removed lines

@@ -71,8 +71,7 @@ 
       unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+  } 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.
@@ -88,8 +87,7 @@ 
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
       }
-    }
-    else {
+    } 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)
@@ -175,12 +173,10 @@ 
       if ($never_been_picked) {
         // Allow users who have been previously selected
         $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
+      } elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+      } else {
         // Process failed...
         return FALSE;
       }
@@ -235,8 +231,7 @@ 
     $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 {
+  } 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 "
@@ -357,8 +352,7 @@ 
       rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
@@ -399,8 +393,7 @@ 
   // If boincid or token is not present, then go to the home page.
   if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+  } else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
   }
@@ -451,8 +444,7 @@ 
   $dir = "boinc_{$type}_dir";
   if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+  } else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
       'admin/boinc/environment'
@@ -465,8 +457,7 @@ 
         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 {
+      } else {
         drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
       }
@@ -481,8 +472,7 @@ 
       if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
       }
-    }
-    else {
+    } else {
       // Clear the messages on the environment config page
       drupal_get_messages();
     }
@@ -501,8 +491,7 @@ 
   );
   if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+  } 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>' .

Upper-Lower-Casing +25 added lines, -25 removed lines

@@ -27,7 +27,7 @@ 
 /**
  * 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) {
+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) {
@@ -49,7 +49,7 @@ 
 function boincuser_check_credit_requirements() {
   global $user;
   if (!$user->uid) {
-    return FALSE;
+    return false;
   }
   $account = user_load($user->uid);
   $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
@@ -61,7 +61,7 @@ 
     drupal_set_message(bts(
       'You are banned from community participation until @date',
       array('@date' => format_date($account->boincuser_penalty_expiration))
-    ), 'warning', FALSE);
+    ), 'warning', false);
     if (isset($account->roles[$community_role])) {
       // Remove from the community role, if not already
       unset($account->roles[$community_role]);
@@ -93,7 +93,7 @@ 
       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);
+      ), '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
@@ -108,7 +108,7 @@ 
 /**
  * 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) {
+function boincuser_get_first_unread_comment_id($nid, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
@@ -174,15 +174,15 @@ 
       // 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;
+        $never_been_picked = false;
       }
       elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
-        $active_users = FALSE;
+        $active_users = false;
       }
       else {
         // Process failed...
-        return FALSE;
+        return false;
       }
     }
   }
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email=null, $prev_email=null, $adminuser=false) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -327,7 +327,7 @@ 
  */
 function boincuser_check_termsofuse($user) {
   require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $boinc_user = boincuser_load($user->uid, true);
   return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
@@ -340,7 +340,7 @@ 
  */
 function boincuser_consentto_termsofuse($user) {
   require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $boinc_user = boincuser_load($user->uid, true);
 
   list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
   if ($checkct) {
@@ -350,7 +350,7 @@ 
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. The @project administrators have been notified.",
         array(
           '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+          '@project' => variable_get('site_name', 'Drupal-BOINC'), null, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
       'error');
@@ -361,11 +361,11 @@ 
   else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
-        array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
+        array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -380,10 +380,10 @@ 
     // 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 true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -464,11 +464,11 @@ 
       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);
+            'admin/boinc/environment'))), 'warning', false);
       }
       else {
         drupal_set_message(t('There is a problem with the site. Please contact
-          the system administrator.'), 'error', FALSE);
+          the system administrator.'), 'error', false);
       }
       // Redirect home to display the error message and avoid fatal errors
       // (unless on a blacklisted page)
@@ -487,7 +487,7 @@ 
       drupal_get_messages();
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -507,15 +507,15 @@ 
         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))
+            '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);
+              'admin/boinc/scheduler', array('html' => true))
+            )), 'warning', false);
     }
   }
   return array();
@@ -532,7 +532,7 @@ 
 function is_current_boinc_user($boinc_id) {
   global $user;
   if (!$user->uid) {
-    return FALSE;
+    return false;
   }
   // boincuser_id is not stored in the global user, so load a new instance
   $drupuser = user_load($user->uid);
@@ -553,11 +553,11 @@ 
 /**
  * Get a BOINC user object
  */
-function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
+function boincuser_load($user_id = null, $is_drupal_id = false) {
   if (!$user_id) {
     global $user;
     $user_id = $user->uid;
-    $is_drupal_id = TRUE;
+    $is_drupal_id = true;
   }
   if ($is_drupal_id) {
     $account = user_load($user_id);