Passed
Push — master ( 3b3a7b...0ff5f1 )
by Vitalii
01:09 queued 19s
created
html/inc/account.inc 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -174,8 +174,7 @@
 block discarded – undo
174 174
             array("agree_to_terms_of_use", "", false),
175 175
         );
176 176
         form_checkboxes(tra("Do you agree to the terms of use above?"), $myitems, 'tabindex="0"');
177
-    }
178
-    else {
177
+    } else {
179 178
         // error - no terms of use for user to agree to!
180 179
     }
181 180
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
             tra("Must be at least %1 characters", $min_passwd_length),
101 101
             tra("Password")
102 102
         ),
103
-        "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
103
+        "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd")
104 104
     );
105 105
     if (USER_COUNTRY) {
106 106
         form_select(
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
     } else {
146 146
         $x = tra("Email address:");
147 147
     }
148
-    form_input_text($x, "email_addr", '', 'text', $attrs='autofocus tabindex="1"');
148
+    form_input_text($x, "email_addr", '', 'text', $attrs = 'autofocus tabindex="1"');
149 149
     form_input_text(
150
-        tra("Password:").'<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
150
+        tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
151 151
         "passwd",
152 152
         "",
153 153
         "password",
Please login to merge, or discard this patch.
html/user/sample_index.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,10 +58,10 @@
 block discarded – undo
58 58
     //panel(null, 'panel_contents');
59 59
 }
60 60
 
61
-function left(){
61
+function left() {
62 62
     global $user, $no_web_account_creation, $master_url, $project_id;
63 63
     panel(
64
-        $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
64
+        $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT),
65 65
         function() use($user) {
66 66
             global $no_web_account_creation, $master_url, $project_id;
67 67
             if ($user) {
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
     //panel(null, 'panel_contents');
59 59
 }
60 60
 
61
-function left(){
61
+function left() {
62 62
     global $user, $no_web_account_creation, $master_url, $project_id;
63 63
     panel(
64 64
         $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
Please login to merge, or discard this patch.
html/user/am_set_info.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 }
188 188
 
189 189
 if (!is_null($teamid)) {
190
-    if ($teamid==0) {
190
+    if ($teamid == 0) {
191 191
         user_quit_team($user);
192 192
     } else {
193 193
         $team = BoincTeam::lookup_id_nocache($teamid);
@@ -240,15 +240,15 @@  discard block
 block discarded – undo
240 240
 // table. If one or more of these consent_xyz parameters are NOT
241 241
 // present, the RPC will still return 'success', even though the
242 242
 // consent table is not updated.
243
-if ( (isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source)) ) {
243
+if ((isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source))) {
244 244
     list($checkct, $ctid) = check_consent_type($consent_name);
245 245
     if ($checkct) {
246 246
 
247 247
         // Check to see if latest consent of this name is already
248 248
         // given.
249
-        $cr= BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
250
-        if ( (($cr) and ($cr->consent_flag!=$consent_flag)) or
251
-             (!$cr) ) {
249
+        $cr = BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
250
+        if ((($cr) and ($cr->consent_flag != $consent_flag)) or
251
+             (!$cr)) {
252 252
 
253 253
             $rc = consent_to_a_policy($user, $ctid, $consent_flag, $consent_not_required, $consent_source, time());
254 254
             if (!$rc) {
Please login to merge, or discard this patch.
html/user/create_account.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
             // set to 1.
105 105
             if ($consent_flag==0) {
106 106
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
107
-            } else  {
107
+            } else {
108 108
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
109 109
             }
110 110
             if (!$rc) {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
         }
107 107
         if (!$checkct) {
108 108
             error_log("Project configuration error! " .
109
-              "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
109
+                "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
110 110
             );
111 111
         }
112 112
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -100,12 +100,12 @@  discard block
 block discarded – undo
100 100
         // Consistency checks
101 101
         //
102 102
         if (!check_termsofuse()) {
103
-            error_log("Project configuration error! " .
103
+            error_log("Project configuration error! ".
104 104
                 "Terms of use undefined while 'account_creation_rpc_require_consent' enabled!"
105 105
             );
106 106
         }
107 107
         if (!$checkct) {
108
-            error_log("Project configuration error! " .
108
+            error_log("Project configuration error! ".
109 109
               "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
110 110
             );
111 111
         }
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
         //
115 115
         if (is_null($consent_flag) or !$source) {
116 116
             xml_error(ERR_ACCT_REQUIRE_CONSENT,
117
-                "This project requires you to consent to its terms of use. " .
118
-                "Please update your BOINC software " .
119
-                "or register via the project's website " .
117
+                "This project requires you to consent to its terms of use. ".
118
+                "Please update your BOINC software ".
119
+                "or register via the project's website ".
120 120
                 "or contact your account manager's provider."
121 121
             );
122 122
         }
@@ -152,13 +152,13 @@  discard block
 block discarded – undo
152 152
         // * not agree.
153 153
         //   -> no create account RPC at all
154 154
         //
155
-        if ( (!is_null($consent_flag)) and $source) {
155
+        if ((!is_null($consent_flag)) and $source) {
156 156
             // Record the user giving consent in database - if consent_flag is 0,
157 157
             // this is an 'anonymous account' and consent_not_required is
158 158
             // set to 1.
159
-            if ($consent_flag==0) {
159
+            if ($consent_flag == 0) {
160 160
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
161
-            } else  {
161
+            } else {
162 162
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
163 163
             }
164 164
             if (!$rc) {
Please login to merge, or discard this patch.
html/ops/manage_consent_types.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 // Toggles the enable flag
54 54
 function mct_toggle_field($field) {
55 55
     $ctid = post_int("consent_type_id");
56
-    $toggle = post_str("toggle" . $field);
56
+    $toggle = post_str("toggle".$field);
57 57
     if ($toggle == "Click to Enable") {
58 58
         $state = 1;
59 59
         $action = "Enabled";
Please login to merge, or discard this patch.
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@  discard block
 block discarded – undo
46 46
     if ($toggle == "Click to Enable") {
47 47
         $state = 1;
48 48
         $action = "Enabled";
49
-    }
50
-    else {
49
+    } else {
51 50
         $state = 0;
52 51
         $action = "Disabled";
53 52
     }
@@ -91,12 +90,10 @@  discard block
 block discarded – undo
91 90
         if (!in_rops()) {
92 91
             if (!($ct->enabled)) {
93 92
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Enable\"></td>";
94
-            }
95
-            else {
93
+            } else {
96 94
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Disable\"></td>";
97 95
             }
98
-        }
99
-        else {
96
+        } else {
100 97
             echo "  <td>$ct->enabled</td>";
101 98
         }
102 99
 
@@ -107,12 +104,10 @@  discard block
 block discarded – undo
107 104
         if (!in_rops()) {
108 105
             if (!($ct->privacypref)) {
109 106
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Enable\"></td>";
110
-            }
111
-            else {
107
+            } else {
112 108
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Disable\"></td>";
113 109
             }
114
-        }
115
-        else {
110
+        } else {
116 111
             echo "  <td>$ct->privacypref</td>";
117 112
         }
118 113
 
@@ -156,11 +151,9 @@  discard block
 block discarded – undo
156 151
 
157 152
 if (post_str("add_consenttype", true)) {
158 153
     add_consenttype();
159
-}
160
-else if (post_str("toggleenabled", true)) {
154
+} else if (post_str("toggleenabled", true)) {
161 155
     mct_toggle_field("enabled");
162
-}
163
-else if (post_str("toggleprivacypref", true)) {
156
+} else if (post_str("toggleprivacypref", true)) {
164 157
     mct_toggle_field("privacypref");
165 158
 }
166 159
 
Please login to merge, or discard this patch.
features/discussion_forums/discussion_forums.features.user_permission.inc 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -4,110 +4,110 @@
 block discarded – undo
4 4
  * Implementation of hook_user_default_permissions().
5 5
  */
6 6
 function discussion_forums_user_default_permissions() {
7
-  $permissions = array();
7
+    $permissions = array();
8 8
 
9
-  // Exported permission: access comments
10
-  $permissions['access comments'] = array(
9
+    // Exported permission: access comments
10
+    $permissions['access comments'] = array(
11 11
     'name' => 'access comments',
12 12
     'roles' => array(
13
-      '0' => 'administrator',
14
-      '1' => 'anonymous user',
15
-      '2' => 'authenticated user',
13
+        '0' => 'administrator',
14
+        '1' => 'anonymous user',
15
+        '2' => 'authenticated user',
16 16
     ),
17
-  );
17
+    );
18 18
 
19
-  // Exported permission: administer comments
20
-  $permissions['administer comments'] = array(
19
+    // Exported permission: administer comments
20
+    $permissions['administer comments'] = array(
21 21
     'name' => 'administer comments',
22 22
     'roles' => array(
23
-      '0' => 'administrator',
24
-      '1' => 'moderator',
23
+        '0' => 'administrator',
24
+        '1' => 'moderator',
25 25
     ),
26
-  );
26
+    );
27 27
 
28
-  // Exported permission: administer forums
29
-  $permissions['administer forums'] = array(
28
+    // Exported permission: administer forums
29
+    $permissions['administer forums'] = array(
30 30
     'name' => 'administer forums',
31 31
     'roles' => array(
32
-      '0' => 'administrator',
32
+        '0' => 'administrator',
33 33
     ),
34
-  );
34
+    );
35 35
 
36
-  // Exported permission: assign community member role
37
-  $permissions['assign community member role'] = array(
36
+    // Exported permission: assign community member role
37
+    $permissions['assign community member role'] = array(
38 38
     'name' => 'assign community member role',
39 39
     'roles' => array(
40
-      '0' => 'moderator',
40
+        '0' => 'moderator',
41 41
     ),
42
-  );
42
+    );
43 43
 
44
-  // Exported permission: create forum topics
45
-  $permissions['create forum topics'] = array(
44
+    // Exported permission: create forum topics
45
+    $permissions['create forum topics'] = array(
46 46
     'name' => 'create forum topics',
47 47
     'roles' => array(
48
-      '0' => 'administrator',
49
-      '1' => 'community member',
50
-      '2' => 'moderator',
51
-      '3' => 'verified contributor',
48
+        '0' => 'administrator',
49
+        '1' => 'community member',
50
+        '2' => 'moderator',
51
+        '3' => 'verified contributor',
52 52
     ),
53
-  );
53
+    );
54 54
 
55
-  // Exported permission: delete any forum topic
56
-  $permissions['delete any forum topic'] = array(
55
+    // Exported permission: delete any forum topic
56
+    $permissions['delete any forum topic'] = array(
57 57
     'name' => 'delete any forum topic',
58 58
     'roles' => array(
59
-      '0' => 'administrator',
59
+        '0' => 'administrator',
60 60
     ),
61
-  );
61
+    );
62 62
 
63
-  // Exported permission: delete own forum topics
64
-  $permissions['delete own forum topics'] = array(
63
+    // Exported permission: delete own forum topics
64
+    $permissions['delete own forum topics'] = array(
65 65
     'name' => 'delete own forum topics',
66 66
     'roles' => array(
67
-      '0' => 'administrator',
67
+        '0' => 'administrator',
68 68
     ),
69
-  );
69
+    );
70 70
 
71
-  // Exported permission: edit any forum topic
72
-  $permissions['edit any forum topic'] = array(
71
+    // Exported permission: edit any forum topic
72
+    $permissions['edit any forum topic'] = array(
73 73
     'name' => 'edit any forum topic',
74 74
     'roles' => array(
75
-      '0' => 'administrator',
76
-      '1' => 'moderator',
75
+        '0' => 'administrator',
76
+        '1' => 'moderator',
77 77
     ),
78
-  );
78
+    );
79 79
 
80
-  // Exported permission: edit own forum topics
81
-  $permissions['edit own forum topics'] = array(
80
+    // Exported permission: edit own forum topics
81
+    $permissions['edit own forum topics'] = array(
82 82
     'name' => 'edit own forum topics',
83 83
     'roles' => array(
84
-      '0' => 'administrator',
85
-      '1' => 'community member',
86
-      '2' => 'verified contributor',
84
+        '0' => 'administrator',
85
+        '1' => 'community member',
86
+        '2' => 'verified contributor',
87 87
     ),
88
-  );
88
+    );
89 89
 
90
-  // Exported permission: post comments
91
-  $permissions['post comments'] = array(
90
+    // Exported permission: post comments
91
+    $permissions['post comments'] = array(
92 92
     'name' => 'post comments',
93 93
     'roles' => array(
94
-      '0' => 'administrator',
95
-      '1' => 'community member',
96
-      '2' => 'moderator',
97
-      '3' => 'verified contributor',
94
+        '0' => 'administrator',
95
+        '1' => 'community member',
96
+        '2' => 'moderator',
97
+        '3' => 'verified contributor',
98 98
     ),
99
-  );
99
+    );
100 100
 
101
-  // Exported permission: post comments without approval
102
-  $permissions['post comments without approval'] = array(
101
+    // Exported permission: post comments without approval
102
+    $permissions['post comments without approval'] = array(
103 103
     'name' => 'post comments without approval',
104 104
     'roles' => array(
105
-      '0' => 'administrator',
106
-      '1' => 'community member',
107
-      '2' => 'moderator',
108
-      '3' => 'verified contributor',
105
+        '0' => 'administrator',
106
+        '1' => 'community member',
107
+        '2' => 'moderator',
108
+        '3' => 'verified contributor',
109 109
     ),
110
-  );
110
+    );
111 111
 
112
-  return $permissions;
112
+    return $permissions;
113 113
 }
Please login to merge, or discard this patch.
html/user/host_stats.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
         show_type($vers, $stats);
156 156
     }
157 157
     foreach ($data->darwin as $vers=>$state) {
158
-        show_type("Darwin $vers", $state);
158
+        show_type("darwin $vers", $state);
159 159
     }
160 160
     show_type("Linux total", $data->linux);
161 161
     foreach ($data->other as $vers=>$stats) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@
 block discarded – undo
22 22
 require_once("../inc/util.inc");
23 23
 require_once("../inc/cache.inc");
24 24
 
25
-$min_credit = .1;   // only count hosts with this much RAC
25
+$min_credit = .1; // only count hosts with this much RAC
26 26
 $total_rac = 0;
27 27
 
28 28
 define("CACHE_PERIOD", 7*86400);
29 29
 
30 30
 function show_type($type, $stats) {
31 31
     global $total_rac;
32
-    $pct = $total_rac?number_format(100*$stats->rac/$total_rac, 4):0;
32
+    $pct = $total_rac ?number_format(100*$stats->rac/$total_rac, 4) : 0;
33 33
     row_array(array($type, $stats->nhosts, "$pct %"));
34 34
 }
35 35
 
Please login to merge, or discard this patch.
html/user/stats.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 start_table();
28 28
 echo "
29 29
     <tr><td>"
30
-    . tra("Leader boards for %1",PROJECT).":
30
+    . tra("Leader boards for %1", PROJECT).":
31 31
     <ul>
32 32
     <li><a href=\"top_users.php\">" . tra("Participants")."</a>
33 33
 ";
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 if (!DISABLE_TEAMS) {
39 39
     echo "
40
-        <li><a href=\"top_teams.php\">" . tra("Teams"). "</a>
40
+        <li><a href=\"top_teams.php\">" . tra("Teams")."</a>
41 41
     ";
42 42
     if ($credit_by_app) {
43 43
         echo "<ul><li><a href=per_app_list.php?is_team=1>Per application</a></ul>\n";
Please login to merge, or discard this patch.
modules/boincuser/boincuser_delete/includes/boincuser_delete.helpers.inc 4 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -9,11 +9,11 @@  discard block
 block discarded – undo
9 9
  * Helper functions
10 10
  */
11 11
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
12
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
12
+  drupal_goto('/admin/boinc/user_delete/'.$form['#uid']);
13 13
 }
14 14
 
15 15
 function _boincuser_delete_cancel($form, &$form_state) {
16
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
16
+  drupal_goto('/user/'.$form['#uid'].'/edit');
17 17
 }
18 18
 
19 19
 /**
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
25 25
   }
26 26
 
27
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
27
+  $given_hash = md5($current_pass.$boinc_user->email_addr);
28 28
 
29
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
29
+  if ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
30 30
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
31 31
   }
32 32
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 /**
41 41
  * Delete the user function.
42 42
  */
43
-function _boincuser_delete_deleteuser($account, $action=NULL) {
43
+function _boincuser_delete_deleteuser($account, $action = NULL) {
44 44
   require_boinc('user_util');
45 45
   require_boinc('delete_account');
46 46
 
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
       //  * erase signature
75 75
       $myarray = array(
76 76
         'status'    => 0,
77
-        'name'      => 'deleted_' . time() . '_' . random_string(),
78
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
79
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
77
+        'name'      => 'deleted_'.time().'_'.random_string(),
78
+        'mail'      => 'deleted_'.time().'_'.random_string(),
79
+        'pass'      => 'deleted_'.time().'_'.random_string(),
80 80
         'signature' => '',
81
-        'init'      => 'deleted_' . time() . '_' . random_string(),
81
+        'init'      => 'deleted_'.time().'_'.random_string(),
82 82
       );
83 83
       user_save($account, $myarray);
84 84
       break;
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
   if (!empty($mids)) {
132 132
     // Delete recipient entries in {pm_index} of the messages the user wrote.
133
-    db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
133
+    db_query('DELETE FROM {pm_index} WHERE mid IN ('.db_placeholders($mids).')', $mids);
134 134
   }
135 135
 
136 136
   // Delete recipient entries of that user.
Please login to merge, or discard this patch.
Upper-Lower-Casing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@  discard block
 block discarded – undo
21 21
  */
22 22
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
23 23
   if (!$current_pass) {
24
-    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
24
+    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), null, 'boinc:delete-user-account'));
25 25
   }
26 26
 
27 27
   $given_hash = md5($current_pass . $boinc_user->email_addr);
28 28
 
29 29
   if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
30
-    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
30
+    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), null, 'boinc:delete-user-account'));
31 31
   }
32 32
 
33 33
   return true;
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 /**
41 41
  * Delete the user function.
42 42
  */
43
-function _boincuser_delete_deleteuser($account, $action=NULL) {
43
+function _boincuser_delete_deleteuser($account, $action=null) {
44 44
   require_boinc('user_util');
45 45
   require_boinc('delete_account');
46 46
 
Please login to merge, or discard this patch.
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -9,28 +9,28 @@  discard block
 block discarded – undo
9 9
  * Helper functions
10 10
  */
11 11
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
12
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
12
+    drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
13 13
 }
14 14
 
15 15
 function _boincuser_delete_cancel($form, &$form_state) {
16
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
16
+    drupal_goto('/user/' . $form['#uid'] . '/edit');
17 17
 }
18 18
 
19 19
 /**
20 20
  * Validation user password function.
21 21
  */
22 22
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
23
-  if (!$current_pass) {
23
+    if (!$current_pass) {
24 24
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
25
-  }
25
+    }
26 26
 
27
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
27
+    $given_hash = md5($current_pass . $boinc_user->email_addr);
28 28
 
29
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
29
+    if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
30 30
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
31
-  }
31
+    }
32 32
 
33
-  return true;
33
+    return true;
34 34
 }
35 35
 
36 36
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -41,56 +41,56 @@  discard block
 block discarded – undo
41 41
  * Delete the user function.
42 42
  */
43 43
 function _boincuser_delete_deleteuser($account, $action=NULL) {
44
-  require_boinc('user_util');
45
-  require_boinc('delete_account');
44
+    require_boinc('user_util');
45
+    require_boinc('delete_account');
46 46
 
47
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
47
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
48 48
 
49
-  // watchdog message
50
-  watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
51
-  array(
49
+    // watchdog message
50
+    watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
51
+    array(
52 52
     '%uid' =>  $account->uid,
53 53
     '%boincuser_id' => $account->boincuser_id,
54 54
     '%displayname' => $account->boincuser_name,
55
-  ), WATCHDOG_NOTICE);
55
+    ), WATCHDOG_NOTICE);
56 56
 
57
-  // delete the account - This will delete the boinc user from the
58
-  // boinc project database, and then delete the Drupal user using the
59
-  // hook_user() functions.
57
+    // delete the account - This will delete the boinc user from the
58
+    // boinc project database, and then delete the Drupal user using the
59
+    // hook_user() functions.
60 60
 
61
-  switch ($action) {
61
+    switch ($action) {
62 62
     case 'soft_obfuscate':
63 63
       obfuscate_account($boinc_user);
64
-      _boincuser_delete_comment_reassign($account);
65
-      _boincuser_delete_node_reassign($account);
66
-      _boincuser_delete_privatemsg_delete($account);
67
-      _boincuser_delete_friends($account);
68
-      // delete the user's profile
69
-      $profile = content_profile_load('profile', $account->uid);
70
-      node_delete($profile->nid);
71
-      // Drupal account -
72
-      //  * 'block'/disable the account
73
-      //  * set name, mail, pass, and init to deleted
74
-      //  * erase signature
75
-      $myarray = array(
64
+        _boincuser_delete_comment_reassign($account);
65
+        _boincuser_delete_node_reassign($account);
66
+        _boincuser_delete_privatemsg_delete($account);
67
+        _boincuser_delete_friends($account);
68
+        // delete the user's profile
69
+        $profile = content_profile_load('profile', $account->uid);
70
+        node_delete($profile->nid);
71
+        // Drupal account -
72
+        //  * 'block'/disable the account
73
+        //  * set name, mail, pass, and init to deleted
74
+        //  * erase signature
75
+        $myarray = array(
76 76
         'status'    => 0,
77 77
         'name'      => 'deleted_' . time() . '_' . random_string(),
78 78
         'mail'      => 'deleted_' . time() . '_' . random_string(),
79 79
         'pass'      => 'deleted_' . time() . '_' . random_string(),
80 80
         'signature' => '',
81 81
         'init'      => 'deleted_' . time() . '_' . random_string(),
82
-      );
83
-      user_save($account, $myarray);
84
-      break;
82
+        );
83
+        user_save($account, $myarray);
84
+        break;
85 85
     case 'hard_wipe':
86 86
       wipe_account($boinc_user);
87
-      user_delete(array(), $account->uid);
88
-      break;
87
+        user_delete(array(), $account->uid);
88
+        break;
89 89
     default:
90 90
       watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
91 91
         '%action' => $action,
92
-      ), WATCHDOG_ERROR);
93
-  }
92
+        ), WATCHDOG_ERROR);
93
+    }
94 94
 }
95 95
 
96 96
 /**
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
  * Copied from node.module, node_user()
100 100
  */
101 101
 function _boincuser_delete_node_reassign($account) {
102
-  db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
103
-  db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
102
+    db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
103
+    db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
104 104
 }
105 105
 
106 106
 /**
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
  * Copied from comment.module, comment_user()
110 110
  */
111 111
 function _boincuser_delete_comment_reassign($account) {
112
-  // bug in comment module, remove user name from comments.
113
-  db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
112
+    // bug in comment module, remove user name from comments.
113
+    db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
114 114
 
115
-  db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
116
-  db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
115
+    db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
116
+    db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
117 117
 }
118 118
 
119 119
 /**
@@ -122,23 +122,23 @@  discard block
 block discarded – undo
122 122
  * Copied from privatemsg module, case 'delete' in privatemsg_user().
123 123
  */
124 124
 function _boincuser_delete_privatemsg_delete($account) {
125
-  // Load all mids of the messages the user wrote.
126
-  $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
127
-  $mids = array();
128
-  while ($row = db_fetch_array($result)) {
125
+    // Load all mids of the messages the user wrote.
126
+    $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
127
+    $mids = array();
128
+    while ($row = db_fetch_array($result)) {
129 129
     $mids[] = $row['mid'];
130
-  }
130
+    }
131 131
 
132
-  // Delete messages the user wrote.
133
-  db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
132
+    // Delete messages the user wrote.
133
+    db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
134 134
 
135
-  if (!empty($mids)) {
135
+    if (!empty($mids)) {
136 136
     // Delete recipient entries in {pm_index} of the messages the user wrote.
137 137
     db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
138
-  }
138
+    }
139 139
 
140
-  // Delete recipient entries of that user.
141
-  db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
140
+    // Delete recipient entries of that user.
141
+    db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
142 142
 }
143 143
 
144 144
 /**
@@ -147,6 +147,6 @@  discard block
 block discarded – undo
147 147
  * Copied from flag_friend, flag_friend_user()
148 148
  */
149 149
 function _boincuser_delete_friends($account) {
150
-  // remove any friend relationships if an account is removed
150
+    // remove any friend relationships if an account is removed
151 151
     db_query("DELETE FROM {flag_friend} WHERE uid = %d OR friend_uid = %d", $account->uid, $account->uid);
152 152
 }
153 153
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -59,37 +59,37 @@
 block discarded – undo
59 59
   // hook_user() functions.
60 60
 
61 61
   switch ($action) {
62
-    case 'soft_obfuscate':
63
-      obfuscate_account($boinc_user);
64
-      _boincuser_delete_comment_reassign($account);
65
-      _boincuser_delete_node_reassign($account);
66
-      _boincuser_delete_privatemsg_delete($account);
67
-      _boincuser_delete_friends($account);
68
-      // delete the user's profile
69
-      $profile = content_profile_load('profile', $account->uid);
70
-      node_delete($profile->nid);
71
-      // Drupal account -
72
-      //  * 'block'/disable the account
73
-      //  * set name, mail, pass, and init to deleted
74
-      //  * erase signature
75
-      $myarray = array(
76
-        'status'    => 0,
77
-        'name'      => 'deleted_' . time() . '_' . random_string(),
78
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
79
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
80
-        'signature' => '',
81
-        'init'      => 'deleted_' . time() . '_' . random_string(),
82
-      );
83
-      user_save($account, $myarray);
84
-      break;
85
-    case 'hard_wipe':
86
-      wipe_account($boinc_user);
87
-      user_delete(array(), $account->uid);
88
-      break;
89
-    default:
90
-      watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
91
-        '%action' => $action,
92
-      ), WATCHDOG_ERROR);
62
+  case 'soft_obfuscate':
63
+    obfuscate_account($boinc_user);
64
+    _boincuser_delete_comment_reassign($account);
65
+    _boincuser_delete_node_reassign($account);
66
+    _boincuser_delete_privatemsg_delete($account);
67
+    _boincuser_delete_friends($account);
68
+    // delete the user's profile
69
+    $profile = content_profile_load('profile', $account->uid);
70
+    node_delete($profile->nid);
71
+    // Drupal account -
72
+    //  * 'block'/disable the account
73
+    //  * set name, mail, pass, and init to deleted
74
+    //  * erase signature
75
+    $myarray = array(
76
+      'status'    => 0,
77
+      'name'      => 'deleted_' . time() . '_' . random_string(),
78
+      'mail'      => 'deleted_' . time() . '_' . random_string(),
79
+      'pass'      => 'deleted_' . time() . '_' . random_string(),
80
+      'signature' => '',
81
+      'init'      => 'deleted_' . time() . '_' . random_string(),
82
+    );
83
+    user_save($account, $myarray);
84
+    break;
85
+  case 'hard_wipe':
86
+    wipe_account($boinc_user);
87
+    user_delete(array(), $account->uid);
88
+    break;
89
+  default:
90
+    watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
91
+      '%action' => $action,
92
+    ), WATCHDOG_ERROR);
93 93
   }
94 94
 }
95 95
 
Please login to merge, or discard this patch.