Passed
Pull Request — master (#5698)
by David
08:58
created
html/ops/size_census.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
     // joined to the host
38 38
 
39 39
     $db = BoincDb::get();
40
-    $query = "select et_avg, host.on_frac, host.active_frac, host.gpu_active_frac, app_version.plan_class " .
41
-        " from DBNAME.host_app_version, DBNAME.host, DBNAME.app_version " .
42
-        " where host_app_version.app_version_id = app_version.id " .
43
-        " and app_version.appid = $app->id " .
44
-        " and et_n > 0  and et_avg > 0 " .
45
-        " and host.id = host_app_version.host_id " .
40
+    $query = "select et_avg, host.on_frac, host.active_frac, host.gpu_active_frac, app_version.plan_class ".
41
+        " from DBNAME.host_app_version, DBNAME.host, DBNAME.app_version ".
42
+        " where host_app_version.app_version_id = app_version.id ".
43
+        " and app_version.appid = $app->id ".
44
+        " and et_n > 0  and et_avg > 0 ".
45
+        " and host.id = host_app_version.host_id ".
46 46
         " and host.expavg_credit > 10";
47 47
     $result = $db->do_query($query);
48 48
     $a = array();
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
                 $av *= $x->active_frac;
56 56
             }
57 57
         } else {
58
-            $av = $x->on_frac * $x->active_frac;
58
+            $av = $x->on_frac*$x->active_frac;
59 59
         }
60
-        $a[] = (1/$x->et_avg) * $av;
60
+        $a[] = (1/$x->et_avg)*$av;
61 61
     }
62 62
     _mysql_free_result($result);
63 63
     sort($a);
64 64
     $n = count($a);
65 65
     $f = fopen("../../size_census_".$app->name, "w");
66
-    for ($i=1; $i<$app->n_size_classes; $i++) {
66
+    for ($i = 1; $i < $app->n_size_classes; $i++) {
67 67
         $k = (int)(($i*$n)/$app->n_size_classes);
68 68
         fprintf($f, "%e\n", $a[$k]);
69 69
     }
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
 echo "Starting: ", time_str(time()), "\n";
74 74
 
75
-if ($argc == 2 && $argv[1]=="--all_apps") {
75
+if ($argc == 2 && $argv[1] == "--all_apps") {
76 76
     $apps = BoincApp::enum("deprecated=0");
77 77
 } else {
78 78
     $apps = BoincApp::enum("deprecated=0 and n_size_classes>1");
Please login to merge, or discard this patch.
html/ops/list_new_users.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 \***********************************************************************/
28 28
 
29 29
 $limit = get_int('limit', true);
30
-if (! $limit > 0 ) $limit = 30;
30
+if (!$limit > 0) $limit = 30;
31 31
 
32 32
 
33 33
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 echo "<input class=\"btn btn-default\" type=\"submit\" value=\"Display\">\n";
49 49
 echo "</form>\n";
50 50
 
51
-$query="SELECT * FROM user ORDER BY create_time DESC LIMIT $limit";
51
+$query = "SELECT * FROM user ORDER BY create_time DESC LIMIT $limit";
52 52
 $result = _mysql_query($query);
53 53
 if (_mysql_num_rows($result) < 1) {
54 54
     echo "There are no new users.";
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
     $joined = time_str($row->create_time);
67 67
     $email_validated = $row->email_validated;
68 68
     
69
-    $team_name="";
70
-    if($row->teamid > 0){
69
+    $team_name = "";
70
+    if ($row->teamid > 0) {
71 71
         $team = BoincTeam::lookup_id($row->teamid);
72 72
         $team_name = $team->name;
73 73
     }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     if ($special_bits != "0") {
81 81
         for ($i = 0; $i < 7; $i++) {
82 82
             $bit = substr($special_bits, $i, 1);
83
-            if ($bit == '1'){
83
+            if ($bit == '1') {
84 84
                 if (!empty($roles)) {
85 85
                     $roles .= ", ";
86 86
                 }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     // Banished?
96 96
     if (!empty($user->banished_until)) {
97 97
         $dt = $user->banished_until - time();
98
-        if( $dt > 0 ) {
98
+        if ($dt > 0) {
99 99
             $x = "<span style=\"color: #ff0000\">Currently banished</span>";
100 100
         }
101 101
         else {
@@ -117,5 +117,5 @@  discard block
 block discarded – undo
117 117
 
118 118
 admin_page_tail();
119 119
 
120
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
120
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
121 121
 ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     $email_validated = $row->email_validated;
68 68
 
69 69
     $team_name="";
70
-    if($row->teamid > 0){
70
+    if($row->teamid > 0) {
71 71
         $team = BoincTeam::lookup_id($row->teamid);
72 72
         $team_name = $team->name;
73 73
     }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     if ($special_bits != "0") {
81 81
         for ($i = 0; $i < 7; $i++) {
82 82
             $bit = substr($special_bits, $i, 1);
83
-            if ($bit == '1'){
83
+            if ($bit == '1') {
84 84
                 if (!empty($roles)) {
85 85
                     $roles .= ", ";
86 86
                 }
@@ -97,8 +97,7 @@  discard block
 block discarded – undo
97 97
         $dt = $user->banished_until - time();
98 98
         if( $dt > 0 ) {
99 99
             $x = "<span style=\"color: #ff0000\">Currently banished</span>";
100
-        }
101
-        else {
100
+        } else {
102 101
             $x = "<span style=\"color: #ff9900\">Previously banished</span>";
103 102
         }
104 103
         $roles .= $x;
Please login to merge, or discard this patch.
html/ops/app_select_edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
     $dom->preserveWhiteSpace = false;
101 101
     $dom->formatOutput = true;
102 102
     $dom->loadXML($prefs->asXML());
103
-    return $dom->saveXML($dom->documentElement) . "\n";
103
+    return $dom->saveXML($dom->documentElement)."\n";
104 104
 }
105 105
 
106 106
 function update_user($user, $app_id) {
Please login to merge, or discard this patch.
html/ops/repair_forums.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
 function cleanup_orphan_threads() {
36 36
     $threads = BoincThread::enum("");
37
-    foreach($threads as $thread) {
37
+    foreach ($threads as $thread) {
38 38
         $forum = BoincForum::lookup_id($thread->forum);
39 39
         if (!$forum) {
40 40
             cleanup_thread($thread);
Please login to merge, or discard this patch.
html/ops/mass_email.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 
85 85
     $result = _mysql_query($query);
86 86
     while ($user = _mysql_fetch_object($result)) {
87
-    	// TODO: might want to also replace TOTAL_CREDIT, RAC, and similar.
87
+        // TODO: might want to also replace TOTAL_CREDIT, RAC, and similar.
88 88
         $body_to_send = str_replace("USERNAME", $user->name, $body);
89 89
         $body_to_send .= "\n\nTo opt out of future emails from ".PROJECT.", please edit your project preferences at ".secure_url_base()."prefs.php?subset=project\n";
90 90
         $retval = send_email($user, $subject, $body_to_send);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 // These are set to large values because otherwise the script has
37 37
 // a tendency to just stop after some time.
38 38
 //
39
-ini_set ("memory_limit", "20M");
39
+ini_set("memory_limit", "20M");
40 40
 set_time_limit(3600);
41 41
 
42 42
 $receiver = 0;
Please login to merge, or discard this patch.
html/ops/remote_server_status.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -80,41 +80,41 @@
 block discarded – undo
80 80
         die("can't parse config file\n");
81 81
     }
82 82
     $config = $c->config;
83
-    $master_url = (string) $config->master_url;
83
+    $master_url = (string)$config->master_url;
84 84
     $u = parse_url($master_url);
85 85
     $master_host = $u["host"];
86 86
 
87
-    $url = (string) $config->download_url;
87
+    $url = (string)$config->download_url;
88 88
     $u = parse_url($url);
89 89
     $h = $u["host"];
90 90
     if ($h != $master_host) {
91 91
         $y = new StdClass;
92 92
         $y->cmd = 'Download server';
93 93
         $y->host = $h;
94
-        $y->status = web_server_running($url)?1:0;
94
+        $y->status = web_server_running($url) ? 1 : 0;
95 95
         $x[] = $y;
96 96
     }
97
-    $url = (string) $config->upload_url;
97
+    $url = (string)$config->upload_url;
98 98
     $u = parse_url($url);
99 99
     $h = $u["host"];
100 100
     if ($h != $master_host) {
101 101
         $y = new StdClass;
102 102
         $y->cmd = 'Upload server';
103 103
         $y->host = $h;
104
-        $y->status = web_server_running($url)?1:0;
104
+        $y->status = web_server_running($url) ? 1 : 0;
105 105
         $x[] = $y;
106 106
     }
107 107
 
108 108
     $main_host = (string)$c->config->host;
109 109
     if ($c->config->www_host) {
110
-        $web_host = (string) $c->config->www_host;
110
+        $web_host = (string)$c->config->www_host;
111 111
     } else {
112 112
         $web_host = $main_host;
113 113
     }
114 114
     $daemons = $c->daemons;
115 115
     foreach ($daemons->daemon as $d) {
116 116
         if ((int)$d->disabled != 0) continue;
117
-        $host = $d->host?(string)$d->host:$main_host;
117
+        $host = $d->host ? (string)$d->host : $main_host;
118 118
         if ($host != $web_host) {
119 119
             $y = new StdClass;
120 120
             $y->cmd = (string)$d->cmd;
Please login to merge, or discard this patch.
html/ops/cancel_wu_form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,5 +55,5 @@
 block discarded – undo
55 55
     </form>
56 56
 ";
57 57
 admin_page_tail();
58
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
58
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
59 59
 ?>
Please login to merge, or discard this patch.
html/ops/reset_hrclass.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,11 +21,11 @@
 block discarded – undo
21 21
 // TODO: document - when/why would you want to do this?
22 22
 // TODO: use new DB interface
23 23
 
24
-include_once( "../inc/db.inc" );
25
-include_once( "../inc/util.inc" );
26
-include_once( "../inc/db_ops.inc" );
27
-include_once( "../inc/util_ops.inc" );
28
-include_once( "../inc/prefs.inc" );
24
+include_once("../inc/db.inc");
25
+include_once("../inc/util.inc");
26
+include_once("../inc/db_ops.inc");
27
+include_once("../inc/util_ops.inc");
28
+include_once("../inc/prefs.inc");
29 29
 
30 30
 db_init();
31 31
 
Please login to merge, or discard this patch.
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.