BOINC / boinc

html/user/create_profile.php

Spacing +20 added lines, -20 removed lines

@@ -32,7 +32,7 @@ 
 // If $selection is provided, and if it matches one of the entries in the file,
 // it will be selected by default.
 //
-function show_combo_box($name, $filename, $selection=null) {
+function show_combo_box($name, $filename, $selection = null) {
     echo "<select name=\"$name\" class=\"form-control\">\n";
 
     $file = fopen($filename, "r");
@@ -63,14 +63,14 @@ 
 <tr><td colspan=2>
 <table border=0 cellpadding=5
 <tr>
-<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a>
+<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a>
 </td>
-<td valign=top>" .tra("%1 Your profile picture is shown to the left.",  $warning) ."
+<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)."
 <p>".
-tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br />
+tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br />
 <input name=picture type=file><br>
 <p>".
-tra("To remove it from your profile, check this box:") . "
+tra("To remove it from your profile, check this box:")."
 <input type=checkbox name=delete_pic>
 <p>
 </td></tr>";
@@ -78,7 +78,7 @@ 
         end_table();
         echo "</td></tr>";
     } else {
-        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB") . "
+        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB")."
 <p>
 <input name=picture type=file>
         ");
@@ -93,7 +93,7 @@ 
     row1(tra("Language"));
     echo "<tr><td>
         <p>" .
-        tra("Select the language in which your profile is written:") . "
+        tra("Select the language in which your profile is written:")."
         <p>
     ";
     if (isset($profile->language)) {
@@ -109,7 +109,7 @@ 
     if (recaptcha_public_key()) {
         table_row(boinc_recaptcha_get_html(recaptcha_public_key()));
     }
-    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
+    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">");
 }
 
 // Returns an array containing:
@@ -123,7 +123,7 @@ 
 
     // Determine if the filetype uploaded is supported.
     // TODO: Change these to constants.
-    switch($size[2]) {
+    switch ($size[2]) {
     case '2':    // JPEG
         $image = imageCreateFromJPEG($fileName);
         break;
@@ -160,7 +160,7 @@ 
 
 function show_description() {
     echo "
-        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . "
+        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)."
         <p>
     ";
 }
@@ -178,14 +178,14 @@ 
     row1(show_profile_heading1());
     rowify(show_profile_question1().bbcode_info());
     show_textarea("response1", $response1);
-    row1( show_profile_heading2());
-    rowify( show_profile_question2().bbcode_info());
+    row1(show_profile_heading2());
+    rowify(show_profile_question2().bbcode_info());
     show_textarea("response2", $response2);
     show_language_selection($profile);
 }
 
 function show_textarea($name, $text) {
-    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>");
+    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>");
 }
 
 // $profile is null if user doesn't already have a profile.
@@ -229,8 +229,8 @@ 
         $delete_pic = "off";
     }
 
-    if (strlen($response1)==0 &&
-        strlen($response2)==0 &&
+    if (strlen($response1) == 0 &&
+        strlen($response2) == 0 &&
         $delete_pic != "on" &&
         !is_uploaded_file($_FILES['picture']['tmp_name'])
     ) {
@@ -244,7 +244,7 @@ 
         $profile->verification = 0;
     }
 
-    $profile ? $has_picture = $profile->has_picture: $has_picture = false;
+    $profile ? $has_picture = $profile->has_picture : $has_picture = false;
 
     if (is_uploaded_file($_FILES['picture']['tmp_name'])) {
         $has_picture = true;
@@ -259,13 +259,13 @@ 
 
         // Write the original image file to disk.
         // TODO: define a constant for image quality.
-        ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg');
-        ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg');
+        ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg');
+        ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg');
     }
     $response1 = sanitize_html($response1);
     $response2 = sanitize_html($response2);
 
-    $has_picture = $has_picture?1:0;
+    $has_picture = $has_picture ? 1 : 0;
     if ($profile) {
         $query = " response1 = '".BoincDb::escape_string($response1)."',"
             ." response2 = '".BoincDb::escape_string($response2)."',"
@@ -307,7 +307,7 @@ 
     page_tail();
 }
 
-function show_profile_form($profile, $warning=null) {
+function show_profile_form($profile, $warning = null) {
     if ($profile) {
         page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra());
     } else {

html/inc/bootstrap.inc

Spacing +23 added lines, -23 removed lines

@@ -141,12 +141,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     $master_url = master_url();
@@ -246,7 +246,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary", $body_class="") {
+function panel($title, $content_func, $class = "panel-primary", $body_class = "") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -273,7 +273,7 @@ 
 // $left_width is the width of left column in 1/12 units.
 // $arg is passed to the functions.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6, $arg=null) {
+function grid($top_func, $left_func, $right_func, $left_width = 6, $arg = null) {
     echo '
         <div class="container-fluid">
     ';
@@ -288,7 +288,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -312,7 +312,7 @@ 
 //      use extra = "name=x"
 //      call forum_focus(x, foo) after defining the field
 //
-function form_start($action, $method='get', $extra='') {
+function form_start($action, $method = 'get', $extra = '') {
     echo sprintf(
         '<div class="container-fluid">
         <form class="form-horizontal" method="%s" action="%s" %s>'
@@ -344,7 +344,7 @@ 
 // just the input field
 //
 function form_input_text_field(
-    $name, $value='', $type='text', $attrs='', $extra=''
+    $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     return sprintf(
         '<input %s type="%s" class="form-control" name="%s" value="%s">%s',
@@ -355,7 +355,7 @@ 
 // the whole row
 //
 function form_input_text(
-    $label, $name, $value='', $type='text', $attrs='', $extra=''
+    $label, $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     echo sprintf('
         <div class="form-group">
@@ -383,7 +383,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='', $nrows=4) {
+function form_input_textarea($label, $name, $value = '', $nrows = 4) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -400,7 +400,7 @@ 
 // $items is either a string of <option> elements,
 // or an array of [value, name] pairs
 //
-function form_select($label, $name, $items, $selected=null) {
+function form_select($label, $name, $items, $selected = null) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -413,7 +413,7 @@ 
         foreach ($items as $i) {
             echo sprintf(
                 '<option %s value=%s>%s</option>',
-                ($i[0]==$selected)?'selected':'',
+                ($i[0] == $selected) ? 'selected' : '',
                 $i[0], $i[1]
             );
         }
@@ -426,7 +426,7 @@ 
 // same, for multiple select.
 // $selected, if non-null, is a list of selected values
 //
-function form_select_multiple($label, $name, $items, $selected=null, $size=0) {
+function form_select_multiple($label, $name, $items, $selected = null, $size = 0) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -438,7 +438,7 @@ 
     foreach ($items as $i) {
         echo sprintf(
             '<option %s value=%s>%s</option>',
-            ($selected && in_array($i[0], $selected))?'selected':'',
+            ($selected && in_array($i[0], $selected)) ? 'selected' : '',
             $i[0], $i[1]
         );
     }
@@ -447,12 +447,12 @@ 
 
 // return a list of strings for checkbox items
 //
-function checkbox_item_strings($items, $attrs='') {
+function checkbox_item_strings($items, $attrs = '') {
     $x = [];
     foreach ($items as $i) {
         $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     return $x;
@@ -460,7 +460,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -479,7 +479,7 @@ 
 //
 function form_radio_buttons(
     $label, $name, $items, $selected,
-    $assign_ids=false       // assign IDs to buttons based on names
+    $assign_ids = false       // assign IDs to buttons based on names
 ) {
     echo sprintf('
         <div class="form-group">
@@ -489,7 +489,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         if ($assign_ids) {
             $id = sprintf('id="%s_%s"', $name, $i[0]);
         } else {
@@ -527,7 +527,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf(
@@ -537,7 +537,7 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -549,7 +549,7 @@ 
               <input type="checkbox" name="%s" %s>
            </div>
         </div>
-        ', $name, $checked?"checked":""
+        ', $name, $checked ? "checked" : ""
     );
 }
 
@@ -577,7 +577,7 @@ 
 // $selected is the list of selected values.
 // $extra is e.g. id=foo
 //
-function form_select2_multi($label, $name, $items, $selected=null, $extra='') {
+function form_select2_multi($label, $name, $items, $selected = null, $extra = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -589,7 +589,7 @@ 
     foreach ($items as $i) {
         echo sprintf(
             '<option %s value=%s>%s</option>',
-            ($selected && in_array($i[0], $selected))?'selected':'',
+            ($selected && in_array($i[0], $selected)) ? 'selected' : '',
             $i[0], $i[1]
         );
     }

html/inc/util.inc

Spacing +77 added lines, -77 removed lines

@@ -30,7 +30,7 @@ 
 require_once("../inc/bootstrap.inc");
 
 function master_url() {
-    return parse_config(get_config() , "<master_url>");
+    return parse_config(get_config(), "<master_url>");
 }
 function recaptcha_public_key() {
     return parse_config(get_config(), "<recaptcha_public_key>");
@@ -42,10 +42,10 @@ 
 // Set parameters to defaults if not defined in config.xml
 
 $x = parse_config(get_config(), "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config(get_config(), "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // Set parameters to defaults if not defined in project.inc
 
@@ -155,10 +155,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) {
     // the following allows independent login for projects on the same server
     //
     $url = parse_url(master_url());
@@ -167,28 +167,28 @@ 
         $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,
         '',
-        is_https(),     // if this page is secure, make cookie secure
+        is_https(), // if this page is secure, make cookie secure
         true            // httponly; no JS access
     );
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     $url = parse_url(master_url());
     $path = $url['path'];
     if ($ops) {
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) {
         // this could have been called earlier with $must_be_logged_in false
@@ -214,7 +214,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);
@@ -225,7 +225,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);
@@ -235,7 +235,7 @@ 
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -247,11 +247,11 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in html/project/project.inc
 //
-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()")
@@ -260,10 +260,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)
@@ -285,7 +285,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
@@ -308,11 +308,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">
@@ -368,7 +368,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"):
@@ -383,13 +383,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";
@@ -423,24 +423,24 @@ 
 // convert time interval in seconds to a string of the form
 // 'D days h hours m min s sec'.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $x = (int)$x;
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = $x % 60;
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = $x%60;
 
     $s = "";
     if ($days) {
         $s .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($s))) {
+    if ($res > 0 && ($hours || strlen($s))) {
         $s .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($s))) {
+    if ($res > 1 && ($minutes || strlen($s))) {
         $s .= "$minutes ".tra("min")." ";
     }
-    if ($res>2) {
+    if ($res > 2) {
         $s .= "$seconds ".tra("sec")." ";
     }
     return $s;
@@ -454,7 +454,7 @@ 
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
+    return gmdate('j M Y, G:i:s', (int)$x)." UTC";
 }
 
 function local_time_str($x) {
@@ -466,14 +466,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);
 }
 
@@ -518,7 +518,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 {
@@ -532,10 +532,10 @@ 
 
 // a table row with 2 columns, with the left on right-aligned
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -546,7 +546,7 @@ 
 // output the first part of row2();
 // then write the content, followed by </td></tr>
 
-function row2_init($x, $lwidth='40%') {
+function row2_init($x, $lwidth = '40%') {
     echo sprintf('<tr>
         <td width="%s" %s>%s</td>
         <td %s>',
@@ -562,31 +562,31 @@ 
     echo "<tr><td>$string</td></tr>";
 }
 
-function row_array($x, $attrs=null) {
+function row_array($x, $attrs = null) {
     echo "<tr>\n";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<td $a>$h</td>\n";
         $i++;
     }
     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
     );
@@ -646,7 +646,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;
@@ -729,8 +729,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) {
@@ -749,7 +749,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)) {
@@ -764,7 +764,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;
@@ -782,7 +782,7 @@ 
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -794,7 +794,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 {
@@ -806,7 +806,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 {
@@ -822,7 +822,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;
     }
@@ -846,7 +846,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
     //
@@ -863,7 +863,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) {
@@ -888,12 +888,12 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
-    $url = is_https()?'https':'http';
+    $url = is_https() ? 'https' : 'http';
     $url .= "://";
     $url .= $_SERVER['SERVER_NAME'];
     $url .= ":".$_SERVER['SERVER_PORT'];
@@ -911,7 +911,7 @@ 
 // the colors for bootstrap's btn-success are almost illegible;
 // the green is too light.  Use a darker green.
 //
-function button_style($color='green', $font_size=null) {
+function button_style($color = 'green', $font_size = null) {
     $fs = '';
     if ($font_size) {
         $fs = sprintf('; font-size:%dpx', $font_size);
@@ -930,7 +930,7 @@ 
 // class: class of the button, e.g. btn
 // extra: Additional text in href tag
 //
-function button_text($url, $text, $desc=null, $class=null, $extra='') {
+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
     if (!$desc) {
         $desc = $text;
     }
@@ -945,23 +945,23 @@ 
     );
 }
 
-function button_text_small($url, $text, $desc=null) {
+function button_text_small($url, $text, $desc = null) {
     return button_text($url, $text, $desc, "btn btn-xs", button_style());
 }
 
-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
     echo button_text($url, $text, $desc, $class, $extra);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text_small($url, $text, $desc);
 }
 
 // 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\"";
@@ -998,7 +998,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) {
@@ -1074,7 +1074,7 @@ 
 // Check this to avoid XSS vulnerability
 //
 function sanitize_sort_by($x) {
-    switch($x) {
+    switch ($x) {
     case 'expavg_credit':
     case 'total_credit':
         return;
@@ -1092,7 +1092,7 @@ 
 }
 
 function do_download($path) {
-    $name=basename($path);
+    $name = basename($path);
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
     header('Content-Disposition: attachment; filename='.$name);
@@ -1100,7 +1100,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);
 }
@@ -1149,10 +1149,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];
     }
@@ -1181,7 +1181,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")
     ;
 }
 
@@ -1211,7 +1211,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() {
@@ -1237,7 +1237,7 @@ 
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to

html/inc/forum_email.inc

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
 // - project forums: everyone in POST_REPORT_EMAILS
 // - team message board: team founder and admins
 //
-function mail_report_list($forum, $subject, $body, $must_send=false) {
+function mail_report_list($forum, $subject, $body, $must_send = false) {
     $success = true;
     switch ($forum->parent_type) {
     case 0:
@@ -65,7 +65,7 @@ 
 function send_moderation_email($forum, $post, $thread, $explanation, $action) {
     $master_url = master_url();
 
-    $moderator=get_logged_in_user();
+    $moderator = get_logged_in_user();
     $body = "";
     $user = BoincUser::lookup_id($post->user);
 
@@ -126,11 +126,11 @@ 
 // There's a new post in the thread, which the user is subscribed to.
 // send them an email notifying them.
 //
-function send_thread_notification_email($thread, $user){
-    $title = PROJECT . ": there is a new post in '". $thread->title ."'";
-    $link = secure_url_base() . "forum_thread.php?id=" . $thread->id;
-    $body = "A " . PROJECT . " user has posted to the thread
-\"" . $thread->title . "\".\n"
+function send_thread_notification_email($thread, $user) {
+    $title = PROJECT.": there is a new post in '".$thread->title."'";
+    $link = secure_url_base()."forum_thread.php?id=".$thread->id;
+    $body = "A ".PROJECT." user has posted to the thread
+\"" . $thread->title."\".\n"
            ."To view the updated thread, visit:\n$link
 
 --------------------------
@@ -144,11 +144,11 @@ 
 // There's a new thread in the forum, which the user is subscribed to.
 // send them an email notifying them.
 //
-function send_forum_notification_email($forum, $user){
-    $title = PROJECT . ": there is a new thread in '". $forum->title ."'";
-    $link = secure_url_base() . "forum_forum.php?id=" . $forum->id;
-    $body = "A " . PROJECT . " user has added a thread to the forum
-\"" . $thread->title . "\".\n"
+function send_forum_notification_email($forum, $user) {
+    $title = PROJECT.": there is a new thread in '".$forum->title."'";
+    $link = secure_url_base()."forum_forum.php?id=".$forum->id;
+    $body = "A ".PROJECT." user has added a thread to the forum
+\"" . $thread->title."\".\n"
            ."To view the updated forum, visit:\n$link
 
 --------------------------
@@ -161,7 +161,7 @@ 
 
 //////////////////// a user clicks the red "x" to report a post ///////////
 //
-function send_report_post_email($user, $forum, $thread,  $post, $message) {
+function send_report_post_email($user, $forum, $thread, $post, $message) {
 	$master_url = master_url();
 
     $body = "";
@@ -219,16 +219,16 @@ 
 //
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
 	$master_url = master_url();
-    $now=time();
+    $now = time();
     $subject = PROJECT." banishment vote underway";
     $vote_url = $master_url."forum_banishment_vote.php";
     $body = "
 A vote has been started to banish you
 from the ".PROJECT." message boards until ".date('M j,
-Y G:i', $duration+$now).",
+Y G:i', $duration + $now).",
 because your postings have not followed our guidelines.
 
-This vote will last until ".date('M j, Y G:i',$end_time)." or until a majority
+This vote will last until ".date('M j, Y G:i', $end_time)." or until a majority
 decision has been reached.  If the vote does not result in banishment, you will be
 able to resume posting at that time.
     ";

html/inc/cache.inc

Spacing +29 added lines, -29 removed lines

@@ -32,8 +32,8 @@ 
         mkdir("../cache", 0770);
         chmod("../cache", 0770);
     }
-    for ($i=0;$i<256;$i++) {
-        $j=sprintf("%02x",$i);
+    for ($i = 0; $i < 256; $i++) {
+        $j = sprintf("%02x", $i);
         if (!@filemtime("../cache/$j")) {
             mkdir("../cache/$j", 0770);
             chmod("../cache/$j", 0770);
@@ -41,7 +41,7 @@ 
     }
 }
 
-function get_path($params, $phpfile=null) {
+function get_path($params, $phpfile = null) {
     if (!@filemtime("../cache/00")) make_cache_dirs();
     if ($phpfile) {
         $z = $phpfile;
@@ -51,7 +51,7 @@ 
     }
 
     // add a layer of subdirectories for reducing file lookup time
-    $sz = substr(md5($z."_".urlencode($params)),1,2);
+    $sz = substr(md5($z."_".urlencode($params)), 1, 2);
     $path = "../cache/".$sz."/".$z;
     if ($params) {
         $path = $path."_".urlencode($params);
@@ -60,14 +60,14 @@ 
 }
 
 function disk_usage($dir) {
-    $usage=0;
-    if ($handle=@opendir($dir)) {
-        while ($file=readdir($handle)) {
+    $usage = 0;
+    if ($handle = @opendir($dir)) {
+        while ($file = readdir($handle)) {
             if (($file != ".") && ($file != "..")) {
                 if (@is_dir($dir."/".$file)) {
-                    $usage+=disk_usage($dir."/".$file);
+                    $usage += disk_usage($dir."/".$file);
                 } else {
-                    $usage+=@filesize($dir."/".$file);
+                    $usage += @filesize($dir."/".$file);
                 }
             }
         }
@@ -81,8 +81,8 @@ 
     if (!chdir($dir)) {
         return;
     }
-    if ($handle=@opendir(".")) {
-        while ($file=readdir($handle)) {
+    if ($handle = @opendir(".")) {
+        while ($file = readdir($handle)) {
             if ($file == ".") continue;
             if ($file == "..") continue;
 
@@ -93,7 +93,7 @@ 
             if (@is_dir($file)) {
                 clean_cache($max_age, $file);
             } else {
-                if ((time()-@filemtime($file))>$max_age) {
+                if ((time() - @filemtime($file)) > $max_age) {
                     //echo "unlinking ".getcwd()."/$file\n";
                     @unlink($file);
                 }
@@ -107,8 +107,8 @@ 
 
 // check cache size every once in a while, purge if too big
 //
-function cache_check_diskspace(){
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
+function cache_check_diskspace() {
+    if ((rand()%CACHE_SIZE_CHECK_FREQ)) return;
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
         USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
@@ -116,7 +116,7 @@ 
     clean_cache($x, "../cache");
 }
 
-function cache_need_to_regenerate($path, $max_age){
+function cache_need_to_regenerate($path, $max_age) {
     $regenerate = false;
     $request = apache_request_headers();
 
@@ -128,7 +128,7 @@ 
         // and touch the cached copy so other processes
         // don't regenerate at the same time
         //
-        if ($lastmodified<time()-$max_age) {
+        if ($lastmodified < time() - $max_age) {
             $regenerate = true;
             @touch($path);
         }
@@ -139,7 +139,7 @@ 
 }
 
 // Returns cached data or false if nothing was found
-function get_cached_data($max_age, $params=""){
+function get_cached_data($max_age, $params = "") {
     global $no_cache;
 
     if ($no_cache) return false;
@@ -155,7 +155,7 @@ 
             }
         } else {
             cache_check_diskspace();
-            $regenerate=cache_need_to_regenerate($path, $max_age);
+            $regenerate = cache_need_to_regenerate($path, $max_age);
             if (!$regenerate) {
                 return file_get_contents($path);
             }
@@ -165,7 +165,7 @@ 
 }
 
 // DEPRECATED
-function start_cache($max_age, $params=""){
+function start_cache($max_age, $params = "") {
     global $no_cache, $caching, $memcache;
 
     if ($no_cache) return;
@@ -188,15 +188,15 @@ 
             $regenerate = cache_need_to_regenerate($path, $max_age);
         }
         //Is the stored version too old, do we need to regenerate it?
-        if ($regenerate){
+        if ($regenerate) {
             // If cached version is too old (or non-existent)
             // generate the page and write to cache
             //
             ob_start();
             ob_implicit_flush(0);
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age);
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
 
             // allow the calling page to see cache period
             //
@@ -208,9 +208,9 @@ 
             if (strstr($params, "format=xml")) {
                 header('Content-type: text/xml');
             }
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age );
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
             if ($cache && $cache->content) {
                 echo $cache->content;
                 exit;
@@ -228,7 +228,7 @@ 
 
 // write output buffer both to client and to cache
 // DEPRECATED
-function end_cache($max_age,$params=""){
+function end_cache($max_age, $params = "") {
     global $no_cache;
     if ($no_cache) return;
 
@@ -253,7 +253,7 @@ 
     }
 }
 
-function set_cached_data($max_age, $data, $params=""){
+function set_cached_data($max_age, $data, $params = "") {
     // for the benefit of hackers
     if (strstr($params, "..")) {
         return "bad params";
@@ -295,7 +295,7 @@ 
         }
         $server_arr = array();
         $servers = explode('|', MEMCACHE_SERVERS);
-        foreach($servers as &$server) {
+        foreach ($servers as &$server) {
             list($ip, $port, $weight) = explode(':', $server);
             if (!$port) { $port = 11211; }
             $server_arr[] = array($ip, $port, $weight);

html/user/manage_project.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
             $app = BoincApp::lookup_id($ua->app_id);
             $names[] = $app->name;
         }
-        $sub = $names?implode(', ', $names):'---';
+        $sub = $names ?implode(', ', $names) : '---';
     }
     if ($u->manage_all) {
         $admin = 'All applications';
@@ -49,7 +49,7 @@ 
             $app = BoincApp::lookup_id($ua->app_id);
             $names[] = $app->name;
         }
-        $admin = $names?implode(', ', $names):'---';
+        $admin = $names ?implode(', ', $names) : '---';
     }
     [$yes, $no] = read_kw_prefs($user);
     global $job_keywords;
@@ -69,7 +69,7 @@ 
         implode('<br>', $kws),
         $u->quota,
         $u->max_jobs_in_progress,
-        ($u->logical_start_time > time())?local_time_str($u->logical_start_time):'---'
+        ($u->logical_start_time > time()) ?local_time_str($u->logical_start_time) : '---'
     );
 }
 
@@ -199,18 +199,18 @@ 
     $manage_apps = array_map('intval', $manage_apps);
     foreach ($apps as $app) {
         $s = in_array($app->id, $submit_apps);
-        $m = in_array($app->id, $manage_apps)?1:0;
+        $m = in_array($app->id, $manage_apps) ? 1 : 0;
         if ($s || $m) {
             BoincUserSubmitApp::insert(
                 "(user_id, app_id, manage) values ($user_id, $app->id, $m)"
             );
         }
     }
-    $quota = (double) get_str('quota');
+    $quota = (double)get_str('quota');
     if ($quota != $us->quota) {
         $us->update("quota=$quota");
     }
-    $mj = (int) get_str('max_jobs_in_progress');
+    $mj = (int)get_str('max_jobs_in_progress');
     if ($mj != $us->max_jobs_in_progress) {
         $us->update("max_jobs_in_progress=$mj");
     }

html/user/buda.php

Spacing +9 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
 // show list of BUDA apps and variants,
 // w/ buttons for adding and deleting
 //
-function app_list($notice=null) {
+function app_list($notice = null) {
     global $buda_root;
     if (!is_dir($buda_root)) {
         mkdir($buda_root);
@@ -256,7 +256,7 @@ 
     //
     $x = "<input_template>\n";
     $ninfiles = 1 + count($variant_desc->input_file_names) + count($variant_desc->app_files);
-    for ($i=0; $i<$ninfiles; $i++) {
+    for ($i = 0; $i < $ninfiles; $i++) {
         $x .= "   <file_info>\n      <sticky/>\n      <no_delete/>\n      <executable/>\n   </file_info>\n";
     }
     $x .= "   <workunit>\n";
@@ -286,7 +286,7 @@ 
     );
 
     $x .= sprintf("      <max_delay>%f</max_delay>\n",
-        $variant_desc->max_delay_days * 86400.
+        $variant_desc->max_delay_days*86400.
     );
 
     $x .= "   </workunit>\n<input_template>\n";
@@ -476,8 +476,8 @@ 
     }
 }
 
-function app_form($desc=null) {
-    page_head_select2($desc?"Edit BUDA app $desc->name":'Create BUDA app');
+function app_form($desc = null) {
+    page_head_select2($desc ? "Edit BUDA app $desc->name" : 'Create BUDA app');
     form_start('buda.php');
     form_input_hidden('action', 'app_action');
     if ($desc) {
@@ -488,22 +488,22 @@ 
         form_input_text('Internal name<br><small>No spaces</small>', 'name');
     }
     form_input_text('User-visible name', 'long_name',
-        $desc?$desc->long_name:null
+        $desc ? $desc->long_name : null
     );
     form_input_textarea(
         'Description<br><small>... of what the app does and of the research goals</small>',
         'description',
-        $desc?$desc->description:null
+        $desc ? $desc->description : null
     );
     form_select2_multi('Science keywords',
         'sci_kw',
         keyword_select_options(KW_CATEGORY_SCIENCE),
-        $desc?$desc->sci_kw:null
+        $desc ? $desc->sci_kw : null
     );
     form_input_text(
         'URL of web page describing app',
         'url',
-        !empty($desc->url)?$desc->url:''
+        !empty($desc->url) ? $desc->url : ''
     );
     // don't include location keywords;
     // various people may submit jobs to this app

html/user/submit_rpc_handler.php

Spacing +30 added lines, -30 removed lines

@@ -59,7 +59,7 @@ 
     if ($template) {
         $t = (double)$template->workunit->rsc_fpops_est;
     }
-    foreach($r->batch->job as $job) {
+    foreach ($r->batch->job as $job) {
         $y = (double)$job->rsc_fpops_est;
         if ($y) {
             $x += $y;
@@ -85,7 +85,7 @@ 
 function est_elapsed_time($r, $template) {
     // crude estimate: batch FLOPs / project FLOPS
     //
-    return batch_flop_count($r, $template) / project_flops();
+    return batch_flop_count($r, $template)/project_flops();
 }
 
 // if batch-level input template filename was given, read it;
@@ -95,9 +95,9 @@ 
 //
 function read_input_template($app, $r) {
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
     } else {
-        $path = project_dir() . "/templates/$app->name"."_in";
+        $path = project_dir()."/templates/$app->name"."_in";
     }
     if (file_exists($path)) {
         $x = simplexml_load_file($path);
@@ -145,7 +145,7 @@ 
 function validate_batch($jobs, $template) {
     $i = 0;
     $n = count($template->file_info);
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         $m = count($job->input_files);
         if ($n != $m) {
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -214,7 +214,7 @@ 
 // stage all the files
 //
 function stage_files(&$jobs, $user) {
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         foreach ($job->input_files as $file) {
             if ($file->mode != "remote") {
                 $file->name = stage_file($file, $user);
@@ -227,7 +227,7 @@ 
 //
 function submit_jobs(
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
-    $input_template_filename,        // batch-level; can also specify per job
+    $input_template_filename, // batch-level; can also specify per job
     $output_template_filename,
     $user
 ) {
@@ -237,7 +237,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -272,7 +272,7 @@ 
         $x .= "\n";
     }
 
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
 
     if ($user->seti_id) {
         $cmd .= " --target_user $user->id ";
@@ -383,7 +383,7 @@ 
 //
 function xml_get_jobs($r) {
     $jobs = array();
-    foreach($r->batch->job as $j) {
+    foreach ($r->batch->job as $j) {
         $job = new StdClass;
         $job->input_files = array();
         $job->command_line = (string)$j->command_line;
@@ -436,16 +436,16 @@ 
 //
 function logical_end_time($r, $jobs, $user, $app) {
     $total_flops = 0;
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         //print_r($job);
         if ($job->rsc_fpops_est) {
             $total_flops += $job->rsc_fpops_est;
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
         } else if ($r->batch->job_params->rsc_fpops_est) {
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
         } else {
-            $x = (double) $template->workunit->rsc_fpops_est;
+            $x = (double)$template->workunit->rsc_fpops_est;
             if ($x) {
                 $total_flops += $x;
             } else {
@@ -453,7 +453,7 @@ 
             }
         }
     }
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
     $x = exec($cmd);
     if (!is_numeric($x) || (double)$x == 0) {
         xml_error(-1, "$cmd returned $x");
@@ -538,15 +538,15 @@ 
     }
 
     $job_params = new StdClass;
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
         // could add quorum-related stuff
 
-    $input_template_filename = (string) $r->batch->input_template_filename;
-    $output_template_filename = (string) $r->batch->output_template_filename;
+    $input_template_filename = (string)$r->batch->input_template_filename;
+    $output_template_filename = (string)$r->batch->output_template_filename;
         // possibly empty
 
     submit_jobs(
@@ -639,7 +639,7 @@ 
 }
 
 function n_outfiles($wu) {
-    $path = project_dir() . "/$wu->output_template_filename";
+    $path = project_dir()."/$wu->output_template_filename";
     $r = simplexml_load_file($path);
     return count($r->file_info);
 }
@@ -846,7 +846,7 @@ 
 ";
         if ($result->server_state == 5) {   // over?
             $paths = get_outfile_paths($result);
-            foreach($paths as $path) {
+            foreach ($paths as $path) {
                 if (is_file($path)) {
                     $size = filesize($path);
                     echo "        <outfile>
@@ -890,7 +890,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -1005,8 +1005,8 @@ 
     }
 
     $user = check_remote_submit_permissions($r, $app);
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
     if ($in === false || $out === false) {
         log_write("template file missing");
         xml_error(-1, "template file missing");
@@ -1018,7 +1018,7 @@ 
 
 function ping($r) {
     xml_start_tag("ping");
-    BoincDb::get();     // errors out if DB down or web disabled
+    BoincDb::get(); // errors out if DB down or web disabled
     echo "<success>1</success>
         </ping>
     ";
@@ -1092,9 +1092,9 @@ 
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
 if ($request_log) {
     $log_dir = parse_config(get_config(), "<log_dir>");
-    $request_log = $log_dir . "/" . $request_log;
+    $request_log = $log_dir."/".$request_log;
     if ($file = fopen($request_log, "a")) {
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $req . "\n</submit_rpc_handler>\n");
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$req."\n</submit_rpc_handler>\n");
         fclose($file);
     }
 }

html/inc/submit_util.inc

Spacing +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
     foreach ($res_in_prog as $res) {
         $wus_in_prog[$res->workunitid] = true;
     }
-    unset($res_in_progress);    // does this do anything?
+    unset($res_in_progress); // does this do anything?
 
     $fp_total = 0;
     $fp_done = 0;
@@ -352,7 +352,7 @@ 
 // get the total size of output files of a batch
 //
 function batch_output_file_size($batchid) {
-    $batch_td_size=0;
+    $batch_td_size = 0;
     $wus = BoincWorkunit::enum_fields(
         'canonical_resultid',
         "batch=$batchid"
@@ -385,7 +385,7 @@ 
 }
 
 function boinc_get_wu_output_files_url($user, $wu_id) {
-    $auth_str =  md5($user->authenticator.$wu_id);
+    $auth_str = md5($user->authenticator.$wu_id);
     return "get_output.php?cmd=workunit_files&wu_id=$wu_id&auth_str=$auth_str";
 }
 
@@ -419,7 +419,7 @@ 
     if (!file_exists($path)) return null;
     $x = file_get_contents($path);
     $n = sscanf($x, "%s %d", $md5, $size);
-    if ($n != 2 || strlen($md5)!=32) {
+    if ($n != 2 || strlen($md5) != 32) {
         return null;
     }
     return [$md5, $size];