BOINC / boinc

html/inc/countries.inc

Spacing +8 added lines, -8 removed lines

@@ -257,7 +257,7 @@ 
     "Zimbabwe"
 );
 
-$country_to_iso3166_2 = array (
+$country_to_iso3166_2 = array(
     "Afghanistan" => "af",
     "Albania" => "al",
     "Algeria" => "dz",
@@ -493,25 +493,25 @@ 
 
 // return a list of country options for a <select>
 //
-function country_select_options($selected_country="None") {
+function country_select_options($selected_country = "None") {
     global $countries;
 
     require_once("../inc/geoip.inc"); 
 
     // See if we can find the user's country and select it as default:
     //
-    $gi = geoip_open("../inc/GeoIP.dat",GEOIP_STANDARD);
-    $geoip_country = geoip_country_name_by_addr($gi,$_SERVER["REMOTE_ADDR"]);
+    $gi = geoip_open("../inc/GeoIP.dat", GEOIP_STANDARD);
+    $geoip_country = geoip_country_name_by_addr($gi, $_SERVER["REMOTE_ADDR"]);
     geoip_close($gi);
 
-    if ($selected_country=="") $selected_country="None";
-    if ($selected_country=="None" and $geoip_country!=""){
-        $selected_country=$geoip_country;
+    if ($selected_country == "") $selected_country = "None";
+    if ($selected_country == "None" and $geoip_country != "") {
+        $selected_country = $geoip_country;
     }
 
     $x = "";
     foreach ($countries as $country) {
-        $selected = ($selected_country == $country ? "selected":"");
+        $selected = ($selected_country == $country ? "selected" : "");
         $x .= "<option value=\"$country\" $selected>$country</option>\n";
     }
     return $x;

html/inc/cert.inc

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@
     credit_to_ops($credit, $ops, $unit);
       
     if ($bolden) {
-        $lbold="[[";
-        $rbold="]]";
+        $lbold = "[[";
+        $rbold = "]]";
     } else {
-        $lbold="";        $rbold="";
+        $lbold = ""; $rbold = "";
     } 
     return " $lbold$cobbs Cobblestones$rbold of computation ($ops $unit floating-point operations)";
 }

html/inc/util_basic.inc

Spacing +5 added lines, -5 removed lines

@@ -44,10 +44,10 @@ 
     ";
 }
 
-function xml_error($num, $msg=null, $file=null, $line=null) {
+function xml_error($num, $msg = null, $file = null, $line = null) {
     global $xml_outer_tag;
     if (!$msg) {
-        switch($num) {
+        switch ($num) {
         case -112: $msg = "Invalid XML"; break;
         case -136: $msg = "Not found"; break;
         case -137: $msg = "Name or email address is not unique"; break;
@@ -94,7 +94,7 @@ 
 //
 function parse_element($xml, $tag) {
     $element = null;
-    $closetag = "</" . substr($tag,1);
+    $closetag = "</".substr($tag, 1);
     $x = strstr($xml, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;
@@ -109,8 +109,8 @@ 
 
 function parse_next_element($xml, $tag, &$cursor) {
     $element = null;
-    $closetag = "</" . substr($tag,1);
-    $pos = substr($xml,$cursor);
+    $closetag = "</".substr($tag, 1);
+    $pos = substr($xml, $cursor);
     $x = strstr($pos, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;

html/inc/text_transform.inc

Spacing +26 added lines, -26 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)    
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)    
 
     // Constructor - set the defaults.
 
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
     
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc-dev-doc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -272,7 +272,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -280,19 +280,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -300,7 +300,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -325,5 +325,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/recaptcha_loader.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * classes.
  */
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     if (substr($class, 0, 10) !== 'ReCaptcha\\') {
       /* If the class does not lie under the "ReCaptcha" namespace,
        * then we can exit immediately.

html/inc/bbcode_convert.inc

Spacing +23 added lines, -23 removed lines

@@ -19,7 +19,7 @@ 
 
 require_once('../inc/sanitize_html.inc');
 
-function image_as_bb($text){
+function image_as_bb($text) {
     // This function depends on sanitized HTML
 
     $pattern = '@<img(.*) src=\"([^>^"]+)\"([^>]*)>@si';
@@ -33,7 +33,7 @@ 
     return $text;
 }
 
-function link_as_bb($text){
+function link_as_bb($text) {
         /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<a href=\"([^>]+)\">@si'; // Gives us the URL in $1...
@@ -49,35 +49,35 @@ 
     return $text;
 }
 
-function formatting_as_bb($text){
+function formatting_as_bb($text) {
         /* This function depends on sanitized HTML */
-    $in[]="<b>";$out[]="[b]";
-    $in[]="</b>";$out[]="[/b]";
+    $in[] = "<b>"; $out[] = "[b]";
+    $in[] = "</b>"; $out[] = "[/b]";
 
-    $in[]="<i>";$out[]="[i]";
-    $in[]="</i>";$out[]="[/i]";
+    $in[] = "<i>"; $out[] = "[i]";
+    $in[] = "</i>"; $out[] = "[/i]";
 
-    $in[]="<u>";$out[]="[u]";
-    $in[]="</u>";$out[]="[/u]";
+    $in[] = "<u>"; $out[] = "[u]";
+    $in[] = "</u>"; $out[] = "[/u]";
 
-    $in[]="<b>";$out[]="[b]";
-    $in[]="</b>";$out[]="[/b]";
+    $in[] = "<b>"; $out[] = "[b]";
+    $in[] = "</b>"; $out[] = "[/b]";
 
-    $in[]="<ul>";$out[]="[list]";
-    $in[]="</ul>";$out[]="[/list]";
+    $in[] = "<ul>"; $out[] = "[list]";
+    $in[] = "</ul>"; $out[] = "[/list]";
 
-    $in[]="<ol>";$out[]="[list=1]";
-    $in[]="</ol>";$out[]="[/list]";
+    $in[] = "<ol>"; $out[] = "[list=1]";
+    $in[] = "</ol>"; $out[] = "[/list]";
 
-    $in[]="<pre>";$out[]="[pre]";
-    $in[]="</pre>";$out[]="[/pre]";
+    $in[] = "<pre>"; $out[] = "[pre]";
+    $in[] = "</pre>"; $out[] = "[/pre]";
 
-    $in[]="</br>";$out[]="\n";
-    $in[]="<br/>";$out[]="\n";
-    $in[]="<br>";$out[]="\n";
-    $in[]="&gt;";$out[]=">";
-    $in[]="&lt;";$out[]="<";
-    $in[]="&amp;";$out[]="&";
+    $in[] = "</br>"; $out[] = "\n";
+    $in[] = "<br/>"; $out[] = "\n";
+    $in[] = "<br>"; $out[] = "\n";
+    $in[] = "&gt;"; $out[] = ">";
+    $in[] = "&lt;"; $out[] = "<";
+    $in[] = "&amp;"; $out[] = "&";
 
     return str_replace($in, $out, $text);
 }

html/inc/bolt_ex.inc

Spacing +14 added lines, -14 removed lines

@@ -21,11 +21,11 @@ 
 // The following is a global var accessed by exercise functions.
 //
 $bolt_ex = null;
-$bolt_ex->mode = 0;     // input: SHOW/SCORE/ANSWER
-$bolt_ex->index = 0;    // input: sequence of this exercise in file
-$bolt_ex->score = 0;    // input/output: cumulative score (if mode = SCORE)
-$bolt_ex->weight = 0;   // input/output: cumulative weight
-$bolt_ex->query_string = "";    // user's response (if SCORE or ANSWER)
+$bolt_ex->mode = 0; // input: SHOW/SCORE/ANSWER
+$bolt_ex->index = 0; // input: sequence of this exercise in file
+$bolt_ex->score = 0; // input/output: cumulative score (if mode = SCORE)
+$bolt_ex->weight = 0; // input/output: cumulative weight
+$bolt_ex->query_string = ""; // user's response (if SCORE or ANSWER)
 
 function weight($w) {
     return array('weight', $w);
@@ -170,9 +170,9 @@ 
             $response = isset($$key);
             $r = $choice[1];
             $correct = ($r && $response) || (!$r && !$response);
-            $color = $correct?"#88ff88":"#ff8888";
-            table_row($c, $r?"yes":"no",
-                array($response?"yes":"no", "bgcolor=$color")
+            $color = $correct ? "#88ff88" : "#ff8888";
+            table_row($c, $r ? "yes" : "no",
+                array($response ? "yes" : "no", "bgcolor=$color")
             );
             $i++;
         }
@@ -215,11 +215,11 @@ 
         if ($y > $rect[3]) $right = false;
         $cx = $rect[0];
         $cy = $rect[2];
-        $sizex = $rect[1]-$rect[0];
-        $sizey = $rect[3]-$rect[2];
-        $ax = $x-4;
-        $ay = $y-4;
-        $color = $right?"green":"red";
+        $sizex = $rect[1] - $rect[0];
+        $sizey = $rect[3] - $rect[2];
+        $ax = $x - 4;
+        $ay = $y - 4;
+        $color = $right ? "green" : "red";
         if ($right) {
             echo "The point you selected (shown in green) is correct.";
         } else {
@@ -256,7 +256,7 @@ 
 }
 
 class BoltFitbAnswer {
-    public $type;   // 0=constant, 1=regexp, 2=func
+    public $type; // 0=constant, 1=regexp, 2=func
     public $ans;
     function __construct($type, $ans) {
         $this->type = $type;

html/inc/prefs_project.inc

Spacing +18 added lines, -18 removed lines

@@ -68,7 +68,7 @@ 
 }
 
 if ($app_types->cpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use CPU"),
         "Request CPU-only tasks from this project.",
         "no_cpu",
@@ -77,7 +77,7 @@ 
     );
 }
 if ($app_types->ati) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use ATI GPU"),
         "Request ATI GPU tasks from this project.",
         "no_ati",
@@ -86,7 +86,7 @@ 
     );
 }
 if ($app_types->cuda) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use NVIDIA GPU"),
         "Request NVIDIA GPU tasks from this project.",
         "no_cuda",
@@ -95,7 +95,7 @@ 
     );
 }
 if ($app_types->intel_gpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use Intel GPU"),
         "Request Intel GPU tasks from this project.",
         "no_intel_gpu",
@@ -120,7 +120,7 @@ 
     $x = "";
 }
 
-$privacy_pref_descs = array (
+$privacy_pref_descs = array(
     new PREF_BOOL(
         tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x,
         "",
@@ -152,7 +152,7 @@ 
     global $in_project_specific;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         $venue_name = $attrs["name"];
         $top_parse_result = $parse_result;
@@ -164,7 +164,7 @@ 
         break;
     default:
         if ($in_project_specific) {
-            $text= $text."<$name>";
+            $text = $text."<$name>";
         } else {
             $text = "";
         }
@@ -179,12 +179,12 @@ 
     global $venue_name;
     global $project_pref_descs;
 
-    foreach($project_pref_descs as $p) {
+    foreach ($project_pref_descs as $p) {
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -228,7 +228,7 @@ 
     return $parse_result;
 }
 
-function prefs_show_project($prefs, $columns=false) {
+function prefs_show_project($prefs, $columns = false) {
     global $project_pref_descs;
     if ($columns) {
         foreach ($project_pref_descs as $p) {
@@ -254,7 +254,7 @@ 
     }
 }
 
-function prefs_show_project_specific($prefs, $columns=false) {
+function prefs_show_project_specific($prefs, $columns = false) {
     if ($columns) {
         $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
         $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : "";
@@ -266,10 +266,10 @@ 
     project_specific_prefs_show($project_specific_prefs, $columns);
 }
 
-function print_prefs_display_project($user, $columns=false) {
+function print_prefs_display_project($user, $columns = false) {
     $project_prefs = prefs_parse_project($user->project_prefs);
 
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=".(int)!$columns.">".tra("(Switch View)")."</a></font>";
     if ($columns) {
         start_table();
         row_heading(tra("Combined preferences").$switch_link);
@@ -311,14 +311,14 @@ 
     }
 }
 
-function prefs_form_project($prefs, $error=false) {
+function prefs_form_project($prefs, $error = false) {
     global $project_pref_descs;
     foreach ($project_pref_descs as $p) {
         $p->show_form_row($prefs, $error);
     }
 }
 
-function prefs_form_project_specific($prefs_xml, $error=false) {
+function prefs_form_project_specific($prefs_xml, $error = false) {
     $prefs = project_specific_prefs_parse($prefs_xml);
     project_specific_prefs_edit($prefs, $error);
 }
@@ -357,7 +357,7 @@ 
 
 // given a prefs structure, return the corresponding XML string
 //
-function project_prefs_make_xml($prefs, $primary=true) {
+function project_prefs_make_xml($prefs, $primary = true) {
     global $project_pref_descs;
     $xml = "";
     if ($primary) {
@@ -392,8 +392,8 @@ 
 //
 function project_prefs_update(&$user, $prefs) {
     $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs));
-    $send_email = $user->send_email?1:0;
-    $show_hosts = $user->show_hosts?1:0;
+    $send_email = $user->send_email ? 1 : 0;
+    $show_hosts = $user->show_hosts ? 1 : 0;
     $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts");
     if (!$retval) {
         return 1;

html/inc/boinc_db.inc

Spacing +10 added lines, -10 removed lines

@@ -212,11 +212,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -265,7 +265,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -290,7 +290,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -322,11 +322,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -441,7 +441,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -497,11 +497,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -781,7 +781,7 @@ 
 // apply this to any user-supplied strings used in queries
 // 
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);