BOINC /
boinc
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | require_once("../inc/bootstrap.inc"); |
| 31 | 31 | |
| 32 | 32 | function master_url() { |
| 33 | - return parse_config(get_config() , "<master_url>"); |
|
| 33 | + return parse_config(get_config(), "<master_url>"); |
|
| 34 | 34 | } |
| 35 | 35 | function recaptcha_public_key() { |
| 36 | 36 | return parse_config(get_config(), "<recaptcha_public_key>"); |
@@ -42,10 +42,10 @@ discard block |
||
| 42 | 42 | // Set parameters to defaults if not defined in config.xml |
| 43 | 43 | |
| 44 | 44 | $x = parse_config(get_config(), "<user_country>"); |
| 45 | -define('USER_COUNTRY', ($x===null)?1:(int)$x); |
|
| 45 | +define('USER_COUNTRY', ($x === null) ? 1 : (int)$x); |
|
| 46 | 46 | |
| 47 | 47 | $x = parse_config(get_config(), "<user_url>"); |
| 48 | -define('USER_URL', ($x===null)?1:(int)$x); |
|
| 48 | +define('USER_URL', ($x === null) ? 1 : (int)$x); |
|
| 49 | 49 | |
| 50 | 50 | // Set parameters to defaults if not defined in project.inc |
| 51 | 51 | |
@@ -155,10 +155,10 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | function url_base() { |
| 158 | - return is_https()?secure_url_base():URL_BASE; |
|
| 158 | + return is_https() ?secure_url_base() : URL_BASE; |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | -function send_cookie($name, $value, $permanent, $ops=false) { |
|
| 161 | +function send_cookie($name, $value, $permanent, $ops = false) { |
|
| 162 | 162 | // the following allows independent login for projects on the same server |
| 163 | 163 | // |
| 164 | 164 | $url = parse_url(master_url()); |
@@ -167,28 +167,28 @@ discard block |
||
| 167 | 167 | $path = substr($path, 0, -1); |
| 168 | 168 | $path .= "_ops/"; |
| 169 | 169 | } |
| 170 | - $expire = $permanent?time()+3600*24*365:0; |
|
| 170 | + $expire = $permanent ?time() + 3600*24*365 : 0; |
|
| 171 | 171 | setcookie($name, $value, $expire, $path, |
| 172 | 172 | '', |
| 173 | - is_https(), // if this page is secure, make cookie secure |
|
| 173 | + is_https(), // if this page is secure, make cookie secure |
|
| 174 | 174 | true // httponly; no JS access |
| 175 | 175 | ); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | -function clear_cookie($name, $ops=false) { |
|
| 178 | +function clear_cookie($name, $ops = false) { |
|
| 179 | 179 | $url = parse_url(master_url()); |
| 180 | 180 | $path = $url['path']; |
| 181 | 181 | if ($ops) { |
| 182 | 182 | $path = substr($path, 0, -1); |
| 183 | 183 | $path .= "_ops/"; |
| 184 | 184 | } |
| 185 | - setcookie($name, '', time()-3600, $path); |
|
| 185 | + setcookie($name, '', time() - 3600, $path); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | $g_logged_in_user = null; |
| 189 | 189 | $got_logged_in_user = false; |
| 190 | 190 | |
| 191 | -function get_logged_in_user($must_be_logged_in=true) { |
|
| 191 | +function get_logged_in_user($must_be_logged_in = true) { |
|
| 192 | 192 | global $g_logged_in_user, $got_logged_in_user; |
| 193 | 193 | if ($got_logged_in_user) { |
| 194 | 194 | // this could have been called earlier with $must_be_logged_in false |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $next_url = $_SERVER['REQUEST_URI']; |
| 215 | 215 | $n = strrpos($next_url, "/"); |
| 216 | 216 | if ($n) { |
| 217 | - $next_url = substr($next_url, $n+1); |
|
| 217 | + $next_url = substr($next_url, $n + 1); |
|
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | $next_url = urlencode($next_url); |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | return $g_logged_in_user; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | -function show_login_info($prefix="") { |
|
| 228 | +function show_login_info($prefix = "") { |
|
| 229 | 229 | $user = get_logged_in_user(false); |
| 230 | 230 | if ($user) { |
| 231 | 231 | $url_tokens = url_tokens($user->authenticator); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | } |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | -$cache_control_extra=""; |
|
| 238 | +$cache_control_extra = ""; |
|
| 239 | 239 | $is_login_page = false; |
| 240 | 240 | |
| 241 | 241 | // Call this to start pages. |
@@ -247,11 +247,11 @@ discard block |
||
| 247 | 247 | // with an existing web framework can more easily do so. |
| 248 | 248 | // To do so, define page_head() in html/project/project.inc |
| 249 | 249 | // |
| 250 | -if (!function_exists("page_head")){ |
|
| 250 | +if (!function_exists("page_head")) { |
|
| 251 | 251 | function page_head( |
| 252 | 252 | $title, |
| 253 | 253 | // page title. Put in <title>, used as title for browser tab. |
| 254 | - $body_attrs=null, |
|
| 254 | + $body_attrs = null, |
|
| 255 | 255 | // <body XXXX> |
| 256 | 256 | // e.g. Javascript to put focus in an input field |
| 257 | 257 | // (onload="document.form.foo.focus()") |
@@ -260,10 +260,10 @@ discard block |
||
| 260 | 260 | // if set, include schedulers.txt. |
| 261 | 261 | // also pass to project_banner() in case you want a different |
| 262 | 262 | // header for your main page. |
| 263 | - $url_prefix="", |
|
| 263 | + $url_prefix = "", |
|
| 264 | 264 | // prepend this to links. |
| 265 | 265 | // Use for web pages not in the top directory |
| 266 | - $head_extra=null |
|
| 266 | + $head_extra = null |
|
| 267 | 267 | // extra stuff to put in <head>. E.g.: |
| 268 | 268 | // reCAPTCHA code (create_profile.php) |
| 269 | 269 | // bbcode javascript (forums) |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | header("Content-type: text/html; charset=utf-8"); |
| 286 | 286 | header("Expires: Mon, 26 Jul 1997 05:00:00 UTC"); |
| 287 | 287 | // Date in the past |
| 288 | - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC"); |
|
| 288 | + header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC"); |
|
| 289 | 289 | // always modified |
| 290 | 290 | header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0"); |
| 291 | 291 | // for HTTP/1.1 |
@@ -308,11 +308,11 @@ discard block |
||
| 308 | 308 | if ($head_extra) { |
| 309 | 309 | echo "\n$head_extra\n"; |
| 310 | 310 | } |
| 311 | - if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) { |
|
| 311 | + if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) { |
|
| 312 | 312 | readfile("schedulers.txt"); |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | - $t = $title?$title:PROJECT; |
|
| 315 | + $t = $title ? $title : PROJECT; |
|
| 316 | 316 | echo "<title>$t</title>\n"; |
| 317 | 317 | echo ' |
| 318 | 318 | <meta charset="utf-8"> |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | echo '<div class="container-fluid"> |
| 369 | 369 | '; |
| 370 | 370 | |
| 371 | - switch($title) { //kludge |
|
| 371 | + switch ($title) { //kludge |
|
| 372 | 372 | case tra("Log in"): |
| 373 | 373 | case tra("Create an account"): |
| 374 | 374 | case tra("Server status page"): |
@@ -383,13 +383,13 @@ discard block |
||
| 383 | 383 | |
| 384 | 384 | // See the comments for page_head() |
| 385 | 385 | // |
| 386 | -if (!function_exists("page_tail")){ |
|
| 386 | +if (!function_exists("page_tail")) { |
|
| 387 | 387 | function page_tail( |
| 388 | - $show_date=false, |
|
| 388 | + $show_date = false, |
|
| 389 | 389 | // true for pages that are generated periodically rather than on the fly |
| 390 | - $url_prefix="", |
|
| 390 | + $url_prefix = "", |
|
| 391 | 391 | // use for pages not at top level |
| 392 | - $is_main=false |
|
| 392 | + $is_main = false |
|
| 393 | 393 | // passed to project_footer; |
| 394 | 394 | ) { |
| 395 | 395 | echo "<br>\n"; |
@@ -423,24 +423,24 @@ discard block |
||
| 423 | 423 | // convert time interval in seconds to a string of the form |
| 424 | 424 | // 'D days h hours m min s sec'. |
| 425 | 425 | |
| 426 | -function time_diff($x, $res=3) { |
|
| 426 | +function time_diff($x, $res = 3) { |
|
| 427 | 427 | $x = (int)$x; |
| 428 | 428 | $days = (int)($x/86400); |
| 429 | - $hours = (int)(($x-$days*86400)/3600); |
|
| 430 | - $minutes = (int)(($x-$days*86400-$hours*3600)/60); |
|
| 431 | - $seconds = $x % 60; |
|
| 429 | + $hours = (int)(($x - $days*86400)/3600); |
|
| 430 | + $minutes = (int)(($x - $days*86400 - $hours*3600)/60); |
|
| 431 | + $seconds = $x%60; |
|
| 432 | 432 | |
| 433 | 433 | $s = ""; |
| 434 | 434 | if ($days) { |
| 435 | 435 | $s .= "$days ".tra("days")." "; |
| 436 | 436 | } |
| 437 | - if ($res>0 && ($hours || strlen($s))) { |
|
| 437 | + if ($res > 0 && ($hours || strlen($s))) { |
|
| 438 | 438 | $s .= "$hours ".tra("hours")." "; |
| 439 | 439 | } |
| 440 | - if ($res>1 && ($minutes || strlen($s))) { |
|
| 440 | + if ($res > 1 && ($minutes || strlen($s))) { |
|
| 441 | 441 | $s .= "$minutes ".tra("min")." "; |
| 442 | 442 | } |
| 443 | - if ($res>2) { |
|
| 443 | + if ($res > 2) { |
|
| 444 | 444 | $s .= "$seconds ".tra("sec")." "; |
| 445 | 445 | } |
| 446 | 446 | return $s; |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | |
| 455 | 455 | function time_str($x) { |
| 456 | 456 | if ($x == 0) return "---"; |
| 457 | - return gmdate('j M Y, G:i:s', (int)$x) . " UTC"; |
|
| 457 | + return gmdate('j M Y, G:i:s', (int)$x)." UTC"; |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | function local_time_str($x) { |
@@ -466,14 +466,14 @@ discard block |
||
| 466 | 466 | return time_str($x); |
| 467 | 467 | } |
| 468 | 468 | |
| 469 | -function start_table_str($class="", $style="") { |
|
| 470 | - $s = $style?'style="'.$style.'"':''; |
|
| 469 | +function start_table_str($class = "", $style = "") { |
|
| 470 | + $s = $style ? 'style="'.$style.'"' : ''; |
|
| 471 | 471 | return '<div class="table"> |
| 472 | 472 | <table '.$s.' width="100%" class="table table-condensed '.$class.'" > |
| 473 | 473 | '; |
| 474 | 474 | } |
| 475 | 475 | |
| 476 | -function start_table($class="", $style="") { |
|
| 476 | +function start_table($class = "", $style = "") { |
|
| 477 | 477 | echo start_table_str($class, $style); |
| 478 | 478 | } |
| 479 | 479 | |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | echo "</tr>\n"; |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | -function row1($x, $ncols=2, $class="heading") { |
|
| 521 | +function row1($x, $ncols = 2, $class = "heading") { |
|
| 522 | 522 | if ($class == "heading") { |
| 523 | 523 | echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n"; |
| 524 | 524 | } else { |
@@ -532,10 +532,10 @@ discard block |
||
| 532 | 532 | |
| 533 | 533 | // a table row with 2 columns, with the left on right-aligned |
| 534 | 534 | |
| 535 | -function row2($x, $y, $show_error=false, $lwidth='40%') { |
|
| 536 | - if ($x==="") $x="<br>"; |
|
| 537 | - if ($y==="") $y="<br>"; |
|
| 538 | - $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS; |
|
| 535 | +function row2($x, $y, $show_error = false, $lwidth = '40%') { |
|
| 536 | + if ($x === "") $x = "<br>"; |
|
| 537 | + if ($y === "") $y = "<br>"; |
|
| 538 | + $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS; |
|
| 539 | 539 | echo "<tr> |
| 540 | 540 | <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td> |
| 541 | 541 | <td $attrs >$y</td> |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | // output the first part of row2(); |
| 547 | 547 | // then write the content, followed by </td></tr> |
| 548 | 548 | |
| 549 | -function row2_init($x, $lwidth='40%') { |
|
| 549 | +function row2_init($x, $lwidth = '40%') { |
|
| 550 | 550 | echo sprintf('<tr> |
| 551 | 551 | <td width="%s" %s>%s</td> |
| 552 | 552 | <td %s>', |
@@ -562,31 +562,31 @@ discard block |
||
| 562 | 562 | echo "<tr><td>$string</td></tr>"; |
| 563 | 563 | } |
| 564 | 564 | |
| 565 | -function row_array($x, $attrs=null) { |
|
| 565 | +function row_array($x, $attrs = null) { |
|
| 566 | 566 | echo "<tr>\n"; |
| 567 | 567 | $i = 0; |
| 568 | 568 | foreach ($x as $h) { |
| 569 | - $a = $attrs?$attrs[$i]:""; |
|
| 569 | + $a = $attrs ? $attrs[$i] : ""; |
|
| 570 | 570 | echo "<td $a>$h</td>\n"; |
| 571 | 571 | $i++; |
| 572 | 572 | } |
| 573 | 573 | echo "</tr>\n"; |
| 574 | 574 | } |
| 575 | 575 | |
| 576 | -define ('ALIGN_RIGHT', 'style="text-align:right;"'); |
|
| 576 | +define('ALIGN_RIGHT', 'style="text-align:right;"'); |
|
| 577 | 577 | |
| 578 | -function row_heading_array($x, $attrs=null, $class='bg-primary') { |
|
| 578 | +function row_heading_array($x, $attrs = null, $class = 'bg-primary') { |
|
| 579 | 579 | echo "<tr>"; |
| 580 | 580 | $i = 0; |
| 581 | 581 | foreach ($x as $h) { |
| 582 | - $a = $attrs?$attrs[$i]:""; |
|
| 582 | + $a = $attrs ? $attrs[$i] : ""; |
|
| 583 | 583 | echo "<th $a class=\"$class\">$h</th>"; |
| 584 | 584 | $i++; |
| 585 | 585 | } |
| 586 | 586 | echo "</tr>\n"; |
| 587 | 587 | } |
| 588 | 588 | |
| 589 | -function row_heading($x, $class='bg-primary') { |
|
| 589 | +function row_heading($x, $class = 'bg-primary') { |
|
| 590 | 590 | echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr> |
| 591 | 591 | ', $class, $x |
| 592 | 592 | ); |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | // If $ellipsis is true, then an ellipsis is added to any sentence which |
| 647 | 647 | // is cut short. |
| 648 | 648 | |
| 649 | -function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) { |
|
| 649 | +function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) { |
|
| 650 | 650 | $words = explode($delimiter, $sentence); |
| 651 | 651 | $total_chars = 0; |
| 652 | 652 | $trunc = false; |
@@ -729,8 +729,8 @@ discard block |
||
| 729 | 729 | |
| 730 | 730 | // returns null if the arg is optional and missing |
| 731 | 731 | // |
| 732 | -function get_int($name, $optional=false) { |
|
| 733 | - $x=null; |
|
| 732 | +function get_int($name, $optional = false) { |
|
| 733 | + $x = null; |
|
| 734 | 734 | if (isset($_GET[$name])) $x = $_GET[$name]; |
| 735 | 735 | if (!is_numeric($x)) { |
| 736 | 736 | if ($optional) { |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | |
| 750 | 750 | // returns null if the arg is optional and missing |
| 751 | 751 | // |
| 752 | -function post_num($name, $optional=false) { |
|
| 752 | +function post_num($name, $optional = false) { |
|
| 753 | 753 | $x = null; |
| 754 | 754 | if (isset($_POST[$name])) $x = $_POST[$name]; |
| 755 | 755 | if (!is_numeric($x)) { |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | |
| 765 | 765 | // returns null if the arg is optional and missing |
| 766 | 766 | // |
| 767 | -function post_int($name, $optional=false) { |
|
| 767 | +function post_int($name, $optional = false) { |
|
| 768 | 768 | $x = post_num($name, $optional); |
| 769 | 769 | if (is_null($x)) return null; |
| 770 | 770 | $y = (int)$x; |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | } |
| 783 | 783 | } |
| 784 | 784 | |
| 785 | -function get_str($name, $optional=false) { |
|
| 785 | +function get_str($name, $optional = false) { |
|
| 786 | 786 | if (isset($_GET[$name])) { |
| 787 | 787 | $x = $_GET[$name]; |
| 788 | 788 | } else { |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | return undo_magic_quotes($x); |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | -function post_str($name, $optional=false) { |
|
| 797 | +function post_str($name, $optional = false) { |
|
| 798 | 798 | if (isset($_POST[$name])) { |
| 799 | 799 | $x = $_POST[$name]; |
| 800 | 800 | } else { |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | return undo_magic_quotes($x); |
| 807 | 807 | } |
| 808 | 808 | |
| 809 | -function post_arr($name, $optional=false) { |
|
| 809 | +function post_arr($name, $optional = false) { |
|
| 810 | 810 | if (isset($_POST[$name]) && is_array($_POST[$name])) { |
| 811 | 811 | $x = $_POST[$name]; |
| 812 | 812 | } else { |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | // the mb_* functions are not included by default |
| 823 | 823 | // return (mb_detect_encoding($passwd) -= 'ASCII'); |
| 824 | 824 | |
| 825 | - for ($i=0; $i<strlen($str); $i++) { |
|
| 825 | + for ($i = 0; $i < strlen($str); $i++) { |
|
| 826 | 826 | $c = ord(substr($str, $i)); |
| 827 | 827 | if ($c < 32 || $c > 127) return false; |
| 828 | 828 | } |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | $number = str_replace(',', '.', $number); // replace the german decimal separator |
| 847 | 847 | // if no value was entered and this is ok |
| 848 | 848 | // |
| 849 | - if ($number=='' && !$low) return true; |
|
| 849 | + if ($number == '' && !$low) return true; |
|
| 850 | 850 | |
| 851 | 851 | // the supplied value contains alphabetic characters |
| 852 | 852 | // |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | |
| 864 | 864 | // Generate a "select" element from an array of values |
| 865 | 865 | // |
| 866 | -function select_from_array($name, $array, $selection=null, $width=240) { |
|
| 866 | +function select_from_array($name, $array, $selection = null, $width = 240) { |
|
| 867 | 867 | $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"'; |
| 868 | 868 | |
| 869 | 869 | foreach ($array as $key => $value) { |
@@ -888,12 +888,12 @@ discard block |
||
| 888 | 888 | return $str; |
| 889 | 889 | } |
| 890 | 890 | |
| 891 | -function strip_bbcode($string){ |
|
| 892 | - return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string); |
|
| 891 | +function strip_bbcode($string) { |
|
| 892 | + return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string); |
|
| 893 | 893 | } |
| 894 | 894 | |
| 895 | 895 | function current_url() { |
| 896 | - $url = is_https()?'https':'http'; |
|
| 896 | + $url = is_https() ? 'https' : 'http'; |
|
| 897 | 897 | $url .= "://"; |
| 898 | 898 | $url .= $_SERVER['SERVER_NAME']; |
| 899 | 899 | $url .= ":".$_SERVER['SERVER_PORT']; |
@@ -911,7 +911,7 @@ discard block |
||
| 911 | 911 | // the colors for bootstrap's btn-success are almost illegible; |
| 912 | 912 | // the green is too light. Use a darker green. |
| 913 | 913 | // |
| 914 | -function button_style($color='green', $font_size=null) { |
|
| 914 | +function button_style($color = 'green', $font_size = null) { |
|
| 915 | 915 | $fs = ''; |
| 916 | 916 | if ($font_size) { |
| 917 | 917 | $fs = sprintf('; font-size:%dpx', $font_size); |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | // class: class of the button, e.g. btn |
| 931 | 931 | // extra: Additional text in href tag |
| 932 | 932 | // |
| 933 | -function button_text($url, $text, $desc=null, $class=null, $extra='') { |
|
| 933 | +function button_text($url, $text, $desc = null, $class = null, $extra = '') { |
|
| 934 | 934 | if (!$desc) { |
| 935 | 935 | $desc = $text; |
| 936 | 936 | } |
@@ -945,23 +945,23 @@ discard block |
||
| 945 | 945 | ); |
| 946 | 946 | } |
| 947 | 947 | |
| 948 | -function button_text_small($url, $text, $desc=null) { |
|
| 948 | +function button_text_small($url, $text, $desc = null) { |
|
| 949 | 949 | return button_text($url, $text, $desc, "btn btn-xs", button_style()); |
| 950 | 950 | } |
| 951 | 951 | |
| 952 | -function show_button($url, $text, $desc=null, $class=null, $extra=null) { |
|
| 952 | +function show_button($url, $text, $desc = null, $class = null, $extra = null) { |
|
| 953 | 953 | echo button_text($url, $text, $desc, $class, $extra); |
| 954 | 954 | } |
| 955 | 955 | |
| 956 | 956 | // for places with a bunch of buttons, like forum posts |
| 957 | 957 | // |
| 958 | -function show_button_small($url, $text, $desc=null) { |
|
| 958 | +function show_button_small($url, $text, $desc = null) { |
|
| 959 | 959 | echo button_text_small($url, $text, $desc); |
| 960 | 960 | } |
| 961 | 961 | |
| 962 | 962 | // used for showing icons |
| 963 | 963 | // |
| 964 | -function show_image($src, $title, $alt, $height=null) { |
|
| 964 | +function show_image($src, $title, $alt, $height = null) { |
|
| 965 | 965 | $h = ""; |
| 966 | 966 | if ($height) { |
| 967 | 967 | $h = "height=\"$height\""; |
@@ -998,7 +998,7 @@ discard block |
||
| 998 | 998 | // tries instead to connect to <replica_db_host> if tag exists. |
| 999 | 999 | // DEPRECATED - use boinc_db.inc |
| 1000 | 1000 | // |
| 1001 | -function db_init($try_replica=false) { |
|
| 1001 | +function db_init($try_replica = false) { |
|
| 1002 | 1002 | check_web_stopped(); |
| 1003 | 1003 | $retval = db_init_aux($try_replica); |
| 1004 | 1004 | if ($retval == 1) { |
@@ -1074,7 +1074,7 @@ discard block |
||
| 1074 | 1074 | // Check this to avoid XSS vulnerability |
| 1075 | 1075 | // |
| 1076 | 1076 | function sanitize_sort_by($x) { |
| 1077 | - switch($x) { |
|
| 1077 | + switch ($x) { |
|
| 1078 | 1078 | case 'expavg_credit': |
| 1079 | 1079 | case 'total_credit': |
| 1080 | 1080 | return; |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | } |
| 1093 | 1093 | |
| 1094 | 1094 | function do_download($path) { |
| 1095 | - $name=basename($path); |
|
| 1095 | + $name = basename($path); |
|
| 1096 | 1096 | header('Content-Description: File Transfer'); |
| 1097 | 1097 | header('Content-Type: application/octet-stream'); |
| 1098 | 1098 | header('Content-Disposition: attachment; filename='.$name); |
@@ -1100,7 +1100,7 @@ discard block |
||
| 1100 | 1100 | header('Expires: 0'); |
| 1101 | 1101 | header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); |
| 1102 | 1102 | header('Pragma: public'); |
| 1103 | - header('Content-Length: ' . filesize($path)); |
|
| 1103 | + header('Content-Length: '.filesize($path)); |
|
| 1104 | 1104 | flush(); |
| 1105 | 1105 | readfile($path); |
| 1106 | 1106 | } |
@@ -1149,10 +1149,10 @@ discard block |
||
| 1149 | 1149 | // Otherwise return 0. |
| 1150 | 1150 | // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)" |
| 1151 | 1151 | // |
| 1152 | -function boinc_client_version(){ |
|
| 1152 | +function boinc_client_version() { |
|
| 1153 | 1153 | if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0; |
| 1154 | 1154 | $x = $_SERVER['HTTP_USER_AGENT']; |
| 1155 | - $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/"; |
|
| 1155 | + $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/"; |
|
| 1156 | 1156 | if (preg_match($e, $x, $matches)) { |
| 1157 | 1157 | return $matches[1]*10000 + $matches[2]*100 + $matches[3]; |
| 1158 | 1158 | } |
@@ -1181,7 +1181,7 @@ discard block |
||
| 1181 | 1181 | $rem_name = $name."_remaining"; |
| 1182 | 1182 | return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\" |
| 1183 | 1183 | onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea> |
| 1184 | - <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining") |
|
| 1184 | + <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining") |
|
| 1185 | 1185 | ; |
| 1186 | 1186 | } |
| 1187 | 1187 | |
@@ -1211,7 +1211,7 @@ discard block |
||
| 1211 | 1211 | // use the following around text with long lines, |
| 1212 | 1212 | // to limit the width and make it more readable. |
| 1213 | 1213 | // |
| 1214 | -function text_start($width=640) { |
|
| 1214 | +function text_start($width = 640) { |
|
| 1215 | 1215 | echo sprintf("<div style=\"max-width: %dpx;\">\n", $width); |
| 1216 | 1216 | } |
| 1217 | 1217 | function text_end() { |
@@ -1237,7 +1237,7 @@ discard block |
||
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | 1239 | function cert_filename() { |
| 1240 | - return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php"; |
|
| 1240 | + return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php"; |
|
| 1241 | 1241 | } |
| 1242 | 1242 | |
| 1243 | 1243 | // if user hasn't validated their email addr, tell them to |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | // - project forums: everyone in POST_REPORT_EMAILS |
| 25 | 25 | // - team message board: team founder and admins |
| 26 | 26 | // |
| 27 | -function mail_report_list($forum, $subject, $body, $must_send=false) { |
|
| 27 | +function mail_report_list($forum, $subject, $body, $must_send = false) { |
|
| 28 | 28 | $success = true; |
| 29 | 29 | switch ($forum->parent_type) { |
| 30 | 30 | case 0: |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | function send_moderation_email($forum, $post, $thread, $explanation, $action) { |
| 66 | 66 | $master_url = master_url(); |
| 67 | 67 | |
| 68 | - $moderator=get_logged_in_user(); |
|
| 68 | + $moderator = get_logged_in_user(); |
|
| 69 | 69 | $body = ""; |
| 70 | 70 | $user = BoincUser::lookup_id($post->user); |
| 71 | 71 | |
@@ -126,11 +126,11 @@ discard block |
||
| 126 | 126 | // There's a new post in the thread, which the user is subscribed to. |
| 127 | 127 | // send them an email notifying them. |
| 128 | 128 | // |
| 129 | -function send_thread_notification_email($thread, $user){ |
|
| 130 | - $title = PROJECT . ": there is a new post in '". $thread->title ."'"; |
|
| 131 | - $link = secure_url_base() . "forum_thread.php?id=" . $thread->id; |
|
| 132 | - $body = "A " . PROJECT . " user has posted to the thread |
|
| 133 | -\"" . $thread->title . "\".\n" |
|
| 129 | +function send_thread_notification_email($thread, $user) { |
|
| 130 | + $title = PROJECT.": there is a new post in '".$thread->title."'"; |
|
| 131 | + $link = secure_url_base()."forum_thread.php?id=".$thread->id; |
|
| 132 | + $body = "A ".PROJECT." user has posted to the thread |
|
| 133 | +\"" . $thread->title."\".\n" |
|
| 134 | 134 | ."To view the updated thread, visit:\n$link |
| 135 | 135 | |
| 136 | 136 | -------------------------- |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | // There's a new thread in the forum, which the user is subscribed to. |
| 145 | 145 | // send them an email notifying them. |
| 146 | 146 | // |
| 147 | -function send_forum_notification_email($forum, $user){ |
|
| 148 | - $title = PROJECT . ": there is a new thread in '". $forum->title ."'"; |
|
| 149 | - $link = secure_url_base() . "forum_forum.php?id=" . $forum->id; |
|
| 150 | - $body = "A " . PROJECT . " user has added a thread to the forum |
|
| 151 | -\"" . $thread->title . "\".\n" |
|
| 147 | +function send_forum_notification_email($forum, $user) { |
|
| 148 | + $title = PROJECT.": there is a new thread in '".$forum->title."'"; |
|
| 149 | + $link = secure_url_base()."forum_forum.php?id=".$forum->id; |
|
| 150 | + $body = "A ".PROJECT." user has added a thread to the forum |
|
| 151 | +\"" . $thread->title."\".\n" |
|
| 152 | 152 | ."To view the updated forum, visit:\n$link |
| 153 | 153 | |
| 154 | 154 | -------------------------- |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | //////////////////// a user clicks the red "x" to report a post /////////// |
| 163 | 163 | // |
| 164 | -function send_report_post_email($user, $forum, $thread, $post, $message) { |
|
| 164 | +function send_report_post_email($user, $forum, $thread, $post, $message) { |
|
| 165 | 165 | $master_url = master_url(); |
| 166 | 166 | |
| 167 | 167 | $body = ""; |
@@ -219,16 +219,16 @@ discard block |
||
| 219 | 219 | // |
| 220 | 220 | function send_banish_vote_email($user, $duration, $reason, $end_time) { |
| 221 | 221 | $master_url = master_url(); |
| 222 | - $now=time(); |
|
| 222 | + $now = time(); |
|
| 223 | 223 | $subject = PROJECT." banishment vote underway"; |
| 224 | 224 | $vote_url = $master_url."forum_banishment_vote.php"; |
| 225 | 225 | $body = " |
| 226 | 226 | A vote has been started to banish you |
| 227 | 227 | from the ".PROJECT." message boards until ".date('M j, |
| 228 | -Y G:i', $duration+$now).", |
|
| 228 | +Y G:i', $duration + $now).", |
|
| 229 | 229 | because your postings have not followed our guidelines. |
| 230 | 230 | |
| 231 | -This vote will last until ".date('M j, Y G:i',$end_time)." or until a majority |
|
| 231 | +This vote will last until ".date('M j, Y G:i', $end_time)." or until a majority |
|
| 232 | 232 | decision has been reached. If the vote does not result in banishment, you will be |
| 233 | 233 | able to resume posting at that time. |
| 234 | 234 | "; |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | mkdir("../cache", 0770); |
| 33 | 33 | chmod("../cache", 0770); |
| 34 | 34 | } |
| 35 | - for ($i=0;$i<256;$i++) { |
|
| 36 | - $j=sprintf("%02x",$i); |
|
| 35 | + for ($i = 0; $i < 256; $i++) { |
|
| 36 | + $j = sprintf("%02x", $i); |
|
| 37 | 37 | if (!@filemtime("../cache/$j")) { |
| 38 | 38 | mkdir("../cache/$j", 0770); |
| 39 | 39 | chmod("../cache/$j", 0770); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | -function get_path($params, $phpfile=null) { |
|
| 44 | +function get_path($params, $phpfile = null) { |
|
| 45 | 45 | if (!@filemtime("../cache/00")) make_cache_dirs(); |
| 46 | 46 | if ($phpfile) { |
| 47 | 47 | $z = $phpfile; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // add a layer of subdirectories for reducing file lookup time |
| 54 | - $sz = substr(md5($z."_".urlencode($params)),1,2); |
|
| 54 | + $sz = substr(md5($z."_".urlencode($params)), 1, 2); |
|
| 55 | 55 | $path = "../cache/".$sz."/".$z; |
| 56 | 56 | if ($params) { |
| 57 | 57 | $path = $path."_".urlencode($params); |
@@ -60,14 +60,14 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | function disk_usage($dir) { |
| 63 | - $usage=0; |
|
| 64 | - if ($handle=@opendir($dir)) { |
|
| 65 | - while ($file=readdir($handle)) { |
|
| 63 | + $usage = 0; |
|
| 64 | + if ($handle = @opendir($dir)) { |
|
| 65 | + while ($file = readdir($handle)) { |
|
| 66 | 66 | if (($file != ".") && ($file != "..")) { |
| 67 | 67 | if (@is_dir($dir."/".$file)) { |
| 68 | - $usage+=disk_usage($dir."/".$file); |
|
| 68 | + $usage += disk_usage($dir."/".$file); |
|
| 69 | 69 | } else { |
| 70 | - $usage+=@filesize($dir."/".$file); |
|
| 70 | + $usage += @filesize($dir."/".$file); |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | if (!chdir($dir)) { |
| 82 | 82 | return; |
| 83 | 83 | } |
| 84 | - if ($handle=@opendir(".")) { |
|
| 85 | - while ($file=readdir($handle)) { |
|
| 84 | + if ($handle = @opendir(".")) { |
|
| 85 | + while ($file = readdir($handle)) { |
|
| 86 | 86 | if ($file == ".") continue; |
| 87 | 87 | if ($file == "..") continue; |
| 88 | 88 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | if (@is_dir($file)) { |
| 94 | 94 | clean_cache($max_age, $file); |
| 95 | 95 | } else { |
| 96 | - if ((time()-@filemtime($file))>$max_age) { |
|
| 96 | + if ((time() - @filemtime($file)) > $max_age) { |
|
| 97 | 97 | //echo "unlinking ".getcwd()."/$file\n"; |
| 98 | 98 | @unlink($file); |
| 99 | 99 | } |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | // check cache size every once in a while, purge if too big |
| 109 | 109 | // |
| 110 | -function cache_check_diskspace(){ |
|
| 111 | - if ((rand() % CACHE_SIZE_CHECK_FREQ)) return; |
|
| 110 | +function cache_check_diskspace() { |
|
| 111 | + if ((rand()%CACHE_SIZE_CHECK_FREQ)) return; |
|
| 112 | 112 | if (disk_usage("../cache") < MAX_CACHE_USAGE) return; |
| 113 | 113 | $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL, |
| 114 | 114 | USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | clean_cache($x, "../cache"); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | -function cache_need_to_regenerate($path, $max_age){ |
|
| 119 | +function cache_need_to_regenerate($path, $max_age) { |
|
| 120 | 120 | $regenerate = false; |
| 121 | 121 | $request = apache_request_headers(); |
| 122 | 122 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | // and touch the cached copy so other processes |
| 129 | 129 | // don't regenerate at the same time |
| 130 | 130 | // |
| 131 | - if ($lastmodified<time()-$max_age) { |
|
| 131 | + if ($lastmodified < time() - $max_age) { |
|
| 132 | 132 | $regenerate = true; |
| 133 | 133 | @touch($path); |
| 134 | 134 | } |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | // Returns cached data or false if nothing was found |
| 142 | -function get_cached_data($max_age, $params=""){ |
|
| 142 | +function get_cached_data($max_age, $params = "") { |
|
| 143 | 143 | global $no_cache; |
| 144 | 144 | |
| 145 | 145 | if ($no_cache) return false; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | } else { |
| 157 | 157 | cache_check_diskspace(); |
| 158 | - $regenerate=cache_need_to_regenerate($path, $max_age); |
|
| 158 | + $regenerate = cache_need_to_regenerate($path, $max_age); |
|
| 159 | 159 | if (!$regenerate) { |
| 160 | 160 | return file_get_contents($path); |
| 161 | 161 | } |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | // DEPRECATED |
| 168 | -function start_cache($max_age, $params=""){ |
|
| 168 | +function start_cache($max_age, $params = "") { |
|
| 169 | 169 | global $no_cache, $caching, $memcache; |
| 170 | 170 | |
| 171 | 171 | if ($no_cache) return; |
@@ -188,15 +188,15 @@ discard block |
||
| 188 | 188 | $regenerate = cache_need_to_regenerate($path, $max_age); |
| 189 | 189 | } |
| 190 | 190 | //Is the stored version too old, do we need to regenerate it? |
| 191 | - if ($regenerate){ |
|
| 191 | + if ($regenerate) { |
|
| 192 | 192 | // If cached version is too old (or non-existent) |
| 193 | 193 | // generate the page and write to cache |
| 194 | 194 | // |
| 195 | 195 | ob_start(); |
| 196 | 196 | ob_implicit_flush(0); |
| 197 | - Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); |
|
| 198 | - Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT"); |
|
| 199 | - Header("Cache-Control: public, max-age=" . $max_age); |
|
| 197 | + Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); |
|
| 198 | + Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT"); |
|
| 199 | + Header("Cache-Control: public, max-age=".$max_age); |
|
| 200 | 200 | |
| 201 | 201 | // allow the calling page to see cache period |
| 202 | 202 | // |
@@ -208,9 +208,9 @@ discard block |
||
| 208 | 208 | if (strstr($params, "format=xml")) { |
| 209 | 209 | header('Content-type: text/xml'); |
| 210 | 210 | } |
| 211 | - Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT"); |
|
| 212 | - Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT"); |
|
| 213 | - Header("Cache-Control: public, max-age=" . $max_age ); |
|
| 211 | + Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT"); |
|
| 212 | + Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT"); |
|
| 213 | + Header("Cache-Control: public, max-age=".$max_age); |
|
| 214 | 214 | if ($cache && $cache->content) { |
| 215 | 215 | echo $cache->content; |
| 216 | 216 | exit; |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | // write output buffer both to client and to cache |
| 230 | 230 | // DEPRECATED |
| 231 | -function end_cache($max_age,$params=""){ |
|
| 231 | +function end_cache($max_age, $params = "") { |
|
| 232 | 232 | global $no_cache; |
| 233 | 233 | if ($no_cache) return; |
| 234 | 234 | |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | -function set_cached_data($max_age, $data, $params=""){ |
|
| 256 | +function set_cached_data($max_age, $data, $params = "") { |
|
| 257 | 257 | // for the benefit of hackers |
| 258 | 258 | if (strstr($params, "..")) { |
| 259 | 259 | return "bad params"; |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | $server_arr = array(); |
| 297 | 297 | $servers = explode('|', MEMCACHE_SERVERS); |
| 298 | - foreach($servers as &$server) { |
|
| 298 | + foreach ($servers as &$server) { |
|
| 299 | 299 | list($ip, $port, $weight) = explode(':', $server); |
| 300 | 300 | if (!$port) { $port = 11211; } |
| 301 | 301 | $server_arr[] = array($ip, $port, $weight); |
@@ -93,9 +93,9 @@ |
||
| 93 | 93 | global $job_keywords; |
| 94 | 94 | $kw = $job_keywords[$id]; |
| 95 | 95 | $u = $uprefs[$id]; |
| 96 | - $yes_checked = ($u == KW_YES)?"checked":""; |
|
| 97 | - $no_checked = ($u == KW_NO)?"checked":""; |
|
| 98 | - $maybe_checked = ($u == KW_MAYBE)?"checked":""; |
|
| 96 | + $yes_checked = ($u == KW_YES) ? "checked" : ""; |
|
| 97 | + $no_checked = ($u == KW_NO) ? "checked" : ""; |
|
| 98 | + $maybe_checked = ($u == KW_MAYBE) ? "checked" : ""; |
|
| 99 | 99 | |
| 100 | 100 | echo sprintf('<tr id="%s" hidden>%s', "row$id", "\n"); |
| 101 | 101 | echo sprintf(' <td width=50%% id="%s"></td>%s', "text$id", "\n"); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $app = BoincApp::lookup_id($ua->app_id); |
| 39 | 39 | $names[] = $app->name; |
| 40 | 40 | } |
| 41 | - $sub = $names?implode(', ', $names):'---'; |
|
| 41 | + $sub = $names ?implode(', ', $names) : '---'; |
|
| 42 | 42 | } |
| 43 | 43 | if ($u->manage_all) { |
| 44 | 44 | $admin = 'All applications'; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $app = BoincApp::lookup_id($ua->app_id); |
| 50 | 50 | $names[] = $app->name; |
| 51 | 51 | } |
| 52 | - $admin = $names?implode(', ', $names):'---'; |
|
| 52 | + $admin = $names ?implode(', ', $names) : '---'; |
|
| 53 | 53 | } |
| 54 | 54 | [$yes, $no] = read_kw_prefs($user); |
| 55 | 55 | global $job_keywords; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | implode('<br>', $kws), |
| 70 | 70 | $u->quota, |
| 71 | 71 | $u->max_jobs_in_progress, |
| 72 | - ($u->logical_start_time > time())?local_time_str($u->logical_start_time):'---' |
|
| 72 | + ($u->logical_start_time > time()) ?local_time_str($u->logical_start_time) : '---' |
|
| 73 | 73 | ); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -199,18 +199,18 @@ discard block |
||
| 199 | 199 | $manage_apps = array_map('intval', $manage_apps); |
| 200 | 200 | foreach ($apps as $app) { |
| 201 | 201 | $s = in_array($app->id, $submit_apps); |
| 202 | - $m = in_array($app->id, $manage_apps)?1:0; |
|
| 202 | + $m = in_array($app->id, $manage_apps) ? 1 : 0; |
|
| 203 | 203 | if ($s || $m) { |
| 204 | 204 | BoincUserSubmitApp::insert( |
| 205 | 205 | "(user_id, app_id, manage) values ($user_id, $app->id, $m)" |
| 206 | 206 | ); |
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | - $quota = (double) get_str('quota'); |
|
| 209 | + $quota = (double)get_str('quota'); |
|
| 210 | 210 | if ($quota != $us->quota) { |
| 211 | 211 | $us->update("quota=$quota"); |
| 212 | 212 | } |
| 213 | - $mj = (int) get_str('max_jobs_in_progress'); |
|
| 213 | + $mj = (int)get_str('max_jobs_in_progress'); |
|
| 214 | 214 | if ($mj != $us->max_jobs_in_progress) { |
| 215 | 215 | $us->update("max_jobs_in_progress=$mj"); |
| 216 | 216 | } |
@@ -31,14 +31,14 @@ |
||
| 31 | 31 | if (file_exists($path)) { |
| 32 | 32 | $x = file($path); |
| 33 | 33 | $yes = explode(' ', trim($x[0])); |
| 34 | - if ($yes[0]=='') $yes=[]; |
|
| 34 | + if ($yes[0] == '') $yes = []; |
|
| 35 | 35 | $yes = array_map('intval', $yes); |
| 36 | 36 | $no = explode(' ', trim($x[1])); |
| 37 | - if ($no[0]=='') $no=[]; |
|
| 37 | + if ($no[0] == '') $no = []; |
|
| 38 | 38 | $no = array_map('intval', $no); |
| 39 | 39 | return [$yes, $no]; |
| 40 | 40 | } else { |
| 41 | - return [[],[]]; |
|
| 41 | + return [[], []]; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | function boinc_recaptcha_get_html($publickey) { |
| 34 | 34 | if ($publickey) { |
| 35 | - return '<div class="g-recaptcha" data-sitekey="' . $publickey . '"></div>'; |
|
| 35 | + return '<div class="g-recaptcha" data-sitekey="'.$publickey.'"></div>'; |
|
| 36 | 36 | } else { |
| 37 | 37 | return ''; |
| 38 | 38 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | // show list of BUDA apps and variants, |
| 55 | 55 | // w/ buttons for adding and deleting |
| 56 | 56 | // |
| 57 | -function app_list($notice=null) { |
|
| 57 | +function app_list($notice = null) { |
|
| 58 | 58 | global $buda_root; |
| 59 | 59 | if (!is_dir($buda_root)) { |
| 60 | 60 | mkdir($buda_root); |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | // |
| 257 | 257 | $x = "<input_template>\n"; |
| 258 | 258 | $ninfiles = 1 + count($variant_desc->input_file_names) + count($variant_desc->app_files); |
| 259 | - for ($i=0; $i<$ninfiles; $i++) { |
|
| 259 | + for ($i = 0; $i < $ninfiles; $i++) { |
|
| 260 | 260 | $x .= " <file_info>\n <sticky/>\n <no_delete/>\n <executable/>\n </file_info>\n"; |
| 261 | 261 | } |
| 262 | 262 | $x .= " <workunit>\n"; |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | ); |
| 287 | 287 | |
| 288 | 288 | $x .= sprintf(" <max_delay>%f</max_delay>\n", |
| 289 | - $variant_desc->max_delay_days * 86400. |
|
| 289 | + $variant_desc->max_delay_days*86400. |
|
| 290 | 290 | ); |
| 291 | 291 | |
| 292 | 292 | $x .= " </workunit>\n<input_template>\n"; |
@@ -476,8 +476,8 @@ discard block |
||
| 476 | 476 | } |
| 477 | 477 | } |
| 478 | 478 | |
| 479 | -function app_form($desc=null) { |
|
| 480 | - page_head_select2($desc?"Edit BUDA app $desc->name":'Create BUDA app'); |
|
| 479 | +function app_form($desc = null) { |
|
| 480 | + page_head_select2($desc ? "Edit BUDA app $desc->name" : 'Create BUDA app'); |
|
| 481 | 481 | form_start('buda.php'); |
| 482 | 482 | form_input_hidden('action', 'app_action'); |
| 483 | 483 | if ($desc) { |
@@ -488,22 +488,22 @@ discard block |
||
| 488 | 488 | form_input_text('Internal name<br><small>No spaces</small>', 'name'); |
| 489 | 489 | } |
| 490 | 490 | form_input_text('User-visible name', 'long_name', |
| 491 | - $desc?$desc->long_name:null |
|
| 491 | + $desc ? $desc->long_name : null |
|
| 492 | 492 | ); |
| 493 | 493 | form_input_textarea( |
| 494 | 494 | 'Description<br><small>... of what the app does and of the research goals</small>', |
| 495 | 495 | 'description', |
| 496 | - $desc?$desc->description:null |
|
| 496 | + $desc ? $desc->description : null |
|
| 497 | 497 | ); |
| 498 | 498 | form_select2_multi('Science keywords', |
| 499 | 499 | 'sci_kw', |
| 500 | 500 | keyword_select_options(KW_CATEGORY_SCIENCE), |
| 501 | - $desc?$desc->sci_kw:null |
|
| 501 | + $desc ? $desc->sci_kw : null |
|
| 502 | 502 | ); |
| 503 | 503 | form_input_text( |
| 504 | 504 | 'URL of web page describing app', |
| 505 | 505 | 'url', |
| 506 | - !empty($desc->url)?$desc->url:'' |
|
| 506 | + !empty($desc->url) ? $desc->url : '' |
|
| 507 | 507 | ); |
| 508 | 508 | // don't include location keywords; |
| 509 | 509 | // various people may submit jobs to this app |
@@ -59,7 +59,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 "; |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | // |
| 384 | 384 | function xml_get_jobs($r) { |
| 385 | 385 | $jobs = array(); |
| 386 | - foreach($r->batch->job as $j) { |
|
| 386 | + foreach ($r->batch->job as $j) { |
|
| 387 | 387 | $job = new StdClass; |
| 388 | 388 | $job->input_files = array(); |
| 389 | 389 | $job->command_line = (string)$j->command_line; |
@@ -436,16 +436,16 @@ discard block |
||
| 436 | 436 | // |
| 437 | 437 | function logical_end_time($r, $jobs, $user, $app) { |
| 438 | 438 | $total_flops = 0; |
| 439 | - foreach($jobs as $job) { |
|
| 439 | + foreach ($jobs as $job) { |
|
| 440 | 440 | //print_r($job); |
| 441 | 441 | if ($job->rsc_fpops_est) { |
| 442 | 442 | $total_flops += $job->rsc_fpops_est; |
| 443 | 443 | } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) { |
| 444 | - $total_flops += (double) $job->input_template->workunit->rsc_fpops_est; |
|
| 444 | + $total_flops += (double)$job->input_template->workunit->rsc_fpops_est; |
|
| 445 | 445 | } else if ($r->batch->job_params->rsc_fpops_est) { |
| 446 | - $total_flops += (double) $r->batch->job_params->rsc_fpops_est; |
|
| 446 | + $total_flops += (double)$r->batch->job_params->rsc_fpops_est; |
|
| 447 | 447 | } else { |
| 448 | - $x = (double) $template->workunit->rsc_fpops_est; |
|
| 448 | + $x = (double)$template->workunit->rsc_fpops_est; |
|
| 449 | 449 | if ($x) { |
| 450 | 450 | $total_flops += $x; |
| 451 | 451 | } else { |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | } |
| 454 | 454 | } |
| 455 | 455 | } |
| 456 | - $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
| 456 | + $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
| 457 | 457 | $x = exec($cmd); |
| 458 | 458 | if (!is_numeric($x) || (double)$x == 0) { |
| 459 | 459 | xml_error(-1, "$cmd returned $x"); |
@@ -538,15 +538,15 @@ discard block |
||
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | $job_params = new StdClass; |
| 541 | - $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound; |
|
| 542 | - $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est; |
|
| 543 | - $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound; |
|
| 544 | - $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound; |
|
| 545 | - $job_params->delay_bound = (double) $r->batch->job_params->delay_bound; |
|
| 541 | + $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound; |
|
| 542 | + $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est; |
|
| 543 | + $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound; |
|
| 544 | + $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound; |
|
| 545 | + $job_params->delay_bound = (double)$r->batch->job_params->delay_bound; |
|
| 546 | 546 | // could add quorum-related stuff |
| 547 | 547 | |
| 548 | - $input_template_filename = (string) $r->batch->input_template_filename; |
|
| 549 | - $output_template_filename = (string) $r->batch->output_template_filename; |
|
| 548 | + $input_template_filename = (string)$r->batch->input_template_filename; |
|
| 549 | + $output_template_filename = (string)$r->batch->output_template_filename; |
|
| 550 | 550 | // possibly empty |
| 551 | 551 | |
| 552 | 552 | submit_jobs( |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | function n_outfiles($wu) { |
| 642 | - $path = project_dir() . "/$wu->output_template_filename"; |
|
| 642 | + $path = project_dir()."/$wu->output_template_filename"; |
|
| 643 | 643 | $r = simplexml_load_file($path); |
| 644 | 644 | return count($r->file_info); |
| 645 | 645 | } |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | "; |
| 847 | 847 | if ($result->server_state == 5) { // over? |
| 848 | 848 | $paths = get_outfile_paths($result); |
| 849 | - foreach($paths as $path) { |
|
| 849 | + foreach ($paths as $path) { |
|
| 850 | 850 | if (is_file($path)) { |
| 851 | 851 | $size = filesize($path); |
| 852 | 852 | echo " <outfile> |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | } else { |
| 891 | 891 | $results = BoincResult::enum("workunitid=$job_id"); |
| 892 | 892 | foreach ($results as $r) { |
| 893 | - switch($r->outcome) { |
|
| 893 | + switch ($r->outcome) { |
|
| 894 | 894 | case 1: |
| 895 | 895 | case 3: |
| 896 | 896 | case 6: |
@@ -1005,8 +1005,8 @@ discard block |
||
| 1005 | 1005 | } |
| 1006 | 1006 | |
| 1007 | 1007 | $user = check_remote_submit_permissions($r, $app); |
| 1008 | - $in = file_get_contents(project_dir() . "/templates/".$app->name."_in"); |
|
| 1009 | - $out = file_get_contents(project_dir() . "/templates/".$app->name."_out"); |
|
| 1008 | + $in = file_get_contents(project_dir()."/templates/".$app->name."_in"); |
|
| 1009 | + $out = file_get_contents(project_dir()."/templates/".$app->name."_out"); |
|
| 1010 | 1010 | if ($in === false || $out === false) { |
| 1011 | 1011 | log_write("template file missing"); |
| 1012 | 1012 | xml_error(-1, "template file missing"); |
@@ -1018,7 +1018,7 @@ discard block |
||
| 1018 | 1018 | |
| 1019 | 1019 | function ping($r) { |
| 1020 | 1020 | xml_start_tag("ping"); |
| 1021 | - BoincDb::get(); // errors out if DB down or web disabled |
|
| 1021 | + BoincDb::get(); // errors out if DB down or web disabled |
|
| 1022 | 1022 | echo "<success>1</success> |
| 1023 | 1023 | </ping> |
| 1024 | 1024 | "; |
@@ -1092,9 +1092,9 @@ discard block |
||
| 1092 | 1092 | $request_log = parse_config(get_config(), "<remote_submit_request_log>"); |
| 1093 | 1093 | if ($request_log) { |
| 1094 | 1094 | $log_dir = parse_config(get_config(), "<log_dir>"); |
| 1095 | - $request_log = $log_dir . "/" . $request_log; |
|
| 1095 | + $request_log = $log_dir."/".$request_log; |
|
| 1096 | 1096 | if ($file = fopen($request_log, "a")) { |
| 1097 | - fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $req . "\n</submit_rpc_handler>\n"); |
|
| 1097 | + fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$req."\n</submit_rpc_handler>\n"); |
|
| 1098 | 1098 | fclose($file); |
| 1099 | 1099 | } |
| 1100 | 1100 | } |
