BOINC / boinc

html/user/forum_post.php

Spacing +10 added lines, -10 removed lines

@@ -53,10 +53,10 @@ 
 $preview = post_str("preview", true);
 $warning = null;
 
-if ($content && $title && (!$preview)){
-    if (post_str('add_signature', true) == "add_it"){
-        $add_signature = true;    // set a flag and concatenate later
-    }  else {
+if ($content && $title && (!$preview)) {
+    if (post_str('add_signature', true) == "add_it") {
+        $add_signature = true; // set a flag and concatenate later
+    } else {
         $add_signature = false;
     }
     check_tokens($logged_in_user->authenticator);
@@ -68,14 +68,14 @@ 
             $title, $content, $logged_in_user, $forum, $add_signature, $export
         );
         if ($thread) {
-            header('Location: forum_thread.php?id=' . $thread->id);
+            header('Location: forum_thread.php?id='.$thread->id);
         } else {
             error_page("Can't create thread.  $forum_error");
         }
     }
 }
 
-page_head(tra("Create new thread"),'','','', $bbcode_js);
+page_head(tra("Create new thread"), '', '', '', $bbcode_js);
 show_forum_header($logged_in_user);
 
 if ($warning) {
@@ -116,7 +116,7 @@ 
     $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>";
 }
 
-if ($force_title && $title){
+if ($force_title && $title) {
     row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">");
 } else {
     row2(tra("Title").$submit_help,
@@ -132,9 +132,9 @@ 
 echo "</td></tr>";
 
 if (!$logged_in_user->prefs->no_signature_by_default) {
-    $enable_signature="checked=\"true\"";
+    $enable_signature = "checked=\"true\"";
 } else {
-    $enable_signature="";
+    $enable_signature = "";
 }
 
 if (is_news_forum($forum)) {
@@ -150,5 +150,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";
+$cvs_version_tracker[] = "\$Id$";
 ?>

html/user/stats.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 start_table();
 echo "
     <tr><td>"
-    . tra("Leader boards for %1",PROJECT).":
+    . tra("Leader boards for %1", PROJECT).":
     <ul>
     <li><a href=\"top_users.php\">" . tra("Participants")."</a>
 ";
@@ -37,7 +37,7 @@ 
 
 if (!DISABLE_TEAMS) {
     echo "
-        <li><a href=\"top_teams.php\">" . tra("Teams"). "</a>
+        <li><a href=\"top_teams.php\">" . tra("Teams")."</a>
     ";
     if ($credit_by_app) {
         echo "<ul><li><a href=per_app_list.php?is_team=1>Per application</a></ul>\n";

html/user/host_stats.php

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
 require_once("../inc/util.inc");
 require_once("../inc/cache.inc");
 
-$min_credit = .1;   // only count hosts with this much RAC
+$min_credit = .1; // only count hosts with this much RAC
 $total_rac = 0;
 
 define("CACHE_PERIOD", 7*86400);
 
 function show_type($type, $stats) {
     global $total_rac;
-    $pct = $total_rac?number_format(100*$stats->rac/$total_rac, 4):0;
+    $pct = $total_rac ?number_format(100*$stats->rac/$total_rac, 4) : 0;
     row_array(array($type, $stats->nhosts, "$pct %"));
 }
 

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

Spacing +10 added lines, -10 removed lines

@@ -9,11 +9,11 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+  drupal_goto('/admin/boinc/user_delete/'.$form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+  drupal_goto('/user/'.$form['#uid'].'/edit');
 }
 
 /**
@@ -24,9 +24,9 @@ 
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
   }
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+  $given_hash = md5($current_pass.$boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+  if ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
   }
 
@@ -40,7 +40,7 @@ 
 /**
  * Delete the user function.
  */
-function _boincuser_delete_deleteuser($account, $action=NULL) {
+function _boincuser_delete_deleteuser($account, $action = NULL) {
   require_boinc('user_util');
   require_boinc('delete_account');
 
@@ -74,11 +74,11 @@ 
       //  * erase signature
       $myarray = array(
         'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
+        'name'      => 'deleted_'.time().'_'.random_string(),
+        'mail'      => 'deleted_'.time().'_'.random_string(),
+        'pass'      => 'deleted_'.time().'_'.random_string(),
         'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
+        'init'      => 'deleted_'.time().'_'.random_string(),
       );
       user_save($account, $myarray);
       break;
@@ -130,7 +130,7 @@ 
 
   if (!empty($mids)) {
     // Delete recipient entries in {pm_index} of the messages the user wrote.
-    db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
+    db_query('DELETE FROM {pm_index} WHERE mid IN ('.db_placeholders($mids).')', $mids);
   }
 
   // Delete recipient entries of that user.

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/boincuser_delete.admin.inc

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
   $form['#uid'] = $uid;
 
   $form['account']['help'] = array(
-    '#value' => "<p>" . t("This form will delete this user <strong>without any email notification</strong> sent to the user. Be very careful in deleting users using this form. Once you select the delete type, check the checkbox, enter your password, and click submit, the user's account will be deleted. This will occur <strong>immediately</strong>. There is no 'undo'!") . "</p><p>" . t("You are deleting the following user, link opens in new window:") . "</p>",
+    '#value' => "<p>".t("This form will delete this user <strong>without any email notification</strong> sent to the user. Be very careful in deleting users using this form. Once you select the delete type, check the checkbox, enter your password, and click submit, the user's account will be deleted. This will occur <strong>immediately</strong>. There is no 'undo'!")."</p><p>".t("You are deleting the following user, link opens in new window:")."</p>",
     '#weight' => -1,
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
@@ -76,16 +76,16 @@ 
     drupal_set_title($account->boincuser_name);
 
     $form['account']['boincuser_name'] = array(
-      '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
+      '#value' => t('<li>BOINC username (public displayname): ').l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
     );
     $form['account']['boincuser_id'] = array(
-      '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
+      '#value' => t('<li>BOINC user ID: ').$account->boincuser_id,
     );
     $form['account']['drupal_name'] = array(
-      '#value' => t('<li>Drupal username (internal): ') . $account->name,
+      '#value' => t('<li>Drupal username (internal): ').$account->name,
     );
     $form['account']['user_id'] = array(
-      '#value' => t('<li>Drupal user ID: ') . $account->uid,
+      '#value' => t('<li>Drupal user ID: ').$account->uid,
     );
 
     $form['account']['user_delete_action'] = array(
@@ -148,7 +148,7 @@ 
     form_set_error('user_delete_action', t('Please select an action to perform using the radio buttons.'));
   }
 
-  if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
+  if (($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe')) {
     form_set_error('user_delete_action', t('User Delete action not a predefined value, unknown error in radio buttons.'));
   }
 

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)) {
@@ -110,7 +110,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:
@@ -124,7 +124,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;
@@ -161,7 +161,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>
     ";
 }
@@ -179,14 +179,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.
@@ -232,8 +232,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'])
     ) {
@@ -247,7 +247,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;
@@ -262,13 +262,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)."',"
@@ -310,7 +310,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/create_account_form.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     }
 }
 
-form_start("create_account_action.php","post");
+form_start("create_account_action.php", "post");
 create_account_form($teamid, $next_url);
 global $recaptcha_public_key;
 if ($recaptcha_public_key) {
@@ -77,5 +77,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/delete_account.inc

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 if (!defined("DELETE_DELAY")) define("DELETE_DELAY", 2);
 
 function is_delete_account_token_valid($userid, $token) {
-    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
+    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         return false;
     }
@@ -126,7 +126,7 @@ 
 //
 function is_over_but_not_validated($res) {
     if ($res->server_state == RESULT_SERVER_STATE_OVER && $res->outcome == RESULT_OUTCOME_SUCCESS &&
-            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE) ) {
+            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE)) {
         return true;
     }    
     return false;
@@ -144,8 +144,8 @@ 
 //
 function cancel_results_for_user($user) {
     $ress = BoincResult::enum("userid = $user->id");
-    $cancel_clause="server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
-    $set_id_clause="hostid=0, userid=0";
+    $cancel_clause = "server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
+    $set_id_clause = "hostid=0, userid=0";
     foreach ($ress as $res) {
         if (is_in_progress($res) || is_over_but_not_validated($res)) {
             $res->update($cancel_clause.", ".$set_id_clause);
@@ -168,12 +168,12 @@ 
 
     // delete remote submit user
     //
-    delete_remote_submit_user($user);  // from submit_util.inc
+    delete_remote_submit_user($user); // from submit_util.inc
     
     // remove user's team records
     //
-    user_erase_team_owner($user);      // from team.inc
-    user_quit_team($user);        // from team.inc
+    user_erase_team_owner($user); // from team.inc
+    user_quit_team($user); // from team.inc
     user_erase_team_delta($user); // from team.inc
     
     // Items that do not have logic elsewhere
@@ -199,6 +199,6 @@ 
     BoincConsent::delete_for_user($user->id);
 
     // final action
-    delete_user($user);  //from user_util.inc
+    delete_user($user); //from user_util.inc
     return 0;
 }

html/user/user_agreetermsofuse_action.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 if ($checkct) {
     $rc1 = consent_to_a_policy($user, $ctid, 1, 0, 'Webform', time());
     if (!$rc1) {
-        error_page("Database error when attempting to INSERT into table consent with ID=$user->id. " . BoincDb::error() . " Please contact site administrators.");
+        error_page("Database error when attempting to INSERT into table consent with ID=$user->id. ".BoincDb::error()." Please contact site administrators.");
     }
 } else {
     error_page("Error: consent type for enrollment not found. Please contact site administrators.");