BOINC / boinc

html/inc/common_defs.inc

Spacing +57 added lines, -57 removed lines

@@ -27,74 +27,74 @@
 define('BATCH_STATE_RETIRED', 4);
 
 define('ANON_PLATFORM_UNKNOWN', -1);
-define('ANON_PLATFORM_CPU',     -2);
-define('ANON_PLATFORM_NVIDIA',  -3);
-define('ANON_PLATFORM_ATI',     -4);
-define('ANON_PLATFORM_INTEL_GPU',   -5);
-define('ANON_PLATFORM_APPLE_GPU',   -6);
+define('ANON_PLATFORM_CPU', -2);
+define('ANON_PLATFORM_NVIDIA', -3);
+define('ANON_PLATFORM_ATI', -4);
+define('ANON_PLATFORM_INTEL_GPU', -5);
+define('ANON_PLATFORM_APPLE_GPU', -6);
 
-define('RESULT_SERVER_STATE_INACTIVE',       1);
-define('RESULT_SERVER_STATE_UNSENT',         2);
-define('RESULT_SERVER_STATE_IN_PROGRESS',    4);
-define('RESULT_SERVER_STATE_OVER',           5);
+define('RESULT_SERVER_STATE_INACTIVE', 1);
+define('RESULT_SERVER_STATE_UNSENT', 2);
+define('RESULT_SERVER_STATE_IN_PROGRESS', 4);
+define('RESULT_SERVER_STATE_OVER', 5);
 
-define('RESULT_OUTCOME_INIT',             0);
-define('RESULT_OUTCOME_SUCCESS',          1);
-define('RESULT_OUTCOME_COULDNT_SEND',     2);
-define('RESULT_OUTCOME_CLIENT_ERROR',     3);
-define('RESULT_OUTCOME_NO_REPLY',         4);
-define('RESULT_OUTCOME_DIDNT_NEED',       5);
-define('RESULT_OUTCOME_VALIDATE_ERROR',   6);
-define('RESULT_OUTCOME_CLIENT_DETACHED',  7);
+define('RESULT_OUTCOME_INIT', 0);
+define('RESULT_OUTCOME_SUCCESS', 1);
+define('RESULT_OUTCOME_COULDNT_SEND', 2);
+define('RESULT_OUTCOME_CLIENT_ERROR', 3);
+define('RESULT_OUTCOME_NO_REPLY', 4);
+define('RESULT_OUTCOME_DIDNT_NEED', 5);
+define('RESULT_OUTCOME_VALIDATE_ERROR', 6);
+define('RESULT_OUTCOME_CLIENT_DETACHED', 7);
 
-define('VALIDATE_STATE_INIT',        0);
-define('VALIDATE_STATE_VALID',       1);
-define('VALIDATE_STATE_INVALID',     2);
-define('VALIDATE_STATE_NO_CHECK',    3);
-define('VALIDATE_STATE_INCONCLUSIVE',4);
-define('VALIDATE_STATE_TOO_LATE',    5);
+define('VALIDATE_STATE_INIT', 0);
+define('VALIDATE_STATE_VALID', 1);
+define('VALIDATE_STATE_INVALID', 2);
+define('VALIDATE_STATE_NO_CHECK', 3);
+define('VALIDATE_STATE_INCONCLUSIVE', 4);
+define('VALIDATE_STATE_TOO_LATE', 5);
 
-define('WU_ERROR_COULDNT_SEND_RESULT',           1);
-define('WU_ERROR_TOO_MANY_ERROR_RESULTS',        2);
-define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS',      4);
-define('WU_ERROR_TOO_MANY_TOTAL_RESULTS',        8);
-define('WU_ERROR_CANCELLED',                     16);
-define('WU_ERROR_NO_CANONICAL_RESULT',           32);
+define('WU_ERROR_COULDNT_SEND_RESULT', 1);
+define('WU_ERROR_TOO_MANY_ERROR_RESULTS', 2);
+define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS', 4);
+define('WU_ERROR_TOO_MANY_TOTAL_RESULTS', 8);
+define('WU_ERROR_CANCELLED', 16);
+define('WU_ERROR_NO_CANONICAL_RESULT', 32);
 
-define('FILE_DELETE_INIT',       0);
-define('FILE_DELETE_READY',      1);
-define('FILE_DELETE_DONE',       2);
-define('FILE_DELETE_ERROR',      3);
+define('FILE_DELETE_INIT', 0);
+define('FILE_DELETE_READY', 1);
+define('FILE_DELETE_DONE', 2);
+define('FILE_DELETE_ERROR', 3);
 
-define('ASSIMILATE_INIT',       0);
-define('ASSIMILATE_READY',      1);
-define('ASSIMILATE_DONE',       2);
+define('ASSIMILATE_INIT', 0);
+define('ASSIMILATE_READY', 1);
+define('ASSIMILATE_DONE', 2);
 
 // from lib/common_defs.h
 //
-define('RESULT_NEW',                 0);
-define('RESULT_FILES_DOWNLOADING',   1);
-define('RESULT_FILES_DOWNLOADED',    2);
-define('RESULT_COMPUTE_ERROR',       3);
-define('RESULT_FILES_UPLOADING',     4);
-define('RESULT_FILES_UPLOADED',      5);
-define('RESULT_ABORTED',             6);
-define('RESULT_UPLOAD_FAILED',       7);
+define('RESULT_NEW', 0);
+define('RESULT_FILES_DOWNLOADING', 1);
+define('RESULT_FILES_DOWNLOADED', 2);
+define('RESULT_COMPUTE_ERROR', 3);
+define('RESULT_FILES_UPLOADING', 4);
+define('RESULT_FILES_UPLOADED', 5);
+define('RESULT_ABORTED', 6);
+define('RESULT_UPLOAD_FAILED', 7);
 
 // from lib/error_numbers.h
 // returned by some web RPCs
 //
-define('ERR_XML_PARSE',               -112);
-define('ERR_DB_NOT_FOUND',            -136);
-define('ERR_DB_NOT_UNIQUE',           -137);
-define('ERR_DB_CANT_CONNECT',         -138);
-define('ERR_PROJECT_DOWN',            -183);
-define('ERR_BAD_USER_NAME',           -188);
-define('ERR_NO_OPTION',               -191);
-define('ERR_BAD_EMAIL_ADDR',          -205);
-define('ERR_BAD_PASSWD',              -206);
-define('ERR_ACCT_CREATION_DISABLED',  -208);
-define('ERR_ATTACH_FAIL_INIT',        -209);
-define('ERR_ATTACH_FAIL_DOWNLOAD',    -210);
-define('ERR_ACCT_REQUIRE_CONSENT',    -242);
+define('ERR_XML_PARSE', -112);
+define('ERR_DB_NOT_FOUND', -136);
+define('ERR_DB_NOT_UNIQUE', -137);
+define('ERR_DB_CANT_CONNECT', -138);
+define('ERR_PROJECT_DOWN', -183);
+define('ERR_BAD_USER_NAME', -188);
+define('ERR_NO_OPTION', -191);
+define('ERR_BAD_EMAIL_ADDR', -205);
+define('ERR_BAD_PASSWD', -206);
+define('ERR_ACCT_CREATION_DISABLED', -208);
+define('ERR_ATTACH_FAIL_INIT', -209);
+define('ERR_ATTACH_FAIL_DOWNLOAD', -210);
+define('ERR_ACCT_REQUIRE_CONSENT', -242);
 ?>

html/user/gpu_ratios.php

Spacing +6 added lines, -6 removed lines

@@ -34,26 +34,26 @@
 $intel_gpu_credit_sum = 0;
 $apple_gpu_scale_sum = 0;
 $apple_gpu_credit_sum = 0;
-$total_credit_sum= 0;
+$total_credit_sum = 0;
 
 $apps = BoincApp::enum("deprecated=0");
 foreach ($apps as $app) {
     $avs = BoincAppVersion::enum("appid=$app->id and deprecated=0");
     foreach ($avs as $av) {
         if (strstr($av->plan_class, "ati")) {
-            $ati_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $ati_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $ati_credit_sum += $av->expavg_credit;
         } else if (strstr($av->plan_class, "nvidia") || strstr($av->plan_class, "cuda")) {
-            $nvidia_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $nvidia_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $nvidia_credit_sum += $av->expavg_credit;
         } else if (strstr($av->plan_class, "intel_gpu")) {
-            $intel_gpu_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $intel_gpu_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $intel_gpu_credit_sum += $av->expavg_credit;
         } else if (strstr($av->plan_class, "apple_gpu")) {
-            $apple_gpu_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $apple_gpu_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $apple_gpu_credit_sum += $av->expavg_credit;
         } else {
-            $cpu_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $cpu_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $cpu_credit_sum += $av->expavg_credit;
         }
         $total_credit_sum += $av->expavg_credit;

html/inc/user_util.inc

Braces +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
             $users = BoincUser::enum(
                 sprintf("name like '%s%%'", $new_name)
             );
-            foreach ($users as $u){
+            foreach ($users as $u) {
                 echo "<p>$u->name\n";
             }
             page_tail();

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 
 function check_passwd_ui($user, $passwd) {
     $passwd_hash = md5($passwd.$user->email_addr);
-    if(!check_passwd_hash($user, $passwd_hash)) {
+    if (!check_passwd_hash($user, $passwd_hash)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         page_head("Password incorrect");
         echo "The password you entered is incorrect. Please go back and try again.\n";
@@ -69,7 +69,7 @@ 
 function is_banned_email_addr($email_addr) {
     global $banned_email_domains;
     if (isset($banned_email_domains)) {
-        foreach($banned_email_domains as $d) {
+        foreach ($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
             if ($x == $d) return true;
         }
@@ -108,7 +108,7 @@ 
 //
 function make_user(
     $email_addr, $name, $passwd_hash,
-    $country=null, $postal_code=null, $project_prefs=null, $teamid=0
+    $country = null, $postal_code = null, $project_prefs = null, $teamid = 0
 ) {
     if (!is_valid_email_syntax($email_addr)) return null;
         // caller generally has already checked
@@ -243,7 +243,7 @@ 
             $users = BoincUser::enum(
                 sprintf("name like '%s%%'", $new_name)
             );
-            foreach ($users as $u){
+            foreach ($users as $u) {
                 echo "<p>$u->name\n";
             }
             page_tail();
@@ -278,7 +278,7 @@ 
         show_error(tra("Passwords may only include ASCII characters."));
     }
 
-    if (strlen($passwd)<$min_passwd_length) {
+    if (strlen($passwd) < $min_passwd_length) {
         show_error(
             tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length)
         );

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

@@ -193,14 +193,14 @@ 
 
     // Check if consent to terms of use has been given.
     //
-    $myconsent = FALSE;
+    $myconsent = false;
     list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
     if ($checkct and check_termsofuse()) {
         $agree = post_str("agree_to_terms_of_use", true);
         if (!$agree) {
             error_page(tra("You have not agreed to our terms of use. Please agree to the terms of use by navigating back to the previous page, in order to create your account"));
         }
-        $myconsent = TRUE;
+        $myconsent = true;
     }
 
     // see whether the new account should be pre-enrolled in a team,
@@ -211,7 +211,7 @@ 
         $team = BoincTeam::lookup_id($teamid);
         $clone_user = BoincUser::lookup_id($team->userid);
         if (!$clone_user) {
-            error_page("User $team->userid not found");
+            error_page("user $team->userid not found");
         }
         $project_prefs = $clone_user->project_prefs;
     } else {

html/user/edit_forum_preferences_action.php

Spacing +29 added lines, -29 removed lines

@@ -29,7 +29,7 @@ 
 }
 BoincForumPrefs::lookup($user);
 
-if (post_str("action", true)=="reset_confirm"){
+if (post_str("action", true) == "reset_confirm") {
     page_head(tra("Confirm reset"));
     echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")."
         <p>
@@ -45,7 +45,7 @@ 
 // If the user has requested a reset of preferences;
 // preserve a few fields.
 //
-if (post_str("action", true)=="reset"){
+if (post_str("action", true) == "reset") {
     $posts = $user->prefs->posts;
     $last_post = $user->prefs->last_post;
     $rated_posts = $user->prefs->rated_posts;
@@ -67,30 +67,30 @@ 
 if (!DISABLE_FORUMS) {
 
 $avatar_type = post_int("avatar_select");
-$newfile=IMAGE_PATH.$user->id."_avatar.jpg";
+$newfile = IMAGE_PATH.$user->id."_avatar.jpg";
 
 // Update the user avatar
-if ($avatar_type<0 or $avatar_type>3) $avatar_type=0;
-if ($avatar_type==0){
-    if (file_exists($newfile)){
+if ($avatar_type < 0 or $avatar_type > 3) $avatar_type = 0;
+if ($avatar_type == 0) {
+    if (file_exists($newfile)) {
         // Delete the file on the server if the user
         // decides not to use an avatar
         //
         unlink($newfile);
     }
-    $avatar_url="";
+    $avatar_url = "";
 } elseif ($avatar_type == 1) {
     $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&amp;d=identicon";
-} elseif ($avatar_type==2){
-    if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) {
-        if ($_FILES['picture']['tmp_name']!="") {
+} elseif ($avatar_type == 2) {
+    if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name'] != "")) {
+        if ($_FILES['picture']['tmp_name'] != "") {
             $file = $_FILES['picture']['tmp_name'];
         } else {
             // Remote image. Download and store locally
             $file = post_str("avatar_url");
         }
         $size = getImageSize($file);
-        if ($size[2]!=2 and $size[2]!=3){
+        if ($size[2] != 2 and $size[2] != 3) {
             //Not the right kind of file
             error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported."));
         }
@@ -99,30 +99,30 @@ 
         $image2 = intelligently_scale_image($file, 100, 100);
         ImageJPEG($image2, $newfile);
     }
-    if (file_exists($newfile)){
-        $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
+    if (file_exists($newfile)) {
+        $avatar_url = IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
     } else {
         //User didn't upload a compatible file or it went lost on the server
-        $avatar_url="";
+        $avatar_url = "";
     }
 }
 
-$images_as_links = (isset($_POST["forum_images_as_links"]) && $_POST["forum_images_as_links"]!="")?1:0;
-$link_popup = (isset($_POST["forum_link_popup"]) && $_POST["forum_link_popup"]!="")?1:0;
-$hide_avatars = (isset($_POST["forum_hide_avatars"]) && $_POST["forum_hide_avatars"]!="")?1:0;
-$hide_signatures = (isset($_POST["forum_hide_signatures"]) && $_POST["forum_hide_signatures"]!="")?1:0;
-$highlight_special = (isset($_POST["forum_highlight_special"]) && $_POST["forum_highlight_special"]!="")?1:0;
-$jump_to_unread = (isset($_POST["forum_jump_to_unread"]) && $_POST["forum_jump_to_unread"]!="")?1:0;
-$ignore_sticky_posts = (isset($_POST["forum_ignore_sticky_posts"]) && $_POST["forum_ignore_sticky_posts"]!="")?1:0;
-$no_signature_by_default = (isset($_POST["signature_by_default"]) && $_POST["signature_by_default"]!="")?0:1;
+$images_as_links = (isset($_POST["forum_images_as_links"]) && $_POST["forum_images_as_links"] != "") ? 1 : 0;
+$link_popup = (isset($_POST["forum_link_popup"]) && $_POST["forum_link_popup"] != "") ? 1 : 0;
+$hide_avatars = (isset($_POST["forum_hide_avatars"]) && $_POST["forum_hide_avatars"] != "") ? 1 : 0;
+$hide_signatures = (isset($_POST["forum_hide_signatures"]) && $_POST["forum_hide_signatures"] != "") ? 1 : 0;
+$highlight_special = (isset($_POST["forum_highlight_special"]) && $_POST["forum_highlight_special"] != "") ? 1 : 0;
+$jump_to_unread = (isset($_POST["forum_jump_to_unread"]) && $_POST["forum_jump_to_unread"] != "") ? 1 : 0;
+$ignore_sticky_posts = (isset($_POST["forum_ignore_sticky_posts"]) && $_POST["forum_ignore_sticky_posts"] != "") ? 1 : 0;
+$no_signature_by_default = (isset($_POST["signature_by_default"]) && $_POST["signature_by_default"] != "") ? 0 : 1;
 $signature = post_str("signature", true);
-if (strlen($signature)>250) {
+if (strlen($signature) > 250) {
     error_page(tra("Your signature was too long, please keep it less than 250 characters."));
 }
 $forum_sort = post_int("forum_sort");
 $thread_sort = post_int("thread_sort");
 $display_wrap_postcount = post_int("forum_display_wrap_postcount");
-if ($display_wrap_postcount<1) $display_wrap_postcount=1;
+if ($display_wrap_postcount < 1) $display_wrap_postcount = 1;
 
 $signature = BoincDb::escape_string($signature);
 
@@ -141,10 +141,10 @@ 
     }
 } else {
     // todo: clean up the following
-    $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!="");
-    if ($add_user_to_filter){
+    $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"] != "");
+    if ($add_user_to_filter) {
         $user_to_add = trim($_POST["forum_filter_user"]);
-        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){
+        if ($user_to_add != "" and $user_to_add == strval(intval($user_to_add))) {
             $other_user = BoincUser::lookup_id($user_to_add);
             if (!$other_user) {
                 echo tra("No such user:")." ".$user_to_add;
@@ -159,9 +159,9 @@ 
 //
 $ignored_users = get_ignored_list($user);
 // todo: use foreach
-for ($i=0;$i<sizeof($ignored_users);$i++){
+for ($i = 0; $i < sizeof($ignored_users); $i++) {
     $remove = "remove".trim($ignored_users[$i]);
-    if (isset($_POST[$remove]) && $_POST[$remove]!=""){
+    if (isset($_POST[$remove]) && $_POST[$remove] != "") {
         $other_user = BoincUser::lookup_id($ignored_users[$i]);
         if (!$other_user) {
             echo tra("No such user:")." ".$ignored_users[$j];

Braces +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
 }
 BoincForumPrefs::lookup($user);
 
-if (post_str("action", true)=="reset_confirm"){
+if (post_str("action", true)=="reset_confirm") {
     page_head(tra("Confirm reset"));
     echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")."
         <p>
@@ -45,7 +45,7 @@ 
 // If the user has requested a reset of preferences;
 // preserve a few fields.
 //
-if (post_str("action", true)=="reset"){
+if (post_str("action", true)=="reset") {
     $posts = $user->prefs->posts;
     $last_post = $user->prefs->last_post;
     $rated_posts = $user->prefs->rated_posts;
@@ -71,8 +71,8 @@ 
 
 // Update the user avatar
 if ($avatar_type<0 or $avatar_type>3) $avatar_type=0;
-if ($avatar_type==0){
-    if (file_exists($newfile)){
+if ($avatar_type==0) {
+    if (file_exists($newfile)) {
         // Delete the file on the server if the user
         // decides not to use an avatar
         //
@@ -81,7 +81,7 @@ 
     $avatar_url="";
 } elseif ($avatar_type == 1) {
     $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&amp;d=identicon";
-} elseif ($avatar_type==2){
+} elseif ($avatar_type==2) {
     if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) {
         if ($_FILES['picture']['tmp_name']!="") {
             $file = $_FILES['picture']['tmp_name'];
@@ -90,7 +90,7 @@ 
             $file = post_str("avatar_url");
         }
         $size = getImageSize($file);
-        if ($size[2]!=2 and $size[2]!=3){
+        if ($size[2]!=2 and $size[2]!=3) {
             //Not the right kind of file
             error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported."));
         }
@@ -99,7 +99,7 @@ 
         $image2 = intelligently_scale_image($file, 100, 100);
         ImageJPEG($image2, $newfile);
     }
-    if (file_exists($newfile)){
+    if (file_exists($newfile)) {
         $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
     } else {
         //User didn't upload a compatible file or it went lost on the server
@@ -142,9 +142,9 @@ 
 } else {
     // todo: clean up the following
     $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!="");
-    if ($add_user_to_filter){
+    if ($add_user_to_filter) {
         $user_to_add = trim($_POST["forum_filter_user"]);
-        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){
+        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))) {
             $other_user = BoincUser::lookup_id($user_to_add);
             if (!$other_user) {
                 echo tra("No such user:")." ".$user_to_add;
@@ -159,9 +159,9 @@ 
 //
 $ignored_users = get_ignored_list($user);
 // todo: use foreach
-for ($i=0;$i<sizeof($ignored_users);$i++){
+for ($i=0;$i<sizeof($ignored_users);$i++) {
     $remove = "remove".trim($ignored_users[$i]);
-    if (isset($_POST[$remove]) && $_POST[$remove]!=""){
+    if (isset($_POST[$remove]) && $_POST[$remove]!="") {
         $other_user = BoincUser::lookup_id($ignored_users[$i]);
         if (!$other_user) {
             echo tra("No such user:")." ".$ignored_users[$j];

html/user/edit_forum_preferences_form.php

Braces +5 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
 // ------------ Forum identity -----------
 
 $select_0 = $select_1 = $select_2 = "";
-if (strlen($user->prefs->avatar)){
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
+if (strlen($user->prefs->avatar)) {
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") {
+// Gravatar
         $select_1 = "checked=\"true\"";
     } else {
         $select_2 = "checked=\"true\"";
@@ -73,7 +74,7 @@ 
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
 );
-if (strlen($user->prefs->avatar)){
+if (strlen($user->prefs->avatar)) {
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
 }
@@ -103,7 +104,7 @@ 
         tra("Attach signature by default")
     )
 );
-if ($user->prefs->signature!=""){
+if ($user->prefs->signature!="") {
     row2(tra("Signature preview").
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
         output_transform($user->prefs->signature)

Spacing +20 added lines, -20 removed lines

@@ -38,9 +38,9 @@ 
 // ------------ Notification -----------
 
 row1(tra("Notifications"));
-$ch0 = $user->prefs->pm_notification==0?"checked":"";
-$ch1 = $user->prefs->pm_notification==1?"checked":"";
-$ch2 = $user->prefs->pm_notification==2?"checked":"";
+$ch0 = $user->prefs->pm_notification == 0 ? "checked" : "";
+$ch1 = $user->prefs->pm_notification == 1 ? "checked" : "";
+$ch2 = $user->prefs->pm_notification == 2 ? "checked" : "";
 row2(
     tra("How should we notify you of new private messages, friend requests, posts in subscribed threads, and other events?"),
     "<input type=radio name=pm_notification value=0 $ch0> ".tra("On my Account page (no email)")."
@@ -53,8 +53,8 @@ 
 // ------------ Forum identity -----------
 
 $select_0 = $select_1 = $select_2 = "";
-if (strlen($user->prefs->avatar)){
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
+if (strlen($user->prefs->avatar)) {
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18) == "//www.gravatar.com") { // Gravatar
         $select_1 = "checked=\"true\"";
     } else {
         $select_2 = "checked=\"true\"";
@@ -73,15 +73,15 @@ 
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
 );
-if (strlen($user->prefs->avatar)){
+if (strlen($user->prefs->avatar)) {
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
 }
 
-$signature_by_default = $user->prefs->no_signature_by_default==false?"checked=\"checked\"":"";
+$signature_by_default = $user->prefs->no_signature_by_default == false ? "checked=\"checked\"" : "";
 
-$signature=$user->prefs->signature;
-$maxlen=250;
+$signature = $user->prefs->signature;
+$maxlen = 250;
 $x = '';
 if (!NO_COMPUTING) {
     $x = tra(
@@ -103,7 +103,7 @@ 
         tra("Attach signature by default")
     )
 );
-if ($user->prefs->signature!=""){
+if ($user->prefs->signature != "") {
     row2(tra("Signature preview").
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
         output_transform($user->prefs->signature)
@@ -112,13 +112,13 @@ 
 
 // ------------ Message display  -----------
 
-$forum_hide_avatars = $user->prefs->hide_avatars?"checked=\"checked\"":"";
-$forum_hide_signatures = $user->prefs->hide_signatures?"checked=\"checked\"":"";
-$forum_link_popup = $user->prefs->link_popup?"checked=\"checked\"":"";
-$forum_image_as_link = $user->prefs->images_as_links?"checked=\"checked\"":"";
-$forum_jump_to_unread = $user->prefs->jump_to_unread?"checked=\"checked\"":"";
-$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts?"checked=\"checked\"":"";
-$forum_highlight_special = $user->prefs->highlight_special?"checked=\"checked\"":"";
+$forum_hide_avatars = $user->prefs->hide_avatars ? "checked=\"checked\"" : "";
+$forum_hide_signatures = $user->prefs->hide_signatures ? "checked=\"checked\"" : "";
+$forum_link_popup = $user->prefs->link_popup ? "checked=\"checked\"" : "";
+$forum_image_as_link = $user->prefs->images_as_links ? "checked=\"checked\"" : "";
+$forum_jump_to_unread = $user->prefs->jump_to_unread ? "checked=\"checked\"" : "";
+$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts ? "checked=\"checked\"" : "";
+$forum_highlight_special = $user->prefs->highlight_special ? "checked=\"checked\"" : "";
 
 $forum_minimum_wrap_postcount = intval($user->prefs->minimum_wrap_postcount);
 $forum_display_wrap_postcount = intval($user->prefs->display_wrap_postcount);
@@ -164,7 +164,7 @@ 
                 <input class="btn btn-default" type="submit" name="remove%d" value="%s">
                 <br>
             ',
-            UNIQUE_USER_NAME?'':"$blocked_user->id -",
+            UNIQUE_USER_NAME ? '' : "$blocked_user->id -",
             user_links($blocked_user),
             $blocked_user->id,
             tra("Unblock")
@@ -178,7 +178,7 @@ 
         tra("Blocked users"),
         tra('Ignore message board posts and private messages from these users.')
     ),
-    $blocked_str?$blocked_str:'---'
+    $blocked_str ? $blocked_str : '---'
 );
 row2(
     tra('Block user'),
@@ -188,7 +188,7 @@ 
             <input type="text" name="forum_filter_user" size=12>
             <input class="btn btn-default" type="submit" name="add_user_to_filter" value="%s">
         ',
-        UNIQUE_USER_NAME?tra('User name'):tra('User ID (For instance: 123456789)'),
+        UNIQUE_USER_NAME ?tra('User name') : tra('User ID (For instance: 123456789)'),
         tra("Block")
     )
 );

html/user/pm.php

Braces +4 added lines, -2 removed lines

@@ -285,7 +285,8 @@ 
         // (PM reply fills in the latter)
         //
         $x = explode(' ', $username);
-        if (is_numeric($x[0])) {     // user ID
+        if (is_numeric($x[0])) {
+// user ID
             $userid = (int)$x[0];
             $user = BoincUser::lookup_id($userid);
             if ($user == null) {
@@ -303,7 +304,8 @@ 
                     tra("Could not find user with username %1", $username)
                 );
                 return;
-            } elseif (count($users) > 1) { // Non-unique username
+            } elseif (count($users) > 1) {
+// Non-unique username
                 pm_form_page(
                     $replyto, $userid,
                     tra("%1 is not a unique username; you will have to use user ID", $username)

Spacing +9 added lines, -9 removed lines

@@ -84,20 +84,20 @@ 
             if ($offset === false) $offset = 0;
             if ($offset >= $nmsgs) $offset = 0;
             echo sprintf('Showing messages %d to %d of %d',
-                $offset+1,
-                min($offset+$nshow, $nmsgs),
+                $offset + 1,
+                min($offset + $nshow, $nmsgs),
                 $nmsgs
             );
             if ($offset) {
                 echo sprintf(
                     ' &middot; <a href=pm.php?action=inbox&offset=%d>Previous %d</a>',
-                    max(0, $offset-$nshow), $nshow
+                    max(0, $offset - $nshow), $nshow
                 );
             }
-            if ($offset+$nshow < $nmsgs) {
+            if ($offset + $nshow < $nmsgs) {
                 echo sprintf(
                     ' &middot; <a href=pm.php?action=inbox&offset=%d>Next %d</a>',
-                    $offset+$nshow, $nshow
+                    $offset + $nshow, $nshow
                 );
             }
         }
@@ -112,12 +112,12 @@ 
             array('style="width: 12em;"', 'style="width: 10em;"', "")
         );
         $i = 0;
-        foreach($msgs as $msg) {
-            if ($i<$offset) {
+        foreach ($msgs as $msg) {
+            if ($i < $offset) {
                 $i++;
                 continue;
             }
-            if ($i>=$offset+$nshow) break;
+            if ($i >= $offset + $nshow) break;
             $i++;
             $sender = BoincUser::lookup_id($msg->senderid);
             if (!$sender) {
@@ -391,7 +391,7 @@ 
     $msgs = BoincPrivateMessage::enum(
         "userid=$logged_in_user->id"
     );
-    foreach($msgs as $msg) {
+    foreach ($msgs as $msg) {
         $x = "pm_select_$msg->id";
         if (post_str($x, true)) {
             $msg = BoincPrivateMessage::lookup_id($msg->id);

html/user/forum_forum.php

Braces +2 added lines, -2 removed lines

@@ -46,14 +46,14 @@
 
     if (!$sort_style) {
         // get the sort style either from the logged in user or a cookie
-        if ($user){
+        if ($user) {
             $sort_style = $user->prefs->forum_sorting;
         } else {
             list($sort_style, $thread_style) = parse_forum_cookie();
         }
     } else {
         // set the sort style
-        if ($user){
+        if ($user) {
             $user->prefs->forum_sorting = $sort_style;
             $user->prefs->update("forum_sorting=$sort_style");
         } else {

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

@@ -70,7 +70,7 @@
         page_head(sprintf("%s '%s'", tra("Forum"), $forum->title));
         if ($msg) echo "<p>$msg</p>\n";
         show_forum_header($user);
-        echo forum_title($category, $forum, NULL);
+        echo forum_title($category, $forum, null);
         break;
     case 1:
         $team = BoincTeam::lookup_id($forum->category);

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 // show a forum.
 // $user is null if not logged in
 //
-function forum_page($forum, $user, $msg=null) {
+function forum_page($forum, $user, $msg = null) {
     global $forum_sort_styles;
 
     if (DISABLE_FORUMS) {
@@ -53,14 +53,14 @@ 
 
     if (!$sort_style) {
         // get the sort style either from the logged in user or a cookie
-        if ($user){
+        if ($user) {
             $sort_style = $user->prefs->forum_sorting;
         } else {
             list($sort_style, $thread_style) = parse_forum_cookie();
         }
     } else {
         // set the sort style
-        if ($user){
+        if ($user) {
             $user->prefs->forum_sorting = $sort_style;
             $user->prefs->update("forum_sorting=$sort_style");
         } else {
@@ -248,7 +248,7 @@ 
         echo "<td><a href=\"forum_thread.php?id=$thread->id\">$title</a><br></td>";
 
         echo '
-            <td>'.($thread->replies+1).'</td>
+            <td>'.($thread->replies + 1).'</td>
             <td>'.user_links($owner, BADGE_HEIGHT_SMALL).'</td>
             <td>'.$thread->views.'</td>
             <td>'.time_diff_str($thread->timestamp, time()).'</td>
@@ -257,7 +257,7 @@ 
         flush();
     }
     end_table();
-    echo "<br>$page_nav";    // show page links
+    echo "<br>$page_nav"; // show page links
 }
 
 $id = get_int("id");

html/ops/delete_user.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 die("Delete this line first\n");
 
 if (is_numeric($argv[1])) {
-    $user = BoincUser::lookup_id((int) $argv[1]);
+    $user = BoincUser::lookup_id((int)$argv[1]);
     if (!$user) die("no such user\n");
     $retval = delete_account($user);
     if ($retval) {

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

@@ -43,7 +43,7 @@
         if ($retval) {
             echo "Failed to delete user: $retval\n";
         } else {
-            echo "User $user->id deleted\n";
+            echo "user $user->id deleted\n";
         }
     }
 }

html/inc/email.inc

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
 
 // send an email, using PHPMailer or not.
 //
-function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
+function send_email($user, $subject, $body, $body_html = null, $email_addr = null) {
     if (!$email_addr) {
         $email_addr = $user->email_addr;
     }
@@ -69,17 +69,17 @@ 
             return true;
         }
     } else {
-        $headers ="";
+        $headers = "";
         if (defined('EMAIL_FROM') && defined('EMAIL_FROM_NAME')) {
             $headers = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM.">";
         } else if (defined('EMAIL_FROM')) {
-            $headers = "From: ". EMAIL_FROM;
+            $headers = "From: ".EMAIL_FROM;
         }
         if ($body_html) {
             $body = "<html><body>\n";
             $body .= $body_html;
             $body .= "\n</body></html>\n";
-            $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";
+            $headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";
         }
         return mail($email_addr, $subject, $body, $headers);
     }
@@ -160,7 +160,7 @@ 
     // otherwise check both IP and email
     if ($ip && filter_var(
         $ip, FILTER_VALIDATE_IP,
-        FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
+        FILTER_FLAG_NO_PRIV_RANGE|FILTER_FLAG_NO_RES_RANGE
     )) {
         $x = @file_get_contents("https://www.stopforumspam.com/api?ip=".$ip."&email=".$addr);
     } else {
@@ -205,7 +205,7 @@ 
     return md5($key.'oogabooga');
 }
 
-function opt_out_url($user, $page="opt_out.php") {
+function opt_out_url($user, $page = "opt_out.php") {
     return sprintf("%s%s?code=%s&userid=%d",
         secure_url_base(),
         $page,