BOINC / boinc

drupal/sites/default/boinc/modules/boincuser/includes/boincuser.helpers.inc

Spacing +13 added lines, -13 removed lines

@@ -165,8 +165,8 @@ 
       WHERE n.type = 'profile'
       AND n.status = 1
       AND n.moderate = 0
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
       ORDER BY RAND()
       LIMIT 1"
     ));
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -303,7 +303,7 @@ 
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
   }
 
   // Determine if there are duplicate names, if so append a number to end.
@@ -373,7 +373,7 @@ 
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
-    if (preg_match('{' . $pi . '}', $path)) {
+    if (preg_match('{'.$pi.'}', $path)) {
       return TRUE;
     }
   }
@@ -499,15 +499,15 @@ 
   elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
-            t('and') . '</strong> ' . t('save the configuration'),
+          array('!verify' => l(t('verify the default values').' <strong>'. 
+            t('and').'</strong> '.t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
-            array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
+            array('!verify' => l(t('verify the default values').' <strong>'. 
+              t('and').'</strong> '.t('save the configuration'),
               'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
@@ -569,7 +569,7 @@ 
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
   $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
+  $deleteurl = 'node/'.$node->nid.'/delete';
   $afterq = 'destination=account';
   drupal_goto($deleteurl, $afterq);
 }
@@ -599,8 +599,8 @@ 
   $view = views_get_current_view();
   $account_id = $view->args[0];
   $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
-    array('@count' => $friend_count)) . '</h2>';
+  return '<h2 class="pane-title">'.bts('Friends (@count)', 
+    array('@count' => $friend_count)).'</h2>';
 }
 
 /**
@@ -613,7 +613,7 @@ 
   $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
   db_set_active('default');
   while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+      $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
   }
 
   drupal_json((object)$matches);

html/inc/account.inc

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
             tra("Must be at least %1 characters", $min_passwd_length),
             tra("Password")
         ),
-        "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
+        "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd")
     );
     if (USER_COUNTRY) {
         form_select(
@@ -145,9 +145,9 @@ 
     } else {
         $x = tra("Email address:");
     }
-    form_input_text($x, "email_addr", '', 'text', $attrs='autofocus tabindex="1"');
+    form_input_text($x, "email_addr", '', 'text', $attrs = 'autofocus tabindex="1"');
     form_input_text(
-        tra("Password:").'<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
+        tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
         "passwd",
         "",
         "password",

html/inc/util_basic.inc

Spacing +5 added lines, -5 removed lines

@@ -46,10 +46,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;
@@ -95,7 +95,7 @@ 
 // If it's a single-tag element, and it's present, just return the tag
 //
 function parse_element($xml, $tag) {
-    $closetag = "</" . substr($tag,1);
+    $closetag = "</".substr($tag, 1);
     $x = strstr($xml, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;
@@ -111,8 +111,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/util.inc

Spacing +77 added lines, -77 removed lines

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

html/user/get_project_config.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@ 
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment == false) {
         $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>
@@ -115,7 +115,7 @@ 
 if (defined('TERMSOFUSE_FILE')) {
   $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+  $tou_file = "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

html/ops/mass_email_script.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 $globals->batch = 1000;
 $globals->lapsed_interval = 60*86400;
 
-for ($i=1; $i<$argc; $i++) {
+for ($i = 1; $i < $argc; $i++) {
     if ($argv[$i] == "--batch") {
         $i++;
         $globals->batch = $argv[$i];
@@ -169,7 +169,7 @@ 
         gmdate('d F Y', $user->create_time),
         number_format($user->total_credit, 0),
         opt_out_url($user),
-        floor((time() - $user->last_rpc_time) / 86400),
+        floor((time() - $user->last_rpc_time)/86400),
     );
     return preg_replace($pat, $rep, $template);
 }
@@ -238,7 +238,7 @@ 
     while ($user = _mysql_fetch_object($result)) {
         handle_user($user);
         $startid = $user->id;
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -252,7 +252,7 @@ 
     $user = _mysql_fetch_object($result);
     if ($user) {
         handle_user($user);
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -289,7 +289,7 @@ 
     } else {
         $fid = fopen($id_file, 'r');
         if (!$fid) {
-            echo  $id_file . ' not found - create ID list and run again\n';
+            echo  $id_file.' not found - create ID list and run again\n';
             exit();
         }
         $thisid = 0;
@@ -300,7 +300,7 @@ 
         }
         fclose($fid);
     }
-    echo 'All done!' . "\n";
+    echo 'All done!'."\n";
 }
 
 if (!function_exists('make_php_mailer')) {

html/inc/translation.inc

Spacing +33 added lines, -33 removed lines

@@ -64,11 +64,11 @@ 
     $dh = opendir($langdir.$transdir);
     if (!$dh) die("can't open translation dir");
     while (($file = readdir($dh)) !== false) {
-        if ($file==".." || $file==".") {
+        if ($file == ".." || $file == ".") {
             continue;
         }
         // only do files ending in .po
-        if (substr($file,-3) != ".po"){
+        if (substr($file, -3) != ".po") {
             //debug("File $file with unknown extension found in $info_dir");
             continue;
         }
@@ -76,7 +76,7 @@ 
             "-------------Compiling $transdir$file------------", 0
         );
         $language = parse_po_file($langdir.$transdir.$file);
-        if (!$language){
+        if (!$language) {
             language_log(
                 "WARNING: Could not parse language ".$file
             );
@@ -95,10 +95,10 @@ 
             );
             exit;
         }
-        foreach ($language as $key => $value){
+        foreach ($language as $key => $value) {
             if ($value !== "") {
                 // Skip if the msgstr is empty
-                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
+                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file, 0, -3))."\"][\"".$key."\"] = \"".$value."\";\n");
             }
         }
         // don't write \?\> - may append
@@ -115,27 +115,27 @@ 
 function parse_po_file($file) {
     $translation_file = file($file);
     $first_entry = true;
-    $current_token_text="";
-    $current_token ="";
+    $current_token_text = "";
+    $current_token = "";
     $parsing_token = false;
     $parsing_text = false;
     $size = sizeof($translation_file);
     $output = array();
-    for ($i=0; $i<$size; $i++){
+    for ($i = 0; $i < $size; $i++) {
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
-        if (substr($entry, 0, 1)=="#") {
+        if (substr($entry, 0, 1) == "#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
-            if (!$first_entry){
+            if (!$first_entry) {
                 //If this is not the first, save the previous entry
-                $output[$current_token]=$current_token_text;
+                $output[$current_token] = $current_token_text;
             }
             $current_token = get_po_line($entry, $file);
-            $current_token_text="";
+            $current_token_text = "";
             $parsing_token = true;
             $parsing_text = false;
-            $first_entry=false;
+            $first_entry = false;
         } elseif (strpos($entry, "msgstr") !== false) {
             $current_token_text = get_po_line($entry, $file);
             $parsing_token = false;
@@ -149,7 +149,7 @@ 
     
     // Get the last token
     //
-    if ($current_token && $current_token_text){
+    if ($current_token && $current_token_text) {
         $output[$current_token] = $current_token_text;
     }
     return $output;
@@ -159,9 +159,9 @@ 
 // Returns the contents of a line (ie removes "" from start and end)
 //
 function get_po_line($line, $file) {
-    $start = strpos($line, '"')+1;
+    $start = strpos($line, '"') + 1;
     $stop = strrpos($line, '"');
-    $x = substr($line, $start, $stop-$start);
+    $x = substr($line, $start, $stop - $start);
     $n = preg_match("/[^\\\\]\"/", $x);
     if ($n) {
         echo "ERROR - MISMATCHED QUOTES IN $file: $line\n";
@@ -180,11 +180,11 @@ 
     
     // Find the string in the user's language
     //
-    foreach ($languages_in_use as $language){
+    foreach ($languages_in_use as $language) {
         if (isset($language_lookup_array[$language][$text])) {
             $text = $language_lookup_array[$language][$text];
             break;
-        } else if ($language=="en"){ 
+        } else if ($language == "en") { 
             // This language is defined in the code and is always available
             break;
         }
@@ -193,7 +193,7 @@ 
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i=1; $i<func_num_args(); $i++){
+    for ($i = 1; $i < func_num_args(); $i++) {
         $replacements["%".$i] = func_get_arg($i);
     }
 
@@ -210,14 +210,14 @@ 
     return $text;
 }
 
-function language_log($message, $loglevel=0) {
+function language_log($message, $loglevel = 0) {
     global $lang_log_level;
     $msg = "";
-    if ($loglevel==0) $msg = "[ Debug    ]";
-    if ($loglevel==1) $msg = "[ Warning  ]";
-    if ($loglevel==2) $msg = "[ CRITICAL ]";
+    if ($loglevel == 0) $msg = "[ Debug    ]";
+    if ($loglevel == 1) $msg = "[ Warning  ]";
+    if ($loglevel == 2) $msg = "[ CRITICAL ]";
 
-    if ($loglevel >= $lang_log_level){
+    if ($loglevel >= $lang_log_level) {
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
     }
 }
@@ -226,7 +226,7 @@ 
 // (by looking at cookies and browser settings)
 // cookies have highest priority.
 
-if (isset($_COOKIE['lang'])){
+if (isset($_COOKIE['lang'])) {
     $language_string = $_COOKIE['lang'].",";
 } else {
     $language_string = '';
@@ -257,10 +257,10 @@ 
 // Loop over languages that the client requests
 //
 $size = sizeof($client_languages);
-for ($i=0; $i<$size; $i++) {
-    if ((strlen($client_languages[$i])>2)
+for ($i = 0; $i < $size; $i++) {
+    if ((strlen($client_languages[$i]) > 2)
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
-    ){
+    ) {
         // If this is defined as primary-secondary, represent it as xx_YY
         //
         $language = substr(
@@ -279,7 +279,7 @@ 
 
     // if main language is english, look no further
     //
-    if ((count($languages_in_use)==0) && ($language == 'en' || $language2 == 'en')) {
+    if ((count($languages_in_use) == 0) && ($language == 'en' || $language2 == 'en')) {
         break;
     }
 
@@ -287,7 +287,7 @@ 
     //
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
     if (file_exists($file_name)) {
-        if (!in_array($language, $languages_in_use)){
+        if (!in_array($language, $languages_in_use)) {
             require_once($file_name);
             $languages_in_use[] = $language;
         }
@@ -295,7 +295,7 @@ 
     if ($language2) {
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
         if (file_exists($file_name)) {
-            if (!in_array($language2, $languages_in_use)){
+            if (!in_array($language2, $languages_in_use)) {
                 require_once($file_name);
                 $languages_in_use[] = $language2;
             }
@@ -303,7 +303,7 @@ 
     }
 }
 
-$GLOBALS['languages_in_use'] = $languages_in_use;   // for Drupal
+$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/cert_all.php

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@ 
 
 $border = get_str("border", true);
 
-if ($border=="no") {
+if ($border == "no") {
     $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 $font = "\"Optima,Lucida Bright,Times New Roman\"";
@@ -75,7 +75,7 @@ 
     <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
 ";
 foreach ($user->projects as $p) {
-    if ($p->total_credit<100) continue;
+    if ($p->total_credit < 100) continue;
     show_proj($p);
 }
 echo "

drupal/sites/default/settings.php

Spacing +8 added lines, -8 removed lines

@@ -114,7 +114,7 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+  $dbserver = 'localhost';
 $db_url = array(
   'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
   'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
@@ -162,14 +162,14 @@ 
  * settings are used there. Settings defined here should not be
  * duplicated there so as to avoid conflict issues.
  */
-ini_set('session.cache_expire',     200000);
-ini_set('session.cache_limiter',    'none');
-ini_set('session.cookie_lifetime',  2000000);
-ini_set('session.gc_maxlifetime',   200000);
-ini_set('session.save_handler',     'user');
+ini_set('session.cache_expire', 200000);
+ini_set('session.cache_limiter', 'none');
+ini_set('session.cookie_lifetime', 2000000);
+ini_set('session.gc_maxlifetime', 200000);
+ini_set('session.save_handler', 'user');
 ini_set('session.use_only_cookies', 1);
-ini_set('session.use_trans_sid',    0);
-ini_set('url_rewriter.tags',        '');
+ini_set('session.use_trans_sid', 0);
+ini_set('url_rewriter.tags', '');
 ini_set('memory_limit', '128M');
 ini_set('post_max_size', '8MB');
 ini_set('upload_max_filesize', '8MB');