Passed
Pull Request — master (#5698)
by David
08:58
created
html/user/donations.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
         $acquired = $acquired - $required;
74 74
         $progress = 100;
75 75
     } else {
76
-        $progress = round($acquired / ($required) * 100);
77
-        $progress2 = round($acquired / ($required) * 100,1);
76
+        $progress = round($acquired/($required)*100);
77
+        $progress2 = round($acquired/($required)*100, 1);
78 78
     }
79 79
     
80 80
     $col2 = "<input style=\"float: left\" type=\"radio\" name=\"item_id\" value=\"".$row->id."\"";
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     } elseif ($progress == 100) {
90 90
         $col2 .= "<div style=\"float: left; width: 300px; height: 18px; background-color: green; border: 1px solid #000000\">";
91 91
     } else {
92
-        $col2 .= "<div style=\"float: left; width: ".($progress*3 - 1)."px; height: 18px; background-color: green; border: 1px solid #000000;\" align=\"right\"><b>".$progress2."</b>%</div><div style=\"float: left; width: ".((100-$progress)*3 - 1)."px; height: 18px; background-color: red; border: 1px solid #000000;\">";
92
+        $col2 .= "<div style=\"float: left; width: ".($progress*3 - 1)."px; height: 18px; background-color: green; border: 1px solid #000000;\" align=\"right\"><b>".$progress2."</b>%</div><div style=\"float: left; width: ".((100 - $progress)*3 - 1)."px; height: 18px; background-color: red; border: 1px solid #000000;\">";
93 93
     }
94 94
     
95 95
     row2($col1, $col2);
Please login to merge, or discard this patch.
Braces   +15 added lines, -30 removed lines patch added patch discarded remove patch
@@ -98,50 +98,35 @@
 block discarded – undo
98 98
 $amount = "<select class=\"form-control\" name=\"from\" onchange=\"Cvalue();numberFormat();\" style=\"width: 200px;\">\n";
99 99
 if (DONATION_CURRENCY == "EUR") {
100 100
     $amount .= "<option value=\"51\">Euros</option>\n";
101
-}
102
-elseif (DONATION_CURRENCY == "CAD") {
101
+} elseif (DONATION_CURRENCY == "CAD") {
103 102
     $amount .= "<option value=\"30\">Canadian Dollars</option>\n";
104
-}
105
-elseif (DONATION_CURRENCY == "GBP") {
103
+} elseif (DONATION_CURRENCY == "GBP") {
106 104
     $amount .= "<option value=\"24\">Pounds Sterling</option>\n";
107
-}
108
-elseif (DONATION_CURRENCY == "USD") {
105
+} elseif (DONATION_CURRENCY == "USD") {
109 106
     $amount .= "<option value=\"3\">U.S. Dollars</option>\n";
110
-}
111
-elseif (DONATION_CURRENCY == "JPY") {
107
+} elseif (DONATION_CURRENCY == "JPY") {
112 108
     $amount .= "<option value=\"72\">Yen</option>\n";
113
-}
114
-elseif (DONATION_CURRENCY == "AUD") {
109
+} elseif (DONATION_CURRENCY == "AUD") {
115 110
     $amount .= "<option value=\"9\">Australian Dollars</option>\n";
116
-}
117
-elseif (DONATION_CURRENCY == "NZD") {
111
+} elseif (DONATION_CURRENCY == "NZD") {
118 112
     $amount .= "<option value=\"102\">New Zealand Dollars</option>\n";
119
-}
120
-elseif (DONATION_CURRENCY == "CHF") {
113
+} elseif (DONATION_CURRENCY == "CHF") {
121 114
     $amount .= "<option value=\"139\">Swiss Francs</option>\n";
122
-}
123
-elseif (DONATION_CURRENCY == "HKD") {
115
+} elseif (DONATION_CURRENCY == "HKD") {
124 116
     $amount .= "<option value=\"63\">Hong Kong Dollars</option>\n";
125
-}
126
-elseif (DONATION_CURRENCY == "SGD") {
117
+} elseif (DONATION_CURRENCY == "SGD") {
127 118
     $amount .= "<option value=\"126\">Singapore Dollars</option>\n";
128
-}
129
-elseif (DONATION_CURRENCY == "SEK") {
119
+} elseif (DONATION_CURRENCY == "SEK") {
130 120
     $amount .= "<option value=\"138\">Swedish Kronor</option>\n";
131
-}
132
-elseif (DONATION_CURRENCY == "DKK") {
121
+} elseif (DONATION_CURRENCY == "DKK") {
133 122
     $amount .= "<option value=\"42\">Danish Kroner</option>\n";
134
-}
135
-elseif (DONATION_CURRENCY == "PLN") {
123
+} elseif (DONATION_CURRENCY == "PLN") {
136 124
     $amount .= "<option value=\"114\">Polish Zloty</option>\n";
137
-}
138
-elseif (DONATION_CURRENCY == "NOK") {
125
+} elseif (DONATION_CURRENCY == "NOK") {
139 126
     $amount .= "<option value=\"106\">Norwegian Kroner</option>\n";
140
-}
141
-elseif (DONATION_CURRENCY == "HUF") {
127
+} elseif (DONATION_CURRENCY == "HUF") {
142 128
     $amount .= "<option value=\"64\">Hungarian Forint</option>\n";
143
-}
144
-elseif (DONATION_CURRENCY == "CZK") {
129
+} elseif (DONATION_CURRENCY == "CZK") {
145 130
     $amount .= "<option value=\"41\">Czech Koruna</option>\n";
146 131
 }
147 132
 $amount .= "</select>\n";
Please login to merge, or discard this patch.
html/user/team_change_founder_form.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     if ($user->id != $team->userid) {       //don't show current founder
96 96
         $user_total_credit = format_credit($user->total_credit);
97 97
         $user_expavg_credit = format_credit($user->expavg_credit);
98
-        $selected = ($user->id == $team->ping_user)?"selected":"";
98
+        $selected = ($user->id == $team->ping_user) ? "selected" : "";
99 99
         echo '
100 100
             <tr>
101 101
             <td><input type="radio" name="userid" value="'.$user->id.'">
@@ -121,5 +121,5 @@  discard block
 block discarded – undo
121 121
 echo "</form>";
122 122
 page_tail();
123 123
 
124
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
124
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
125 125
 ?>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,8 @@
 block discarded – undo
92 92
 
93 93
 $navailable_users = 0;
94 94
 foreach ($users as $user) {
95
-    if ($user->id != $team->userid) {       //don't show current founder
95
+    if ($user->id != $team->userid) {
96
+//don't show current founder
96 97
         $user_total_credit = format_credit($user->total_credit);
97 98
         $user_expavg_credit = format_credit($user->expavg_credit);
98 99
         $selected = ($user->id == $team->ping_user)?"selected":"";
Please login to merge, or discard this patch.
html/user/submit_example.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 // hardwired app name for now
46 46
 define('APP_NAME', 'remote_test');
47 47
 
48
-$project = $master_url;         // from project.inc
48
+$project = $master_url; // from project.inc
49 49
 $user = get_logged_in_user();
50 50
 $auth = $user->authenticator;
51 51
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
159 159
     if (!$user_submit) return null;
160 160
     $a = array();
161
-    foreach($apps as $app) {
161
+    foreach ($apps as $app) {
162 162
         if ($user_submit->submit_all) {
163 163
             $a[] = $app;
164 164
         } else {
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
     $input_url = get_str('input_url');
236 236
     if (!$input_url) error_page("missing input URL");
237 237
     $param_lo = (double)get_str('param_lo');
238
-    if ($param_lo<0 || $param_lo>60) error_page("param lo must be in 0..60");
238
+    if ($param_lo < 0 || $param_lo > 60) error_page("param lo must be in 0..60");
239 239
     $param_hi = (double)get_str('param_hi');
240
-    if ($param_hi<0 || $param_hi>60 || $param_hi <= $param_lo) {
240
+    if ($param_hi < 0 || $param_hi > 60 || $param_hi <= $param_lo) {
241 241
         error_page("param hi must be in 0..60 and > param lo");
242 242
     }
243 243
     $param_inc = (double)get_str('param_inc');
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
     $f->source = $input_url;
255 255
     $f->mode = 'semilocal';
256 256
 
257
-    for ($x=$param_lo; $x<$param_hi; $x += $param_inc) {
257
+    for ($x = $param_lo; $x < $param_hi; $x += $param_inc) {
258 258
         $job = new StdClass;
259 259
         $job->rsc_fpops_est = $x*1e9;
260 260
         $job->command_line = "--t $x";
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
         "status",
344 344
         "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>"
345 345
     );
346
-    foreach($batch->jobs as $job) {
346
+    foreach ($batch->jobs as $job) {
347 347
         $id = (int)$job->id;
348 348
         $resultid = (int)$job->canonical_instance_id;
349 349
         if ($resultid) {
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
         "Instance ID<br><p class=\"text-muted\">click for result page on BOINC server</p>",
387 387
         "State", "Output files"
388 388
     );
389
-    foreach($reply->instances as $inst) {
389
+    foreach ($reply->instances as $inst) {
390 390
         echo "<tr>
391 391
             <td><a href=result.php?resultid=$inst->id>$inst->id</a></td>
392 392
             <td>$inst->state</td>
Please login to merge, or discard this patch.
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
     list($batch, $errmsg) = boinc_query_batch($req);
303 303
     if ($errmsg) error_page(htmlentities($errmsg));
304 304
 
305
-    page_head("Batch $req->batch_id");
305
+    page_head("batch $req->batch_id");
306 306
     start_table();
307 307
     row2("name", $batch->name);
308 308
     row2("application", $batch->app_name);
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
     list($reply, $errmsg) = boinc_query_job($req);
379 379
     if ($errmsg) error_page(htmlentities($errmsg));
380 380
 
381
-    page_head("Job $req->job_id");
381
+    page_head("job $req->job_id");
382 382
     echo "<a href=$project/workunit.php?wuid=$req->job_id>View workunit page on BOINC server</a>\n";
383 383
     echo "<h2>Instances</h2>\n";
384 384
     start_table();
Please login to merge, or discard this patch.
html/user/userw.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 check_get_args(array("id"));
23 23
 
24 24
 function show_credit_wap($user) {
25
-    $retstr = "<br/>User TotCred: " . format_credit($user->total_credit) . "<br/>";
26
-    $retstr .= "User AvgCred: " . format_credit($user->expavg_credit) . "<br/>";
25
+    $retstr = "<br/>User TotCred: ".format_credit($user->total_credit)."<br/>";
26
+    $retstr .= "User AvgCred: ".format_credit($user->expavg_credit)."<br/>";
27 27
     return $retstr;
28 28
 }
29 29
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
     $wapstr .= show_credit_wap($user);
46 46
     if ($user->teamid && $team) {
47 47
         $wapstr .= "<br/>".tra("Team:")." ".$team->name."<br/>";
48
-        $wapstr .= tra("Team TotCred:")." " . format_credit($team->total_credit) . "<br/>";
49
-        $wapstr .= tra("Team AvgCred:")." " . format_credit($team->expavg_credit) . "<br/>";
48
+        $wapstr .= tra("Team TotCred:")." ".format_credit($team->total_credit)."<br/>";
49
+        $wapstr .= tra("Team AvgCred:")." ".format_credit($team->expavg_credit)."<br/>";
50 50
     } else {
51 51
         $wapstr .= "<br/>".tra("Team: None")."<br/>";
52 52
     }
Please login to merge, or discard this patch.
html/user/ffmail_form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 
52 52
 start_table();
53 53
 row2("From:", "$user->name &lt;$user->email_addr>");
54
-for ($i=0; $i<6; $i++) {
54
+for ($i = 0; $i < 6; $i++) {
55 55
     row2(tra("To:"), "<input size=30 name=e$i>");
56 56
 }
57 57
 row2(tra("Subject"), "<input size=80 name=subject value=\"$subject\">");
Please login to merge, or discard this patch.
html/user/info.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,5 +58,5 @@
 block discarded – undo
58 58
     <p>".tra("These other projects are not associated with %1, and we cannot vouch for their security practices or the nature of their research. Join them at your own risk.", PROJECT);
59 59
 }
60 60
 page_tail();
61
-$cvs_version_tracker[]="\$Id$";
61
+$cvs_version_tracker[] = "\$Id$";
62 62
 ?>
Please login to merge, or discard this patch.
html/user/forum_index.php 3 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 show_forum_header($user);
75 75
 
76
-if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
76
+if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE) {
77 77
     $categories = BoincCategory::enum("true order by orderID");
78 78
 } else {
79 79
     echo "<p>"
@@ -140,5 +140,5 @@  discard block
 block discarded – undo
140 140
 page_tail();
141 141
 BoincForumLogging::cleanup();
142 142
 
143
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
143
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
144 144
 ?>
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 
74 74
 show_forum_header($user);
75 75
 
76
-if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
76
+if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE) {
77 77
     $categories = BoincCategory::enum("true order by orderID");
78 78
 } else {
79 79
     echo "<p>"
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
     if ($first) {
88 88
         $first = false;
89 89
         echo "<p>";
90
-        show_forum_title($category, NULL, NULL);
90
+        show_forum_title($category, null, null);
91 91
         echo "<p>";
92 92
         show_mark_as_read_button($user);
93 93
         start_table('table-striped');
Please login to merge, or discard this patch.
html/user/view_profile.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 
45 45
 $cache_args = "userid=$userid";
46 46
 $cacheddata = get_cached_data(USER_PROFILE_TTL, $cache_args);
47
-if ($cacheddata){
47
+if ($cacheddata) {
48 48
     // Already got a cached version of the information
49 49
     $community_links_object = unserialize($cacheddata);
50 50
 } else {
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 
45 45
 $cache_args = "userid=$userid";
46 46
 $cacheddata = get_cached_data(USER_PROFILE_TTL, $cache_args);
47
-if ($cacheddata){
47
+if ($cacheddata) {
48 48
     // Already got a cached version of the information
49 49
     $community_links_object = unserialize($cacheddata);
50 50
 } else {
Please login to merge, or discard this patch.
html/user/team_delta.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     global $xml;
31 31
     $user = BoincUser::lookup_id($delta->userid);
32 32
     $when = time_str($delta->timestamp);
33
-    $what = $delta->joining?"joined":"quit";
33
+    $what = $delta->joining ? "joined" : "quit";
34 34
     if ($xml) {
35 35
         echo "    <action>
36 36
         <id>$user->id</id>
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     } else {
44 44
         echo "<tr>
45 45
            <td>$when</td>
46
-           <td>",user_links($user, BADGE_HEIGHT_MEDIUM)," (ID $user->id)</td>
46
+           <td>", user_links($user, BADGE_HEIGHT_MEDIUM), " (ID $user->id)</td>
47 47
            <td>$what</td>
48 48
            <td>$delta->total_credit</td>
49 49
            </tr>
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
     );
83 83
 }
84 84
 $deltas = BoincTeamDelta::enum("teamid=$teamid order by timestamp");
85
-foreach($deltas as $delta) {
85
+foreach ($deltas as $delta) {
86 86
     show_delta($delta);
87 87
 }
88 88
 if ($xml) {
Please login to merge, or discard this patch.