BOINC / boinc

html/user/sample_index.php

Spacing +2 added lines, -2 removed lines

@@ -58,10 +58,10 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $master_url, $project_id;
     panel(
-        $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
+        $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT),
         function() use($user) {
             global $no_web_account_creation, $master_url, $project_id;
             if ($user) {

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $master_url, $project_id;
     panel(
         $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),

html/user/am_set_info.php

Spacing +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
 }
 
 if (!is_null($teamid)) {
-    if ($teamid==0) {
+    if ($teamid == 0) {
         user_quit_team($user);
     } else {
         $team = BoincTeam::lookup_id_nocache($teamid);
@@ -240,15 +240,15 @@ 
 // table. If one or more of these consent_xyz parameters are NOT
 // present, the RPC will still return 'success', even though the
 // consent table is not updated.
-if ( (isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source)) ) {
+if ((isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source))) {
     list($checkct, $ctid) = check_consent_type($consent_name);
     if ($checkct) {
 
         // Check to see if latest consent of this name is already
         // given.
-        $cr= BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
-        if ( (($cr) and ($cr->consent_flag!=$consent_flag)) or
-             (!$cr) ) {
+        $cr = BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
+        if ((($cr) and ($cr->consent_flag != $consent_flag)) or
+             (!$cr)) {
 
             $rc = consent_to_a_policy($user, $ctid, $consent_flag, $consent_not_required, $consent_source, time());
             if (!$rc) {

html/user/create_account.php

Braces +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             // set to 1.
             if ($consent_flag==0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

Indentation +2 added lines, -2 removed lines

@@ -96,11 +96,11 @@
         // Consistency checks
         if (!check_termsofuse()) {
             error_log("Project configuration error! " .
-                      "Terms of use undefined while 'account_creation_rpc_require_consent' enabled!");
+                        "Terms of use undefined while 'account_creation_rpc_require_consent' enabled!");
         }
         if (!$checkct) {
             error_log("Project configuration error! " .
-                      "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!");
+                        "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!");
         }
 
         // Check consent requirement

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
     xml_error(ERR_ACCT_CREATION_DISABLED);
 }
 
-if(defined('INVITE_CODES')) {
+if (defined('INVITE_CODES')) {
     $invite_code = get_str("invite_code");
     if (!preg_match(INVITE_CODES, $invite_code)) {
         xml_error(ERR_ATTACH_FAIL_INIT);
@@ -95,19 +95,19 @@ 
     if (parse_bool($config, "account_creation_rpc_require_consent")) {
         // Consistency checks
         if (!check_termsofuse()) {
-            error_log("Project configuration error! " .
+            error_log("Project configuration error! ".
                       "Terms of use undefined while 'account_creation_rpc_require_consent' enabled!");
         }
         if (!$checkct) {
-            error_log("Project configuration error! " .
+            error_log("Project configuration error! ".
                       "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!");
         }
 
         // Check consent requirement
         if (is_null($consent_flag) or !$source) {
-            xml_error(ERR_ACCT_REQUIRE_CONSENT, "This project requires to consent to its terms of use. " .
-                                                "Please update your BOINC software " .
-                                                "or register via the project's website " .
+            xml_error(ERR_ACCT_REQUIRE_CONSENT, "This project requires to consent to its terms of use. ".
+                                                "Please update your BOINC software ".
+                                                "or register via the project's website ".
                                                 "or contact your account manager's provider.");
         }
     }
@@ -141,13 +141,13 @@ 
         // * not agree.
         //   -> no create account RPC at all
         //
-        if ( (!is_null($consent_flag)) and $source) {
+        if ((!is_null($consent_flag)) and $source) {
             // Record the user giving consent in database - if consent_flag is 0,
             // this is an 'anonymous account' and consent_not_required is
             // set to 1.
-            if ($consent_flag==0) {
+            if ($consent_flag == 0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

html/ops/manage_consent_types.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 // Toggles the enable flag
 function mct_toggle_field($field) {
     $ctid = post_int("consent_type_id");
-    $toggle = post_str("toggle" . $field);
+    $toggle = post_str("toggle".$field);
     if ($toggle == "Click to Enable") {
         $state = 1;
         $action = "Enabled";

Braces +7 added lines, -14 removed lines

@@ -46,8 +46,7 @@ 
     if ($toggle == "Click to Enable") {
         $state = 1;
         $action = "Enabled";
-    }
-    else {
+    } else {
         $state = 0;
         $action = "Disabled";
     }
@@ -91,12 +90,10 @@ 
         if (!in_rops()) {
             if (!($ct->enabled)) {
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Enable\"></td>";
-            }
-            else {
+            } else {
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Disable\"></td>";
             }
-        }
-        else {
+        } else {
             echo "  <td>$ct->enabled</td>";
         }
 
@@ -107,12 +104,10 @@ 
         if (!in_rops()) {
             if (!($ct->privacypref)) {
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Enable\"></td>";
-            }
-            else {
+            } else {
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Disable\"></td>";
             }
-        }
-        else {
+        } else {
             echo "  <td>$ct->privacypref</td>";
         }
 
@@ -156,11 +151,9 @@ 
 
 if (post_str("add_consenttype", true)) {
     add_consenttype();
-}
-else if (post_str("toggleenabled", true)) {
+} else if (post_str("toggleenabled", true)) {
     mct_toggle_field("enabled");
-}
-else if (post_str("toggleprivacypref", true)) {
+} else if (post_str("toggleprivacypref", true)) {
     mct_toggle_field("privacypref");
 }
 

html/inc/host.inc

Spacing +22 added lines, -22 removed lines

@@ -32,12 +32,12 @@ 
 
 function sched_log_name($x) {
     if ($x == 0) return "NO_SUCH_LOG";
-    return gmdate('Y-m-d_H/Y-m-d_H:i', $x) . ".txt";
+    return gmdate('Y-m-d_H/Y-m-d_H:i', $x).".txt";
 }
 
 function sched_log_link($x) {
     if (file_exists("sched_logs")) {
-        return "<a href=\"../sched_logs/" . sched_log_name($x) . "\">" . time_str($x) . "</a>";
+        return "<a href=\"../sched_logs/".sched_log_name($x)."\">".time_str($x)."</a>";
     } else {
         return time_str($x);
     }
@@ -45,7 +45,7 @@ 
 
 function location_form($host) {
     $none = "selected";
-    $h=$w=$s=$m="";
+    $h = $w = $s = $m = "";
     if ($host->venue == "home") $h = "selected";
     if ($host->venue == "work") $w = "selected";
     if ($host->venue == "school") $s = "selected";
@@ -98,7 +98,7 @@ 
             row2(tra("Product name"), $host->product_name);
         }
         $x = $host->timezone/3600;
-        if ($x >= 0) $x="+$x";
+        if ($x >= 0) $x = "+$x";
         row2(tra("Local Standard Time"), tra("UTC %1 hours", $x));
     } else {
         $owner = BoincUser::lookup_id($host->userid);
@@ -258,15 +258,15 @@ 
 // "[vbox|5.0.0|1|1]", where now two additional flags give information about
 // hardware virtualization support. Older clients may have the old-style
 // serialnum in the DB despite the server being upgraded.
-function vbox_desc($x){
-    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/",$x,$matches)){
+function vbox_desc($x) {
+    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/", $x, $matches)) {
         $desc = "Virtualbox (".$matches[1].") ".tra("installed");
-        if (sizeof($matches)>2){
-            if ($matches[3]=="1" and $matches[4]=="1") {
+        if (sizeof($matches) > 2) {
+            if ($matches[3] == "1" and $matches[4] == "1") {
                 return $desc.tra(", CPU has hardware virtualization support and it is enabled");
-            } elseif ($matches[3]=="1" and $matches[4]=="0") {
+            } elseif ($matches[3] == "1" and $matches[4] == "0") {
                 return $desc.tra(", CPU has hardware virtualization support but it is disabled");
-            } elseif ($matches[3]=="0") {
+            } elseif ($matches[3] == "0") {
                 return $desc.tra(", CPU does not have hardware virtualization support");
             }
         } else {
@@ -280,7 +280,7 @@ 
 // Given string of the form [BOINC|vers][type|model|count|RAM|driver-vers][vbox|vers],
 // return a human-readable version of the GPU info
 //
-function gpu_desc($x, $detail=true) {
+function gpu_desc($x, $detail = true) {
     $descs = explode("]", $x);
     array_pop($descs);
     $str = "";
@@ -291,7 +291,7 @@ 
         if ($d[0] == "BOINC") continue;
         if ($d[0] == "vbox") continue;
         if ($str) $str .= "<p>";
-        if ($d[2]!="" && $d[2]!="1") $str .= "[".$d[2]."] ";
+        if ($d[2] != "" && $d[2] != "1") $str .= "[".$d[2]."] ";
         if ($d[0] == "CUDA") {
             $str .= "NVIDIA";
         } else if ($d[0] == "CAL") {
@@ -498,14 +498,14 @@ 
     if ($pos1 === false) return $x;
     $pos2 = strpos($model, ']');
     if ($pos2 === false) return $x;
-    $a = substr($model, $pos1+1, $pos2-$pos1-1);
+    $a = substr($model, $pos1 + 1, $pos2 - $pos1 - 1);
     $y = explode(" ", $a);
     if (count($y) == 0) return $x;
     if ($y[0] == "Family") {
         $x->info = $a;
     } else {
         $x->arch = $y[0];
-        $x->info = substr($a, strlen($y[0])+1);
+        $x->info = substr($a, strlen($y[0]) + 1);
     }
     return $x;
 }
@@ -594,7 +594,7 @@ 
     $avg_time = 0;
 
     $results = BoincResult::enum("hostid=$hostid order by received_time");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         if ($result->granted_credit <= 0) continue;
         $total += $result->granted_credit;
 
@@ -687,7 +687,7 @@ 
 
 function link_url($sort, $rev, $show_all) {
     global $userid;
-    $x = $userid ? "&userid=$userid":"";
+    $x = $userid ? "&userid=$userid" : "";
     return "hosts_user.php?sort=$sort&rev=$rev&show_all=$show_all$x";
 }
 
@@ -761,7 +761,7 @@ 
 }
 
 function show_user_hosts($userid, $private, $show_all, $sort, $rev) {
-    $desc = false;  // whether the sort order's default is decreasing
+    $desc = false; // whether the sort order's default is decreasing
     switch ($sort) {
     case "total_credit": $sort_clause = "total_credit"; $desc = true; break;
     case "expavg_credit": $sort_clause = "expavg_credit"; $desc = true; break;
@@ -784,7 +784,7 @@ 
     more_or_less($sort, $rev, $show_all);
 
     $now = time();
-    $old_hosts=0;
+    $old_hosts = 0;
     $i = 1;
     $hosts = BoincHost::enum("userid=$userid order by $sort_clause");
     $any_product_name = false;
@@ -796,9 +796,9 @@ 
     }
     user_host_table_start($private, $sort, $rev, $show_all, $any_product_name);
     foreach ($hosts as $host) {
-        $is_old=false;
+        $is_old = false;
         if (($now - $host->rpc_time) > 30*86400) {
-            $is_old=true;
+            $is_old = true;
             $old_hosts++;
         }
         if (!$show_all && $is_old) continue;
@@ -807,7 +807,7 @@ 
     }
     end_table();
 
-    if ($old_hosts>0) {
+    if ($old_hosts > 0) {
         more_or_less($sort, $rev, $show_all);
     }
 
@@ -827,6 +827,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Braces +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
             if ($host->last_ip_addr != $host->external_ip_addr) {
                 row2(tra("External IP address"), $host->external_ip_addr);
             }
-        } else { 
+        } else {
             row2(tra("IP address"), "<a href=show_host_detail.php?hostid=$host->id&ipprivate=1>".tra("Show IP address")."</a>");
         }
         row2(tra("Domain name"), $host->domain_name);
@@ -258,10 +258,10 @@ 
 // "[vbox|5.0.0|1|1]", where now two additional flags give information about
 // hardware virtualization support. Older clients may have the old-style
 // serialnum in the DB despite the server being upgraded.
-function vbox_desc($x){
-    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/",$x,$matches)){
+function vbox_desc($x) {
+    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/",$x,$matches)) {
         $desc = "Virtualbox (".$matches[1].") ".tra("installed");
-        if (sizeof($matches)>2){
+        if (sizeof($matches)>2) {
             if ($matches[3]=="1" and $matches[4]=="1") {
                 return $desc.tra(", CPU has hardware virtualization support and it is enabled");
             } elseif ($matches[3]=="1" and $matches[4]=="0") {

drupal/sites/all/features/discussion_forums/discussion_forums.features.user_permission.inc

Indentation +61 added lines, -61 removed lines

@@ -4,110 +4,110 @@
  * Implementation of hook_user_default_permissions().
  */
 function discussion_forums_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: access comments
-  $permissions['access comments'] = array(
+    // Exported permission: access comments
+    $permissions['access comments'] = array(
     'name' => 'access comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'anonymous user',
-      '2' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'anonymous user',
+        '2' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: administer comments
-  $permissions['administer comments'] = array(
+    // Exported permission: administer comments
+    $permissions['administer comments'] = array(
     'name' => 'administer comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: administer forums
-  $permissions['administer forums'] = array(
+    // Exported permission: administer forums
+    $permissions['administer forums'] = array(
     'name' => 'administer forums',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: assign community member role
-  $permissions['assign community member role'] = array(
+    // Exported permission: assign community member role
+    $permissions['assign community member role'] = array(
     'name' => 'assign community member role',
     'roles' => array(
-      '0' => 'moderator',
+        '0' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: create forum topics
-  $permissions['create forum topics'] = array(
+    // Exported permission: create forum topics
+    $permissions['create forum topics'] = array(
     'name' => 'create forum topics',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: delete any forum topic
-  $permissions['delete any forum topic'] = array(
+    // Exported permission: delete any forum topic
+    $permissions['delete any forum topic'] = array(
     'name' => 'delete any forum topic',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete own forum topics
-  $permissions['delete own forum topics'] = array(
+    // Exported permission: delete own forum topics
+    $permissions['delete own forum topics'] = array(
     'name' => 'delete own forum topics',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit any forum topic
-  $permissions['edit any forum topic'] = array(
+    // Exported permission: edit any forum topic
+    $permissions['edit any forum topic'] = array(
     'name' => 'edit any forum topic',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: edit own forum topics
-  $permissions['edit own forum topics'] = array(
+    // Exported permission: edit own forum topics
+    $permissions['edit own forum topics'] = array(
     'name' => 'edit own forum topics',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: post comments
-  $permissions['post comments'] = array(
+    // Exported permission: post comments
+    $permissions['post comments'] = array(
     'name' => 'post comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: post comments without approval
-  $permissions['post comments without approval'] = array(
+    // Exported permission: post comments without approval
+    $permissions['post comments without approval'] = array(
     'name' => 'post comments without approval',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

html/user/host_stats.php

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

@@ -155,7 +155,7 @@
         show_type($vers, $stats);
     }
     foreach ($data->darwin as $vers=>$state) {
-        show_type("Darwin $vers", $state);
+        show_type("darwin $vers", $state);
     }
     show_type("Linux total", $data->linux);
     foreach ($data->other as $vers=>$stats) {

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
 require_once("../inc/util.inc");
 require_once("../inc/cache.inc");
 
-$min_credit = .1;   // only count hosts with this much RAC
+$min_credit = .1; // only count hosts with this much RAC
 $total_rac = 0;
 
 define("CACHE_PERIOD", 7*86400);
 
 function show_type($type, $stats) {
     global $total_rac;
-    $pct = $total_rac?number_format(100*$stats->rac/$total_rac, 4):0;
+    $pct = $total_rac ?number_format(100*$stats->rac/$total_rac, 4) : 0;
     row_array(array($type, $stats->nhosts, "$pct %"));
 }
 

html/user/stats.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 start_table();
 echo "
     <tr><td>"
-    . tra("Leader boards for %1",PROJECT).":
+    . tra("Leader boards for %1", PROJECT).":
     <ul>
     <li><a href=\"top_users.php\">" . tra("Participants")."</a>
 ";
@@ -37,7 +37,7 @@ 
 
 if (!DISABLE_TEAMS) {
     echo "
-        <li><a href=\"top_teams.php\">" . tra("Teams"). "</a>
+        <li><a href=\"top_teams.php\">" . tra("Teams")."</a>
     ";
     if ($credit_by_app) {
         echo "<ul><li><a href=per_app_list.php?is_team=1>Per application</a></ul>\n";

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

Spacing +10 added lines, -10 removed lines

@@ -9,11 +9,11 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+  drupal_goto('/admin/boinc/user_delete/'.$form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+  drupal_goto('/user/'.$form['#uid'].'/edit');
 }
 
 /**
@@ -24,9 +24,9 @@ 
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
   }
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+  $given_hash = md5($current_pass.$boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+  if ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
   }
 
@@ -40,7 +40,7 @@ 
 /**
  * Delete the user function.
  */
-function _boincuser_delete_deleteuser($account, $action=NULL) {
+function _boincuser_delete_deleteuser($account, $action = NULL) {
   require_boinc('user_util');
   require_boinc('delete_account');
 
@@ -74,11 +74,11 @@ 
       //  * erase signature
       $myarray = array(
         'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
+        'name'      => 'deleted_'.time().'_'.random_string(),
+        'mail'      => 'deleted_'.time().'_'.random_string(),
+        'pass'      => 'deleted_'.time().'_'.random_string(),
         'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
+        'init'      => 'deleted_'.time().'_'.random_string(),
       );
       user_save($account, $myarray);
       break;
@@ -130,7 +130,7 @@ 
 
   if (!empty($mids)) {
     // Delete recipient entries in {pm_index} of the messages the user wrote.
-    db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
+    db_query('DELETE FROM {pm_index} WHERE mid IN ('.db_placeholders($mids).')', $mids);
   }
 
   // Delete recipient entries of that user.

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

@@ -21,13 +21,13 @@ 
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
   if (!$current_pass) {
-    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
+    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), null, 'boinc:delete-user-account'));
   }
 
   $given_hash = md5($current_pass . $boinc_user->email_addr);
 
   if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
-    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
+    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), null, 'boinc:delete-user-account'));
   }
 
   return true;
@@ -40,7 +40,7 @@ 
 /**
  * Delete the user function.
  */
-function _boincuser_delete_deleteuser($account, $action=NULL) {
+function _boincuser_delete_deleteuser($account, $action=null) {
   require_boinc('user_util');
   require_boinc('delete_account');
 

Indentation +56 added lines, -56 removed lines

@@ -9,28 +9,28 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+    drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+    drupal_goto('/user/' . $form['#uid'] . '/edit');
 }
 
 /**
  * Validation user password function.
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
-  if (!$current_pass) {
+    if (!$current_pass) {
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+    $given_hash = md5($current_pass . $boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+    if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  return true;
+    return true;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -41,56 +41,56 @@ 
  * Delete the user function.
  */
 function _boincuser_delete_deleteuser($account, $action=NULL) {
-  require_boinc('user_util');
-  require_boinc('delete_account');
+    require_boinc('user_util');
+    require_boinc('delete_account');
 
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  // watchdog message
-  watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
-  array(
+    // watchdog message
+    watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
+    array(
     '%uid' =>  $account->uid,
     '%boincuser_id' => $account->boincuser_id,
     '%displayname' => $account->boincuser_name,
-  ), WATCHDOG_NOTICE);
+    ), WATCHDOG_NOTICE);
 
-  // delete the account - This will delete the boinc user from the
-  // boinc project database, and then delete the Drupal user using the
-  // hook_user() functions.
+    // delete the account - This will delete the boinc user from the
+    // boinc project database, and then delete the Drupal user using the
+    // hook_user() functions.
 
-  switch ($action) {
+    switch ($action) {
     case 'soft_obfuscate':
       obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
+        _boincuser_delete_comment_reassign($account);
+        _boincuser_delete_node_reassign($account);
+        _boincuser_delete_privatemsg_delete($account);
+        _boincuser_delete_friends($account);
+        // delete the user's profile
+        $profile = content_profile_load('profile', $account->uid);
+        node_delete($profile->nid);
+        // Drupal account -
+        //  * 'block'/disable the account
+        //  * set name, mail, pass, and init to deleted
+        //  * erase signature
+        $myarray = array(
         'status'    => 0,
         'name'      => 'deleted_' . time() . '_' . random_string(),
         'mail'      => 'deleted_' . time() . '_' . random_string(),
         'pass'      => 'deleted_' . time() . '_' . random_string(),
         'signature' => '',
         'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
+        );
+        user_save($account, $myarray);
+        break;
     case 'hard_wipe':
       wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
+        user_delete(array(), $account->uid);
+        break;
     default:
       watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
         '%action' => $action,
-      ), WATCHDOG_ERROR);
-  }
+        ), WATCHDOG_ERROR);
+    }
 }
 
 /**
@@ -99,8 +99,8 @@ 
  * Copied from node.module, node_user()
  */
 function _boincuser_delete_node_reassign($account) {
-  db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
-  db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
 }
 
 /**
@@ -109,11 +109,11 @@ 
  * Copied from comment.module, comment_user()
  */
 function _boincuser_delete_comment_reassign($account) {
-  // bug in comment module, remove user name from comments.
-  db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
+    // bug in comment module, remove user name from comments.
+    db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
 
-  db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
-  db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
+    db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
 }
 
 /**
@@ -122,23 +122,23 @@ 
  * Copied from privatemsg module, case 'delete' in privatemsg_user().
  */
 function _boincuser_delete_privatemsg_delete($account) {
-  // Load all mids of the messages the user wrote.
-  $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
-  $mids = array();
-  while ($row = db_fetch_array($result)) {
+    // Load all mids of the messages the user wrote.
+    $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
+    $mids = array();
+    while ($row = db_fetch_array($result)) {
     $mids[] = $row['mid'];
-  }
+    }
 
-  // Delete messages the user wrote.
-  db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
+    // Delete messages the user wrote.
+    db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
 
-  if (!empty($mids)) {
+    if (!empty($mids)) {
     // Delete recipient entries in {pm_index} of the messages the user wrote.
     db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
-  }
+    }
 
-  // Delete recipient entries of that user.
-  db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
+    // Delete recipient entries of that user.
+    db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
 }
 
 /**
@@ -147,6 +147,6 @@ 
  * Copied from flag_friend, flag_friend_user()
  */
 function _boincuser_delete_friends($account) {
-  // remove any friend relationships if an account is removed
+    // remove any friend relationships if an account is removed
     db_query("DELETE FROM {flag_friend} WHERE uid = %d OR friend_uid = %d", $account->uid, $account->uid);
 }
\ No newline at end of file

Switch Indentation +60 added lines, -60 removed lines

@@ -9,28 +9,28 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+drupal_goto('/user/' . $form['#uid'] . '/edit');
 }
 
 /**
  * Validation user password function.
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
-  if (!$current_pass) {
-    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
-  }
+if (!$current_pass) {
+return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
+}
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+$given_hash = md5($current_pass . $boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
-    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
-  }
+if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
+}
 
-  return true;
+return true;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -41,56 +41,56 @@ 
  * Delete the user function.
  */
 function _boincuser_delete_deleteuser($account, $action=NULL) {
-  require_boinc('user_util');
-  require_boinc('delete_account');
-
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-
-  // watchdog message
-  watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
-  array(
-    '%uid' =>  $account->uid,
-    '%boincuser_id' => $account->boincuser_id,
-    '%displayname' => $account->boincuser_name,
-  ), WATCHDOG_NOTICE);
-
-  // delete the account - This will delete the boinc user from the
-  // boinc project database, and then delete the Drupal user using the
-  // hook_user() functions.
-
-  switch ($action) {
-    case 'soft_obfuscate':
-      obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
-        'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
-        'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
-    case 'hard_wipe':
-      wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
-    default:
-      watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
-        '%action' => $action,
-      ), WATCHDOG_ERROR);
-  }
+require_boinc('user_util');
+require_boinc('delete_account');
+
+$boinc_user = BoincUser::lookup_id($account->boincuser_id);
+
+// watchdog message
+watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
+array(
+'%uid' =>  $account->uid,
+'%boincuser_id' => $account->boincuser_id,
+'%displayname' => $account->boincuser_name,
+), WATCHDOG_NOTICE);
+
+// delete the account - This will delete the boinc user from the
+// boinc project database, and then delete the Drupal user using the
+// hook_user() functions.
+
+switch ($action) {
+case 'soft_obfuscate':
+obfuscate_account($boinc_user);
+_boincuser_delete_comment_reassign($account);
+_boincuser_delete_node_reassign($account);
+_boincuser_delete_privatemsg_delete($account);
+_boincuser_delete_friends($account);
+// delete the user's profile
+$profile = content_profile_load('profile', $account->uid);
+node_delete($profile->nid);
+// Drupal account -
+//  * 'block'/disable the account
+//  * set name, mail, pass, and init to deleted
+//  * erase signature
+$myarray = array(
+'status'    => 0,
+'name'      => 'deleted_' . time() . '_' . random_string(),
+'mail'      => 'deleted_' . time() . '_' . random_string(),
+'pass'      => 'deleted_' . time() . '_' . random_string(),
+'signature' => '',
+'init'      => 'deleted_' . time() . '_' . random_string(),
+);
+user_save($account, $myarray);
+break;
+case 'hard_wipe':
+wipe_account($boinc_user);
+user_delete(array(), $account->uid);
+break;
+default:
+watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
+'%action' => $action,
+), WATCHDOG_ERROR);
+}
 }
 
 /**