BOINC / boinc

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

Indentation +17 added lines, -17 removed lines

@@ -9,40 +9,40 @@ 
  * Implements hook_block() for Drupal 6 compatibility
  */
 function comment_form_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
+    switch ($op) {
+    case 'view':
     //$block = node_comment_block_block_view($delta);
     $block = array();
     if ($delta == 'comment_form') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+        if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         global $user;
         $node = node_load($nid);
         if ($node->comment !== 0 AND user_access('post comments', $user)) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
-          $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
+            $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+            $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+            $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
+        }
         }
-      }
     }
     break;
-  case 'list':
+    case 'list':
     $blocks = comment_form_block_block_info();
     return $blocks;
     break;
-  default:
+    default:
   }
-  return $block;
+    return $block;
 }
 
 /**
  * Implements hook_block_info().
  */
 function comment_form_block_block_info() {
-  $blocks['comment_form'] = array(
+    $blocks['comment_form'] = array(
     'info' => bts('Comment form', array(), NULL, 'boinc:forum-comment-form'),
-  );
+    );
 
-  return $blocks;
+    return $blocks;
 }
 
 /**
@@ -81,10 +81,10 @@ 
  * Implements hook_form_FORM_ID_alter() for block_admin_configure.
  */
 function comment_form_block_form_block_admin_configure_alter(&$form, &$form_state) {
-  if (isset($form['delta'])) {
+    if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'comment_form') {
-      $form['settings']['title']['#disabled'] = TRUE;
-      $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+        $form['settings']['title']['#disabled'] = TRUE;
+        $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+    }
     }
-  }
 }

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

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

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

Indentation +28 added lines, -28 removed lines

@@ -8,38 +8,38 @@ 
 
 
 /**
-  * The BOINC stats configuration determines where statistics are sourced
-  */
+ * The BOINC stats configuration determines where statistics are sourced
+ */
 function boincstats_admin_stats_system(&$form_state) {
-  $form = array();
-  $default = array(
+    $form = array();
+    $default = array(
     'boinc_stats_server' => variable_get('boinc_stats_server', 'stats.gridrepublic.org'),
     'boinc_stats_project_list_rpc' => variable_get('boinc_stats_project_list_rpc', 'rpc/get_projects.php'),
     'boinc_stats_project_credit_history_rpc' => variable_get('boinc_stats_project_credit_history_rpc', 'rpc2/get_project_tc_history.php'),
     'boinc_stats_user_credit_history_rpc' => variable_get('boinc_stats_user_credit_history_rpc', 'rpc2/get_user_credit_history.php'),
     'boinc_stats_remote_project_id' => variable_get('boinc_stats_remote_project_id', ''),
-  );
-  // Define the form
-  $form['boinc_stats_server'] = array(
+    );
+    // Define the form
+    $form['boinc_stats_server'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_server']
-  );
-  $form['boinc_stats_project_list_rpc'] = array(
+    );
+    $form['boinc_stats_project_list_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_project_list_rpc']
-  );
-  $form['boinc_stats_project_credit_history_rpc'] = array(
+    );
+    $form['boinc_stats_project_credit_history_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_project_credit_history_rpc']
-  );
-  $form['boinc_stats_user_credit_history_rpc'] = array(
+    );
+    $form['boinc_stats_user_credit_history_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_user_credit_history_rpc']
-  );
-  $form['boinc_stats_remote_project_id'] = array(
+    );
+    $form['boinc_stats_remote_project_id'] = array(
     '#type' => 'textfield',
     '#title' => t('Stats ID for @project', array(
-      '@project' => variable_get('site_name', 'Drupal-BOINC'))),
+        '@project' => variable_get('site_name', 'Drupal-BOINC'))),
     '#default_value' => $default['boinc_stats_remote_project_id'],
     '#description' => t('This project must be registered with a stats system in
       order for some statistics to be available. Currently only one system is
@@ -47,26 +47,26 @@ 
         '!find_project_id' => l(t('Find your project ID'),
         "http://{$default['boinc_stats_server']}/{$default['boinc_stats_project_list_rpc']}",
         array('attributes' => array('target' => 'external')))
-      )
+        )
     )
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC stats form.
-  */
+ * Validate the BOINC stats form.
+ */
 function boincstats_admin_stats_system_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_stats_remote_project_id']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_stats_remote_project_id']) {
     form_set_error('boinc_stats_remote_project_id',
-      t('Stats may not work without a valid stats ID configured!'));
-  }
+        t('Stats may not work without a valid stats ID configured!'));
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC stats form.
-  */
+ * Handle post-validation submission of BOINC stats form.
+ */
 function boincstats_admin_stats_system_submit($form, &$form_state) {
-  drupal_set_message(t('Stats system configuration has been updated.'));
+    drupal_set_message(t('Stats system configuration has been updated.'));
 }

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

Indentation +642 added lines, -642 removed lines

@@ -15,30 +15,30 @@ 
  */
 function boinctranslate_initialize_languages() {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $api_base_url = 'https://www.transifex.com/api/2';
-  $project_name = variable_get(
+    $api_base_url = 'https://www.transifex.com/api/2';
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  $operations = array();
+    );
+    $operations = array();
 
-  if ($project_name) {
+    if ($project_name) {
     // Get all languages configured for this project at Transifex
     $path = "project/{$project_name}/languages";
     $response = boinctranslate_transifex_request($path);
 
     if ($response == '404 NOT FOUND') {
-      drupal_set_message(
+        drupal_set_message(
         t('Unable to get languages for %project.',
-          array(
+            array(
             '%project' => $project_name,
-          )
+            )
         ), 'warning'
-      );
+        );
     }
     elseif ($response) {
-      if (is_array($response)) {
+        if (is_array($response)) {
 
         $installed_languages = language_list();
         $available_languages = _locale_get_predefined_list();
@@ -48,13 +48,13 @@ 
 
         // Set up Transifex languages in Drupal
         foreach ($response as $language) {
-          $posix_code = $language['language_code'];
-          $rfc_code = strtolower(str_replace('_', '-', $posix_code));
-          $transifex_languages[$rfc_code] = $language;
-          if (!isset($installed_languages[$rfc_code])) {
+            $posix_code = $language['language_code'];
+            $rfc_code = strtolower(str_replace('_', '-', $posix_code));
+            $transifex_languages[$rfc_code] = $language;
+            if (!isset($installed_languages[$rfc_code])) {
             // See if this language can be installed from a predefined list
             if (isset($available_languages[$rfc_code])) {
-              locale_add_language(
+                locale_add_language(
                 $rfc_code,
                 NULL,
                 NULL,
@@ -62,30 +62,30 @@ 
                 NULL,
                 NULL,
                 FALSE
-              );
-              drupal_set_message(
+                );
+                drupal_set_message(
                 'Added predefined language: '.$available_languages[$rfc_code][0]
-              );
-              db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
+                );
+                db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
             }
             else {
-              // Retrieve language details from Transifex
-              $path = "language/{$posix_code}";
-              $response = boinctranslate_transifex_request($path);
+                // Retrieve language details from Transifex
+                $path = "language/{$posix_code}";
+                $response = boinctranslate_transifex_request($path);
 
-              if ($response == '404 NOT FOUND') {
+                if ($response == '404 NOT FOUND') {
                 drupal_set_message(
-                  t('Unable to get details for language %code.',
+                    t('Unable to get details for language %code.',
                     array(
-                      '%code' => $posix_code,
+                        '%code' => $posix_code,
                     )
-                  ), 'warning'
+                    ), 'warning'
                 );
-              }
-              elseif ($response) {
+                }
+                elseif ($response) {
                 if (!empty($response['name'])) {
-                  // Add a custom language to Drupal and enable
-                  locale_add_language(
+                    // Add a custom language to Drupal and enable
+                    locale_add_language(
                     $rfc_code,
                     $response['name'],
                     $response['name'],
@@ -93,362 +93,362 @@ 
                     NULL,
                     NULL,
                     TRUE
-                  );
-                  drupal_set_message(
+                    );
+                    drupal_set_message(
                     'Added new language: '.$response['name']
-                  );
+                    );
                 }
                 else {
-                  $variables = array(
+                    $variables = array(
                     '%code' => $posix_code,
-                  );
-                  drupal_set_message(
+                    );
+                    drupal_set_message(
                     t('Unable to get details for language %code.', $variables),
                     'error'
-                  );
-                  watchdog(
+                    );
+                    watchdog(
                     'boinctranslate',
                     'Unable to get details for language %code.',
                     $variables,
                     WATCHDOG_ERROR
-                  );
+                    );
+                }
                 }
-              }
-              else {
-               $variables = array(
-                  '%code' => $posix_code,
+                else {
+                $variables = array(
+                    '%code' => $posix_code,
                 );
                 drupal_set_message(
-                  t('Invalid response while getting details for language %code.', $variables),
-                  'error'
+                    t('Invalid response while getting details for language %code.', $variables),
+                    'error'
                 );
                 watchdog(
-                  'boinctranslate',
-                  'Invalid response while getting details for language %code.',
-                  $variables,
-                  WATCHDOG_ERROR
+                    'boinctranslate',
+                    'Invalid response while getting details for language %code.',
+                    $variables,
+                    WATCHDOG_ERROR
                 );
-              }
+                }
             }
             // Import any language files for the newly added language
             if ($batch = locale_batch_by_language($rfc_code, '_locale_batch_language_finished')) {
-              $operations = array_merge($operations, $batch['operations']);
-              $process_batches = TRUE;
+                $operations = array_merge($operations, $batch['operations']);
+                $process_batches = TRUE;
+            }
             }
-          }
         }
         drupal_set_message('Finished installing official BOINC languages.');
         // Disable languages that are not in Transifex
         foreach ($installed_languages as $langcode => $language) {
-          if (!isset($transifex_languages[$langcode])) {
+            if (!isset($transifex_languages[$langcode])) {
             $disabled_languages[$langcode] = $langcode;
             db_query("UPDATE {languages} SET enabled = 0 WHERE language = '%s'", $langcode);
-          }
+            }
         }
         if ($disabled_languages) {
-          drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
+            drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
         }
         if ($process_batches) {
-          $batch = array(
+            $batch = array(
             'operations' => $operations,
-          );
-          batch_set($batch);
-          batch_process('admin/boinc/translation');
+            );
+            batch_set($batch);
+            batch_process('admin/boinc/translation');
+        }
         }
-      }
-      else {
+        else {
         $variables = array(
-          '%project' => $project_name,
+            '%project' => $project_name,
         );
         drupal_set_message(
-          t('No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)', $variables),
-          'error'
+            t('No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)', $variables),
+            'error'
         );
         watchdog(
-          'boinctranslate',
-          'No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)',
-          $variables,
-          WATCHDOG_ERROR
+            'boinctranslate',
+            'No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)',
+            $variables,
+            WATCHDOG_ERROR
         );
-      }
+        }
     }
     else {
-     $variables = array(
+        $variables = array(
         '%project' => $project_name,
-      );
-      drupal_set_message(
+        );
+        drupal_set_message(
         t('Invalid response while getting languages for %project.', $variables),
         'error'
-      );
-      watchdog(
+        );
+        watchdog(
         'boinctranslate',
         'Invalid response while getting languages for %project.',
         $variables,
         WATCHDOG_ERROR
-      );
+        );
     }
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_export_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $project_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  // Get resource names from local config
-  $resource_config = (variable_get(
+    );
+    // Get resource names from local config
+    $resource_config = (variable_get(
     'boinc_translate_transifex_project_resources', ''
-  ));
-  $resource_names = boinctranslate_parse_resources($resource_config);
-  $primary_resource = reset($resource_names);
+    ));
+    $resource_names = boinctranslate_parse_resources($resource_config);
+    $primary_resource = reset($resource_names);
 
-  if ($project_name AND $primary_resource) {
+    if ($project_name AND $primary_resource) {
     // Create or update the translation source, if needed
     $source_exists = FALSE;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
     if ($resources AND is_array($resources)) {
-      foreach ($resources as $resource) {
+        foreach ($resources as $resource) {
         if ($resource['slug'] == $primary_resource) {
-          $source_exists = TRUE;
-          break;
+            $source_exists = TRUE;
+            break;
         }
-      }
-      if (!$source_exists) {
+        }
+        if (!$source_exists) {
         // Create the source
         $path = "project/{$project_name}/resources";
         $post = array(
-          'slug' => $primary_resource,
-          'name' => 'Drupal-Project',
-          'i18n_type' => 'PO',
-          'category' => 'Drupal',
-          'content' => boinctranslate_get_po('en', 'project'),
+            'slug' => $primary_resource,
+            'name' => 'Drupal-Project',
+            'i18n_type' => 'PO',
+            'category' => 'Drupal',
+            'content' => boinctranslate_get_po('en', 'project'),
         );
         $result = boinctranslate_transifex_request($path, $post);
-      }
-      else {
+        }
+        else {
         // Update the source
         $path = "project/{$project_name}/resource/{$primary_resource}/content";
         $post = array(
-          'content' => boinctranslate_get_po('en', 'project')
+            'content' => boinctranslate_get_po('en', 'project')
         );
         $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
-      }
+        }
     }
 
     if (is_array($result) OR substr($result, 0, 6) != 'ERROR:') {
-      $enabled_languages = locale_language_list();
-      if ($source_exists) {
+        $enabled_languages = locale_language_list();
+        if ($source_exists) {
         drupal_set_message('Updated source translation strings at Transifex');
-      }
-      else {
+        }
+        else {
         drupal_set_message('Established new translation resource at Transifex');
-      }
-      // Try to export translations for all enabled languages
-      foreach ($enabled_languages as $langcode => $language_name) {
+        }
+        // Try to export translations for all enabled languages
+        foreach ($enabled_languages as $langcode => $language_name) {
         if ($langcode == 'en') {
-          continue;
+            continue;
         }
         $po_file = boinctranslate_get_po($langcode, 'project');
         if ($po_file) {
-          $path = "project/{$project_name}/resource/{$primary_resource}/translation/{$langcode}";
-          $post = array(
+            $path = "project/{$project_name}/resource/{$primary_resource}/translation/{$langcode}";
+            $post = array(
             'content' => $po_file,
-          );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
-          if (!is_array($result)
+            );
+            $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+            if (!is_array($result)
           AND substr($result, 0, 6) == 'ERROR:') {
             drupal_set_message(
-              "Unable to update {$language_name} translations: {$result}",
-              'warning'
+                "Unable to update {$language_name} translations: {$result}",
+                'warning'
             );
-          }
-          else {
+            }
+            else {
             drupal_set_message("Updated {$language_name} translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
-          }
+            }
         }
         else {
-          drupal_set_message("No translations to export for {$language_name}");
+            drupal_set_message("No translations to export for {$language_name}");
+        }
         }
-      }
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         "Unable to update the translation source: {$result}",
         'warning'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      'Failed to export translations: Transifex settings are not intiailized.',
-      'error'
+        'Failed to export translations: Transifex settings are not intiailized.',
+        'error'
     );
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_update_official_boinc_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $project_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $project_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
-  );
-  $drupal_resource = variable_get(
+    );
+    $drupal_resource = variable_get(
     'boinc_translate_transifex_boinc_drupal_resource', ''
-  );
+    );
 
-  if ($project_name AND $drupal_resource) {
+    if ($project_name AND $drupal_resource) {
     // Create or update the translation source, if needed
     $source_exists = FALSE;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
     if ($resources AND is_array($resources)) {
-      foreach ($resources as $resource) {
+        foreach ($resources as $resource) {
         if ($resource['slug'] == $drupal_resource) {
-          $source_exists = TRUE;
-          break;
+            $source_exists = TRUE;
+            break;
+        }
         }
-      }
     }
 
     if ($source_exists) {
-      $enabled_languages = locale_language_list();
-      // Try to export translations for all enabled languages
-      foreach ($enabled_languages as $langcode => $language_name) {
+        $enabled_languages = locale_language_list();
+        // Try to export translations for all enabled languages
+        foreach ($enabled_languages as $langcode => $language_name) {
         if ($langcode == 'en') {
-          continue;
+            continue;
         }
         $po_file = boinctranslate_get_po($langcode, 'boinc');
         if ($po_file) {
-          $path = "project/{$project_name}/resource/{$drupal_resource}/translation/{$langcode}";
-          $post = array(
+            $path = "project/{$project_name}/resource/{$drupal_resource}/translation/{$langcode}";
+            $post = array(
             'content' => $po_file,
-          );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+            );
+            $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
 
-          if (!is_array($result)) {
+            if (!is_array($result)) {
             if (substr($result, 0, 6) == 'ERROR:') {
-              drupal_set_message(
+                drupal_set_message(
                 "Unable to update {$language_name} official BOINC translations: {$result}",
                 'warning'
-              );
+                );
             }
             elseif ($result == '401 UNAUTHORIZED') {
-              drupal_set_message(
+                drupal_set_message(
                 'Not authorized to update official BOINC translations',
                 'warning'
-              );
-              break;
+                );
+                break;
             }
             elseif ($result == 'success') {
-              drupal_set_message("Updated {$language_name} official BOINC translations");
+                drupal_set_message("Updated {$language_name} official BOINC translations");
             }
             else {
-              drupal_set_message(
+                drupal_set_message(
                 "Unexpected response for {$language_name}: {$result}",
                 'warning'
-              );
+                );
             }
-          }
-          else {
+            }
+            else {
             drupal_set_message("Updated {$language_name} official BOINC translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
-          }
+            }
         }
         else {
-          drupal_set_message("No official BOINC translations to export for {$language_name}");
+            drupal_set_message("No official BOINC translations to export for {$language_name}");
+        }
         }
-      }
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         "The {$drupal_resource} resource does not exist in the {$project_name} project at Transifex",
         'warning'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      'Failed to export official BOINC translations: Transifex settings are not intiailized.',
-      'error'
+        'Failed to export official BOINC translations: Transifex settings are not intiailized.',
+        'error'
     );
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_download_pot($type = 'boinc') {
-  $po = boinctranslate_get_po(NULL, $type);
-  _locale_export_po(NULL, $po);
+    $po = boinctranslate_get_po(NULL, $type);
+    _locale_export_po(NULL, $po);
 }
 
 /**
  *
  */
 function boinctranslate_transifex_request($path, $post = NULL, $json = TRUE, $use_put = FALSE, $username = '', $password = '') {
-  $debug_mode = variable_get('boinc_debug_mode', 0);
+    $debug_mode = variable_get('boinc_debug_mode', 0);
 
-  // Transifex details
-  $api_base_url = 'https://www.transifex.com/api/2';
-  if (!$username) $username = variable_get('boinc_translate_transifex_user', '');
-  if (!$password) $password = variable_get('boinc_translate_transifex_pass', '');
+    // Transifex details
+    $api_base_url = 'https://www.transifex.com/api/2';
+    if (!$username) $username = variable_get('boinc_translate_transifex_user', '');
+    if (!$password) $password = variable_get('boinc_translate_transifex_pass', '');
 
-  $url = "{$api_base_url}/{$path}";
-  $headers = array(
+    $url = "{$api_base_url}/{$path}";
+    $headers = array(
     'Authorization' => 'Basic ' . base64_encode($username . ":" . $password),
-  );
-  $data = NULL;
+    );
+    $data = NULL;
 
-  if ($post) {
+    if ($post) {
     if ($json) {
-      $headers['Content-Type'] = 'application/json';
-      $data = json_encode($post);
+        $headers['Content-Type'] = 'application/json';
+        $data = json_encode($post);
     }
     else {
-      $data = drupal_query_string_encode($post);
+        $data = drupal_query_string_encode($post);
     }
     $method = ($use_put) ? 'PUT' : 'POST';
-  }
-  else {
+    }
+    else {
     $method = 'GET';
-  }
+    }
 
-  $response = drupal_http_request($url, $headers, $method, $data, 1, 10);
+    $response = drupal_http_request($url, $headers, $method, $data, 1, 10);
 
-  switch ($response->code) {
-  case 200:
+    switch ($response->code) {
+    case 200:
   case 304:
     if ($json) {
-      // Process as JSON
-      return json_decode($response->data, TRUE);
+        // Process as JSON
+        return json_decode($response->data, TRUE);
     }
     else {
-      return (string) $response->data;
+        return (string) $response->data;
     }
     break;
-  case 404:
+    case 404:
     return '404 NOT FOUND';
-  case 401:
+    case 401:
     return '401 UNAUTHORIZED';
-  case 400:
+    case 400:
     if ($debug_mode) watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
     return "ERROR: {$response->data}";
-  case 405:
+    case 405:
     if ($debug_mode) watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
     return "ERROR: User not allowed to perform this action";
-  }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 /**
@@ -456,58 +456,58 @@ 
  */
 function boinctranslate_get_po($langcode, $type = 'standard') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $all_languages = language_list();
-  $language = $langcode ? $all_languages[$langcode] : NULL;
-  $textgroups = array();
-  $strings = array();
+    $all_languages = language_list();
+    $language = $langcode ? $all_languages[$langcode] : NULL;
+    $textgroups = array();
+    $strings = array();
 
-  switch ($type) {
-  case 'standard':
+    switch ($type) {
+    case 'standard':
     $textgroups = array(
-      'default',
-      'taxonomy',
-      'views',
+        'default',
+        'taxonomy',
+        'views',
     );
     break;
-  case 'boinc':
+    case 'boinc':
     $textgroups = array(
-      'boinc',
+        'boinc',
     );
     break;
-  case 'project':
+    case 'project':
     $textgroups = array(
-      'blocks',
-      'menu',
-      'project',
+        'blocks',
+        'menu',
+        'project',
     );
     break;
-  default:
+    default:
   }
 
-  // Merge textgroup strings together for export as one file
-  foreach ($textgroups as $textgroup) {
+    // Merge textgroup strings together for export as one file
+    foreach ($textgroups as $textgroup) {
     $strings += _locale_export_get_strings($language, $textgroup);
-  }
-  ksort($strings);
-  foreach ($strings as $id => $string) {
+    }
+    ksort($strings);
+    foreach ($strings as $id => $string) {
     // Set the string context
     $strings[$id]['context'] = trim($string['comment']);
-  }
-  if ($langcode AND $langcode != 'en') {
+    }
+    if ($langcode AND $langcode != 'en') {
     // If not the source language, remove untranslated strings from the ouput
     foreach ($strings as $i => $string) {
-      if (!$string['translation']) {
+        if (!$string['translation']) {
         unset($strings[$i]);
-      }
+        }
     }
-  }
-  if ($strings) {
+    }
+    if ($strings) {
     return boinctranslate_export_po_generate($language, $strings, NULL, $type);
-  }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 /**
@@ -515,21 +515,21 @@ 
  */
 function boinctranslate_export_po_generate($language = NULL, $strings = array(), $header = NULL, $type = NULL) {
 
-  require_once(getcwd() . '/includes/locale.inc');
-  global $user;
+    require_once(getcwd() . '/includes/locale.inc');
+    global $user;
 
-  // unset $language to indicate template creation
-  if (isset($language) && $language->language == "en") {
+    // unset $language to indicate template creation
+    if (isset($language) && $language->language == "en") {
     $language = NULL;
-  }
+    }
 
-  if (!isset($header)) {
+    if (!isset($header)) {
     if (isset($type) && $type == "project") {
-      $header = "# ".variable_get('site_name', 'Drupal-BOINC')." drupal localization template\n";
-      $header .= "# Copyright (C) ".date("Y")." ".variable_get('site_name', 'Drupal-BOINC')."\n";
+        $header = "# ".variable_get('site_name', 'Drupal-BOINC')." drupal localization template\n";
+        $header .= "# Copyright (C) ".date("Y")." ".variable_get('site_name', 'Drupal-BOINC')."\n";
     } else {
-      $header = "# BOINC drupal localization template\n";
-      $header .= "# Copyright (C) ".date("Y")." University of California\n";
+        $header = "# BOINC drupal localization template\n";
+        $header .= "# Copyright (C) ".date("Y")." University of California\n";
     }
     $header .= '# Generated by ' . $user->name . ' <' . $user->mail . ">\n";
     $header .= "#\n";
@@ -538,201 +538,201 @@ 
     $header .= "msgid \"\"\n";
     $header .= "msgstr \"\"\n";
     if (isset($type) && $type == "project") {
-      $header .= "\"Project-Id-Version: ".variable_get('site_name', 'Drupal-BOINC')." ".date("Y-m-d-H:iO")."\\n\"\n";
+        $header .= "\"Project-Id-Version: ".variable_get('site_name', 'Drupal-BOINC')." ".date("Y-m-d-H:iO")."\\n\"\n";
     } else {
-      $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
+        $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
     }
     $header .= "\"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\\n\"\n";
     $header .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
     if (isset($language)) {
-      $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+        $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
     }
     $header .= "\"Last-Translator: Generated automatically from Drupal translate interface\\n\"\n";
     $header .= "\"MIME-Version: 1.0\\n\"\n";
     $header .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n";
     $header .= "\"Content-Transfer-Encoding: 8bit\\n\"\n";
     if (isset($language)) {
-      $header .= "\"Language: ".$language->language."\\n\"";
-      if ($language->formula && $language->plurals) {
+        $header .= "\"Language: ".$language->language."\\n\"";
+        if ($language->formula && $language->plurals) {
         $header .= "\"Plural-Forms: nplurals=" . $language->plurals . "; plural=" . strtr($language->formula, array('$' => '')) . ";\\n\"\n";
-      }
+        }
     }
     $header .= "\"X-Poedit-SourceCharset: utf-8\\n\"\n";
-  }
+    }
 
-  $output = $header . "\n";
+    $output = $header . "\n";
 
-  foreach ($strings as $lid => $string) {
+    foreach ($strings as $lid => $string) {
     // Only process non-children, children are output below their parent.
     if (!isset($string['child'])) {
-      if ($string['comment']) {
+        if ($string['comment']) {
         $output .= '#: ' . $string['comment'] . "\n";
-      }
-      if ($string['context']) {
+        }
+        if ($string['context']) {
         $output .= 'msgctxt "' . $string['context'] . "\"\n";
-      }
-      $output .= 'msgid ' . _locale_export_string($string['source']);
-      if (!empty($string['plural'])) {
+        }
+        $output .= 'msgid ' . _locale_export_string($string['source']);
+        if (!empty($string['plural'])) {
         $plural = $string['plural'];
         $output .= 'msgid_plural ' . _locale_export_string($strings[$plural]['source']);
         if (isset($language)) {
-          $translation = $string['translation'];
-          for ($i = 0; $i < $language->plurals; $i++) {
+            $translation = $string['translation'];
+            for ($i = 0; $i < $language->plurals; $i++) {
             $output .= 'msgstr[' . $i . '] ' . _locale_export_string($translation);
             if ($plural) {
-              $translation = _locale_export_remove_plural($strings[$plural]['translation']);
-              $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
+                $translation = _locale_export_remove_plural($strings[$plural]['translation']);
+                $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
             }
             else {
-              $translation = '';
+                $translation = '';
+            }
             }
-          }
         }
         else {
-          $output .= 'msgstr[0] ""' . "\n";
-          $output .= 'msgstr[1] ""' . "\n";
+            $output .= 'msgstr[0] ""' . "\n";
+            $output .= 'msgstr[1] ""' . "\n";
+        }
         }
-      }
-      else {
+        else {
         $output .= 'msgstr ' . _locale_export_string($string['translation']);
-      }
-      $output .= "\n";
+        }
+        $output .= "\n";
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  *
  */
 function boinctranslate_refresh_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $errors = array();
-  $languages = locale_language_list();
-  $translation_resources = array();
-  $operations = array();
-  $debug_mode = variable_get('boinc_debug_mode', 0);
-
-  $boinc_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $errors = array();
+    $languages = locale_language_list();
+    $translation_resources = array();
+    $operations = array();
+    $debug_mode = variable_get('boinc_debug_mode', 0);
+
+    $boinc_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
-  );
-  $boinc_resources = boinctranslate_parse_resources(
+    );
+    $boinc_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_standard_resources', array())
-  );
-  // Add the Official BOINC resource to the list of BOINC resources;
-  // The official resource overrides any additional resources provided, so it
-  // should be added to the end so as to be processed last
-  $drupal_resource = variable_get(
+    );
+    // Add the Official BOINC resource to the list of BOINC resources;
+    // The official resource overrides any additional resources provided, so it
+    // should be added to the end so as to be processed last
+    $drupal_resource = variable_get(
     'boinc_translate_transifex_boinc_drupal_resource', ''
-  );
-  $boinc_resources[] = $drupal_resource;
-  if ($boinc_name AND $boinc_resources) {
+    );
+    $boinc_resources[] = $drupal_resource;
+    if ($boinc_name AND $boinc_resources) {
     $translation_resources[$boinc_name] = array(
-      'resources' => $boinc_resources,
-      'textgroups' => array(
+        'resources' => $boinc_resources,
+        'textgroups' => array(
         'boinc',
         'default',
         'taxonomy',
         'views',
-      ),
+        ),
     );
-  }
-  $project_name = variable_get(
+    }
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  $project_resources = boinctranslate_parse_resources(
+    );
+    $project_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_project_resources', array())
-  );
-  if ($project_name AND $project_resources) {
+    );
+    if ($project_name AND $project_resources) {
     $translation_resources[$project_name] = array(
-      'resources' => $project_resources,
-      'textgroups' => array(
+        'resources' => $project_resources,
+        'textgroups' => array(
         'blocks',
         'menu',
         'project',
-      ),
+        ),
     );
     // Be sure any strings from the override file are added to the boinc group
     $override_file = './' . drupal_get_path('module', 'boinctranslate') . '/includes/other-boinc-translation-strings.txt';
     $other_strings = file($override_file);
     if ($other_strings) {
-      foreach ($other_strings as $string) {
+        foreach ($other_strings as $string) {
         $string = trim($string);
         if ($string) {
-          // Ignore lines starting with '#' i.e., comments.
-          if ($string[0] === "#")
+            // Ignore lines starting with '#' i.e., comments.
+            if ($string[0] === "#")
             continue;
 
-          // Use '|' as delimiter to split string and context info.
-          $line = explode("|", $string);
-          if ($line) {
+            // Use '|' as delimiter to split string and context info.
+            $line = explode("|", $string);
+            if ($line) {
             if (count($line)==1) {
-              $tl0 = trim($line[0]);
-              if ($tl0) {
+                $tl0 = trim($line[0]);
+                if ($tl0) {
                 bts($tl0);
-              }
+                }
             }
             elseif (count($line)>1) {
-              $tl0 = trim($line[0]);
-              $tl1 = trim($line[1]);
-              if ($tl0 and $tl1) {
+                $tl0 = trim($line[0]);
+                $tl1 = trim($line[1]);
+                if ($tl0 and $tl1) {
                 bts($tl0, array(), NULL, $tl1);
-              }
+                }
             }
-          }// if ($line)
+            }// if ($line)
 
         }// if ($string)
-      }// foreach
+        }// foreach
     }// if ($other_strings)
-  }
+    }
 
-  foreach ($languages as $langcode => $language) {
+    foreach ($languages as $langcode => $language) {
     if ($langcode == 'en') {
-      continue;
+        continue;
     }
 
     $import_stats = array(
-      'new' => 0,
-      'updated' => 0,
-      'deleted' => 0,
-      'skipped' => 0,
+        'new' => 0,
+        'updated' => 0,
+        'deleted' => 0,
+        'skipped' => 0,
     );
 
     foreach ($translation_resources as $project => $translation) {
-      foreach ($translation['resources'] as $resource) {
+        foreach ($translation['resources'] as $resource) {
 
         // Add this language to the batch operations
         $operations[] = array(
-          'boinctranslate_refresh_translations_op',
-          array(
+            'boinctranslate_refresh_translations_op',
+            array(
             $project, $resource, $langcode, $language, $translation['textgroups'], $debug_mode
-          ),
+            ),
         );
-      }
+        }
     }
     if ($batch = locale_batch_by_language($langcode)) {
-      foreach ($batch['operations'] as $op) {
+        foreach ($batch['operations'] as $op) {
         $operations[] = array(
-          'boinctranslate_refresh_translations_op',
-          array(
+            'boinctranslate_refresh_translations_op',
+            array(
             NULL, $op[1][0], $langcode, $language, array('default'), $debug_mode
-          ),
+            ),
         );
-      }
+        }
+    }
     }
-  }
 
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boinctranslate_refresh_translations_finished',
     'title' => t('Importing translations'),
     'init_message' => t('Beginning translation import...'),
     'progress_message' => t('Applied @current out of @total translation updates.'),
     'error_message' => t('Translation import has encountered an error.'),
-  );
+    );
 
-  batch_set($batch);
-  batch_process();
+    batch_set($batch);
+    batch_process();
 }
 
 
@@ -741,18 +741,18 @@ 
  */
 function boinctranslate_refresh_translations_op($project, $resource, $langcode, $language, $textgroups, $debug_mode, &$context) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  if ($debug_mode) {
+    if ($debug_mode) {
     watchdog(
-      'boinctranslate',
-      'Checking for @language updates in @project:@resource',
-      array('@language' => $language, '@project' => $project, '@resource' => $resource),
-      WATCHDOG_INFO
+        'boinctranslate',
+        'Checking for @language updates in @project:@resource',
+        array('@language' => $language, '@project' => $project, '@resource' => $resource),
+        WATCHDOG_INFO
     );
-  }
+    }
 
-  if ($project) {
+    if ($project) {
     // Import the configured resources
     $success = FALSE;
     $message = '';
@@ -760,10 +760,10 @@ 
     $response = boinctranslate_transifex_request($path);
 
     if ($response == '404 NOT FOUND') {
-      $message = "Project resource {$project}:{$resource} not found in {$language}.";
+        $message = "Project resource {$project}:{$resource} not found in {$language}.";
     }
     elseif ($response) {
-      if (!empty($response['content'])) {
+        if (!empty($response['content'])) {
         $po_text = $response['content'];
 
         // Write the translation file to a temporary location
@@ -771,163 +771,163 @@ 
         $file->filepath = file_save_data($po_text, NULL);
         $file->filename = basename($file->filepath);
         if (!$file->filepath) {
-          $message = 'Unable to create temporary file in '
+            $message = 'Unable to create temporary file in '
             . file_directory_temp() . " for {$language} translation "
             . "resource {$project}:{$resource}";
         }
 
         foreach ($textgroups as $textgroup) {
-          // Import the translations from the file to each related textgroup
-          if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
+            // Import the translations from the file to each related textgroup
+            if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
             $message = "The {$language} translation import of"
-              . " {$project}:{$resource} failed.";
+                . " {$project}:{$resource} failed.";
             $success = FALSE;
             break;
-          }
-          else {
+            }
+            else {
             $success = TRUE;
-          }
+            }
+        }
         }
-      }
-      else {
+        else {
         $message = "Unable to read response for {$language} translation import"
-          . " of {$project}:{$resource}.";
-      }
+            . " of {$project}:{$resource}.";
+        }
     }
     else {
-      $message = "Translation data not found in response for {$language}"
+        $message = "Translation data not found in response for {$language}"
         . " translation import of {$project}:{$resource}.";
     }
-  }
-  else {
+    }
+    else {
     // If project isn't specified, import as a local Drupal resource
     $project = 'drupal.local';
     $file = new stdClass();
     $file->filepath = $resource;
     $file->filename = basename($file->filepath);
     if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
-      $message = "The {$language} translation import of"
+        $message = "The {$language} translation import of"
         . " local file {$resource} failed.";
-      $success = FALSE;
+        $success = FALSE;
     }
     else {
-      $success = TRUE;
+        $success = TRUE;
+    }
     }
-  }
 
-  if ($success) {
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = "{$langcode}:{$textgroup}";
     $message = "Imported {$language} translations in {$project}:{$resource} ({$results['new']} added, {$results['updated']} refreshed, {$results['deleted']} removed)";
 
     if ($debug_mode) {
-      watchdog(
+        watchdog(
         'boinctranslate',
         $message,
         array(),
         WATCHDOG_INFO
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = "{$langcode}:{$textgroup}";
     watchdog(
-      'boinctranslate',
-      $message,
-      array(),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        $message,
+        array(),
+        WATCHDOG_WARNING
     );
-  }
+    }
 
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['language'] = $langcode;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['language'] = $langcode;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boinctranslate_refresh_translations_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $count = count($results['success']);
     $message = "Successfully completed {$count} import operations";
     watchdog(
-      'boinctranslate',
-      'Successfully completed @count import operations.',
-      array('@count' => $count),
-      WATCHDOG_INFO
+        'boinctranslate',
+        'Successfully completed @count import operations.',
+        array('@count' => $count),
+        WATCHDOG_INFO
     );
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
     watchdog(
-      'boinctranslate',
-      $message,
-      array(),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        $message,
+        array(),
+        WATCHDOG_WARNING
     );
-  }
-  drupal_set_message($message);
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_set_message($message);
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function _boinctranslate_locale_import_po($file, $langcode, $mode, $group = NULL) {
-  // Try to allocate enough time to parse and import the data.
-  if (function_exists('set_time_limit')) {
+    // Try to allocate enough time to parse and import the data.
+    if (function_exists('set_time_limit')) {
     @set_time_limit(240);
-  }
+    }
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  // Check if we have the language already in the database.
-  if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
+    // Check if we have the language already in the database.
+    if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
     drupal_set_message(t('The language selected for import is not supported.'), 'error');
     return FALSE;
-  }
+    }
 
-  // Get strings from file (returns on failure after a partial import, or on success)
-  $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
-  if ($status === FALSE) {
+    // Get strings from file (returns on failure after a partial import, or on success)
+    $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
+    if ($status === FALSE) {
     // Error messages are set in _locale_import_read_po().
     return FALSE;
-  }
+    }
 
-  // Get status information on import process.
-  list($headerdone, $additions, $updates, $deletes, $skips) = _boinctranslate_locale_import_one_string('db-report');
+    // Get status information on import process.
+    list($headerdone, $additions, $updates, $deletes, $skips) = _boinctranslate_locale_import_one_string('db-report');
 
-  if (!$headerdone) {
+    if (!$headerdone) {
     drupal_set_message(t('The translation file %filename appears to have a missing or malformed header.', array('%filename' => $file->filename)), 'error');
-  }
+    }
 
-  // Clear cache and force refresh of JavaScript translations.
-  _locale_invalidate_js($langcode);
-  cache_clear_all('locale:', 'cache', TRUE);
+    // Clear cache and force refresh of JavaScript translations.
+    _locale_invalidate_js($langcode);
+    cache_clear_all('locale:', 'cache', TRUE);
 
-  // Rebuild the menu, strings may have changed.
-  menu_rebuild();
+    // Rebuild the menu, strings may have changed.
+    menu_rebuild();
 
-  return array(
+    return array(
     'new' => $additions,
     'updated' => $updates,
     'deleted' => $deletes,
     'skipped' => $skips,
-  );
+    );
 }
 
 /**
@@ -935,253 +935,253 @@ 
  */
 function _boinctranslate_locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
-  if (!$fd) {
+    $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
+    if (!$fd) {
     watchdog(
-      'boinctranslate',
-      'The translation import for %lang failed, because %filename could not be read.',
-      array('%lang' => $lang, '%filename' => $file->filename),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        'The translation import for %lang failed, because %filename could not be read.',
+        array('%lang' => $lang, '%filename' => $file->filename),
+        WATCHDOG_WARNING
     );
     _locale_import_message('The translation import failed, because the file %filename could not be read.', $file);
     return FALSE;
-  }
+    }
 
-  $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
-  $current = array(); // Current entry being read
-  $plural = 0; // Current plural form
-  $lineno = 0; // Current line
+    $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
+    $current = array(); // Current entry being read
+    $plural = 0; // Current plural form
+    $lineno = 0; // Current line
 
-  while (!feof($fd)) {
+    while (!feof($fd)) {
     $line = fgets($fd, 10 * 1024); // A line should not be this long
     if ($lineno == 0) {
-      // The first line might come with a UTF-8 BOM, which should be removed.
-      $line = str_replace("\xEF\xBB\xBF", '', $line);
+        // The first line might come with a UTF-8 BOM, which should be removed.
+        $line = str_replace("\xEF\xBB\xBF", '', $line);
     }
     $lineno++;
     $line = trim(strtr($line, array("\\\n" => "")));
 
     if (!strncmp("#", $line, 1)) { // A comment
-      if ($context == "COMMENT") { // Already in comment context: add
+        if ($context == "COMMENT") { // Already in comment context: add
         $current["#"][] = substr($line, 1);
-      }
-      elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        }
+        elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
         $current["#"][] = substr($line, 1);
         $context = "COMMENT";
-      }
-      else { // Parse error
+        }
+        else { // Parse error
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
-      }
+        }
     }
     elseif (!strncmp("msgctxt", $line, 7)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
+        }
+        elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 7));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 7));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgctxt"] = $quoted;
-      $context = "MSGCTXT";
+        }
+        $current["msgctxt"] = $quoted;
+        $context = "MSGCTXT";
     }
     elseif (!strncmp("msgid_plural", $line, 12)) {
-      if ($context != "MSGID") { // Must be plural form for current entry
+        if ($context != "MSGID") { // Must be plural form for current entry
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 12));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 12));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgid"] = $current["msgid"] . "\0" . $quoted;
-      $context = "MSGID_PLURAL";
+        }
+        $current["msgid"] = $current["msgid"] . "\0" . $quoted;
+        $context = "MSGID_PLURAL";
     }
     elseif (!strncmp("msgid", $line, 5)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif ($context == "MSGID") { // Already in this context? Parse error
+        }
+        elseif ($context == "MSGID") { // Already in this context? Parse error
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 5));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 5));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgid"] = $quoted;
-      $context = "MSGID";
+        }
+        $current["msgid"] = $quoted;
+        $context = "MSGID";
     }
     elseif (!strncmp("msgstr[", $line, 7)) {
-      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
+        if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      if (strpos($line, "]") === FALSE) {
+        }
+        if (strpos($line, "]") === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $frombracket = strstr($line, "[");
-      $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
-      $line = trim(strstr($line, " "));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $frombracket = strstr($line, "[");
+        $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
+        $line = trim(strstr($line, " "));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgstr"][$plural] = $quoted;
-      $context = "MSGSTR_ARR";
+        }
+        $current["msgstr"][$plural] = $quoted;
+        $context = "MSGSTR_ARR";
     }
     elseif (!strncmp("msgstr", $line, 6)) {
-      if ($context != "MSGID") { // Should come just after a msgid block
+        if ($context != "MSGID") { // Should come just after a msgid block
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 6));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 6));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgstr"] = $quoted;
-      $context = "MSGSTR";
+        }
+        $current["msgstr"] = $quoted;
+        $context = "MSGSTR";
     }
     elseif ($line != "") {
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
+        }
+        if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
         $current["msgid"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR") {
+        }
+        elseif ($context == "MSGSTR") {
         $current["msgstr"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR_ARR") {
+        }
+        elseif ($context == "MSGSTR_ARR") {
         $current["msgstr"][$plural] .= $quoted;
-      }
-      else {
+        }
+        else {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: there is an unexpected string on line %line.', $file, $lineno);
         return FALSE;
-      }
+        }
+    }
     }
-  }
 
-  // End of PO file, flush last entry
-  if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
+    // End of PO file, flush last entry
+    if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
     _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
-  }
-  elseif ($context != "COMMENT") {
+    }
+    elseif ($context != "COMMENT") {
     watchdog(
-      'boinctranslate',
-      'The translation file %filename for %lang ended unexpectedly at line %line.',
-      array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        'The translation file %filename for %lang ended unexpectedly at line %line.',
+        array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+        WATCHDOG_WARNING
     );
     _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno);
     return FALSE;
-  }
+    }
 
 }
 
@@ -1190,28 +1190,28 @@ 
  */
 function _boinctranslate_locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  static $report = array(
+    static $report = array(
     'additions' => 0,
     'updates' => 0,
     'deletes' => 0,
     'skips' => 0,
-  );
-  static $headerdone = FALSE;
-  static $strings = array();
+    );
+    static $headerdone = FALSE;
+    static $strings = array();
 
-  switch ($op) {
+    switch ($op) {
     // Return stored strings
     case 'mem-report':
       return $strings;
 
-      // Store string in memory (only supports single strings)
+        // Store string in memory (only supports single strings)
     case 'mem-store':
       $strings[$value['msgid']] = $value['msgstr'];
-      return;
+        return;
 
-      // Called at end of import to inform the user
+        // Called at end of import to inform the user
     case 'db-report':
       return array(
         $headerdone,
@@ -1219,57 +1219,57 @@ 
         $report['updates'],
         $report['deletes'],
         $report['skips'],
-      );
+        );
 
-      // Store the string we got in the database.
+        // Store the string we got in the database.
     case 'db-store':
       // We got header information.
       if ($value['msgid'] == '') {
         $languages = language_list();
         if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
-          // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing
-          // data untouched or if we don't have an existing plural formula.
-          $header = _locale_import_parse_header($value['msgstr']);
+            // Since we only need to parse the header if we ought to update the
+            // plural formula, only run this if we don't need to keep existing
+            // data untouched or if we don't have an existing plural formula.
+            $header = _locale_import_parse_header($value['msgstr']);
 
-          // Get and store the plural formula if available.
-          if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+            // Get and store the plural formula if available.
+            if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
             list($nplurals, $plural) = $p;
             db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
-          }
+            }
         }
         $headerdone = TRUE;
-      }
+        }
 
-      else {
+        else {
         // Some real string to import.
         $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
 
         if (strpos($value['msgid'], "\0")) {
-          // This string has plural versions.
-          $english = explode("\0", $value['msgid'], 2);
-          $entries = array_keys($value['msgstr']);
-          for ($i = 3; $i <= count($entries); $i++) {
+            // This string has plural versions.
+            $english = explode("\0", $value['msgid'], 2);
+            $entries = array_keys($value['msgstr']);
+            for ($i = 3; $i <= count($entries); $i++) {
             $english[] = $english[1];
-          }
-          $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
-          $english = array_map('_locale_import_append_plural', $english, $entries);
-          foreach ($translation as $key => $trans) {
+            }
+            $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
+            $english = array_map('_locale_import_append_plural', $english, $entries);
+            foreach ($translation as $key => $trans) {
             if ($key == 0) {
-              $plid = 0;
+                $plid = 0;
             }
             $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
-          }
+            }
         }
 
         else {
-          // A simple string to import.
-          $english = $value['msgid'];
-          $translation = $value['msgstr'];
-          _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
+            // A simple string to import.
+            $english = $value['msgid'];
+            $translation = $value['msgstr'];
+            _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
         }
-      }
-  } // end of db-store operation
+        }
+    } // end of db-store operation
 }
 
 /**
@@ -1286,15 +1286,15 @@ 
  */
 function _boinctranslate_locale_import_one_string_db(&$report, $langcode, $source, $translation, $textgroup, $location, $mode, $plid = NULL, $plural = NULL) {
 
-  $ignoreoverwrite = FALSE;
-  $lid = 0;
+    $ignoreoverwrite = FALSE;
+    $lid = 0;
 
-  // Use different DB query depending on the textgroup.
-  $uselocation = array("boinc", "project");
-  if (in_array($textgroup, $uselocation)) {
+    // Use different DB query depending on the textgroup.
+    $uselocation = array("boinc", "project");
+    if (in_array($textgroup, $uselocation)) {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s' AND textgroup = '%s'", $location, $source, $textgroup);
-  }
-  else {
+    }
+    else {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup);
 
     // Parse the location string for the string ignoreoverwrite, which
@@ -1303,61 +1303,61 @@ 
     // location string.
     $parts = explode(':', $location);
     if (!empty($parts[2])) {
-      if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
+        if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
         $ignoreoverwrite = TRUE;
-      }
+        }
     }
-  }// if (in_array($textgroup, $uselocation))
+    }// if (in_array($textgroup, $uselocation))
 
-  if (!empty($translation)) {
+    if (!empty($translation)) {
     // Skip this string unless it passes a check for dangerous code.
     // Text groups other than default still can contain HTML tags
     // (i.e. translatable blocks).
     if ($textgroup == "default" && !locale_string_is_safe($translation)) {
-      $report['skips']++;
-      $lid = 0;
+        $report['skips']++;
+        $lid = 0;
     }
     elseif ($resource) {
-      // We have this source string saved already. Loop over the db results from locales_source table.
-      while ($row = db_fetch_array($resource)) {
+        // We have this source string saved already. Loop over the db results from locales_source table.
+        while ($row = db_fetch_array($resource)) {
 
         $lid = $row['lid'];
         // Check of if one or more translations exist for this lid in locales_target table.
         $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
         if (!$exists) {
-          // No translation in this language, insert translation into locales_target table.
-          db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
-          $report['additions']++;
+            // No translation in this language, insert translation into locales_target table.
+            db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
+            $report['additions']++;
         }
         else if ( ($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite) ) {
-          // Translation exists, only overwrite if instructed.
-          db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
-          $report['updates']++;
+            // Translation exists, only overwrite if instructed.
+            db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
+            $report['updates']++;
         }
         else {
-          $report['skips']++;
+            $report['skips']++;
         }// end if !$exists
 
-      }// while
+        }// while
     }
-  }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
+    }
+    elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
-      $lid = $row['lid'];
-      $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
-      if ($exists) {
+        $lid = $row['lid'];
+        $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
+        if ($exists) {
         // Empty translation, remove existing if instructed.
         db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $langcode, $lid, $plid, $plural);
         $report['deletes']++;
-      }// if $exists
+        }// if $exists
     }// while
-  }
-  else {
+    }
+    else {
     $report['skips']++;
-  }
+    }
 
-  return $lid;
+    return $lid;
 }
 
 
@@ -1366,17 +1366,17 @@ 
  * Parse valid resources out of configuration
  */
 function boinctranslate_parse_resources($resource_text) {
-  $resources = array();
-  $resource_array = explode(
+    $resources = array();
+    $resource_array = explode(
     "\n", $resource_text
-  );
-  foreach ($resource_array as $resource) {
+    );
+    foreach ($resource_array as $resource) {
     $resource = trim($resource);
     if ($resource AND $resource[0] != '#') {
-      $resources[] = $resource;
+        $resources[] = $resource;
     }
-  }
-  return $resources;
+    }
+    return $resources;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1403,5 +1403,5 @@ 
  * database.
  */
 function _boinctranslate_supertrim($instr) {
-  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
+    return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
 }

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

Indentation +145 added lines, -145 removed lines

@@ -7,85 +7,85 @@ 
 */
 
 /**
-  * The BOINC translation settings form allows configuration of BTS integration
-  * (and other translation related settings)
-  */
+ * The BOINC translation settings form allows configuration of BTS integration
+ * (and other translation related settings)
+ */
 function boinctranslate_admin_settings(&$form_state) {
-  $form = array();
-  $initialized = FALSE;
-  $import_enabled = FALSE;
-  $default = array(
+    $form = array();
+    $initialized = FALSE;
+    $import_enabled = FALSE;
+    $default = array(
     'transifex_user' => variable_get('boinc_translate_transifex_user', ''),
     'transifex_pass' => variable_get('boinc_translate_transifex_pass', ''),
     'transifex_boinc_name' => variable_get(
-      'boinc_translate_transifex_standard_name', 'boinc'
+        'boinc_translate_transifex_standard_name', 'boinc'
     ),
     'transifex_boinc_resources' => variable_get(
-      'boinc_translate_transifex_standard_resources',
-      "project-generic\nweb"
+        'boinc_translate_transifex_standard_resources',
+        "project-generic\nweb"
     ),
     'transifex_boinc_drupal_resource' => variable_get(
-      'boinc_translate_transifex_boinc_drupal_resource',
-      'drupal'
+        'boinc_translate_transifex_boinc_drupal_resource',
+        'drupal'
     ),
     'transifex_project_name' => variable_get(
-      'boinc_translate_transifex_project_name', ''
+        'boinc_translate_transifex_project_name', ''
     ),
     'transifex_project_resources' => variable_get(
-      'boinc_translate_transifex_project_resources', ''
+        'boinc_translate_transifex_project_resources', ''
     ),
-  );
+    );
 
-  if ($default['transifex_user'] AND $default['transifex_pass']) {
+    if ($default['transifex_user'] AND $default['transifex_pass']) {
     if (trim($default['transifex_boinc_resources'])
     OR trim($default['transifex_project_resources'])) {
-      $import_enabled = TRUE;
+        $import_enabled = TRUE;
     }
     if ($default['transifex_boinc_name']
     AND $default['transifex_project_name']
     AND trim($default['transifex_boinc_resources'])
     AND trim($default['transifex_project_resources'])) {
-      $initialized = TRUE;
+        $initialized = TRUE;
+    }
     }
-  }
 
-  // Define the form
+    // Define the form
 
-  $form['transifex'] = array(
+    $form['transifex'] = array(
     '#title' => t('Transifex settings'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => $initialized,
     '#attributes' => array('class' => '')
-  );
-  $form['transifex']['boinc_translate_transifex_user'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_user'] = array(
     '#type' => 'textfield',
     '#title' => t('User name'),
     '#default_value' => $default['transifex_user'],
-  );
-  $form['transifex']['boinc_translate_transifex_pass'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_pass'] = array(
     '#type' => 'password',
     '#title' => t('Password'),
     '#attributes' => array(
-      'placeholder' => $default['transifex_pass'] ? '********' : '',
+        'placeholder' => $default['transifex_pass'] ? '********' : '',
     ),
-  );
-  $form['transifex']['boinc_translate_transifex_standard_name'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_standard_name'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC Transifex project'),
     '#default_value' => $default['transifex_boinc_name'],
     '#description' => t('The portion of the Transifex URL that identifies BOINC.'),
-  );
-  $form['transifex']['boinc_translate_transifex_boinc_drupal_resource'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_boinc_drupal_resource'] = array(
     '#type' => 'textfield',
     '#title' => t('Official BOINC Drupal Resource'),
     '#default_value' => $default['transifex_boinc_drupal_resource'],
     '#description' => t('The portion of the Transifex URL that identifies
       the standard BOINC Resource to use for translation of the public
       content defined in the Drupal system.'),
-  );
-  $form['transifex']['boinc_translate_transifex_standard_resources'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_standard_resources'] = array(
     '#type' => 'textarea',
     '#title' => t('Additional BOINC Resources'),
     '#default_value' => $default['transifex_boinc_resources'],
@@ -96,14 +96,14 @@ 
       by any matching translations found in Resources further down the list.
       Note that strings from the Official BOINC Drupal Resource will override
       any strings from these additional Resources.'),
-  );
-  $form['transifex']['boinc_translate_transifex_project_name'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_project_name'] = array(
     '#type' => 'textfield',
     '#title' => t('Project-specific Transifex project'),
     '#default_value' => $default['transifex_project_name'],
     '#description' => t('The portion of the Transifex URL that identifies this project.'),
-  );
-  $form['transifex']['boinc_translate_transifex_project_resources'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_project_resources'] = array(
     '#type' => 'textarea',
     '#title' => t('Project-specific Resources'),
     '#default_value' => $default['transifex_project_resources'],
@@ -116,241 +116,241 @@ 
       NOTE: The first Resource listed here is considered the primary Resource
       for project-specific translations and will be updated by the "Update
       project-specific Resources" button below!'),
-  );
-  $form['transifex']['buttons']['submit'] = array(
+    );
+    $form['transifex']['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration'),
-  );
+    );
 
-  $form['tools'] = array(
+    $form['tools'] = array(
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#attributes' => array('class' => '')
-  );
-  $form['tools']['initialize_languages_text'] = array(
+    );
+    $form['tools']['initialize_languages_text'] = array(
     '#type' => 'item',
     '#title' => t('Install official BOINC languages'),
     '#value' => t('Installs all languages from the BOINC Transifex project. Also installs missing languages in Drupal. <br>Languages must be enabled manually in Administer > Site configuration > Languages.'),
-  );
-  $form['tools']['initialize_languages'] = array(
+    );
+    $form['tools']['initialize_languages'] = array(
     '#type' => 'button',
     '#value' => t('Install official BOINC languages'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_initialize_languages'),
     '#disabled' => !$initialized,
-  );
-  $form['tools']['import_now_text'] = array(
+    );
+    $form['tools']['import_now_text'] = array(
     '#type' => 'item',
     '#title' => t('Import all translations'),
     '#value' => t('Imports from Tranifex all configured Resources into their respective text groups.'),
-  );
-  $form['tools']['import_now'] = array(
+    );
+    $form['tools']['import_now'] = array(
     '#type' => 'button',
     '#value' => t('Import all translations'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_import_now'),
     '#disabled' => !$import_enabled,
-  );
-  $form['tools']['download_boinc_pot_text'] = array(
+    );
+    $form['tools']['download_boinc_pot_text'] = array(
     '#type' => 'item',
     '#title' => t('Download official BOINC-Drupal .pot'),
     '#value' => t('Downloads the generic BOINC-Drupal .pot file. This is the template file for the boinc text group.'),
-  );
-  $form['tools']['download_boinc_pot'] = array(
+    );
+    $form['tools']['download_boinc_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download official BOINC-Drupal .pot'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_download_boinc_pot'),
     '#disabled' => !$import_enabled,
-  );
-  $form['tools']['download_project_pot_text'] = array(
+    );
+    $form['tools']['download_project_pot_text'] = array(
     '#type' => 'item',
     '#title' => t('Download project-specific .pot'),
     '#value' => t('Downloads the project-specific .pot file. This is the template file for the project text group.'),
-  );
-  $form['tools']['download_project_pot'] = array(
+    );
+    $form['tools']['download_project_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download project-specific .pot'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_download_project_pot'),
     '#disabled' => !$import_enabled,
-  );
-  if (user_access('update official BOINC translations')) {
+    );
+    if (user_access('update official BOINC translations')) {
     $form['tools']['update_official_boinc_text'] = array(
-      '#type' => 'item',
-      '#title' => t('Update official BOINC translations'),
-      '#value' => t('Updates the official BOINC-Drupal Resource (translatable strings templates) to the BOINC Transifex project, based on the consolidated imported translations.<br><b>WARNING: Do not use unless you have write-access to the BOINC Transifex project.</b>'),
+        '#type' => 'item',
+        '#title' => t('Update official BOINC translations'),
+        '#value' => t('Updates the official BOINC-Drupal Resource (translatable strings templates) to the BOINC Transifex project, based on the consolidated imported translations.<br><b>WARNING: Do not use unless you have write-access to the BOINC Transifex project.</b>'),
     );
     $form['tools']['update_official_boinc'] = array(
-      '#type' => 'button',
-      '#value' => t('Update official BOINC translations'),
-      '#executes_submit_callback' => TRUE,
-      '#submit' => array('boinctranslate_admin_settings_update_official_boinc'),
-      '#disabled' => !$import_enabled,
+        '#type' => 'button',
+        '#value' => t('Update official BOINC translations'),
+        '#executes_submit_callback' => TRUE,
+        '#submit' => array('boinctranslate_admin_settings_update_official_boinc'),
+        '#disabled' => !$import_enabled,
     );
-  }
-  $form['tools']['export_now_text'] = array(
+    }
+    $form['tools']['export_now_text'] = array(
     '#type' => 'item',
     '#title' => t('Update project-specific Resources'),
     '#value' => t('Updates the configured Resources (translatable strings templates) to the project\'s Transifex project.<br><b>WARNING: Do not use unless you have write-access to your project\'s Transifex project.</b>'),
-  );
-  $form['tools']['export_now'] = array(
+    );
+    $form['tools']['export_now'] = array(
     '#type' => 'button',
     '#value' => t('Update project-specific Resources'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_export_now'),
     '#disabled' => !$import_enabled,
-  );
+    );
 
-  $form['#submit'][] = 'system_settings_form_submit';
-  $form['#theme'] = 'system_settings_form';
+    $form['#submit'][] = 'system_settings_form_submit';
+    $form['#theme'] = 'system_settings_form';
 
-  return $form;
+    return $form;
 }
 
 function boinctranslate_admin_settings_export_now() {
-  drupal_goto('admin/boinc/translation/export');
+    drupal_goto('admin/boinc/translation/export');
 }
 
 function boinctranslate_admin_settings_import_now() {
-  drupal_goto('admin/boinc/translation/import');
+    drupal_goto('admin/boinc/translation/import');
 }
 
 function boinctranslate_admin_settings_initialize_languages() {
-  drupal_goto('admin/boinc/translation/initialize-languages');
+    drupal_goto('admin/boinc/translation/initialize-languages');
 }
 
 function boinctranslate_admin_settings_update_official_boinc() {
-  drupal_goto('admin/boinc/translation/update-official-boinc');
+    drupal_goto('admin/boinc/translation/update-official-boinc');
 }
 
 function boinctranslate_admin_settings_download_boinc_pot() {
-  drupal_goto('admin/boinc/translation/download-pot/boinc');
+    drupal_goto('admin/boinc/translation/download-pot/boinc');
 }
 
 function boinctranslate_admin_settings_download_project_pot() {
-  drupal_goto('admin/boinc/translation/download-pot/project');
+    drupal_goto('admin/boinc/translation/download-pot/project');
 }
 
 
 /**
-  * Validate the BOINC translation settings form.
-  */
+ * Validate the BOINC translation settings form.
+ */
 function boinctranslate_admin_settings_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  $errors = array();
-  $api_base_url = 'https://www.transifex.com/api/2';
+    $values = $form_state['values'];
+    $errors = array();
+    $api_base_url = 'https://www.transifex.com/api/2';
 
-  if (!$values['boinc_translate_transifex_user']) {
+    if (!$values['boinc_translate_transifex_user']) {
     form_set_error('boinc_translate_transifex_user', t('User name is required.'));
-  }
-  if (!$values['boinc_translate_transifex_pass']) {
+    }
+    if (!$values['boinc_translate_transifex_pass']) {
     if (!variable_get('boinc_translate_transifex_pass', '')) {
-      form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
+        form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
     }
     else {
-      unset($form_state['values']['boinc_translate_transifex_pass']);
+        unset($form_state['values']['boinc_translate_transifex_pass']);
+    }
     }
-  }
-  if (!$values['boinc_translate_transifex_standard_name']) {
+    if (!$values['boinc_translate_transifex_standard_name']) {
     form_set_error('boinc_translate_transifex_standard_name',
-      t('BOINC Transifex project name is required.')
+        t('BOINC Transifex project name is required.')
     );
-  }
-  if (!$values['boinc_translate_transifex_standard_resources']) {
+    }
+    if (!$values['boinc_translate_transifex_standard_resources']) {
     form_set_error('boinc_translate_transifex_standard_resources',
-      t('At least one BOINC Transifex project Resource is required.')
+        t('At least one BOINC Transifex project Resource is required.')
     );
-  }
-  if (!$values['boinc_translate_transifex_project_resources']) {
+    }
+    if (!$values['boinc_translate_transifex_project_resources']) {
     form_set_error('boinc_translate_transifex_project_resources',
-      t('At least one project-specific Transifex Resource is required.')
+        t('At least one project-specific Transifex Resource is required.')
     );
-  }
+    }
 
-  $username = $values['boinc_translate_transifex_user'];
-  $password = ($values['boinc_translate_transifex_pass']) ? $values['boinc_translate_transifex_pass'] : variable_get('boinc_translate_transifex_pass', '');
-  $boinc_name = $values['boinc_translate_transifex_standard_name'];
-  $boinc_resources = boinctranslate_parse_resources(
+    $username = $values['boinc_translate_transifex_user'];
+    $password = ($values['boinc_translate_transifex_pass']) ? $values['boinc_translate_transifex_pass'] : variable_get('boinc_translate_transifex_pass', '');
+    $boinc_name = $values['boinc_translate_transifex_standard_name'];
+    $boinc_resources = boinctranslate_parse_resources(
     $values['boinc_translate_transifex_standard_resources']
-  );
+    );
 
-  if ($username AND $password AND $boinc_name AND $boinc_resources) {
+    if ($username AND $password AND $boinc_name AND $boinc_resources) {
     // Test authentication
     $authenticated = FALSE;
     $path = "project/{$boinc_name}/resource/{$boinc_resources[0]}/translation/en";
     $response = boinctranslate_transifex_request($path, NULL, TRUE, FALSE, $username, $password);
 
     if ($response) {
-      if ($response == '401 UNAUTHORIZED') {
+        if ($response == '401 UNAUTHORIZED') {
         form_set_error(
-          'boinc_translate_transifex_pass',
-          t('Transifex authentication failed.')
+            'boinc_translate_transifex_pass',
+            t('Transifex authentication failed.')
         );
-      }
-      else {
+        }
+        else {
         $authenticated = TRUE;
-      }
+        }
     }
 
     if ($authenticated) {
-      // Prepare list of resources to validate
-      $transifex_resources = array(
+        // Prepare list of resources to validate
+        $transifex_resources = array(
         'boinc' => $boinc_resources,
-      );
-      // Parse project-specific resources
-      $project_name = trim($values['boinc_translate_transifex_project_name']);
-      $project_resources = boinctranslate_parse_resources(
+        );
+        // Parse project-specific resources
+        $project_name = trim($values['boinc_translate_transifex_project_name']);
+        $project_resources = boinctranslate_parse_resources(
         $values['boinc_translate_transifex_project_resources']
-      );
-      if ($project_name AND $project_resources) {
+        );
+        if ($project_name AND $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
-      }
-      elseif ($project_name AND !$project_resources) {
+        }
+        elseif ($project_name AND !$project_resources) {
         drupal_set_message(
-          t('No project-specific resources were provided'),
-          'warning'
+            t('No project-specific resources were provided'),
+            'warning'
         );
-      }
-      elseif ($project_resources AND !$project_name) {
+        }
+        elseif ($project_resources AND !$project_name) {
         drupal_set_message(
-          t('No project-specific Transifex project name was provided'),
-          'warning'
+            t('No project-specific Transifex project name was provided'),
+            'warning'
         );
-      }
+        }
 
-      // Try to access the given resources
-      foreach ($transifex_resources as $project => $resources) {
+        // Try to access the given resources
+        foreach ($transifex_resources as $project => $resources) {
         foreach ($resources as $resource) {
 
-          $path = "project/{$project}/resource/{$resource}/translation/en";
-          $response = boinctranslate_transifex_request($path);
+            $path = "project/{$project}/resource/{$resource}/translation/en";
+            $response = boinctranslate_transifex_request($path);
 
-          if ($response == '404 NOT FOUND') {
+            if ($response == '404 NOT FOUND') {
             form_set_error(
-              'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
-              t('Resource %name not found in %project.',
+                'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
+                t('Resource %name not found in %project.',
                 array(
-                  '%name' => $resource,
-                  '%project' => $project,
+                    '%name' => $resource,
+                    '%project' => $project,
+                )
                 )
-              )
             );
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of BOINC translation settings form.
-  */
+ * Handle post-validation submission of BOINC translation settings form.
+ */
 function boinctranslate_admin_settings_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC translation settings have been updated.'));
+    drupal_set_message(t('BOINC translation settings have been updated.'));
 }
 
 

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

Indentation +114 added lines, -114 removed lines

@@ -7,191 +7,191 @@ 
 */
 
 /**
-  * The BOINC community form allows the setting of requirements for interaction
-  * in the community sections of the site.
-  */
+ * The BOINC community form allows the setting of requirements for interaction
+ * in the community sections of the site.
+ */
 function boinccore_admin_community(&$form_state) {
-  $form = array();
-  $default = array(
+    $form = array();
+    $default = array(
     'min_credit_to_post' => variable_get('boinc_comment_min_credit', 0),
     'penalty_period' => variable_get('boinc_penalty_period', 7*24*60*60),
     'moderator_mailing_list' => variable_get('boinc_moderator_mailing_list', ''),
     'moderator_force_individual_notifications' => variable_get('boinc_moderator_force_individual_notifications', 0),
-  );
+    );
 
-  // Define the form
-  $form['boinc_comment_min_credit'] = array(
+    // Define the form
+    $form['boinc_comment_min_credit'] = array(
     '#type' => 'textfield',
     '#title' => t('Credit required for community participation'),
     '#default_value' => $default['min_credit_to_post'],
     '#description' => t('Set a minimum threshold of credit a user must have
       earned before being allowed to create a profile, post comments or participate in forums.'),
-  );
-  $form['boinc_penalty_period'] = array(
+    );
+    $form['boinc_penalty_period'] = array(
     '#type' => 'textfield',
     '#title' => t('Penalty period'),
     '#default_value' => $default['penalty_period'],
     '#description' => t('The amount of time (in seconds) that user privileges
       are revoked when a user is banned from community participation.'),
-  );
-  $form['boinc_moderator_mailing_list'] = array(
+    );
+    $form['boinc_moderator_mailing_list'] = array(
     '#type' => 'textfield',
     '#title' => t('Moderator mailing list'),
     '#default_value' => $default['moderator_mailing_list'],
     '#description' => t('As an alternative to sending moderator notifications
       to individual users with the moderator role, enter a mailing list address
       here to be the only target of the notification emails.'),
-  );
-  $form['boinc_moderator_force_individual_notifications'] = array(
+    );
+    $form['boinc_moderator_force_individual_notifications'] = array(
     '#type' => 'checkbox',
     '#title' => t('Always send individual notifications'),
     '#default_value' => $default['moderator_force_individual_notifications'],
     '#description' => t('Continue to send individual moderator notification
       emails even when a mailing list is provided.'),
-  );
+    );
 
-  $form['tools'] = array(
+    $form['tools'] = array(
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#attributes' => array('class' => '')
-  );
-  $form['tools']['reset_uotd'] = array(
+    );
+    $form['tools']['reset_uotd'] = array(
     '#type' => 'submit',
     '#value' => t('Force new UOTD'),
     '#submit' => array('boinccore_reset_user_of_the_day'),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC community form.
-  */
+ * Validate the BOINC community form.
+ */
 function boinccore_admin_community_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!is_numeric($values['boinc_comment_min_credit'])) {
+    $values = $form_state['values'];
+    if (!is_numeric($values['boinc_comment_min_credit'])) {
     form_set_error('boinc_comment_min_credit', t('The minimum credit value must be a number.'));
-  }
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC community form.
-  */
+ * Handle post-validation submission of BOINC community form.
+ */
 function boinccore_admin_community_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC community settings have been updated.'));
+    drupal_set_message(t('BOINC community settings have been updated.'));
 }
 
 /**
  * Force a reset of the user of the day
  */
 function boinccore_reset_user_of_the_day() {
-  if (boincuser_select_user_of_the_day()) {
+    if (boincuser_select_user_of_the_day()) {
     drupal_set_message(t('The user of the day has been reset.'));
-  }
+    }
 }
 
 /**
-  * The standard page generator form provides an interface to create standard
-  * pages, such as a Help or About page.
-  */
+ * The standard page generator form provides an interface to create standard
+ * pages, such as a Help or About page.
+ */
 function boinccore_admin_default_content(&$form_state) {
-  $form = array();
+    $form = array();
 
-  // Define the form
-  $form['page'] = array(
+    // Define the form
+    $form['page'] = array(
     '#type' => 'select',
     '#title' => t('Generate default content for'),
     '#description' => t('Generate some standard pages for a Drupal-BOINC Web site. You may generate all pages or specific pages. If a page already exists, it will <b>not</b> be overwritten. Pages will be generated with the path \'/page\', e.g., \'/help\'. Note the absense of \'content/\'.<p>The pages generated here will have very limited content. Most will have content such as \'Add a link to your FAQ here.\', and it is the admin or editors responsibility to add the necessary content.'),
     '#options' => array(
-      0 => t('All standard pages'),
+        0 => t('All standard pages'),
 //      'about' => t('About page'),
-      'help' => t('Help page'),
-      'rules' => t('Rules and Policies page'),
-      'moderation' => t('Moderation information page'),
+        'help' => t('Help page'),
+        'rules' => t('Rules and Policies page'),
+        'moderation' => t('Moderation information page'),
     ),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => 'Generate content',
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
-  * Generate content based on the selection made on the form
-  */
+ * Generate content based on the selection made on the form
+ */
 function boinccore_admin_default_content_submit($form, &$form_state) {
-  $option = $form_state['values']['page'];
-  $page_list = boinccore_admin_default_content_generate($option);
-  $pages_generated = count($page_list);
-  if ($pages_generated > 0) {
+    $option = $form_state['values']['page'];
+    $page_list = boinccore_admin_default_content_generate($option);
+    $pages_generated = count($page_list);
+    if ($pages_generated > 0) {
     switch ($pages_generated) {
     case 1:
       $page_list = reset($page_list);
-      break;
+        break;
     case 2:
       $page_list = implode(' and ', $page_list);
-      break;
+        break;
     default:
       end($page_list);
-      $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
-      $page_list = implode(', ', $page_list);
+        $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
+        $page_list = implode(', ', $page_list);
     }
     drupal_set_message(t('Default content has been generated for the @listed
       @pages.', array(
         '@listed' => $page_list,
         '@pages' => format_plural($pages_generated, 'page', 'pages'),
-      )
+        )
     ));
-  }
-  else {
+    }
+    else {
     if ($option) {
-      drupal_set_message(t('The @specified page already exists.',
+        drupal_set_message(t('The @specified page already exists.',
         array('@specified' => $option)), 'warning');
     }
     else {
-      drupal_set_message(t('All pages already exist, so none can be recreated
+        drupal_set_message(t('All pages already exist, so none can be recreated
         automatically.'), 'warning');
     }
     drupal_set_message(t('To recreate a page, first delete the existing page (or
       remove its URL alias), then try this function again.'), 'warning');
-  }
+    }
 }
 
 /**
-  *
-  */
+ *
+ */
 function boinccore_admin_default_content_generate($pages = array()) {
-  if (!$pages) {
+    if (!$pages) {
     // If not specified, attempt to generate all pages by default
     $pages = array(
-      'help',
+        'help',
 //      'about',
-      'rules',
-      'moderation',
+        'rules',
+        'moderation',
     );
-  }
-  elseif (!is_array($pages)) {
+    }
+    elseif (!is_array($pages)) {
     $pages = array($pages);
-  }
+    }
 
-  $pages_generated = array();
-  if (in_array('about', $pages)) {
+    $pages_generated = array();
+    if (in_array('about', $pages)) {
     // Create the default About page, if it doesn't exist
     // TODO: what is the default About page...?
     if (!drupal_lookup_path('source', 'about')) {
-      drupal_set_message('The about page doesn\'t yet have a definition...', 'warning');
-      //$pages_generated[] = 'about';
+        drupal_set_message('The about page doesn\'t yet have a definition...', 'warning');
+        //$pages_generated[] = 'about';
+    }
     }
-  }
-  if (in_array('help', $pages)) {
+    if (in_array('help', $pages)) {
     // Create the default Help page, if it doesn't exist
     if (!drupal_lookup_path('source', 'help')) {
-      $node = array(
+        $node = array(
         'type' => 'page',
         'title' => t('Help'),
         'uid' => 1,
@@ -204,7 +204,7 @@ 
         'comment' => 0, // disable comments
         'moderate' => 0,
         'body' => preg_replace('/>\s+</', '><',
-          '<p>Use this page to provide help and support for your site\'s
+            '<p>Use this page to provide help and support for your site\'s
           visitors:</p>
           <ul>
             <li>Add a link to your primary forum for getting help</li>
@@ -215,25 +215,25 @@ 
         'sticky' => 0,
         'format' => 4,
         //'teaser' => $teaser,
-      );
-      $node = (object) $node; // node_save requires an object
-      node_save($node);
+        );
+        $node = (object) $node; // node_save requires an object
+        node_save($node);
 
-      $item = array(
+        $item = array(
         'link_path' => drupal_get_normal_path('help'),
         'link_title' => t('Help'),
         'menu_name' => 'primary-links',
         'weight' => 50,
-      );
-      menu_link_save($item);
-      $pages_generated[] = 'help';
+        );
+        menu_link_save($item);
+        $pages_generated[] = 'help';
     }
-  }
-  if (in_array('rules', $pages)) {
+    }
+    if (in_array('rules', $pages)) {
     // Create the default Rules page, if it doesn't exist
     if (!drupal_lookup_path('source', 'rules-and-policies')) {
-      // Create node
-      $node = array(
+        // Create node
+        $node = array(
         'type' => 'page',
         'title' => t('Rules and Policies'),
         'uid' => 1,
@@ -246,30 +246,30 @@ 
         'comment' => 0, // disable comments
         'moderate' => 0,
         'body' => preg_replace('/>\s+</', '><',
-          '<p>Use this page to list your sites rules and policies.</p>'),
+            '<p>Use this page to list your sites rules and policies.</p>'),
         'sticky' => 0,
         'format' => 4,
         //'teaser' => $teaser,
-      );
-      $node = (object) $node; // node_save requires an object
-      node_save($node);
+        );
+        $node = (object) $node; // node_save requires an object
+        node_save($node);
 
-      // Create menu item to node
-      $item = array(
+        // Create menu item to node
+        $item = array(
         'link_path' => drupal_get_normal_path('rules-and-policies'),
         'link_title' => t('Rules and Policies'),
         'menu_name' => 'menu-footer-links',
         'weight' => 0,
-      );
-      menu_link_save($item);
-      $pages_generated[] = 'rules-and-policies';
+        );
+        menu_link_save($item);
+        $pages_generated[] = 'rules-and-policies';
+    }
     }
-  }
-  if (in_array('moderation', $pages)) {
+    if (in_array('moderation', $pages)) {
     // Create the default Moderation page, if it doesn't exist
     if (!drupal_lookup_path('source', 'moderation')) {
-      // Create node
-      $node = array(
+        // Create node
+        $node = array(
         'type' => 'page',
         'title' => t('Moderation'),
         'uid' => 1,
@@ -282,27 +282,27 @@ 
         'comment' => 0, // disable comments
         'moderate' => 0,
         'body' => preg_replace('/>\s+</', '><',
-          '<p>Use this page to describe your sites moderation policy.</p>'),
+            '<p>Use this page to describe your sites moderation policy.</p>'),
         'sticky' => 0,
         'format' => 4,
         //'teaser' => $teaser,
-      );
-      $node = (object) $node; // node_save requires an object
-      node_save($node);
+        );
+        $node = (object) $node; // node_save requires an object
+        node_save($node);
 
-      // Create menu item to node
-      $item = array(
+        // Create menu item to node
+        $item = array(
         'link_path' => drupal_get_normal_path('moderation'),
         'link_title' => t('Moderation'),
         'menu_name' => 'menu-footer-links',
         'weight' => 0,
-      );
-      menu_link_save($item);
-      $pages_generated[] = 'moderation';
+        );
+        menu_link_save($item);
+        $pages_generated[] = 'moderation';
+    }
     }
-  }
 
-  // Rebuild drupal menus
-  menu_rebuild();
-  return $pages_generated;
+    // Rebuild drupal menus
+    menu_rebuild();
+    return $pages_generated;
 }

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

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

drupal/sites/all/features/global_search_solr/global_search_solr.module

Indentation +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 // Hackish... but there doesn't seem to be a non-hackish way to change the
 // label on the search form!? Need a custom module to call hook_form_alter()...
 function global_search_solr_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'apachesolr_search_custom_page_search_form') {
+    if ($form_id == 'apachesolr_search_custom_page_search_form') {
     $form['basic']['keys']['#title'] = t('Search');
     $form['basic']['keys']['#size'] = 40;
-  }
+    }
 }

drupal/sites/all/features/private_messages/private_messages.panels_default.inc

Indentation +35 added lines, -35 removed lines

@@ -4,33 +4,33 @@ 
  * Implementation of hook_default_panels_mini().
  */
 function private_messages_default_panels_mini() {
-  $export = array();
+    $export = array();
 
-  $mini = new stdClass;
-  $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */
-  $mini->api_version = 1;
-  $mini->name = 'user_mail_summary';
-  $mini->category = 'BOINC';
-  $mini->admin_title = 'User mail summary';
-  $mini->admin_description = 'Mail widget for user dashboard';
-  $mini->requiredcontexts = array();
-  $mini->contexts = array();
-  $mini->relationships = array();
-  $display = new panels_display;
-  $display->layout = 'onecol';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    $mini = new stdClass;
+    $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */
+    $mini->api_version = 1;
+    $mini->name = 'user_mail_summary';
+    $mini->category = 'BOINC';
+    $mini->admin_title = 'User mail summary';
+    $mini->admin_description = 'Mail widget for user dashboard';
+    $mini->requiredcontexts = array();
+    $mini->contexts = array();
+    $mini->relationships = array();
+    $display = new panels_display;
+    $display->layout = 'onecol';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'middle' => NULL,
+        'default' => NULL,
+        'middle' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = 'Messages';
-  $display->storage_type = 'panels_mini';
-  $display->storage_id = 'user_mail_summary';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = 'Messages';
+    $display->storage_type = 'panels_mini';
+    $display->storage_id = 'user_mail_summary';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'middle';
@@ -39,9 +39,9 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Mail summary',
-      'title' => 'Messages',
-      'body' => '<?php
+        'admin_title' => 'Mail summary',
+        'title' => 'Messages',
+        'body' => '<?php
   $l1 = url(\'messages\');
   $l2 = url(\'messages/new\');
 ?>
@@ -51,22 +51,22 @@ 
   </li>
   <li class="last tab"><a href="<?php echo $l2?>"><?php print bts(\'Compose new\', array(), NULL, \'boinc:account-dashboard\'); ?></a></li>
 </ul>',
-      'format' => '3',
-      'substitute' => TRUE,
+        'format' => '3',
+        'substitute' => TRUE,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array();
     $pane->extras = array();
     $pane->position = 0;
     $display->content['new-1'] = $pane;
     $display->panels['middle'][0] = 'new-1';
-  $display->hide_title = PANELS_TITLE_NONE;
-  $display->title_pane = 'new-1';
-  $mini->display = $display;
-  $export['user_mail_summary'] = $mini;
+    $display->hide_title = PANELS_TITLE_NONE;
+    $display->title_pane = 'new-1';
+    $mini->display = $display;
+    $export['user_mail_summary'] = $mini;
 
-  return $export;
+    return $export;
 }