BOINC / boinc

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];

html/user/friend.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
         if ($notify) {
             page_head(tra("Request pending"));
             $t = date_str($friend->create_time);
-            echo tra("You requested friendship with %1 on %2.", $destuser->name,$t) . "
+            echo tra("You requested friendship with %1 on %2.", $destuser->name, $t)."
                 <p>" .
                 tra("This request is still pending confirmation.");
             page_tail();
@@ -51,7 +51,7 @@ 
 function check_ignoring($srcuser, $destuser) {
     BoincForumPrefs::lookup($destuser);
     if (is_ignoring($destuser, $srcuser)) {
-        error_page(tra("%1 is not accepting friendship requests from you",$destuser->name));
+        error_page(tra("%1 is not accepting friendship requests from you", $destuser->name));
     }
 }
 
@@ -72,11 +72,11 @@ 
     echo "
         <form method=post action=friend.php>
         <input type=hidden name=userid value=$destid>
-        <input type=hidden name=action value=add_confirm>" .
+        <input type=hidden name=action value=add_confirm>".
         tra("You have asked to add %1 as a friend. We will notify %1 and will ask him/her to confirm that you are friends.",
-        "<b>".$destuser->name."</b>") ."
+        "<b>".$destuser->name."</b>")."
         <p>" .
-        tra("Add an optional message here:") ."
+        tra("Add an optional message here:")."
         <br>
         ".textarea_with_counter("message", 250, "")."
         <p>
@@ -115,7 +115,7 @@ 
         send_friend_request_email($user, $destuser, $msg);
     }
     page_head(tra("Friend request sent"));
-    echo tra("We have notified %1 of your request.","<b>".$destuser->name."</b>");
+    echo tra("We have notified %1 of your request.", "<b>".$destuser->name."</b>");
     page_tail();
 }
 
@@ -196,7 +196,7 @@ 
     }
 
     page_head(tra("Friendship confirmed"));
-    echo tra("Your friendship with %1 has been confirmed.","<b>" . $srcuser->name ."</b>");
+    echo tra("Your friendship with %1 has been confirmed.", "<b>".$srcuser->name."</b>");
     page_tail();
 }
 
@@ -215,7 +215,7 @@ 
         $notify->delete();
     }
     page_head(tra("Friendship declined"));
-    echo tra("You have declined friendship with %1","<b>".$srcuser->name."</b>");
+    echo tra("You have declined friendship with %1", "<b>".$srcuser->name."</b>");
     page_tail();
 }
 
@@ -233,7 +233,7 @@ 
         echo tra("Notification not found");
     }
     page_head(tra("Friend confirmed"));
-    echo tra("You are now friends with %1.",$destuser->name);
+    echo tra("You are now friends with %1.", $destuser->name);
     page_tail();
 }
 
@@ -245,7 +245,7 @@ 
     echo
         tra("Are you sure you want to cancel your friendship with %1?",
             $destuser->name
-        ) ."<p>\n"
+        )."<p>\n"
     ;
     show_button("friend.php?action=cancel&userid=$destid", tra("Yes"), tra("Cancel friendship"));
     show_button(HOME_PAGE, tra("No"), tra("Stay friends"));
@@ -259,7 +259,7 @@ 
     if (!$destuser) error_page("No such user");
     BoincFriend::delete($user->id, $destid);
     page_head(tra("Friendship cancelled"));
-    echo tra("Your friendship with %1 has been cancelled.",$destuser->name);
+    echo tra("Your friendship with %1 has been cancelled.", $destuser->name);
     page_tail();
 }
 

drupal/sites/default/boinc/modules/boincuser/boincuser.module

Spacing +120 added lines, -120 removed lines

@@ -189,7 +189,7 @@ 
     'type' => MENU_CALLBACK
   );
   $items['account_finish.php'] = array(
-    'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
+    'title' => 'Welcome to '.variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
     'access callback' => TRUE,
@@ -249,8 +249,8 @@ 
   // termsofuse is enabled, by having text in the termsofuse variable.
   $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
-    if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($user->uid)) {
+    if (!boincuser_check_termsofuse($user) and ($existinguser_tou)) {
 
       // Admins are exempt, otherwise the admin may not be able to
       // access the site!
@@ -264,14 +264,14 @@ 
           'user/termsofuse',
           'logout',
           'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
+          'user/'.$user->uid.'/edit',
+          'user/'.$user->uid.'/recoveremail/*',
           'recover_email.php',
         );
         if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/delete';
+          $paths0[] = 'user/'.$user->uid.'/deleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/odeleteconfirm/*';
         }
 
         // Paths added by the admin
@@ -282,7 +282,7 @@ 
         }
 
         // paths to ignore
-        $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
+        $paths_to_ignore = array_unique(array_merge($paths0, $paths2));
 
         if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
           drupal_goto('user/termsofuse');
@@ -304,7 +304,7 @@ 
   require_boinc('password_compat/password');
   // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
   if (isset($account->uid) && ($account->uid > 1)) {
-    switch($op) {
+    switch ($op) {
     case 'load':
       // User loading; insert BOINC data into the user object
       $drupal_user = db_fetch_object(db_query("
@@ -334,11 +334,11 @@ 
       ));
       $account->boincuser_name = $boinc_user->name;
       $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+      $account->boincuser_weak_auth = md5($boinc_user->authenticator.$boinc_user->passwd_hash);
       $account->boincuser_total_credit = round($boinc_user->total_credit);
       $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
       $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+      $account->boincuser_cpid = md5($boinc_user->cross_project_id.$account->mail);
       $account->boincuser_default_pref_set = $boinc_user->venue;
       $account->boincteam_id = $boinc_user->teamid;
       $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
@@ -507,7 +507,7 @@ 
 
             // Set password hash appropriately
             $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
+            $passwd_hash = password_hash(md5($passwd.$lower_email_addr), PASSWORD_DEFAULT);
             // Algorithm for changing email and/or password
             if ($changing_email) {
               // locally store current email to set as previous email
@@ -595,8 +595,8 @@ 
   }
 
   // Check if user has agreed to terms of use.
-  if ( (!empty($termsofuse)) and ($account->uid) and
-       (!boincuser_check_termsofuse($account)) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($account->uid) and
+       (!boincuser_check_termsofuse($account)) and ($existinguser_tou)) {
 
     // Admins are exempted.
     $administrator_role = array_search('administrator', user_roles(true));
@@ -610,9 +610,9 @@ 
       $query_for_destination = '';
       $prevdest = $_REQUEST['destination'];
       if ($prevdest) {
-        $query_for_destination = '?destination=' . $prevdest;
+        $query_for_destination = '?destination='.$prevdest;
       }
-      $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
+      $_REQUEST['destination'] = $path_for_destination.$query_for_destination;
 
     }
   }
@@ -645,7 +645,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'update':
     boincuser_node_update($node);
   }
@@ -656,7 +656,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincuser_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'profile':
     // Update the BOINC database directly
     $account = user_load($node->uid);
@@ -778,7 +778,7 @@ 
     }
 
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest).'</li>',
       '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
@@ -811,7 +811,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -843,7 +843,7 @@ 
     $form['actions']['submit']['#suffix'] = '</li>';
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
-        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
@@ -870,7 +870,7 @@ 
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
@@ -958,11 +958,11 @@ 
     // Set special message if user has not agreed to TOU
     $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-    if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
+    if ((!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users'))) {
       drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
-          '@project' => variable_get('site_name','Drupal-BOINC'),
+          '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:account-credentials-change')
       , 'info');
     }
@@ -1027,36 +1027,36 @@ 
     $form['account']['boincuser_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_id . '</span>
+          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_id.'</span>
         </div>',
     );
     $form['account']['user_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->uid . '</span>
+          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->uid.'</span>
         </div>',
     );
     $form['account']['account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_account_key . '</span>
+          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_account_key.'</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
+          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}".'</span>
         </div>',
     );
     $form['account']['cpid'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_cpid . '</span>
+          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_cpid.'</span>
         </div>',
     );
 
@@ -1074,7 +1074,7 @@ 
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1003,
     );
     if (isset($form['delete']) AND is_array($form['delete'])) {
@@ -1170,7 +1170,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -1219,11 +1219,11 @@ 
     // Set name temporarily to dummy value to beat validation
     $form['name'] = array(
       '#type' => 'hidden',
-      '#value' => rand() . '.' . time()
+      '#value' => rand().'.'.time()
     );
 
     // Add JS for submit button disabling
-    drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+    drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
 
     // Terms of use section
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
@@ -1239,7 +1239,7 @@ 
 
       $form['termsofuse']['title1'] = array(
         '#weight' => -12,
-        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register' ) . '</h2>',
+        '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register').'</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
       );
@@ -1262,7 +1262,7 @@ 
 
     $form['title2'] = array(
       '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+      '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register').'</h2>',
       '#prefix' => '<div id="register-title2">',
       '#suffix' => '</div>',
     );
@@ -1326,7 +1326,7 @@ 
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login').'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -1408,7 +1408,7 @@ 
  */
 function boincuser_token_list($type = 'all') {
   if ($type == 'user' || $type == 'all') {
-    $tokens['user']['display-name']      = t("The user's name that should be displayed");
+    $tokens['user']['display-name'] = t("The user's name that should be displayed");
     return $tokens;
   }
 }
@@ -1420,9 +1420,9 @@ 
   if ($view->args) {
     $account_id = $view->args[0];
   }
-  if ($view->name=="user_activity") {
+  if ($view->name == "user_activity") {
     // Run the following custom query for the user_activity view
-    $view->build_info['query']= "
+    $view->build_info['query'] = "
       SELECT node_revisions.vid AS vid,
         node.nid AS node_nid,
         node.uid AS users_node_uid,
@@ -1462,13 +1462,13 @@ 
   // Delete expired users in the BOINC database, user_delete table.
   require_boinc('boinc_db');
   $num_deleted = BoincUserDeleted::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
   }
 
   // Delete expired tokens from token table
   $tokens_deleted = BoincToken::delete_expired();
-  if ($tokens_deleted>0) {
+  if ($tokens_deleted > 0) {
     watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
   }
 }
@@ -1553,38 +1553,38 @@ 
   case 'boinc':
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
+    $output .= '  <li>'.bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), NULL, 'boinc:join-page').'</li>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
+      $output .= '<li>'.bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
     else {
-      $output .= '<li>' . bts("If you're running a command-line version of BOINC,
+      $output .= '<li>'.bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
           '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
+    $output .= '<li>'.bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
       array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+      ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
     break;
   case 'new':
   default:
@@ -1596,37 +1596,37 @@ 
     //  $ruleslink = drupal_lookup_path('source', $ruleslinkB);
     //}
 
-    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', '') );
+    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', ''));
 
     // Join page output
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
-      $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
+    else if (menu_valid_path(array('link_path' => $ruleslink))) {
+      $output .= '  <li>'.bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
+    $output .= '  <li>'.bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
-    $output .= '    ' . bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
+    $output .= '    '.bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
       '!fdroid_link' => '<a href="https://f-droid.org/en/packages/edu.berkeley.boinc">F-Droid</a>',
       '!apk_link' => '<a href="https://boinc.berkeley.edu/download_all.php">BOINC for Android</a>',
     ), NULL, 'boinc:join-page');
     $output .= '  </li>';
-    $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
+    $output .= '  <li>'.bts('Run the installer.', array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts('Choose @sitename from the list, or enter @siteurl.', array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+    ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
   }
   $output .= '</div>';
   return $output;
@@ -1639,7 +1639,7 @@ 
   global $user;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
   // get the front page message from database; this is set in the admin interface under BOINC Other
-  $site_message = variable_get('boinc_other_frontpage','');
+  $site_message = variable_get('boinc_other_frontpage', '');
 
   // Determine the user of the day
   $current_uotd = db_fetch_object(db_query("
@@ -1661,30 +1661,30 @@ 
   $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
   $output .= '</h2>';
   $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+  $output .= '  <div>'.bts($site_message, array(), NULL, "project:front page").' '.l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about').'</div>';
   if ($user->uid) {
-    $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   else {
-    $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   $output .= '</div>';
   $output .= '<div class="boinc-overview-details">';
   $output .= '  <div class="detail-container">';
-  $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
+  $output .= '    <a class="user-of-the-day" href="account/'.$uotd->uid.'">';
   $output .= '      <div class="picture">';
   $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
     $uotd_image['alt'], array(), FALSE);
   $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
+  $output .= '      <div class="text">'.bts('User of the day', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '      <div class="detail">'.$uotd->boincuser_name.'</div>';
   $output .= '    </a>';
   $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">'.bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform windows">'.bts('Windows', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform mac">'.bts('Mac', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform linux">'.bts('Linux', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      </div>';
   $output .= '    </div>';
   $output .= '  </div>';
@@ -1715,7 +1715,7 @@ 
   $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
   if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
-      '@url' => $base_url . '/user/registration',
+      '@url' => $base_url.'/user/registration',
     ),
     NULL, 'boinc:create_account');
     xml_error(-208, $mess);
@@ -1747,8 +1747,8 @@ 
   $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
   if ($boinc_user) {
     // Return authenticator for existing users
-    if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
-    password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
+    if (($params['passwd_hash'] == $boinc_user->passwd_hash) or
+    password_verify($params['passwd_hash'], $boinc_user->passwd_hash)) {
       $output = array('authenticator' => $boinc_user->authenticator);
     }
     else {
@@ -1804,7 +1804,7 @@ 
   // Ensure there is a authentication token before continuing
   if (empty($authtoken)) {
     drupal_not_found();
-    return ;
+    return;
   }
 
   if (strlen($authtoken) != 32) {
@@ -1826,8 +1826,8 @@ 
   }
 
   // Lookup path to custom account finish page
-  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
-  if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
+  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', ''));
+  if (menu_valid_path(array('link_path' => $customaccountfinishpath))) {
     $node = menu_get_object('node', 1, $customaccountfinishpath);
     if ($node) {
       return node_page_view($node);
@@ -1836,12 +1836,12 @@ 
 
   // open links in new window
   $options = array(
-    'attributes' => array( 'target' => '_blank' ),
+    'attributes' => array('target' => '_blank'),
   );
 
   // Check moderation page exists
-  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
-  if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
+  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', ''));
+  if (menu_valid_path(array('link_path' => $moderationpath))) {
     $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
   } else {
     $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
@@ -1849,11 +1849,11 @@ 
 
   $username = $user->boincuser_name;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
+  $output = "<p>".bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
   array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+  ), NULL, 'boinc:account-finish')."</p>";
 
   $links = array(
     array(
@@ -1919,7 +1919,7 @@ 
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = NULL, $type = 'ul');
 
   return $output;
 }
@@ -2036,7 +2036,7 @@ 
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
-    $site_url = $base_url . $base_path;
+    $site_url = $base_url.$base_path;
     $moderator = user_load($user->uid);
     $profile->moderate = 0;
     $profile->status = 0;
@@ -2097,7 +2097,7 @@ 
       global $base_url;
       global $base_path;
       $site_name = variable_get('site_name', 'Drupal-BOINC');
-      $site_url = $base_url . $base_path;
+      $site_url = $base_url.$base_path;
       $moderator = user_load($user->uid);
       $settings = array(
         'from' => '',
@@ -2201,25 +2201,25 @@ 
   if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
 
   $output = '';
-  $output .= '<table class="user-projects">' . "\n";
-  $output .= '<thead>' . "\n";
-  $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
-  $output .= '  </tr>' . "\n";
-  $output .= '</thead>' . "\n";
-  $output .= '<tbody>' . "\n";
+  $output .= '<table class="user-projects">'."\n";
+  $output .= '<thead>'."\n";
+  $output .= '  <tr>'."\n";
+  $output .= '    <th>'.bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Avg credit', array(), NULL, 'boinc:account-dashboard').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits').'</th>'."\n";
+  $output .= '  </tr>'."\n";
+  $output .= '</thead>'."\n";
+  $output .= '<tbody>'."\n";
   foreach ($projects AS $project) {
-    $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
-    $output .= '  <tr>' . "\n";
-    $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->expavg_credit) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->total_credit) . '</td>' . "\n";
-    $output .= '  </tr>' . "\n";
+    $url = rtrim($project->url, '/').'/show_user.php?userid='.$project->id;
+    $output .= '  <tr>'."\n";
+    $output .= '    <td>'.l($project->name, $url).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->expavg_credit).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->total_credit).'</td>'."\n";
+    $output .= '  </tr>'."\n";
   }
-  $output .= '</tbody>' . "\n";
-  $output .= '</table>' . "\n";
+  $output .= '</tbody>'."\n";
+  $output .= '</table>'."\n";
   $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
   //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
   return $output;
@@ -2239,8 +2239,8 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+  foreach ($get as $arg => $value) $args[] = "{$arg}=".rawurlencode($value);
+  $query = '?'.implode('&', $args);
 
   // Load XML from RPC
   $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
@@ -2312,12 +2312,12 @@ 
     $output .= '<ul class="tab-list">';
     $count = 0;
     foreach ($links as $key => $link) {
-      $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
+      $output .= '<li class="'.(($count == 0) ? 'first primary ' : '').'tab">';
       $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
       $output .= '</li>';
       $count++;
     }
-    $output .= '<li class="' . (($count) ? '' : 'first ') . 'last tab">' . flag_create_link('abuse_user_meta', $account->uid) . '</li>';
+    $output .= '<li class="'.(($count) ? '' : 'first ').'last tab">'.flag_create_link('abuse_user_meta', $account->uid).'</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -2358,7 +2358,7 @@ 
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
   foreach ($documents as $document) {
-    if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
+    if ($document->entity_type == 'node' AND $document->bundle == 'profile') {
       // Node information.
       $nid = $document->entity_id;
       $node = node_load($nid);
@@ -2408,11 +2408,11 @@ 
   // privatemsg module. We need to convert them back to spaces for the
   // check below.
   $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
-  if ($drupalid>0) {
+  if ($drupalid > 0) {
     if ($recipient = user_load(array('uid' => $drupalid))) {
       // Double-check that the loaded user matches both boincuser_id
       // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+      if (($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name)) {
         return $recipient;
       }
     }

html/inc/forum_db.inc

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
         $db = BoincDb::get();
         return $db->lookup('category', 'BoincCategory', $clause);
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('category', 'BoincCategory', $clause);
     }
@@ -78,7 +78,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'thread', $clause);
     }
-    static function enum($clause="") {
+    static function enum($clause = "") {
         $db = BoincDb::get();
         return $db->enum('thread', 'BoincThread', $clause);
     }
@@ -142,7 +142,7 @@ 
         $db = BoincDb::get();
         $ret = $db->insert('forum_preferences', $clause);
     }
-    static function lookup(&$user, $nocache=false) {
+    static function lookup(&$user, $nocache = false) {
         if (!$user) return;
         if (isset($user->prefs)) return;
         if (!$nocache && isset(self::$cache[$user->id])) {
@@ -164,7 +164,7 @@ 
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+         return (substr($this->special_user, $specialbit, 1) == 1);
     }
     function update($clause) {
         $db = BoincDb::get();
@@ -175,7 +175,7 @@ 
         $db = BoincDb::get();
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
     }
@@ -215,8 +215,8 @@ 
         //
         $fl = BoincForumLogging::lookup(0, 0);
         if ($fl) {
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
-                BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
+            if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) {
+                BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0");
                 BoincForumLogging::replace(0, 0, time());
             }
         } else {
@@ -326,10 +326,10 @@ 
     }
 }
 
-define ('NOTIFY_FRIEND_REQ', 1);
-define ('NOTIFY_FRIEND_ACCEPT', 2);
-define ('NOTIFY_PM', 3);
-define ('NOTIFY_SUBSCRIBED_THREAD', 4);
-define ('NOTIFY_SUBSCRIBED_FORUM', 5);
+define('NOTIFY_FRIEND_REQ', 1);
+define('NOTIFY_FRIEND_ACCEPT', 2);
+define('NOTIFY_PM', 3);
+define('NOTIFY_SUBSCRIBED_THREAD', 4);
+define('NOTIFY_SUBSCRIBED_FORUM', 5);
 
 ?>

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) {

html/user/server_status.php

Spacing +9 added lines, -9 removed lines

@@ -180,7 +180,7 @@ 
             $avg = round($app->info->avg, 2);
             $min = round($app->info->min, 2);
             $max = round($app->info->max, 2);
-            $x = $max?"$avg ($min - $max)":"---";
+            $x = $max ? "$avg ($min - $max)" : "---";
             $u = $app->info->users;
         } else {
             $x = '---';
@@ -275,7 +275,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -316,12 +316,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -331,7 +331,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -343,14 +343,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -361,7 +361,7 @@ 
     $y = new StdClass;
     $y->cmd = "Scheduler";
     $y->host = $sched_host;
-    $y->status = !file_exists("../../stop_sched");;
+    $y->status = !file_exists("../../stop_sched"); ;
     $local_daemons[] = $y;
 
     foreach ($daemons->daemon as $d) {
@@ -374,7 +374,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

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,

html/inc/user_util.inc

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)
         );

html/ops/botnet.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 //      add other criteria like # of countries (based on IP addr)
 //      consider only hosts with recent last RPC time
 
-define ('MAX_HOSTS', 100);
+define('MAX_HOSTS', 100);
 
 require_once('../inc/boinc_db.inc');