BOINC / boinc

html/user/am_set_info.php

Spacing +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
 }
 
 if (!is_null($teamid)) {
-    if ($teamid==0) {
+    if ($teamid == 0) {
         user_quit_team($user);
     } else {
         $team = BoincTeam::lookup_id_nocache($teamid);
@@ -240,15 +240,15 @@ 
 // table. If one or more of these consent_xyz parameters are NOT
 // present, the RPC will still return 'success', even though the
 // consent table is not updated.
-if ( (isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source)) ) {
+if ((isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source))) {
     list($checkct, $ctid) = check_consent_type($consent_name);
     if ($checkct) {
 
         // Check to see if latest consent of this name is already
         // given.
-        $cr= BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
-        if ( (($cr) and ($cr->consent_flag!=$consent_flag)) or
-             (!$cr) ) {
+        $cr = BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
+        if ((($cr) and ($cr->consent_flag != $consent_flag)) or
+             (!$cr)) {
 
             $rc = consent_to_a_policy($user, $ctid, $consent_flag, $consent_not_required, $consent_source, time());
             if (!$rc) {

html/ops/manage_consent_types.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 // Toggles the enable flag
 function mct_toggle_field($field) {
     $ctid = post_int("consent_type_id");
-    $toggle = post_str("toggle" . $field);
+    $toggle = post_str("toggle".$field);
     if ($toggle == "Click to Enable") {
         $state = 1;
         $action = "Enabled";

html/user/delete_account_confirm.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
     
     page_head(tra("Account Deleted"));
     
-    echo "<p>".tra("Your account has been deleted.  If you want to contribute to %1 in the future you will need to create a new account.",PROJECT)."</p>";
+    echo "<p>".tra("Your account has been deleted.  If you want to contribute to %1 in the future you will need to create a new account.", PROJECT)."</p>";
     
     page_tail();
 }

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.'));
   }
 

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

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/server_status.php',
+        '%full_url' => $base_url.'/server_status.php',
         '%relative_url' => 'server_status.php',
       )
     ),
@@ -131,7 +131,7 @@ 
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/apps.php',
+        '%full_url' => $base_url.'/apps.php',
         '%relative_url' => 'apps.php',
       )
     ),
@@ -354,7 +354,7 @@ 
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
-    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
+    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ').l(t('User management -> User settings'), '/admin/user/settings').'. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
   );
 
   $form['boinc_weboptions_registrationtitle'] = array(
@@ -409,32 +409,32 @@ 
     '#rows' => 8,
     '#description' => t('A list of Drupal URLs/paths to ignore for Terms of Use (ToU). If the option above \'Are existing users forced to agree to the Terms of Use?\' is activated, then some paths need to be ignored when checking if a user has agreed to the ToU. A good example is the logout path, "logout", or else users will not be able to logout!
 <p>There is a default list of paths that must be ignored or else the site will not function. They are not included in this box. Here you may provide additional paths to be ignored, for example the privacy policy page may be accessible so that users may read it before agreeing to the site\'s ToU.
-<p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url . '/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with ' . $base_url . '/account/.'),
+<p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url.'/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with '.$base_url.'/account/.'),
   );
 
   $form['pathtitle'] = array(
     '#value' => '<h3>Path Options</h3>',
   );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+  $form['boinc_weboptions_accountfinish'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
   );
-  $form['boinc_weboptions_moderationpage'] = array (
+  $form['boinc_weboptions_moderationpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
   );
-  $form['boinc_weboptions_rulespolicies'] = array (
+  $form['boinc_weboptions_rulespolicies'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
   );
-  $form['boinc_other_frontpage'] = array (
+  $form['boinc_other_frontpage'] = array(
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
@@ -447,7 +447,7 @@ 
     '#value' => '<h3>Other Options</h3>',
   );
 
-  $form['boinc_weboptions_blacklisted_usernames'] = array (
+  $form['boinc_weboptions_blacklisted_usernames'] = array(
     '#type' => 'textarea',
     '#title' => t('BOINC username blacklist'),
     '#default_value' => $default['boinc_weboptions_blacklisted_usernames'],
@@ -466,17 +466,17 @@ 
   $values = $form_state['values'];
 
   $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+  if (($accountfinish) AND (!drupal_lookup_path('source', $accountfinish))) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+  if (($moderationpage) AND (!drupal_lookup_path('source', $moderationpage))) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+  if (($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies))) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
   }
 }
@@ -485,5 +485,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+  drupal_set_message(bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options'));
 }

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

Spacing +11 added lines, -11 removed lines

@@ -93,9 +93,9 @@ 
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
   global $user;
 
-  switch($form_id) {
+  switch ($form_id) {
     case 'user_profile_form':
-      if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
+      if (user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3) == '')) {
         $form['delete'] = array(
           '#type' => 'submit',
           '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
@@ -105,7 +105,7 @@ 
           '#suffix' => '</li>',
         );
       }
-      else if ( user_access('administer users') ) {
+      else if (user_access('administer users')) {
         $form['delete'] = array(
           '#type' => 'submit',
           '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
@@ -158,7 +158,7 @@ 
           break;
       }
 
-      $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+      $question = 'Are you sure you want to delete the account <em>'.htmlspecialchars($form['_account']['#value']->boincuser_name).'</em>?';
       drupal_set_title($question);
 
       unset($form['description']);
@@ -177,7 +177,7 @@ 
       );
       $form['main']['fs1']['help'] = array(
         '#value' => bts(
-          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
+          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>".
           "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
           array(
             '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
@@ -189,7 +189,7 @@ 
 
       if ($dtypes == 'user_decides') {
         $form['main']['common'] = array(
-          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
+          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account').$common_acts.'<p>'.bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
           '#prefix' => "<div id='delete-instructions'>",
           '#suffix' => "</div>",
           '#weight' => 20,
@@ -257,7 +257,7 @@ 
         '#weight' => 1010,
       );
 
-      $form['#redirect'] = 'account/' . $uid;
+      $form['#redirect'] = 'account/'.$uid;
       $form['#validate'] = array('boincuser_delete_validate');
       $form['#submit'] = array('boincuser_delete_submit');
       break;
@@ -317,7 +317,7 @@ 
   global $base_path;
   module_load_include('inc', 'rules', 'modules/system.rules');
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $site_url = $base_url . $base_path . "user/login";
+  $site_url = $base_url.$base_path."user/login";
 
   // Perform the requested operation
   $op = $form_state['values']['user_delete_action'];
@@ -364,7 +364,7 @@ 
   );
   rules_action_mail_to_user($account, $settings);
 
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'), 'info');
 
   $redirect = variable_get('boincuser_delete_redirect', '<front>');
   // Redirect
@@ -458,7 +458,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -548,7 +548,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(