BOINC / boinc

drupal/sites/all/features/boinc_standard/boinc_standard.features.menu_custom.inc

Indentation +9 added lines, -9 removed lines

@@ -4,19 +4,19 @@
  * Implementation of hook_menu_default_menu_custom().
  */
 function boinc_standard_menu_default_menu_custom() {
-  $menus = array();
+    $menus = array();
 
-  // Exported menu: menu-footer-links
-  $menus['menu-footer-links'] = array(
+    // Exported menu: menu-footer-links
+    $menus['menu-footer-links'] = array(
     'menu_name' => 'menu-footer-links',
     'title' => 'Footer links',
     'description' => 'Auxiliary menu, typically at the bottom of the page in the footer, that includes links to content such as "about us" or "privacy policy" etc.',
-  );
-  // Translatables
-  // Title and description for footer menu appears in admin menu: Admin> Site Building> Menus
-  t('Auxiliary menu, typically at the bottom of the page in the footer, that includes links to content such as "about us" or "privacy policy" etc.');
-  t('Footer links');
+    );
+    // Translatables
+    // Title and description for footer menu appears in admin menu: Admin> Site Building> Menus
+    t('Auxiliary menu, typically at the bottom of the page in the footer, that includes links to content such as "about us" or "privacy policy" etc.');
+    t('Footer links');
 
 
-  return $menus;
+    return $menus;
 }

drupal/sites/all/features/user_profiles/user_profiles.features.menu_links.inc

Indentation +16 added lines, -16 removed lines

@@ -4,18 +4,18 @@ 
  * Implementation of hook_menu_default_menu_links().
  */
 function user_profiles_menu_default_menu_links() {
-  $menu_links = array();
+    $menu_links = array();
 
-  // Exported menu link: primary-links:account/profile
-  $menu_links['primary-links:account/profile'] = array(
+    // Exported menu link: primary-links:account/profile
+    $menu_links['primary-links:account/profile'] = array(
     'menu_name' => 'primary-links',
     'link_path' => 'account/profile',
     'router_path' => 'account/profile',
     'link_title' => 'Profile',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -24,17 +24,17 @@ 
     'expanded' => '0',
     'weight' => '-49',
     'parent_path' => 'dashboard',
-  );
-  // Exported menu link: primary-links:moderate/profiles
-  $menu_links['primary-links:moderate/profiles'] = array(
+    );
+    // Exported menu link: primary-links:moderate/profiles
+    $menu_links['primary-links:moderate/profiles'] = array(
     'menu_name' => 'primary-links',
     'link_path' => 'moderate/profiles',
     'router_path' => 'moderate/profiles',
     'link_title' => 'Queue',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -43,11 +43,11 @@ 
     'expanded' => '0',
     'weight' => '-50',
     'parent_path' => 'moderate',
-  );
-  // Translatables
-  // Use bts() function to translate additional strings.
-  bts('Queue', array(), NULL, 'boinc:menu-link');
-  bts('Profile', array(), NULL, 'boinc:menu-link');
+    );
+    // Translatables
+    // Use bts() function to translate additional strings.
+    bts('Queue', array(), NULL, 'boinc:menu-link');
+    bts('Profile', array(), NULL, 'boinc:menu-link');
 
-  return $menu_links;
+    return $menu_links;
 }

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

@@ -46,8 +46,8 @@
   );
   // Translatables
   // Use bts() function to translate additional strings.
-  bts('Queue', array(), NULL, 'boinc:menu-link');
-  bts('Profile', array(), NULL, 'boinc:menu-link');
+  bts('Queue', array(), null, 'boinc:menu-link');
+  bts('Profile', array(), null, 'boinc:menu-link');
 
   return $menu_links;
 }

drupal/sites/all/features/news/news.features.menu_links.inc

Indentation +11 added lines, -11 removed lines

@@ -4,19 +4,19 @@ 
  * Implementation of hook_menu_default_menu_links().
  */
 function news_menu_default_menu_links() {
-  $menu_links = array();
+    $menu_links = array();
 
-  // Exported menu link: primary-links:news
-  $menu_links['primary-links:news'] = array(
+    // Exported menu link: primary-links:news
+    $menu_links['primary-links:news'] = array(
     'menu_name' => 'primary-links',
     'link_path' => 'news',
     'router_path' => 'news',
     'link_title' => 'News',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
-      'alter' => TRUE,
+        ),
+        'alter' => TRUE,
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -24,11 +24,11 @@ 
     'has_children' => '0',
     'expanded' => '1',
     'weight' => '-48',
-  );
-  // Translatables
-  // Use bts() function to translate additional strings.
-  bts('News', array(), NULL, 'boinc:menu-link');
+    );
+    // Translatables
+    // Use bts() function to translate additional strings.
+    bts('News', array(), NULL, 'boinc:menu-link');
 
 
-  return $menu_links;
+    return $menu_links;
 }

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

@@ -16,7 +16,7 @@ 
       'attributes' => array(
         'title' => '',
       ),
-      'alter' => TRUE,
+      'alter' => true,
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -27,7 +27,7 @@ 
   );
   // Translatables
   // Use bts() function to translate additional strings.
-  bts('News', array(), NULL, 'boinc:menu-link');
+  bts('News', array(), null, 'boinc:menu-link');
 
 
   return $menu_links;

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

Braces +14 added lines, -18 removed lines

@@ -104,8 +104,7 @@ 
   
   if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+  } else {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily', $cpid);
@@ -114,9 +113,10 @@ 
       for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
       }
-    }
-    else {
-      for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
+    } else {
+      for ($i = 0; $i <= $dataset_size; $i++) {
+          $dataset[] = 0;
+      }
     }
     
     // Get color configuration
@@ -226,8 +226,7 @@ 
   
   if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+  } else {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily');
@@ -236,9 +235,10 @@ 
       for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
       }
-    }
-    else {
-      for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
+    } else {
+      for ($i = 0; $i <= 30; $i++) {
+          $dataset[] = 0;
+      }
     }
     
     // Create and populate the pData object
@@ -316,8 +316,7 @@ 
           directory must be writeable by the web server.',
           array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
         return FALSE;
-      }
-      else {
+      } else {
         // Create the cache dir
         if (!mkdir($cache_dir, 0775)) {
           watchdog('boincstats', 'Failed to create @cache_dir directory. Check
@@ -326,8 +325,7 @@ 
           return FALSE;
         }
       }
-    }
-    else {
+    } else {
       watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
         Please allow webserver write access.',
         array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
@@ -370,8 +368,7 @@ 
   foreach ($get as $arg => $value) {
     if ($value !== NULL) {
       $args[] = "{$arg}=" . rawurlencode($value);
-    }
-    else {
+    } else {
       $args[] = $arg;
     }
   }
@@ -467,8 +464,7 @@ 
       drupal_set_message(t('The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
           'admin/boinc/stats'))), 'error', FALSE);
-    }
-    else {
+    } else {
       drupal_set_message(t('There is a problem with the site. Please contact
         the system administrator.'), 'error', FALSE);
     }

Spacing +22 added lines, -22 removed lines

@@ -73,7 +73,7 @@ 
   
   $stats_xml = NULL;
   
-  switch($chart_size) {
+  switch ($chart_size) {
   case 'small':
     $cache_name .= "{$cpid}_small";
     $dataset_size = 30;
@@ -99,7 +99,7 @@ 
   }
   
   // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+  $myCache = new pCache(array('CacheFolder' => realpath('.').'/'.conf_path().'/files/cache'));
   $myCache->removeOlderThan(60*60*24);
   
   if ($myCache->isInCache($cache_name)) {
@@ -112,7 +112,7 @@ 
     if ($stats_xml) {
       // Get the last 60 days of stats for the chart
       for ($j = 30; $j < 90; $j++) {
-        $dataset[] = (int) $stats_xml->records->record[$j];
+        $dataset[] = (int)$stats_xml->records->record[$j];
       }
     }
     else {
@@ -131,7 +131,7 @@ 
     
     $MyData->addPoints($dataset, 'series1');
     $MyData->setPalette('series1', $palette_color);
-    $MyData->setAxisPosition(0,AXIS_POSITION_RIGHT);
+    $MyData->setAxisPosition(0, AXIS_POSITION_RIGHT);
     
     // Create the pChart object
     $myPicture = new pImage($chart_width, $chart_height, $MyData);
@@ -176,7 +176,7 @@ 
     if ($label_x_axis) {
       for ($i = 5; $i >= 0; $i--) {
         $label = ($i) ? -10*$i : 'Today';
-        $myPicture->drawText(589-587*($i/6)-5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
+        $myPicture->drawText(589 - 587*($i/6) - 5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
       }
     }
 
@@ -221,7 +221,7 @@ 
   }
   
   // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+  $myCache = new pCache(array('CacheFolder' => realpath('.').'/'.conf_path().'/files/cache'));
   $myCache->removeOlderThan(60*60*24);
   
   if ($myCache->isInCache($cache_name)) {
@@ -234,7 +234,7 @@ 
     if ($stats_xml) {
       // Get the last 60 days of stats for the chart
       for ($j = 30; $j < 90; $j++) {
-        $dataset[] = (int) $stats_xml->records->record[$j];
+        $dataset[] = (int)$stats_xml->records->record[$j];
       }
     }
     else {
@@ -246,10 +246,10 @@ 
     
     $MyData->addPoints($dataset, 'series1');
     $MyData->setPalette('series1', $palette_color);
-    $MyData->setAxisPosition(0,AXIS_POSITION_RIGHT);
+    $MyData->setAxisPosition(0, AXIS_POSITION_RIGHT);
 
     // Create the pChart object
-    $myPicture = new pImage(266,80,$MyData);
+    $myPicture = new pImage(266, 80, $MyData);
 
     // Turn on Antialiasing
     $myPicture->Antialias = true;
@@ -258,8 +258,8 @@ 
     //$myPicture->setFontProperties(array('FontName' => '../fonts/pf_arma_five.ttf','FontSize' => 6));
 
     // Define the chart area
-    $myPicture->setGraphArea(0,0,266,80);
-    $myPicture->drawFilledRectangle(0,0,266,80,$backdrop_color);
+    $myPicture->setGraphArea(0, 0, 266, 80);
+    $myPicture->drawFilledRectangle(0, 0, 266, 80, $backdrop_color);
 
     // Draw the scale
     $scaleSettings = array(
@@ -307,7 +307,7 @@ 
  *
  */
 function boincstats_check_cache_dir($cache_path = 'files/cache') {
-  $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
+  $cache_dir = realpath('.').'/'.conf_path().'/'.$cache_path;
   if (!is_writeable($cache_dir)) {
     if (!is_dir($cache_dir)) {
       if (!is_writeable(dirname($cache_dir))) {
@@ -369,13 +369,13 @@ 
   $args = array();
   foreach ($get as $arg => $value) {
     if ($value !== NULL) {
-      $args[] = "{$arg}=" . rawurlencode($value);
+      $args[] = "{$arg}=".rawurlencode($value);
     }
     else {
       $args[] = $arg;
     }
   }
-  $query = '?' . implode('&', $args);
+  $query = '?'.implode('&', $args);
   
   // Load XML from RPC
   $stats_xml = NULL;
@@ -394,7 +394,7 @@ 
 function boincstats_get_project_total_credit() {
   $stats_xml = boincstats_get_project_stats();
   $last_record = end($stats_xml->records->record);
-  return ($last_record) ? (int) $last_record : 0;
+  return ($last_record) ? (int)$last_record : 0;
 }
 
 /*
@@ -409,7 +409,7 @@ 
  *
  */
 function boincstats_credit_to_ghours($credit) {
-  return $credit / (100 * 365);
+  return $credit/(100*365);
 }
 
 /*
@@ -422,7 +422,7 @@ 
     't' => 6,
     'p' => 9
   );
-  return $credit / (pow(10, (int) $factor[$prefix]) / 10);
+  return $credit/(pow(10, (int)$factor[$prefix])/10);
 }
 
 
@@ -435,14 +435,14 @@ 
   $output = '';
   switch ($type) {
   case 'basic':
-    $output .= '<div class="overlay"><span>(' . bts('Credits per day', array(), NULL, 'boinc:front-page') . ')</span></div>' . "\n";
-    $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
+    $output .= '<div class="overlay"><span>('.bts('Credits per day', array(), NULL, 'boinc:front-page').')</span></div>'."\n";
+    $output .= '<div class="chart"><img src="'.$base_path.'charts/project" /></div>'."\n";
     break;
   case 'detailed':
-    $output .= '<div class="stats"><label>' . bts('Total G-hours', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
-    $output .= '<div class="stats"><label>' . bts('Avg TFlops', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
+    $output .= '<div class="stats"><label>'.bts('Total G-hours', array(), NULL, 'boinc:front-page').': </label><span>'.number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())).'</span></div>'."\n";
+    $output .= '<div class="stats"><label>'.bts('Avg TFlops', array(), NULL, 'boinc:front-page').': </label><span>'.number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')).'</span></div>'."\n";
     //$output .= '<div class="stats"><a href="#">' . bts('Pending credits', array(), NULL, 'boinc:front-page') . '</a></div>' . "\n";
-    $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
+    $output .= '<div class="chart"><img src="'.$base_path.'charts/project" /></div>'."\n";
     break;
   default:
   }

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

@@ -68,10 +68,10 @@ 
   $dataset_size = 0;
   $chart_height = 0;
   $chart_width = 0;
-  $draw_x_lines = FALSE;
-  $label_x_axis = FALSE;
+  $draw_x_lines = false;
+  $label_x_axis = false;
   
-  $stats_xml = NULL;
+  $stats_xml = null;
   
   switch($chart_size) {
   case 'small':
@@ -80,8 +80,8 @@ 
     $chart_height = 80;
     $chart_width = 266;
     //$backdrop_color = array('R'=>238,'G'=>238,'B'=>238);
-    $draw_x_lines = FALSE;
-    $label_x_axis = FALSE;
+    $draw_x_lines = false;
+    $label_x_axis = false;
     break;
   case 'medium':
   default:
@@ -89,8 +89,8 @@ 
     $dataset_size = 60;
     $chart_height = 155;
     $chart_width = 589;
-    $draw_x_lines = TRUE;
-    $label_x_axis = TRUE;
+    $draw_x_lines = true;
+    $label_x_axis = true;
   }
   
   // Sanity check for cache directory
@@ -163,7 +163,7 @@ 
       'OuterTickWidth' => 0,
       'XMargin' => 1,
       'YMargin' => 0,
-      'Floating' => TRUE,
+      'Floating' => true,
       'GridR' => 200,
       'GridG' => 200,
       'GridB' => 200,
@@ -276,7 +276,7 @@ 
       'OuterTickWidth' => 0,
       'XMargin' => 1,
       'YMargin' => 0,
-      'Floating' => TRUE,
+      'Floating' => true,
       'GridR' => 200,
       'GridG' => 200,
       'GridB' => 200,
@@ -315,7 +315,7 @@ 
         watchdog('boincstats', '@parent_dir directory is not writeable. This
           directory must be writeable by the web server.',
           array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
-        return FALSE;
+        return false;
       }
       else {
         // Create the cache dir
@@ -323,7 +323,7 @@ 
           watchdog('boincstats', 'Failed to create @cache_dir directory. Check
             filesystem permissions...?',
             array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-          return FALSE;
+          return false;
         }
       }
     }
@@ -331,16 +331,16 @@ 
       watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
         Please allow webserver write access.',
         array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-      return FALSE;
+      return false;
     }
   }
-  return TRUE;
+  return true;
 }
 
 /*
  *
  */
-function boincstats_get_project_stats($type = 'total', $cpid = NULL) {
+function boincstats_get_project_stats($type = 'total', $cpid = null) {
   
   // Determine the stats environment
   boincstats_check_configuration();
@@ -353,7 +353,7 @@ 
   );
   switch ($type) {
   case 'daily':
-    $get['daily'] = NULL;
+    $get['daily'] = null;
     break;
   case 'total':
   default:
@@ -368,7 +368,7 @@ 
   // Construct query string
   $args = array();
   foreach ($get as $arg => $value) {
-    if ($value !== NULL) {
+    if ($value !== null) {
       $args[] = "{$arg}=" . rawurlencode($value);
     }
     else {
@@ -378,7 +378,7 @@ 
   $query = '?' . implode('&', $args);
   
   // Load XML from RPC
-  $stats_xml = NULL;
+  $stats_xml = null;
   $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
   $result = drupal_http_request($target_url);
   if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
@@ -435,12 +435,12 @@ 
   $output = '';
   switch ($type) {
   case 'basic':
-    $output .= '<div class="overlay"><span>(' . bts('Credits per day', array(), NULL, 'boinc:front-page') . ')</span></div>' . "\n";
+    $output .= '<div class="overlay"><span>(' . bts('Credits per day', array(), null, 'boinc:front-page') . ')</span></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
   case 'detailed':
-    $output .= '<div class="stats"><label>' . bts('Total G-hours', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
-    $output .= '<div class="stats"><label>' . bts('Avg TFlops', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
+    $output .= '<div class="stats"><label>' . bts('Total G-hours', array(), null, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
+    $output .= '<div class="stats"><label>' . bts('Avg TFlops', array(), null, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
     //$output .= '<div class="stats"><a href="#">' . bts('Pending credits', array(), NULL, 'boinc:front-page') . '</a></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
@@ -466,11 +466,11 @@ 
     if (user_access('administer site configuration')) {
       drupal_set_message(t('The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats'))), 'error', FALSE);
+          'admin/boinc/stats'))), 'error', false);
     }
     else {
       drupal_set_message(t('There is a problem with the site. Please contact
-        the system administrator.'), 'error', FALSE);
+        the system administrator.'), 'error', false);
     }
   }
 }

Indentation +183 added lines, -183 removed lines

@@ -2,9 +2,9 @@ 
 // $Id$
 
 /**
-  * @file
-  * Enable BOINC charting features for statistics
-  */
+ * @file
+ * Enable BOINC charting features for statistics
+ */
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -18,10 +18,10 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Implementation of hook_menu().
-  */
+ * Implementation of hook_menu().
+ */
 function boincstats_menu() {
-  $items['admin/boinc/stats'] = array(
+    $items['admin/boinc/stats'] = array(
     'title' => 'Environment: Statistics setup',
     'description' => 'Configure the stats system for generating charts and
       providing cross project data.',
@@ -30,18 +30,18 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincstats.admin.inc'
-  );
-  $items['charts/user'] = array(
+    );
+    $items['charts/user'] = array(
     'page callback' => 'boincstats_get_user_stats_chart',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['charts/project'] = array(
+    );
+    $items['charts/project'] = array(
     'page callback' => 'boincstats_get_project_stats_chart',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 
@@ -50,31 +50,31 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * User stats chart menu callback
-  * Called to generate the daily credit status chart for a user (dashboard)
-  */
+ * User stats chart menu callback
+ * Called to generate the daily credit status chart for a user (dashboard)
+ */
 function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
 
-  // pChart library inclusions
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
+    // pChart library inclusions
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
 
-  init_theme();
-  global $theme_key;
-  $cache_name = "{$theme_key}_";
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_";
 
-  $dataset_size = 0;
-  $chart_height = 0;
-  $chart_width = 0;
-  $draw_x_lines = FALSE;
-  $label_x_axis = FALSE;
+    $dataset_size = 0;
+    $chart_height = 0;
+    $chart_width = 0;
+    $draw_x_lines = FALSE;
+    $label_x_axis = FALSE;
 
-  $stats_xml = NULL;
+    $stats_xml = NULL;
 
-  switch($chart_size) {
-  case 'small':
+    switch($chart_size) {
+    case 'small':
     $cache_name .= "{$cpid}_small";
     $dataset_size = 30;
     $chart_height = 80;
@@ -83,7 +83,7 @@ 
     $draw_x_lines = FALSE;
     $label_x_axis = FALSE;
     break;
-  case 'medium':
+    case 'medium':
   default:
     $cache_name .= $cpid;
     $dataset_size = 60;
@@ -91,32 +91,32 @@ 
     $chart_width = 589;
     $draw_x_lines = TRUE;
     $label_x_axis = TRUE;
-  }
+    }
 
-  // Sanity check for cache directory
-  if (!boincstats_check_cache_dir()) {
+    // Sanity check for cache directory
+    if (!boincstats_check_cache_dir()) {
     return;
-  }
+    }
 
-  // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
-  $myCache->removeOlderThan(60*60*24);
+    // Initialize the cache object and flush stale images
+    $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+    $myCache->removeOlderThan(60*60*24);
 
-  if ($myCache->isInCache($cache_name)) {
+    if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+    }
+    else {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily', $cpid);
     if ($stats_xml) {
-      // Get the last 60 days of stats for the chart
-      for ($j = 30; $j < 90; $j++) {
+        // Get the last 60 days of stats for the chart
+        for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
     }
 
     // Get color configuration
@@ -145,39 +145,39 @@ 
     // Define the chart area
     $myPicture->setGraphArea(0, 3, $chart_width, $chart_height);
     if ($backdrop_color) {
-      $myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
+        $myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
     }
 
     // Draw the scale
     $scaleSettings = array(
-      'Mode' => SCALE_MODE_START0,
-      'DrawYLines' => false,
-      'DrawXLines' => $draw_x_lines,
-      'GridTicks' => 2,
-      'LabelSkip' => 9,
-      'SkippedAxisAlpha' => 0,
-      'SkippedInnerTickWidth' => 0,
-      'SkippedOuterTickWidth' => 0,
-      'AxisAlpha' => 0,
-      'InnerTickWidth' => 0,
-      'OuterTickWidth' => 0,
-      'XMargin' => 1,
-      'YMargin' => 0,
-      'Floating' => TRUE,
-      'GridR' => 200,
-      'GridG' => 200,
-      'GridB' => 200,
-      'DrawSubTicks' => false,
-      'CycleBackground' => false
+        'Mode' => SCALE_MODE_START0,
+        'DrawYLines' => false,
+        'DrawXLines' => $draw_x_lines,
+        'GridTicks' => 2,
+        'LabelSkip' => 9,
+        'SkippedAxisAlpha' => 0,
+        'SkippedInnerTickWidth' => 0,
+        'SkippedOuterTickWidth' => 0,
+        'AxisAlpha' => 0,
+        'InnerTickWidth' => 0,
+        'OuterTickWidth' => 0,
+        'XMargin' => 1,
+        'YMargin' => 0,
+        'Floating' => TRUE,
+        'GridR' => 200,
+        'GridG' => 200,
+        'GridB' => 200,
+        'DrawSubTicks' => false,
+        'CycleBackground' => false
     );
     $myPicture->setFontProperties(array('FontSize' => 10));
     $myPicture->drawScale($scaleSettings);
 
     if ($label_x_axis) {
-      for ($i = 5; $i >= 0; $i--) {
+        for ($i = 5; $i >= 0; $i--) {
         $label = ($i) ? -10*$i : 'Today';
         $myPicture->drawText(589-587*($i/6)-5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
-      }
+        }
     }
 
     // Draw the area chart
@@ -189,7 +189,7 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /**
@@ -197,48 +197,48 @@ 
  * Called to generate the daily credit status chart for the whole project
  */
 function boincstats_get_project_stats_chart() {
-  // pChart library inclusions
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
-
-  init_theme();
-  global $theme_key;
-  $cache_name = "{$theme_key}_project_chart";
-
-  $color_keys = array('R', 'G', 'B');
-
-  // Get color configuration
-  $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
-  $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
-  $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
-  $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
-
-  // Sanity check for cache directory
-  if (!boincstats_check_cache_dir()) {
+    // pChart library inclusions
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
+
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_project_chart";
+
+    $color_keys = array('R', 'G', 'B');
+
+    // Get color configuration
+    $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
+    $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
+    $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
+    $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
+
+    // Sanity check for cache directory
+    if (!boincstats_check_cache_dir()) {
     return;
-  }
+    }
 
-  // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
-  $myCache->removeOlderThan(60*60*24);
+    // Initialize the cache object and flush stale images
+    $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+    $myCache->removeOlderThan(60*60*24);
 
-  if ($myCache->isInCache($cache_name)) {
+    if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+    }
+    else {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily');
     if ($stats_xml) {
-      // Get the last 60 days of stats for the chart
-      for ($j = 30; $j < 90; $j++) {
+        // Get the last 60 days of stats for the chart
+        for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
     }
 
     // Create and populate the pData object
@@ -263,25 +263,25 @@ 
 
     // Draw the scale
     $scaleSettings = array(
-      'Mode' => SCALE_MODE_START0,
-      'DrawYLines' => false,
-      'DrawXLines' => false,
-      'GridTicks' => 2,
-      'LabelSkip' => 9,
-      'SkippedAxisAlpha' => 0,
-      'SkippedInnerTickWidth' => 0,
-      'SkippedOuterTickWidth' => 0,
-      'AxisAlpha' => 0,
-      'InnerTickWidth' => 0,
-      'OuterTickWidth' => 0,
-      'XMargin' => 1,
-      'YMargin' => 0,
-      'Floating' => TRUE,
-      'GridR' => 200,
-      'GridG' => 200,
-      'GridB' => 200,
-      'DrawSubTicks' => false,
-      'CycleBackground' => false
+        'Mode' => SCALE_MODE_START0,
+        'DrawYLines' => false,
+        'DrawXLines' => false,
+        'GridTicks' => 2,
+        'LabelSkip' => 9,
+        'SkippedAxisAlpha' => 0,
+        'SkippedInnerTickWidth' => 0,
+        'SkippedOuterTickWidth' => 0,
+        'AxisAlpha' => 0,
+        'InnerTickWidth' => 0,
+        'OuterTickWidth' => 0,
+        'XMargin' => 1,
+        'YMargin' => 0,
+        'Floating' => TRUE,
+        'GridR' => 200,
+        'GridG' => 200,
+        'GridB' => 200,
+        'DrawSubTicks' => false,
+        'CycleBackground' => false
     );
     $myPicture->setFontProperties(array('FontSize' => 10));
     $myPicture->drawScale($scaleSettings);
@@ -300,41 +300,41 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /*
  *
  */
 function boincstats_check_cache_dir($cache_path = 'files/cache') {
-  $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
-  if (!is_writeable($cache_dir)) {
+    $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
+    if (!is_writeable($cache_dir)) {
     if (!is_dir($cache_dir)) {
-      if (!is_writeable(dirname($cache_dir))) {
+        if (!is_writeable(dirname($cache_dir))) {
         // If the parent "files" dir isn't even writeable...
         watchdog('boincstats', '@parent_dir directory is not writeable. This
           directory must be writeable by the web server.',
-          array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
+            array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
         return FALSE;
-      }
-      else {
+        }
+        else {
         // Create the cache dir
         if (!mkdir($cache_dir, 0775)) {
-          watchdog('boincstats', 'Failed to create @cache_dir directory. Check
+            watchdog('boincstats', 'Failed to create @cache_dir directory. Check
             filesystem permissions...?',
             array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-          return FALSE;
+            return FALSE;
+        }
         }
-      }
     }
     else {
-      watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
+        watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
         Please allow webserver write access.',
         array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-      return FALSE;
+        return FALSE;
     }
-  }
-  return TRUE;
+    }
+    return TRUE;
 }
 
 /*
@@ -342,87 +342,87 @@ 
  */
 function boincstats_get_project_stats($type = 'total', $cpid = NULL) {
 
-  // Determine the stats environment
-  boincstats_check_configuration();
-  $stats_server = variable_get('boinc_stats_server', '');
-  $stats_rpc = variable_get('boinc_stats_project_credit_history_rpc', '');
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
+    // Determine the stats environment
+    boincstats_check_configuration();
+    $stats_server = variable_get('boinc_stats_server', '');
+    $stats_rpc = variable_get('boinc_stats_project_credit_history_rpc', '');
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
 
-  $get = array(
+    $get = array(
     'id' => $project_id
-  );
-  switch ($type) {
-  case 'daily':
+    );
+    switch ($type) {
+    case 'daily':
     $get['daily'] = NULL;
     break;
-  case 'total':
+    case 'total':
   default:
   }
 
-  if ($cpid) {
+    if ($cpid) {
     // If a user CPID has been provided, limit scope to that user
     $stats_rpc = variable_get('boinc_stats_user_credit_history_rpc', '');
     $get['cpid'] = $cpid;
-  }
+    }
 
-  // Construct query string
-  $args = array();
-  foreach ($get as $arg => $value) {
+    // Construct query string
+    $args = array();
+    foreach ($get as $arg => $value) {
     if ($value !== NULL) {
-      $args[] = "{$arg}=" . rawurlencode($value);
+        $args[] = "{$arg}=" . rawurlencode($value);
     }
     else {
-      $args[] = $arg;
+        $args[] = $arg;
     }
-  }
-  $query = '?' . implode('&', $args);
+    }
+    $query = '?' . implode('&', $args);
 
-  // Load XML from RPC
-  $stats_xml = NULL;
-  $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
-  $result = drupal_http_request($target_url);
-  if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
+    // Load XML from RPC
+    $stats_xml = NULL;
+    $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
+    $result = drupal_http_request($target_url);
+    if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
     $stats_xml = simplexml_load_string($result->data);
-  }
-  watchdog('boincstats', $target_url);
-  return $stats_xml;
+    }
+    watchdog('boincstats', $target_url);
+    return $stats_xml;
 }
 
 /*
  *
  */
 function boincstats_get_project_total_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  $last_record = end($stats_xml->records->record);
-  return ($last_record) ? (int) $last_record : 0;
+    $stats_xml = boincstats_get_project_stats();
+    $last_record = end($stats_xml->records->record);
+    return ($last_record) ? (int) $last_record : 0;
 }
 
 /*
  *
  */
 function boincstats_get_project_avg_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  return (isset($stats_xml->recent_avg)) ? $stats_xml->recent_avg : 0;
+    $stats_xml = boincstats_get_project_stats();
+    return (isset($stats_xml->recent_avg)) ? $stats_xml->recent_avg : 0;
 }
 
 /*
  *
  */
 function boincstats_credit_to_ghours($credit) {
-  return $credit / (100 * 365);
+    return $credit / (100 * 365);
 }
 
 /*
  *
  */
 function boincstats_credit_to_flops($credit, $prefix = 0) {
-  $factor = array(
+    $factor = array(
     '0' => 0,
     'g' => 3,
     't' => 6,
     'p' => 9
-  );
-  return $credit / (pow(10, (int) $factor[$prefix]) / 10);
+    );
+    return $credit / (pow(10, (int) $factor[$prefix]) / 10);
 }
 
 
@@ -431,22 +431,22 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function boincstats_get_project_stats_overview($type = 'basic') {
-  global $base_path;
-  $output = '';
-  switch ($type) {
-  case 'basic':
+    global $base_path;
+    $output = '';
+    switch ($type) {
+    case 'basic':
     $output .= '<div class="overlay"><span>(' . bts('Credits per day', array(), NULL, 'boinc:front-page') . ')</span></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  case 'detailed':
+    case 'detailed':
     $output .= '<div class="stats"><label>' . bts('Total G-hours', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
     $output .= '<div class="stats"><label>' . bts('Avg TFlops', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
     //$output .= '<div class="stats"><a href="#">' . bts('Pending credits', array(), NULL, 'boinc:front-page') . '</a></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  default:
+    default:
   }
-  return $output;
+    return $output;
 }
 
 
@@ -458,19 +458,19 @@ 
  * Check that the stats system is configured, report if it isn't
  */
 function boincstats_check_configuration() {
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
-  if (!$project_id) {
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
+    if (!$project_id) {
     watchdog('boincstats', 'The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats')), WATCHDOG_ERROR);
+            'admin/boinc/stats')), WATCHDOG_ERROR);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC stats system is not configured. Please
+        drupal_set_message(t('The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats'))), 'error', FALSE);
+            'admin/boinc/stats'))), 'error', FALSE);
     }
     else {
-      drupal_set_message(t('There is a problem with the site. Please contact
+        drupal_set_message(t('There is a problem with the site. Please contact
         the system administrator.'), 'error', FALSE);
     }
-  }
+    }
 }

html/user/per_app_list.php

Spacing +9 added lines, -9 removed lines

@@ -58,7 +58,7 @@ 
     echo "</tr>";
 
     echo "<tr>";
-    echo "<th>" . tra("Rank") . "</th><th>" . tra("Name") . "</th>\n";
+    echo "<th>".tra("Rank")."</th><th>".tra("Name")."</th>\n";
     foreach ($apps as $app) {
         for ($i = 0; $i < 2; $i++) {
             $x = col_title($is_team, $app, $appid, $is_total, $i);
@@ -78,13 +78,13 @@ 
     echo "<tr>";
     echo "<td>$i</td>";
 
-    echo "<td>" . $item[0][$x] . "</td>";
+    echo "<td>".$item[0][$x]."</td>";
     $y = 1;
     foreach ($apps as $app) {
         $z = 0;
-        echo "<td>" . format_credit($item[$y][$x][$z]) . "</td>";
+        echo "<td>".format_credit($item[$y][$x][$z])."</td>";
         $z++;
-        echo "<td>" . format_credit_large($item[$y][$x][$z]) . "</td>";
+        echo "<td>".format_credit_large($item[$y][$x][$z])."</td>";
         $y++;
     }
     echo "</tr>";
@@ -179,10 +179,10 @@ 
 
     if ($is_team) {
 
-        $data  = BoincCreditTeam::get_list("appid=$appid", $x, $offset . ", " . $items_per_page);
+        $data  = BoincCreditTeam::get_list("appid=$appid", $x, $offset.", ".$items_per_page);
         $store = retrieve_credit_team($data);
     } else {
-        $data  = BoincCreditUser::get_list("appid=$appid", $x, $offset . ", " . $items_per_page);
+        $data  = BoincCreditUser::get_list("appid=$appid", $x, $offset.", ".$items_per_page);
         $store = retrieve_credit_user($data);
     }
 
@@ -197,7 +197,7 @@ 
 
 if (!$offset)
     $offset = 0;
-if ($offset % $items_per_page)
+if ($offset%$items_per_page)
     $offset = 0;
 
 $x = $is_team ? tra("Top teams by application") : tra("Top participants by application");
@@ -245,12 +245,12 @@ 
 
 if ($offset > 0) {
     $new_offset = $offset - $items_per_page;
-    echo "<a href=per_app_list.php?appid=$appid&is_team=$is_team&is_total=$is_total&offset=$new_offset>" . tra("Previous %1", $items_per_page) . "</a> &middot; ";
+    echo "<a href=per_app_list.php?appid=$appid&is_team=$is_team&is_total=$is_total&offset=$new_offset>".tra("Previous %1", $items_per_page)."</a> &middot; ";
 }
 
 if (sizeof($data[0]) == $items_per_page) {
     $new_offset = $offset + $items_per_page;
-    echo "<a href=per_app_list.php?appid=$appid&is_team=$is_team&is_total=$is_total&offset=$new_offset>" . tra("Next %1", $items_per_page) . "</a>";
+    echo "<a href=per_app_list.php?appid=$appid&is_team=$is_team&is_total=$is_total&offset=$new_offset>".tra("Next %1", $items_per_page)."</a>";
 }
 
 page_tail();

drupal/sites/all/features/boinc_standard/boinc_standard.features.menu_links.inc

Indentation +27 added lines, -27 removed lines

@@ -4,18 +4,18 @@ 
  * Implementation of hook_menu_default_menu_links().
  */
 function boinc_standard_menu_default_menu_links() {
-  $menu_links = array();
+    $menu_links = array();
 
-  // Exported menu link: menu-footer-links:https://boinc.berkeley.edu/
-  $menu_links['menu-footer-links:https://boinc.berkeley.edu/'] = array(
+    // Exported menu link: menu-footer-links:https://boinc.berkeley.edu/
+    $menu_links['menu-footer-links:https://boinc.berkeley.edu/'] = array(
     'menu_name' => 'menu-footer-links',
     'link_path' => 'https://boinc.berkeley.edu/',
     'router_path' => '',
     'link_title' => 'BOINC',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -23,17 +23,17 @@ 
     'has_children' => '0',
     'expanded' => '0',
     'weight' => '10',
-  );
-  // Exported menu link: primary-links:<front>
-  $menu_links['primary-links:<front>'] = array(
+    );
+    // Exported menu link: primary-links:<front>
+    $menu_links['primary-links:<front>'] = array(
     'menu_name' => 'primary-links',
     'link_path' => '<front>',
     'router_path' => '',
     'link_title' => 'Home',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -41,17 +41,17 @@ 
     'has_children' => '0',
     'expanded' => '0',
     'weight' => '-50',
-  );
-  // Exported menu link: primary-links:dashboard
-  $menu_links['primary-links:dashboard'] = array(
+    );
+    // Exported menu link: primary-links:dashboard
+    $menu_links['primary-links:dashboard'] = array(
     'menu_name' => 'primary-links',
     'link_path' => 'dashboard',
     'router_path' => 'dashboard',
     'link_title' => 'Dashboard',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -60,17 +60,17 @@ 
     'expanded' => '0',
     'weight' => '-50',
     'parent_path' => 'dashboard',
-  );
-  // Exported menu link: primary-links:user/me/edit
-  $menu_links['primary-links:user/me/edit'] = array(
+    );
+    // Exported menu link: primary-links:user/me/edit
+    $menu_links['primary-links:user/me/edit'] = array(
     'menu_name' => 'primary-links',
     'link_path' => 'user/me/edit',
     'router_path' => 'user/%/edit',
     'link_title' => 'Credentials',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -79,12 +79,12 @@ 
     'expanded' => '0',
     'weight' => '-48',
     'parent_path' => 'dashboard',
-  );
-  // Translatables
-  // Use bts() function to translate additional strings.
-  bts('Home', array(), NULL, 'boinc:menu-link');
-  bts('Credentials', array(), NULL, 'boinc:menu-link');
-  bts('Dashboard', array(), NULL, 'boinc:menu-link');
+    );
+    // Translatables
+    // Use bts() function to translate additional strings.
+    bts('Home', array(), NULL, 'boinc:menu-link');
+    bts('Credentials', array(), NULL, 'boinc:menu-link');
+    bts('Dashboard', array(), NULL, 'boinc:menu-link');
 
-  return $menu_links;
+    return $menu_links;
 }

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

@@ -82,9 +82,9 @@
   );
   // Translatables
   // Use bts() function to translate additional strings.
-  bts('Home', array(), NULL, 'boinc:menu-link');
-  bts('Credentials', array(), NULL, 'boinc:menu-link');
-  bts('Dashboard', array(), NULL, 'boinc:menu-link');
+  bts('Home', array(), null, 'boinc:menu-link');
+  bts('Credentials', array(), null, 'boinc:menu-link');
+  bts('Dashboard', array(), null, 'boinc:menu-link');
 
   return $menu_links;
 }

drupal/sites/all/features/user_preferences/user_preferences.features.menu_links.inc

Indentation +13 added lines, -13 removed lines

@@ -4,18 +4,18 @@ 
  * Implementation of hook_menu_default_menu_links().
  */
 function user_preferences_menu_default_menu_links() {
-  $menu_links = array();
+    $menu_links = array();
 
-  // Exported menu link: primary-links:account/prefs
-  $menu_links['primary-links:account/prefs'] = array(
+    // Exported menu link: primary-links:account/prefs
+    $menu_links['primary-links:account/prefs'] = array(
     'menu_name' => 'primary-links',
     'link_path' => 'account/prefs',
     'router_path' => 'account/prefs',
     'link_title' => 'Preferences',
     'options' => array(
-      'attributes' => array(
+        'attributes' => array(
         'title' => '',
-      ),
+        ),
     ),
     'module' => 'menu',
     'hidden' => '0',
@@ -24,13 +24,13 @@ 
     'expanded' => '0',
     'weight' => '-47',
     'parent_path' => 'dashboard',
-  );
-  // Translatables
-  // Use bts() function to translate additional strings.
-  bts('Preferences', array(), NULL, 'boinc:menu-link');
-  bts('Community', array(), NULL, 'boinc:menu-link');
-  bts('Privacy', array(), NULL, 'boinc:menu-link');
-  bts('Subscriptions', array(), NULL, 'boinc:menu-link:-1:ignoreoverwrite');
+    );
+    // Translatables
+    // Use bts() function to translate additional strings.
+    bts('Preferences', array(), NULL, 'boinc:menu-link');
+    bts('Community', array(), NULL, 'boinc:menu-link');
+    bts('Privacy', array(), NULL, 'boinc:menu-link');
+    bts('Subscriptions', array(), NULL, 'boinc:menu-link:-1:ignoreoverwrite');
 
-  return $menu_links;
+    return $menu_links;
 }

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

@@ -27,10 +27,10 @@
   );
   // Translatables
   // Use bts() function to translate additional strings.
-  bts('Preferences', array(), NULL, 'boinc:menu-link');
-  bts('Community', array(), NULL, 'boinc:menu-link');
-  bts('Privacy', array(), NULL, 'boinc:menu-link');
-  bts('Subscriptions', array(), NULL, 'boinc:menu-link:-1:ignoreoverwrite');
+  bts('Preferences', array(), null, 'boinc:menu-link');
+  bts('Community', array(), null, 'boinc:menu-link');
+  bts('Privacy', array(), null, 'boinc:menu-link');
+  bts('Subscriptions', array(), null, 'boinc:menu-link:-1:ignoreoverwrite');
 
   return $menu_links;
 }

drupal/sites/all/features/user_profiles/user_profiles.views_default.inc

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

@@ -14,7 +14,7 @@ 
   $view->base_table = 'node';
   $view->core = 6;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'title' => array(
@@ -158,9 +158,9 @@ 
       'operator' => '=',
       'value' => '1',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'moderate',
@@ -178,7 +178,7 @@ 
   $handler->override_option('cache', array(
     'type' => 'none',
   ));
-  $handler->override_option('empty', bts('No content is in the queue for moderation.', array(), NULL, 'boinc:moderate-user-page'));
+  $handler->override_option('empty', bts('No content is in the queue for moderation.', array(), null, 'boinc:moderate-user-page'));
   $handler->override_option('empty_format', '4');
   $handler->override_option('use_pager', '1');
   $handler->override_option('style_plugin', 'table');
@@ -324,9 +324,9 @@ 
       'operator' => '=',
       'value' => '1',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'moderate',
@@ -343,9 +343,9 @@ 
         'profile' => 'profile',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'type',
@@ -357,7 +357,7 @@ 
       'relationship' => 'none',
     ),
   ));
-  $handler->override_option('title', bts('User profile moderation queue', array(), NULL, 'boinc:moderate-user-page'));
+  $handler->override_option('title', bts('User profile moderation queue', array(), null, 'boinc:moderate-user-page'));
   $handler->override_option('path', 'moderate/profiles');
   $handler->override_option('menu', array(
     'type' => 'default tab',
@@ -384,7 +384,7 @@ 
   $view->base_table = 'node_revisions';
   $view->core = 6;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
     'uid' => array(

Indentation +403 added lines, -403 removed lines

@@ -4,22 +4,22 @@ 
  * Implementation of hook_views_default_views().
  */
 function user_profiles_views_default_views() {
-  $views = array();
+    $views = array();
 
-  // Exported view: moderation_queue
-  $view = new view;
-  $view->name = 'moderation_queue';
-  $view->description = '';
-  $view->tag = '';
-  $view->base_table = 'node';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: moderation_queue
+    $view = new view;
+    $view->name = 'moderation_queue';
+    $view->description = '';
+    $view->tag = '';
+    $view->base_table = 'node';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'title' => array(
-      'label' => 'Title',
-      'alter' => array(
+        'label' => 'Title',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -38,21 +38,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 1,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 1,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
     'changed' => array(
-      'label' => 'Updated date',
-      'alter' => array(
+        'label' => 'Updated date',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -71,22 +71,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'time ago',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'time ago',
+        'custom_date_format' => '',
+        'exclude' => 0,
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
     'uid' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -105,21 +105,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 1,
-      'exclude' => 1,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 1,
+        'exclude' => 1,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Author',
-      'alter' => array(
+        'label' => 'Author',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -138,81 +138,81 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'link_to_user' => 0,
-      'overwrite_anonymous' => 1,
-      'anonymous_text' => 'Anonymous',
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'link_to_user' => 0,
+        'overwrite_anonymous' => 1,
+        'anonymous_text' => 'Anonymous',
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'users',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'moderate' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'moderate',
-      'table' => 'node',
-      'field' => 'moderate',
-      'relationship' => 'none',
+        ),
+        'id' => 'moderate',
+        'table' => 'node',
+        'field' => 'moderate',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'role',
     'role' => array(
-      1271379760 => 1271379760,
+        1271379760 => 1271379760,
     ),
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('empty', bts('No content is in the queue for moderation.', array(), NULL, 'boinc:moderate-user-page'));
-  $handler->override_option('empty_format', '4');
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('empty', bts('No content is in the queue for moderation.', array(), NULL, 'boinc:moderate-user-page'));
+    $handler->override_option('empty_format', '4');
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 0,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'view_node' => 'view_node',
-      'title' => 'title',
-      'changed' => 'changed',
+        'view_node' => 'view_node',
+        'title' => 'title',
+        'changed' => 'changed',
     ),
     'info' => array(
-      'view_node' => array(
+        'view_node' => array(
         'separator' => '',
-      ),
-      'title' => array(
+        ),
+        'title' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'changed' => array(
+        ),
+        'changed' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'changed',
-  ));
-  $handler = $view->new_display('page', 'User profiles', 'page_1');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('page', 'User profiles', 'page_1');
+    $handler->override_option('fields', array(
     'uid' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -231,24 +231,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 1,
-      'exclude' => 1,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 1,
+        'exclude' => 1,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'User',
-      'alter' => array(
+        'label' => 'User',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -267,26 +267,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 1,
-      'overwrite_anonymous' => 0,
-      'anonymous_text' => '',
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 1,
+        'overwrite_anonymous' => 0,
+        'anonymous_text' => '',
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'users',
+        'field' => 'name',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'changed' => array(
-      'label' => 'Updated date',
-      'alter' => array(
+        'label' => 'Updated date',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -305,22 +305,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'time ago',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'time ago',
+        'custom_date_format' => '',
+        'exclude' => 0,
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Edit Profile',
-      'alter' => array(
+        'label' => 'Edit Profile',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -339,108 +339,108 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 $uid = $data->users_uid;
 return l(
 bts(\'edit\', array(), NULL, \'boinc:edit-profile\'),
 "/moderate/profile/$uid/edit");
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'moderate' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'moderate',
-      'table' => 'node',
-      'field' => 'moderate',
-      'override' => array(
+        ),
+        'id' => 'moderate',
+        'table' => 'node',
+        'field' => 'moderate',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'type' => array(
-      'operator' => 'in',
-      'value' => array(
+        'operator' => 'in',
+        'value' => array(
         'profile' => 'profile',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'override' => array(
+        ),
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('title', bts('User profile moderation queue', array(), NULL, 'boinc:moderate-user-page'));
-  $handler->override_option('path', 'moderate/profiles');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('title', bts('User profile moderation queue', array(), NULL, 'boinc:moderate-user-page'));
+    $handler->override_option('path', 'moderate/profiles');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'Queue',
     'description' => '',
     'weight' => '-50',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'normal',
     'title' => 'Moderation',
     'description' => '',
     'weight' => '0',
     'name' => 'primary-links',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: user_activity
-  $view = new view;
-  $view->name = 'user_activity';
-  $view->description = 'A feed of a user\'s activity on the site';
-  $view->tag = '';
-  $view->base_table = 'node_revisions';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
+    // Exported view: user_activity
+    $view = new view;
+    $view->name = 'user_activity';
+    $view->description = 'A feed of a user\'s activity on the site';
+    $view->tag = '';
+    $view->base_table = 'node_revisions';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('relationships', array(
     'uid' => array(
-      'label' => 'user',
-      'required' => 1,
-      'id' => 'uid',
-      'table' => 'node_revisions',
-      'field' => 'uid',
-      'relationship' => 'none',
+        'label' => 'user',
+        'required' => 1,
+        'id' => 'uid',
+        'table' => 'node_revisions',
+        'field' => 'uid',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('fields', array(
     'nid' => array(
-      'label' => 'Nid',
-      'alter' => array(
+        'label' => 'Nid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -459,21 +459,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'nid',
-      'table' => 'node',
-      'field' => 'nid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'nid',
+        'table' => 'node',
+        'field' => 'nid',
+        'relationship' => 'none',
     ),
     'title' => array(
-      'label' => 'Title',
-      'alter' => array(
+        'label' => 'Title',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -492,21 +492,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
     'type' => array(
-      'label' => 'Type',
-      'alter' => array(
+        'label' => 'Type',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -525,22 +525,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'machine_name' => 0,
-      'exclude' => 1,
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'machine_name' => 0,
+        'exclude' => 1,
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'relationship' => 'none',
     ),
     'uid' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -559,21 +559,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 0,
-      'exclude' => 1,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'relationship' => 'uid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 0,
+        'exclude' => 1,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'relationship' => 'uid',
     ),
     'nothing' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'text' => '<div class="gray-divider"></div>',
         'make_link' => 0,
         'path' => '',
@@ -591,20 +591,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'nothing',
-      'table' => 'views',
-      'field' => 'nothing',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'nothing',
+        'table' => 'views',
+        'field' => 'nothing',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -623,12 +623,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 
 switch($data->node_type) {
 case \'forum\':
@@ -657,18 +657,18 @@ 
 $account = user_load($uid);
 echo l($account->boincuser_name, "account/{$uid}") . " {$action} " . l($data->node_title, $url, array(\'fragment\' => $fragment));
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Override',
-      ),
+        ),
     ),
     'body' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -687,20 +687,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 1,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'body',
-      'table' => 'node_revisions',
-      'field' => 'body',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'body',
+        'table' => 'node_revisions',
+        'field' => 'body',
+        'relationship' => 'none',
     ),
     'timestamp' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -719,40 +719,40 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'jS F Y',
-      'exclude' => 0,
-      'id' => 'timestamp',
-      'table' => 'node_revisions',
-      'field' => 'timestamp',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'jS F Y',
+        'exclude' => 0,
+        'id' => 'timestamp',
+        'table' => 'node_revisions',
+        'field' => 'timestamp',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'uid' => array(
-      'default_action' => 'default',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'user',
-      'default_argument' => '',
-      'validate_type' => 'user',
-      'validate_fail' => 'empty',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'default',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'user',
+        'default_argument' => '',
+        'validate_type' => 'user',
+        'validate_fail' => 'empty',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -761,20 +761,20 @@ 
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'relationship' => 'uid',
-      'default_options_div_prefix' => '',
-      'default_taxonomy_tid_term_page' => 0,
-      'default_taxonomy_tid_node' => 0,
-      'default_taxonomy_tid_limit' => 0,
-      'default_taxonomy_tid_vids' => array(
+        ),
+        'relationship' => 'uid',
+        'default_options_div_prefix' => '',
+        'default_taxonomy_tid_term_page' => 0,
+        'default_taxonomy_tid_node' => 0,
+        'default_taxonomy_tid_limit' => 0,
+        'default_taxonomy_tid_vids' => array(
         1 => 0,
         2 => 0,
-      ),
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'team' => 0,
@@ -783,20 +783,20 @@ 
         'forum' => 0,
         'panel' => 0,
         'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
         2 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-      'me_redirect' => 0,
-      'me_validate_user_argument_type' => 'uid',
-      'me_validate_user_roles' => array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+        'me_redirect' => 0,
+        'me_validate_user_argument_type' => 'uid',
+        'me_validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -805,67 +805,67 @@ 
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'validate_argument_node_flag_name' => '*relationship*',
-      'validate_argument_node_flag_test' => 'flaggable',
-      'validate_argument_node_flag_id_type' => 'id',
-      'validate_argument_user_flag_name' => '*relationship*',
-      'validate_argument_user_flag_test' => 'flaggable',
-      'validate_argument_user_flag_id_type' => 'id',
-      'me_validate_user_restrict_roles' => 0,
+        ),
+        'validate_argument_node_flag_name' => '*relationship*',
+        'validate_argument_node_flag_test' => 'flaggable',
+        'validate_argument_node_flag_id_type' => 'id',
+        'validate_argument_user_flag_name' => '*relationship*',
+        'validate_argument_user_flag_test' => 'flaggable',
+        'validate_argument_user_flag_id_type' => 'id',
+        'me_validate_user_restrict_roles' => 0,
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('items_per_page', 5);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('items_per_page', 5);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('row_options', array(
     'inline' => array(
-      'value' => 'value',
-      'phpcode_1' => 'phpcode_1',
+        'value' => 'value',
+        'phpcode_1' => 'phpcode_1',
     ),
     'separator' => ' ',
     'hide_empty' => 0,
-  ));
-  $handler = $view->new_display('block', 'Block', 'block_1');
-  $handler->override_option('block_description', '');
-  $handler->override_option('block_caching', -1);
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('title', 'Recent posts');
-  $handler->override_option('style_plugin', 'grid');
-  $handler->override_option('style_options', array(
+    ));
+    $handler = $view->new_display('block', 'Block', 'block_1');
+    $handler->override_option('block_description', '');
+    $handler->override_option('block_caching', -1);
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('title', 'Recent posts');
+    $handler->override_option('style_plugin', 'grid');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'columns' => '1',
     'alignment' => 'vertical',
     'fill_single_line' => 1,
     'summary' => '',
-  ));
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('row_options', array(
     'inline' => array(),
     'separator' => '',
     'hide_empty' => 0,
-  ));
-  $handler->override_option('path', 'account/%/posts');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/%/posts');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => '0',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  return $views;
+    return $views;
 }

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

Switch Indentation +19 added lines, -19 removed lines

@@ -551,12 +551,12 @@ 
  */
 function boinccore_locale($op = 'groups', $group = NULL) {
   switch ($op) {
-    case 'groups':
-        return array('boinc' => 'BOINC');
-    case 'info':
-      //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
-      $info['boinc']['format'] = FALSE;
-      return $info;
+  case 'groups':
+      return array('boinc' => 'BOINC');
+  case 'info':
+    //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
+    $info['boinc']['format'] = FALSE;
+    return $info;
   }
 }
 
@@ -1885,19 +1885,19 @@ 
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {
-        case '@':
-          // Escaped only.
-          $args [$key] = check_plain($value);
-          break;
-
-        case '%':
-        default:
-          // Escaped and placeholder.
-          $args [$key] = theme('placeholder', $value);
-          break;
-
-        case '!':
-          // Pass-through.
+      case '@':
+        // Escaped only.
+        $args [$key] = check_plain($value);
+        break;
+
+      case '%':
+      default:
+        // Escaped and placeholder.
+        $args [$key] = theme('placeholder', $value);
+        break;
+
+      case '!':
+        // Pass-through.
       }
     }
     return strtr($string, $args);

Braces +29 added lines, -58 removed lines

@@ -430,8 +430,7 @@ 
       $user_info .= '  <div class="picture">';
       if (is_array($user_image) AND $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-      }
-      elseif (is_string($user_image)) {
+      } elseif (is_string($user_image)) {
         $user_info .= '<img src="' . $user_image . '"/>';
       }
       $user_info .= '  </div>';
@@ -473,8 +472,7 @@ 
     // If a specific comment is being referenced, go back to it on cancel
     if ($comment_ref = $form['pid']['#value']) {
       $cancel_url = "goto/comment/{$comment_ref}";
-    }
-    else {
+    } else {
       $cancel_url = "node/{$form['nid']['#value']}";
     }
     
@@ -528,8 +526,7 @@ 
             '#weight' => 1000,
           );
         }
-      }
-      else {
+      } else {
         $form = NULL;
         $form['from'] = array(
           '#type'  => 'item',
@@ -626,8 +623,7 @@ 
           'title' => bts('Reply to this topic with a quote', array(), NULL, 'boinc:forum-reply-to-comment')
       );
     }
-  }
-  else {
+  } else {
     // Standard EDIT, DELETE, and REPLY links are created by Drupal, but we want to alter them
     if (isset($links['comment_delete'])) {
       $links['comment_delete']['attributes'] = array(
@@ -681,8 +677,7 @@ 
                   'title' => bts('Remove sticky status from this topic', array(), NULL, 'boinc:forum-unsticky-comment')
               )
           );
-        }
-        else {
+        } else {
           $links['make_sticky'] = array(
               'title' => bts('Make sticky', array(), NULL, 'boinc:forum-sticky-comment'),
               'href' => "{$node_control}/sticky",
@@ -699,8 +694,7 @@ 
                   'title' => bts('Lock this thread for comments', array(), NULL, 'boinc:forum-lock-comment')
               )
           );
-        }
-        else {
+        } else {
           $links['unlock'] = array(
               'title' => bts('Unlock', array(), NULL, 'boinc:forum-unlock-comment'),
               'href' => "{$node_control}/unlock",
@@ -717,8 +711,7 @@ 
                   'title' => bts('Hide this topic', array(), NULL, 'boinc:forum-hide-comment')
               )
           );
-        }
-        else {
+        } else {
           $links['unhide'] = array(
               'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
               'href' => "{$node_control}/unhide",
@@ -729,8 +722,7 @@ 
         }
       }// if user_access('edit any forum topic')
     }
-  }
-  else if ($type=='comment') {
+  } else if ($type=='comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -771,8 +763,7 @@ 
                 'title' => bts('Hide this comment', array(), NULL, 'boinc:forum-hide-comment')
             )
         );
-      }
-      else {
+      } else {
         $links['unhide'] = array(
             'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
             'href' => "{$comment_control}/unhide",
@@ -958,8 +949,7 @@ 
       watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
-  }
-  elseif ($project_prefs) {
+  } elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
@@ -1002,8 +992,7 @@ 
         node_save($content_profile);
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -112,
@@ -1138,8 +1127,7 @@ 
           node_save($node);
           // Save the team IDs to a BOINC <--> Drupal reference table.
           db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam_id, $node->nid);
-        }
-        else {
+        } else {
           $xml['create_team_reply']['warning'] = t(
             'There was a problem integrating this team into Drupal. Please
             contact @project administrators!', array('@project' => PROJECT)
@@ -1154,8 +1142,7 @@ 
           // Delete from the BOINC DB if we can't sync with Drupal
           $boincteam::delete();
         }
-      }
-      else {
+      } else {
         $xml['create_team_reply']['warning'] = t(
           'There was a problem integrating this team into Drupal. Please
           contact @project administrators!', array('@project' => PROJECT)
@@ -1169,8 +1156,7 @@ 
         );
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -1,
@@ -1239,8 +1225,7 @@ 
         );
         $xml['users']['user'][] = $team_member;
       }
-    }
-    else {
+    } else {
       // Query BOINC database user table
       db_set_active('boinc_rw');
       $result = db_query("
@@ -1293,8 +1278,7 @@ 
         $xml['users']['user'][] = $team_members[$member->boinc_id];
       }
     } // end if credit_only
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1343,24 +1327,19 @@ 
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
-                }
-                else {
+                } else {
                   $error = 'Error saving avatar to profile';
                 }
-              }
-              else {
+              } else {
                 $error = 'Unable to load user profile';
               }
-            }
-            else {
+            } else {
               $error = 'User has no profile, so avatar could not be added';
             }
-          }
-          else {
+          } else {
             $error = 'Unable to save remote image';
           }
-        }
-        else {
+        } else {
           $error = 'Could not find avatar image at URL';
         }
       }
@@ -1387,8 +1366,7 @@ 
             'success' => NULL,
           ),
         );
-      }
-      else {
+      } else {
         // Failure
         $xml = array(
           'error' => array(
@@ -1397,8 +1375,7 @@ 
           ),
         );
       }
-    }
-    else {
+    } else {
       // Drupal user not found
       $xml = array(
         'error' => array(
@@ -1407,8 +1384,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     // BOINC user not found
     $xml = array(
       'error' => array(
@@ -1526,8 +1502,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1651,8 +1626,7 @@ 
         // Get the number of comments per page
         if ($user->comments_per_page) {
           $comments_per_page = $user->comments_per_page;
-        }
-        else {
+        } else {
           $node = node_load($object->nid);
           $comments_per_page = variable_get(
             "comment_default_per_page_{$node->type}", 50
@@ -1673,8 +1647,7 @@ 
     // Check for a login, then redirect to the user's friend requests page
     if ($user->uid) {
       drupal_goto("account/{$user->uid}/friends/pending");
-    }
-    else {
+    } else {
       drupal_goto('user/login', array(
         'destination' => 'goto/friend-requests'
       ));
@@ -1950,8 +1923,7 @@ 
     if ($moderator_rid !== FALSE) {
       $settings['recipients'] = array($moderator_rid);
       rules_action_mail_to_users_of_role($settings);
-    }
-    else {
+    } else {
       watchdog(
         'boinccore',
         'Unable to identify members of the moderator role to send moderator notifications!',
@@ -1982,8 +1954,7 @@ 
   }
   if (empty($args)) {
     return $string;
-  }
-  else {
+  } else {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {

Indentation +727 added lines, -727 removed lines

@@ -29,22 +29,22 @@ 
  * with defined URL paths
  */
 function boinccore_menu() {
-  $items['node_control'] = array(
+    $items['node_control'] = array(
     'page callback' => 'boinccore_node_control',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['comment_control'] = array(
+    );
+    $items['comment_control'] = array(
     'page callback' => 'boinccore_comment_control',
     'access arguments' => array('administer comments'),
     'type' => MENU_CALLBACK
-  );
-  $items['goto'] = array(
+    );
+    $items['goto'] = array(
     'page callback' => 'boinccore_url_pagination_handler',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc/community'] = array(
+    );
+    $items['admin/boinc/community'] = array(
     'title' => 'Community',
     'description' => 'Global settings for community interaction.',
     'page callback' => 'drupal_get_form',
@@ -52,8 +52,8 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boinccore.admin.inc'
-  );
-  $items['admin/boinc/standard-content-generator'] = array(
+    );
+    $items['admin/boinc/standard-content-generator'] = array(
     'title' => 'Standard page generator',
     'description' => 'Regenerate standard site content (e.g. Help and About Us
       pages).',
@@ -62,172 +62,172 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boinccore.admin.inc'
-  );
+    );
 
-  // BOINC RPC wrappers
-  $items['lookup_account.php'] = array(
+    // BOINC RPC wrappers
+    $items['lookup_account.php'] = array(
     'title' => 'Look up account RPC',
     'description' => 'RPC for getting the authenticator for a user account.',
     'page callback' => 'boinccore_lookup_account',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['am_get_info.php'] = array(
+    );
+    $items['am_get_info.php'] = array(
     'title' => 'Account manager get info RPC',
     'description' => 'RPC for getting assorted details of a user account.',
     'page callback' => 'boinccore_am_get_info',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['am_set_info.php'] = array(
+    );
+    $items['am_set_info.php'] = array(
     'title' => 'Account manager set info RPC',
     'description' => 'RPC for updating assorted details of a user account.',
     'page callback' => 'boinccore_am_set_info',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['am_set_host_info.php'] = array(
+    );
+    $items['am_set_host_info.php'] = array(
     'title' => 'Account manager set host info RPC',
     'description' => 'RPC for updating the venue for a given host.',
     'page callback' => 'boinccore_am_set_host_info',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['show_user.php'] = array(
+    );
+    $items['show_user.php'] = array(
     'title' => 'Show user RPC',
     'description' => 'RPC for getting assorted details of a user account.',
     'page callback' => 'boinccore_show_user',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['pending.php'] = array(
+    );
+    $items['pending.php'] = array(
     'title' => 'Pending credit RPC',
     'description' => 'RPC for getting pending credit for a given account.',
     'page callback' => 'boinccore_pending_credit',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['create_team.php'] = array(
+    );
+    $items['create_team.php'] = array(
     'title' => 'Create team RPC',
     'description' => 'RPC for creating a new team.',
     'page callback' => 'boinccore_create_team',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['team_lookup.php'] = array(
+    );
+    $items['team_lookup.php'] = array(
     'title' => 'Team lookup RPC',
     'description' => 'RPC for getting info on a team or matching teams.',
     'page callback' => 'boinccore_team_lookup',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['team_email_list.php'] = array(
+    );
+    $items['team_email_list.php'] = array(
     'title' => 'Get team member list RPC',
     'description' => 'RPC for getting a list of members of a given team.',
     'page callback' => 'boinccore_team_email_list',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['edit_forum_preferences_action.php'] = array(
+    );
+    $items['edit_forum_preferences_action.php'] = array(
     'title' => 'Forum preferences RPC',
     'description' => 'RPC for setting forum preferences for a given user.',
     'page callback' => 'boinccore_edit_forum_preferences',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['forum_get_data.php'] = array(
+    );
+    $items['forum_get_data.php'] = array(
     'title' => 'Forum get data RPC',
     'description' => 'RPC for getting recent forum activity for a given user.',
     'page callback' => 'boinccore_forum_get_data',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['apps.php'] = array(
+    );
+    $items['apps.php'] = array(
     'title' => 'Apps RPC',
     'description' => 'RPC for getting the applications in the system.',
     'page callback' => 'boinccore_apps',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Implementation of hook_menu_alter()
  */
 function boinccore_menu_alter(&$items) {
-  // If using Solr search and not core Drupal search, disable core search!
-  if (module_exists('global_search_solr') AND !module_exists('global_search')) {
+    // If using Solr search and not core Drupal search, disable core search!
+    if (module_exists('global_search_solr') AND !module_exists('global_search')) {
     // Add permission to user search.
     $check = array(
-      'search/node/%menu_tail',
-      'search/user/%menu_tail',
-      'user/autocomplete'
+        'search/node/%menu_tail',
+        'search/user/%menu_tail',
+        'user/autocomplete'
     );
     foreach ($check as $path) {
-      if (isset($items[$path])) {
+        if (isset($items[$path])) {
         $items[$path]['access callback'] = FALSE;
-      }
+        }
     }
-  }
-  // If using content profile module (for user profiles) setup special
-  // delete page.
-  if (module_exists('content_profile')) {
+    }
+    // If using content profile module (for user profiles) setup special
+    // delete page.
+    if (module_exists('content_profile')) {
     $items['node/%node/delete'] = array(
-      'title' => 'Delete',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('boinccore_delete_confirm', 1),
-      'access callback' => 'node_access',
-      'access arguments' => array('delete', 1),
-      'module' => 'boinccore',
-      'file' => 'includes/boinccore.forms.inc',
-      'weight' => 1,
-      'type' => MENU_CALLBACK,
+        'title' => 'Delete',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('boinccore_delete_confirm', 1),
+        'access callback' => 'node_access',
+        'access arguments' => array('delete', 1),
+        'module' => 'boinccore',
+        'file' => 'includes/boinccore.forms.inc',
+        'weight' => 1,
+        'type' => MENU_CALLBACK,
     );
-  }
+    }
 
-  // 'Remove' menu paths for ignore_user and privatemsg
-  // (pm_block_user) module which we have 'overridden' with
-  // boincwork's own functions.
-  if (module_exists('ignore_user')) {
+    // 'Remove' menu paths for ignore_user and privatemsg
+    // (pm_block_user) module which we have 'overridden' with
+    // boincwork's own functions.
+    if (module_exists('ignore_user')) {
     $check = array(
-      'ignore_user/add',
-      'ignore_user/remove',
+        'ignore_user/add',
+        'ignore_user/remove',
     );
     foreach ($check as $path) {
-      if (isset($items[$path])) {
+        if (isset($items[$path])) {
         $items[$path]['access callback'] = FALSE;
-      }
+        }
     }
 
     // Redirect user to privacy prefs page.
     $path1 = 'ignore_user/list';
     if (isset($items[$path1])) {
-      $items[$path1]['page callback'] = 'drupal_goto';
-      $items[$path1]['page arguments'] = array('account/prefs/privacy');
+        $items[$path1]['page callback'] = 'drupal_goto';
+        $items[$path1]['page arguments'] = array('account/prefs/privacy');
+    }
     }
-  }
 
-  if (module_exists('pm_block_user')) {
+    if (module_exists('pm_block_user')) {
     $check = array(
-      'messages/block/%user',
+        'messages/block/%user',
     );
     foreach ($check as $path) {
-      if (isset($items[$path])) {
+        if (isset($items[$path])) {
         $items[$path]['access callback'] = FALSE;
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_enable()
  */
 function boinccore_enable() {
-  // Automatically try to establish standard site content when this module is
-  // enabled (e.g. Help and About Us pages)
-  boinccore_admin_default_content_generate();
+    // Automatically try to establish standard site content when this module is
+    // enabled (e.g. Help and About Us pages)
+    boinccore_admin_default_content_generate();
 }
 
 /**
@@ -240,14 +240,14 @@ 
  * See: https://www.drupal.org/node/339958#comment-3012662
  */
 function boinccore_boot() {
-  global $user, $language;
-  $cache = variable_get('cache', CACHE_DISABLED);
-  $language_negotiation = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
-
-  // If we have an anonymous user, page cache is enabled, the URL has no prefix
-  // and browser language negotiation is set, we perform a redirect to the
-  // prefixed URL.
-  if (empty($user->uid) && $cache != CACHE_DISABLED && $language_negotiation == LANGUAGE_NEGOTIATION_PATH) {
+    global $user, $language;
+    $cache = variable_get('cache', CACHE_DISABLED);
+    $language_negotiation = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
+
+    // If we have an anonymous user, page cache is enabled, the URL has no prefix
+    // and browser language negotiation is set, we perform a redirect to the
+    // prefixed URL.
+    if (empty($user->uid) && $cache != CACHE_DISABLED && $language_negotiation == LANGUAGE_NEGOTIATION_PATH) {
     $args = isset($_GET['q']) ? explode('/', $_GET['q']) : array();
     $prefix = array_shift($args);
 
@@ -259,24 +259,24 @@ 
     // so call this backported Drupal 7 language negotation function, which
     // does both case insensitive and longest prefix matching
     if (function_exists('locale_language_from_browser')) {
-      $language = locale_language_from_browser();
+        $language = locale_language_from_browser();
     }
 
     if (!empty($language->prefix) && $prefix != $language->prefix) {
-      // We need full path support to perform the redirect.
-      drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH);
-
-      require_once './includes/common.inc';
-      $url = url($_GET['q'], array('query' => drupal_query_string_encode($_GET, array('q'))));
-      $code = variable_get('locale_redirect_http_code', 302);
-
-      // Since we are in a hook_boot() implementation cache mode is normal, so
-      // we can safely call hook_exit().
-      bootstrap_invoke_all('exit');
-      header("Location: $url", TRUE, $code);
-      exit;
+        // We need full path support to perform the redirect.
+        drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH);
+
+        require_once './includes/common.inc';
+        $url = url($_GET['q'], array('query' => drupal_query_string_encode($_GET, array('q'))));
+        $code = variable_get('locale_redirect_http_code', 302);
+
+        // Since we are in a hook_boot() implementation cache mode is normal, so
+        // we can safely call hook_exit().
+        bootstrap_invoke_all('exit');
+        header("Location: $url", TRUE, $code);
+        exit;
+    }
     }
-  }
 }
 
 
@@ -289,9 +289,9 @@ 
  *
  * Obsolete in Drupal 7...
  */
-  function locale_language_from_browser() {
+    function locale_language_from_browser() {
     if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-      return FALSE;
+        return FALSE;
     }
 
     $languages = language_list('enabled');
@@ -306,14 +306,14 @@ 
     // Samples: "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5"
     $browser_langcodes = array();
     if (preg_match_all('@(?<=[, ]|^)([a-zA-Z-]+|\*)(?:;q=([0-9.]+))?(?:$|\s*,\s*)@', trim($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches, PREG_SET_ORDER)) {
-      foreach ($matches as $match) {
+        foreach ($matches as $match) {
         // We can safely use strtolower() here, tags are ASCII.
         // RFC2616 mandates that the decimal part is no more than three digits,
         // so we multiply the qvalue by 1000 to avoid floating point comparisons.
         $langcode = strtolower($match[1]);
         $qvalue = isset($match[2]) ? (float) $match[2] : 1;
         $browser_langcodes[$langcode] = (int) ($qvalue * 1000);
-      }
+        }
     }
 
     // We should take pristine values from the HTTP headers, but Internet Explorer
@@ -325,10 +325,10 @@ 
     // http://blogs.msdn.com/b/ie/archive/2006/10/17/accept-language-header-for-internet-explorer-7.aspx
     asort($browser_langcodes);
     foreach ($browser_langcodes as $langcode => $qvalue) {
-      $generic_tag = strtok($langcode, '-');
-      if (!isset($browser_langcodes[$generic_tag])) {
+        $generic_tag = strtok($langcode, '-');
+        if (!isset($browser_langcodes[$generic_tag])) {
         $browser_langcodes[$generic_tag] = $qvalue;
-      }
+        }
     }
 
     // Find the enabled language with the greatest qvalue, following the rules
@@ -337,156 +337,156 @@ 
     $best_match_language = FALSE;
     $max_qvalue = 0;
     foreach ($languages as $langcode => $language) {
-      // Language tags are case insensitive (RFC2616, sec 3.10).
-      $langcode = strtolower($langcode);
+        // Language tags are case insensitive (RFC2616, sec 3.10).
+        $langcode = strtolower($langcode);
 
-      // If nothing matches below, the default qvalue is the one of the wildcard
-      // language, if set, or is 0 (which will never match).
-      $qvalue = isset($browser_langcodes['*']) ? $browser_langcodes['*'] : 0;
+        // If nothing matches below, the default qvalue is the one of the wildcard
+        // language, if set, or is 0 (which will never match).
+        $qvalue = isset($browser_langcodes['*']) ? $browser_langcodes['*'] : 0;
 
-      // Find the longest possible prefix of the browser-supplied language
-      // ('the language-range') that matches this site language ('the language tag').
-      $prefix = $langcode;
-      do {
+        // Find the longest possible prefix of the browser-supplied language
+        // ('the language-range') that matches this site language ('the language tag').
+        $prefix = $langcode;
+        do {
         if (isset($browser_langcodes[$prefix])) {
-          $qvalue = $browser_langcodes[$prefix];
-          break;
+            $qvalue = $browser_langcodes[$prefix];
+            break;
         }
-      }
-       while ($prefix = substr($prefix, 0, strrpos($prefix, '-')));
+        }
+        while ($prefix = substr($prefix, 0, strrpos($prefix, '-')));
 
-      // Find the best match.
-      if ($qvalue > $max_qvalue) {
+        // Find the best match.
+        if ($qvalue > $max_qvalue) {
         $best_match_language = $language;
         $max_qvalue = $qvalue;
-      }
+        }
     }
 
     return $best_match_language;
-  }
+    }
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boinccore_cron() {
-  // Notify moderators if there is site content that requires moderator action
-  $items_in_queue = boincuser_moderation_queue_count('cron');
-  $last_notification = variable_get('boinccore_last_content_moderation_reminder', 0);
-  if ($items_in_queue AND $last_notification < time() - 24*60*60) {
+    // Notify moderators if there is site content that requires moderator action
+    $items_in_queue = boincuser_moderation_queue_count('cron');
+    $last_notification = variable_get('boinccore_last_content_moderation_reminder', 0);
+    if ($items_in_queue AND $last_notification < time() - 24*60*60) {
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
     $site_url = $base_url . $base_path;
     $settings = array(
-      'from' => '',
-      'subject' => "Content at {$site_name} is awaiting moderation",
-      'message' => ''
-      . "Please visit the moderation queue page to review content that "
-      . "requires moderator action: \n"
-      . "\n"
-      . "{$site_url}moderate",
+        'from' => '',
+        'subject' => "Content at {$site_name} is awaiting moderation",
+        'message' => ''
+        . "Please visit the moderation queue page to review content that "
+        . "requires moderator action: \n"
+        . "\n"
+        . "{$site_url}moderate",
     );
     boinccore_rules_action_mail_to_moderators($settings);
     variable_set('boinccore_last_content_moderation_reminder', time());
-  }
+    }
 
-  // Delete expired tokens in BOINC DB
-  _boinccore_delete_expired_tokens();
+    // Delete expired tokens in BOINC DB
+    _boinccore_delete_expired_tokens();
 }
 
 /**
  * Implementation of hook_rules_action_info().
  */
 function boinccore_rules_action_info() {
-  return array(
+    return array(
     'boinccore_rules_action_mail_to_moderators' => array(
-      'label' => t('Notify moderators via email'),
-      'module' => 'BOINC core',
-      'eval input' => array('subject', 'message', 'from'),
+        'label' => t('Notify moderators via email'),
+        'module' => 'BOINC core',
+        'eval input' => array('subject', 'message', 'from'),
     ),
     'boinccore_rules_action_mark_content_for_moderation' => array(
-      'label' => t('Mark content for moderation'),
-      'arguments' => array(
+        'label' => t('Mark content for moderation'),
+        'arguments' => array(
         'node' => array('type' => 'node', 'label' => t('Content')),
-      ),
-      'module' => 'BOINC core',
+        ),
+        'module' => 'BOINC core',
     ),
     'boinccore_rules_action_mail_to_admins' => array(
-      'label' => t('Notify admins via email'),
-      'module' => 'BOINC core',
-      'eval input' => array('subject', 'message', 'from'),
+        'label' => t('Notify admins via email'),
+        'module' => 'BOINC core',
+        'eval input' => array('subject', 'message', 'from'),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_form_alter()
  */
 function boinccore_form_alter(&$form, $form_state, $form_id) {
-  global $user;
-  $account = user_load($user->uid);
-  switch ($form_id) {
-  // Comment form
-  case 'comment_form':
+    global $user;
+    $account = user_load($user->uid);
+    switch ($form_id) {
+    // Comment form
+    case 'comment_form':
     $user_image = boincuser_get_user_profile_image($user->uid);
     $user_info = '<div class="user">';
     if ($user_image) {
-      $user_info .= '  <div class="picture">';
-      if (is_array($user_image) AND $user_image['image']['filepath']) {
+        $user_info .= '  <div class="picture">';
+        if (is_array($user_image) AND $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-      }
-      elseif (is_string($user_image)) {
+        }
+        elseif (is_string($user_image)) {
         $user_info .= '<img src="' . $user_image . '"/>';
-      }
-      $user_info .= '  </div>';
+        }
+        $user_info .= '  </div>';
     }
     $user_info .= '  <div class="name">' . theme('username', $account) . '</div>';
     if ($account->uid) {
-      //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
-      //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
-      //$user_info .= '  <div class="credit">Credit: ' . $account->boincuser_total_credit . '</div>';
-      //$user_info .= '  <div class="rac">RAC: ' . $account->boincuser_expavg_credit . '</div>';
+        //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
+        //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
+        //$user_info .= '  <div class="credit">Credit: ' . $account->boincuser_total_credit . '</div>';
+        //$user_info .= '  <div class="rac">RAC: ' . $account->boincuser_expavg_credit . '</div>';
     }
     $user_info .= '</div>';
     array_unshift($form, array(
-      'user_info' => array(
+        'user_info' => array(
         '#value' => $user_info,
-      ),
-      'comment_form_prefix' => array(
+        ),
+        'comment_form_prefix' => array(
         '#value' => '<div class="form-body">',
-      ),
+        ),
     ));
     $form['comment_form_suffix'] = array(
-      '#value' => '</div>',
+        '#value' => '</div>',
     );
 
     module_load_include('inc', 'bbcode', 'bbcode-help');
     $form['bbcode_help'] = array(
-      '#title' => bts('BBcode help', array(), NULL, 'boinc:help-with-user-input-with-BBCode'),
-      '#type' => 'fieldset',
-      '#attributes' => array(
+        '#title' => bts('BBcode help', array(), NULL, 'boinc:help-with-user-input-with-BBCode'),
+        '#type' => 'fieldset',
+        '#attributes' => array(
         'class' => 'bbcode_help',
-      ),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-      'content' => array(
+        ),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        'content' => array(
         '#value' => _bbcode_filter_tip(),
-      ),
+        ),
     );
 
     // If a specific comment is being referenced, go back to it on cancel
     if ($comment_ref = $form['pid']['#value']) {
-      $cancel_url = "goto/comment/{$comment_ref}";
+        $cancel_url = "goto/comment/{$comment_ref}";
     }
     else {
-      $cancel_url = "node/{$form['nid']['#value']}";
+        $cancel_url = "node/{$form['nid']['#value']}";
     }
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit'] = $form['submit'];
     unset($form['submit']);
@@ -505,12 +505,12 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
-      '#weight' => 1004,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
+        '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     // Remove redundant name field
@@ -526,38 +526,38 @@ 
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
     if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
-      if ($node->type == 'forum') {
+        if ($node->type == 'forum') {
         if (module_exists('captcha')) {
-          $form['comment_captcha'] = array(
+            $form['comment_captcha'] = array(
             '#type' => 'captcha',
             '#weight' => 1000,
-          );
+            );
         }
-      }
-      else {
+        }
+        else {
         $form = NULL;
         $form['from'] = array(
-          '#type'  => 'item',
-          '#value' => 'You do not have permission to post comments in this forum.',
+            '#type'  => 'item',
+            '#value' => 'You do not have permission to post comments in this forum.',
         );
-      }
+        }
     }
 
     break;
 
-  // Forum node form
-  case 'forum_node_form':
+    // Forum node form
+    case 'forum_node_form':
   case 'team_forum_node_form':
     $forum_id = key($form['#node']->taxonomy);
     $form['buttons']['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
     $form['buttons']['submit']['#value'] = bts('Post topic', array(), NULL, 'boinc:post-forum-comment');
@@ -570,28 +570,28 @@ 
     $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'), "community/forum/{$forum_id}") . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}") . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     // Add captcha for role='community member'
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
     if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
-      if (module_exists('captcha')) {
+        if (module_exists('captcha')) {
         $form['comment_captcha'] = array(
-          '#type' => 'captcha',
-          '#weight' => 1000,
+            '#type' => 'captcha',
+            '#weight' => 1000,
         );
-      }
+        }
     }
 
     break;
-  case 'boinccore_delete_confirm':
+    case 'boinccore_delete_confirm':
     // Wrap action buttons for styling consistency
     $form['actions']['#prefix'] = '<ul class="form-control tab-list">';
     $form['actions']['#suffix'] = '</ul>';
@@ -601,7 +601,7 @@ 
     $form['actions']['cancel']['#prefix'] = '<li class="tab">';
     $form['actions']['cancel']['#suffix'] = '</li>';
     break;
-  default:
+    default:
   }
 }
 
@@ -609,61 +609,61 @@ 
  * Implementation of hook_link_alter()
  */
 function boinccore_link_alter(&$links, $node, $comment = NULL) {
-  //echo '<pre>' . print_r($links, true) . '</pre>';
-  foreach ($links as $module => $link) {
+    //echo '<pre>' . print_r($links, true) . '</pre>';
+    foreach ($links as $module => $link) {
     // Remove the ignore user link
     if (strstr($module, 'ignore_user')) {
-      unset($links[$module]);
+        unset($links[$module]);
     }
-  }
-  // Node first, then comment: to be consistent with boinccore_link() function
-  if (!($comment)) {
+    }
+    // Node first, then comment: to be consistent with boinccore_link() function
+    if (!($comment)) {
     // modify the comment_add link
     if (isset($links['comment_add'])) {
-      $links['comment_add']['title'] = bts('reply', array(), NULL, 'boinc:forum-reply-to-comment');
-      $links['comment_add']['attributes'] = array(
-          'title' => bts('Reply to this comment', array(), NULL, 'boinc:forum-reply-to-comment')
-      );
+        $links['comment_add']['title'] = bts('reply', array(), NULL, 'boinc:forum-reply-to-comment');
+        $links['comment_add']['attributes'] = array(
+            'title' => bts('Reply to this comment', array(), NULL, 'boinc:forum-reply-to-comment')
+        );
     }
     // modify quote link
     if (isset($links['quote'])) {
-      $links['quote']['attributes'] = array(
-          'title' => bts('Reply to this topic with a quote', array(), NULL, 'boinc:forum-reply-to-comment')
-      );
+        $links['quote']['attributes'] = array(
+            'title' => bts('Reply to this topic with a quote', array(), NULL, 'boinc:forum-reply-to-comment')
+        );
     }
-  }
-  else {
+    }
+    else {
     // Standard EDIT, DELETE, and REPLY links are created by Drupal, but we want to alter them
     if (isset($links['comment_delete'])) {
-      $links['comment_delete']['attributes'] = array(
-          'title' => bts('Delete this comment', array(), NULL, 'boinc:forum-delete-comment')
-      );
+        $links['comment_delete']['attributes'] = array(
+            'title' => bts('Delete this comment', array(), NULL, 'boinc:forum-delete-comment')
+        );
     }
     if (isset($links['comment_edit'])) {
-      $links['comment_edit']['attributes'] = array(
-          'title' => bts('Edit this comment', array(), NULL, 'boinc:forum-edit-comment')
-      );
+        $links['comment_edit']['attributes'] = array(
+            'title' => bts('Edit this comment', array(), NULL, 'boinc:forum-edit-comment')
+        );
     }
     if (isset($links['comment_reply'])) {
-      $links['comment_reply']['attributes'] = array(
-          'title' => bts('Reply to this comment', array(), NULL, 'boinc:forum-reply-to-comment')
-      );
+        $links['comment_reply']['attributes'] = array(
+            'title' => bts('Reply to this comment', array(), NULL, 'boinc:forum-reply-to-comment')
+        );
     }
-  }// if !$comment
+    }// if !$comment
 }
 
 /**
  * Implementation of hook_locale().
  */
 function boinccore_locale($op = 'groups', $group = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'groups':
         return array('boinc' => 'BOINC');
     case 'info':
       //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
       $info['boinc']['format'] = FALSE;
-      return $info;
-  }
+        return $info;
+    }
 }
 
 
@@ -671,71 +671,71 @@ 
  * Implementation of hook_link()
  */
 function boinccore_link($type, $object, $teaser = FALSE) {
-  // Add custom links with this hook
+    // Add custom links with this hook
 
-  if ($type=='node') {
+    if ($type=='node') {
     if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
-      // Add topic moderator controls
-      if (user_access('edit any forum topic')) {
+        // Add topic moderator controls
+        if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
         if ($object->sticky) {
-          $links['make_unsticky'] = array(
-              'title' => bts('Make unsticky', array(), NULL, 'boinc:forum-unsticky-comment'),
-              'href' => "{$node_control}/unsticky",
-              'attributes' => array(
-                  'title' => bts('Remove sticky status from this topic', array(), NULL, 'boinc:forum-unsticky-comment')
-              )
-          );
+            $links['make_unsticky'] = array(
+                'title' => bts('Make unsticky', array(), NULL, 'boinc:forum-unsticky-comment'),
+                'href' => "{$node_control}/unsticky",
+                'attributes' => array(
+                    'title' => bts('Remove sticky status from this topic', array(), NULL, 'boinc:forum-unsticky-comment')
+                )
+            );
         }
         else {
-          $links['make_sticky'] = array(
-              'title' => bts('Make sticky', array(), NULL, 'boinc:forum-sticky-comment'),
-              'href' => "{$node_control}/sticky",
-              'attributes' => array(
-                  'title' => bts('Make this topic sticky', array(), NULL, 'boinc:forum-sticky-comment')
-              )
-          );
+            $links['make_sticky'] = array(
+                'title' => bts('Make sticky', array(), NULL, 'boinc:forum-sticky-comment'),
+                'href' => "{$node_control}/sticky",
+                'attributes' => array(
+                    'title' => bts('Make this topic sticky', array(), NULL, 'boinc:forum-sticky-comment')
+                )
+            );
         }
         if ($object->comment == COMMENT_NODE_READ_WRITE) {
-          $links['lock'] = array(
-              'title' => bts('Lock', array(), NULL, 'boinc:forum-lock-comment'),
-              'href' => "{$node_control}/lock",
-              'attributes' => array(
-                  'title' => bts('Lock this thread for comments', array(), NULL, 'boinc:forum-lock-comment')
-              )
-          );
+            $links['lock'] = array(
+                'title' => bts('Lock', array(), NULL, 'boinc:forum-lock-comment'),
+                'href' => "{$node_control}/lock",
+                'attributes' => array(
+                    'title' => bts('Lock this thread for comments', array(), NULL, 'boinc:forum-lock-comment')
+                )
+            );
         }
         else {
-          $links['unlock'] = array(
-              'title' => bts('Unlock', array(), NULL, 'boinc:forum-unlock-comment'),
-              'href' => "{$node_control}/unlock",
-              'attributes' => array(
-                  'title' => bts('Unlock this thread for comments', array(), NULL, 'boinc:forum-unlock-comment')
-              )
-          );
+            $links['unlock'] = array(
+                'title' => bts('Unlock', array(), NULL, 'boinc:forum-unlock-comment'),
+                'href' => "{$node_control}/unlock",
+                'attributes' => array(
+                    'title' => bts('Unlock this thread for comments', array(), NULL, 'boinc:forum-unlock-comment')
+                )
+            );
         }
         if ($object->status) {
-          $links['hide'] = array(
-              'title' => bts('Hide', array(), NULL, 'boinc:forum-hide-comment'),
-              'href' => "{$node_control}/hide",
-              'attributes' => array(
-                  'title' => bts('Hide this topic', array(), NULL, 'boinc:forum-hide-comment')
-              )
-          );
+            $links['hide'] = array(
+                'title' => bts('Hide', array(), NULL, 'boinc:forum-hide-comment'),
+                'href' => "{$node_control}/hide",
+                'attributes' => array(
+                    'title' => bts('Hide this topic', array(), NULL, 'boinc:forum-hide-comment')
+                )
+            );
         }
         else {
-          $links['unhide'] = array(
-              'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
-              'href' => "{$node_control}/unhide",
-              'attributes' => array(
-                  'title' => bts('Unhide this topic', array(), NULL, 'boinc:forum-unhide-comment')
-              )
-          );
+            $links['unhide'] = array(
+                'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
+                'href' => "{$node_control}/unhide",
+                'attributes' => array(
+                    'title' => bts('Unhide this topic', array(), NULL, 'boinc:forum-unhide-comment')
+                )
+            );
         }
-      }// if user_access('edit any forum topic')
+        }// if user_access('edit any forum topic')
     }
-  }
-  else if ($type=='comment') {
+    }
+    else if ($type=='comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -755,10 +755,10 @@ 
     // HIDE and COVERT comment
     // The following are moderator only links
     if (user_access('administer comments')) {
-      $comment_control = "comment_control/{$cid}";
-      // Add link to convert comment into a new topic
-      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
-      if ($reply_count == 0) {
+        $comment_control = "comment_control/{$cid}";
+        // Add link to convert comment into a new topic
+        $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
+        if ($reply_count == 0) {
         $links['convert'] = array(
             'title' => bts('Convert', array(), NULL, 'boinc:forum-convert-comment-to-topic'),
             'href' => "{$comment_control}/convert",
@@ -766,9 +766,9 @@ 
                 'title' => bts('Convert this comment to a new topic', array(), NULL, 'boinc:forum-convert-comment-to-topic')
             )
         );
-      }
-      // Add hide link
-      if ($object->status == 0) {
+        }
+        // Add hide link
+        if ($object->status == 0) {
         $links['hide'] = array(
             'title' => bts('Hide', array(), NULL, 'boinc:forum-hide-comment'),
             'href' => "{$comment_control}/hide",
@@ -776,8 +776,8 @@ 
                 'title' => bts('Hide this comment', array(), NULL, 'boinc:forum-hide-comment')
             )
         );
-      }
-      else {
+        }
+        else {
         $links['unhide'] = array(
             'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
             'href' => "{$comment_control}/unhide",
@@ -785,27 +785,27 @@ 
                 'title' => bts('Unhide this comment', array(), NULL, 'boinc:forum-unhide-comment')
             )
         );
-      }
+        }
     }// if user_access('administer comments')
-  }//if $type
+    }//if $type
 
-  return $links;
+    return $links;
 }
 
 /**
  * Implementation of hook_mail_alter()
  */
 function boinccore_mail_alter(&$message) {
-  /* This code alters the headers for all emails sent by the Drupal Web site to use
+    /* This code alters the headers for all emails sent by the Drupal Web site to use
      'Quote-Printable' as the encoding, both altering the header and modifies the body to the
      new encoding.
   */
-  $message['headers']['Content-Transfer-Encoding'] = 'Quoted-Printable';
-  if (is_array($message['body'])) {
+    $message['headers']['Content-Transfer-Encoding'] = 'Quoted-Printable';
+    if (is_array($message['body'])) {
     $message['body'] = array_map( "quoted_printable_encode", $message['body'] );
-  } else {
+    } else {
     $message['body'] = quoted_printable_encode($message['body']);
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -818,45 +818,45 @@ 
  * link rather than through the node form.
  */
 function boinccore_node_control($nid = NULL, $action = NULL) {
-  if ((!$nid OR !$node = node_load($nid)) OR
+    if ((!$nid OR !$node = node_load($nid)) OR
       ($node->type == 'forum' AND !user_access('edit any forum topic')) OR
       ($node->type != 'forum' AND !user_access('administer nodes'))) {
     // What are you even doing here...
     return FALSE;
-  }
-  switch ($action) {
-  case 'unhide':
+    }
+    switch ($action) {
+    case 'unhide':
     node_publish_action($node);
     break;
-  case 'hide':
+    case 'hide':
     node_unpublish_action($node);
     break;
-  case 'sticky':
+    case 'sticky':
     node_make_sticky_action($node);
     break;
-  case 'unsticky':
+    case 'unsticky':
     node_make_unsticky_action($node);
     break;
-  case 'lock':
+    case 'lock':
     $node->comment = 1;
     watchdog('action', 'Locked comments on @type %title.', array(
-      '@type' => node_get_types('name', $node), '%title' => $node->title));
+        '@type' => node_get_types('name', $node), '%title' => $node->title));
     break;
-  case 'unlock':
+    case 'unlock':
     $node->comment = 2;
     watchdog('action', 'Unlocked comments on @type %title.', array(
-      '@type' => node_get_types('name', $node), '%title' => $node->title));
+        '@type' => node_get_types('name', $node), '%title' => $node->title));
     break;
-  default:
+    default:
   }
-  node_save($node);
-  // If hiding a forum topic (node) and not an administrator, go to
-  // the forum page. Otherwise the user will reach an access-denied
-  // page.
-  if (($action=="hide") and (!user_access('administer forums'))) {
+    node_save($node);
+    // If hiding a forum topic (node) and not an administrator, go to
+    // the forum page. Otherwise the user will reach an access-denied
+    // page.
+    if (($action=="hide") and (!user_access('administer forums'))) {
     drupal_goto("community/forum/{$node->tid}");
-  }
-  drupal_goto("node/{$nid}");
+    }
+    drupal_goto("node/{$nid}");
 }
 
 /**
@@ -865,28 +865,28 @@ 
  * through the comment edit form.
  */
 function boinccore_comment_control($cid = NULL, $action = NULL) {
-  if (!$cid OR !$comment = _comment_load($cid)) {
+    if (!$cid OR !$comment = _comment_load($cid)) {
     // What are you even doing here...
     return FALSE;
-  }
-  $return_path = "node/{$comment->nid}";
-  $return_anchor = "comment-{$cid}";
-  switch ($action) {
-  case 'unhide':
+    }
+    $return_path = "node/{$comment->nid}";
+    $return_anchor = "comment-{$cid}";
+    switch ($action) {
+    case 'unhide':
     comment_publish_action($comment);
     rules_invoke_event('boinccore_comment_unhidden', $comment);
     if (module_exists("boinc_solr_comments")) {
-      boinc_solr_comments_publish($comment);
+        boinc_solr_comments_publish($comment);
     }
     break;
-  case 'hide':
+    case 'hide':
     comment_unpublish_action($comment);
     rules_invoke_event('comment_unpublish', $comment);
     if (module_exists("boinc_solr_comments")) {
-      boinc_solr_comments_unpublish($comment);
+        boinc_solr_comments_unpublish($comment);
     }
     break;
-  case 'convert':
+    case 'convert':
     $node = new stdClass();
     $node->name = $comment->subject;
     $node->title = $node->name;
@@ -906,7 +906,7 @@ 
     $node->tid = $parent_node->tid;
 
     if (filter_access($comment->format)) {
-      $node->format = $comment->format;
+        $node->format = $comment->format;
     }
 
     // Save the new node
@@ -922,9 +922,9 @@ 
     $return_path = "node/{$node->nid}";
     $return_anchor = NULL;
     break;
-  default:
+    default:
   }
-  drupal_goto($return_path, NULL, $return_anchor);
+    drupal_goto($return_path, NULL, $return_anchor);
 }
 
 /**
@@ -932,7 +932,7 @@ 
  * Get the authenticator for a given account
  */
 function boinccore_lookup_account() {
-  include_boinc('user/lookup_account.php');
+    include_boinc('user/lookup_account.php');
 }
 
 /**
@@ -940,29 +940,29 @@ 
  * Get assorted details for a given account
  */
 function boinccore_am_get_info() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  // Capture the XML output of the RPC so we can override things
-  ob_start();
-  include_boinc('user/am_get_info.php');
-  $xml = ob_get_clean();
-  $xml = load_configuration($xml);
-  // See if the account has an approved profile in Drupal
-  $uid = !empty($xml['am_get_info_reply']['id']) ? boincuser_lookup_uid($xml['am_get_info_reply']['id']) : 0;
-  if ($uid) {
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    // Capture the XML output of the RPC so we can override things
+    ob_start();
+    include_boinc('user/am_get_info.php');
+    $xml = ob_get_clean();
+    $xml = load_configuration($xml);
+    // See if the account has an approved profile in Drupal
+    $uid = !empty($xml['am_get_info_reply']['id']) ? boincuser_lookup_uid($xml['am_get_info_reply']['id']) : 0;
+    if ($uid) {
     $content_profile = content_profile_load('profile', $uid);
     $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
     $country = check_plain($content_profile->field_country[0]['value']);
     $website = '';
     if ($profile_is_approved) {
-      $website = check_plain($content_profile->field_url[0]['value']);
+        $website = check_plain($content_profile->field_url[0]['value']);
     }
     // Override BOINC values with Drupal values as needed
     $xml['am_get_info_reply']['has_profile']['@value'] = ($profile_is_approved) ? 1 : 0;
     $xml['am_get_info_reply']['country']['@value'] = $country;
     $xml['am_get_info_reply']['url']['@value'] = $website;
-  }
-  print save_configuration($xml);
+    }
+    print save_configuration($xml);
 }
 
 /**
@@ -970,75 +970,75 @@ 
  * Update assorted details for a given account
  */
 function boinccore_am_set_info() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  // Validate the XML prefs (in case BOINC does not)
-  $global_prefs = !empty($_POST['global_prefs']) ? $_POST['global_prefs'] : (!empty($_GET['global_prefs']) ? $_GET['global_prefs'] : NULL);
-  $project_prefs = !empty($_POST['project_prefs']) ? $_POST['project_prefs'] : (!empty($_GET['project_prefs']) ? $_GET['project_prefs'] : NULL);
-  libxml_use_internal_errors(true);
-  $xml = new DomDocument();
-  if ($global_prefs) {
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    // Validate the XML prefs (in case BOINC does not)
+    $global_prefs = !empty($_POST['global_prefs']) ? $_POST['global_prefs'] : (!empty($_GET['global_prefs']) ? $_GET['global_prefs'] : NULL);
+    $project_prefs = !empty($_POST['project_prefs']) ? $_POST['project_prefs'] : (!empty($_GET['project_prefs']) ? $_GET['project_prefs'] : NULL);
+    libxml_use_internal_errors(true);
+    $xml = new DomDocument();
+    if ($global_prefs) {
     $xml->loadXML($global_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
-      $lines = explode("\r", $global_prefs);
-      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
+        $lines = explode("\r", $global_prefs);
+        watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
-  }
-  elseif ($project_prefs) {
+    }
+    elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
-      $lines = explode("\r", $project_prefs);
-      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
+        $lines = explode("\r", $project_prefs);
+        watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
-  }
-  if (!$errors) {
+    }
+    if (!$errors) {
     // Capture the XML output of the RPC so we can override things
     ob_start();
     include_boinc('user/am_set_info.php');
     $xml = ob_get_clean();
     $xml = load_configuration($xml);
     if (isset($xml['am_set_info_reply']['success'])) {
-      // Find the account in Drupal
-      $boinc_auth = !empty($_POST['account_key']) ? $_POST['account_key'] : $_GET['account_key'];
-      db_set_active('boinc_rw');
-      $boinc_id = db_result(db_query("
+        // Find the account in Drupal
+        $boinc_auth = !empty($_POST['account_key']) ? $_POST['account_key'] : $_GET['account_key'];
+        db_set_active('boinc_rw');
+        $boinc_id = db_result(db_query("
         SELECT id
         FROM {user}
         WHERE authenticator = '%s'",
         $boinc_auth
-      ));
-      db_set_active('default');
-      $uid = boincuser_lookup_uid($boinc_id);
+        ));
+        db_set_active('default');
+        $uid = boincuser_lookup_uid($boinc_id);
 
-      // Apply any relevant updates to the Drupal account, also
-      $country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : NULL);
-      $url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : NULL);
-      $email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : NULL);
+        // Apply any relevant updates to the Drupal account, also
+        $country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : NULL);
+        $url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : NULL);
+        $email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : NULL);
 
-      if ($email_addr) {
+        if ($email_addr) {
         $account = user_load($uid);
         user_save($account, array('mail' => $email_addr));
-      }
-      if ($country OR $url) {
+        }
+        if ($country OR $url) {
         $content_profile = content_profile_load('profile', $uid);
         if ($country) $content_profile->field_country[0]['value'] = $country;
         if ($url) $content_profile->field_url[0]['value'] = $url;
         node_save($content_profile);
-      }
+        }
     }
-  }
-  else {
+    }
+    else {
     $xml = array(
-      'error' => array(
+        'error' => array(
         'error_num' => -112,
         'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1])
-      ),
+        ),
     );
-  }
-  print save_configuration($xml);
+    }
+    print save_configuration($xml);
 }
 
 /**
@@ -1046,17 +1046,17 @@ 
  * Update the venue for the given host
  */
 function boinccore_am_set_host_info() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  // Capture the XML output of the RPC so we can override things
-  ob_start();
-  include_boinc('user/am_set_host_info.php');
-  $xml = ob_get_clean();
-  $xml = load_configuration($xml);
-  if (isset($xml['am_set_host_info_reply']['success'])) {
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    // Capture the XML output of the RPC so we can override things
+    ob_start();
+    include_boinc('user/am_set_host_info.php');
+    $xml = ob_get_clean();
+    $xml = load_configuration($xml);
+    if (isset($xml['am_set_host_info_reply']['success'])) {
     // Override anything that needs overriding
-  }
-  print save_configuration($xml);
+    }
+    print save_configuration($xml);
 }
 
 /**
@@ -1064,29 +1064,29 @@ 
  * Get assorted details for a given account
  */
 function boinccore_show_user() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  // Capture the XML output of the RPC so we can override things
-  ob_start();
-  include_boinc('user/show_user.php');
-  $xml = ob_get_clean();
-  $xml = load_configuration($xml);
-  // See if the account has an approved profile in Drupal
-  $uid = !empty($xml['user']['id']) ? boincuser_lookup_uid($xml['user']['id']) : 0;
-  if ($uid) {
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    // Capture the XML output of the RPC so we can override things
+    ob_start();
+    include_boinc('user/show_user.php');
+    $xml = ob_get_clean();
+    $xml = load_configuration($xml);
+    // See if the account has an approved profile in Drupal
+    $uid = !empty($xml['user']['id']) ? boincuser_lookup_uid($xml['user']['id']) : 0;
+    if ($uid) {
     $content_profile = content_profile_load('profile', $uid);
     $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
     $country = check_plain($content_profile->field_country[0]['value']);
     $website = '';
     if ($profile_is_approved) {
-      $website = check_plain($content_profile->field_url[0]['value']);
+        $website = check_plain($content_profile->field_url[0]['value']);
     }
     // Override BOINC values with Drupal values as needed
     $xml['user']['has_profile']['@value'] = ($profile_is_approved) ? 1 : 0;
     $xml['user']['country']['@value'] = $country;
     $xml['user']['url']['@value'] = $website;
-  }
-  print save_configuration($xml);
+    }
+    print save_configuration($xml);
 }
 
 /**
@@ -1094,9 +1094,9 @@ 
  * Get pending credit information for a given account
  */
 function boinccore_pending_credit() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  include_boinc('user/pending.php');
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    include_boinc('user/pending.php');
 }
 
 /**
@@ -1105,7 +1105,7 @@ 
  */
 function boinccore_create_team() {
 
-  if (module_exists('boincteam')) {
+    if (module_exists('boincteam')) {
     module_load_include('module', 'boincteam', 'boincteam');
 
     $input_format = !empty($values['format']) ? $values['format'] : 4;
@@ -1118,9 +1118,9 @@ 
     $xml = load_configuration($xml);
 
     if (isset($xml['create_team_reply']['success'])) {
-      $boincteam_id = isset($xml['create_team_reply']['team_id']['@value']) ? $xml['create_team_reply']['team_id']['@value'] : 0;
+        $boincteam_id = isset($xml['create_team_reply']['team_id']['@value']) ? $xml['create_team_reply']['team_id']['@value'] : 0;
 
-      if ($boincteam_id) {
+        if ($boincteam_id) {
 
         $boincteam = boincteam_load($boincteam_id);
         $team_owner_uid = boincuser_lookup_uid($boincteam->userid);
@@ -1128,92 +1128,92 @@ 
         // Create the team node in Drupal
 
         $values = array(
-          'name' => isset($_GET['name']) ? $_GET['name'] : '',
-          'description' => isset($_GET['description']) ? $_GET['description'] : '',
-          'type' => isset($_GET['type']) ? $_GET['type'] : '',
+            'name' => isset($_GET['name']) ? $_GET['name'] : '',
+            'description' => isset($_GET['description']) ? $_GET['description'] : '',
+            'type' => isset($_GET['type']) ? $_GET['type'] : '',
         );
         $teaser = node_teaser($values['description']);
         $created_time = time();
 
         $node = array(
-          'type' => 'team',
-          'title' => $values['name'],
-          'body' => $values['description'],
-          'teaser' => $teaser,
-          'uid' => $team_owner_uid,
-          'path' => null,
-          'status' => 1,  // published or not - always publish
-          'promote' => 0,
-          'created' => $created_time,
-          'comment' => 0,  // comments disabled
-          'moderate' => 0,
-          'sticky' => 0,
-          'format' => $input_format
+            'type' => 'team',
+            'title' => $values['name'],
+            'body' => $values['description'],
+            'teaser' => $teaser,
+            'uid' => $team_owner_uid,
+            'path' => null,
+            'status' => 1,  // published or not - always publish
+            'promote' => 0,
+            'created' => $created_time,
+            'comment' => 0,  // comments disabled
+            'moderate' => 0,
+            'sticky' => 0,
+            'format' => $input_format
         );
 
         // Use pathauto function, if available, to clean up the path
         if (module_exists('pathauto')) {
-          module_load_include('inc', 'pathauto', 'pathauto');
-          $node['path'] = pathauto_cleanstring($values['name']);
+            module_load_include('inc', 'pathauto', 'pathauto');
+            $node['path'] = pathauto_cleanstring($values['name']);
 
-          $node = (object) $node; // node_save requires an object form
-          $team_categories = taxonomy_get_term_by_name($values['type']);
-          $node->taxonomy[] = $team_categories[0];
+            $node = (object) $node; // node_save requires an object form
+            $team_categories = taxonomy_get_term_by_name($values['type']);
+            $node->taxonomy[] = $team_categories[0];
 
-          // Save the team node
-          node_save($node);
-          // Save the team IDs to a BOINC <--> Drupal reference table.
-          db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam_id, $node->nid);
+            // Save the team node
+            node_save($node);
+            // Save the team IDs to a BOINC <--> Drupal reference table.
+            db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam_id, $node->nid);
         }
         else {
-          $xml['create_team_reply']['warning'] = t(
+            $xml['create_team_reply']['warning'] = t(
             'There was a problem integrating this team into Drupal. Please
             contact @project administrators!', array('@project' => PROJECT)
-          );
-          watchdog(
+            );
+            watchdog(
             'BOINC team',
             'BOINC teams require the Pathauto module. Team cannot be created in
               Drupal via create_team.php RPC.',
             array(),
             WATCHDOG_ERROR
-          );
-          // Delete from the BOINC DB if we can't sync with Drupal
-          $boincteam::delete();
+            );
+            // Delete from the BOINC DB if we can't sync with Drupal
+            $boincteam::delete();
         }
-      }
-      else {
+        }
+        else {
         $xml['create_team_reply']['warning'] = t(
-          'There was a problem integrating this team into Drupal. Please
+            'There was a problem integrating this team into Drupal. Please
           contact @project administrators!', array('@project' => PROJECT)
         );
         watchdog(
-          'BOINC team',
-          'Team cannot be created in Drupal via create_team.php RPC because no
+            'BOINC team',
+            'Team cannot be created in Drupal via create_team.php RPC because no
             BOINC team ID was returned in the XML.',
-          array(),
-          WATCHDOG_ERROR
+            array(),
+            WATCHDOG_ERROR
         );
-      }
+        }
     }
-  }
-  else {
+    }
+    else {
     $xml = array(
-      'error' => array(
+        'error' => array(
         'error_num' => -1,
         'error_msg' => t(
-          'Teams are not enabled for this project'
+            'Teams are not enabled for this project'
+        ),
         ),
-      ),
     );
     watchdog(
-      'BOINC team',
-      'Team cannot be created in Drupal via create_team.php RPC because the
+        'BOINC team',
+        'Team cannot be created in Drupal via create_team.php RPC because the
         BOINC team module is not enabled.',
-      array(),
-      WATCHDOG_ERROR
+        array(),
+        WATCHDOG_ERROR
     );
-  }
-  print save_configuration($xml);
+    }
+    print save_configuration($xml);
 }
 
 /**
@@ -1221,9 +1221,9 @@ 
  * Get info on a team by ID or a list of teams that match a given name
  */
 function boinccore_team_lookup() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  include_boinc('user/team_lookup.php');
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    include_boinc('user/team_lookup.php');
 }
 
 /**
@@ -1231,72 +1231,72 @@ 
  * Get members of a given team
  */
 function boinccore_team_email_list() {
-  // See if the account has an approved profile in Drupal
-  $boincteam_id = !empty($_POST['teamid']) ? $_POST['teamid'] : $_GET['teamid'];
-  $credit_only = !empty($_POST['creditonly']) ? $_POST['creditonly'] : $_GET['creditonly'];
-  $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
-  if (!$show_xml) {
-      // creditonly does not affect non xml output in BOINC
-      $credit_only = FALSE;
-  }
-  $xml = array();
+    // See if the account has an approved profile in Drupal
+    $boincteam_id = !empty($_POST['teamid']) ? $_POST['teamid'] : $_GET['teamid'];
+    $credit_only = !empty($_POST['creditonly']) ? $_POST['creditonly'] : $_GET['creditonly'];
+    $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
+    if (!$show_xml) {
+        // creditonly does not affect non xml output in BOINC
+        $credit_only = FALSE;
+    }
+    $xml = array();
 
-  if ($boincteam_id && is_numeric($boincteam_id)) {
+    if ($boincteam_id && is_numeric($boincteam_id)) {
     if ($credit_only) {
-      db_set_active('boinc_rw');
-      $result = db_query("
+        db_set_active('boinc_rw');
+        $result = db_query("
         SELECT
           u.id, u.name, u.cross_project_id, u.email_addr, u.total_credit, u.expavg_credit, u.expavg_time
         FROM {user} u
         WHERE u.teamid = %d and u.total_credit > 0",
         $boincteam_id
-      );
-      db_set_active('default');
+        );
+        db_set_active('default');
 
-      $xml = array('users' => array());
-      while ($member = db_fetch_object($result)) {
+        $xml = array('users' => array());
+        while ($member = db_fetch_object($result)) {
         $team_member = array(
-          'id' => $member->id,
-          'cpid' => md5($member->cross_project_id.$member->email_addr),
-          'name' => htmlspecialchars($member->name),
-          'total_credit' => round($member->total_credit),
-          'expavg_credit' => round($member->expavg_credit),
-          'expavg_time' => round($member->expavg_time),
+            'id' => $member->id,
+            'cpid' => md5($member->cross_project_id.$member->email_addr),
+            'name' => htmlspecialchars($member->name),
+            'total_credit' => round($member->total_credit),
+            'expavg_credit' => round($member->expavg_credit),
+            'expavg_time' => round($member->expavg_time),
         );
         $xml['users']['user'][] = $team_member;
-      }
+        }
     }
     else {
-      // Query BOINC database user table
-      db_set_active('boinc_rw');
-      $result = db_query("
+        // Query BOINC database user table
+        db_set_active('boinc_rw');
+        $result = db_query("
         SELECT
           u.id, u.name, u.cross_project_id, u.create_time, u.email_addr, u.total_credit, u.expavg_credit, u.expavg_time
         FROM {user} u
         WHERE u.teamid = %d ORDER BY u.email_addr ASC",
         $boincteam_id
-      );
-      db_set_active('default');
+        );
+        db_set_active('default');
 
-      // Extract information from BOINC database for team members.
-      $team_members = array();
-      while ($member = db_fetch_object($result)) {
+        // Extract information from BOINC database for team members.
+        $team_members = array();
+        while ($member = db_fetch_object($result)) {
         $team_members[$member->id] = array(
-          'id' => $member->id,
-          'cpid' => md5($member->cross_project_id.$member->email_addr),
-          'create_time' => $member->create_time,
-          'name' => htmlspecialchars($member->name),
-          'country' => NULL,
-          'total_credit' => round($member->total_credit),
-          'expavg_credit' => round($member->expavg_credit),
-          'expavg_time' => round($member->expavg_time),
-          'url' => NULL,
-          'has_profile' => 0,
+            'id' => $member->id,
+            'cpid' => md5($member->cross_project_id.$member->email_addr),
+            'create_time' => $member->create_time,
+            'name' => htmlspecialchars($member->name),
+            'country' => NULL,
+            'total_credit' => round($member->total_credit),
+            'expavg_credit' => round($member->expavg_credit),
+            'expavg_time' => round($member->expavg_time),
+            'url' => NULL,
+            'has_profile' => 0,
         );
-      }
+        }
 
-      // Query Drupal database, multiple tables
-      $sql1 = "
+        // Query Drupal database, multiple tables
+        $sql1 = "
          SELECT
            bu.boinc_id, du.uid, du.name, n.nid, n.type, n.field_country_value, n.field_url_value
          FROM {boincuser} AS bu
@@ -1307,28 +1307,28 @@ 
            INNER JOIN {content_type_profile} AS p ON node.nid=p.nid
            WHERE node.type='profile' ) n ON du.uid=n.uid
          WHERE bu.boinc_id IN (%s)";
-      $member_id_list = implode(',', array_keys($team_members));
-      if (!$member_id_list) {
+        $member_id_list = implode(',', array_keys($team_members));
+        if (!$member_id_list) {
         $member_id_list = '-1';
-      }
-      $result = db_query($sql1, $member_id_list);
-      while ($member = db_fetch_object($result)) {
+        }
+        $result = db_query($sql1, $member_id_list);
+        while ($member = db_fetch_object($result)) {
         $team_members[$member->boinc_id]['country'] = $member->field_country_value;
         $team_members[$member->boinc_id]['url'] = $member->field_url_value;
         $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1:  0;
         $xml['users']['user'][] = $team_members[$member->boinc_id];
-      }
+        }
     } // end if credit_only
-  }
-  else {
+    }
+    else {
     $xml = array(
-      'error' => array(
+        'error' => array(
         'error_num' => -136,
         'error_msg' => 'Not found',
-      ),
+        ),
     );
-  } // end if boincteam_id
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+    } // end if boincteam_id
+    print xml_to_text(array_to_xml($xml), TRUE, TRUE);
 }
 
 /**
@@ -1336,114 +1336,114 @@ 
  * Edit the forum preferences for a given user
  */
 function boinccore_edit_forum_preferences() {
-  // Do not pass through to BOINC in this case as BOINC forums are no longer
-  // relevant -- use Drupal data only
+    // Do not pass through to BOINC in this case as BOINC forums are no longer
+    // relevant -- use Drupal data only
 
-  $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : NULL);
+    $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : NULL);
 
-  require_boinc('boinc_db');
-  $boincuser = BoincUser::lookup_auth($account_key);
-  if ($boincuser) {
+    require_boinc('boinc_db');
+    $boincuser = BoincUser::lookup_auth($account_key);
+    if ($boincuser) {
     $uid = boincuser_lookup_uid($boincuser->id);
     if ($uid AND $account = user_load($uid)) {
-      // Currently supported preferences
-      $avatar_url = isset($_POST['avatar_url']) ? $_POST['avatar_url'] : (isset($_GET['avatar_url']) ? $_GET['avatar_url'] : NULL);
-      $hide_signatures = isset($_POST['forum_hide_signatures']) ? $_POST['forum_hide_signatures'] : (isset($_GET['forum_hide_signatures']) ? $_GET['forum_hide_signatures'] : NULL);
-      $signature = isset($_POST['signature']) ? $_POST['signature'] : (isset($_GET['signature']) ? $_GET['signature'] : NULL);
-      $post_order = isset($_POST['thread_sort']) ? $_POST['thread_sort'] : (isset($_GET['thread_sort']) ? $_GET['thread_sort'] : NULL);
-      // Update preferences as needed
-      if ($avatar_url) {
+        // Currently supported preferences
+        $avatar_url = isset($_POST['avatar_url']) ? $_POST['avatar_url'] : (isset($_GET['avatar_url']) ? $_GET['avatar_url'] : NULL);
+        $hide_signatures = isset($_POST['forum_hide_signatures']) ? $_POST['forum_hide_signatures'] : (isset($_GET['forum_hide_signatures']) ? $_GET['forum_hide_signatures'] : NULL);
+        $signature = isset($_POST['signature']) ? $_POST['signature'] : (isset($_GET['signature']) ? $_GET['signature'] : NULL);
+        $post_order = isset($_POST['thread_sort']) ? $_POST['thread_sort'] : (isset($_GET['thread_sort']) ? $_GET['thread_sort'] : NULL);
+        // Update preferences as needed
+        if ($avatar_url) {
         $avatar_image = file_get_contents($avatar_url);
         if ($avatar_image) {
-          $image_dir = 'profiles';
-          $image_path = "{$image_dir}/{$boincuser->id}_avatar.jpg";
-          $file = file_save_data($avatar_image, $image_path, FILE_EXISTS_REPLACE);
-          if ($file) {
+            $image_dir = 'profiles';
+            $image_path = "{$image_dir}/{$boincuser->id}_avatar.jpg";
+            $file = file_save_data($avatar_image, $image_path, FILE_EXISTS_REPLACE);
+            if ($file) {
             $profile = new stdClass();
             $profile->type = 'profile';
             $profile->language = NULL;
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
-              $profile_node = node_load($profile_nid);
-              if ($profile_node) {
+                $profile_node = node_load($profile_nid);
+                if ($profile_node) {
                 $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
                 if ($avatar_image) {
-                  $profile_node->field_image[0] = $avatar_image;
-                  node_save($profile_node);
+                    $profile_node->field_image[0] = $avatar_image;
+                    node_save($profile_node);
                 }
                 else {
-                  $error = 'Error saving avatar to profile';
+                    $error = 'Error saving avatar to profile';
                 }
-              }
-              else {
+                }
+                else {
                 $error = 'Unable to load user profile';
-              }
+                }
             }
             else {
-              $error = 'User has no profile, so avatar could not be added';
+                $error = 'User has no profile, so avatar could not be added';
+            }
             }
-          }
-          else {
+            else {
             $error = 'Unable to save remote image';
-          }
+            }
         }
         else {
-          $error = 'Could not find avatar image at URL';
+            $error = 'Could not find avatar image at URL';
         }
-      }
-      if ($hide_signatures !== NULL) {
+        }
+        if ($hide_signatures !== NULL) {
         user_save($account, array('hide_signatures' => ($hide_signatures ? 1 : 0)));
-      }
-      if ($signature !== NULL) {
+        }
+        if ($signature !== NULL) {
         $signature = check_markup($signature);
         user_save($account, array('signature' => $signature));
-      }
-      if ($post_order) {
+        }
+        if ($post_order) {
         require_boinc('forum');
         $post_order_map = array(
-          CREATE_TIME_OLD => 2,
-          CREATE_TIME_NEW => 1,
+            CREATE_TIME_OLD => 2,
+            CREATE_TIME_NEW => 1,
         );
         $drupal_post_order = isset($post_order_map[$post_order]) ? $post_order_map[$post_order] : 2;
         user_save($account, array('sort' => $drupal_post_order));
-      }
-      if (!$error) {
+        }
+        if (!$error) {
         // Success
         $xml = array(
-          'edit_forum_preferences' => array(
+            'edit_forum_preferences' => array(
             'success' => NULL,
-          ),
+            ),
         );
-      }
-      else {
+        }
+        else {
         // Failure
         $xml = array(
-          'error' => array(
+            'error' => array(
             'error_num' => -1,
             'error_msg' => $error,
-          ),
+            ),
         );
-      }
+        }
     }
     else {
-      // Drupal user not found
-      $xml = array(
+        // Drupal user not found
+        $xml = array(
         'error' => array(
-          'error_num' => -1,
-          'error_msg' => 'Unknown error',
+            'error_num' => -1,
+            'error_msg' => 'Unknown error',
         ),
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     // BOINC user not found
     $xml = array(
-      'error' => array(
+        'error' => array(
         'error_num' => -136,
         'error_msg' => 'Not found',
-      ),
+        ),
     );
-  }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+    }
+    print xml_to_text(array_to_xml($xml), TRUE, TRUE);
 }
 
 /**
@@ -1451,14 +1451,14 @@ 
  * Get the last comments OR threads made by a given user
  */
 function boinccore_forum_get_data() {
-  // Do not pass through to BOINC in this case as BOINC forums are no longer
-  // relevant -- use Drupal data only
+    // Do not pass through to BOINC in this case as BOINC forums are no longer
+    // relevant -- use Drupal data only
 
-  $xml = array();
-  $boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : NULL);
-  $uid = boincuser_lookup_uid($boinc_id);
+    $xml = array();
+    $boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : NULL);
+    $uid = boincuser_lookup_uid($boinc_id);
 
-  if ($uid) {
+    if ($uid) {
     $method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : NULL);
     $count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : NULL);
     if (!$count) $count = 10;
@@ -1466,7 +1466,7 @@ 
     switch ($method) {
     case 'user_posts':
       $content_length = !empty($_POST['content_length']) ? $_POST['content_length'] : (!empty($_GET['content_length']) ? $_GET['content_length'] : NULL);
-      $posts = db_query("
+        $posts = db_query("
         SELECT
           c.cid,
           n.nid,
@@ -1480,26 +1480,26 @@ 
         ORDER BY timestamp DESC
         LIMIT %d",
         $uid, (int) $count
-      );
-      $xml = array(
+        );
+        $xml = array(
         'rpc_response' => array(
-          'count' => 0,
-          'posts' => array(),
+            'count' => 0,
+            'posts' => array(),
         ),
-      );
-      $post_count = 0;
-      while ($post = db_fetch_object($posts)) {
+        );
+        $post_count = 0;
+        while ($post = db_fetch_object($posts)) {
         $xml['rpc_response']['posts']['post'][] = array(
-          'id' => $post->cid,
-          'threadid' => $post->nid,
-          'threadtitle' => $post->title,
-          'timestamp' => $post->timestamp,
-          'content' => ($content_length ? substr($post->comment, 0, $content_length) : $post->comment),
+            'id' => $post->cid,
+            'threadid' => $post->nid,
+            'threadtitle' => $post->title,
+            'timestamp' => $post->timestamp,
+            'content' => ($content_length ? substr($post->comment, 0, $content_length) : $post->comment),
         );
         $post_count++;
-      }
-      $xml['rpc_response']['count'] = $post_count;
-      break;
+        }
+        $xml['rpc_response']['count'] = $post_count;
+        break;
 
     case 'user_threads':
       $threads = db_query("
@@ -1523,45 +1523,45 @@ 
         ORDER BY changed DESC
         LIMIT %d",
         $uid, (int) $count
-      );
-      $xml = array(
+        );
+        $xml = array(
         'rpc_response' => array(
-          'count' => 0,
-          'threads' => array(),
+            'count' => 0,
+            'threads' => array(),
         ),
-      );
-      $thread_count = 0;
-      while ($thread = db_fetch_object($threads)) {
+        );
+        $thread_count = 0;
+        while ($thread = db_fetch_object($threads)) {
         $xml['rpc_response']['threads']['thread'][] = array(
-          'id' => $thread->nid,
-          'forumid' => $thread->tid,
-          'replies' => $thread->replies,
-          'views' => $thread->views,
-          'timestamp' => $thread->changed,
-          'title' => $thread->title,
+            'id' => $thread->nid,
+            'forumid' => $thread->tid,
+            'replies' => $thread->replies,
+            'views' => $thread->views,
+            'timestamp' => $thread->changed,
+            'title' => $thread->title,
         );
         $thread_count++;
-      }
-      $xml['rpc_response']['count'] = $thread_count;
-      break;
+        }
+        $xml['rpc_response']['count'] = $thread_count;
+        break;
     default:
       $xml = array(
         'error' => array(
-          'error_num' => -1,
-          'error_msg' => 'Unknown error',
+            'error_num' => -1,
+            'error_msg' => 'Unknown error',
         ),
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     $xml = array(
-      'error' => array(
+        'error' => array(
         'error_num' => -136,
         'error_msg' => 'Not found',
-      ),
+        ),
     );
-  }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+    }
+    print xml_to_text(array_to_xml($xml), TRUE, TRUE);
 }
 
 /**
@@ -1569,9 +1569,9 @@ 
  * Get information on applications in the system
  */
 function boinccore_apps() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  include_boinc('user/apps.php');
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    include_boinc('user/apps.php');
 }
 
 /**
@@ -1581,147 +1581,147 @@ 
  * controller function, which can compute the page based on the user's settings
  */
 function boinccore_url_pagination_handler($type, $object_id = NULL) {
-  global $user;
-  $path = NULL;
-  $params = array();
-  switch ($type) {
-  case 'boinc-forum':
+    global $user;
+    $path = NULL;
+    $params = array();
+    switch ($type) {
+    case 'boinc-forum':
     // Redirect requests to a BOINC forum to the Drupal forum
     $forum_id = db_result(db_query('
       SELECT tid
       FROM {boincimport_temp_forum}
       WHERE forum_id = %d',
-      $object_id
+        $object_id
     ));
     if ($forum_id) {
-      drupal_goto("community/forum/{$forum_id}");
+        drupal_goto("community/forum/{$forum_id}");
     }
     break;
-  case 'boinc-forum-index':
+    case 'boinc-forum-index':
     // Redirect requests to the top level BOINC forum to Drupal forums
     drupal_goto("community/forum");
     break;
-  case 'boinc-forum-post':
+    case 'boinc-forum-post':
     // Redirect requests to a BOINC forum post to the Drupal comment
     $cid = db_result(db_query('
       SELECT cid
       FROM {boincimport_temp_post}
       WHERE post_id = %d',
-      $object_id
+        $object_id
     ));
     if ($cid) {
-      drupal_goto("goto/comment/{$cid}");
+        drupal_goto("goto/comment/{$cid}");
     }
     break;
-  case 'boinc-forum-topic':
+    case 'boinc-forum-topic':
     // Redirect requests to a BOINC forum topic to the Drupal node
     $nid = db_result(db_query('
       SELECT nid
       FROM {boincimport_temp_topic}
       WHERE topic_id = %d',
-      $object_id
+        $object_id
     ));
     if ($nid) {
-      drupal_goto("node/{$nid}");
+        drupal_goto("node/{$nid}");
     }
     break;
-  case 'boinc-host':
+    case 'boinc-host':
     // Redirect requests to BOINC host details to the host page in Drupal
     drupal_goto("host/{$object_id}");
     break;
-  case 'boinc-hosts-user':
+    case 'boinc-hosts-user':
     // Redirect requests to a BOINC user host list to the host list in Drupal
     $uid = boincuser_lookup_uid($object_id);
     if ($uid) {
-      drupal_goto("account/{$uid}/computers");
+        drupal_goto("account/{$uid}/computers");
     }
     break;
-  case 'boinc-result':
+    case 'boinc-result':
     // Redirect requests to BOINC task details to the task page in Drupal
     drupal_goto("task/{$object_id}");
-  case 'boinc-results-host':
+    case 'boinc-results-host':
     // Redirect requests to BOINC tasks by host to the host task page in Drupal
     drupal_goto("host/{$object_id}/tasks");
     break;
-  case 'boinc-results-user':
+    case 'boinc-results-user':
     // Redirect requests to a BOINC user's tasks to the Drupal account tasks
     drupal_goto("account/tasks");
     break;
-  case 'boinc-user':
+    case 'boinc-user':
     // Redirect requests to a BOINC user ID to the Drupal profile
     $uid = boincuser_lookup_uid($object_id);
     if ($uid) {
-      drupal_goto("account/{$uid}");
+        drupal_goto("account/{$uid}");
     }
     break;
-  case 'boinc-workunit':
+    case 'boinc-workunit':
     // Redirect requests to BOINC workunits to the workunit page in Drupal
     drupal_goto("workunit/{$object_id}");
     break;
-  case 'comment':
+    case 'comment':
     $object = _comment_load($object_id);
     if ($object) {
-      $path = "node/{$object->nid}";
-      // Get the sort order
-      $gt_lt = '<';
-      $comment_order = (isset($user->sort)) ? $user->sort : variable_get('comment_default_order_forum', 2);
-      if ($comment_order == COMMENT_ORDER_NEWEST_FIRST) {
+        $path = "node/{$object->nid}";
+        // Get the sort order
+        $gt_lt = '<';
+        $comment_order = (isset($user->sort)) ? $user->sort : variable_get('comment_default_order_forum', 2);
+        if ($comment_order == COMMENT_ORDER_NEWEST_FIRST) {
         $gt_lt = '>';
-      }
-      // don't filter hidden comments for admins/mods
-      $include_hidden = '';
-      if (in_array('administrator', array_values($user->roles)) ||
+        }
+        // don't filter hidden comments for admins/mods
+        $include_hidden = '';
+        if (in_array('administrator', array_values($user->roles)) ||
           in_array('moderator', array_values($user->roles))) {
         $include_hidden = 'OR status = 1';
-      }
-      // See how many comments there are before (or after) this comment...
-      $comment_offset = db_result(db_query('
+        }
+        // See how many comments there are before (or after) this comment...
+        $comment_offset = db_result(db_query('
         SELECT COUNT(*) FROM {comments}
         WHERE nid = %d AND (status = 0 %s) AND timestamp %s %d',
         $object->nid, $include_hidden, $gt_lt, $object->timestamp));
-      if ($comment_offset) {
+        if ($comment_offset) {
         // Get the number of comments per page
         if ($user->comments_per_page) {
-          $comments_per_page = $user->comments_per_page;
+            $comments_per_page = $user->comments_per_page;
         }
         else {
-          $node = node_load($object->nid);
-          $comments_per_page = variable_get(
+            $node = node_load($object->nid);
+            $comments_per_page = variable_get(
             "comment_default_per_page_{$node->type}", 50
-          );
+            );
         }
         // Determine which page to display in order to show the given comment
         $page = floor($comment_offset / $comments_per_page);
         if ($page) {
-          $params = array('page' => $page);
+            $params = array('page' => $page);
+        }
         }
-      }
     }
     if ($path) {
-      drupal_goto($path, $params, "comment-{$object->cid}");
+        drupal_goto($path, $params, "comment-{$object->cid}");
     }
     break;
-  case 'friend-requests':
+    case 'friend-requests':
     // Check for a login, then redirect to the user's friend requests page
     if ($user->uid) {
-      drupal_goto("account/{$user->uid}/friends/pending");
+        drupal_goto("account/{$user->uid}/friends/pending");
     }
     else {
-      drupal_goto('user/login', array(
+        drupal_goto('user/login', array(
         'destination' => 'goto/friend-requests'
-      ));
+        ));
     }
     break;
-  default:
+    default:
   }
-  drupal_not_found();
+    drupal_not_found();
 }
 
 /*
  * Fetch an array of all countries
  */
 function boinccore_get_country_list() {
-  return array(
+    return array(
     'None' => 'None',
     'International' => 'International',
     'Afghanistan' => 'Afghanistan',
@@ -1955,7 +1955,7 @@ 
     'Yemen' => 'Yemen',
     'Zambia' => 'Zambia',
     'Zimbabwe' => 'Zimbabwe',
-  );
+    );
 }
 
 
@@ -1967,46 +1967,46 @@ 
  * Action: Mark node for moderation
  */
 function boinccore_rules_action_mark_content_for_moderation($node) {
-  $node->moderate = 1;
-  return array('node' => $node);
+    $node->moderate = 1;
+    return array('node' => $node);
 }
 
 /**
  * Action: Send mail to moderators.
  */
 function boinccore_rules_action_mail_to_moderators($settings) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  $mailing_list = variable_get('boinc_moderator_mailing_list', '');
-  $force_individual_notifications = variable_get('boinc_moderator_force_individual_notifications', 0);
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    $mailing_list = variable_get('boinc_moderator_mailing_list', '');
+    $force_individual_notifications = variable_get('boinc_moderator_force_individual_notifications', 0);
 
-  if (!$mailing_list OR $force_individual_notifications) {
+    if (!$mailing_list OR $force_individual_notifications) {
     // Send individual emails to all moderators
     $roles = user_roles();
     $moderator_rid = array_search('moderator', $roles);
     if ($moderator_rid !== FALSE) {
-      $settings['recipients'] = array($moderator_rid);
-      rules_action_mail_to_users_of_role($settings);
+        $settings['recipients'] = array($moderator_rid);
+        rules_action_mail_to_users_of_role($settings);
     }
     else {
-      watchdog(
+        watchdog(
         'boinccore',
         'Unable to identify members of the moderator role to send moderator notifications!',
         array(),
         WATCHDOG_ERROR
-      );
+        );
     }
-  }
-  if ($mailing_list) {
+    }
+    if ($mailing_list) {
     $settings['to'] = $mailing_list;
     rules_action_mail($settings);
-  }
+    }
 }
 /**
  * Action "Send mail to moderators" configuration form
  */
 function boinccore_rules_action_mail_to_moderators_form($settings = array(), &$form) {
-  // Select only non-anonymous user roles because anonymous users won't have emails.
-  rules_action_mail_to_user_form($settings, $form);
+    // Select only non-anonymous user roles because anonymous users won't have emails.
+    rules_action_mail_to_user_form($settings, $form);
 }
 
 
@@ -2014,27 +2014,27 @@ 
  * Action: Send mail to admins.
  */
 function boinccore_rules_action_mail_to_admins($settings) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  $mailing_list = variable_get('boinc_admin_mailing_list', '');
-  if (empty($mailing_list)) {
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    $mailing_list = variable_get('boinc_admin_mailing_list', '');
+    if (empty($mailing_list)) {
     $mailing_list = variable_get('site_mail', '');
     if (empty($mailing_list)) {
-      watchdog('boinccore',
+        watchdog('boinccore',
         'Attempting to email administrators, but there is no admin email list or site email to send to.', array(),
         WATCHDOG_ERROR
-      );
-      return FALSE;
+        );
+        return FALSE;
     }
-  }
-  $settings['to'] = $mailing_list;
-  rules_action_mail($settings);
+    }
+    $settings['to'] = $mailing_list;
+    rules_action_mail($settings);
 }
 
 /**
  * Action "Send mail to admins" configuration form
  */
 function boinccore_rules_action_mail_to_admins_form($settings = array(), &$form) {
-  rules_action_mail_to_user_form($settings, $form);
+    rules_action_mail_to_user_form($settings, $form);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -2045,33 +2045,33 @@ 
  * BOINC wrapper for string translation
  */
 function bts($string, $args = array(), $langcode = NULL, $context = 'boinc: ', $update = TRUE) {
-  if (function_exists('i18nstrings_ts')) {
+    if (function_exists('i18nstrings_ts')) {
     $string = i18nstrings_ts($context, $string, $langcode, $update);
-  }
-  if (empty($args)) {
+    }
+    if (empty($args)) {
     return $string;
-  }
-  else {
+    }
+    else {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
-      switch ($key [0]) {
+        switch ($key [0]) {
         case '@':
           // Escaped only.
           $args [$key] = check_plain($value);
-          break;
+            break;
 
         case '%':
         default:
           // Escaped and placeholder.
           $args [$key] = theme('placeholder', $value);
-          break;
+            break;
 
         case '!':
           // Pass-through.
       }
     }
     return strtr($string, $args);
-  }
+    }
 }
 
 
@@ -2083,9 +2083,9 @@ 
  * Overview of moderation queues
  */
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
-  $output .= '<ul class="tab-list action-list">';
-  if (module_exists('user_profiles')) {
+    $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
+    $output .= '<ul class="tab-list action-list">';
+    if (module_exists('user_profiles')) {
     $profile_count = db_result(db_query("
       SELECT COUNT(DISTINCT(n.nid))
       FROM {node} n
@@ -2097,9 +2097,9 @@ 
     $output .= '<span class="item-count">' . $profile_count . '</span>';
     $output .= '</div>';
     $output .= '</li>';
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 
@@ -2109,10 +2109,10 @@ 
  *
  */
 function  _boinccore_delete_expired_tokens() {
-  require_boinc('boinc_db');
+    require_boinc('boinc_db');
 
-  $num_deleted = BoincToken::delete_expired();
-  if ($num_deleted>0) {
+    $num_deleted = BoincToken::delete_expired();
+    if ($num_deleted>0) {
     watchdog('boinccore', "Deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
-  }
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -311,8 +311,8 @@ 
         // RFC2616 mandates that the decimal part is no more than three digits,
         // so we multiply the qvalue by 1000 to avoid floating point comparisons.
         $langcode = strtolower($match[1]);
-        $qvalue = isset($match[2]) ? (float) $match[2] : 1;
-        $browser_langcodes[$langcode] = (int) ($qvalue * 1000);
+        $qvalue = isset($match[2]) ? (float)$match[2] : 1;
+        $browser_langcodes[$langcode] = (int)($qvalue*1000);
       }
     }
 
@@ -377,7 +377,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;
     $settings = array(
       'from' => '',
       'subject' => "Content at {$site_name} is awaiting moderation",
@@ -437,11 +437,11 @@ 
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
-        $user_info .= '<img src="' . $user_image . '"/>';
+        $user_info .= '<img src="'.$user_image.'"/>';
       }
       $user_info .= '  </div>';
     }
-    $user_info .= '  <div class="name">' . theme('username', $account) . '</div>';
+    $user_info .= '  <div class="name">'.theme('username', $account).'</div>';
     if ($account->uid) {
       //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
       //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
@@ -505,7 +505,7 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url).'</li>',
       '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -525,7 +525,7 @@ 
     $node = node_load($form['nid']['#value']);
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if ($node->type == 'forum') {
         if (module_exists('captcha')) {
           $form['comment_captcha'] = array(
@@ -570,7 +570,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'), "community/forum/{$forum_id}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -581,7 +581,7 @@ 
     // Add captcha for role='community member'
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if (module_exists('captcha')) {
         $form['comment_captcha'] = array(
           '#type' => 'captcha',
@@ -673,8 +673,8 @@ 
 function boinccore_link($type, $object, $teaser = FALSE) {
   // Add custom links with this hook
 
-  if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+  if ($type == 'node') {
+    if (($object->type == 'forum') OR ($object->type == 'team_forum')) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
@@ -735,7 +735,7 @@ 
       }// if user_access('edit any forum topic')
     }
   }
-  else if ($type=='comment') {
+  else if ($type == 'comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -757,7 +757,7 @@ 
     if (user_access('administer comments')) {
       $comment_control = "comment_control/{$cid}";
       // Add link to convert comment into a new topic
-      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
+      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid));
       if ($reply_count == 0) {
         $links['convert'] = array(
             'title' => bts('Convert', array(), NULL, 'boinc:forum-convert-comment-to-topic'),
@@ -802,7 +802,7 @@ 
   */
   $message['headers']['Content-Transfer-Encoding'] = 'Quoted-Printable';
   if (is_array($message['body'])) {
-    $message['body'] = array_map( "quoted_printable_encode", $message['body'] );
+    $message['body'] = array_map("quoted_printable_encode", $message['body']);
   } else {
     $message['body'] = quoted_printable_encode($message['body']);
   }
@@ -853,7 +853,7 @@ 
   // If hiding a forum topic (node) and not an administrator, go to
   // the forum page. Otherwise the user will reach an access-denied
   // page.
-  if (($action=="hide") and (!user_access('administer forums'))) {
+  if (($action == "hide") and (!user_access('administer forums'))) {
     drupal_goto("community/forum/{$node->tid}");
   }
   drupal_goto("node/{$nid}");
@@ -895,8 +895,8 @@ 
     $node->created = $comment->timestamp;
     $node->changed = $node->created;
     $node->promote = 0; // Display on front page?
-    $node->sticky = 0;  // Display top of page?
-    $node->status = 1;   // Published?
+    $node->sticky = 0; // Display top of page?
+    $node->status = 1; // Published?
     $node->comment = 2;
     //$node->language = 'en';
     $node->uid = $comment->uid;
@@ -981,16 +981,16 @@ 
     $xml->loadXML($global_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $global_prefs);
-      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
-      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   if (!$errors) {
@@ -1033,8 +1033,8 @@ 
     $xml = array(
       'error' => array(
         'error_num' => -112,
-        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1])
+        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1])
       ),
     );
   }
@@ -1142,10 +1142,10 @@ 
           'teaser' => $teaser,
           'uid' => $team_owner_uid,
           'path' => null,
-          'status' => 1,  // published or not - always publish
+          'status' => 1, // published or not - always publish
           'promote' => 0,
           'created' => $created_time,
-          'comment' => 0,  // comments disabled
+          'comment' => 0, // comments disabled
           'moderate' => 0,
           'sticky' => 0,
           'format' => $input_format
@@ -1156,7 +1156,7 @@ 
           module_load_include('inc', 'pathauto', 'pathauto');
           $node['path'] = pathauto_cleanstring($values['name']);
 
-          $node = (object) $node; // node_save requires an object form
+          $node = (object)$node; // node_save requires an object form
           $team_categories = taxonomy_get_term_by_name($values['type']);
           $node->taxonomy[] = $team_categories[0];
 
@@ -1315,7 +1315,7 @@ 
       while ($member = db_fetch_object($result)) {
         $team_members[$member->boinc_id]['country'] = $member->field_country_value;
         $team_members[$member->boinc_id]['url'] = $member->field_url_value;
-        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1:  0;
+        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1 : 0;
         $xml['users']['user'][] = $team_members[$member->boinc_id];
       }
     } // end if credit_only
@@ -1365,7 +1365,7 @@ 
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path().'/'.$image_path, 'field_image', 'profile', TRUE);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1479,7 +1479,7 @@ 
         WHERE (n.status = 1) AND (c.uid = '%d')
         ORDER BY timestamp DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1522,7 +1522,7 @@ 
         WHERE (n.status = 1) AND (n.uid = '%d')
         ORDER BY changed DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1691,7 +1691,7 @@ 
           );
         }
         // Determine which page to display in order to show the given comment
-        $page = floor($comment_offset / $comments_per_page);
+        $page = floor($comment_offset/$comments_per_page);
         if ($page) {
           $params = array('page' => $page);
         }
@@ -2083,7 +2083,7 @@ 
  * Overview of moderation queues
  */
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
+  $output = '<h2 class="pane-title">'.bts('Moderation', array(), NULL, 'boinc:moderate-profiles').'</h2>';
   $output .= '<ul class="tab-list action-list">';
   if (module_exists('user_profiles')) {
     $profile_count = db_result(db_query("
@@ -2094,7 +2094,7 @@ 
     $output .= '<li class="tab primary">';
     $output .= l(bts('Unvetted profiles', array(), NULL, 'boinc:moderate-profiles'), 'moderate/profiles');
     $output .= '<div class="item-count-wrapper">';
-    $output .= '<span class="item-count">' . $profile_count . '</span>';
+    $output .= '<span class="item-count">'.$profile_count.'</span>';
     $output .= '</div>';
     $output .= '</li>';
   }
@@ -2112,7 +2112,7 @@ 
   require_boinc('boinc_db');
 
   $num_deleted = BoincToken::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boinccore', "Deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
   }
 }

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

@@ -69,84 +69,84 @@ 
     'title' => 'Look up account RPC',
     'description' => 'RPC for getting the authenticator for a user account.',
     'page callback' => 'boinccore_lookup_account',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['am_get_info.php'] = array(
     'title' => 'Account manager get info RPC',
     'description' => 'RPC for getting assorted details of a user account.',
     'page callback' => 'boinccore_am_get_info',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['am_set_info.php'] = array(
     'title' => 'Account manager set info RPC',
     'description' => 'RPC for updating assorted details of a user account.',
     'page callback' => 'boinccore_am_set_info',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['am_set_host_info.php'] = array(
     'title' => 'Account manager set host info RPC',
     'description' => 'RPC for updating the venue for a given host.',
     'page callback' => 'boinccore_am_set_host_info',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['show_user.php'] = array(
     'title' => 'Show user RPC',
     'description' => 'RPC for getting assorted details of a user account.',
     'page callback' => 'boinccore_show_user',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['pending.php'] = array(
     'title' => 'Pending credit RPC',
     'description' => 'RPC for getting pending credit for a given account.',
     'page callback' => 'boinccore_pending_credit',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['create_team.php'] = array(
     'title' => 'Create team RPC',
     'description' => 'RPC for creating a new team.',
     'page callback' => 'boinccore_create_team',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['team_lookup.php'] = array(
     'title' => 'Team lookup RPC',
     'description' => 'RPC for getting info on a team or matching teams.',
     'page callback' => 'boinccore_team_lookup',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['team_email_list.php'] = array(
     'title' => 'Get team member list RPC',
     'description' => 'RPC for getting a list of members of a given team.',
     'page callback' => 'boinccore_team_email_list',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['edit_forum_preferences_action.php'] = array(
     'title' => 'Forum preferences RPC',
     'description' => 'RPC for setting forum preferences for a given user.',
     'page callback' => 'boinccore_edit_forum_preferences',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['forum_get_data.php'] = array(
     'title' => 'Forum get data RPC',
     'description' => 'RPC for getting recent forum activity for a given user.',
     'page callback' => 'boinccore_forum_get_data',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['apps.php'] = array(
     'title' => 'Apps RPC',
     'description' => 'RPC for getting the applications in the system.',
     'page callback' => 'boinccore_apps',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
 
@@ -158,7 +158,7 @@ 
  */
 function boinccore_menu_alter(&$items) {
   // If using Solr search and not core Drupal search, disable core search!
-  if (module_exists('global_search_solr') AND !module_exists('global_search')) {
+  if (module_exists('global_search_solr') and !module_exists('global_search')) {
     // Add permission to user search.
     $check = array(
       'search/node/%menu_tail',
@@ -167,7 +167,7 @@ 
     );
     foreach ($check as $path) {
       if (isset($items[$path])) {
-        $items[$path]['access callback'] = FALSE;
+        $items[$path]['access callback'] = false;
       }
     }
   }
@@ -197,7 +197,7 @@ 
     );
     foreach ($check as $path) {
       if (isset($items[$path])) {
-        $items[$path]['access callback'] = FALSE;
+        $items[$path]['access callback'] = false;
       }
     }
 
@@ -215,7 +215,7 @@ 
     );
     foreach ($check as $path) {
       if (isset($items[$path])) {
-        $items[$path]['access callback'] = FALSE;
+        $items[$path]['access callback'] = false;
       }
     }
   }
@@ -273,7 +273,7 @@ 
       // Since we are in a hook_boot() implementation cache mode is normal, so
       // we can safely call hook_exit().
       bootstrap_invoke_all('exit');
-      header("Location: $url", TRUE, $code);
+      header("Location: $url", true, $code);
       exit;
     }
   }
@@ -291,7 +291,7 @@ 
  */
   function locale_language_from_browser() {
     if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-      return FALSE;
+      return false;
     }
 
     $languages = language_list('enabled');
@@ -334,7 +334,7 @@ 
     // Find the enabled language with the greatest qvalue, following the rules
     // of RFC 2616 (section 14.4). If several languages have the same qvalue,
     // prefer the one with the greatest weight.
-    $best_match_language = FALSE;
+    $best_match_language = false;
     $max_qvalue = 0;
     foreach ($languages as $langcode => $language) {
       // Language tags are case insensitive (RFC2616, sec 3.10).
@@ -373,7 +373,7 @@ 
   // Notify moderators if there is site content that requires moderator action
   $items_in_queue = boincuser_moderation_queue_count('cron');
   $last_notification = variable_get('boinccore_last_content_moderation_reminder', 0);
-  if ($items_in_queue AND $last_notification < time() - 24*60*60) {
+  if ($items_in_queue and $last_notification < time() - 24*60*60) {
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
@@ -433,7 +433,7 @@ 
     $user_info = '<div class="user">';
     if ($user_image) {
       $user_info .= '  <div class="picture">';
-      if (is_array($user_image) AND $user_image['image']['filepath']) {
+      if (is_array($user_image) and $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
@@ -463,13 +463,13 @@ 
 
     module_load_include('inc', 'bbcode', 'bbcode-help');
     $form['bbcode_help'] = array(
-      '#title' => bts('BBcode help', array(), NULL, 'boinc:help-with-user-input-with-BBCode'),
+      '#title' => bts('BBcode help', array(), null, 'boinc:help-with-user-input-with-BBCode'),
       '#type' => 'fieldset',
       '#attributes' => array(
         'class' => 'bbcode_help',
       ),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
       'content' => array(
         '#value' => _bbcode_filter_tip(),
       ),
@@ -491,7 +491,7 @@ 
     $form['buttons']['submit'] = $form['submit'];
     unset($form['submit']);
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Post comment', array(), NULL, 'boinc:post-forum-comment');
+    $form['buttons']['submit']['#value'] = bts('Post comment', array(), null, 'boinc:post-forum-comment');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     // We want all these buttons together under the "buttons" array, but the
@@ -505,7 +505,7 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $cancel_url) . '</li>',
       '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -535,7 +535,7 @@ 
         }
       }
       else {
-        $form = NULL;
+        $form = null;
         $form['from'] = array(
           '#type'  => 'item',
           '#value' => 'You do not have permission to post comments in this forum.',
@@ -560,7 +560,7 @@ 
       '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Post topic', array(), NULL, 'boinc:post-forum-comment');
+    $form['buttons']['submit']['#value'] = bts('Post topic', array(), null, 'boinc:post-forum-comment');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['preview']['#prefix'] = '<li class="tab">';
@@ -570,7 +570,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'), "community/forum/{$forum_id}") . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "community/forum/{$forum_id}") . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -608,7 +608,7 @@ 
 /**
  * Implementation of hook_link_alter()
  */
-function boinccore_link_alter(&$links, $node, $comment = NULL) {
+function boinccore_link_alter(&$links, $node, $comment = null) {
   //echo '<pre>' . print_r($links, true) . '</pre>';
   foreach ($links as $module => $link) {
     // Remove the ignore user link
@@ -620,15 +620,15 @@ 
   if (!($comment)) {
     // modify the comment_add link
     if (isset($links['comment_add'])) {
-      $links['comment_add']['title'] = bts('reply', array(), NULL, 'boinc:forum-reply-to-comment');
+      $links['comment_add']['title'] = bts('reply', array(), null, 'boinc:forum-reply-to-comment');
       $links['comment_add']['attributes'] = array(
-          'title' => bts('Reply to this comment', array(), NULL, 'boinc:forum-reply-to-comment')
+          'title' => bts('Reply to this comment', array(), null, 'boinc:forum-reply-to-comment')
       );
     }
     // modify quote link
     if (isset($links['quote'])) {
       $links['quote']['attributes'] = array(
-          'title' => bts('Reply to this topic with a quote', array(), NULL, 'boinc:forum-reply-to-comment')
+          'title' => bts('Reply to this topic with a quote', array(), null, 'boinc:forum-reply-to-comment')
       );
     }
   }
@@ -636,17 +636,17 @@ 
     // Standard EDIT, DELETE, and REPLY links are created by Drupal, but we want to alter them
     if (isset($links['comment_delete'])) {
       $links['comment_delete']['attributes'] = array(
-          'title' => bts('Delete this comment', array(), NULL, 'boinc:forum-delete-comment')
+          'title' => bts('Delete this comment', array(), null, 'boinc:forum-delete-comment')
       );
     }
     if (isset($links['comment_edit'])) {
       $links['comment_edit']['attributes'] = array(
-          'title' => bts('Edit this comment', array(), NULL, 'boinc:forum-edit-comment')
+          'title' => bts('Edit this comment', array(), null, 'boinc:forum-edit-comment')
       );
     }
     if (isset($links['comment_reply'])) {
       $links['comment_reply']['attributes'] = array(
-          'title' => bts('Reply to this comment', array(), NULL, 'boinc:forum-reply-to-comment')
+          'title' => bts('Reply to this comment', array(), null, 'boinc:forum-reply-to-comment')
       );
     }
   }// if !$comment
@@ -655,13 +655,13 @@ 
 /**
  * Implementation of hook_locale().
  */
-function boinccore_locale($op = 'groups', $group = NULL) {
+function boinccore_locale($op = 'groups', $group = null) {
   switch ($op) {
     case 'groups':
         return array('boinc' => 'BOINC');
     case 'info':
       //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
-      $info['boinc']['format'] = FALSE;
+      $info['boinc']['format'] = false;
       return $info;
   }
 }
@@ -670,65 +670,65 @@ 
 /**
  * Implementation of hook_link()
  */
-function boinccore_link($type, $object, $teaser = FALSE) {
+function boinccore_link($type, $object, $teaser = false) {
   // Add custom links with this hook
 
   if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+    if ( ($object->type=='forum') or ($object->type=='team_forum') ) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
         if ($object->sticky) {
           $links['make_unsticky'] = array(
-              'title' => bts('Make unsticky', array(), NULL, 'boinc:forum-unsticky-comment'),
+              'title' => bts('Make unsticky', array(), null, 'boinc:forum-unsticky-comment'),
               'href' => "{$node_control}/unsticky",
               'attributes' => array(
-                  'title' => bts('Remove sticky status from this topic', array(), NULL, 'boinc:forum-unsticky-comment')
+                  'title' => bts('Remove sticky status from this topic', array(), null, 'boinc:forum-unsticky-comment')
               )
           );
         }
         else {
           $links['make_sticky'] = array(
-              'title' => bts('Make sticky', array(), NULL, 'boinc:forum-sticky-comment'),
+              'title' => bts('Make sticky', array(), null, 'boinc:forum-sticky-comment'),
               'href' => "{$node_control}/sticky",
               'attributes' => array(
-                  'title' => bts('Make this topic sticky', array(), NULL, 'boinc:forum-sticky-comment')
+                  'title' => bts('Make this topic sticky', array(), null, 'boinc:forum-sticky-comment')
               )
           );
         }
         if ($object->comment == COMMENT_NODE_READ_WRITE) {
           $links['lock'] = array(
-              'title' => bts('Lock', array(), NULL, 'boinc:forum-lock-comment'),
+              'title' => bts('Lock', array(), null, 'boinc:forum-lock-comment'),
               'href' => "{$node_control}/lock",
               'attributes' => array(
-                  'title' => bts('Lock this thread for comments', array(), NULL, 'boinc:forum-lock-comment')
+                  'title' => bts('Lock this thread for comments', array(), null, 'boinc:forum-lock-comment')
               )
           );
         }
         else {
           $links['unlock'] = array(
-              'title' => bts('Unlock', array(), NULL, 'boinc:forum-unlock-comment'),
+              'title' => bts('Unlock', array(), null, 'boinc:forum-unlock-comment'),
               'href' => "{$node_control}/unlock",
               'attributes' => array(
-                  'title' => bts('Unlock this thread for comments', array(), NULL, 'boinc:forum-unlock-comment')
+                  'title' => bts('Unlock this thread for comments', array(), null, 'boinc:forum-unlock-comment')
               )
           );
         }
         if ($object->status) {
           $links['hide'] = array(
-              'title' => bts('Hide', array(), NULL, 'boinc:forum-hide-comment'),
+              'title' => bts('Hide', array(), null, 'boinc:forum-hide-comment'),
               'href' => "{$node_control}/hide",
               'attributes' => array(
-                  'title' => bts('Hide this topic', array(), NULL, 'boinc:forum-hide-comment')
+                  'title' => bts('Hide this topic', array(), null, 'boinc:forum-hide-comment')
               )
           );
         }
         else {
           $links['unhide'] = array(
-              'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
+              'title' => bts('Unhide', array(), null, 'boinc:forum-unhide-comment'),
               'href' => "{$node_control}/unhide",
               'attributes' => array(
-                  'title' => bts('Unhide this topic', array(), NULL, 'boinc:forum-unhide-comment')
+                  'title' => bts('Unhide this topic', array(), null, 'boinc:forum-unhide-comment')
               )
           );
         }
@@ -743,10 +743,10 @@ 
     // QUOTE
     if ($node->comment == COMMENT_NODE_READ_WRITE) {
         $links['quote'] = array(
-            'title' => bts('Quote', array(), NULL, 'boinc:forum-reply-to-comment-with-quote'),
+            'title' => bts('Quote', array(), null, 'boinc:forum-reply-to-comment-with-quote'),
             'href' => "comment/reply/{$nid}/{$cid}",
             'attributes' => array(
-                'title' => bts('Reply to this comment with a quote', array(), NULL, 'boinc:forum-reply-to-comment')
+                'title' => bts('Reply to this comment with a quote', array(), null, 'boinc:forum-reply-to-comment')
             ),
             'fragment' => 'comment-form',
             'query' => 'quote=1',
@@ -760,29 +760,29 @@ 
       $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
       if ($reply_count == 0) {
         $links['convert'] = array(
-            'title' => bts('Convert', array(), NULL, 'boinc:forum-convert-comment-to-topic'),
+            'title' => bts('Convert', array(), null, 'boinc:forum-convert-comment-to-topic'),
             'href' => "{$comment_control}/convert",
             'attributes' => array(
-                'title' => bts('Convert this comment to a new topic', array(), NULL, 'boinc:forum-convert-comment-to-topic')
+                'title' => bts('Convert this comment to a new topic', array(), null, 'boinc:forum-convert-comment-to-topic')
             )
         );
       }
       // Add hide link
       if ($object->status == 0) {
         $links['hide'] = array(
-            'title' => bts('Hide', array(), NULL, 'boinc:forum-hide-comment'),
+            'title' => bts('Hide', array(), null, 'boinc:forum-hide-comment'),
             'href' => "{$comment_control}/hide",
             'attributes' => array(
-                'title' => bts('Hide this comment', array(), NULL, 'boinc:forum-hide-comment')
+                'title' => bts('Hide this comment', array(), null, 'boinc:forum-hide-comment')
             )
         );
       }
       else {
         $links['unhide'] = array(
-            'title' => bts('Unhide', array(), NULL, 'boinc:forum-unhide-comment'),
+            'title' => bts('Unhide', array(), null, 'boinc:forum-unhide-comment'),
             'href' => "{$comment_control}/unhide",
             'attributes' => array(
-                'title' => bts('Unhide this comment', array(), NULL, 'boinc:forum-unhide-comment')
+                'title' => bts('Unhide this comment', array(), null, 'boinc:forum-unhide-comment')
             )
         );
       }
@@ -817,12 +817,12 @@ 
  * Allow published, sticky, and comment status to be set on nodes by direct
  * link rather than through the node form.
  */
-function boinccore_node_control($nid = NULL, $action = NULL) {
-  if ((!$nid OR !$node = node_load($nid)) OR
-      ($node->type == 'forum' AND !user_access('edit any forum topic')) OR
-      ($node->type != 'forum' AND !user_access('administer nodes'))) {
+function boinccore_node_control($nid = null, $action = null) {
+  if ((!$nid or !$node = node_load($nid)) or
+      ($node->type == 'forum' and !user_access('edit any forum topic')) or
+      ($node->type != 'forum' and !user_access('administer nodes'))) {
     // What are you even doing here...
-    return FALSE;
+    return false;
   }
   switch ($action) {
   case 'unhide':
@@ -864,10 +864,10 @@ 
  * Allow published status to be set on comments by direct link rather than
  * through the comment edit form.
  */
-function boinccore_comment_control($cid = NULL, $action = NULL) {
-  if (!$cid OR !$comment = _comment_load($cid)) {
+function boinccore_comment_control($cid = null, $action = null) {
+  if (!$cid or !$comment = _comment_load($cid)) {
     // What are you even doing here...
-    return FALSE;
+    return false;
   }
   $return_path = "node/{$comment->nid}";
   $return_anchor = "comment-{$cid}";
@@ -920,11 +920,11 @@ 
     rules_invoke_event('boinccore_comment_convert', $comment);
 
     $return_path = "node/{$node->nid}";
-    $return_anchor = NULL;
+    $return_anchor = null;
     break;
   default:
   }
-  drupal_goto($return_path, NULL, $return_anchor);
+  drupal_goto($return_path, null, $return_anchor);
 }
 
 /**
@@ -951,7 +951,7 @@ 
   $uid = !empty($xml['am_get_info_reply']['id']) ? boincuser_lookup_uid($xml['am_get_info_reply']['id']) : 0;
   if ($uid) {
     $content_profile = content_profile_load('profile', $uid);
-    $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
+    $profile_is_approved = ($content_profile->status and !$content_profile->moderate);
     $country = check_plain($content_profile->field_country[0]['value']);
     $website = '';
     if ($profile_is_approved) {
@@ -973,8 +973,8 @@ 
   // Remove q from the GET request or BOINC will panic
   unset($_GET['q']);
   // Validate the XML prefs (in case BOINC does not)
-  $global_prefs = !empty($_POST['global_prefs']) ? $_POST['global_prefs'] : (!empty($_GET['global_prefs']) ? $_GET['global_prefs'] : NULL);
-  $project_prefs = !empty($_POST['project_prefs']) ? $_POST['project_prefs'] : (!empty($_GET['project_prefs']) ? $_GET['project_prefs'] : NULL);
+  $global_prefs = !empty($_POST['global_prefs']) ? $_POST['global_prefs'] : (!empty($_GET['global_prefs']) ? $_GET['global_prefs'] : null);
+  $project_prefs = !empty($_POST['project_prefs']) ? $_POST['project_prefs'] : (!empty($_GET['project_prefs']) ? $_GET['project_prefs'] : null);
   libxml_use_internal_errors(true);
   $xml = new DomDocument();
   if ($global_prefs) {
@@ -1013,15 +1013,15 @@ 
       $uid = boincuser_lookup_uid($boinc_id);
 
       // Apply any relevant updates to the Drupal account, also
-      $country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : NULL);
-      $url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : NULL);
-      $email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : NULL);
+      $country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : null);
+      $url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : null);
+      $email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : null);
 
       if ($email_addr) {
         $account = user_load($uid);
         user_save($account, array('mail' => $email_addr));
       }
-      if ($country OR $url) {
+      if ($country or $url) {
         $content_profile = content_profile_load('profile', $uid);
         if ($country) $content_profile->field_country[0]['value'] = $country;
         if ($url) $content_profile->field_url[0]['value'] = $url;
@@ -1075,7 +1075,7 @@ 
   $uid = !empty($xml['user']['id']) ? boincuser_lookup_uid($xml['user']['id']) : 0;
   if ($uid) {
     $content_profile = content_profile_load('profile', $uid);
-    $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
+    $profile_is_approved = ($content_profile->status and !$content_profile->moderate);
     $country = check_plain($content_profile->field_country[0]['value']);
     $website = '';
     if ($profile_is_approved) {
@@ -1237,7 +1237,7 @@ 
   $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
   if (!$show_xml) {
       // creditonly does not affect non xml output in BOINC
-      $credit_only = FALSE;
+      $credit_only = false;
   }
   $xml = array();
 
@@ -1286,11 +1286,11 @@ 
           'cpid' => md5($member->cross_project_id.$member->email_addr),
           'create_time' => $member->create_time,
           'name' => htmlspecialchars($member->name),
-          'country' => NULL,
+          'country' => null,
           'total_credit' => round($member->total_credit),
           'expavg_credit' => round($member->expavg_credit),
           'expavg_time' => round($member->expavg_time),
-          'url' => NULL,
+          'url' => null,
           'has_profile' => 0,
         );
       }
@@ -1328,7 +1328,7 @@ 
       ),
     );
   } // end if boincteam_id
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1339,18 +1339,18 @@ 
   // Do not pass through to BOINC in this case as BOINC forums are no longer
   // relevant -- use Drupal data only
 
-  $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : NULL);
+  $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : null);
 
   require_boinc('boinc_db');
   $boincuser = BoincUser::lookup_auth($account_key);
   if ($boincuser) {
     $uid = boincuser_lookup_uid($boincuser->id);
-    if ($uid AND $account = user_load($uid)) {
+    if ($uid and $account = user_load($uid)) {
       // Currently supported preferences
-      $avatar_url = isset($_POST['avatar_url']) ? $_POST['avatar_url'] : (isset($_GET['avatar_url']) ? $_GET['avatar_url'] : NULL);
-      $hide_signatures = isset($_POST['forum_hide_signatures']) ? $_POST['forum_hide_signatures'] : (isset($_GET['forum_hide_signatures']) ? $_GET['forum_hide_signatures'] : NULL);
-      $signature = isset($_POST['signature']) ? $_POST['signature'] : (isset($_GET['signature']) ? $_GET['signature'] : NULL);
-      $post_order = isset($_POST['thread_sort']) ? $_POST['thread_sort'] : (isset($_GET['thread_sort']) ? $_GET['thread_sort'] : NULL);
+      $avatar_url = isset($_POST['avatar_url']) ? $_POST['avatar_url'] : (isset($_GET['avatar_url']) ? $_GET['avatar_url'] : null);
+      $hide_signatures = isset($_POST['forum_hide_signatures']) ? $_POST['forum_hide_signatures'] : (isset($_GET['forum_hide_signatures']) ? $_GET['forum_hide_signatures'] : null);
+      $signature = isset($_POST['signature']) ? $_POST['signature'] : (isset($_GET['signature']) ? $_GET['signature'] : null);
+      $post_order = isset($_POST['thread_sort']) ? $_POST['thread_sort'] : (isset($_GET['thread_sort']) ? $_GET['thread_sort'] : null);
       // Update preferences as needed
       if ($avatar_url) {
         $avatar_image = file_get_contents($avatar_url);
@@ -1361,11 +1361,11 @@ 
           if ($file) {
             $profile = new stdClass();
             $profile->type = 'profile';
-            $profile->language = NULL;
+            $profile->language = null;
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', true);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1390,10 +1390,10 @@ 
           $error = 'Could not find avatar image at URL';
         }
       }
-      if ($hide_signatures !== NULL) {
+      if ($hide_signatures !== null) {
         user_save($account, array('hide_signatures' => ($hide_signatures ? 1 : 0)));
       }
-      if ($signature !== NULL) {
+      if ($signature !== null) {
         $signature = check_markup($signature);
         user_save($account, array('signature' => $signature));
       }
@@ -1410,7 +1410,7 @@ 
         // Success
         $xml = array(
           'edit_forum_preferences' => array(
-            'success' => NULL,
+            'success' => null,
           ),
         );
       }
@@ -1443,7 +1443,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1455,17 +1455,17 @@ 
   // relevant -- use Drupal data only
 
   $xml = array();
-  $boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : NULL);
+  $boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : null);
   $uid = boincuser_lookup_uid($boinc_id);
 
   if ($uid) {
-    $method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : NULL);
-    $count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : NULL);
+    $method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : null);
+    $count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : null);
     if (!$count) $count = 10;
 
     switch ($method) {
     case 'user_posts':
-      $content_length = !empty($_POST['content_length']) ? $_POST['content_length'] : (!empty($_GET['content_length']) ? $_GET['content_length'] : NULL);
+      $content_length = !empty($_POST['content_length']) ? $_POST['content_length'] : (!empty($_GET['content_length']) ? $_GET['content_length'] : null);
       $posts = db_query("
         SELECT
           c.cid,
@@ -1561,7 +1561,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1580,9 +1580,9 @@ 
  * in advance on which page a given comment will appear. Link instead to this
  * controller function, which can compute the page based on the user's settings
  */
-function boinccore_url_pagination_handler($type, $object_id = NULL) {
+function boinccore_url_pagination_handler($type, $object_id = null) {
   global $user;
-  $path = NULL;
+  $path = null;
   $params = array();
   switch ($type) {
   case 'boinc-forum':
@@ -1979,11 +1979,11 @@ 
   $mailing_list = variable_get('boinc_moderator_mailing_list', '');
   $force_individual_notifications = variable_get('boinc_moderator_force_individual_notifications', 0);
 
-  if (!$mailing_list OR $force_individual_notifications) {
+  if (!$mailing_list or $force_individual_notifications) {
     // Send individual emails to all moderators
     $roles = user_roles();
     $moderator_rid = array_search('moderator', $roles);
-    if ($moderator_rid !== FALSE) {
+    if ($moderator_rid !== false) {
       $settings['recipients'] = array($moderator_rid);
       rules_action_mail_to_users_of_role($settings);
     }
@@ -2023,7 +2023,7 @@ 
         'Attempting to email administrators, but there is no admin email list or site email to send to.', array(),
         WATCHDOG_ERROR
       );
-      return FALSE;
+      return false;
     }
   }
   $settings['to'] = $mailing_list;
@@ -2044,7 +2044,7 @@ 
 /*
  * BOINC wrapper for string translation
  */
-function bts($string, $args = array(), $langcode = NULL, $context = 'boinc: ', $update = TRUE) {
+function bts($string, $args = array(), $langcode = null, $context = 'boinc: ', $update = true) {
   if (function_exists('i18nstrings_ts')) {
     $string = i18nstrings_ts($context, $string, $langcode, $update);
   }
@@ -2083,7 +2083,7 @@ 
  * Overview of moderation queues
  */
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
+  $output = '<h2 class="pane-title">' . bts('Moderation', array(), null, 'boinc:moderate-profiles') . '</h2>';
   $output .= '<ul class="tab-list action-list">';
   if (module_exists('user_profiles')) {
     $profile_count = db_result(db_query("
@@ -2092,7 +2092,7 @@ 
       WHERE n.type = 'profile' AND n.moderate = 1"
     ));
     $output .= '<li class="tab primary">';
-    $output .= l(bts('Unvetted profiles', array(), NULL, 'boinc:moderate-profiles'), 'moderate/profiles');
+    $output .= l(bts('Unvetted profiles', array(), null, 'boinc:moderate-profiles'), 'moderate/profiles');
     $output .= '<div class="item-count-wrapper">';
     $output .= '<span class="item-count">' . $profile_count . '</span>';
     $output .= '</div>';
@@ -2113,6 +2113,6 @@ 
 
   $num_deleted = BoincToken::delete_expired();
   if ($num_deleted>0) {
-    watchdog('boinccore', "Deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
+    watchdog('boinccore', "deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
   }
 }