Passed
Pull Request — master (#4130)
by Christian
15:24 queued 03:30
created
html/inc/stats_sites.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 function site_list($sites) {
188 188
     echo "<ul>\n";
189
-    for ($i=0; $i<count($sites); $i++) {
189
+    for ($i = 0; $i < count($sites); $i++) {
190 190
         $s = $sites[$i];
191 191
         $url = $s[0];
192 192
         $name = $s[1];
193
-        $comment = array_key_exists(2, $s)?$s[2]:"";
193
+        $comment = array_key_exists(2, $s) ? $s[2] : "";
194 194
         echo "<li><a href=\"$url\">$name</a> $comment\n";
195 195
     }
196 196
     echo "</ul>\n";
@@ -199,5 +199,5 @@  discard block
 block discarded – undo
199 199
 $GLOBALS['cpid_stats_sites'] = $cpid_stats_sites;
200 200
 $GLOBALS['host_sites'] = $host_sites;
201 201
 
202
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
202
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
203 203
 ?>
Please login to merge, or discard this patch.
html/inc/bolt_sched.inc 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@
 block discarded – undo
29 29
 
30 30
 //
31 31
 class BoltIter {
32
-    public $top;        // topmost unit
32
+    public $top; // topmost unit
33 33
     public $state;
34
-    public $xset;       // exercise set, if any
34
+    public $xset; // exercise set, if any
35 35
 
36 36
     // the following are temps
37
-    public $item;       // current item
38
-    public $frac_done;  // fraction done
37
+    public $item; // current item
38
+    public $frac_done; // fraction done
39 39
 
40 40
     function __construct($top) {
41 41
         $this->top = $top;
Please login to merge, or discard this patch.
html/inc/prefs.inc 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -276,9 +276,9 @@  discard block
 block discarded – undo
276 276
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
277 277
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
278 278
     // set some defaults if not found
279
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
279
+    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0; // no limit
280 280
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
281
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
281
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1; // 1 GB
282 282
     // set mininimum free space scheduler allows 
283 283
     // - depends on which scheduler is running
284 284
     $dp->new_sched_flag = 1;
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
     global $text;
305 305
     global $venue_name;
306 306
 
307
-    switch($name) {
307
+    switch ($name) {
308 308
     case "venue":
309 309
         if (array_key_exists("name", $attrs)) {
310 310
             $venue_name = $attrs["name"];
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
             return;
351 351
         }
352 352
     }
353
-    switch($name) {
353
+    switch ($name) {
354 354
     case "venue":
355 355
         $top_parse_result->$venue_name = $parse_result;
356 356
         $parse_result = $top_parse_result;
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
     }
510 510
 }
511 511
 
512
-function print_prefs_display_global($user, $columns=false) {
512
+function print_prefs_display_global($user, $columns = false) {
513 513
     $global_prefs = prefs_parse_global($user->global_prefs);
514 514
 
515 515
     echo tra("These settings apply to all computers using this account except")
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
         .tra("Android devices")
520 520
         ."</ul>
521 521
     ";
522
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
522
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=".(int)!$columns.">".tra("(Switch view)")."</a></font>";
523 523
     if ($columns) {
524 524
         echo "<h3>".tra("Combined preferences").$switch_link."</h3>";
525 525
         start_table();
@@ -554,9 +554,9 @@  discard block
 block discarded – undo
554 554
 // otherwise false
555 555
 //
556 556
 function print_prefs_form(
557
-    $action, $subset, $venue, $user, $prefs, $cols, $error=false,
558
-    $project_error=false
559
-){
557
+    $action, $subset, $venue, $user, $prefs, $cols, $error = false,
558
+    $project_error = false
559
+) {
560 560
     if ($action == "add") {
561 561
         $script = "add_venue.php";
562 562
         $submit_value = tra("Add preferences");
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
 //
596 596
 // Functions to display preference subsets as forms
597 597
 //
598
-function prefs_form_global($user, $prefs, $error=false) {
598
+function prefs_form_global($user, $prefs, $error = false) {
599 599
     global $cpu_prefs;
600 600
     global $disk_prefs;
601 601
     global $mem_prefs;
@@ -635,9 +635,9 @@  discard block
 block discarded – undo
635 635
 //
636 636
 function prefs_form_radio_buttons($name, $yesno) {
637 637
     $rb = tra("yes")." <input type=radio name=$name value=yes "
638
-        .($yesno?"checked":"")
638
+        .($yesno ? "checked" : "")
639 639
         ."> ".tra("no")." <input type=radio name=$name value=no "
640
-        .($yesno?"":"checked")
640
+        .($yesno ? "" : "checked")
641 641
         .">\n";
642 642
     return $rb;
643 643
 }
@@ -656,12 +656,12 @@  discard block
 block discarded – undo
656 656
 }
657 657
 function venue_show($user) {
658 658
     $venue = $user->venue;
659
-    if ($venue =='') $venue = '---';
659
+    if ($venue == '') $venue = '---';
660 660
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
661 661
 }
662 662
 
663 663
 function venue_form($user) {
664
-    $n=$h=$w=$s=$m='';
664
+    $n = $h = $w = $s = $m = '';
665 665
     if ($user->venue == '') $n = 'selected';
666 666
     if ($user->venue == 'home') $h = 'selected';
667 667
     if ($user->venue == 'work') $w = 'selected';
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
 //
718 718
 // convert prefs from structure to XML
719 719
 //
720
-function global_prefs_make_xml($prefs, $primary=true) {
720
+function global_prefs_make_xml($prefs, $primary = true) {
721 721
     global $cpu_prefs;
722 722
     global $disk_prefs;
723 723
     global $mem_prefs;
Please login to merge, or discard this patch.
html/inc/forum_banishment_vote.inc 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 db_init();
27 27
 
28 28
 function current_tally($voteid) {
29
-    $query="select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
29
+    $query = "select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
30 30
     $result = _mysql_query($query);
31 31
     $foobar = _mysql_fetch_object($result);
32 32
     echo "<b>Current Tally</b>    Ayes: ".$foobar->ayes." Nays: ".$foobar->nays."<p>";
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 
36 36
 function vote_is_in_progress($userid) {
37 37
     // check whether a vote is already ongoing
38
-    $now=time();
39
-    $query="select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
38
+    $now = time();
39
+    $query = "select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
40 40
     $result = _mysql_query($query);
41 41
     if (!$result) {
42 42
         echo "Database error attempting to read banishment_vote table 1.<p>";
@@ -51,56 +51,56 @@  discard block
 block discarded – undo
51 51
     return $foobar->count;
52 52
 }
53 53
 
54
-function start_vote($config,$logged_in_user,$user,$category,$reason) {
55
-    $now=time();
56
-    $fin=$now+21600;
54
+function start_vote($config, $logged_in_user, $user, $category, $reason) {
55
+    $now = time();
56
+    $fin = $now + 21600;
57 57
 
58 58
 
59
-    if ( vote_is_in_progress($user->id) !=0 ) {
59
+    if (vote_is_in_progress($user->id) != 0) {
60 60
         echo "A banishment vote is already underway for this user.<p>";
61 61
         return 0;
62 62
     }
63
-    $query="insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
63
+    $query = "insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
64 64
     $result = _mysql_query($query);
65 65
     if (!$result) {
66 66
         echo "Database error attempting to insert to banishment_vote table.<p>";
67 67
         return 0;
68 68
     }
69 69
 
70
-    $voteid=_mysql_insert_id();
71
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (". $voteid .",". $logged_in_user->id .",". $now .",1)";
70
+    $voteid = _mysql_insert_id();
71
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
72 72
     $result = _mysql_query($query);
73 73
     if (!$result) {
74 74
         echo "Database error attempting to insert to banishment_votes table.<p>";
75 75
         return 0;
76 76
     }
77 77
 
78
-    $query="update forum_preferences set banished_until=".$fin." where userid=".$user->id;
78
+    $query = "update forum_preferences set banished_until=".$fin." where userid=".$user->id;
79 79
     $result = _mysql_query($query);
80 80
 
81 81
     echo "Banishment vote started.<p><p>";
82 82
     current_tally($voteid);
83
-    return send_banish_vote_email($user, 86400*14, $reason, $now+21600);
83
+    return send_banish_vote_email($user, 86400*14, $reason, $now + 21600);
84 84
 }    
85 85
 
86
-function vote_yes($config,$logged_in_user,$user) {
87
-    $now=time();
86
+function vote_yes($config, $logged_in_user, $user) {
87
+    $now = time();
88 88
     // Check that a vote is underway.
89
-    if (vote_is_in_progress($user->id)<1) {
89
+    if (vote_is_in_progress($user->id) < 1) {
90 90
         echo "No banishment vote is underway for this user.<p><p>";
91 91
         return 0;
92 92
     }
93 93
     // Find the voteid
94
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
94
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
95 95
     $result = _mysql_query($query);
96 96
     $foobar = _mysql_fetch_object($result);
97 97
     if (!$foobar) {
98 98
         echo "Database error attempting to read banishment_vote table.<p>";
99 99
         return 0;
100 100
     }
101
-    $voteid=$foobar->voteid;
101
+    $voteid = $foobar->voteid;
102 102
     // Check whether mod has voted already.
103
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
103
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
104 104
     $result = _mysql_query($query);
105 105
     $foobar = _mysql_fetch_object($result);
106 106
     if (!$foobar) {
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         return 0;
114 114
     }
115 115
     // insert the vote
116
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",1)";
116
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
117 117
     $result = _mysql_query($query);
118 118
     if (!$result) {
119 119
         echo "Database error attempting to insert to banishment_votes table.<p>";
@@ -124,24 +124,24 @@  discard block
 block discarded – undo
124 124
     return 1;
125 125
 }
126 126
 
127
-function vote_no($config,$logged_in_user,$user) {
127
+function vote_no($config, $logged_in_user, $user) {
128 128
     // Check that a vote is underway.
129
-    $now=time();
130
-    if (vote_is_in_progress($user->id)<1) {
129
+    $now = time();
130
+    if (vote_is_in_progress($user->id) < 1) {
131 131
         echo "No banishment vote is underway for this user.<p>";
132 132
         return 0;
133 133
     }
134 134
     // Find the voteid
135
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
135
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
136 136
     $result = _mysql_query($query);
137 137
     $foobar = _mysql_fetch_object($result);
138 138
     if (!$foobar) {
139 139
         echo "Database error attempting to read banishment_vote table.<p>";
140 140
         return 0;
141 141
     }
142
-    $voteid=$foobar->voteid;
142
+    $voteid = $foobar->voteid;
143 143
     // Check whether mod has voted already.
144
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid ." and modid=".$logged_in_user->id;
144
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
145 145
     $result = _mysql_query($query);
146 146
     $foobar = _mysql_fetch_object($result);
147 147
     if (!$foobar) {
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         return 0;
155 155
     }
156 156
     // insert the vote
157
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",0)";
157
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",0)";
158 158
     $result = _mysql_query($query);
159 159
     if (!$result) {
160 160
         echo "Database error attempting to insert to banishment_votes table.<p>";
Please login to merge, or discard this patch.
html/inc/bolt.inc 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     public $title;
31 31
         // Optional; used when showing course history outline.
32 32
     public $is_item;
33
-    public $attrs;        // course-defined
33
+    public $attrs; // course-defined
34 34
 
35 35
     abstract function walk(&$iter, $incr, &$frac_done);
36 36
         // multi-purpose function for traversing a course.
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             $this->query_string = null;
56 56
         } else {
57 57
             $this->filename = substr($filename, 0, $p);
58
-            $this->query_string = substr($filename, $p+1);
58
+            $this->query_string = substr($filename, $p + 1);
59 59
         }
60 60
         $this->name = $filename;
61 61
         $this->title = $title;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             // look up unit by name
163 163
             //
164 164
             $child = null;
165
-            for ($i=0; $i<$n; $i++) {
165
+            for ($i = 0; $i < $n; $i++) {
166 166
                 $c = $this->units[$i];
167 167
                 if ($c->name == $child_name) {
168 168
                     $child = $c;
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
                 if ($i >= $n) {
178 178
                     // and if index is too big, use last unit
179 179
                     //
180
-                    $i = $n-1;
180
+                    $i = $n - 1;
181 181
                 }
182 182
                 $child = $this->units[$i];
183 183
             }
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                         $this->finished($iter);
198 198
                         return true;
199 199
                     } else {
200
-                        $i = ($i+1)%$n;
200
+                        $i = ($i + 1)%$n;
201 201
                     }
202 202
                 }
203 203
             }
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
         if (array_key_exists($this->name, $state)) {
236 236
             $state_rec = $state[$this->name];
237 237
             $child_name = $state_rec['child_name'];
238
-            foreach($this->units as $c) {
238
+            foreach ($this->units as $c) {
239 239
                 if ($c->name == $child_name) {
240 240
                     return $c;
241 241
                 }
Please login to merge, or discard this patch.
html/inc/recaptchalib.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 function boinc_recaptcha_get_html($publickey) {
34 34
     if ($publickey) {
35
-        return '<div class="g-recaptcha" data-sitekey="' . $publickey . '"></div>';
35
+        return '<div class="g-recaptcha" data-sitekey="'.$publickey.'"></div>';
36 36
     } else {
37 37
         return '';
38 38
     }
Please login to merge, or discard this patch.
html/inc/forum_db.inc 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         $db = BoincDb::get();
28 28
         return $db->lookup('category', 'BoincCategory', $clause);
29 29
     }
30
-    static function enum($clause=null) {
30
+    static function enum($clause = null) {
31 31
         $db = BoincDb::get();
32 32
         return $db->enum('category', 'BoincCategory', $clause);
33 33
     }
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         $db = BoincDb::get();
79 79
         return $db->update($this, 'thread', $clause);
80 80
     }
81
-    static function enum($clause="") {
81
+    static function enum($clause = "") {
82 82
         $db = BoincDb::get();
83 83
         return $db->enum('thread', 'BoincThread', $clause);
84 84
     }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
         $db = BoincDb::get();
143 143
         $ret = $db->insert('forum_preferences', $clause);
144 144
     }
145
-    static function lookup(&$user, $nocache=false) {
145
+    static function lookup(&$user, $nocache = false) {
146 146
         if (!$user) return;
147 147
         if (isset($user->prefs)) return;
148 148
         if (!$nocache && isset(self::$cache[$user->id])) {
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         $user->prefs = $prefs;
165 165
     }
166 166
     function privilege($specialbit) {
167
-         return (substr($this->special_user, $specialbit,1)==1);
167
+         return (substr($this->special_user, $specialbit, 1) == 1);
168 168
     }
169 169
     function update($clause) {
170 170
         $db = BoincDb::get();
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
         $db = BoincDb::get();
176 176
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
177 177
     }
178
-    static function enum($clause=null) {
178
+    static function enum($clause = null) {
179 179
         $db = BoincDb::get();
180 180
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
181 181
     }
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
         //
216 216
         $fl = BoincForumLogging::lookup(0, 0);
217 217
         if ($fl) {
218
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
219
-                BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
218
+            if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) {
219
+                BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0");
220 220
                 BoincForumLogging::replace(0, 0, time());
221 221
             }
222 222
         } else {
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
322 322
     }
323 323
 }
324 324
 
325
-define ('NOTIFY_FRIEND_REQ', 1);
326
-define ('NOTIFY_FRIEND_ACCEPT', 2);
327
-define ('NOTIFY_PM', 3);
328
-define ('NOTIFY_SUBSCRIBED_POST', 4);
325
+define('NOTIFY_FRIEND_REQ', 1);
326
+define('NOTIFY_FRIEND_ACCEPT', 2);
327
+define('NOTIFY_PM', 3);
328
+define('NOTIFY_SUBSCRIBED_POST', 4);
329 329
 
330 330
 ?>
Please login to merge, or discard this patch.
html/inc/credit.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@
 block discarded – undo
24 24
 function update_average($now, $work_start_time, $work, &$avg, &$avg_time) {
25 25
     if ($avg_time) {
26 26
         $diff = $now - $avg_time;
27
-        if ($diff <0) $diff = 0;
27
+        if ($diff < 0) $diff = 0;
28 28
         $diff_days = $diff/86400;
29 29
         $weight = exp(-$diff*M_LN2/CREDIT_HALF_LIFE);
30 30
         $avg *= $weight;
31 31
 
32
-        if ((1.0-$weight)>0.000001) {
33
-            $avg += (1.0-$weight)*($work/$diff_days);
32
+        if ((1.0 - $weight) > 0.000001) {
33
+            $avg += (1.0 - $weight)*($work/$diff_days);
34 34
         }
35 35
         else {
36 36
             $avg += M_LN2*$work*86400/CREDIT_HALF_LIFE;
Please login to merge, or discard this patch.
html/inc/news.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -118,5 +118,5 @@
 block discarded – undo
118 118
     ";
119 119
 }
120 120
 
121
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
121
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
122 122
 ?>
Please login to merge, or discard this patch.