Completed
Push — master ( 51fd7c...f6831d )
by Kevin
17:07 queued 07:24
created
html/ops/user_graph.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,13 +26,13 @@  discard block
 block discarded – undo
26 26
 
27 27
 
28 28
     // Create the graph. These two calls are always required
29
-    $graph = new Graph(350,250,"auto");    
29
+    $graph = new Graph(350, 250, "auto");    
30 30
     //$graph->SetScale("lin");
31 31
     //$graph->SetScale("textlin");
32 32
     $graph->SetScale("loglin");
33 33
 
34 34
     // Create the linear plot
35
-    $lineplot=new BarPlot($arr, $xarr);
35
+    $lineplot = new BarPlot($arr, $xarr);
36 36
     $lineplot->SetColor("blue");
37 37
 
38 38
     // Add the plot to the graph
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 function show_text($xarr, $yarr) {
46 46
     $n = sizeof($xarr);
47
-    for ($i=0; $i<$n; $i++) {
47
+    for ($i = 0; $i < $n; $i++) {
48 48
         echo "<br>$xarr[$i] $yarr[$i]\n";
49 49
     }
50 50
 }
@@ -90,9 +90,9 @@  discard block
 block discarded – undo
90 90
         if ($ind > $maxind) $maxind = $ind;
91 91
     }
92 92
     $xarr = array();
93
-    for ($i=0; $i<=$maxind; $i++) {
93
+    for ($i = 0; $i <= $maxind; $i++) {
94 94
         $xarr[$i] = $i;
95
-        if (is_null($yarr[$i])) $yarr[$i]=0;
95
+        if (is_null($yarr[$i])) $yarr[$i] = 0;
96 96
     }
97 97
     if ($show_text) {
98 98
         show_text($xarr, $yarr);
Please login to merge, or discard this patch.
html/ops/grant_credit.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 }
50 50
 
51 51
 function grant_credits_for_wu($wuid) {
52
-    $max_credit=300;
52
+    $max_credit = 300;
53 53
     $ndone = 0;
54 54
     $query_r = _mysql_query("select * from result where granted_credit=0 and claimed_credit>0 and workunitid=$wuid");
55 55
  
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
         $user    = _mysql_fetch_object($query_u);
67 67
 
68 68
         $credit = $result->claimed_credit;
69
-        if ($credit>$max_credit) {
70
-            $credit=$max_credit;
69
+        if ($credit > $max_credit) {
70
+            $credit = $max_credit;
71 71
             echo " WARNING: USER $user->name ($userid) CLAIMED $result->claimed_credit CREDITS (getting $credit)!";
72 72
         }
73 73
         $user->total_credit += $credit;
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 }
107 107
 
108 108
 function grant_credits_for_cancelled() {
109
-    $ngranted=0;
110
-    $query_w  = _mysql_query("select * from workunit where error_mask!=0");
109
+    $ngranted = 0;
110
+    $query_w = _mysql_query("select * from workunit where error_mask!=0");
111 111
     while (($workunit = _mysql_fetch_object($query_w))) {
112 112
         // echo "Starting WU $workunit->id\n";
113 113
         $ngranted += grant_credits_for_wu($workunit->id);
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@
 block discarded – undo
41 41
 function testquery($argstring) {
42 42
     if (0) {
43 43
         echo "WOULD DO: $argstring\n";
44
-    }
45
-    else {
44
+    } else {
46 45
         _mysql_query($argstring);
47 46
     }
48 47
     return;
Please login to merge, or discard this patch.
html/ops/cancel_wu_action.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 $wuid2 = get_int('wuid2');
31 31
 $unsent_only = get_str('unsent_only', true);
32 32
 
33
-if ($wuid1<1 || $wuid2<$wuid1) {
33
+if ($wuid1 < 1 || $wuid2 < $wuid1) {
34 34
     admin_error_page(
35 35
         "<h2>Workunit IDs fail to satisfy the conditions:<p> 0 < ID1 <= ID2"
36 36
     );
@@ -46,5 +46,5 @@  discard block
 block discarded – undo
46 46
 echo " canceled jobs with $wuid1 <= workunit ID <= $wuid2</h2>";
47 47
 admin_page_tail();
48 48
 
49
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
49
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
50 50
 ?>
Please login to merge, or discard this patch.
html/ops/news_convert.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
     $content = str_replace("\n", " ", $content);
93 93
     $content = _mysql_escape_string($content);
94 94
 
95
-    $thread_id  = BoincThread::insert("(forum, owner, title, create_time, timestamp, replies) values ($forum_id, $user->id, '$title', $when, $when, 0)");
95
+    $thread_id = BoincThread::insert("(forum, owner, title, create_time, timestamp, replies) values ($forum_id, $user->id, '$title', $when, $when, 0)");
96 96
     if (!$thread_id) {
97 97
         echo "thread insert failed\n";
98 98
         echo "title: [$title]\n";
Please login to merge, or discard this patch.
html/ops/remind.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 $globals->userid = 0;
83 83
 $globals->count = -1;
84 84
 
85
-for ($i=1; $i<$argc; $i++) {
85
+for ($i = 1; $i < $argc; $i++) {
86 86
     if ($argv[$i] == "--failed") {
87 87
         $globals->do_failed = true;
88 88
     } elseif ($argv[$i] == "--lapsed") {
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
         number_format($user->total_credit, 0),
190 190
         opt_out_url($user),
191 191
         $user->id,
192
-        floor ((time() - last_rpc_time($user)) / 86400),
192
+        floor((time() - last_rpc_time($user))/86400),
193 193
     );
194 194
     return preg_replace($pat, $rep, $template);
195 195
 }
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
     $result = _mysql_query($query);
241 241
     $t = 0;
242 242
     while ($r = _mysql_fetch_object($result)) {
243
-        if ($r->email_type !=2 && $r->email_type != 3) continue;
243
+        if ($r->email_type != 2 && $r->email_type != 3) continue;
244 244
         if ($r->time_sent > $t) $t = $r->time_sent;
245 245
 
246 246
     }
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
     if ($globals->explain) {
269 269
         $x = (time() - $user->create_time)/86400;
270 270
         $t = last_rpc_time($user);
271
-        $show_lapsed_interval = (time()-$t)/86400;
271
+        $show_lapsed_interval = (time() - $t)/86400;
272 272
         echo "user $user->id ($user->email_addr) was created $x days ago\n";
273 273
         echo "  total_credit: $user->total_credit; last RPC $show_lapsed_interval days ago\n";
274 274
         echo "  sending $do_type email\n";
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@
 block discarded – undo
229 229
         _mysql_query($query);
230 230
     }
231 231
     $globals->count--;
232
-    if ($globals->count == 0) { 
232
+    if ($globals->count == 0) {
233 233
         echo "reached limit set by --count - exiting...\n";
234 234
         exit();
235 235
     }
Please login to merge, or discard this patch.
html/ops/cancel_workunits.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 admin_page_head("Cancel Jobs");
30 30
 
31 31
 $limit = get_int('limit', true);
32
-if (!$limit || $limit==0) {
32
+if (!$limit || $limit == 0) {
33 33
     $limit = 100;
34 34
 }
35 35
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 $clause = get_str('clause', true);
43 43
 
44 44
 if ($minid && $maxid) {
45
-    $qclause = "id >=" . $minid . " AND id <=" . $maxid;
45
+    $qclause = "id >=".$minid." AND id <=".$maxid;
46 46
 } else if ($list) {
47
-    $qclause = "id IN (" . $list . ")";
47
+    $qclause = "id IN (".$list.")";
48 48
 } else if ($uclause) {
49 49
     $qclause = urldecode($uclause);
50 50
 } else if ($clause) {
@@ -161,5 +161,5 @@  discard block
 block discarded – undo
161 161
 
162 162
 admin_page_tail();
163 163
 
164
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
164
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
165 165
 ?>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,8 @@
 block discarded – undo
100 100
     echo "</p>\n";
101 101
     echo "</form>\n";
102 102
 
103
-} else { // if ($qclause)
103
+} else {
104
+// if ($qclause)
104 105
 
105 106
     $query = "SELECT id, name FROM workunit WHERE canonical_resultid = 0 AND error_mask = 0 AND $qclause;";
106 107
     $db = BoincDb::get(true);
Please login to merge, or discard this patch.
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 2 patches
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.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -556,7 +556,7 @@
 block discarded – undo
556 556
 function print_prefs_form(
557 557
     $action, $subset, $venue, $user, $prefs, $cols, $error=false,
558 558
     $project_error=false
559
-){
559
+) {
560 560
     if ($action == "add") {
561 561
         $script = "add_venue.php";
562 562
         $submit_value = tra("Add preferences");
Please login to merge, or discard this patch.