BOINC / boinc

html/user/job_fpops.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
             $host = BoincHost::lookup_id($res->hostid);
             $hosts[$res->hostid] = $host;
         }
-        $fpops = $res->cpu_time * $host->p_fpops;
+        $fpops = $res->cpu_time*$host->p_fpops;
         $samples[] = $res->cpu_time;
         //$fpops /= 1e9;
         //echo "$res->cpu_time $fpops\n";
@@ -45,11 +45,11 @@ 
 }
 
 function show($samples) {
-    $x = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+    $x = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
     foreach ($samples as $s) {
         $x[(int)log10($s)] += 1;
     }
-    for ($i=0; $i<16; $i++) {
+    for ($i = 0; $i < 16; $i++) {
         echo sprintf("%d: %d\n", $i, $x[$i]);
     }
 }

html/user/submit_example.php

Spacing +6 added lines, -6 removed lines

@@ -158,7 +158,7 @@ 
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
     if (!$user_submit) return null;
     $a = array();
-    foreach($apps as $app) {
+    foreach ($apps as $app) {
         if ($user_submit->submit_all) {
             $a[] = $app;
         } else {
@@ -235,9 +235,9 @@ 
     $input_url = get_str('input_url');
     if (!$input_url) error_page("missing input URL");
     $param_lo = (double)get_str('param_lo');
-    if ($param_lo<0 || $param_lo>60) error_page("param lo must be in 0..60");
+    if ($param_lo < 0 || $param_lo > 60) error_page("param lo must be in 0..60");
     $param_hi = (double)get_str('param_hi');
-    if ($param_hi<0 || $param_hi>60 || $param_hi <= $param_lo) {
+    if ($param_hi < 0 || $param_hi > 60 || $param_hi <= $param_lo) {
         error_page("param hi must be in 0..60 and > param lo");
     }
     $param_inc = (double)get_str('param_inc');
@@ -254,7 +254,7 @@ 
     $f->source = $input_url;
     $f->mode = 'semilocal';
 
-    for ($x=$param_lo; $x<$param_hi; $x += $param_inc) {
+    for ($x = $param_lo; $x < $param_hi; $x += $param_inc) {
         $job = new StdClass;
         $job->rsc_fpops_est = $x*1e9;
         $job->command_line = "--t $x";
@@ -343,7 +343,7 @@ 
         "status",
         "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>"
     );
-    foreach($batch->jobs as $job) {
+    foreach ($batch->jobs as $job) {
         $id = (int)$job->id;
         $resultid = (int)$job->canonical_instance_id;
         if ($resultid) {
@@ -386,7 +386,7 @@ 
         "Instance ID<br><p class=\"text-muted\">click for result page on BOINC server</p>",
         "State", "Output files"
     );
-    foreach($reply->instances as $inst) {
+    foreach ($reply->instances as $inst) {
         echo "<tr>
             <td><a href=result.php?resultid=$inst->id>$inst->id</a></td>
             <td>$inst->state</td>

html/user/register.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 function reg_form() {
     $config = get_config();
     $disable_acct = parse_bool($config, "disable_account_creation");
-    page_head("Register",  null, null, null, boinc_recaptcha_get_head_extra());
+    page_head("Register", null, null, null, boinc_recaptcha_get_head_extra());
     echo "<h3>Create an account</h3>";
     form_start("create_account_action.php", "post");
     create_account_form(0, "download_software.php");

html/user/create_account_form.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }
 }
 
-form_start("create_account_action.php","post");
+form_start("create_account_action.php", "post");
 create_account_form($teamid, $next_url);
 if (recaptcha_public_key()) {
     form_general("", boinc_recaptcha_get_html(recaptcha_public_key()));

html/user/sample_index.php

Spacing +2 added lines, -2 removed lines

@@ -58,10 +58,10 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $project_id;
     panel(
-        $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
+        $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT),
         function() use($user) {
             global $no_web_account_creation, $project_id;
             if ($user) {

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $project_id;
     panel(
         $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),

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/user/account_ownership.php

Indentation +119 added lines, -119 removed lines

@@ -28,138 +28,138 @@
 check_tokens($user->authenticator);
 
 function account_ownership_action($user) {
-  // POST request - the user has submitted the form.
-  page_head(tra("Proof of account ownership results"), null, null, null, boinc_recaptcha_get_head_extra());
-
-  if (recaptcha_private_key()) {
-      // Recaptcha is enabled on the BOINC server
-      if (!boinc_recaptcha_isValidated(recaptcha_private_key())) {
-          // The user failed to solve the recaptcha prompt - redirect them to an error message!
-          error_page(
-              tra("Your reCAPTCHA response was not correct. Please try again.")
-          );
-      }
-  }
-
-  // Input is passed in from the openssl_sign_form
-  $user_data = htmlentities(post_str("user_data", true), ENT_QUOTES, "UTF-8"); // Convert special characters to html equivelant
-
-  if ((strlen($user_data) > 0) && (strlen($user_data) <= 4096)) {
-      require_once("../inc/account_ownership.inc");
-      // Check that the private key file exists where specified. If not, redirect to error page.
-      if (!file_exists($account_ownership_private_key_file_path)) {
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      // Check that the public key file exists where specified. If not, redirect to error page.
-      if (!file_exists($account_ownership_public_key_file_path)) {
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      $privkey = fopen($account_ownership_private_key_file_path, "r"); // Opening private key file
-      if (!isset($privkey) || empty($privkey)) {
+    // POST request - the user has submitted the form.
+    page_head(tra("Proof of account ownership results"), null, null, null, boinc_recaptcha_get_head_extra());
+
+    if (recaptcha_private_key()) {
+        // Recaptcha is enabled on the BOINC server
+        if (!boinc_recaptcha_isValidated(recaptcha_private_key())) {
+            // The user failed to solve the recaptcha prompt - redirect them to an error message!
+            error_page(
+                tra("Your reCAPTCHA response was not correct. Please try again.")
+            );
+        }
+    }
+
+    // Input is passed in from the openssl_sign_form
+    $user_data = htmlentities(post_str("user_data", true), ENT_QUOTES, "UTF-8"); // Convert special characters to html equivelant
+
+    if ((strlen($user_data) > 0) && (strlen($user_data) <= 4096)) {
+        require_once("../inc/account_ownership.inc");
+        // Check that the private key file exists where specified. If not, redirect to error page.
+        if (!file_exists($account_ownership_private_key_file_path)) {
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        // Check that the public key file exists where specified. If not, redirect to error page.
+        if (!file_exists($account_ownership_public_key_file_path)) {
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        $privkey = fopen($account_ownership_private_key_file_path, "r"); // Opening private key file
+        if (!isset($privkey) || empty($privkey)) {
         error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-      $privkey_contents = fread($privkey, 8192); // Reading contents of private key into var
-      fclose($privkey); // Closing private key file
+        }
+        $privkey_contents = fread($privkey, 8192); // Reading contents of private key into var
+        fclose($privkey); // Closing private key file
 
-      $userid = $user->id; // Retrieving the user's UserId
-      $message_data = "$userid $user_data"; // Create the message which will be signed.
+        $userid = $user->id; // Retrieving the user's UserId
+        $message_data = "$userid $user_data"; // Create the message which will be signed.
 
-      $private_key_pem = openssl_pkey_get_private($privkey_contents); // Loading the private key into memory
-      openssl_sign($message_data, $signature, $private_key_pem, OPENSSL_ALGO_SHA512); // Compute signature using SHA512
-      openssl_free_key($private_key_pem); // Free the private key from memory for additional security
+        $private_key_pem = openssl_pkey_get_private($privkey_contents); // Loading the private key into memory
+        openssl_sign($message_data, $signature, $private_key_pem, OPENSSL_ALGO_SHA512); // Compute signature using SHA512
+        openssl_free_key($private_key_pem); // Free the private key from memory for additional security
 
-      $pubkey = fopen($account_ownership_public_key_file_path, "r"); // Open public key file
-      if ((!isset($pubkey)) || empty($pubkey)) {
+        $pubkey = fopen($account_ownership_public_key_file_path, "r"); // Open public key file
+        if ((!isset($pubkey)) || empty($pubkey)) {
         error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-      $pubkey_contents = fread($pubkey, 8192); // Read contents to var
-      fclose($pubkey); // Close pub key file
-
-      $base64_sig = base64_encode($signature); // Base64 encode the generated signature to enable safe output to text file.
-      $decoded_sig = base64_decode($base64_sig); // Decode base64 sig for use in sig_verification
-      $pubkeyid = openssl_pkey_get_public($pubkey_contents); // fetch public key into memory
-      $sig_verification = openssl_verify($message_data, $decoded_sig, $pubkeyid, OPENSSL_ALGO_SHA512); // Verify that the generated signature against the original data, using the public key.
-      openssl_free_key($pubkeyid); // Free the public key from memory
-
-      // Check if signature was successfully validated
-      if ($sig_verification == 1) {
-          $url_tokens = url_tokens($user->authenticator);
-          // The generated signature has been successfully verified using the public key.
-          $master_url = master_url();
-          echo "<p>Do not share this information with anyone other than the external system which has requested this proof of account ownership.</p>";
-          echo "<textarea rows='13' cols='50' id='result_textbox'><account_ownership_verification>\n<master_url>$master_url</master_url>\n<msg>$message_data</msg>\n<signature>$base64_sig</signature>\n</account_ownership_verification></textarea>";
-          echo "<br/><br/><button class='btn btn-success' onclick='copy_result_textbox()'>Copy text</button>";
-          echo "<a href='account_ownership.php?$url_tokens'><button class='btn btn-default'>Go back</button></a>";
-          echo '<script type="text/javascript">';
-          echo 'function copy_result_textbox() {
+        }
+        $pubkey_contents = fread($pubkey, 8192); // Read contents to var
+        fclose($pubkey); // Close pub key file
+
+        $base64_sig = base64_encode($signature); // Base64 encode the generated signature to enable safe output to text file.
+        $decoded_sig = base64_decode($base64_sig); // Decode base64 sig for use in sig_verification
+        $pubkeyid = openssl_pkey_get_public($pubkey_contents); // fetch public key into memory
+        $sig_verification = openssl_verify($message_data, $decoded_sig, $pubkeyid, OPENSSL_ALGO_SHA512); // Verify that the generated signature against the original data, using the public key.
+        openssl_free_key($pubkeyid); // Free the public key from memory
+
+        // Check if signature was successfully validated
+        if ($sig_verification == 1) {
+            $url_tokens = url_tokens($user->authenticator);
+            // The generated signature has been successfully verified using the public key.
+            $master_url = master_url();
+            echo "<p>Do not share this information with anyone other than the external system which has requested this proof of account ownership.</p>";
+            echo "<textarea rows='13' cols='50' id='result_textbox'><account_ownership_verification>\n<master_url>$master_url</master_url>\n<msg>$message_data</msg>\n<signature>$base64_sig</signature>\n</account_ownership_verification></textarea>";
+            echo "<br/><br/><button class='btn btn-success' onclick='copy_result_textbox()'>Copy text</button>";
+            echo "<a href='account_ownership.php?$url_tokens'><button class='btn btn-default'>Go back</button></a>";
+            echo '<script type="text/javascript">';
+            echo 'function copy_result_textbox() {
                 var target_textbox = document.getElementById("result_textbox");
                 target_textbox.select();
                 document.execCommand("copy");
                 alert("Copied to clipboard");
               }';
-          echo '</script>';
-          page_tail();
-
-      } elseif ($sig_verification == 0) {
-          // The generated signature has not been verified. The private/public keys do not match.
-          error_page(tra("Signature verification failed. Contact the project administrator to resolve the issue."));
-      } else {
-          // Something has gone wrong & an error has occurred.
-          error_page(tra("An error occurred during the signature verification. Contact the project administrator to resolve the issue."));
-      }
-  } else {
-      // User data input invalid
-      error_page(tra("Invalid input. User input must have a length > 0 and < 4096. <form><input type='button' value='Go back!'' onclick='history.back()'></form>"));
-  }
+            echo '</script>';
+            page_tail();
+
+        } elseif ($sig_verification == 0) {
+            // The generated signature has not been verified. The private/public keys do not match.
+            error_page(tra("Signature verification failed. Contact the project administrator to resolve the issue."));
+        } else {
+            // Something has gone wrong & an error has occurred.
+            error_page(tra("An error occurred during the signature verification. Contact the project administrator to resolve the issue."));
+        }
+    } else {
+        // User data input invalid
+        error_page(tra("Invalid input. User input must have a length > 0 and < 4096. <form><input type='button' value='Go back!'' onclick='history.back()'></form>"));
+    }
 }
 
 function account_ownership_form($user) {
-  // GET request - the user has navigated to the page.
-  page_head(tra("Generate proof of account ownership"), null, null, null, boinc_recaptcha_get_head_extra());
-
-  if ($user) { // Verify the user is logged in
-      require_once("../inc/account_ownership.inc");
-
-      if (!file_exists($account_ownership_private_key_file_path)) {
-          // Check that the private key file exists where specified. If not, redirect to error page.
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      if (!file_exists($account_ownership_public_key_file_path)) {
-          // Check that the public key file exists where specified. If not, redirect to error page.
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      echo "<p>This tool is designed to create a proof of account ownership for external systems.</p>";
-
-      if (recaptcha_public_key()) {
-          // Recaptcha configured
-          echo "<p>Enter a message with length less than 4096 characters into the input textbox below, solve the captcha then click the 'Generate' button.</p>";
-      } else {
-          // Recaptcha not configured
-          echo "<p>Enter a message with length less than 4096 characters into the input textbox below then click the 'Generate' button.</p>";
-      }
-      echo "<p>A textbox will then appear which contains your proof of account ownership.";
-      echo "<form method=post action=account_ownership.php>";
-
-      echo form_tokens($user->authenticator);
-      echo "<textarea rows='4' cols='50' name=user_data type=text size=20 placeholder='Enter text'></textarea><br/><br/>";
-
-      if (recaptcha_public_key()) {
-          // Trigger recaptcha!
-          form_general("", boinc_recaptcha_get_html(recaptcha_public_key()));
-      }
-
-      echo "<input class=\"btn btn-success\" type=submit value='".tra("Generate")."'>";
-      echo "</form><br/><hr/>";
-  } else {
-      // The user is not logged in!
-      echo "<p>You need to be logged in to use this functionality.</p>";
-  }
-
-  page_tail();
+    // GET request - the user has navigated to the page.
+    page_head(tra("Generate proof of account ownership"), null, null, null, boinc_recaptcha_get_head_extra());
+
+    if ($user) { // Verify the user is logged in
+        require_once("../inc/account_ownership.inc");
+
+        if (!file_exists($account_ownership_private_key_file_path)) {
+            // Check that the private key file exists where specified. If not, redirect to error page.
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        if (!file_exists($account_ownership_public_key_file_path)) {
+            // Check that the public key file exists where specified. If not, redirect to error page.
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        echo "<p>This tool is designed to create a proof of account ownership for external systems.</p>";
+
+        if (recaptcha_public_key()) {
+            // Recaptcha configured
+            echo "<p>Enter a message with length less than 4096 characters into the input textbox below, solve the captcha then click the 'Generate' button.</p>";
+        } else {
+            // Recaptcha not configured
+            echo "<p>Enter a message with length less than 4096 characters into the input textbox below then click the 'Generate' button.</p>";
+        }
+        echo "<p>A textbox will then appear which contains your proof of account ownership.";
+        echo "<form method=post action=account_ownership.php>";
+
+        echo form_tokens($user->authenticator);
+        echo "<textarea rows='4' cols='50' name=user_data type=text size=20 placeholder='Enter text'></textarea><br/><br/>";
+
+        if (recaptcha_public_key()) {
+            // Trigger recaptcha!
+            form_general("", boinc_recaptcha_get_html(recaptcha_public_key()));
+        }
+
+        echo "<input class=\"btn btn-success\" type=submit value='".tra("Generate")."'>";
+        echo "</form><br/><hr/>";
+    } else {
+        // The user is not logged in!
+        echo "<p>You need to be logged in to use this functionality.</p>";
+    }
+
+    page_tail();
 }
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {

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

Indentation +9 added lines, -9 removed lines

@@ -131,7 +131,7 @@ 
     $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
+            ."To view the updated thread, visit:\n$link
 
 --------------------------
 To change email preferences, visit:
@@ -149,7 +149,7 @@ 
     $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
+            ."To view the updated forum, visit:\n$link
 
 --------------------------
 To change email preferences, visit:
@@ -162,7 +162,7 @@ 
 //////////////////// a user clicks the red "x" to report a post ///////////
 //
 function send_report_post_email($user, $forum, $thread,  $post, $message) {
-	$master_url = master_url();
+    $master_url = master_url();
 
     $body = "";
     $owner = BoincUser::lookup_id($post->user);
@@ -218,7 +218,7 @@ 
 //////////////////// a banishment vote has been started  ///////////
 //
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
-	$master_url = master_url();
+    $master_url = master_url();
     $now=time();
     $subject = PROJECT." banishment vote underway";
     $vote_url = $master_url."forum_banishment_vote.php";
@@ -240,11 +240,11 @@ 
     pm_send_msg($user, $user, $subject, $body, false);
 
     $body .= "\n\n<a href=".$vote_url."?action=yes&userid="
-             .$user->id
-           .">[vote to banish author]</a>\n\n"
-           ."<a href=".$vote_url."?action=no&userid="
-             .$user->id
-           .">[vote not to banish author]</a>";
+                .$user->id
+            .">[vote to banish author]</a>\n\n"
+            ."<a href=".$vote_url."?action=no&userid="
+                .$user->id
+            .">[vote not to banish author]</a>";
 
     $forum = new BoincForum;
     $forum->parent_type = 0;

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.
     ";