Passed
Pull Request — master (#2712)
by Christian
08:07
created
html/ops/block_host.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@  discard block
 block discarded – undo
20 20
 
21 21
 // TODO: document; use new DB interface
22 22
 
23
-include_once( "../inc/db.inc" );
24
-include_once( "../inc/util.inc" );
25
-include_once( "../inc/db_ops.inc" );
26
-include_once( "../inc/util_ops.inc" );
27
-include_once( "../inc/prefs.inc" );
23
+include_once("../inc/db.inc");
24
+include_once("../inc/util.inc");
25
+include_once("../inc/db_ops.inc");
26
+include_once("../inc/util_ops.inc");
27
+include_once("../inc/prefs.inc");
28 28
 
29 29
 db_init();
30 30
 
31 31
 if (get_int('hostid')) {
32
-    $hostid = get_int( 'hostid' );
32
+    $hostid = get_int('hostid');
33 33
 } else {
34 34
     error_page("no hostid");
35 35
 }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
 admin_page_head($title);
41 41
 
42
-if($hostid > 0) {
42
+if ($hostid > 0) {
43 43
     $result = _mysql_query("UPDATE host SET max_results_day=1 WHERE id=".$hostid);
44 44
 }
45 45
 
Please login to merge, or discard this patch.
html/ops/problem_host.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -116,14 +116,14 @@
 block discarded – undo
116 116
 } else {
117 117
     $host = BoincHost::lookup_id($hostid);
118 118
     if (!$host) {
119
-    	echo "<h2>No host with that ID</h2>
119
+        echo "<h2>No host with that ID</h2>
120 120
 	 	<center>Please <a href=\"problem_host.php\">try again</a></center>";
121 121
     } else {
122 122
         $user = BoincUser::lookup_id($host->userid);
123
-    	echo "<a href=\"problem_host.php\">Do another?</a><br><br>";
124
-    	send_problem_email($user, $host);
125
-    	echo "Email to ".$user->email_addr." has been sent.<br>";
126
-	}
123
+        echo "<a href=\"problem_host.php\">Do another?</a><br><br>";
124
+        send_problem_email($user, $host);
125
+        echo "Email to ".$user->email_addr." has been sent.<br>";
126
+    }
127 127
 }
128 128
 
129 129
 admin_page_tail();
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
     Average credit: ".$host->expavg_credit."
38 38
     Average update time: ".time_str($host->expavg_time)."
39 39
     IP address: $host->last_ip_addr (same the last $host->nsame_ip_addr times)
40
-    Domain name: " . $host->domain_name;
40
+    Domain name: ".$host->domain_name;
41 41
     $x = $host->timezone/3600;
42
-    if ($x >= 0) $x="+$x";
43
-    $host_content.="
42
+    if ($x >= 0) $x = "+$x";
43
+    $host_content .= "
44 44
     Local Time = UTC $x hours
45
-    Number of CPUs: " . $host->p_ncpus."
45
+    Number of CPUs: ".$host->p_ncpus."
46 46
     CPU: $host->p_vendor $host->p_model
47 47
     FP ops/sec: ".$host->p_fpops."
48 48
     Int ops/sec: ".$host->p_iops."
@@ -50,28 +50,28 @@  discard block
 block discarded – undo
50 50
     Operating System: $host->os_name $host->os_version";
51 51
     $x = $host->m_nbytes/(1024*1024);
52 52
     $y = round($x, 2);
53
-    $host_content.="
53
+    $host_content .= "
54 54
     Memory: $y MB";
55 55
     $x = $host->m_cache/1024;
56 56
     $y = round($x, 2);
57
-    $host_content.="
57
+    $host_content .= "
58 58
     Cache: $y KB";
59 59
     $x = $host->m_swap/(1024*1024);
60 60
     $y = round($x, 2);
61
-    $host_content.="
61
+    $host_content .= "
62 62
     Swap Space: $y MB";
63 63
     $x = $host->d_total/(1024*1024*1024);
64 64
     $y = round($x, 2);
65
-    $host_content.="
65
+    $host_content .= "
66 66
     Total Disk Space: $y GB";
67 67
     $x = $host->d_free/(1024*1024*1024);
68 68
     $y = round($x, 2);
69
-    $host_content.="
69
+    $host_content .= "
70 70
     Free Disk Space: $y GB
71 71
     Avg network bandwidth (upstream): $host->n_bwup bytes/sec
72 72
     Avg network bandwidth (downstream): $host->n_bwdown bytes/sec";
73 73
     $x = $host->avg_turnaround/86400;
74
-    $host_content.="
74
+    $host_content .= "
75 75
     Average turnaround: ".round($x, 2)." days
76 76
     Number of RPCs: $host->rpc_seqno
77 77
     Last RPC: ".time_str($host->rpc_time)."
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 installation.  Could you please have a look at it?
89 89
 
90 90
 Sincerely,
91
-        The ". PROJECT." team
91
+        The ".PROJECT." team
92 92
 ";
93 93
 $body .= "
94 94
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 " . $host_content."
97 97
 
98 98
 For further information and assistance with ".PROJECT." go to $master_url";
99
-    echo nl2br($body) . "<br><br>"; 
99
+    echo nl2br($body)."<br><br>"; 
100 100
     return send_email($user, $subject, $body);
101 101
 
102 102
 }
@@ -127,5 +127,5 @@  discard block
 block discarded – undo
127 127
 }
128 128
 
129 129
 admin_page_tail();
130
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
130
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
131 131
 ?>
Please login to merge, or discard this patch.
html/ops/clean_cache.php 3 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -24,17 +24,17 @@
 block discarded – undo
24 24
 set_time_limit(0);
25 25
 
26 26
 function cache_check_diskspace2(){
27
-   $too_old = 86400;
28
-   while (1) {
29
-       $f = disk_free_space("../cache");
30
-       $u = disk_usage("../cache");
31
-       echo "free: $f used: $u\n";
32
-       if ($f > MIN_FREE_SPACE && $u < MAX_CACHE_USAGE) {
33
-           break;
34
-       }
35
-       clean_cache($too_old, "../cache");
36
-       $too_old/=2;
37
-   }
27
+    $too_old = 86400;
28
+    while (1) {
29
+        $f = disk_free_space("../cache");
30
+        $u = disk_usage("../cache");
31
+        echo "free: $f used: $u\n";
32
+        if ($f > MIN_FREE_SPACE && $u < MAX_CACHE_USAGE) {
33
+            break;
34
+        }
35
+        clean_cache($too_old, "../cache");
36
+        $too_old/=2;
37
+    }
38 38
 }
39 39
 
40 40
 cache_check_diskspace2();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 
24 24
 set_time_limit(0);
25 25
 
26
-function cache_check_diskspace2(){
26
+function cache_check_diskspace2() {
27 27
    $too_old = 86400;
28 28
    while (1) {
29 29
        $f = disk_free_space("../cache");
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
            break;
34 34
        }
35 35
        clean_cache($too_old, "../cache");
36
-       $too_old/=2;
36
+       $too_old /= 2;
37 37
    }
38 38
 }
39 39
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 
24 24
 set_time_limit(0);
25 25
 
26
-function cache_check_diskspace2(){
26
+function cache_check_diskspace2() {
27 27
    $too_old = 86400;
28 28
    while (1) {
29 29
        $f = disk_free_space("../cache");
Please login to merge, or discard this patch.
html/ops/cancel_workunits_action.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -38,30 +38,30 @@  discard block
 block discarded – undo
38 38
 if ($cancel && ($cancel == 1)) {
39 39
     if ($WU) {
40 40
         foreach ($WU as $key => $value) {
41
-            if($WUs != "") {
42
-                $WUs = $WUs . ",";
41
+            if ($WUs != "") {
42
+                $WUs = $WUs.",";
43 43
             }
44
-            $WUs = $WUs . $value;
44
+            $WUs = $WUs.$value;
45 45
         }
46 46
     }
47 47
 }
48 48
 
49 49
 // cancel WUs (if not in rops)
50 50
 //
51
-if($WUs != "") {
51
+if ($WUs != "") {
52 52
     echo "<!--- WUs to cancel: $WUs --->\n";
53 53
     if (!in_rops()) {
54
-        cancel_wus_where("id IN (" . $WUs . ")");
54
+        cancel_wus_where("id IN (".$WUs.")");
55 55
     }
56 56
 }
57 57
 
58 58
 if ($back) {
59 59
     if ($back == "errorwus") {
60 60
         $args = "?refresh_cache=1";
61
-        if ($hide_canceled && $hide_canceled=="on") {
61
+        if ($hide_canceled && $hide_canceled == "on") {
62 62
             $args .= "&hide_canceled=on";
63 63
         }
64
-        if ($hide_dlerr && $hide_dlerr=="on") {
64
+        if ($hide_dlerr && $hide_dlerr == "on") {
65 65
             $args .= "&hide_dlerr=on";
66 66
         }
67 67
         if ($appid) {
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         echo "<p><a href=\"errorwus.php$args\">Return to All-error Workunits page</a> (refreshes the cache)</p>";
71 71
     } else if ($back == "cancelwus") {
72 72
         if ($clause) {
73
-            $clause=urlencode($clause);
73
+            $clause = urlencode($clause);
74 74
             echo "<p><a href=\"cancel_workunits.php?limit=$limit&uclause=$clause\">";
75 75
             echo "Cancel next (max $limit) Workunits</a></p>";
76 76
         }
Please login to merge, or discard this patch.
html/ops/revalidate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 // and you want to rerun it on some jobs
22 22
 // (e.g. to grant credit to instances previously marked as invalid)
23 23
 
24
-ini_set ("memory_limit", "2G");
24
+ini_set("memory_limit", "2G");
25 25
 
26 26
 require_once("../inc/util_ops.inc");
27 27
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
     $nresults = 0;
53 53
 
54 54
     $wus = BoincWorkunit::enum($clause);
55
-    foreach($wus as $wu) {
55
+    foreach ($wus as $wu) {
56 56
         $results = BoincResult::enum("workunitid=$wu->id");
57 57
         $n = 0;
58 58
         foreach ($results as $result) {
Please login to merge, or discard this patch.
html/ops/manage_special_users_action.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
25 25
 
26 26
 $bitset = '';
27 27
 
28
-for ($i=0;$i<S_NFLAGS;$i++) {
28
+for ($i = 0; $i < S_NFLAGS; $i++) {
29 29
     if (post_int("role".$i, TRUE) == '1') {
30
-        $bitset = str_pad($bitset, $i+1, '1');
30
+        $bitset = str_pad($bitset, $i + 1, '1');
31 31
     } else {
32
-        $bitset = str_pad($bitset, $i+1, '0');
32
+        $bitset = str_pad($bitset, $i + 1, '0');
33 33
     }
34 34
 }
35 35
 if ($bitset == "0000000") $bitset = '';
@@ -50,5 +50,5 @@  discard block
 block discarded – undo
50 50
 
51 51
 admin_page_tail();
52 52
 
53
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
53
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
54 54
 ?>
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 $bitset = '';
27 27
 
28 28
 for ($i=0;$i<S_NFLAGS;$i++) {
29
-    if (post_int("role".$i, TRUE) == '1') {
29
+    if (post_int("role".$i, true) == '1') {
30 30
         $bitset = str_pad($bitset, $i+1, '1');
31 31
     } else {
32 32
         $bitset = str_pad($bitset, $i+1, '0');
Please login to merge, or discard this patch.
html/ops/create_forums.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@  discard block
 block discarded – undo
41 41
     return $db->insert_id();
42 42
 }
43 43
 
44
-function create_forum($category, $orderID, $title, $description, $is_dev_blog=0) {
44
+function create_forum($category, $orderID, $title, $description, $is_dev_blog = 0) {
45 45
     $q = "(category, orderID, title, description, is_dev_blog) values ($category, $orderID, '$title', '$description', $is_dev_blog)";
46 46
     $db = BoincDB::get();
47
-    $result = $db->insert("forum",$q);
47
+    $result = $db->insert("forum", $q);
48 48
     if (!$result) {
49 49
         $forum = BoincForum::lookup("category=$category and title='$title'");
50 50
         if ($forum) return $forum->id;
@@ -72,5 +72,5 @@  discard block
 block discarded – undo
72 72
 create_forum($catid, 4, "Preferences", "Using preferences");
73 73
 create_forum($catid, 6, "Web site", "Issues involving this web site");
74 74
 
75
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
75
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
76 76
 ?>
Please login to merge, or discard this patch.
html/ops/update_profile_pages.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@
 block discarded – undo
200 200
         for ($row = 0; $row < $height; $row++) {
201 201
             echo "<tr>";
202 202
             for ($col = 0; $col < $width; $col++) {
203
-	            if ($count < $numIds) {
203
+                if ($count < $numIds) {
204 204
                     echo "<td class=\"bordered\" align=\"center\">
205 205
                         <a href=\"".secure_url_base()."view_profile.php?userid=".$userIds[$count]."\"><img src=\"".secure_url_base().IMAGE_URL.$userIds[$count]."_sm.jpg\"></a>
206 206
                     </td>";
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
 // TODO: convert to new DB interface
41 41
 
42
-$alphabet = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3','4','5','6','7','8','9');
42
+$alphabet = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9');
43 43
 
44 44
 
45 45
 // Builds a summary table of user profiles.
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 function show_user_table($members, $offset, $numToDisplay, $cols) {
54 54
     start_table();
55 55
 
56
-    $rows = ceil($numToDisplay / $cols);
56
+    $rows = ceil($numToDisplay/$cols);
57 57
     $count = $offset;
58 58
     $numMembers = count($members);
59 59
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
     // Build an array of IDs of all users with pictures in their profiles.
152 152
     $userIds = array();
153 153
     $numIds = 0;
154
-    foreach($profiles as $profile) {
154
+    foreach ($profiles as $profile) {
155 155
         $user = BoincUser::lookup_id($profile->userid);
156 156
         if (!$user) continue; // maybe we should delete the profile if user is non-existent anymore?
157 157
         if ($user->name) {
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 //        shuffle($userIds);
172 172
 //    }
173 173
 
174
-    $numPages = ceil(count($userIds)/($width * $height));
174
+    $numPages = ceil(count($userIds)/($width*$height));
175 175
 
176 176
     // Make sure that a page is generated even when no profiles with pictures
177 177
     // exist in order to avoid 404 errors from the profile_menu page.
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     $count = 0;
186 186
 
187 187
     for ($page = 1; $page <= $numPages; $page++) {
188
-        $filename = PROFILE_PATH . "user_gallery_" . $page . ".html";
188
+        $filename = PROFILE_PATH."user_gallery_".$page.".html";
189 189
         open_output_buffer();
190 190
 
191 191
         page_head("Profile gallery: page $page of $numPages", null, false, "../");
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
     // of the userids who belong to those countries.
245 245
     // Format: array[country][index] = userid.
246 246
 
247
-    foreach($profiles as $profile) {
247
+    foreach ($profiles as $profile) {
248 248
         $user = BoincUser::lookup_id($profile->userid);
249 249
         if (!$user) continue; // maybe we should delete the profile if user is non-existent anymore?
250 250
         if ($user->country) {
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
     // TODO: Define a constant for the desired number of rows per page.
265 265
 
266 266
     foreach ($countries as $country) {
267
-        $baseFileName =  "profile_country_" . get_legal_filename($country);
267
+        $baseFileName = "profile_country_".get_legal_filename($country);
268 268
         build_profile_pages(
269 269
             $countryMembers[$country],
270 270
             "User Profiles from $country", 5, 2,
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
     $numIds = 0;
291 291
     $members = array();
292 292
 
293
-    foreach($profiles as $profile) {
293
+    foreach ($profiles as $profile) {
294 294
         $user = BoincUser::lookup_id($profile->userid);
295 295
         if (!$user) continue; // maybe we should delete the profile if user is non-existent anymore?
296 296
         if ($user->name) {
@@ -335,11 +335,11 @@  discard block
 block discarded – undo
335 335
 function build_profile_pages(
336 336
     $members, $title, $rowsPerPage, $colsPerPage, $dir, $base_filename
337 337
 ) {
338
-    $numPerPage = $rowsPerPage * $colsPerPage;
339
-    $numPages = ceil(count($members) / $numPerPage);
338
+    $numPerPage = $rowsPerPage*$colsPerPage;
339
+    $numPages = ceil(count($members)/$numPerPage);
340 340
 
341 341
     for ($page = 1; $page <= $numPages; $page++) {
342
-        $filename = $dir . $base_filename . "_" . $page . ".html";
342
+        $filename = $dir.$base_filename."_".$page.".html";
343 343
         open_output_buffer();
344 344
 
345 345
         $pagetitle = $title.": Page $page of $numPages";
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 
348 348
         echo "Last updated ", pretty_time_str(time()), "<p>\n";
349 349
 
350
-        $offset = (($page-1) * $rowsPerPage * $colsPerPage);
350
+        $offset = (($page - 1)*$rowsPerPage*$colsPerPage);
351 351
 
352 352
         show_user_table($members, $offset, $numPerPage, $colsPerPage);
353 353
 
@@ -364,11 +364,11 @@  discard block
 block discarded – undo
364 364
     print_debug_msg("Beginning to build country summary page...");
365 365
     $countries = array_keys($countryMembers);
366 366
 
367
-    $filename = PROFILE_PATH . "profile_country.html";
367
+    $filename = PROFILE_PATH."profile_country.html";
368 368
     open_output_buffer();
369 369
 
370 370
     page_head("User Profiles by Country", null, null, "../");
371
-    echo "Last updated " . pretty_time_str(time()) . "<p>";
371
+    echo "Last updated ".pretty_time_str(time())."<p>";
372 372
 
373 373
     start_table();
374 374
     row_heading_array(array("Country", "Profiles"));
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 $caching = true;
415 415
 
416
-if (@$argv[1]=="-d") $debug=true;
416
+if (@$argv[1] == "-d") $debug = true;
417 417
 
418 418
 build_country_pages();
419 419
 build_alpha_pages();
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@
 block discarded – undo
180 180
         $numPages = 1;
181 181
     }
182 182
 
183
-    print_debug_msg("Generating $numPages pages");
183
+    print_debug_msg("generating $numPages pages");
184 184
 
185 185
     $count = 0;
186 186
 
Please login to merge, or discard this patch.
html/ops/analyze_coproc_log.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 // - daily total
24 24
 // - breakdown by desc (number, credit)
25 25
 
26
-ini_set ("memory_limit", "1G");
26
+ini_set("memory_limit", "1G");
27 27
 set_time_limit(0);
28 28
 
29 29
 $cli_only = true;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         add_to_array($days, $day, $granted);
77 77
     }
78 78
     $i++;
79
-    if ($i % 10000 == 0) echo "$i\n";
79
+    if ($i%10000 == 0) echo "$i\n";
80 80
 }
81 81
 
82 82
 uasort($hosts, "compare");
Please login to merge, or discard this patch.