BOINC / boinc

html/inc/ReCaptcha/RequestMethod/Socket.php

Braces +6 added lines, -12 removed lines

@@ -30,8 +30,7 @@ 
  * Convenience wrapper around native socket and file functions to allow for
  * mocking.
  */
-class Socket
-{
+class Socket {
     private $handle = null;
 
     /**
@@ -45,8 +44,7 @@ 
      * @param float $timeout
      * @return resource
      */
-    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
-    {
+    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null) {
         $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
 
         if ($this->handle != false && $errno === 0 && $errstr === '') {
@@ -63,8 +61,7 @@ 
      * @param int $length
      * @return int | bool
      */
-    public function fwrite($string, $length = null)
-    {
+    public function fwrite($string, $length = null) {
         return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
     }
 
@@ -75,8 +72,7 @@ 
      * @param int $length
      * @return string
      */
-    public function fgets($length = null)
-    {
+    public function fgets($length = null) {
         return fgets($this->handle, $length);
     }
 
@@ -86,8 +82,7 @@ 
      * @see http://php.net/feof
      * @return bool
      */
-    public function feof()
-    {
+    public function feof() {
         return feof($this->handle);
     }
 
@@ -97,8 +92,7 @@ 
      * @see http://php.net/fclose
      * @return bool
      */
-    public function fclose()
-    {
+    public function fclose() {
         return fclose($this->handle);
     }
 }

html/inc/ReCaptcha/RequestMethod/Curl.php

Braces +5 added lines, -10 removed lines

@@ -29,16 +29,14 @@ 
 /**
  * Convenience wrapper around the cURL functions to allow mocking.
  */
-class Curl
-{
+class Curl {
 
     /**
      * @see http://php.net/curl_init
      * @param string $url
      * @return resource cURL handle
      */
-    public function init($url = null)
-    {
+    public function init($url = null) {
         return curl_init($url);
     }
 
@@ -48,8 +46,7 @@ 
      * @param array $options
      * @return bool
      */
-    public function setoptArray($ch, array $options)
-    {
+    public function setoptArray($ch, array $options) {
         return curl_setopt_array($ch, $options);
     }
 
@@ -58,8 +55,7 @@ 
      * @param resource $ch
      * @return mixed
      */
-    public function exec($ch)
-    {
+    public function exec($ch) {
         return curl_exec($ch);
     }
 
@@ -67,8 +63,7 @@ 
      * @see http://php.net/curl_close
      * @param resource $ch
      */
-    public function close($ch)
-    {
+    public function close($ch) {
         curl_close($ch);
     }
 }

html/inc/ReCaptcha/Response.php

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
 /**
  * The response returned from the service.
  */
-class Response
-{
+class Response {
     /**
      * Succes or failure.
      * @var boolean
@@ -49,8 +48,7 @@ 
      * @param string $json
      * @return \ReCaptcha\Response
      */
-    public static function fromJson($json)
-    {
+    public static function fromJson($json) {
         $responseData = json_decode($json, true);
 
         if (!$responseData) {
@@ -74,8 +72,7 @@ 
      * @param boolean $success
      * @param array $errorCodes
      */
-    public function __construct($success, array $errorCodes = array())
-    {
+    public function __construct($success, array $errorCodes = array()) {
         $this->success = $success;
         $this->errorCodes = $errorCodes;
     }
@@ -85,8 +82,7 @@ 
      *
      * @return boolean
      */
-    public function isSuccess()
-    {
+    public function isSuccess() {
         return $this->success;
     }
 
@@ -95,8 +91,7 @@ 
      *
      * @return array
      */
-    public function getErrorCodes()
-    {
+    public function getErrorCodes() {
         return $this->errorCodes;
     }
 }

html/inc/ReCaptcha/RequestParameters.php

Braces +4 added lines, -8 removed lines

@@ -29,8 +29,7 @@ 
 /**
  * Stores and formats the parameters for the request to the reCAPTCHA service.
  */
-class RequestParameters
-{
+class RequestParameters {
     /**
      * Site secret.
      * @var string
@@ -63,8 +62,7 @@ 
      * @param string $remoteIp User's IP address.
      * @param string $version Version of this client library.
      */
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
-    {
+    public function __construct($secret, $response, $remoteIp = null, $version = null) {
         $this->secret = $secret;
         $this->response = $response;
         $this->remoteIp = $remoteIp;
@@ -76,8 +74,7 @@ 
      *
      * @return array Array formatted parameters.
      */
-    public function toArray()
-    {
+    public function toArray() {
         $params = array('secret' => $this->secret, 'response' => $this->response);
 
         if (!is_null($this->remoteIp)) {
@@ -96,8 +93,7 @@ 
      *
      * @return string Query string formatted parameters.
      */
-    public function toQueryString()
-    {
+    public function toQueryString() {
         return http_build_query($this->toArray(), '', '&');
     }
 }

html/inc/dir_hier.inc

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -56,17 +56,17 @@ 
     $dl_md5_path = "$dl_path.md5";
     $have_md5_file = false;
     $md5 = md5_file($path);
-    if ($md5 === FALSE) {
+    if ($md5 === false) {
         return -2;
     }
     $size = filesize($path);
-    if ($size === FALSE) {
+    if ($size === false) {
         return -2;
     }
 
     if (file_exists($dl_md5_path)) {
         $x = file_get_contents($dl_md5_path);
-        if ($x === FALSE) {
+        if ($x === false) {
             return -2;
         }
         $x = explode(" ", $x);
@@ -78,7 +78,7 @@ 
     if (file_exists($dl_path)) {
         if ($have_md5_file) {
             $s = filesize($dl_path);
-            if ($s === FALSE) {
+            if ($s === false) {
                 return -2;
             }
             if ($s == $dl_size && $dl_md5 == $md5) {
@@ -91,11 +91,11 @@ 
             // missing the .md5 file; need to look at the file
             //
             $m = md5_file($dl_path);
-            if ($m === FALSE) {
+            if ($m === false) {
                 return -2;
             }
             if ($m == $md5) {
-                if (file_put_contents($dl_md5_path, "$md5 $size\n") === FALSE) {
+                if (file_put_contents($dl_md5_path, "$md5 $size\n") === false) {
                     return -2;
                 }
                 return 0;
@@ -103,7 +103,7 @@ 
             return -1;
         }
     } else {
-        if (file_put_contents($dl_md5_path, "$md5 $size\n") === FALSE) {
+        if (file_put_contents($dl_md5_path, "$md5 $size\n") === false) {
             return -2;
         }
         return 1;

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 }
 
 function upload_path($filename) {
-    static $upload_dir=null;
+    static $upload_dir = null;
     if (!$upload_dir) {
         $config = get_config();
         $upload_dir = parse_config($config, '<upload_dir>');

html/inc/forum.inc

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -367,7 +367,7 @@
                 $i++;
             }
             if ($start === null) {
-                echo "Post $postid not found.";
+                echo "post $postid not found.";
                 return;
             }
         } else if ($logged_in_user && $logged_in_user->prefs->jump_to_unread) {

Braces +17 added lines, -17 removed lines

@@ -238,7 +238,7 @@ 
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -251,7 +251,7 @@ 
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
             $url, $curpage-1, $items_per_page,
             tra("Previous")." · "
@@ -268,7 +268,7 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
+    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++) {
         $page_str = (string)($i+1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
@@ -289,7 +289,7 @@ 
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages-1) {
         $x .= page_link(
             $url, $curpage+1, $items_per_page,
             " &middot; ".tra("Next")
@@ -518,7 +518,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -539,9 +539,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -578,7 +578,7 @@ 
 
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
@@ -599,7 +599,7 @@ 
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
@@ -615,7 +615,7 @@ 
         $user->nposts = BoincPost::count("user=$user->id");
     }
 
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -654,7 +654,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -674,7 +674,7 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
+    if ($ignore_poster && $filter) {
         echo "<br>" .tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
@@ -688,7 +688,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -755,7 +755,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -1089,7 +1089,7 @@ 
 
     $sql = 'forum = ' . $forumID ;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
@@ -1170,7 +1170,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban");
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 

Indentation +3 added lines, -3 removed lines

@@ -811,9 +811,9 @@ 
 function post_rules() {
     if (defined('FORUM_RULES')) return FORUM_RULES;
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+        $project_rules=project_forum_post_rules();
     } else {
-      $project_rules="";
+        $project_rules="";
     }
     return sprintf("
         <ul>
@@ -1278,7 +1278,7 @@ 
     }
     if ($thread->hidden) {
         error_page(
-           tra("Can't post to a hidden thread.")
+            tra("Can't post to a hidden thread.")
         );
     }
 

Spacing +86 added lines, -86 removed lines

@@ -24,7 +24,7 @@ 
 require_once("../inc/text_transform.inc");
 
 define('THREADS_PER_PAGE', 50);
-define('FORUM_LH_PCT', '25%');      // width of LH column
+define('FORUM_LH_PCT', '25%'); // width of LH column
 
 $forum_error = "";
     // for functions that return null on error,
@@ -55,7 +55,7 @@ 
 define('THREAD_SOLVED', 1);
 
 define('AVATAR_WIDTH', 100);
-define('AVATAR_HEIGHT',100);
+define('AVATAR_HEIGHT', 100);
 
 define('ST_NEW_TIME', 1209600); //3600*24*14 - 14 days
 define('ST_NEW', 'New member');
@@ -80,24 +80,24 @@ 
 define('IMAGE_HIDDEN', 'img/hidden.png');
 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
 define('IMAGE_POST', 'img/post.png');
-define('NEW_IMAGE_HEIGHT','15');
+define('NEW_IMAGE_HEIGHT', '15');
 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
-define('EMPHASIZE_IMAGE_HEIGHT','15');
+define('EMPHASIZE_IMAGE_HEIGHT', '15');
 define('FILTER_IMAGE', 'img/filtered_post.png');
-define('FILTER_IMAGE_HEIGHT','15');
+define('FILTER_IMAGE_HEIGHT', '15');
 define('RATE_POSITIVE_IMAGE', 'img/rate_positive.png');
-define('RATE_POSITIVE_IMAGE_HEIGHT','9');
+define('RATE_POSITIVE_IMAGE_HEIGHT', '9');
 define('RATE_NEGATIVE_IMAGE', 'img/rate_negative.png');
-define('RATE_NEGATIVE_IMAGE_HEIGHT','9');
+define('RATE_NEGATIVE_IMAGE_HEIGHT', '9');
 define('REPORT_POST_IMAGE', 'img/report_post.png');
-define('REPORT_POST_IMAGE_HEIGHT','9');
+define('REPORT_POST_IMAGE_HEIGHT', '9');
 
 define('SOLUTION', tra('This answered my question'));
 define('SUFFERER', tra('I also have this question'));
 define('OFF_TOPIC', tra('Off-topic'));
 
-define ('DEFAULT_LOW_RATING_THRESHOLD', -25);
-define ('DEFAULT_HIGH_RATING_THRESHOLD', 5);
+define('DEFAULT_LOW_RATING_THRESHOLD', -25);
+define('DEFAULT_HIGH_RATING_THRESHOLD', 5);
 
 // special user attributes
 //
@@ -175,15 +175,15 @@ 
 
 // return forum/thread title, with links.
 //
-function forum_title($category, $forum, $thread, $link_thread=false) {
+function forum_title($category, $forum, $thread, $link_thread = false) {
     if ($category) {
         $is_helpdesk = $category->is_helpdesk;
     } else {
         $is_helpdesk = false;
     }
 
-    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
-    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
+    $where = $is_helpdesk ?tra("Questions and Answers") : tra("Message boards");
+    $top_url = $is_helpdesk ? "forum_help_desk.php" : "forum_index.php";
 
     $x = '';
     if (!$forum && !$thread) {
@@ -217,7 +217,7 @@ 
     return $x;
 }
 
-function team_forum_title($forum, $thread=null, $link_thread=false) {
+function team_forum_title($forum, $thread = null, $link_thread = false) {
     $team = BoincTeam::lookup_id($forum->category);
     $x = sprintf('<a href="forum_index.php">%s</a> :',
         tra("Message boards")
@@ -251,12 +251,12 @@ 
 }
 
 function page_link($url, $page_num, $items_per_page, $text) {
-    return " <a href=\"$url&amp;start=" . $page_num*$items_per_page . "\">$text</a> ";
+    return " <a href=\"$url&amp;start=".$page_num*$items_per_page."\">$text</a> ";
 }
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -264,14 +264,14 @@ 
     $x = "";
 
     if ($nitems <= $items_per_page) return "";
-    $npages = ceil($nitems / $items_per_page);
-    $curpage = ceil($start / $items_per_page);
+    $npages = ceil($nitems/$items_per_page);
+    $curpage = ceil($start/$items_per_page);
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
-            $url, $curpage-1, $items_per_page,
+            $url, $curpage - 1, $items_per_page,
             tra("Previous")." &middot; "
         );
     }
@@ -286,8 +286,8 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
-        $page_str = (string)($i+1);
+    for ($i = $curpage - $preshow; $i <= $curpage + $postshow; $i++) {
+        $page_str = (string)($i + 1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
 
@@ -296,20 +296,20 @@ 
         } else {
             $x .= page_link($url, $i, $items_per_page, $page_str);
         }
-        if ($i == $npages-1) break;
-        if ($i == $curpage+$postshow) break;
+        if ($i == $npages - 1) break;
+        if ($i == $curpage + $postshow) break;
         $x .= " &middot; ";
     }
 
-    if ($curpage + $postshow < $npages-1) {
+    if ($curpage + $postshow < $npages - 1) {
         $x .= " . . . ";
-        $x .= page_link($url, $npages-1, $items_per_page, $npages);
+        $x .= page_link($url, $npages - 1, $items_per_page, $npages);
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages - 1) {
         $x .= page_link(
-            $url, $curpage+1, $items_per_page,
+            $url, $curpage + 1, $items_per_page,
             " &middot; ".tra("Next")
         );
     }
@@ -330,7 +330,7 @@ 
 function cleanup_title($title) {
     $x = sanitize_tags(bb2html($title));
     $x = trim($x);
-    if (strlen($x)==0) return "(no title)";
+    if (strlen($x) == 0) return "(no title)";
     else return $x;
 }
 
@@ -392,7 +392,7 @@ 
             $i = 0;
             foreach ($posts as $post) {
                 if ($post->id == $postid) {
-                    $start = $i - ($i % $num_to_show);
+                    $start = $i - ($i%$num_to_show);
                     $jump_to_post = $post;
                     break;
                 }
@@ -419,7 +419,7 @@ 
             // if jump to post, figure out what page to show
             //
             if ($jump_to_post) {
-                $start = $ibest - ($ibest % $num_to_show);
+                $start = $ibest - ($ibest%$num_to_show);
             } else {
                 $start = $default_start;
             }
@@ -527,8 +527,8 @@ 
 // Generates a table row with two cells: author and message
 //
 function show_post(
-    $post, $thread, $forum, $logged_in_user, $start=0,
-    $latest_viewed=0, $controls=FORUM_CONTROLS, $filter=true
+    $post, $thread, $forum, $logged_in_user, $start = 0,
+    $latest_viewed = 0, $controls = FORUM_CONTROLS, $filter = true
 ) {
     global $country_to_iso3166_2;
 
@@ -536,7 +536,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -557,9 +557,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -573,8 +573,8 @@ 
             if (is_moderator($logged_in_user, $forum)) {
                 $can_edit = true;
             } else if (can_reply($thread, $forum, $logged_in_user)) {
-                $time_limit = $post->timestamp+MAXIMUM_EDIT_TIME;
-                $can_edit = time()<$time_limit;
+                $time_limit = $post->timestamp + MAXIMUM_EDIT_TIME;
+                $can_edit = time() < $time_limit;
             } else {
                 $can_edit = false;
             }
@@ -584,10 +584,10 @@ 
     // Print the special user lines, if any
     //
     global $special_user_bitfield;
-    $fstatus="";
+    $fstatus = "";
     $keys = array_keys($special_user_bitfield);
     $is_posted_by_special = false;
-    for ($i=0; $i<sizeof($special_user_bitfield);$i++) {
+    for ($i = 0; $i < sizeof($special_user_bitfield); $i++) {
         if ($user->prefs && $user->prefs->privilege($keys[$i])) {
             $fstatus .= "<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
             $is_posted_by_special = true;
@@ -600,12 +600,12 @@ 
 
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
     }
-    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
+    $class = $highlight ? ' style="border-left: 5px solid LightGreen" ' : '';
 
     // row and start of author col
     //
@@ -617,12 +617,12 @@ 
 
     echo user_links($user, 0, 30);
     echo "<br>";
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
+    if ($user->create_time > time() - ST_NEW_TIME) $fstatus .= ST_NEW."<br>";
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
-        if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
+    if (!$filter || !$ignore_poster) {
+        if ($user->prefs && $user->prefs->avatar != "" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars == false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
     }
@@ -630,14 +630,14 @@ 
 
     $url = "pm.php?action=new&amp;userid=".$user->id;
     $name = $user->name;
-    show_button_small($url, tra("Send message"), tra("Send %1 a private message",$name));
+    show_button_small($url, tra("Send message"), tra("Send %1 a private message", $name));
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
 
     if (!isset($user->nposts)) {
         $user->nposts = BoincPost::count("user=$user->id");
     }
 
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -646,8 +646,8 @@ 
         //
         //echo "ID: ".$user->id."<br>";
         if (!NO_COMPUTING) {
-            echo tra("Credit: %1", number_format($user->total_credit)) ."<br>";
-            echo tra("RAC: %1",    number_format($user->expavg_credit))."<br>";
+            echo tra("Credit: %1", number_format($user->total_credit))."<br>";
+            echo tra("RAC: %1", number_format($user->expavg_credit))."<br>";
         }
 
         // to use this feature:
@@ -676,7 +676,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -696,8 +696,8 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
-        echo "<br>" .tra(
+    if ($ignore_poster && $filter) {
+        echo "<br>".tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
             "</a>"
@@ -710,7 +710,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -718,7 +718,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -752,10 +752,10 @@ 
         }
         if (($controls == FORUM_CONTROLS) && (can_reply($thread, $forum, $logged_in_user))) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;";
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "&amp;no_quote=1#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."&amp;no_quote=1#input";
             // "Reply" is used as a verb
             show_button($url, tra("Reply"), tra("Post a reply to this message"));
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."#input";
             // "Quote" is used as a verb
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
         }
@@ -777,7 +777,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -791,10 +791,10 @@ 
     switch ($forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($forum->category);
-        $title= forum_title($category, $forum, $thread, true);
+        $title = forum_title($category, $forum, $thread, true);
         break;
     case 1:
-        $title= team_forum_title($forum);
+        $title = team_forum_title($forum);
         break;
     }
     row_array([
@@ -833,9 +833,9 @@ 
 function post_rules() {
     if (defined('FORUM_RULES')) return FORUM_RULES;
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+      $project_rules = project_forum_post_rules();
     } else {
-      $project_rules="";
+      $project_rules = "";
     }
     return sprintf("
         <ul>
@@ -864,7 +864,7 @@ 
     );
 }
 
-function post_warning($forum=null) {
+function post_warning($forum = null) {
     $x = '<p><div style="text-align:left">';
 
     // let projects add extra instructions in specific forums,
@@ -950,7 +950,7 @@ 
     $content = substr($content, 0, 64000);
     $content = BoincDb::escape_string($content);
     $now = time();
-    $sig = $signature?1:0;
+    $sig = $signature ? 1 : 0;
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
     if (!$id) {
         $forum_error = "Failed to add post to DB.";
@@ -970,7 +970,7 @@ 
 //
 function update_thread_timestamp($thread) {
     $posts = BoincPost::enum("thread=$thread->id and hidden=0 order by timestamp desc limit 1");
-    if (count($posts)>0) {
+    if (count($posts) > 0) {
         $post = $posts[0];
         $thread->update("timestamp=$post->timestamp");
     }
@@ -978,7 +978,7 @@ 
 
 function update_forum_timestamp($forum) {
     $threads = BoincThread::enum("forum=$forum->id and hidden=0 order by timestamp desc limit 1");
-    if (count($threads)>0) {
+    if (count($threads) > 0) {
         $thread = $threads[0];
         $forum->update("timestamp=$thread->timestamp");
     }
@@ -1001,7 +1001,7 @@ 
     if (is_news_forum($forum) && !$export) {
         $status = 1;
     }
-    $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
+    $id = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
     if (!$id) {
         $forum_error = "Failed to add thread to DB.";
         return null;
@@ -1130,22 +1130,22 @@ 
 // $sticky - bool (not directly passed to SQL)
 //
 function get_forum_threads(
-    $forumID, $start=-1, $nRec=-1, $sort_style=MODIFIED_NEW,
+    $forumID, $start = -1, $nRec = -1, $sort_style = MODIFIED_NEW,
     $show_hidden = 0, $sticky = 1
 ) {
     //if (! (is_numeric($forumID) && is_numeric($min) && is_numeric($nRec))) {
     //    return NULL;  // Something is wrong here.
     //}
 
-    $sql = 'forum = ' . $forumID ;
+    $sql = 'forum = '.$forumID;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $sql .= ' ORDER BY '.$stickysql.'timestamp DESC';
         break;
@@ -1198,7 +1198,7 @@ 
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case CREATE_TIME_NEW:
         $sql .= ' ORDER BY timestamp desc';
         break;
@@ -1220,7 +1220,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban");
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 
@@ -1283,9 +1283,9 @@ 
 //
 function user_can_create_thread($user, $forum) {
     if ($forum->is_dev_blog) {
-        return is_admin($user)?'yes':'no';
+        return is_admin($user) ? 'yes' : 'no';
     }
-    return $user ?'yes':'login';
+    return $user ? 'yes' : 'login';
 }
 
 function check_post_access($user, $forum) {
@@ -1311,14 +1311,14 @@ 
     // We do not tell the (ab)user how much this is -
     // no need to make it easy for them to break the system.
     //
-    if ($user->total_credit<$forum->post_min_total_credit || $user->expavg_credit<$forum->post_min_expavg_credit) {
+    if ($user->total_credit < $forum->post_min_total_credit || $user->expavg_credit < $forum->post_min_expavg_credit) {
         error_page(tra("To create a new thread in %1 you must have a certain level of average credit. This is to protect against abuse of the system.", $forum->title));
     }
 
     // If the user is posting faster than forum regulations allow
     // Tell the user to wait a while before creating any more posts
     //
-    if (time()-$user->prefs->last_post <$forum->post_min_interval) {
+    if (time() - $user->prefs->last_post < $forum->post_min_interval) {
         error_page(tra("You cannot create threads right now. Please wait before trying again. This is to protect against abuse of the system."));
     }
 }
@@ -1344,10 +1344,10 @@ 
 // - edit their posts at any time
 // - hide/unhide/move threads and posts
 
-function is_moderator($user, $forum=null) {
+function is_moderator($user, $forum = null) {
     if (!$user) return false;
     BoincForumPrefs::lookup($user);
-    $type = $forum?$forum->parent_type:0;
+    $type = $forum ? $forum->parent_type : 0;
     switch ($type) {
     case 0:
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1364,7 +1364,7 @@ 
     return false;
 }
 
-function thread_list_header($subscriptions=false) {
+function thread_list_header($subscriptions = false) {
     if ($subscriptions) {
         $x = [
             tra("Thread"),
@@ -1387,13 +1387,13 @@ 
 // show a 1-line summary of thread and its forum.
 // Used for search results and subscription list
 //
-function thread_list_item($thread, $user, $subscriptions=false) {
+function thread_list_item($thread, $user, $subscriptions = false) {
     $thread_forum = BoincForum::lookup_id($thread->forum);
     if (!$thread_forum) return;
     if (!is_forum_visible_to_user($thread_forum, $user)) return;
     $owner = BoincUser::lookup_id($thread->owner);
     if (!$owner) return;
-    switch($thread_forum->parent_type) {
+    switch ($thread_forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($thread_forum->category);
         $title = forum_title($category, $thread_forum, $thread, true);
@@ -1414,7 +1414,7 @@ 
     } else {
         $x = [
             $title,
-            $thread->replies+1,
+            $thread->replies + 1,
             user_links($owner),
             $thread->views,
             time_diff_str($thread->timestamp, time())
@@ -1451,13 +1451,13 @@ 
 
 function subscribed_thread_web_line($notify) {
     $thread = BoincThread::lookup_id($notify->opaque);
-    return tra("New posts in the thread %1","<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
+    return tra("New posts in the thread %1", "<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
 }
 
 function subscribed_thread_rss($notify) {
     $thread = BoincThread::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed thread");
-    $msg = tra("There are new posts in the thread '%1'",$thread->title);
+    $msg = tra("There are new posts in the thread '%1'", $thread->title);
     $url = secure_url_base()."forum_thread.php?id=$thread->id";
     return [$title, $msg, $url];
 }
@@ -1469,13 +1469,13 @@ 
 
 function subscribed_forum_web_line($notify) {
     $forum = BoincForum::lookup_id($notify->opaque);
-    return tra("New threads in the forum %1","<a href=forum_forum.php?id=$forum->id>$forum->title</a>");
+    return tra("New threads in the forum %1", "<a href=forum_forum.php?id=$forum->id>$forum->title</a>");
 }
 
 function subscribed_forum_rss($notify) {
     $forum = BoincForum::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed forum");
-    $msg = tra("There are new threads in the forum '%1'",$forum->title);
+    $msg = tra("There are new threads in the forum '%1'", $forum->title);
     $url = secure_url_base()."forum_forum.php?id=$forum->id";
     return [$title, $msg, $url];
 }

html/inc/prefs.inc

Braces +1 added lines, -1 removed lines

@@ -556,7 +556,7 @@
 function print_prefs_form(
     $action, $subset, $venue, $user, $prefs, $cols, $error=false,
     $project_error=false
-){
+) {
     if ($action == "add") {
         $script = "add_venue.php";
         $submit_value = tra("Add preferences");

Spacing +16 added lines, -16 removed lines

@@ -108,7 +108,7 @@ 
         new NUM_SPEC(tra("% of the CPUs"), 1, 100, 0)
     ),
     new PREF_NUM(
-        tra("Use at most") ."<br><font size=-2>Requires BOINC 7.20.3+</font>",
+        tra("Use at most")."<br><font size=-2>Requires BOINC 7.20.3+</font>",
         // xgettext:no-php-format
         tra("Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat."),
         "niu_cpu_usage_limit",
@@ -295,9 +295,9 @@ 
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
     // set some defaults if not found
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
+    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0; // no limit
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1; // 1 GB
     // set mininimum free space scheduler allows
     // - depends on which scheduler is running
     $dp->new_sched_flag = 1;
@@ -323,7 +323,7 @@ 
     global $text;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         if (array_key_exists("name", $attrs)) {
             $venue_name = $attrs["name"];
@@ -373,7 +373,7 @@ 
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -547,7 +547,7 @@ 
     }
 }
 
-function print_prefs_display_global($user, $columns=false) {
+function print_prefs_display_global($user, $columns = false) {
     $global_prefs = prefs_parse_global($user->global_prefs);
 
     echo tra("These settings apply to all computers using this account except")
@@ -557,7 +557,7 @@ 
         .tra("Android devices")
         ."</ul>
     ";
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=".(int)!$columns.">".tra("(Switch view)")."</a></font>";
     if ($columns) {
         echo "<h3>".tra("Combined preferences").$switch_link."</h3>";
         start_table();
@@ -594,9 +594,9 @@ 
 // otherwise false
 //
 function print_prefs_form(
-    $action, $subset, $venue, $user, $prefs, $cols, $error=false,
-    $project_error=false
-){
+    $action, $subset, $venue, $user, $prefs, $cols, $error = false,
+    $project_error = false
+) {
     if ($action == "add") {
         $script = "add_venue.php";
         $submit_value = tra("Add preferences");
@@ -636,7 +636,7 @@ 
 //
 // Functions to display preference subsets as forms
 //
-function prefs_form_global($user, $prefs, $error=false) {
+function prefs_form_global($user, $prefs, $error = false) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;
@@ -673,9 +673,9 @@ 
 //
 function prefs_form_radio_buttons($name, $yesno) {
     $rb = tra("yes")." <input type=radio name=$name value=yes "
-        .($yesno?"checked":"")
+        .($yesno ? "checked" : "")
         ."> ".tra("no")." <input type=radio name=$name value=no "
-        .($yesno?"":"checked")
+        .($yesno ? "" : "checked")
         .">\n";
     return $rb;
 }
@@ -694,12 +694,12 @@ 
 }
 function venue_show($user) {
     $venue = $user->venue;
-    if ($venue =='') $venue = '---';
+    if ($venue == '') $venue = '---';
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
 }
 
 function venue_form($user) {
-    $n=$h=$w=$s=$m='';
+    $n = $h = $w = $s = $m = '';
     if ($user->venue == '') $n = 'selected';
     if ($user->venue == 'home') $h = 'selected';
     if ($user->venue == 'work') $w = 'selected';
@@ -757,7 +757,7 @@ 
 //
 // convert prefs from structure to XML
 //
-function global_prefs_make_xml($prefs, $primary=true) {
+function global_prefs_make_xml($prefs, $primary = true) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;

html/inc/result.inc

Braces +4 added lines, -4 removed lines

@@ -500,9 +500,9 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function windows_error_code_str($x){
+function windows_error_code_str($x) {
     $h=int2hex($x);
-    switch($h){
+    switch($h) {
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -523,10 +523,10 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function error_code_str($x){
+function error_code_str($x) {
     // severe Windows error numbers are always large negative integers
     if ($x<-400) return windows_error_code_str($x);
-    switch($x){
+    switch($x) {
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
     case 193: return "EXIT_SIGNAL";

Spacing +25 added lines, -25 removed lines

@@ -53,9 +53,9 @@ 
     return $platforms[$id];
 }
 
-function anon_platform_string($result, $rsc_name=null) {
+function anon_platform_string($result, $rsc_name = null) {
     $app = get_app($result->appid);
-    $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
+    $n = $app->user_friendly_name."<br>".tra("Anonymous platform");
     if ($rsc_name) {
         $n .= " ($rsc_name)";
     }
@@ -102,7 +102,7 @@ 
         return $string_to_show;
     }
     if ($result->server_state <> RESULT_SERVER_STATE_OVER) return "---";
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_SUCCESS:
         switch ($result->validate_state) {
         case VALIDATE_STATE_INIT:
@@ -240,7 +240,7 @@ 
             ) {
                 return tra("Not started by deadline - canceled");
             }
-            switch($result->client_state) {
+            switch ($result->client_state) {
             case RESULT_FILES_DOWNLOADING: return tra("Error while downloading");
             case RESULT_FILES_DOWNLOADED:
             case RESULT_COMPUTE_ERROR: return tra("Error while computing");
@@ -259,7 +259,7 @@ 
 }
 
 function result_server_state_string($result) {
-    switch($result->server_state) {
+    switch ($result->server_state) {
     case RESULT_SERVER_STATE_INACTIVE: return tra("Inactive");
     case RESULT_SERVER_STATE_UNSENT: return tra("Unsent");
     case RESULT_SERVER_STATE_IN_PROGRESS: return tra("In progress");
@@ -269,7 +269,7 @@ 
 }
 
 function result_outcome_string($result) {
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_INIT: return "---";
     case RESULT_OUTCOME_SUCCESS: return tra("Success");
     case RESULT_OUTCOME_COULDNT_SEND: return tra("Couldn't send");
@@ -287,7 +287,7 @@ 
 }
 
 function result_client_state_string($result) {
-    switch($result->client_state) {
+    switch ($result->client_state) {
     case RESULT_NEW: return tra("New");
     case RESULT_FILES_DOWNLOADING: return tra("Downloading");
     case RESULT_FILES_DOWNLOADED: return tra("Processing");
@@ -305,7 +305,7 @@ 
 }
 
 function validate_state_str($result) {
-    switch($result->validate_state) {
+    switch ($result->validate_state) {
     case VALIDATE_STATE_INIT: return tra("Initial");
     case VALIDATE_STATE_VALID: return tra("Valid");
     case VALIDATE_STATE_INVALID:
@@ -321,7 +321,7 @@ 
 }
 
 function assimilate_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case ASSIMILATE_INIT: return "Initial";
     case ASSIMILATE_READY: return "Ready to assimilate";
     case ASSIMILATE_DONE: return "Assimilated";
@@ -330,7 +330,7 @@ 
 }
 
 function file_delete_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case FILE_DELETE_INIT: return "Initial";
     case FILE_DELETE_READY: return "Ready to delete";
     case FILE_DELETE_DONE: return "Deleted";
@@ -342,7 +342,7 @@ 
 // convert WU error bitmask to str.
 // If $color, add HTML red color
 //
-function wu_error_mask_str($s, $color=false) {
+function wu_error_mask_str($s, $color = false) {
     $x = "";
     if ($s & WU_ERROR_COULDNT_SEND_RESULT) {
         $x = $x." ".tra("Couldn't send result");
@@ -456,10 +456,10 @@ 
     if ($result->received_time) {
         $r = time_str($result->received_time);
     } else if ($result->report_deadline) {
-        if ($result->report_deadline>time()) {
-            $r = "<font color='#33cc33'>" . time_str($result->report_deadline) . "</font>";
+        if ($result->report_deadline > time()) {
+            $r = "<font color='#33cc33'>".time_str($result->report_deadline)."</font>";
         } else {
-            $r = "<font color='#ff3333'>" . time_str($result->report_deadline) . "</font>";
+            $r = "<font color='#ff3333'>".time_str($result->report_deadline)."</font>";
         }
     } else {
         $r = "---";
@@ -520,7 +520,7 @@ 
 // @param Integer $dec A signed integer
 //
 function int2hex($dec) {
-    return "0x".strtoupper(substr(sprintf("%08x",$dec), -8));
+    return "0x".strtoupper(substr(sprintf("%08x", $dec), -8));
 }
 
 // Decode a windows error number into semi-human-readable,
@@ -530,9 +530,9 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function windows_error_code_str($x){
-    $h=int2hex($x);
-    switch($h){
+function windows_error_code_str($x) {
+    $h = int2hex($x);
+    switch ($h) {
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -553,10 +553,10 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function error_code_str($x){
+function error_code_str($x) {
     // severe Windows error numbers are always large negative integers
-    if ($x<-400) return windows_error_code_str($x);
-    switch($x){
+    if ($x < -400) return windows_error_code_str($x);
+    switch ($x) {
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
     case 193: return "EXIT_SIGNAL";
@@ -717,7 +717,7 @@ 
     return $x." (".int2hex($x).") ".error_code_str($x);
 }
 
-function show_result($result, $show_outfile_links=false) {
+function show_result($result, $show_outfile_links = false) {
     start_table();
     row2(tra("Name"), $result->name);
     row2(tra("Workunit"), "<a href=\"workunit.php?wuid=$result->workunitid\">$result->workunitid</a>");
@@ -769,7 +769,7 @@ 
         echo "<h3>".tra("Stderr output")."</h3> <pre>"
             .htmlspecialchars(
                 $result->stderr_out,
-                ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
+                ENT_QUOTES|(defined('ENT_SUBSTITUTE') ?ENT_SUBSTITUTE:0),
                 'utf-8'
             )
             ."</pre>"
@@ -785,7 +785,7 @@ 
 
     $apps = BoincApp::enum('deprecated=0 ORDER BY user_friendly_name');
 
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         $state_count[$i] = 0;
     }
     foreach ($apps as $app) {
@@ -828,7 +828,7 @@ 
         $x .= "<a href=$url>".tra("Next")." ".$info->results_per_page."</a>";
     }
     $x .= "<br>".tra("State").": ";
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         if ($i) $x .= " &middot; ";
         if ($info->state == $i) {
             $x .= $state_name[$i];

html/inc/countries.inc

Braces +1 added lines, -1 removed lines

@@ -505,7 +505,7 @@
     geoip_close($gi);
 
     if ($selected_country=="") $selected_country="None";
-    if ($selected_country=="None" and $geoip_country!=""){
+    if ($selected_country=="None" and $geoip_country!="") {
         $selected_country=$geoip_country;
     }
 

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;