Inspection of "web: add support for showing long text with a 'mor..." - BOINC/boinc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#5574)

by David

created 2024-04-10 01:42 UTC

Status

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

@@ -33,17 +33,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>");
 
 // Set parameters to defaults if not defined in config.xml
 
 $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);
 
 // Set parameters to defaults if not defined in project.inc
 
@@ -136,10 +136,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
@@ -150,11 +150,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'];
@@ -162,13 +162,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) {
         // this could have been called earlier with $must_be_logged_in false
@@ -194,7 +194,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);
@@ -205,7 +205,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);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -227,11 +227,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()")
@@ -240,10 +240,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)
@@ -265,7 +265,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
@@ -286,11 +286,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;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -347,7 +347,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"):
@@ -362,13 +362,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";
@@ -383,10 +383,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";
     }
 }
@@ -411,24 +411,24 @@  discard block
 block discarded – undo
 // convert time interval in seconds to a string of the form
 // 'D days h hours m min s sec'.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $x = (int)$x;
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = $x % 60;
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = $x%60;
 
     $s = "";
     if ($days) {
         $s .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($s))) {
+    if ($res > 0 && ($hours || strlen($s))) {
         $s .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($s))) {
+    if ($res > 1 && ($minutes || strlen($s))) {
         $s .= "$minutes ".tra("min")." ";
     }
-    if ($res>2) {
+    if ($res > 2) {
         $s .= "$seconds ".tra("sec")." ";
     }
     return $s;
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
+    return gmdate('j M Y, G:i:s', (int)$x)." UTC";
 }
 
 function local_time_str($x) {
@@ -454,14 +454,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);
 }
 
@@ -506,7 +506,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 {
@@ -520,10 +520,10 @@  discard block
 block discarded – undo
 
 // a table row with 2 columns, with the left on right-aligned
 
-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>
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
 // output the first part of row2();
 // then write the content, followed by </td></tr>
 
-function row2_init($x, $lwidth='40%') {
+function row2_init($x, $lwidth = '40%') {
     echo sprintf('<tr>
         <td width="%s" %s>%s</td>
         <td %s>',
@@ -558,20 +558,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
     );
@@ -631,7 +631,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;
@@ -714,8 +714,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) {
@@ -734,7 +734,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)) {
@@ -749,7 +749,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;
@@ -767,7 +767,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 {
@@ -779,7 +779,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 {
@@ -791,7 +791,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 {
@@ -807,7 +807,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;
     }
@@ -831,7 +831,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
     //
@@ -848,7 +848,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) {
@@ -873,8 +873,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() {
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
 // @params extra Additional text in href tag
 //
 
-function button_text($url, $text, $desc=null, $class=null, $extra='') {
+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
     if (!$desc) {
         $desc = $text;
     }
@@ -915,19 +915,19 @@  discard block
 block discarded – undo
     );
 }
 
-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
     echo button_text($url, $text, $desc, $class, $extra);
 }
 
 // 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\"";
@@ -964,7 +964,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) {
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
 // Check this to avoid XSS vulnerability
 //
 function sanitize_sort_by($x) {
-    switch($x) {
+    switch ($x) {
     case 'expavg_credit':
     case 'total_credit':
         return;
@@ -1097,9 +1097,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');
@@ -1108,7 +1108,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);
 }
@@ -1157,10 +1157,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];
     }
@@ -1189,7 +1189,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")
     ;
 }
 
@@ -1219,7 +1219,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() {
@@ -1245,7 +1245,7 @@  discard block
 block discarded – undo
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to
@@ -1262,6 +1262,6 @@  discard block
 block discarded – undo
     }
 }
 
-$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.

html/inc/team.inc 1 patch

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

@@ -40,7 +40,7 @@  discard block
 block discarded – undo
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
     row2(
         tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
-        '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
+        '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
     row2_init(tra('Country'));
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
     $country = $params->country;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
     echo country_select_options($country);
     echo "</select></td></tr>\n";
     row2(tra('Type of team'), team_type_select($params->type, true));
-    $checked = $params->active?"checked":"";
+    $checked = $params->active ? "checked" : "";
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
     row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
     end_table();
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
     row2("Created", date_str($team->create_time));
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
         $founder = $team->founder;
-        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
+        row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
     }
     if (strlen($team->url)) {;
         if (strstr($team->url, "http://")) {
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
     }
     row1(tra('Members'));
     row2(tra('Founder'),
-        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
+        $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
     );
     if (count($team->admins)) {
         $first = true;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
     foreach ($deltas as $delta) {
         $u = BoincUser::lookup_id($delta->userid);
         if ($u->teamid == $teamid) {
-            $new_members[] = $u->id;  // they might have later quit
+            $new_members[] = $u->id; // they might have later quit
         }
     }
     return array_unique($new_members);
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
     if (!$user->teamid) return;
     $user->update("teamid=0");
     $team = BoincTeam::lookup_id($user->teamid);
-    if ($team && $team->ping_user==$user->id) {
+    if ($team && $team->ping_user == $user->id) {
         $team->update("ping_user=-ping_user");
     }
     BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
@@ -478,33 +478,33 @@  discard block
 block discarded – undo
     start_table();
     row2(tra('Team name, text version').'
         <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
-        '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
+        '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
     );
     row2(tra('Team name, HTML version').'
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
-        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
+        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
     );
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
         '.tra('This URL will be linked to from the team\'s page on this site.'),
-        '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
+        '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
     );
     row2(tra('Description of team').':
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         </p>',
-        '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
+        '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
     );
 
-    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
+    row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
 
     row2_init(tra('Country'));
     echo '<select class="form-control" name="country">';
-    echo country_select_options($team?$team->country:null);
+    echo country_select_options($team ? $team->country : null);
     echo "</select></td></tr>\n";
 
-    $x = (!$team || $team->joinable)?"checked":"";
+    $x = (!$team || $team->joinable) ? "checked" : "";
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
     // Check if we're using reCaptcha to prevent spam accounts
     //
@@ -568,12 +568,12 @@  discard block
 block discarded – undo
 //
 function new_transfer_request_ok($team, $now) {
     if ($team->ping_user <= 0) {
-        if ($team->ping_time < $now - 60 * 86400) {
+        if ($team->ping_time < $now - 60*86400) {
             return true;
         }
         return false;
     }
-    if ($team->ping_time < $now - 90 * 86400) {
+    if ($team->ping_time < $now - 90*86400) {
         return true;
     }
     return false;
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
     if (!is_valid_country($country)) {
         $country = tra('None');
     }
-    $country = BoincDb::escape_string($country);  // for Cote d'Ivoire
+    $country = BoincDb::escape_string($country); // for Cote d'Ivoire
 
     $clause = sprintf(
         "(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
@@ -631,6 +631,6 @@  discard block
 block discarded – undo
     }
 }
 
-$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.

		@@ -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
		@@ -136,10 +136,10 @@ discard block
		block discarded – undo
136	136	}
137	137
138	138	function url_base() {
139		- return is_https()?secure_url_base():URL_BASE;
	139	+ return is_https() ?secure_url_base() : URL_BASE;
140	140	}
141	141
142		-function send_cookie($name, $value, $permanent, $ops=false) {
	142	+function send_cookie($name, $value, $permanent, $ops = false) {
143	143	global $master_url;
144	144
145	145	// the following allows independent login for projects on the same server
		@@ -150,11 +150,11 @@ discard block
		block discarded – undo
150	150	$path = substr($path, 0, -1);
151	151	$path .= "_ops/";
152	152	}
153		- $expire = $permanent?time()+360024365:0;
	153	+ $expire = $permanent ?time() + 360024365 : 0;
154	154	setcookie($name, $value, $expire, $path);
155	155	}
156	156
157		-function clear_cookie($name, $ops=false) {
	157	+function clear_cookie($name, $ops = false) {
158	158	global $master_url;
159	159	$url = parse_url($master_url);
160	160	$path = $url['path'];
		@@ -162,13 +162,13 @@ discard block
		block discarded – undo
162	162	$path = substr($path, 0, -1);
163	163	$path .= "_ops/";
164	164	}
165		- setcookie($name, '', time()-3600, $path);
	165	+ setcookie($name, '', time() - 3600, $path);
166	166	}
167	167
168	168	$g_logged_in_user = null;
169	169	$got_logged_in_user = false;
170	170
171		-function get_logged_in_user($must_be_logged_in=true) {
	171	+function get_logged_in_user($must_be_logged_in = true) {
172	172	global $g_logged_in_user, $got_logged_in_user;
173	173	if ($got_logged_in_user) {
174	174	// this could have been called earlier with $must_be_logged_in false
		@@ -194,7 +194,7 @@ discard block
		block discarded – undo
194	194	$next_url = $_SERVER['REQUEST_URI'];
195	195	$n = strrpos($next_url, "/");
196	196	if ($n) {
197		- $next_url = substr($next_url, $n+1);
	197	+ $next_url = substr($next_url, $n + 1);
198	198	}
199	199	}
200	200	$next_url = urlencode($next_url);
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205	return $g_logged_in_user;
206	206	}
207	207
208		-function show_login_info($prefix="") {
	208	+function show_login_info($prefix = "") {
209	209	$user = get_logged_in_user(false);
210	210	if ($user) {
211	211	$url_tokens = url_tokens($user->authenticator);
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	}
216	216	}
217	217
218		-$cache_control_extra="";
	218	+$cache_control_extra = "";
219	219	$is_login_page = false;
220	220
221	221	// Call this to start pages.
		@@ -227,11 +227,11 @@ discard block
		block discarded – undo
227	227	// with an existing web framework can more easily do so.
228	228	// To do so, define page_head() in the project include file.
229	229	//
230		-if (!function_exists("page_head")){
	230	+if (!function_exists("page_head")) {
231	231	function page_head(
232	232	$title,
233	233	// page title. Put in <title>, used as title for browser tab.
234		- $body_attrs=null,
	234	+ $body_attrs = null,
235	235	// <body XXXX>
236	236	// e.g. Javascript to put focus in an input field
237	237	// (onload="document.form.foo.focus()")
		@@ -240,10 +240,10 @@ discard block
		block discarded – undo
240	240	// if set, include schedulers.txt.
241	241	// also pass to project_banner() in case you want a different
242	242	// header for your main page.
243		- $url_prefix="",
	243	+ $url_prefix = "",
244	244	// prepend this to links.
245	245	// Use for web pages not in the top directory
246		- $head_extra=null
	246	+ $head_extra = null
247	247	// extra stuff to put in <head>. E.g.:
248	248	// reCAPTCHA code (create_profile.php)
249	249	// bbcode javascript (forums)
		@@ -265,7 +265,7 @@ discard block
		block discarded – undo
265	265	header("Content-type: text/html; charset=utf-8");
266	266	header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
267	267	// Date in the past
268		- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
	268	+ header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
269	269	// always modified
270	270	header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
271	271	// for HTTP/1.1
		@@ -286,11 +286,11 @@ discard block
		block discarded – undo
286	286	if ($head_extra) {
287	287	echo "\n$head_extra\n";
288	288	}
289		- if ($is_main && (!defined('NO_COMPUTING')\|\|!NO_COMPUTING)) {
	289	+ if ($is_main && (!defined('NO_COMPUTING') \|\| !NO_COMPUTING)) {
290	290	readfile("schedulers.txt");
291	291	}
292	292
293		- $t = $title?$title:PROJECT;
	293	+ $t = $title ? $title : PROJECT;
294	294	echo "<title>$t</title>\n";
295	295	echo '
296	296	<meta charset="utf-8">
		@@ -347,7 +347,7 @@ discard block
		block discarded – undo
347	347	echo '<div class="container-fluid">
348	348	';
349	349
350		- switch($title) { //kludge
	350	+ switch ($title) { //kludge
351	351	case tra("Log in"):
352	352	case tra("Create an account"):
353	353	case tra("Server status page"):
		@@ -362,13 +362,13 @@ discard block
		block discarded – undo
362	362
363	363	// See the comments for page_head()
364	364	//
365		-if (!function_exists("page_tail")){
	365	+if (!function_exists("page_tail")) {
366	366	function page_tail(
367		- $show_date=false,
	367	+ $show_date = false,
368	368	// true for pages that are generated periodically rather than on the fly
369		- $url_prefix="",
	369	+ $url_prefix = "",
370	370	// use for pages not at top level
371		- $is_main=false
	371	+ $is_main = false
372	372	// passed to project_footer;
373	373	) {
374	374	echo "<br>\n";
		@@ -383,10 +383,10 @@ discard block
		block discarded – undo
383	383	}
384	384	}
385	385
386		-function display_cvs_versions(){
	386	+function display_cvs_versions() {
387	387	global $cvs_version_tracker;
388	388	echo "\n<!-- SVN VERSIONS -->\n";
389		- for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
	389	+ for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
390	390	echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
391	391	}
392	392	}
		@@ -411,24 +411,24 @@ discard block
		block discarded – undo
411	411	// convert time interval in seconds to a string of the form
412	412	// 'D days h hours m min s sec'.
413	413
414		-function time_diff($x, $res=3) {
	414	+function time_diff($x, $res = 3) {
415	415	$x = (int)$x;
416	416	$days = (int)($x/86400);
417		- $hours = (int)(($x-$days*86400)/3600);
418		- $minutes = (int)(($x-$days86400-$hours3600)/60);
419		- $seconds = $x % 60;
	417	+ $hours = (int)(($x - $days*86400)/3600);
	418	+ $minutes = (int)(($x - $days86400 - $hours3600)/60);
	419	+ $seconds = $x%60;
420	420
421	421	$s = "";
422	422	if ($days) {
423	423	$s .= "$days ".tra("days")." ";
424	424	}
425		- if ($res>0 && ($hours \|\| strlen($s))) {
	425	+ if ($res > 0 && ($hours \|\| strlen($s))) {
426	426	$s .= "$hours ".tra("hours")." ";
427	427	}
428		- if ($res>1 && ($minutes \|\| strlen($s))) {
	428	+ if ($res > 1 && ($minutes \|\| strlen($s))) {
429	429	$s .= "$minutes ".tra("min")." ";
430	430	}
431		- if ($res>2) {
	431	+ if ($res > 2) {
432	432	$s .= "$seconds ".tra("sec")." ";
433	433	}
434	434	return $s;
		@@ -442,7 +442,7 @@ discard block
		block discarded – undo
442	442
443	443	function time_str($x) {
444	444	if ($x == 0) return "---";
445		- return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
	445	+ return gmdate('j M Y, G:i:s', (int)$x)." UTC";
446	446	}
447	447
448	448	function local_time_str($x) {
		@@ -454,14 +454,14 @@ discard block
		block discarded – undo
454	454	return time_str($x);
455	455	}
456	456
457		-function start_table_str($class="", $style="") {
458		- $s = $style?'style="'.$style.'"':'';
	457	+function start_table_str($class = "", $style = "") {
	458	+ $s = $style ? 'style="'.$style.'"' : '';
459	459	return '<div class="table">
460	460	<table '.$s.' width="100%" class="table table-condensed '.$class.'" >
461	461	';
462	462	}
463	463
464		-function start_table($class="", $style="") {
	464	+function start_table($class = "", $style = "") {
465	465	echo start_table_str($class, $style);
466	466	}
467	467
		@@ -506,7 +506,7 @@ discard block
		block discarded – undo
506	506	echo "</tr>\n";
507	507	}
508	508
509		-function row1($x, $ncols=2, $class="heading") {
	509	+function row1($x, $ncols = 2, $class = "heading") {
510	510	if ($class == "heading") {
511	511	echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
512	512	} else {
		@@ -520,10 +520,10 @@ discard block
		block discarded – undo
520	520
521	521	// a table row with 2 columns, with the left on right-aligned
522	522
523		-function row2($x, $y, $show_error=false, $lwidth='40%') {
524		- if ($x==="") $x="<br>";
525		- if ($y==="") $y="<br>";
526		- $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
	523	+function row2($x, $y, $show_error = false, $lwidth = '40%') {
	524	+ if ($x === "") $x = "<br>";
	525	+ if ($y === "") $y = "<br>";
	526	+ $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
527	527	echo "<tr>
528	528	<td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
529	529	<td $attrs >$y</td>
		@@ -534,7 +534,7 @@ discard block
		block discarded – undo
534	534	// output the first part of row2();
535	535	// then write the content, followed by </td></tr>
536	536
537		-function row2_init($x, $lwidth='40%') {
	537	+function row2_init($x, $lwidth = '40%') {
538	538	echo sprintf('<tr>
539	539	<td width="%s" %s>%s</td>
540	540	<td %s>',
		@@ -558,20 +558,20 @@ discard block
		block discarded – undo
558	558	echo "</tr>\n";
559	559	}
560	560
561		-define ('ALIGN_RIGHT', 'style="text-align:right;"');
	561	+define('ALIGN_RIGHT', 'style="text-align:right;"');
562	562
563		-function row_heading_array($x, $attrs=null, $class='bg-primary') {
	563	+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
564	564	echo "<tr>";
565	565	$i = 0;
566	566	foreach ($x as $h) {
567		- $a = $attrs?$attrs[$i]:"";
	567	+ $a = $attrs ? $attrs[$i] : "";
568	568	echo "<th $a class=\"$class\">$h</th>";
569	569	$i++;
570	570	}
571	571	echo "</tr>\n";
572	572	}
573	573
574		-function row_heading($x, $class='bg-primary') {
	574	+function row_heading($x, $class = 'bg-primary') {
575	575	echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
576	576	', $class, $x
577	577	);
		@@ -631,7 +631,7 @@ discard block
		block discarded – undo
631	631	// If $ellipsis is true, then an ellipsis is added to any sentence which
632	632	// is cut short.
633	633
634		-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
	634	+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
635	635	$words = explode($delimiter, $sentence);
636	636	$total_chars = 0;
637	637	$trunc = false;
		@@ -714,8 +714,8 @@ discard block
		block discarded – undo
714	714
715	715	// returns null if the arg is optional and missing
716	716	//
717		-function get_int($name, $optional=false) {
718		- $x=null;
	717	+function get_int($name, $optional = false) {
	718	+ $x = null;
719	719	if (isset($_GET[$name])) $x = $_GET[$name];
720	720	if (!is_numeric($x)) {
721	721	if ($optional) {
		@@ -734,7 +734,7 @@ discard block
		block discarded – undo
734	734
735	735	// returns null if the arg is optional and missing
736	736	//
737		-function post_num($name, $optional=false) {
	737	+function post_num($name, $optional = false) {
738	738	$x = null;
739	739	if (isset($_POST[$name])) $x = $_POST[$name];
740	740	if (!is_numeric($x)) {
		@@ -749,7 +749,7 @@ discard block
		block discarded – undo
749	749
750	750	// returns null if the arg is optional and missing
751	751	//
752		-function post_int($name, $optional=false) {
	752	+function post_int($name, $optional = false) {
753	753	$x = post_num($name, $optional);
754	754	if (is_null($x)) return null;
755	755	$y = (int)$x;
		@@ -767,7 +767,7 @@ discard block
		block discarded – undo
767	767	}
768	768	}
769	769
770		-function get_str($name, $optional=false) {
	770	+function get_str($name, $optional = false) {
771	771	if (isset($_GET[$name])) {
772	772	$x = $_GET[$name];
773	773	} else {
		@@ -779,7 +779,7 @@ discard block
		block discarded – undo
779	779	return undo_magic_quotes($x);
780	780	}
781	781
782		-function post_str($name, $optional=false) {
	782	+function post_str($name, $optional = false) {
783	783	if (isset($_POST[$name])) {
784	784	$x = $_POST[$name];
785	785	} else {
		@@ -791,7 +791,7 @@ discard block
		block discarded – undo
791	791	return undo_magic_quotes($x);
792	792	}
793	793
794		-function post_arr($name, $optional=false) {
	794	+function post_arr($name, $optional = false) {
795	795	if (isset($_POST[$name]) && is_array($_POST[$name])) {
796	796	$x = $_POST[$name];
797	797	} else {
		@@ -807,7 +807,7 @@ discard block
		block discarded – undo
807	807	// the mb_* functions are not included by default
808	808	// return (mb_detect_encoding($passwd) -= 'ASCII');
809	809
810		- for ($i=0; $i<strlen($str); $i++) {
	810	+ for ($i = 0; $i < strlen($str); $i++) {
811	811	$c = ord(substr($str, $i));
812	812	if ($c < 32 \|\| $c > 127) return false;
813	813	}
		@@ -831,7 +831,7 @@ discard block
		block discarded – undo
831	831	$number = str_replace(',', '.', $number); // replace the german decimal separator
832	832	// if no value was entered and this is ok
833	833	//
834		- if ($number=='' && !$low) return true;
	834	+ if ($number == '' && !$low) return true;
835	835
836	836	// the supplied value contains alphabetic characters
837	837	//
		@@ -848,7 +848,7 @@ discard block
		block discarded – undo
848	848
849	849	// Generate a "select" element from an array of values
850	850	//
851		-function select_from_array($name, $array, $selection=null, $width=240) {
	851	+function select_from_array($name, $array, $selection = null, $width = 240) {
852	852	$out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
853	853
854	854	foreach ($array as $key => $value) {
		@@ -873,8 +873,8 @@ discard block
		block discarded – undo
873	873	return $str;
874	874	}
875	875
876		-function strip_bbcode($string){
877		- return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
	876	+function strip_bbcode($string) {
	877	+ return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
878	878	}
879	879
880	880	function current_url() {
		@@ -903,7 +903,7 @@ discard block
		block discarded – undo
903	903	// @params extra Additional text in href tag
904	904	//
905	905
906		-function button_text($url, $text, $desc=null, $class=null, $extra='') {
	906	+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
907	907	if (!$desc) {
908	908	$desc = $text;
909	909	}
		@@ -915,19 +915,19 @@ discard block
		block discarded – undo
915	915	);
916	916	}
917	917
918		-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
	918	+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
919	919	echo button_text($url, $text, $desc, $class, $extra);
920	920	}
921	921
922	922	// for places with a bunch of buttons, like forum posts
923	923	//
924		-function show_button_small($url, $text, $desc=null) {
	924	+function show_button_small($url, $text, $desc = null) {
925	925	echo button_text($url, $text, $desc, "btn-primary btn-xs");
926	926	}
927	927
928	928	// used for showing icons
929	929	//
930		-function show_image($src, $title, $alt, $height=null) {
	930	+function show_image($src, $title, $alt, $height = null) {
931	931	$h = "";
932	932	if ($height) {
933	933	$h = "height=\"$height\"";
		@@ -964,7 +964,7 @@ discard block
		block discarded – undo
964	964	// tries instead to connect to <replica_db_host> if tag exists.
965	965	// DEPRECATED - use boinc_db.inc
966	966	//
967		-function db_init($try_replica=false) {
	967	+function db_init($try_replica = false) {
968	968	check_web_stopped();
969	969	$retval = db_init_aux($try_replica);
970	970	if ($retval == 1) {
		@@ -1080,7 +1080,7 @@ discard block
		block discarded – undo
1080	1080	// Check this to avoid XSS vulnerability
1081	1081	//
1082	1082	function sanitize_sort_by($x) {
1083		- switch($x) {
	1083	+ switch ($x) {
1084	1084	case 'expavg_credit':
1085	1085	case 'total_credit':
1086	1086	return;
		@@ -1097,9 +1097,9 @@ discard block
		block discarded – undo
1097	1097	return $c/(200/24);
1098	1098	}
1099	1099
1100		-function do_download($path,$name="") {
1101		- if (strcmp($name,"") == 0) {
1102		- $name=basename($path);
	1100	+function do_download($path, $name = "") {
	1101	+ if (strcmp($name, "") == 0) {
	1102	+ $name = basename($path);
1103	1103	}
1104	1104	header('Content-Description: File Transfer');
1105	1105	header('Content-Type: application/octet-stream');
		@@ -1108,7 +1108,7 @@ discard block
		block discarded – undo
1108	1108	header('Expires: 0');
1109	1109	header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
1110	1110	header('Pragma: public');
1111		- header('Content-Length: ' . filesize($path));
	1111	+ header('Content-Length: '.filesize($path));
1112	1112	flush();
1113	1113	readfile($path);
1114	1114	}
		@@ -1157,10 +1157,10 @@ discard block
		block discarded – undo
1157	1157	// Otherwise return 0.
1158	1158	// Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
1159	1159	//
1160		-function boinc_client_version(){
	1160	+function boinc_client_version() {
1161	1161	if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
1162	1162	$x = $_SERVER['HTTP_USER_AGENT'];
1163		- $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
	1163	+ $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
1164	1164	if (preg_match($e, $x, $matches)) {
1165	1165	return $matches[1]10000 + $matches[2]100 + $matches[3];
1166	1166	}
		@@ -1189,7 +1189,7 @@ discard block
		block discarded – undo
1189	1189	$rem_name = $name."_remaining";
1190	1190	return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
1191	1191	onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
1192		- <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
	1192	+ <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
1193	1193	;
1194	1194	}
1195	1195
		@@ -1219,7 +1219,7 @@ discard block
		block discarded – undo
1219	1219	// use the following around text with long lines,
1220	1220	// to limit the width and make it more readable.
1221	1221	//
1222		-function text_start($width=640) {
	1222	+function text_start($width = 640) {
1223	1223	echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
1224	1224	}
1225	1225	function text_end() {
		@@ -1245,7 +1245,7 @@ discard block
		block discarded – undo
1245	1245	}
1246	1246
1247	1247	function cert_filename() {
1248		- return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
	1248	+ return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
1249	1249	}
1250	1250
1251	1251	// if user hasn't validated their email addr, tell them to
		@@ -1262,6 +1262,6 @@ discard block
		block discarded – undo
1262	1262	}
1263	1263	}
1264	1264
1265		-$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit
	1265	+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
1266	1266
1267	1267	?>

		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
41	41	row2(
42	42	tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
43		- '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
	43	+ '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
44	44	row2_init(tra('Country'));
45	45	echo '<select class="form-control" name="country"><option value="" selected>---</option>';
46	46	$country = $params->country;
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	echo country_select_options($country);
49	49	echo "</select></td></tr>\n";
50	50	row2(tra('Type of team'), team_type_select($params->type, true));
51		- $checked = $params->active?"checked":"";
	51	+ $checked = $params->active ? "checked" : "";
52	52	row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
53	53	row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
54	54	end_table();
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	row2("Created", date_str($team->create_time));
97	97	if (defined("SHOW_NONVALIDATED_TEAMS")) {
98	98	$founder = $team->founder;
99		- row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
	99	+ row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
100	100	}
101	101	if (strlen($team->url)) {;
102	102	if (strstr($team->url, "http://")) {
		@@ -169,7 +169,7 @@ discard block
		block discarded – undo
169	169	}
170	170	row1(tra('Members'));
171	171	row2(tra('Founder'),
172		- $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
	172	+ $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
173	173	);
174	174	if (count($team->admins)) {
175	175	$first = true;
		@@ -356,7 +356,7 @@ discard block
		block discarded – undo
356	356	foreach ($deltas as $delta) {
357	357	$u = BoincUser::lookup_id($delta->userid);
358	358	if ($u->teamid == $teamid) {
359		- $new_members[] = $u->id; // they might have later quit
	359	+ $new_members[] = $u->id; // they might have later quit
360	360	}
361	361	}
362	362	return array_unique($new_members);
		@@ -439,7 +439,7 @@ discard block
		block discarded – undo
439	439	if (!$user->teamid) return;
440	440	$user->update("teamid=0");
441	441	$team = BoincTeam::lookup_id($user->teamid);
442		- if ($team && $team->ping_user==$user->id) {
	442	+ if ($team && $team->ping_user == $user->id) {
443	443	$team->update("ping_user=-ping_user");
444	444	}
445	445	BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
		@@ -478,33 +478,33 @@ discard block
		block discarded – undo
478	478	start_table();
479	479	row2(tra('Team name, text version').'
480	480	<br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
481		- '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
	481	+ '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
482	482	);
483	483	row2(tra('Team name, HTML version').'
484	484	<br><p class=\"text-muted\">
485	485	'.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
486	486	'.tra('If you don\'t know HTML, leave this box blank.').'</p>',
487		- '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
	487	+ '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
488	488	);
489	489	row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
490	490	'.tra('This URL will be linked to from the team\'s page on this site.'),
491		- '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
	491	+ '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
492	492	);
493	493	row2(tra('Description of team').':
494	494	<br><p class=\"text-muted\">
495	495	'.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
496	496	</p>',
497		- '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
	497	+ '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
498	498	);
499	499
500		- row2(tra('Type of team').':', team_type_select($team?$team->type:null));
	500	+ row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
501	501
502	502	row2_init(tra('Country'));
503	503	echo '<select class="form-control" name="country">';
504		- echo country_select_options($team?$team->country:null);
	504	+ echo country_select_options($team ? $team->country : null);
505	505	echo "</select></td></tr>\n";
506	506
507		- $x = (!$team \|\| $team->joinable)?"checked":"";
	507	+ $x = (!$team \|\| $team->joinable) ? "checked" : "";
508	508	row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
509	509	// Check if we're using reCaptcha to prevent spam accounts
510	510	//
		@@ -568,12 +568,12 @@ discard block
		block discarded – undo
568	568	//
569	569	function new_transfer_request_ok($team, $now) {
570	570	if ($team->ping_user <= 0) {
571		- if ($team->ping_time < $now - 60 * 86400) {
	571	+ if ($team->ping_time < $now - 60*86400) {
572	572	return true;
573	573	}
574	574	return false;
575	575	}
576		- if ($team->ping_time < $now - 90 * 86400) {
	576	+ if ($team->ping_time < $now - 90*86400) {
577	577	return true;
578	578	}
579	579	return false;
		@@ -608,7 +608,7 @@ discard block
		block discarded – undo
608	608	if (!is_valid_country($country)) {
609	609	$country = tra('None');
610	610	}
611		- $country = BoincDb::escape_string($country); // for Cote d'Ivoire
	611	+ $country = BoincDb::escape_string($country); // for Cote d'Ivoire
612	612
613	613	$clause = sprintf(
614	614	"(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
		@@ -631,6 +631,6 @@ discard block
		block discarded – undo
631	631	}
632	632	}
633	633
634		-$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit
	634	+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
635	635
636	636	?>

BOINC / boinc

Pull Request — master (#5574)

Status

Category

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

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