BOINC / boinc

html/ops/db_update.php

Spacing +5 added lines, -5 removed lines

@@ -276,7 +276,7 @@ 
     do_query("alter table host add max_results_day integer not null");
 }
 
-function update_4_20_2005(){
+function update_4_20_2005() {
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -286,7 +286,7 @@ 
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
 }
 
-function update_4_30_2005(){
+function update_4_30_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
 }
 
@@ -313,7 +313,7 @@ 
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
 }
 
-function update_11_24_2005(){
+function update_11_24_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
 }
@@ -618,7 +618,7 @@ 
     ");
 }
 
-function update_10_05_2008(){
+function update_10_05_2008() {
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
 }
 
@@ -1244,7 +1244,7 @@ 
 // This used to be the Subversion version#,
 // but with Git we just use sequential integers
 //
-$db_updates = array (
+$db_updates = array(
     array(18490, "update_6_16_2009"),
     array(19001, "update_9_3_2009"),
     array(20807, "update_3_5_2010"),

html/ops/bbcode_convert_response2.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    $i = 0;
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 profiles
-            echo $profile->userid.". "; flush();   // print out where we are
+            echo $profile->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.module

Spacing +13 added lines, -13 removed lines

@@ -78,8 +78,8 @@ 
   foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
-    $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
-    if ( $document->entity_type=='node' AND $to_process) {
+    $to_process = (array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle]);
+    if ($document->entity_type == 'node' AND $to_process) {
 
       // Remove ts_comments if present.
       if (isset($document->ts_comments)) {
@@ -110,7 +110,7 @@ 
         $comment_document->bundle = 'Comment';
         $comment_document->bundle_name = 'Comment';
 
-        $comment_document->path = 'goto/comment/' . $comment->cid;
+        $comment_document->path = 'goto/comment/'.$comment->cid;
         $comment_document->url = url($comment_document->path, $url_options);
 
         // Comment object has no language
@@ -140,7 +140,7 @@ 
 
         // Index formatted username so it can be searched and sorted
         // on.
-        $account = (object) array('uid' => $comment->uid, 'name' => $comment->name);
+        $account = (object)array('uid' => $comment->uid, 'name' => $comment->name);
         $username = check_plain($account->name);
         $comment_document->ss_name_formatted = $username;
         $comment_document->tos_name_formatted = $username;
@@ -184,7 +184,7 @@ 
 
           // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
           // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+          if ((preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName)) AND is_array($fieldValue)) {
             foreach ($fieldValue as $subkey => $subvalue) {
               $comment_document->addField($fieldName, $subvalue);
             }
@@ -226,8 +226,8 @@ 
  */
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
   //dpm($query->getSolrParams(), "process_results query getSolrParams");
-  foreach($results as $id => $result) {
-    if ($result['entity_type']=='comment') {
+  foreach ($results as $id => $result) {
+    if ($result['entity_type'] == 'comment') {
         $results[$id]['type'] = 'Comment';
         $results[$id]['date'] = $result['fields']['changed'];
         if (isset($result['fields']['is_uid'])) {
@@ -252,7 +252,7 @@ 
  */
 function boinc_solr_comments_apachesolr_query_alter($query) {
   // Add custom field to query results
-  $query->addParam('fl','tos_content_extra');
+  $query->addParam('fl', 'tos_content_extra');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -282,7 +282,7 @@ 
   switch ($op) {
     case 'delete':
       // Only call delete function on certain node types
-      if (in_array( $node->type, $node_types)) {
+      if (in_array($node->type, $node_types)) {
         boinc_solr_comments_delete($node);
       }
       break;
@@ -314,7 +314,7 @@ 
   try {
     $solr = apachesolr_get_solr($env_id);
     // Custom query to find all comments with parent nid of the node bing deleted.
-    $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
+    $query = "entity_type:comment AND tos_content_extra:".$node->nid;
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+  drupal_set_message(bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /**
@@ -410,7 +410,7 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+  if (($comment->cid) AND ($comment->nid)) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.
@@ -426,7 +426,7 @@ 
  *   The comment to be unpublished (hidden).
  */
 function boinc_solr_comments_unpublish($comment) {
-  if ( ($comment->cid) ) {
+  if (($comment->cid)) {
     // Call the deletecomment function for hook comment.
     boinc_solr_comments_deletecomment($comment);
   }

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

Spacing +13 added lines, -13 removed lines

@@ -165,8 +165,8 @@ 
       WHERE n.type = 'profile'
       AND n.status = 1
       AND n.moderate = 0
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
       ORDER BY RAND()
       LIMIT 1"
     ));
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -303,7 +303,7 @@ 
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
   }
 
   // Determine if there are duplicate names, if so append a number to end.
@@ -379,7 +379,7 @@ 
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
-    if (preg_match('{' . $pi . '}', $path)) {
+    if (preg_match('{'.$pi.'}', $path)) {
       return TRUE;
     }
   }
@@ -505,15 +505,15 @@ 
   elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' .
-            t('and') . '</strong> ' . t('save the configuration'),
+          array('!verify' => l(t('verify the default values').' <strong>'.
+            t('and').'</strong> '.t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
-            array('!verify' => l(t('verify the default values') . ' <strong>' .
-              t('and') . '</strong> ' . t('save the configuration'),
+            array('!verify' => l(t('verify the default values').' <strong>'.
+              t('and').'</strong> '.t('save the configuration'),
               'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
@@ -575,7 +575,7 @@ 
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
   $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
+  $deleteurl = 'node/'.$node->nid.'/delete';
   $afterq = 'destination=account';
   drupal_goto($deleteurl, $afterq);
 }
@@ -605,8 +605,8 @@ 
   $view = views_get_current_view();
   $account_id = $view->args[0];
   $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)',
-    array('@count' => $friend_count)) . '</h2>';
+  return '<h2 class="pane-title">'.bts('Friends (@count)',
+    array('@count' => $friend_count)).'</h2>';
 }
 
 /**
@@ -619,7 +619,7 @@ 
   $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
   db_set_active('default');
   while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+      $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
   }
 
   drupal_json((object)$matches);

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,34 +1596,34 @@ 
     //  $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, download BOINC from the Google Play Store or Amazon App Store.", array(), NULL, 'boinc:join-page');
+    $output .= '    '.bts("For Android devices, download BOINC from the Google Play Store or Amazon App Store.", array(), 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;
@@ -1636,7 +1636,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("
@@ -1658,30 +1658,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>';
@@ -1712,7 +1712,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);
@@ -1744,8 +1744,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 {
@@ -1801,7 +1801,7 @@ 
   // Ensure there is a authentication token before continuing
   if (empty($authtoken)) {
     drupal_not_found();
-    return ;
+    return;
   }
 
   if (strlen($authtoken) != 32) {
@@ -1823,8 +1823,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);
@@ -1833,12 +1833,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');
@@ -1846,11 +1846,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(
@@ -1916,7 +1916,7 @@ 
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = NULL, $type = 'ul');
 
   return $output;
 }
@@ -2033,7 +2033,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;
@@ -2094,7 +2094,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' => '',
@@ -2198,25 +2198,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;
@@ -2236,8 +2236,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}";
@@ -2309,12 +2309,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;
@@ -2355,7 +2355,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);
@@ -2405,11 +2405,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;
       }
     }

drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc

Spacing +66 added lines, -66 removed lines

@@ -5,7 +5,7 @@ 
  * Callback admin/boinc/import/settings
  */
 function boincimport_admin_settings() {
-  global $conf ;
+  global $conf;
   global $db_url;
   global $base_url;
   $stage = variable_get('boincimport_config_stage', 0);
@@ -27,17 +27,17 @@ 
 
   $output = '';
   if (!variable_get('boincimport_tested', 0)) {
-    $form['test']['#collapsed']= FALSE;
+    $form['test']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
-  $output .= '<p>' . t('The migration will modify and even destroy some data. You
+  $output .= '<p>'.t('The migration will modify and even destroy some data. You
     must test this module on a copy of your data first, several times if necessary.
     Only use this module on your live data when you are familiar with the procedure
-    and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you
+    and you\'re confident everything will run smoothly.').'</p><p>'.t('Also, you
     should make a full backup of your database just prior to performing the
     migration on the live data. It is better to turn off both the BOINC site and the
-    Drupal site during the migration.') . '</p>';
+    Drupal site during the migration.').'</p>';
   if (!variable_get('boincimport_tested', 0)) {
     $output .= '</span>';
   }
@@ -55,7 +55,7 @@ 
 
   // Where is BOINC data?
   $pre = variable_get('boincimport_table_prefix', '');
-  $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
+  $tables = array($pre.'forum', $pre.'post', $pre.'thread', $pre.'user');
   $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
   $result = _boincimport_check_tables($tables, $db, 0);
 
@@ -79,8 +79,8 @@ 
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
     $url = variable_get('boincimport_db_url', $default_db_url);
     if (!preg_match('{(mysql|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) {
-      $output = '<p class="marker">'. t('Set the address of the BOINC database
-        according to the following format:') . '<br /><pre>
+      $output = '<p class="marker">'.t('Set the address of the BOINC database
+        according to the following format:').'<br /><pre>
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
       $ready_for_migration = 0;
@@ -98,13 +98,13 @@ 
     );
   }
 
-  $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
+  $output = '<p>'.t('Note that due to a limitation within Drupal core, we cannot
     import messages from one database type to another database type. E.g, we
     cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import
     the data into the same type of database first (import all the BOINC data, as is,
-    from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on
+    from mysql to postgresql).').'</p><p>'.t('If both BOINC and Drupal are on
     postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
-    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
+    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))).'</p>';
   $form['boinc_data']['note'] = array('#value' => $output);
 
   // BOINC table prefix
@@ -121,7 +121,7 @@ 
   $output = $result['html'];
   if ($result['result'] != 1) {
     $ready_for_migration = 0;
-    $form['boinc_data']['#collapsed']= FALSE;
+    $form['boinc_data']['#collapsed'] = FALSE;
     $output .= '<span class="marker">';
     $output .= t('Some tables couldn\'t be found. Are the database settings correct?
       Please correct the errors so that the BOINC tables can be accessed.');
@@ -169,15 +169,15 @@ 
     '#collapsible' => TRUE,
     '#collapsed' => TRUE
   );
-  $output = '<p>'. t('Select which !input_format should be used for the imported
+  $output = '<p>'.t('Select which !input_format should be used for the imported
     messages. It is highly-recommended that this value be left as it is, as the
     Full HTML and PHP code formats can be very dangerous!',
-    array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>';
+    array('!input_format' => l(t('input format'), 'admin/settings/filters'))).'</p>';
   $form['input']['intro'] = array('#value' => $output);
 
   $formats = db_query('SELECT format, name FROM {filter_formats}');
   while ($format = db_fetch_array($formats)) {
-    $input_formats[$format['format']]= $format['name'];
+    $input_formats[$format['format']] = $format['name'];
   }
 
   // By default, use the format named "Rich text"; fall back to Filtered HTML
@@ -194,10 +194,10 @@ 
   );
   if (!$input_format) {
     $ready_for_migration = 0;
-    $form['input']['#collapsed']= FALSE;
+    $form['input']['#collapsed'] = FALSE;
   }
-  $output = '<p><em>'. t('This setting will be applied to all posts and private
-    messages.') .'</em></p>';
+  $output = '<p><em>'.t('This setting will be applied to all posts and private
+    messages.').'</em></p>';
   $form['input']['result'] = array('#value' => $output);
 
   // BBcode settings
@@ -208,23 +208,23 @@ 
     '#collapsed' => TRUE,
   );
 
-  $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
-    import process, BBcode can be handled in two diffent ways') . ':</p>';
-  $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
+  $output = '<p>'.t('BOINC posts are often formatted in BBcode. During the
+    import process, BBcode can be handled in two diffent ways').':</p>';
+  $output .= '<ul><li>'.t('Leave the BBcode as is and use the !bbcode_module
     after the migration to filter the imported posts. In this case, the module
     is not required during the migration, but will need to be installed and
     configured later.',
     array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode',
-    array('attributes' => array('target' => '_blank'))))) . '</li>';
-  $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
+    array('attributes' => array('target' => '_blank'))))).'</li>';
+  $output .= '<li>'.t('Filter the BBcode now and replace it with plain HTML.
     The BBcode module will be required during the migration process, but can
-    be disabled afterwards.') . '</li></ul>';
-  $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
+    be disabled afterwards.').'</li></ul>';
+  $output .= '<p>'.t('An appropriate input filter should be chosen, as well,
     as it will affect how the post is displayed. For example, if BBcode is
     removed and replaced by HTML, some HTML tags will be stripped by the
     "Filtered HTML" input format unless they are first added to the list of
     allowed tags in that format. See the !input_formats page.',
-    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>';
+    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))).'</p>';
 
   $form['bbcode']['intro'] = array('#value' => $output);
   $form['bbcode']['boincimport_bbcode'] = array(
@@ -254,28 +254,28 @@ 
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
+      $output .= '<p class="marker">'.t('You need to !enable_bbcode_input and
         then !configure_bbcode_options', array(
           '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
+          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
     }
-    $output .= '<p>'. t('For best results, !disable_all_options',
-    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
+    $output .= '<p>'.t('For best results, !disable_all_options',
+    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))).'.</p>';
   } else {
     if ($bbcode_disabled) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
+      $output .= '<p>'.t('The !bbcode_module is recommended, but not required.
         You may !enable_bbcode after having installed it.', array(
           '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
-          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
+          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))).'</p>';
     }
-    $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
+    $output .= '<p>'.t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
       '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
-    $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>';
+      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
+    $output .= '<p>'.t('You may want to enable it for other input formats, too.').'</p>';
   }
-  $output .= '<p><em>'. t('This setting will be applied to all posts, private
-    messages and the users\' signature.') .'</em></p>';
+  $output .= '<p><em>'.t('This setting will be applied to all posts, private
+    messages and the users\' signature.').'</em></p>';
 
   $form['bbcode']['result'] = array('#value' => $output);
 
@@ -287,7 +287,7 @@ 
     '#collapsed' => TRUE,
   );
   if (!variable_get('boincimport_base_url_boinc', 0)) {
-    $form['url_transforms']['#collapsed']= FALSE;
+    $form['url_transforms']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -320,11 +320,11 @@ 
   );
   variable_set('boincimport_ready', $ready_for_migration);
   if ($ready_for_migration) {
-    $output = '<p>'. t('Check the settings above one more time. If everything
-      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>';
+    $output = '<p>'.t('Check the settings above one more time. If everything
+      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))).'</p>';
   } else {
-    $output = '<p class="marker">'. t('You are not ready for the migration yet.
-      Please check the settings above.') .'</p>';
+    $output = '<p class="marker">'.t('You are not ready for the migration yet.
+      Please check the settings above.').'</p>';
   }
 
   $form['migration']['info'] = array('#value' => $output);
@@ -335,23 +335,23 @@ 
  * Callback admin/boinc/import/post_configuration
  */
 function boincimport_post_configuration() {
-  $output = '<p>'. t('This page will help to tie up any loose ends following
+  $output = '<p>'.t('This page will help to tie up any loose ends following
     the BOINC data import process. Before continuing, it may be best to have
-    already:') .'</p>';
+    already:').'</p>';
   $output .= '<ul>';
-  $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
-    import module') .'</li>';
-  $output .= '<li>'. t('Imported any additional data using add on modules if
-    available.') .'</li>';
+  $output .= '<li>'.t('Imported users, teams, and forums using the BOINC
+    import module').'</li>';
+  $output .= '<li>'.t('Imported any additional data using add on modules if
+    available.').'</li>';
   $output .= '</ul>';
   //User Set up
-  $output .= '<h2>'. t('User settings') .'</h2>';
-  $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
+  $output .= '<h2>'.t('User settings').'</h2>';
+  $output .= '<p>'.t('Make sure your !user_settings are correct. Specifically,
     you can enable or disable signatures there. ', array(
       '!user_settings' => l(t('user settings'), 'admin/user/settings')
-    )) .'</p>';
-  $output .= '<p>' . t('Note that avatar/picture support is not tied to user
-    settings Picture support at this time.') . '</p>';
+    )).'</p>';
+  $output .= '<p>'.t('Note that avatar/picture support is not tied to user
+    settings Picture support at this time.').'</p>';
   /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
     enable pictures on this page and also:') . '</p>';
   $output .= '<ul>';
@@ -366,15 +366,15 @@ 
   $output .= '</ul>'; */
 
   // Forum Set up
-  $output .= '<h2>'. t('Forum settings') .'</h2>';
-  $output .= '<p>'. t('Check any additional changes to make on the
+  $output .= '<h2>'.t('Forum settings').'</h2>';
+  $output .= '<p>'.t('Check any additional changes to make on the
     !forum_settings page.', array(
       '!forum_settings' =>  l(t('forum settings'), 'admin/content/forum/settings')
-    )) .'</p>';
-  $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
+    )).'</p>';
+  $output .= '<p>'.t('It also may be a good idea to look at the !forum_list to
     verify that all necessary containers and forums are in place.', array(
       '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
-    )) .'</p>';
+    )).'</p>';
   /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
     !documentation.', array(
       '!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank')))
@@ -390,17 +390,17 @@ 
   // BBcode
   $bbcode = variable_get('boincimport_bbcode', 0);
   if ($bbcode) {
-    $output .= '<h2>'. t('Remove BBcode module') .'</h2>';
-    $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t
-      need the bbcode module anymore. You can disable it.') .'</p>';
+    $output .= '<h2>'.t('Remove BBcode module').'</h2>';
+    $output .= '<p>'.t('The BBcode has been cleaned from the posts. You shouldn\'t
+      need the bbcode module anymore. You can disable it.').'</p>';
   } else {
-    $output .= '<h2>'. t('Configure BBcode module') .'</h2>';
-    $output .= '<p>'. t('Most likely, there are many BOINC forum postings
+    $output .= '<h2>'.t('Configure BBcode module').'</h2>';
+    $output .= '<p>'.t('Most likely, there are many BOINC forum postings
       formatted in BBcode. It would be a good idea to verify that BBcode is
       being formatted correctly in the imported posts. Have a look around
       !the_forum.', array(
         '!the_forum' =>  l(t('the forum'), 'community')
-      )) . '</p>';
+      )).'</p>';
   }
 
   return $output;
@@ -445,11 +445,11 @@ 
   $output .= '</ol>';
 
   // process will die() if the link to the BOINC database is wrong:
-  $output .= '<p>'. t('If the BOINC data is in another database, but you made a
+  $output .= '<p>'.t('If the BOINC data is in another database, but you made a
     mistake while setting up the data base url, you may be unable to access the
     setting page due to some limitations of the core of Drupal. !reset_db_url.', array(
       '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
-    )) .'</p>';
+    )).'</p>';
 
   return $output;
 }

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

Spacing +77 added lines, -77 removed lines

@@ -105,8 +105,8 @@ 
   $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
   variable_set('boincimport_db_url', $boinc_db_url);
   variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+  return '<p>'.t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+      array('@configlink' => url('admin/boinc/import/settings'))).'</p>';
 }
 
 /**
@@ -114,18 +114,18 @@ 
  */
 function boincimport_unlock() {
   variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+  return '<p>'.t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
       '!proceed_with_import' => l(t('proceed with the import'),
         'admin/boinc/import/process')
-    )) .'</p>';
+    )).'</p>';
 }
 
 /**
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+  return boincimport_process_cleanup().'<p>'.t('Drupal database cleaned.').'</p>';
 }
 
 /**
@@ -138,7 +138,7 @@ 
  * fails, the process will die() which is a bit too much since we only
  * want to test. Therefore, the test part of the code is not used, now.
  */
-function _boincimport_db_connect($test= 0) {
+function _boincimport_db_connect($test = 0) {
   global $db_url;
   $db_ready = variable_get('boincimport_db_configured', 1);
   if (!$db_ready) {
@@ -148,7 +148,7 @@ 
       $db_url2['default'] = $db_url;
     }
     $db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
-    $GLOBALS['db_url'] =& $db_url2;
+    $GLOBALS['db_url'] = & $db_url2;
     if ($test) {
       if (!db_connect($db_url2['boinc_rw'])) {
         return 0;
@@ -171,10 +171,10 @@ 
   $result = module_exists($module);
   $out['result'] = $result;
   if ($result == 1) {
-    $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
+    $out['html'] .= '<li>'.t('Module %module is enabled. OK!', array('%module' => $module)).'</li>';
   }
   else {
-    $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
+    $out['html'] .= '<li><span class="marker">'.t('Module %module is disabled.', array('%module' => $module)).'</span></li>';
   }
   $out['html'] .= '</ul>';
   return $out;
@@ -187,32 +187,32 @@ 
  *   $out['html'] = formatted html.
  *   $out['result'] = boolean.
  */
-function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
+function _boincimport_check_tables($tables = array(), $db = 'default', $prefix = 1) {
   _boincimport_db_connect();
 
   $out['html'] = '<ul>';
-  $out['result']= 1;
+  $out['result'] = 1;
   foreach ($tables as $table) {
     if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
+      $table = db_prefix_tables('{'.$table.'}');
     }
 
     db_set_active($db);
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+      $result = (bool)db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
     }
     else {
       // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+      $result = (bool)db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+      $out['html'] .= '<li>'.t('Table %table: OK!', array('%table' => $table)).'</li>';
     }
     else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
+      $out['html'] .= '<li><span class="marker">'.t('Table <strong>%table</strong> does not exist!', array('%table' => $table)).'</span></li>';
+      $out['result'] = 0;
     }
   }
   $out['html'] .= '</ul>';
@@ -226,7 +226,7 @@ 
   boinc_get_path();
 
   if (!variable_get('boincimport_ready', 0)) {
-    return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
+    return '<p>'.t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))).'</p>';
   }
 
   $output = 'BOINC import process form';
@@ -236,7 +236,7 @@ 
 
 function boincimport_process_form() {
   $form = array();
-  _boincimport_db_connect() ;
+  _boincimport_db_connect();
   // Causes problems with form api redirect
   //ini_set('display_errors', TRUE);
 
@@ -412,7 +412,7 @@ 
       }
       else {
         drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+        drupal_set_message('Please visit the '.l('Post migration configuration', 'admin/boinc/import/post_configuration').' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO);
         unset($_SESSION['boincimport_stage_selected']);
       }
@@ -633,7 +633,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -662,7 +662,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -846,7 +846,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -873,7 +873,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -1019,7 +1019,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1047,7 +1047,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -1203,7 +1203,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1232,7 +1232,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -1382,7 +1382,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1409,7 +1409,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -1710,7 +1710,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1788,7 +1788,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1801,34 +1801,34 @@ 
   $forum_perms = array();
   $role_map = array_flip(user_roles());
   $forum_perms[$role_map['anonymous user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['authenticated user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['community member']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) $open,
+    'create' => (int)$open,
   );
   $forum_perms[$role_map['verified contributor']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['moderator']] = array(
-    'view' => (int) !$hidden,
-    'update' => (int) !$hidden,
+    'view' => (int)!$hidden,
+    'update' => (int)!$hidden,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['administrator']] = array(
     'view' => 1,
@@ -1893,7 +1893,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -1963,7 +1963,7 @@ 
   $batch_size = 100;
 
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2080,7 +2080,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2094,7 +2094,7 @@ 
       $node['tid'] = $tid;
 
       // Save the topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
       taxonomy_node_save($node, array($tid));
       $success = ($node->nid) ? TRUE : FALSE;
@@ -2157,7 +2157,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2195,7 +2195,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -2271,7 +2271,7 @@ 
   $batch_size = 100;
 
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2485,7 +2485,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2503,10 +2503,10 @@ 
     $empty_posts = count($results['posts']['empty']);
     $failed_posts = count($results['posts']['failure']);
     $message = t(
-      'Successfully imported @post_count posts in @topic_count topics ' .
-      '(@skipped topics either had no replies or all replies were already imported, ' .
-      '@duplicates posts were skipped as already imported, ' .
-      '@empty_posts had no content, ' .
+      'Successfully imported @post_count posts in @topic_count topics '.
+      '(@skipped topics either had no replies or all replies were already imported, '.
+      '@duplicates posts were skipped as already imported, '.
+      '@empty_posts had no content, '.
       'and @error_posts encountered errors during import)',
       array(
         '@post_count' => $posts_imported,
@@ -2529,7 +2529,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -2699,7 +2699,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2726,7 +2726,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -2908,7 +2908,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2922,7 +2922,7 @@ 
       );
 
       // Save the team topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
 
       if ($node->nid) {
@@ -2968,7 +2968,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2995,7 +2995,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -3250,7 +3250,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3277,7 +3277,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -3399,7 +3399,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3428,7 +3428,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -3504,7 +3504,7 @@ 
   $batch_size = 100;
 
   // Create node batches to process
-  for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $node_count; $offset += $batch_size) {
     $nodes_per_batch = $batch_size;
     if ($offset + $batch_size > $node_count) {
       $nodes_per_batch = $node_count - $offset;
@@ -3516,7 +3516,7 @@ 
     );
   }
   // Add comment batches
-  for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $comment_count; $offset += $batch_size) {
     $comments_per_batch = $batch_size;
     if ($offset + $batch_size > $comment_count) {
       $comments_per_batch = $comment_count - $offset;
@@ -3528,7 +3528,7 @@ 
     );
   }
   // And don't forget to process private messages
-  for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $pm_count; $offset += $batch_size) {
     $messages_per_batch = $batch_size;
     if ($offset + $batch_size > $pm_count) {
       $messages_per_batch = $pm_count - $offset;
@@ -3617,7 +3617,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3681,7 +3681,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3744,7 +3744,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3813,7 +3813,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
 
@@ -3882,18 +3882,18 @@ 
     $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid']));
     // Strip the "/" from the end of the thread.
     $max = rtrim($max, '/');
-    $thread = int2vancode(vancode2int($max)+1) .'/';
+    $thread = int2vancode(vancode2int($max) + 1).'/';
   } else {
     // This is comment with a parent comment: we increase the part of the thread
     // value at the proper depth.
     $parent = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $edit['pid']));
     // Strip the "/" from the end of the parent thread.
-    $parent->thread = (string) rtrim((string) $parent->thread, '/');
+    $parent->thread = (string)rtrim((string)$parent->thread, '/');
     // Get the max value in _this_ thread.
     $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid']));
     if ($max == '') {
       // First child of this parent.
-      $thread = $parent->thread .'.'. int2vancode(1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(1).'/';
     } else {
       // Strip the "/" at the end of the thread.
       $max = rtrim($max, '/');
@@ -3902,14 +3902,14 @@ 
       $parent_depth = count(explode('.', $parent->thread));
       $last = $parts[$parent_depth];
       // Finally, build the thread field for this new comment.
-      $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(vancode2int($last) + 1).'/';
     }
   }
 
   $status = 0; // 1 - not published, 0 - published
   $format = variable_get('boincimport_input_format', 0);
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
-  $users = serialize(array(0 => 1));  // default value for everybody!!
+  $users = serialize(array(0 => 1)); // default value for everybody!!
 
   if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
@@ -3943,7 +3943,7 @@ 
   // BBcode to normal html
   if (variable_get('boincimport_bbcode', 0)) {
     $input_format = variable_get('boincimport_input_format', 0);
-    $text = bbcode_filter('process', 0 , $input_format, $text);
+    $text = bbcode_filter('process', 0, $input_format, $text);
   }
   return $text;
 }

drupal/sites/default/boinc/modules/boincwork/includes/boincwork.helpers.inc

Spacing +88 added lines, -88 removed lines

@@ -167,7 +167,7 @@ 
 
   if ($preset) {
     // Load preset from configuration
-    $preset_prefs = (array) $preset_prefs['general_preferences'];
+    $preset_prefs = (array)$preset_prefs['general_preferences'];
     if (isset($preset_prefs['preset'])) {
       if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
@@ -188,7 +188,7 @@ 
 function boincwork_get_project_specific_config() {
   $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
 
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
 
   $xml = new DomDocument();
@@ -196,8 +196,8 @@ 
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $raw_config_data);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
   }
 
@@ -392,13 +392,13 @@ 
 
       // Use appropriate datatype
       if (isset($element['@attributes']['datatype'])) {
-        switch($element['@attributes']['datatype']) {
+        switch ($element['@attributes']['datatype']) {
         case 'integer':
-          $value = (int) $value;
+          $value = (int)$value;
           break;
 
         case 'float':
-          $value = number_format((float) $value, 2);
+          $value = number_format((float)$value, 2);
           break;
 
         default:
@@ -420,7 +420,7 @@ 
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -484,7 +484,7 @@ 
       $name = $element['@attributes']['name'];
       $default = null;
       $options = array();
-      foreach($element['items']['item'] as $item) {
+      foreach ($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
           if ($default === NULL AND
@@ -526,7 +526,7 @@ 
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -591,7 +591,7 @@ 
     }
     foreach ($elements as $key => $element) {
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
+      $name = str_replace(' ', '_', strtolower($title));
       $name = "group_{$name}";
 
       // Translate elements as appropriate
@@ -743,13 +743,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
 
@@ -801,13 +801,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
 
@@ -1129,11 +1129,11 @@ 
   $magnitude = 0;
   $precision = 0;
   if ($digits > $max_digits) {
-    $magnitude = floor(($digits - ($max_digits - 3)) / 3);
-    $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
-    $number = round($number / pow(1000, $magnitude), $precision);
+    $magnitude = floor(($digits - ($max_digits - 3))/3);
+    $precision = $max_digits - ($digits - ($magnitude*3) + 1);
+    $number = round($number/pow(1000, $magnitude), $precision);
   }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+  $number = number_format($number, $precision).(($magnitude) ? "{$suffix[$magnitude]}" : '');
 
   return $number;
 }
@@ -1310,7 +1310,7 @@ 
 
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if (!($xml->loadXML($text))) return false;
     return $xml;
   }
 
@@ -1327,7 +1327,7 @@ 
       while (!is_null($node)) {
           switch ($node->nodeType) {
           case XML_TEXT_NODE:
-              if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
+              if (trim($node->nodeValue) != '') $result = $node->nodeValue;
               break;
           case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
@@ -1344,7 +1344,7 @@ 
               if ($sibling) {
                   $result[$node_name][$index] = '';
                   if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
+                      $result[$node_name][$index] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
@@ -1367,14 +1367,14 @@ 
               } else {
                   $result[$node_name] = '';
                   if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
+                      $result[$node_name] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
                       if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
-                      foreach($attributes as $key => $attribute) {
+                      foreach ($attributes as $key => $attribute) {
                           $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
                       }
                   }
@@ -1414,30 +1414,30 @@ 
   // Determine if hosts are associated at all or just hidden
   $output = '';
   if ($boincuser->show_hosts) {
-    switch($context) {
+    switch ($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No active computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user has no computers that have been'
+      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list').'</p>';
       break;
 
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('There are no computers assigned to this'
+      . ' preference set.', array(), NULL, 'boinc:host-list').'</p>';
       break;
 
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
+      $output .= '<h2>'.bts('Computers pending', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), NULL, 'boinc:host-list').'</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
-    $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
+    $output .= '<h2>'.bts('Computers hidden', array(), NULL, 'boinc:host-list').'</h2>';
+    $output .= '<p>'.bts('This user has chosen not to show information'
+    . ' about their computers.', array(), NULL, 'boinc:host-list').'</p>';
   }
   return $output;
 }
@@ -1449,11 +1449,11 @@ 
 
   //
   $output = '';
-  switch($context) {
+  switch ($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .= '<h2>'.bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .= '<p>'.bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1475,10 +1475,10 @@ 
       $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will delete host @id'
+            'onclick' => 'return confirm(\''.bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
+              NULL, 'boinc:account-host-delete').'\')'
           )
         )
       );
@@ -1568,8 +1568,8 @@ 
       "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-    drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+    drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
     // Get current venue
     db_set_active('boinc_ro');
     $venue = db_result(db_query(
@@ -1593,10 +1593,10 @@ 
     // Add a wrapper to deadline text
     if (!$received_time) {
       if (time() < $deadline) {
-        $output = '<span class="on-time">' . $output . '</span>';
+        $output = '<span class="on-time">'.$output.'</span>';
       }
       else {
-        $output = '<span class="past-due">' . $output . '</span>';
+        $output = '<span class="past-due">'.$output.'</span>';
       }
     }
   }
@@ -1632,15 +1632,15 @@ 
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if (($category != 0) AND ($category != 1) AND ($category != 2)) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
 
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   global $language;
-  $locality=$language->language;
+  $locality = $language->language;
   $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
   $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
   $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
@@ -1688,13 +1688,13 @@ 
       ."ON r.appid=a.id ";
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlall .= " WHERE r.userid='%s' ";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlall .= " WHERE r.hostid='%s' ";
   }
   $sqlall .= " ORDER BY user_friendly_name";
@@ -1705,7 +1705,7 @@ 
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if (($result->appid == $app_id) OR ($app_id == 0) OR ($app_id == -1)) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1728,7 +1728,7 @@ 
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if (($mystate == $tselect) OR ($tselect == STATE_ALL)) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1741,14 +1741,14 @@ 
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
   $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table').' ('.$allcount.')';
   // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+  foreach ($application_map as $akey => $aname) {
     $acount = 0;
-    if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
+    if ($application_select_count and array_key_exists($akey, $application_select_count)) {
       $acount = $application_select_count[$akey];
     }
-    $applications[$akey] = $aname . ' ('. $acount . ')';
+    $applications[$akey] = $aname.' ('.$acount.')';
   }
   // Header array for (sub) results table.
   $resultheader = array(
@@ -1827,13 +1827,13 @@ 
   $sqlwhere = array();
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlwhere[] = "r.userid = '%s'";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlwhere[] = "r.workunitid = '%s'";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlwhere[] = "r.hostid = '%s'";
   }
 
@@ -1857,14 +1857,14 @@ 
   default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) AND $app_id > 0) {
     $sqlwhere[] = "r.appid = '%s'";
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
   }
   else {
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
   }
   db_set_active('default');
 
@@ -1874,7 +1874,7 @@ 
       // state_num() function changes $result object, clone $result
       // object for use in state_num()
       // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ((state_num(clone $result) == $tselect) OR ($tselect == STATE_ALL)) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1890,7 +1890,7 @@ 
           $nf->format($result->cpu_time),
           $nf->format($result->granted_credit),
           array(
-            'data' => $result->user_friendly_name . " " . pretty_application_version($result->app_version_id,$result->version_number, $result->plan_class, $result->platform),
+            'data' => $result->user_friendly_name." ".pretty_application_version($result->app_version_id, $result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
           ),
         );
@@ -1903,54 +1903,54 @@ 
   // Begin result navigation
 
   // Set pathprefix based on type
-  if ($category==0) {
+  if ($category == 0) {
     $pathprefix = 'account/tasks';
   }
-  elseif ($category==1) {
-    $pathprefix = 'workunit/' . $queryid . '/tasks';
+  elseif ($category == 1) {
+    $pathprefix = 'workunit/'.$queryid.'/tasks';
   }
-  elseif ($category==2) {
-    $pathprefix = 'host/' . $queryid . '/tasks';
+  elseif ($category == 2) {
+    $pathprefix = 'host/'.$queryid.'/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
   $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
-    $mypath = $pathprefix . '/' . $state . '/' . $app_id;
-    if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+    $mypath = $pathprefix.'/'.$state.'/'.$app_id;
+    if ($state == STATE_ALL) {
+      $ltext = '<span class="tab task-app-name">'.bts('All', array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">'.bts($state_hnames[$state], array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => TRUE)),
     );
-    if ($state==$tselect) {
+    if ($state == $tselect) {
       $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
   }
   // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $mypath = $pathprefix.'/0/0';
+  $ltext = '<span class="tab">'.bts('Reset', array(), NULL, 'boinc:task-table').'</span>';
+  $stitems[] = array('data' => l($ltext, $mypath, array('html' => TRUE)));
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, NULL, 'ul'.' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
   // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
-    $app_id=-1;
+  if ($app_id == 0) {
+    $app_id = -1;
   }
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if (is_array($resultheader) AND is_array($resultdata)) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if (($category == 1) OR ($category == 2)) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }
@@ -1967,7 +1967,7 @@ 
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
+  return array_walk($array, function(&$v) use ($offset) {
      array_splice($v, $offset, 1);
   });
 }

drupal/sites/default/boinc/modules/boincwork/includes/boincwork.forms.inc

Spacing +46 added lines, -46 removed lines

@@ -71,7 +71,7 @@ 
       }// switch
   } else {
       $form_state['storage']['wip'] = TRUE;
-      if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
+      if (!in_array($prefs_preset, array('standard', 'maximum', 'green', 'minimum', 'custom'))) {
           if ($established) {
               $prefs_preset = 'custom';
           } else {
@@ -141,10 +141,10 @@ 
   );
   $form['hour_options'] = array(
     '#type' => 'value',
-    '#value' => array('0:00','1:00','2:00','3:00','4:00',
-     '5:00','6:00','7:00','8:00','9:00','10:00','11:00',
-     '12:00','13:00','14:00','15:00','16:00','17:00',
-     '18:00','19:00','20:00','21:00','22:00','23:00')
+    '#value' => array('0:00', '1:00', '2:00', '3:00', '4:00',
+     '5:00', '6:00', '7:00', '8:00', '9:00', '10:00', '11:00',
+     '12:00', '13:00', '14:00', '15:00', '16:00', '17:00',
+     '18:00', '19:00', '20:00', '21:00', '22:00', '23:00')
   );
 
   // Identify preference sets that are established to distinguish what has been
@@ -281,7 +281,7 @@ 
     '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), NULL, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['processor']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
+    '#value' => '<div class="form-item"><label>'.bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing').'</label></div>'
   );
   $form['prefs']['advanced']['processor']['start_hour'] = array(
     '#type' => 'select',
@@ -289,7 +289,7 @@ 
     '#default_value' => $default['start_hour']
   );
   $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
-    '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
+    '#value' => '<span>'.bts('and', array(), NULL, 'boinc:account-preference').'</span>'
   );
   $form['prefs']['advanced']['processor']['end_hour'] = array(
     '#type' => 'select',
@@ -297,7 +297,7 @@ 
     '#default_value' => $default['end_hour']
   );
   $form['prefs']['advanced']['processor']['hour_description'] = array(
-    '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">'.bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing').'</div></div>'
   );
   $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
     '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), NULL, 'boinc:account-preferences-computing'),
@@ -454,7 +454,7 @@ 
     '#description' => bts('Limit the upload rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
+    '#value' => '<div class="form-item"><label>'.bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing').'</label></div>'
   );
   $form['prefs']['advanced']['network']['net_start_hour'] = array(
     '#type' => 'select',
@@ -462,7 +462,7 @@ 
     '#default_value' => $default['net_start_hour']
   );
   $form['prefs']['advanced']['network']['hour_delimiter'] = array(
-    '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
+    '#value' => '<span>'.bts('and', array(), NULL, 'boinc:account-preference').'</span>'
   );
   $form['prefs']['advanced']['network']['net_end_hour'] = array(
     '#type' => 'select',
@@ -470,7 +470,7 @@ 
     '#default_value' => $default['net_end_hour']
   );
   $form['prefs']['advanced']['network']['hour_description'] = array(
-    '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">'.bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing').'</div></div>'
   );
   $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
     '#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
@@ -530,23 +530,23 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")).'</li>'
   );
   if ($venue AND $venue != 'generic') {
     global $base_path;
-    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
+    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">'.
       l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
+          'query' => 'destination='.urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the @name preference set. Are you sure?',
+              array('@name' => $venue), NULL, 'boinc:account-preferences').'\')'
           )
         )
-      ) . '</li>';
+      ).'</li>';
   }
   $form['prefs']['view control'] = array(
-    '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
+    '#value' => '<li class="first alt tab">'.l('('.bts('Show comparison view', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/computing/combined').'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -784,7 +784,7 @@ 
     return FALSE;
   }
 
-  if ($new_host->userid==0) {
+  if ($new_host->userid == 0) {
     rules_invoke_event('boincwork_zombie_merge_error', $old_host->id, $new_host->id, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('boincwork',
       'Zombie merge attempted, target host has userid=0: old host id=%old_host, target host id=%new_host',
@@ -880,9 +880,9 @@ 
   }
 
   $form['overview'] = array(
-    '#value' => '<p>' . bts('Sometimes BOINC assigns separate identities to'
+    '#value' => '<p>'.bts('Sometimes BOINC assigns separate identities to'
       . ' the same computer by mistake. You can correct this by merging old'
-      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
+      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge').'</p>'
       . '<p>'
       . bts('Check the computers that are the same as @name'
       . ' (created on @date at @time with computer ID @id)',
@@ -892,7 +892,7 @@ 
           '@time' => date('G:i:s T', $current_host->create_time),
           '@id' => $current_host->id,
         ),
-        NULL, 'boinc:account-host-merge') . '</p>',
+        NULL, 'boinc:account-host-merge').'</p>',
   );
 
   $options = array();
@@ -926,7 +926,7 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}").'</li>'
   );
 
   return $form;
@@ -971,7 +971,7 @@ 
       if (count($merged) == 2) {
         $oxford_comma = '';
       }
-      $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
+      $list = implode(', ', $list).$oxford_comma.' '.$conjunction.' '.$last;
     }
     else {
       $list = $last;
@@ -1220,23 +1220,23 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = 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>'
   );
   if ($venue AND $venue != 'generic') {
     global $base_path;
-    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
+    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">'.
       l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
+          'query' => 'destination='.urlencode(drupal_get_path_alias('account/prefs/project/combined')),
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the @name preference set. Are you sure?',
+              array('@name' => $venue), NULL, 'boinc:account-preferences').'\')'
           )
         )
-      ) . '</li>';
+      ).'</li>';
   }
   $form['prefs']['view control'] = array(
-      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
+      '#value' => '<li class="first alt tab">'.l('('.bts('Show comparison view', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/project/combined').'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1279,7 +1279,7 @@ 
 
   foreach ($xml['project_specific_preferences'] as $wrapped_element) {
     $type = key($wrapped_element);
-    $element= reset($wrapped_element);
+    $element = reset($wrapped_element);
     boincwork_generate_prefs_element($form, $type, $element, $prefs['project_specific']);
   }
 }
@@ -1505,7 +1505,7 @@ 
     $names = array();
     foreach ($languages as $langcode => $item) {
       $name = t($item->name);
-      $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
+      $names[check_plain($langcode)] = check_plain($name.($item->native != $name ? ' ('.$item->native.')' : ''));
     }
     $form['locale'] = array(
       '#type' => 'fieldset',
@@ -1530,20 +1530,20 @@ 
   // Avatar options
   $form['gravatar'] = array(
     '#type' => 'item',
-    '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+    '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/'.$account->mail), NULL, 'boinc:account-preferences-community'),
     '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), NULL, 'boinc:account-preferences-community'),
   );
   if (user_access('disable own gravatar', $account)) {
     $form['gravatar'] = array(
       '#type' => 'checkbox',
-      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/'.$account->mail), NULL, 'boinc:account-preferences-community'),
       '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
       '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
       '#disabled' => !empty($account->picture),
     );
   }
   $form['gravatar']['#weight'] = 15;
-  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
+  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">'.bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community').'</a></legend>';
   // Upload an avatar (pulled from profile_node_form):
   if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
@@ -1578,7 +1578,7 @@ 
   );
   // Can't have a typical Drupal form suffix on a select box?
   $form['forums']['comments_per_page_suffix'] = array(
-    '#value' => '<span>' . bts('comments per page', array(), NULL, 'boinc:account-preferences-community') . '</span>'
+    '#value' => '<span>'.bts('comments per page', array(), NULL, 'boinc:account-preferences-community').'</span>'
   );
   $form['forums']['comments_order'] = array(
     '#type' => 'select',
@@ -1631,7 +1631,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = 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,
   );
   $form['form control tabs suffix'] = array(
@@ -1717,10 +1717,10 @@ 
     if ($user->language != $edit['language']) {
       global $base_url;
       if ($edit['language'] != language_default('language')) {
-        $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
+        $form_state['redirect'] = $base_url.'/'.$edit['language'].'/'.$_GET['q'];
       }
       else {
-        $form_state['redirect'] = $base_url . '/' . $_GET['q'];
+        $form_state['redirect'] = $base_url.'/'.$_GET['q'];
       }
     }
   }
@@ -1790,7 +1790,7 @@ 
   // option that deals with privacy.
   foreach ($privacy_consent_types as $ct) {
 
-    $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0 ;
+    $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0;
     // Set name to 'privacyconsent_SHORTNAME', which can be parsed
     // later in the submit function.
     $form['privacy']['privacyconsent_'.$ct['shortname']] = array(
@@ -1804,7 +1804,7 @@ 
     // Add a description with link to the question 'Do you consent to
     // exporting your data...'.
     $mypatt = '/Do you consent to exporting your data/';
-    if (preg_match($mypatt, $ct['description']) ) {
+    if (preg_match($mypatt, $ct['description'])) {
       $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
       array(
         '!privacy_policy_link' => l(
@@ -1843,7 +1843,7 @@ 
       $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
         '#value' => l(
           bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
-          'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
+          'account/prefs/privacy/ignore_user/remove/'.$ignored_user['iuid'],
           array()
         ),
       );
@@ -1894,7 +1894,7 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = 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>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1981,7 +1981,7 @@ 
   $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
   foreach ($privacyconsent_prefs as $name => $newstate) {
     $subname = explode('_', $name)[1];
-    $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0 ;
+    $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0;
     list($checkct, $ctid) = check_consent_type($subname);
     if ($checkct && ($currstate != $newstate)) {
       consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
@@ -2047,7 +2047,7 @@ 
 function boincwork_selectapp_form_submit($form, &$form_state) {
   $myargs = arg();
   array_pop($myargs);
-  $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
+  $newpath = implode('/', $myargs).'/'.$form['selectapp']['#value'];
   $form_state['redirect'] = $newpath;
 }