Completed
Pull Request — master (#2477)
by Kevin
15:10 queued 08:17
created
html/ops/submit_init_priority.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
         echo "no app for batch $b->id\n";
34 34
         return;
35 35
     }
36
-    if ($b->fraction_done>0 && $b->credit_canonical>0) {
36
+    if ($b->fraction_done > 0 && $b->credit_canonical > 0) {
37 37
         $credit_total = $b->credit_canonical/$b->fraction_done;
38 38
         $fpops_total = $credit_total*(86400e9/200);
39 39
     } else {
Please login to merge, or discard this patch.
html/ops/credit.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
     start_table();
93 93
     table_header("Workunit", "Elapsed", "Proj FLOPS", "Raw credit", "granted");
94 94
     $n = 0;
95
-    $total=0;
96
-    foreach($rs as $r) {
95
+    $total = 0;
96
+    foreach ($rs as $r) {
97 97
         $raw_credit = $r->elapsed_time*$r->flops_estimate*COBB_SCALE;
98 98
         $n++;
99 99
         $total += $raw_credit;
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 }
117 117
 
118 118
 function av_string($av_id) {
119
-    if ($av_id> 0) {
119
+    if ($av_id > 0) {
120 120
         $av = BoincAppVersion::lookup($av_id);
121 121
         $plat = BoincPlatform::lookup_id($av->platformid);
122 122
         $x = "<a href=credit.php?av_id=$av_id>$plat->name $av->plan_class</a>";
Please login to merge, or discard this patch.
html/ops/bbcode_convert.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,15 +44,15 @@
 block discarded – undo
44 44
     $start_id = 0; //Set this to something else if you like
45 45
     $posts = _mysql_query("select * from post where id>$start_id order by id");
46 46
     echo _mysql_error();
47
-    $i=0;
48
-    while ($post = _mysql_fetch_object($posts)){
47
+    $i = 0;
48
+    while ($post = _mysql_fetch_object($posts)) {
49 49
         $i++; 
50 50
         if ($i%100 == 0) {                      //For every 100 posts
51
-            echo $post->id.". "; flush();   // print out where we are
51
+            echo $post->id.". "; flush(); // print out where we are
52 52
             //usleep(200000);
53 53
         }
54 54
         
55
-        if ($post->id > $start_id){
55
+        if ($post->id > $start_id) {
56 56
             fix_post($post);
57 57
         }
58 58
     }
Please login to merge, or discard this patch.
html/ops/manage_special_users.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 row1("Current special users", '9');
28 28
 
29 29
 echo "<tr><td>User</td>";
30
-for ($i=0; $i<S_NFLAGS; $i++) {
31
-    echo "<td width=\"15\">" . $special_user_bitfield[$i] . "</td>\n";
30
+for ($i = 0; $i < S_NFLAGS; $i++) {
31
+    echo "<td width=\"15\">".$special_user_bitfield[$i]."</td>\n";
32 32
 }
33 33
 echo "</tr>";
34 34
 
@@ -37,13 +37,13 @@  discard block
 block discarded – undo
37 37
     FROM forum_preferences as prefs, user 
38 38
     WHERE CONVERT(special_user, DECIMAL) > 0 and prefs.userid=user.id"
39 39
 );
40
-for ($i=1; $i<=_mysql_num_rows($result); $i++){
40
+for ($i = 1; $i <= _mysql_num_rows($result); $i++) {
41 41
 	$foo = _mysql_fetch_object($result);
42 42
     echo "<form action=\"manage_special_users_action.php\" method=\"POST\">\n";
43 43
     echo "<input type=\"hidden\" name=\"userid\" value=\"$foo->userid\"
44 44
         <tr><td>$foo->name ($foo->id)</td>
45 45
     ";
46
-    for ($j=0; $j<S_NFLAGS; $j++) {
46
+    for ($j = 0; $j < S_NFLAGS; $j++) {
47 47
         $bit = substr($foo->special_user, $j, 1);
48 48
         echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
49 49
         if ($bit == 1) {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 echo "<tr><form action=\"manage_special_users_action.php\" method=\"POST\">\n";
59 59
 echo "<td>Add UserID:<input type=\"text\" name=\"userid\" size=\"6\"></td>";
60 60
 
61
-for ($j=0; $j<S_NFLAGS; $j++) {
61
+for ($j = 0; $j < S_NFLAGS; $j++) {
62 62
     echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
63 63
     echo "></td>\n";
64 64
 }
@@ -69,5 +69,5 @@  discard block
 block discarded – undo
69 69
 
70 70
 admin_page_tail();
71 71
 
72
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
72
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
73 73
 ?>
Please login to merge, or discard this patch.
html/ops/profile_screen_form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,5 +96,5 @@
 block discarded – undo
96 96
 ";
97 97
 
98 98
 admin_page_tail();
99
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
99
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
100 100
 ?>
Please login to merge, or discard this patch.
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 1 patch
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.
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.