Inspection of "Strip HTML tags for the page title" - BOINC/boinc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#2980)

by Serghei

created 2019-01-24 07:30 UTC

Status

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch

@@ -38,17 +38,17 @@  discard block
 block discarded – undo
 //
 $config = get_config();
 global $master_url;
-$master_url = parse_config($config , "<master_url>");
+$master_url = parse_config($config, "<master_url>");
 $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
 $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
 
 // the following default to on
 //
 $x = parse_config($config, "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config($config, "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // don't allow /... at the end of URL
 //
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     global $master_url;
 
     // the following allows independent login for projects on the same server
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path);
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     global $master_url;
     $url = parse_url($master_url);
     $path = $url['path'];
@@ -161,13 +161,13 @@  discard block
 block discarded – undo
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) return $g_logged_in_user;
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -219,11 +219,11 @@  discard block
 block discarded – undo
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -232,10 +232,10 @@  discard block
 block discarded – undo
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -274,11 +274,11 @@  discard block
 block discarded – undo
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     printf("<title>%s</title>\n", strip_tags($t));
     echo '
         <meta charset="utf-8">
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -329,13 +329,13 @@  discard block
 block discarded – undo
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -350,10 +350,10 @@  discard block
 block discarded – undo
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
-    for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
+    for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
         echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
     }
 }
@@ -378,23 +378,23 @@  discard block
 block discarded – undo
 // takes argument in second and returns a human formatted time string
 // in the form D days + h Hours + m Min + s sec.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = (int)($x % 60);
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = (int)($x%60);
 
     $datestring = "";
     if ($days) {
         $datestring .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($datestring))) {
+    if ($res > 0 && ($hours || strlen($datestring))) {
         $datestring .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($datestring))) {
+    if ($res > 1 && ($minutes || strlen($datestring))) {
         $datestring .= "$minutes ".tra("min")." ";
     }
-    if ($res>2 && ($seconds)) {
+    if ($res > 2 && ($seconds)) {
         $datestring .= "$seconds ".tra("sec")." ";
     }
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', $x) . " UTC";
+    return gmdate('j M Y, G:i:s', $x)." UTC";
 }
 
 function local_time_str($x) {
@@ -421,14 +421,14 @@  discard block
 block discarded – undo
     return time_str($x);
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
 define('VALUE_ATTRS', 'style="padding-left:12px"');
 define('VALUE_ATTRS_ERR', 'class="danger" style="padding-left:12px"');
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
     ";
 }
 
-function row2_init($x, $y, $lwidth='40%') {
+function row2_init($x, $y, $lwidth = '40%') {
     echo '<tr>
         <td class="text-right " width="'.$lwidth.'"  style="padding-right: 20px;">'.$x.'</td>
         <td '.VALUE_ATTRS.'>'.$y.'
@@ -519,20 +519,20 @@  discard block
 block discarded – undo
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -671,8 +671,8 @@  discard block
 block discarded – undo
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -830,8 +830,8 @@  discard block
 block discarded – undo
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
 
-function button_text($url, $text, $desc=null, $class="btn-success btn-sm") {
+function button_text($url, $text, $desc = null, $class = "btn-success btn-sm") {
     if (!$desc) {
         $desc = $text;
     }
@@ -868,19 +868,19 @@  discard block
 block discarded – undo
     );
 }
 
-function show_button($url, $text, $desc=null, $class="btn-success btn-sm") {
-    echo button_text($url, $text, $desc=null, $class);
+function show_button($url, $text, $desc = null, $class = "btn-success btn-sm") {
+    echo button_text($url, $text, $desc = null, $class);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text($url, $text, $desc, "btn-primary btn-xs");
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -988,7 +988,7 @@  discard block
 block discarded – undo
 function sanitize_numeric($x) {
     if (is_numeric($x)) {
         return $x;
-    } else if (trim($x) == '' ) {
+    } else if (trim($x) == '') {
         return '';
     } else {
         return "not numeric";
@@ -1011,9 +1011,9 @@  discard block
 block discarded – undo
     return $c/(200/24);
 }
 
-function do_download($path,$name="") {
-    if (strcmp($name,"") == 0) {
-        $name=basename($path);
+function do_download($path, $name = "") {
+    if (strcmp($name, "") == 0) {
+        $name = basename($path);
     }
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
@@ -1022,7 +1022,7 @@  discard block
 block discarded – undo
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1071,10 +1071,10 @@  discard block
 block discarded – undo
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1103,7 +1103,7 @@  discard block
 block discarded – undo
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1133,7 +1133,7 @@  discard block
 block discarded – undo
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1146,9 +1146,9 @@  discard block
 block discarded – undo
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Please login to merge, or discard this patch.

		@@ -38,17 +38,17 @@ discard block
		block discarded – undo
38	38	//
39	39	$config = get_config();
40	40	global $master_url;
41		-$master_url = parse_config($config , "<master_url>");
	41	+$master_url = parse_config($config, "<master_url>");
42	42	$recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
43	43	$recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
44	44
45	45	// the following default to on
46	46	//
47	47	$x = parse_config($config, "<user_country>");
48		-define('USER_COUNTRY', ($x===null)?1:(int)$x);
	48	+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
49	49
50	50	$x = parse_config($config, "<user_url>");
51		-define('USER_URL', ($x===null)?1:(int)$x);
	51	+define('USER_URL', ($x === null) ? 1 : (int)$x);
52	52
53	53	// don't allow /... at the end of URL
54	54	//
		@@ -135,10 +135,10 @@ discard block
		block discarded – undo
135	135	}
136	136
137	137	function url_base() {
138		- return is_https()?secure_url_base():URL_BASE;
	138	+ return is_https() ?secure_url_base() : URL_BASE;
139	139	}
140	140
141		-function send_cookie($name, $value, $permanent, $ops=false) {
	141	+function send_cookie($name, $value, $permanent, $ops = false) {
142	142	global $master_url;
143	143
144	144	// the following allows independent login for projects on the same server
		@@ -149,11 +149,11 @@ discard block
		block discarded – undo
149	149	$path = substr($path, 0, -1);
150	150	$path .= "_ops/";
151	151	}
152		- $expire = $permanent?time()+360024365:0;
	152	+ $expire = $permanent ?time() + 360024365 : 0;
153	153	setcookie($name, $value, $expire, $path);
154	154	}
155	155
156		-function clear_cookie($name, $ops=false) {
	156	+function clear_cookie($name, $ops = false) {
157	157	global $master_url;
158	158	$url = parse_url($master_url);
159	159	$path = $url['path'];
		@@ -161,13 +161,13 @@ discard block
		block discarded – undo
161	161	$path = substr($path, 0, -1);
162	162	$path .= "_ops/";
163	163	}
164		- setcookie($name, '', time()-3600, $path);
	164	+ setcookie($name, '', time() - 3600, $path);
165	165	}
166	166
167	167	$g_logged_in_user = null;
168	168	$got_logged_in_user = false;
169	169
170		-function get_logged_in_user($must_be_logged_in=true) {
	170	+function get_logged_in_user($must_be_logged_in = true) {
171	171	global $g_logged_in_user, $got_logged_in_user;
172	172	if ($got_logged_in_user) return $g_logged_in_user;
173	173
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	$next_url = $_SERVER['REQUEST_URI'];
187	187	$n = strrpos($next_url, "/");
188	188	if ($n) {
189		- $next_url = substr($next_url, $n+1);
	189	+ $next_url = substr($next_url, $n + 1);
190	190	}
191	191	}
192	192	$next_url = urlencode($next_url);
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	return $g_logged_in_user;
198	198	}
199	199
200		-function show_login_info($prefix="") {
	200	+function show_login_info($prefix = "") {
201	201	$user = get_logged_in_user(false);
202	202	if ($user) {
203	203	$url_tokens = url_tokens($user->authenticator);
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	}
208	208	}
209	209
210		-$cache_control_extra="";
	210	+$cache_control_extra = "";
211	211	$is_login_page = false;
212	212
213	213	// Call this to start pages.
		@@ -219,11 +219,11 @@ discard block
		block discarded – undo
219	219	// with an existing web framework can more easily do so.
220	220	// To do so, define page_head() in the project include file.
221	221	//
222		-if (!function_exists("page_head")){
	222	+if (!function_exists("page_head")) {
223	223	function page_head(
224	224	$title,
225	225	// page title. Put in <title>, used as title for browser tab.
226		- $body_attrs=null,
	226	+ $body_attrs = null,
227	227	// <body XXXX>
228	228	// e.g. Javascript to put focus in an input field
229	229	// (onload="document.form.foo.focus()")
		@@ -232,10 +232,10 @@ discard block
		block discarded – undo
232	232	// if set, include schedulers.txt.
233	233	// also pass to project_banner() in case you want a different
234	234	// header for your main page.
235		- $url_prefix="",
	235	+ $url_prefix = "",
236	236	// prepend this to links.
237	237	// Use for web pages not in the top directory
238		- $head_extra=null
	238	+ $head_extra = null
239	239	// extra stuff to put in <head>. E.g.:
240	240	// reCAPTCHA code (create_profile.php)
241	241	// bbcode javascript (forums)
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	header("Content-type: text/html; charset=utf-8");
254	254	header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
255	255	// Date in the past
256		- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
	256	+ header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
257	257	// always modified
258	258	header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
259	259	// for HTTP/1.1
		@@ -274,11 +274,11 @@ discard block
		block discarded – undo
274	274	if ($head_extra) {
275	275	echo "\n$head_extra\n";
276	276	}
277		- if ($is_main && (!defined('NO_COMPUTING')\|\|!NO_COMPUTING)) {
	277	+ if ($is_main && (!defined('NO_COMPUTING') \|\| !NO_COMPUTING)) {
278	278	readfile("schedulers.txt");
279	279	}
280	280
281		- $t = $title?$title:PROJECT;
	281	+ $t = $title ? $title : PROJECT;
282	282	printf("<title>%s</title>\n", strip_tags($t));
283	283	echo '
284	284	<meta charset="utf-8">
		@@ -314,7 +314,7 @@ discard block
		block discarded – undo
314	314	echo '<div class="container-fluid">
315	315	';
316	316
317		- switch($title) { //kludge
	317	+ switch ($title) { //kludge
318	318	case tra("Log in"):
319	319	case tra("Create an account"):
320	320	case tra("Server status page"):
		@@ -329,13 +329,13 @@ discard block
		block discarded – undo
329	329
330	330	// See the comments for page_head()
331	331	//
332		-if (!function_exists("page_tail")){
	332	+if (!function_exists("page_tail")) {
333	333	function page_tail(
334		- $show_date=false,
	334	+ $show_date = false,
335	335	// true for pages that are generated periodically rather than on the fly
336		- $url_prefix="",
	336	+ $url_prefix = "",
337	337	// use for pages not at top level
338		- $is_main=false
	338	+ $is_main = false
339	339	// passed to project_footer;
340	340	) {
341	341	echo "<br>\n";
		@@ -350,10 +350,10 @@ discard block
		block discarded – undo
350	350	}
351	351	}
352	352
353		-function display_cvs_versions(){
	353	+function display_cvs_versions() {
354	354	global $cvs_version_tracker;
355	355	echo "\n<!-- SVN VERSIONS -->\n";
356		- for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
	356	+ for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
357	357	echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
358	358	}
359	359	}
		@@ -378,23 +378,23 @@ discard block
		block discarded – undo
378	378	// takes argument in second and returns a human formatted time string
379	379	// in the form D days + h Hours + m Min + s sec.
380	380
381		-function time_diff($x, $res=3) {
	381	+function time_diff($x, $res = 3) {
382	382	$days = (int)($x/86400);
383		- $hours = (int)(($x-$days*86400)/3600);
384		- $minutes = (int)(($x-$days86400-$hours3600)/60);
385		- $seconds = (int)($x % 60);
	383	+ $hours = (int)(($x - $days*86400)/3600);
	384	+ $minutes = (int)(($x - $days86400 - $hours3600)/60);
	385	+ $seconds = (int)($x%60);
386	386
387	387	$datestring = "";
388	388	if ($days) {
389	389	$datestring .= "$days ".tra("days")." ";
390	390	}
391		- if ($res>0 && ($hours \|\| strlen($datestring))) {
	391	+ if ($res > 0 && ($hours \|\| strlen($datestring))) {
392	392	$datestring .= "$hours ".tra("hours")." ";
393	393	}
394		- if ($res>1 && ($minutes \|\| strlen($datestring))) {
	394	+ if ($res > 1 && ($minutes \|\| strlen($datestring))) {
395	395	$datestring .= "$minutes ".tra("min")." ";
396	396	}
397		- if ($res>2 && ($seconds)) {
	397	+ if ($res > 2 && ($seconds)) {
398	398	$datestring .= "$seconds ".tra("sec")." ";
399	399	}
400	400
		@@ -409,7 +409,7 @@ discard block
		block discarded – undo
409	409
410	410	function time_str($x) {
411	411	if ($x == 0) return "---";
412		- return gmdate('j M Y, G:i:s', $x) . " UTC";
	412	+ return gmdate('j M Y, G:i:s', $x)." UTC";
413	413	}
414	414
415	415	function local_time_str($x) {
		@@ -421,14 +421,14 @@ discard block
		block discarded – undo
421	421	return time_str($x);
422	422	}
423	423
424		-function start_table_str($class="", $style="") {
425		- $s = $style?'style="'.$style.'"':'';
	424	+function start_table_str($class = "", $style = "") {
	425	+ $s = $style ? 'style="'.$style.'"' : '';
426	426	return '<div class="table">
427	427	<table '.$s.' width="100%" class="table table-condensed '.$class.'" >
428	428	';
429	429	}
430	430
431		-function start_table($class="", $style="") {
	431	+function start_table($class = "", $style = "") {
432	432	echo start_table_str($class, $style);
433	433	}
434	434
		@@ -473,7 +473,7 @@ discard block
		block discarded – undo
473	473	echo "</tr>\n";
474	474	}
475	475
476		-function row1($x, $ncols=2, $class="heading") {
	476	+function row1($x, $ncols = 2, $class = "heading") {
477	477	if ($class == "heading") {
478	478	echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
479	479	} else {
		@@ -485,10 +485,10 @@ discard block
		block discarded – undo
485	485	define('VALUE_ATTRS', 'style="padding-left:12px"');
486	486	define('VALUE_ATTRS_ERR', 'class="danger" style="padding-left:12px"');
487	487
488		-function row2($x, $y, $show_error=false, $lwidth='40%') {
489		- if ($x==="") $x="<br>";
490		- if ($y==="") $y="<br>";
491		- $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
	488	+function row2($x, $y, $show_error = false, $lwidth = '40%') {
	489	+ if ($x === "") $x = "<br>";
	490	+ if ($y === "") $y = "<br>";
	491	+ $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
492	492	echo "<tr>
493	493	<td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
494	494	<td $attrs >$y</td>
		@@ -496,7 +496,7 @@ discard block
		block discarded – undo
496	496	";
497	497	}
498	498
499		-function row2_init($x, $y, $lwidth='40%') {
	499	+function row2_init($x, $y, $lwidth = '40%') {
500	500	echo '<tr>
501	501	<td class="text-right " width="'.$lwidth.'" style="padding-right: 20px;">'.$x.'</td>
502	502	<td '.VALUE_ATTRS.'>'.$y.'
		@@ -519,20 +519,20 @@ discard block
		block discarded – undo
519	519	echo "</tr>\n";
520	520	}
521	521
522		-define ('ALIGN_RIGHT', 'style="text-align:right;"');
	522	+define('ALIGN_RIGHT', 'style="text-align:right;"');
523	523
524		-function row_heading_array($x, $attrs=null, $class='bg-primary') {
	524	+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
525	525	echo "<tr>";
526	526	$i = 0;
527	527	foreach ($x as $h) {
528		- $a = $attrs?$attrs[$i]:"";
	528	+ $a = $attrs ? $attrs[$i] : "";
529	529	echo "<th $a class=\"$class\">$h</th>";
530	530	$i++;
531	531	}
532	532	echo "</tr>\n";
533	533	}
534	534
535		-function row_heading($x, $class='bg-primary') {
	535	+function row_heading($x, $class = 'bg-primary') {
536	536	echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
537	537	', $class, $x
538	538	);
		@@ -588,7 +588,7 @@ discard block
		block discarded – undo
588	588	// If $ellipsis is true, then an ellipsis is added to any sentence which
589	589	// is cut short.
590	590
591		-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
	591	+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
592	592	$words = explode($delimiter, $sentence);
593	593	$total_chars = 0;
594	594	$trunc = false;
		@@ -671,8 +671,8 @@ discard block
		block discarded – undo
671	671
672	672	// returns null if the arg is optional and missing
673	673	//
674		-function get_int($name, $optional=false) {
675		- $x=null;
	674	+function get_int($name, $optional = false) {
	675	+ $x = null;
676	676	if (isset($_GET[$name])) $x = $_GET[$name];
677	677	if (!is_numeric($x)) {
678	678	if ($optional) {
		@@ -691,7 +691,7 @@ discard block
		block discarded – undo
691	691
692	692	// returns null if the arg is optional and missing
693	693	//
694		-function post_num($name, $optional=false) {
	694	+function post_num($name, $optional = false) {
695	695	$x = null;
696	696	if (isset($_POST[$name])) $x = $_POST[$name];
697	697	if (!is_numeric($x)) {
		@@ -706,7 +706,7 @@ discard block
		block discarded – undo
706	706
707	707	// returns null if the arg is optional and missing
708	708	//
709		-function post_int($name, $optional=false) {
	709	+function post_int($name, $optional = false) {
710	710	$x = post_num($name, $optional);
711	711	if (is_null($x)) return null;
712	712	$y = (int)$x;
		@@ -724,7 +724,7 @@ discard block
		block discarded – undo
724	724	}
725	725	}
726	726
727		-function get_str($name, $optional=false) {
	727	+function get_str($name, $optional = false) {
728	728	if (isset($_GET[$name])) {
729	729	$x = $_GET[$name];
730	730	} else {
		@@ -736,7 +736,7 @@ discard block
		block discarded – undo
736	736	return undo_magic_quotes($x);
737	737	}
738	738
739		-function post_str($name, $optional=false) {
	739	+function post_str($name, $optional = false) {
740	740	if (isset($_POST[$name])) {
741	741	$x = $_POST[$name];
742	742	} else {
		@@ -748,7 +748,7 @@ discard block
		block discarded – undo
748	748	return undo_magic_quotes($x);
749	749	}
750	750
751		-function post_arr($name, $optional=false) {
	751	+function post_arr($name, $optional = false) {
752	752	if (isset($_POST[$name]) && is_array($_POST[$name])) {
753	753	$x = $_POST[$name];
754	754	} else {
		@@ -764,7 +764,7 @@ discard block
		block discarded – undo
764	764	// the mb_* functions are not included by default
765	765	// return (mb_detect_encoding($passwd) -= 'ASCII');
766	766
767		- for ($i=0; $i<strlen($str); $i++) {
	767	+ for ($i = 0; $i < strlen($str); $i++) {
768	768	$c = ord(substr($str, $i));
769	769	if ($c < 32 \|\| $c > 127) return false;
770	770	}
		@@ -788,7 +788,7 @@ discard block
		block discarded – undo
788	788	$number = str_replace(',', '.', $number); // replace the german decimal separator
789	789	// if no value was entered and this is ok
790	790	//
791		- if ($number=='' && !$low) return true;
	791	+ if ($number == '' && !$low) return true;
792	792
793	793	// the supplied value contains alphabetic characters
794	794	//
		@@ -805,7 +805,7 @@ discard block
		block discarded – undo
805	805
806	806	// Generate a "select" element from an array of values
807	807	//
808		-function select_from_array($name, $array, $selection=null, $width=240) {
	808	+function select_from_array($name, $array, $selection = null, $width = 240) {
809	809	$out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
810	810
811	811	foreach ($array as $key => $value) {
		@@ -830,8 +830,8 @@ discard block
		block discarded – undo
830	830	return $str;
831	831	}
832	832
833		-function strip_bbcode($string){
834		- return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
	833	+function strip_bbcode($string) {
	834	+ return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
835	835	}
836	836
837	837	function current_url() {
		@@ -859,7 +859,7 @@ discard block
		block discarded – undo
859	859	// @param class The optional CSS class of the button. Defaults to a standard button
860	860	//
861	861
862		-function button_text($url, $text, $desc=null, $class="btn-success btn-sm") {
	862	+function button_text($url, $text, $desc = null, $class = "btn-success btn-sm") {
863	863	if (!$desc) {
864	864	$desc = $text;
865	865	}
		@@ -868,19 +868,19 @@ discard block
		block discarded – undo
868	868	);
869	869	}
870	870
871		-function show_button($url, $text, $desc=null, $class="btn-success btn-sm") {
872		- echo button_text($url, $text, $desc=null, $class);
	871	+function show_button($url, $text, $desc = null, $class = "btn-success btn-sm") {
	872	+ echo button_text($url, $text, $desc = null, $class);
873	873	}
874	874
875	875	// for places with a bunch of buttons, like forum posts
876	876	//
877		-function show_button_small($url, $text, $desc=null) {
	877	+function show_button_small($url, $text, $desc = null) {
878	878	echo button_text($url, $text, $desc, "btn-primary btn-xs");
879	879	}
880	880
881	881	// used for showing icons
882	882	//
883		-function show_image($src, $title, $alt, $height=null) {
	883	+function show_image($src, $title, $alt, $height = null) {
884	884	$h = "";
885	885	if ($height) {
886	886	$h = "height=\"$height\"";
		@@ -917,7 +917,7 @@ discard block
		block discarded – undo
917	917	// tries instead to connect to <replica_db_host> if tag exists.
918	918	// DEPRECATED - use boinc_db.inc
919	919	//
920		-function db_init($try_replica=false) {
	920	+function db_init($try_replica = false) {
921	921	check_web_stopped();
922	922	$retval = db_init_aux($try_replica);
923	923	if ($retval == 1) {
		@@ -988,7 +988,7 @@ discard block
		block discarded – undo
988	988	function sanitize_numeric($x) {
989	989	if (is_numeric($x)) {
990	990	return $x;
991		- } else if (trim($x) == '' ) {
	991	+ } else if (trim($x) == '') {
992	992	return '';
993	993	} else {
994	994	return "not numeric";
		@@ -1011,9 +1011,9 @@ discard block
		block discarded – undo
1011	1011	return $c/(200/24);
1012	1012	}
1013	1013
1014		-function do_download($path,$name="") {
1015		- if (strcmp($name,"") == 0) {
1016		- $name=basename($path);
	1014	+function do_download($path, $name = "") {
	1015	+ if (strcmp($name, "") == 0) {
	1016	+ $name = basename($path);
1017	1017	}
1018	1018	header('Content-Description: File Transfer');
1019	1019	header('Content-Type: application/octet-stream');
		@@ -1022,7 +1022,7 @@ discard block
		block discarded – undo
1022	1022	header('Expires: 0');
1023	1023	header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
1024	1024	header('Pragma: public');
1025		- header('Content-Length: ' . filesize($path));
	1025	+ header('Content-Length: '.filesize($path));
1026	1026	flush();
1027	1027	readfile($path);
1028	1028	}
		@@ -1071,10 +1071,10 @@ discard block
		block discarded – undo
1071	1071	// Otherwise return 0.
1072	1072	// Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
1073	1073	//
1074		-function boinc_client_version(){
	1074	+function boinc_client_version() {
1075	1075	if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
1076	1076	$x = $_SERVER['HTTP_USER_AGENT'];
1077		- $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
	1077	+ $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
1078	1078	if (preg_match($e, $x, $matches)) {
1079	1079	return $matches[1]10000 + $matches[2]100 + $matches[3];
1080	1080	}
		@@ -1103,7 +1103,7 @@ discard block
		block discarded – undo
1103	1103	$rem_name = $name."_remaining";
1104	1104	return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
1105	1105	onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
1106		- <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
	1106	+ <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
1107	1107	;
1108	1108	}
1109	1109
		@@ -1133,7 +1133,7 @@ discard block
		block discarded – undo
1133	1133	// use the following around text with long lines,
1134	1134	// to limit the width and make it more readable.
1135	1135	//
1136		-function text_start($width=640) {
	1136	+function text_start($width = 640) {
1137	1137	echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
1138	1138	}
1139	1139	function text_end() {
		@@ -1146,9 +1146,9 @@ discard block
		block discarded – undo
1146	1146	}
1147	1147
1148	1148	function cert_filename() {
1149		- return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
	1149	+ return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
1150	1150	}
1151	1151
1152		-$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit
	1152	+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
1153	1153
1154	1154	?>

BOINC / boinc

Pull Request — master (#2980)

Status

Category

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch