Passed
Pull Request — master (#5930)
by Vitalii
30:02 queued 17:39
created
html/user/buda.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 // show list of BUDA apps and variants,
33 33
 // w/ buttons for adding and deleting
34 34
 //
35
-function app_list($notice=null) {
35
+function app_list($notice = null) {
36 36
     global $buda_root;
37 37
     if (!is_dir($buda_root)) {
38 38
         mkdir($buda_root);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     $dir = "$buda_root/$app/$variant";
103 103
     start_table();
104 104
     table_header('name', 'size', 'md5');
105
-    foreach(scandir($dir) as $f) {
105
+    foreach (scandir($dir) as $f) {
106 106
         if ($f[0] == '.') continue;
107 107
         [$md5, $size] = parse_info_file("$dir/.md5/$f");
108 108
         table_row(
Please login to merge, or discard this patch.
html/inc/util.inc 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -33,17 +33,17 @@  discard block
 block discarded – undo
33 33
 //
34 34
 $config = get_config();
35 35
 global $master_url;
36
-$master_url = parse_config($config , "<master_url>");
36
+$master_url = parse_config($config, "<master_url>");
37 37
 $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
38 38
 $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
39 39
 
40 40
 // Set parameters to defaults if not defined in config.xml
41 41
 
42 42
 $x = parse_config($config, "<user_country>");
43
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
43
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
44 44
 
45 45
 $x = parse_config($config, "<user_url>");
46
-define('USER_URL', ($x===null)?1:(int)$x);
46
+define('USER_URL', ($x === null) ? 1 : (int)$x);
47 47
 
48 48
 // Set parameters to defaults if not defined in project.inc
49 49
 
@@ -151,10 +151,10 @@  discard block
 block discarded – undo
151 151
 }
152 152
 
153 153
 function url_base() {
154
-    return is_https()?secure_url_base():URL_BASE;
154
+    return is_https() ?secure_url_base() : URL_BASE;
155 155
 }
156 156
 
157
-function send_cookie($name, $value, $permanent, $ops=false) {
157
+function send_cookie($name, $value, $permanent, $ops = false) {
158 158
     global $master_url;
159 159
 
160 160
     // the following allows independent login for projects on the same server
@@ -165,11 +165,11 @@  discard block
 block discarded – undo
165 165
         $path = substr($path, 0, -1);
166 166
         $path .= "_ops/";
167 167
     }
168
-    $expire = $permanent?time()+3600*24*365:0;
168
+    $expire = $permanent ?time() + 3600*24*365 : 0;
169 169
     setcookie($name, $value, $expire, $path);
170 170
 }
171 171
 
172
-function clear_cookie($name, $ops=false) {
172
+function clear_cookie($name, $ops = false) {
173 173
     global $master_url;
174 174
     $url = parse_url($master_url);
175 175
     $path = $url['path'];
@@ -177,13 +177,13 @@  discard block
 block discarded – undo
177 177
         $path = substr($path, 0, -1);
178 178
         $path .= "_ops/";
179 179
     }
180
-    setcookie($name, '', time()-3600, $path);
180
+    setcookie($name, '', time() - 3600, $path);
181 181
 }
182 182
 
183 183
 $g_logged_in_user = null;
184 184
 $got_logged_in_user = false;
185 185
 
186
-function get_logged_in_user($must_be_logged_in=true) {
186
+function get_logged_in_user($must_be_logged_in = true) {
187 187
     global $g_logged_in_user, $got_logged_in_user;
188 188
     if ($got_logged_in_user) {
189 189
         // this could have been called earlier with $must_be_logged_in false
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
             $next_url = $_SERVER['REQUEST_URI'];
210 210
             $n = strrpos($next_url, "/");
211 211
             if ($n) {
212
-                $next_url = substr($next_url, $n+1);
212
+                $next_url = substr($next_url, $n + 1);
213 213
             }
214 214
         }
215 215
         $next_url = urlencode($next_url);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
     return $g_logged_in_user;
221 221
 }
222 222
 
223
-function show_login_info($prefix="") {
223
+function show_login_info($prefix = "") {
224 224
     $user = get_logged_in_user(false);
225 225
     if ($user) {
226 226
         $url_tokens = url_tokens($user->authenticator);
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
     }
231 231
 }
232 232
 
233
-$cache_control_extra="";
233
+$cache_control_extra = "";
234 234
 $is_login_page = false;
235 235
 
236 236
 // Call this to start pages.
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
242 242
 // with an existing web framework can more easily do so.
243 243
 // To do so, define page_head() in the project include file.
244 244
 //
245
-if (!function_exists("page_head")){
245
+if (!function_exists("page_head")) {
246 246
 function page_head(
247 247
     $title,
248 248
         // page title. Put in <title>, used as title for browser tab.
249
-    $body_attrs=null,
249
+    $body_attrs = null,
250 250
         // <body XXXX>
251 251
         // e.g. Javascript to put focus in an input field
252 252
         // (onload="document.form.foo.focus()")
@@ -255,10 +255,10 @@  discard block
 block discarded – undo
255 255
         // if set, include schedulers.txt.
256 256
         // also pass to project_banner() in case you want a different
257 257
         // header for your main page.
258
-    $url_prefix="",
258
+    $url_prefix = "",
259 259
         // prepend this to links.
260 260
         // Use for web pages not in the top directory
261
-    $head_extra=null
261
+    $head_extra = null
262 262
         // extra stuff to put in <head>. E.g.:
263 263
         // reCAPTCHA code (create_profile.php)
264 264
         // bbcode javascript (forums)
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
         header("Content-type: text/html; charset=utf-8");
281 281
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
282 282
             // Date in the past
283
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
283
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
284 284
             // always modified
285 285
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
286 286
             // for HTTP/1.1
@@ -301,11 +301,11 @@  discard block
 block discarded – undo
301 301
     if ($head_extra) {
302 302
         echo "\n$head_extra\n";
303 303
     }
304
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
304
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
305 305
         readfile("schedulers.txt");
306 306
     }
307 307
 
308
-    $t = $title?$title:PROJECT;
308
+    $t = $title ? $title : PROJECT;
309 309
     echo "<title>$t</title>\n";
310 310
     echo '
311 311
         <meta charset="utf-8">
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
     echo '<div class="container-fluid">
363 363
     ';
364 364
 
365
-    switch($title) {    //kludge
365
+    switch ($title) {    //kludge
366 366
     case tra("Log in"):
367 367
     case tra("Create an account"):
368 368
     case tra("Server status page"):
@@ -377,13 +377,13 @@  discard block
 block discarded – undo
377 377
 
378 378
 // See the comments for page_head()
379 379
 //
380
-if (!function_exists("page_tail")){
380
+if (!function_exists("page_tail")) {
381 381
 function page_tail(
382
-    $show_date=false,
382
+    $show_date = false,
383 383
         // true for pages that are generated periodically rather than on the fly
384
-    $url_prefix="",
384
+    $url_prefix = "",
385 385
         // use for pages not at top level
386
-    $is_main=false
386
+    $is_main = false
387 387
         // passed to project_footer;
388 388
 ) {
389 389
     echo "<br>\n";
@@ -398,10 +398,10 @@  discard block
 block discarded – undo
398 398
 }
399 399
 }
400 400
 
401
-function display_cvs_versions(){
401
+function display_cvs_versions() {
402 402
     global $cvs_version_tracker;
403 403
     echo "\n<!-- SVN VERSIONS -->\n";
404
-    for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
404
+    for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
405 405
         echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
406 406
     }
407 407
 }
@@ -426,24 +426,24 @@  discard block
 block discarded – undo
426 426
 // convert time interval in seconds to a string of the form
427 427
 // 'D days h hours m min s sec'.
428 428
 
429
-function time_diff($x, $res=3) {
429
+function time_diff($x, $res = 3) {
430 430
     $x = (int)$x;
431 431
     $days    = (int)($x/86400);
432
-    $hours   = (int)(($x-$days*86400)/3600);
433
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
434
-    $seconds = $x % 60;
432
+    $hours   = (int)(($x - $days*86400)/3600);
433
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
434
+    $seconds = $x%60;
435 435
 
436 436
     $s = "";
437 437
     if ($days) {
438 438
         $s .= "$days ".tra("days")." ";
439 439
     }
440
-    if ($res>0 && ($hours || strlen($s))) {
440
+    if ($res > 0 && ($hours || strlen($s))) {
441 441
         $s .= "$hours ".tra("hours")." ";
442 442
     }
443
-    if ($res>1 && ($minutes || strlen($s))) {
443
+    if ($res > 1 && ($minutes || strlen($s))) {
444 444
         $s .= "$minutes ".tra("min")." ";
445 445
     }
446
-    if ($res>2) {
446
+    if ($res > 2) {
447 447
         $s .= "$seconds ".tra("sec")." ";
448 448
     }
449 449
     return $s;
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 
458 458
 function time_str($x) {
459 459
     if ($x == 0) return "---";
460
-    return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
460
+    return gmdate('j M Y, G:i:s', (int)$x)." UTC";
461 461
 }
462 462
 
463 463
 function local_time_str($x) {
@@ -469,14 +469,14 @@  discard block
 block discarded – undo
469 469
     return time_str($x);
470 470
 }
471 471
 
472
-function start_table_str($class="", $style="") {
473
-    $s = $style?'style="'.$style.'"':'';
472
+function start_table_str($class = "", $style = "") {
473
+    $s = $style ? 'style="'.$style.'"' : '';
474 474
     return '<div class="table">
475 475
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
476 476
     ';
477 477
 }
478 478
 
479
-function start_table($class="", $style="") {
479
+function start_table($class = "", $style = "") {
480 480
     echo start_table_str($class, $style);
481 481
 }
482 482
 
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
     echo "</tr>\n";
522 522
 }
523 523
 
524
-function row1($x, $ncols=2, $class="heading") {
524
+function row1($x, $ncols = 2, $class = "heading") {
525 525
     if ($class == "heading") {
526 526
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
527 527
     } else {
@@ -535,10 +535,10 @@  discard block
 block discarded – undo
535 535
 
536 536
 // a table row with 2 columns, with the left on right-aligned
537 537
 
538
-function row2($x, $y, $show_error=false, $lwidth='40%') {
539
-    if ($x==="") $x="<br>";
540
-    if ($y==="") $y="<br>";
541
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
538
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
539
+    if ($x === "") $x = "<br>";
540
+    if ($y === "") $y = "<br>";
541
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
542 542
     echo "<tr>
543 543
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
544 544
         <td $attrs >$y</td>
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 // output the first part of row2();
550 550
 // then write the content, followed by </td></tr>
551 551
 
552
-function row2_init($x, $lwidth='40%') {
552
+function row2_init($x, $lwidth = '40%') {
553 553
     echo sprintf('<tr>
554 554
         <td width="%s" %s>%s</td>
555 555
         <td %s>',
@@ -565,31 +565,31 @@  discard block
 block discarded – undo
565 565
     echo "<tr><td>$string</td></tr>";
566 566
 }
567 567
 
568
-function row_array($x, $attrs=null) {
568
+function row_array($x, $attrs = null) {
569 569
     echo "<tr>\n";
570 570
     $i = 0;
571 571
     foreach ($x as $h) {
572
-        $a = $attrs?$attrs[$i]:"";
572
+        $a = $attrs ? $attrs[$i] : "";
573 573
         echo "<td $a>$h</td>\n";
574 574
         $i++;
575 575
     }
576 576
     echo "</tr>\n";
577 577
 }
578 578
 
579
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
579
+define('ALIGN_RIGHT', 'style="text-align:right;"');
580 580
 
581
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
581
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
582 582
     echo "<tr>";
583 583
     $i = 0;
584 584
     foreach ($x as $h) {
585
-        $a = $attrs?$attrs[$i]:"";
585
+        $a = $attrs ? $attrs[$i] : "";
586 586
         echo "<th $a class=\"$class\">$h</th>";
587 587
         $i++;
588 588
     }
589 589
     echo "</tr>\n";
590 590
 }
591 591
 
592
-function row_heading($x, $class='bg-primary') {
592
+function row_heading($x, $class = 'bg-primary') {
593 593
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
594 594
         ', $class, $x
595 595
     );
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
 // If $ellipsis is true, then an ellipsis is added to any sentence which
650 650
 // is cut short.
651 651
 
652
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
652
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
653 653
     $words = explode($delimiter, $sentence);
654 654
     $total_chars = 0;
655 655
     $trunc = false;
@@ -732,8 +732,8 @@  discard block
 block discarded – undo
732 732
 
733 733
 // returns null if the arg is optional and missing
734 734
 //
735
-function get_int($name, $optional=false) {
736
-    $x=null;
735
+function get_int($name, $optional = false) {
736
+    $x = null;
737 737
     if (isset($_GET[$name])) $x = $_GET[$name];
738 738
     if (!is_numeric($x)) {
739 739
         if ($optional) {
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 
753 753
 // returns null if the arg is optional and missing
754 754
 //
755
-function post_num($name, $optional=false) {
755
+function post_num($name, $optional = false) {
756 756
     $x = null;
757 757
     if (isset($_POST[$name])) $x = $_POST[$name];
758 758
     if (!is_numeric($x)) {
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
767 767
 
768 768
 // returns null if the arg is optional and missing
769 769
 //
770
-function post_int($name, $optional=false) {
770
+function post_int($name, $optional = false) {
771 771
     $x = post_num($name, $optional);
772 772
     if (is_null($x)) return null;
773 773
     $y = (int)$x;
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
     }
786 786
 }
787 787
 
788
-function get_str($name, $optional=false) {
788
+function get_str($name, $optional = false) {
789 789
     if (isset($_GET[$name])) {
790 790
         $x = $_GET[$name];
791 791
     } else {
@@ -797,7 +797,7 @@  discard block
 block discarded – undo
797 797
     return undo_magic_quotes($x);
798 798
 }
799 799
 
800
-function post_str($name, $optional=false) {
800
+function post_str($name, $optional = false) {
801 801
     if (isset($_POST[$name])) {
802 802
         $x = $_POST[$name];
803 803
     } else {
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
     return undo_magic_quotes($x);
810 810
 }
811 811
 
812
-function post_arr($name, $optional=false) {
812
+function post_arr($name, $optional = false) {
813 813
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
814 814
         $x = $_POST[$name];
815 815
     } else {
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
     // the mb_* functions are not included by default
826 826
     // return (mb_detect_encoding($passwd) -= 'ASCII');
827 827
 
828
-    for ($i=0; $i<strlen($str); $i++) {
828
+    for ($i = 0; $i < strlen($str); $i++) {
829 829
         $c = ord(substr($str, $i));
830 830
         if ($c < 32 || $c > 127) return false;
831 831
     }
@@ -849,7 +849,7 @@  discard block
 block discarded – undo
849 849
     $number = str_replace(',', '.', $number); // replace the german decimal separator
850 850
     // if no value was entered and this is ok
851 851
     //
852
-    if ($number=='' && !$low) return true;
852
+    if ($number == '' && !$low) return true;
853 853
 
854 854
     // the supplied value contains alphabetic characters
855 855
     //
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 
867 867
 // Generate a "select" element from an array of values
868 868
 //
869
-function select_from_array($name, $array, $selection=null, $width=240) {
869
+function select_from_array($name, $array, $selection = null, $width = 240) {
870 870
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
871 871
 
872 872
     foreach ($array as $key => $value) {
@@ -891,8 +891,8 @@  discard block
 block discarded – undo
891 891
     return $str;
892 892
 }
893 893
 
894
-function strip_bbcode($string){
895
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
894
+function strip_bbcode($string) {
895
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
896 896
 }
897 897
 
898 898
 function current_url() {
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
 // the colors for bootstrap' btn-success are almost illegible;
918 918
 // the green is too light.  Use a darker green.
919 919
 //
920
-function button_style($color='green', $font_size=null) {
920
+function button_style($color = 'green', $font_size = null) {
921 921
     $fs = '';
922 922
     if ($font_size) {
923 923
         $fs = sprintf('; font-size:%dpx', $font_size);
@@ -936,7 +936,7 @@  discard block
 block discarded – undo
936 936
 // class: class of the button, e.g. btn
937 937
 // extra: Additional text in href tag
938 938
 //
939
-function button_text($url, $text, $desc=null, $class=null, $extra='') {
939
+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
940 940
     if (!$desc) {
941 941
         $desc = $text;
942 942
     }
@@ -951,19 +951,19 @@  discard block
 block discarded – undo
951 951
     );
952 952
 }
953 953
 
954
-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
954
+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
955 955
     echo button_text($url, $text, $desc, $class, $extra);
956 956
 }
957 957
 
958 958
 // for places with a bunch of buttons, like forum posts
959 959
 //
960
-function show_button_small($url, $text, $desc=null) {
960
+function show_button_small($url, $text, $desc = null) {
961 961
     echo button_text($url, $text, $desc, "btn btn-xs", button_style());
962 962
 }
963 963
 
964 964
 // used for showing icons
965 965
 //
966
-function show_image($src, $title, $alt, $height=null) {
966
+function show_image($src, $title, $alt, $height = null) {
967 967
     $h = "";
968 968
     if ($height) {
969 969
         $h = "height=\"$height\"";
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 // tries instead to connect to <replica_db_host> if tag exists.
1001 1001
 // DEPRECATED - use boinc_db.inc
1002 1002
 //
1003
-function db_init($try_replica=false) {
1003
+function db_init($try_replica = false) {
1004 1004
     check_web_stopped();
1005 1005
     $retval = db_init_aux($try_replica);
1006 1006
     if ($retval == 1) {
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
 // Check this to avoid XSS vulnerability
1117 1117
 //
1118 1118
 function sanitize_sort_by($x) {
1119
-    switch($x) {
1119
+    switch ($x) {
1120 1120
     case 'expavg_credit':
1121 1121
     case 'total_credit':
1122 1122
         return;
@@ -1134,7 +1134,7 @@  discard block
 block discarded – undo
1134 1134
 }
1135 1135
 
1136 1136
 function do_download($path) {
1137
-    $name=basename($path);
1137
+    $name = basename($path);
1138 1138
     header('Content-Description: File Transfer');
1139 1139
     header('Content-Type: application/octet-stream');
1140 1140
     header('Content-Disposition: attachment; filename='.$name);
@@ -1142,7 +1142,7 @@  discard block
 block discarded – undo
1142 1142
     header('Expires: 0');
1143 1143
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
1144 1144
     header('Pragma: public');
1145
-    header('Content-Length: ' . filesize($path));
1145
+    header('Content-Length: '.filesize($path));
1146 1146
     flush();
1147 1147
     readfile($path);
1148 1148
 }
@@ -1191,10 +1191,10 @@  discard block
 block discarded – undo
1191 1191
 // Otherwise return 0.
1192 1192
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
1193 1193
 //
1194
-function boinc_client_version(){
1194
+function boinc_client_version() {
1195 1195
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
1196 1196
     $x = $_SERVER['HTTP_USER_AGENT'];
1197
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
1197
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
1198 1198
     if (preg_match($e, $x, $matches)) {
1199 1199
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
1200 1200
     }
@@ -1223,7 +1223,7 @@  discard block
 block discarded – undo
1223 1223
     $rem_name = $name."_remaining";
1224 1224
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
1225 1225
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
1226
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
1226
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
1227 1227
     ;
1228 1228
 }
1229 1229
 
@@ -1253,7 +1253,7 @@  discard block
 block discarded – undo
1253 1253
 // use the following around text with long lines,
1254 1254
 // to limit the width and make it more readable.
1255 1255
 //
1256
-function text_start($width=640) {
1256
+function text_start($width = 640) {
1257 1257
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
1258 1258
 }
1259 1259
 function text_end() {
@@ -1279,7 +1279,7 @@  discard block
 block discarded – undo
1279 1279
 }
1280 1280
 
1281 1281
 function cert_filename() {
1282
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
1282
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
1283 1283
 }
1284 1284
 
1285 1285
 // if user hasn't validated their email addr, tell them to
@@ -1296,6 +1296,6 @@  discard block
 block discarded – undo
1296 1296
     }
1297 1297
 }
1298 1298
 
1299
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
1299
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
1300 1300
 
1301 1301
 ?>
Please login to merge, or discard this patch.
html/inc/sandbox.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 // return list of files matching given pattern,
91 91
 // in the format used for form_select() and form_select_multiple()
92 92
 //
93
-function sandbox_select_items($user, $pattern=null) {
93
+function sandbox_select_items($user, $pattern = null) {
94 94
     $sbfiles = sandbox_file_names($user);
95 95
     $sbitems = [];
96 96
     foreach ($sbfiles as $f) {
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     }
112 112
     $files = sandbox_file_names($user);
113 113
     foreach ($files as $f) {
114
-        if ($regexp && !preg_match("/$regexp/",$f)) continue;
114
+        if ($regexp && !preg_match("/$regexp/", $f)) continue;
115 115
         $x .= "<option value=\"$f\">$f</option>\n";
116 116
     }
117 117
     $x .= "</select>\n";
Please login to merge, or discard this patch.
html/inc/db_conn.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 // Intended to be subclassed (e.g., BoincDb, BossaDb)
23 23
 //
24 24
 class DbConn {
25
-    var $db_conn;       // a mysqli object
26
-    var $db_name;       // the DB name
25
+    var $db_conn; // a mysqli object
26
+    var $db_name; // the DB name
27 27
 
28 28
     function init_conn($user, $passwd, $host, $name) {
29 29
         $x = explode(":", $host);
30
-        if (sizeof($x)>1) {
30
+        if (sizeof($x) > 1) {
31 31
             $host = $x[0];
32 32
             $port = $x[1];
33 33
         } else {
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
         }
36 36
         try {
37 37
             $this->db_conn = @new mysqli($host, $user, $passwd, $name, $port);
38
-        } catch(Exception $e) {
38
+        } catch (Exception $e) {
39 39
             return false;
40 40
         }
41 41
         if (mysqli_connect_error()) {
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
         return $this->enum_general($classname, $query);
137 137
     }
138 138
 
139
-    function enum($table, $classname, $where_clause=null, $order_clause=null) {
139
+    function enum($table, $classname, $where_clause = null, $order_clause = null) {
140 140
         return self::enum_fields(
141 141
             $table, $classname, '*', $where_clause, $order_clause
142 142
         );
@@ -181,15 +181,15 @@  discard block
 block discarded – undo
181 181
         if ($x) return (double)$x->$field;
182 182
         return false;
183 183
     }
184
-    function count($table, $clause="TRUE") {
184
+    function count($table, $clause = "TRUE") {
185 185
         $query = "select count(*) as total from DBNAME.$table where $clause";
186 186
         return $this->get_int($query, 'total');
187 187
     }
188
-    function sum($table, $field, $clause="") {
188
+    function sum($table, $field, $clause = "") {
189 189
         $query = "select sum($field) as total from DBNAME.$table $clause";
190 190
         return $this->get_double($query, 'total');
191 191
     }
192
-    function max($table, $field, $clause="") {
192
+    function max($table, $field, $clause = "") {
193 193
         $query = "select max($field) as total from DBNAME.$table $clause";
194 194
         return $this->get_double($query, 'total');
195 195
     }
Please login to merge, or discard this patch.
html/inc/util_basic.inc 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
     return file_exists("$d/stop_sched");
57 57
 }
58 58
 
59
-function xml_error($num=-1, $msg=null, $file=null, $line=null) {
59
+function xml_error($num = -1, $msg = null, $file = null, $line = null) {
60 60
     global $xml_outer_tag;
61 61
     if (!$msg) {
62
-        switch($num) {
62
+        switch ($num) {
63 63
         case -112: $msg = "Invalid XML"; break;
64 64
         case -136: $msg = "Not found"; break;
65 65
         case -137: $msg = "Name or email address is not unique"; break;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 // If it's a single-tag element, and it's present, just return the tag
106 106
 //
107 107
 function parse_element($xml, $tag) {
108
-    $closetag = "</" . substr($tag,1);
108
+    $closetag = "</".substr($tag, 1);
109 109
     $x = strstr($xml, $tag);
110 110
     if ($x) {
111 111
         if (strstr($tag, "/>")) return $tag;
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 
122 122
 function parse_next_element($xml, $tag, &$cursor) {
123 123
     $element = null;
124
-    $closetag = "</" . substr($tag,1);
125
-    $pos = substr($xml,$cursor);
124
+    $closetag = "</".substr($tag, 1);
125
+    $pos = substr($xml, $cursor);
126 126
     $x = strstr($pos, $tag);
127 127
     if ($x) {
128 128
         if (strstr($tag, "/>")) return $tag;
Please login to merge, or discard this patch.
html/user/submit_rpc_handler.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     if ($template) {
60 60
         $t = (double)$template->workunit->rsc_fpops_est;
61 61
     }
62
-    foreach($r->batch->job as $job) {
62
+    foreach ($r->batch->job as $job) {
63 63
         $y = (double)$job->rsc_fpops_est;
64 64
         if ($y) {
65 65
             $x += $y;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 function est_elapsed_time($r, $template) {
86 86
     // crude estimate: batch FLOPs / project FLOPS
87 87
     //
88
-    return batch_flop_count($r, $template) / project_flops();
88
+    return batch_flop_count($r, $template)/project_flops();
89 89
 }
90 90
 
91 91
 // if batch-level input template filename was given, read it;
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 //
96 96
 function read_input_template($app, $r) {
97 97
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
98
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
98
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
99 99
     } else {
100
-        $path = project_dir() . "/templates/$app->name"."_in";
100
+        $path = project_dir()."/templates/$app->name"."_in";
101 101
     }
102 102
     if (file_exists($path)) {
103 103
         $x = simplexml_load_file($path);
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 function validate_batch($jobs, $template) {
146 146
     $i = 0;
147 147
     $n = count($template->file_info);
148
-    foreach($jobs as $job) {
148
+    foreach ($jobs as $job) {
149 149
         $m = count($job->input_files);
150 150
         if ($n != $m) {
151 151
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 // stage all the files
215 215
 //
216 216
 function stage_files(&$jobs, $user) {
217
-    foreach($jobs as $job) {
217
+    foreach ($jobs as $job) {
218 218
         foreach ($job->input_files as $file) {
219 219
             if ($file->mode != "remote") {
220 220
                 $file->name = stage_file($file, $user);
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 //
228 228
 function submit_jobs(
229 229
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
230
-    $input_template_filename,        // batch-level; can also specify per job
230
+    $input_template_filename, // batch-level; can also specify per job
231 231
     $output_template_filename,
232 232
     $user
233 233
 ) {
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
     // one line per job
238 238
     //
239 239
     $x = "";
240
-    foreach($jobs as $job) {
240
+    foreach ($jobs as $job) {
241 241
         if ($job->name) {
242 242
             $x .= " --wu_name $job->name";
243 243
         }
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $x .= "\n";
273 273
     }
274 274
 
275
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
275
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
276 276
 
277 277
     if ($user->seti_id) {
278 278
         $cmd .= " --target_user $user->id ";
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 //
381 381
 function xml_get_jobs($r) {
382 382
     $jobs = array();
383
-    foreach($r->batch->job as $j) {
383
+    foreach ($r->batch->job as $j) {
384 384
         $job = new StdClass;
385 385
         $job->input_files = array();
386 386
         $job->command_line = (string)$j->command_line;
@@ -431,16 +431,16 @@  discard block
 block discarded – undo
431 431
 //
432 432
 function logical_end_time($r, $jobs, $user, $app) {
433 433
     $total_flops = 0;
434
-    foreach($jobs as $job) {
434
+    foreach ($jobs as $job) {
435 435
         //print_r($job);
436 436
         if ($job->rsc_fpops_est) {
437 437
             $total_flops += $job->rsc_fpops_est;
438 438
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
439
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
439
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
440 440
         } else if ($r->batch->job_params->rsc_fpops_est) {
441
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
441
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
442 442
         } else {
443
-            $x = (double) $template->workunit->rsc_fpops_est;
443
+            $x = (double)$template->workunit->rsc_fpops_est;
444 444
             if ($x) {
445 445
                 $total_flops += $x;
446 446
             } else {
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
             }
449 449
         }
450 450
     }
451
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
451
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
452 452
     $x = exec($cmd);
453 453
     if (!is_numeric($x) || (double)$x == 0) {
454 454
         xml_error(-1, "$cmd returned $x");
@@ -533,15 +533,15 @@  discard block
 block discarded – undo
533 533
     }
534 534
 
535 535
     $job_params = new StdClass;
536
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
537
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
538
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
539
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
540
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
536
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
537
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
538
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
539
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
540
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
541 541
         // could add quorum-related stuff
542 542
 
543
-    $input_template_filename = (string) $r->batch->input_template_filename;
544
-    $output_template_filename = (string) $r->batch->output_template_filename;
543
+    $input_template_filename = (string)$r->batch->input_template_filename;
544
+    $output_template_filename = (string)$r->batch->output_template_filename;
545 545
         // possibly empty
546 546
 
547 547
     submit_jobs(
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 }
635 635
 
636 636
 function n_outfiles($wu) {
637
-    $path = project_dir() . "/$wu->output_template_filename";
637
+    $path = project_dir()."/$wu->output_template_filename";
638 638
     $r = simplexml_load_file($path);
639 639
     return count($r->file_info);
640 640
 }
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 ";
842 842
         if ($result->server_state == 5) {   // over?
843 843
             $paths = get_outfile_paths($result);
844
-            foreach($paths as $path) {
844
+            foreach ($paths as $path) {
845 845
                 if (is_file($path)) {
846 846
                     $size = filesize($path);
847 847
                     echo "        <outfile>
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
     } else {
886 886
         $results = BoincResult::enum("workunitid=$job_id");
887 887
         foreach ($results as $r) {
888
-            switch($r->outcome) {
888
+            switch ($r->outcome) {
889 889
             case 1:
890 890
             case 3:
891 891
             case 6:
@@ -1000,8 +1000,8 @@  discard block
 block discarded – undo
1000 1000
     }
1001 1001
 
1002 1002
     $user = check_remote_submit_permissions($r, $app);
1003
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
1004
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
1003
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
1004
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
1005 1005
     if ($in === false || $out === false) {
1006 1006
         log_write("template file missing");
1007 1007
         xml_error(-1, "template file missing");
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
 
1014 1014
 function ping($r) {
1015 1015
     xml_start_tag("ping");
1016
-    BoincDb::get();     // errors out if DB down or web disabled
1016
+    BoincDb::get(); // errors out if DB down or web disabled
1017 1017
     echo "<success>1</success>
1018 1018
         </ping>
1019 1019
     ";
@@ -1080,9 +1080,9 @@  discard block
 block discarded – undo
1080 1080
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
1081 1081
 if ($request_log) {
1082 1082
     $log_dir = parse_config(get_config(), "<log_dir>");
1083
-    $request_log = $log_dir . "/" . $request_log;
1083
+    $request_log = $log_dir."/".$request_log;
1084 1084
     if ($file = fopen($request_log, "a")) {
1085
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n");
1085
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n");
1086 1086
         fclose($file);
1087 1087
     }
1088 1088
 }
Please login to merge, or discard this patch.
html/user/get_output2.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     if ($user->authenticator != $auth) die('bad auth');
52 52
 }
53 53
 
54
-function do_result_aux($result, $batch, $file_num=null) {
54
+function do_result_aux($result, $batch, $file_num = null) {
55 55
     $phys_names = get_outfile_phys_names($result);
56 56
     $log_names = get_outfile_log_names($result);
57 57
     if ($file_num !== null) {
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         $dir_path = "submit/$batch->id/$result->name";
72 72
         system("rm -r $dir_path");
73 73
         mkdir($dir_path);
74
-        for ($i=0; $i<count($phys_names); $i++) {
74
+        for ($i = 0; $i < count($phys_names); $i++) {
75 75
             $cmd = sprintf('ln -s %s %s/%s',
76 76
                 upload_path($phys_names[$i]),
77 77
                 $dir_path,
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     }
89 89
 }
90 90
 
91
-function do_result($result_id, $auth, $file_num=null) {
91
+function do_result($result_id, $auth, $file_num = null) {
92 92
     $result = BoincResult::lookup_id($result_id);
93 93
     if (!$result) die("no result $result_id");
94 94
     $workunit = BoincWorkunit::lookup_id($result->workunitid);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
             system($cmd);
136 136
         } else {
137 137
             mkdir(sprintf('%s/%s', $dir_path, $result->name));
138
-            for ($i=0; $i<count($phys_names); $i++) {
138
+            for ($i = 0; $i < count($phys_names); $i++) {
139 139
                 $cmd = sprintf('ln -s %s %s/%s/%s',
140 140
                     upload_path($phys_names[$i]),
141 141
                     $dir_path,
Please login to merge, or discard this patch.
html/user/submit.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
     if ($owner) {
462 462
         row2('submitter', $owner->name);
463 463
     }
464
-    row2("application", $app?$app->name:'---');
464
+    row2("application", $app ? $app->name : '---');
465 465
     row2("state", batch_state_string($batch->state));
466 466
     //row2("# jobs", $batch->njobs);
467 467
     //row2("# error jobs", $batch->nerror_jobs);
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
         $x[] = "Download Results";
524 524
     }
525 525
     row_heading_array($x);
526
-    foreach($wus as $wu) {
526
+    foreach ($wus as $wu) {
527 527
         $resultid = $wu->canonical_resultid;
528 528
         if ($resultid) {
529 529
             $y = '<font color="green">completed</font>';
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
             $text = "---";
533 533
             if ($batch->state == BATCH_STATE_COMPLETE) {
534 534
                 $y = '<font color="red">failed</font>';
535
-            }   else {
535
+            } else {
536 536
                 $y = "in progress";
537 537
             }
538 538
         }
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
     $results = BoincResult::enum("workunitid=$wuid");
596 596
     $upload_dir = parse_config(get_config(), "<upload_dir>");
597 597
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
598
-    foreach($results as $result) {
598
+    foreach ($results as $result) {
599 599
         $x = [
600 600
             "<a href=result.php?resultid=$result->id>$result->id</a>",
601 601
             state_string($result)
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
         if ($result->server_state == RESULT_SERVER_STATE_OVER) {
605 605
             $phys_names = get_outfile_phys_names($result);
606 606
             $log_names = get_outfile_log_names($result);
607
-            for ($i=0; $i<count($phys_names); $i++) {
607
+            for ($i = 0; $i < count($phys_names); $i++) {
608 608
                 if ($web_app->assim_move) {
609 609
                     // file is in
610 610
                     // project/results/<batchid>/<wu_name>__file_<log_name>
Please login to merge, or discard this patch.
html/inc/submit_util.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 // get the total size of output files of a batch
301 301
 //
302 302
 function batch_output_file_size($batchid) {
303
-    $batch_td_size=0;
303
+    $batch_td_size = 0;
304 304
     $wus = BoincWorkunit::enum("batch=$batchid");
305 305
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
306 306
     $upload_dir = parse_config(get_config(), "<upload_dir>");
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 }
331 331
 
332 332
 function boinc_get_wu_output_files_url($user, $wu_id) {
333
-    $auth_str =  md5($user->authenticator.$wu_id);
333
+    $auth_str = md5($user->authenticator.$wu_id);
334 334
     return "get_output.php?cmd=workunit_files&wu_id=$wu_id&auth_str=$auth_str";
335 335
 }
336 336
 
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
     if (!file_exists($path)) return null;
365 365
     $x = file_get_contents($path);
366 366
     $n = sscanf($x, "%s %d", $md5, $size);
367
-    if ($n != 2 || strlen($md5)!=32) {
367
+    if ($n != 2 || strlen($md5) != 32) {
368 368
         return null;
369 369
     }
370 370
     return [$md5, $size];
Please login to merge, or discard this patch.