BOINC / boinc

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

Indentation +179 added lines, -179 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');
+    // 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";
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_project_chart";
   
-  $color_keys = array('R', 'G', 'B');
+    $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"));
+    // 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()) {
+    // 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))) {
+    // 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))) {
     $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/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.module

Indentation +116 added lines, -116 removed lines

@@ -14,19 +14,19 @@ 
  * Implementation of hook_menu()
  */
 function boinc_solr_comments_menu() {
-  $items = array();
-  $base_path = 'admin/settings/apachesolr/indexcomments';
-  $items[$base_path] = array(
-      'title' => 'Index Comments',
-      'description' => 'Administer Indexing of Comments',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('boinc_solr_comments_form'),
-      'access arguments' => array('administer search'),
-      'file' => 'boinc_solr_comments.admin.inc',
-      'weight' => '10',
-  );
-
-  return $items;
+    $items = array();
+    $base_path = 'admin/settings/apachesolr/indexcomments';
+    $items[$base_path] = array(
+        'title' => 'Index Comments',
+        'description' => 'Administer Indexing of Comments',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('boinc_solr_comments_form'),
+        'access arguments' => array('administer search'),
+        'file' => 'boinc_solr_comments.admin.inc',
+        'weight' => '10',
+    );
+
+    return $items;
 }
 
 
@@ -58,11 +58,11 @@ 
  *   Environment ID for apache solr.
  */
 function boinc_solr_comments_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
-  $comdocs = array();
+    $comdocs = array();
 
-  // Array of node types that will have comments indexed.
-  $node_types = variable_get('boinc_solr_comments_nodetypes', '');
-  if (empty($node_types)) {
+    // Array of node types that will have comments indexed.
+    $node_types = variable_get('boinc_solr_comments_nodetypes', '');
+    if (empty($node_types)) {
     // If the variable has not been set, then by default index
     // comments for all known node types.
     $node_types = array(
@@ -72,28 +72,28 @@ 
         'story'      => 'story',
         'team_forum' => 'team_forum',
     );
-  }
+    }
   
-  // Loop over all documents and alter:
-  foreach ($documents as $document) {
+    // Loop over all documents and alter:
+    foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
     $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
     if ( $document->entity_type=='node' AND $to_process) {
       
-      // Remove ts_comments if present.
-      if (isset($document->ts_comments)) {
+        // Remove ts_comments if present.
+        if (isset($document->ts_comments)) {
         unset($document->ts_comments);
-      }
-      // Node information.
-      $nid = $document->entity_id;
-      $node = node_load($nid);
+        }
+        // Node information.
+        $nid = $document->entity_id;
+        $node = node_load($nid);
       
-      // Query database for comments of node. Only return comments
-      // with status 0 (0 is published for comments).
-      $sql = 'SELECT cid from {comments} WHERE nid = %d AND status = 0 ORDER by timestamp DESC';
-      $resource = db_query($sql, $nid);
-      while ($row = db_fetch_array($resource)) {
+        // Query database for comments of node. Only return comments
+        // with status 0 (0 is published for comments).
+        $sql = 'SELECT cid from {comments} WHERE nid = %d AND status = 0 ORDER by timestamp DESC';
+        $resource = db_query($sql, $nid);
+        while ($row = db_fetch_array($resource)) {
         // Load the comment from cid.
         $comment = _comment_load($row['cid']);
 
@@ -116,10 +116,10 @@ 
         // Comment object has no language
         $comment_document->ss_language = 'und';
         if (function_exists('drupal_get_path_alias')) {
-          $output = drupal_get_path_alias($comment_document->path, NULL);
-          if ($output && $output != $document->path) {
+            $output = drupal_get_path_alias($comment_document->path, NULL);
+            if ($output && $output != $document->path) {
             $comment_document->path_alias = $output;
-          }
+            }
         }
         
         // Code derived from apachesolr_index_node_solr_document
@@ -129,13 +129,13 @@ 
 
         // Author information
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
-          // @see user_validate_name(). !'0' === TRUE.
-          $comment_document->ss_name = '0';
+            // @see user_validate_name(). !'0' === TRUE.
+            $comment_document->ss_name = '0';
         }
         else {
-          $comment_document->ss_name = $comment->name;
-          // We want the name to be searchable for keywords.
-          $comment_document->tos_name = $comment->name;
+            $comment_document->ss_name = $comment->name;
+            // We want the name to be searchable for keywords.
+            $comment_document->tos_name = $comment->name;
         }
 
         // Index formatted username so it can be searched and sorted
@@ -157,59 +157,59 @@ 
         // Unset the following fields (if set) that don't make sense
         // for a comment.
         if (isset($comment_document->bs_sticky)) {
-          unset($comment_document->bs_sticky);
+            unset($comment_document->bs_sticky);
         }
         if (isset($comment_document->bs_promote)) {
-          unset($comment_document->bs_promote);
+            unset($comment_document->bs_promote);
         }    
         if (isset($comment_document->is_tnid)) {
-          unset($comment_document->is_tnid);
+            unset($comment_document->is_tnid);
         }
         if (isset($comment_document->bs_translate)) {
-          unset($comment_document->bs_translate);
+            unset($comment_document->bs_translate);
         }
         if (isset($comment_document->ts_last_comment_timestamp)) {
-          unset($comment_document->ts_last_comment_timestamp);
+            unset($comment_document->ts_last_comment_timestamp);
         }
         if (isset($comment_document->ds_last_comment_or_change)) {
-          unset($comment_document->ds_last_comment_or_change);
+            unset($comment_document->ds_last_comment_or_change);
         }
         if (isset($comment_document->is_comment_count)) {
-          unset($comment_document->is_comment_count);
+            unset($comment_document->is_comment_count);
         }
 
         // Loop over fields in document and copy relevant values into
         // comment_document.
         foreach ($document as $fieldName => $fieldValue) {
 
-          // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
-          // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+            // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
+            // [im_vid_Forums], [tm_vid_1_names]
+            if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
             foreach ($fieldValue as $subkey => $subvalue) {
-              $comment_document->addField($fieldName, $subvalue);
+                $comment_document->addField($fieldName, $subvalue);
             }
-          }// if preg_match
+            }// if preg_match
                
-          // Set the access keys so this module will work with
-          // apachesolr_access.
-          if (module_exists('apachesolr_access')) {
+            // Set the access keys so this module will work with
+            // apachesolr_access.
+            if (module_exists('apachesolr_access')) {
             if (preg_match('/^access/', $fieldName) AND is_array($fieldValue)) {
-              foreach ($fieldValue as $subkey => $subvalue) {
+                foreach ($fieldValue as $subkey => $subvalue) {
                 $comment_document->addField($fieldName, $subvalue);
-              }
+                }
             }// if preg_match
-          }// if module_exist
+            }// if module_exist
             
         }// foreach document
         
         $comdocs[] = $comment_document;
-      }// while
+        }// while
     }// if entity_type=node
-  }// documents
+    }// documents
 
-  // Merge the comment documents with the input documents array. These
-  // documents will now be added to the Solr search index.
-  $documents = array_merge($documents, $comdocs);
+    // Merge the comment documents with the input documents array. These
+    // documents will now be added to the Solr search index.
+    $documents = array_merge($documents, $comdocs);
 }
 
 /**
@@ -225,19 +225,19 @@ 
  *   The Solr query used for the search.
  */
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
-  //dpm($query->getSolrParams(), "process_results query getSolrParams");
-  foreach($results as $id => $result) {
+    //dpm($query->getSolrParams(), "process_results query getSolrParams");
+    foreach($results as $id => $result) {
     if ($result['entity_type']=='comment') {
         $results[$id]['type'] = 'Comment';
         $results[$id]['date'] = $result['fields']['changed'];
         if (isset($result['fields']['is_uid'])) {
-          $uid = $result['fields']['is_uid'];
-          $results[$id]['uid']  = $uid;
-          $results[$id]['user'] = theme('username', user_load($uid));
+            $uid = $result['fields']['is_uid'];
+            $results[$id]['uid']  = $uid;
+            $results[$id]['user'] = theme('username', user_load($uid));
         }
     } //if result entity_type == comment
-  }// foreach $result
-  //dpm($results, "process_results array_results");
+    }// foreach $result
+    //dpm($results, "process_results array_results");
 }
 
 /**
@@ -251,8 +251,8 @@ 
  *   The Solr query used for the search.
  */
 function boinc_solr_comments_apachesolr_query_alter($query) {
-  // Add custom field to query results
-  $query->addParam('fl','tos_content_extra');
+    // Add custom field to query results
+    $query->addParam('fl','tos_content_extra');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -265,9 +265,9 @@ 
  * 
  */
 function boinc_solr_comments_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-  // Array of node types that will have comments indexed.
-  $node_types = variable_get('boinc_solr_comments_nodetypes', '');
-  if (empty($node_types)) {
+    // Array of node types that will have comments indexed.
+    $node_types = variable_get('boinc_solr_comments_nodetypes', '');
+    if (empty($node_types)) {
     // If the variable has not been set, then by default index
     // comments for all known node types.
     $node_types = array(
@@ -277,16 +277,16 @@ 
         'story'      => 'story',
         'team_forum' => 'team_forum',
     );
-  }
+    }
 
-  switch ($op) {
+    switch ($op) {
     case 'delete':
       // Only call delete function on certain node types
       if (in_array( $node->type, $node_types)) {
         boinc_solr_comments_delete($node);
-      }
-      break;
-  } //switch
+        }
+        break;
+    } //switch
 }
 
 
@@ -303,30 +303,30 @@ 
  *   Returns TRUE if the comment was deleted, otherwise return FALSE.
  */
 function boinc_solr_comments_delete($node) {
-  // Load the Solr environment.
-  $env_id = apachesolr_default_environment();
-  // Check to see if Solr is read-only.
-  if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
+    // Load the Solr environment.
+    $env_id = apachesolr_default_environment();
+    // Check to see if Solr is read-only.
+    if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
     return FALSE;
-  }
+    }
   
-  // Code derived from apachesolr_index_delete_entity_from_index
-  try {
+    // Code derived from apachesolr_index_delete_entity_from_index
+    try {
     $solr = apachesolr_get_solr($env_id);
     // Custom query to find all comments with parent nid of the node bing deleted.
     $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-  }
-  catch (Exception $e) {
-      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-      return FALSE;
-  }// try
-
-  // all deletions sucessful
-  apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+    }
+    catch (Exception $e) {
+        watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
+        return FALSE;
+    }// try
+
+    // all deletions sucessful
+    apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
+    return TRUE;
 }
 
 /**
@@ -334,15 +334,15 @@ 
  *
  */
 function boinc_solr_comments_comment(&$a1, $op) {
-  switch ($op) {
+    switch ($op) {
     case 'view':
     case 'update':
       break;
     case 'delete':
       // $a1 should be a comment object
       boinc_solr_comments_deletecomment($a1);
-      break;
-  }// switch
+        break;
+    }// switch
 }
 
 /** 
@@ -358,16 +358,16 @@ 
  *   Returns TRUE if the comment was deleted, otherwise return FALSE.
  */
 function boinc_solr_comments_deletecomment($comment) {
-  // Load the Solr environment.
-  $env_id = apachesolr_default_environment();
-  // Check to see if Solr is read-only.
-  if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
+    // Load the Solr environment.
+    $env_id = apachesolr_default_environment();
+    // Check to see if Solr is read-only.
+    if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
     return FALSE;
-  }
-  //dd($comment->cid, "delete - nid begin");
+    }
+    //dd($comment->cid, "delete - nid begin");
     
-  // Code derived from apachesolr_index_delete_entity_from_index.
-  try {
+    // Code derived from apachesolr_index_delete_entity_from_index.
+    try {
     $solr = apachesolr_get_solr($env_id);
     $entity_id = $comment->cid;
     $entity_type = 'comment';
@@ -377,14 +377,14 @@ 
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
     }
-  catch (Exception $e) {
+    catch (Exception $e) {
     watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
     return FALSE;
-  }// try
+    }// try
 
-  // deletion sucessful
-  apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+    // deletion sucessful
+    apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
+    return TRUE;
 }
 
 
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+    drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /** 
@@ -410,12 +410,12 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+    if ( ($comment->cid) AND ($comment->nid) ) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.
     apachesolr_entity_update($node, 'node');
-  }
+    }
 }
 
 /** 
@@ -426,9 +426,9 @@ 
  *   The comment to be unpublished (hidden). 
  */
 function boinc_solr_comments_unpublish($comment) {
-  if ( ($comment->cid) ) {
+    if ( ($comment->cid) ) {
     // Call the deletecomment function for hook comment.
     boinc_solr_comments_deletecomment($comment);
-  }
+    }
 }
 

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.admin.inc

Indentation +19 added lines, -19 removed lines

@@ -7,48 +7,48 @@
  */
 
 function boinc_solr_comments_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $form['config'] = array(
+    $form['config'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configuration'),
     '#collapsible' => TRUE,
-  );
+    );
 
-  $options = array();
-  foreach (content_types() as $key => $info) {
+    $options = array();
+    foreach (content_types() as $key => $info) {
     // Exclude node types profile, team, and panel
     switch ($key) {
-      case 'profile':
+        case 'profile':
       case 'team':
       case 'panel':
         continue 2;
     }// switch key
     $options[$key] = $info['name'];
-  }
-  asort($options);
+    }
+    asort($options);
   
-  // Form defaults
-  $default = array(
+    // Form defaults
+    $default = array(
     'boinc_solr_comments_nodetypes' => variable_get('boinc_solr_comments_nodetypes', ''),
-  );
-  if (empty($default['boinc_solr_comments_nodetypes'])) {
+    );
+    if (empty($default['boinc_solr_comments_nodetypes'])) {
     $default['boinc_solr_comments_nodetypes'] = array('forum','team_forum','news','page','story');
-  }
+    }
   
-  // Define the form
-  $form['config']['nodes'] = array(
+    // Define the form
+    $form['config']['nodes'] = array(
     '#type'  => 'markup',
     '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), NULL, 'boinc:admin-solr-search-comments-option'),
-  );
+    );
       
-  $form['config']['boinc_solr_comments_nodetypes'] = array(
+    $form['config']['boinc_solr_comments_nodetypes'] = array(
     '#type'          => 'checkboxes',
     '#title'         => 'node',
     '#options'       => $options,
     '#default_value' => $default['boinc_solr_comments_nodetypes'],
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 

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

Indentation +168 added lines, -168 removed lines

@@ -10,80 +10,80 @@ 
  * Allow configuration of general options for preference pages
  */
 function boincwork_admin_prefs_options_form(&$form_state) {
-  $form = array(); 
-  $form['beta'] = array(
+    $form = array(); 
+    $form['beta'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow users to opt in to test beta applications'),
     '#default_value' => variable_get('boinc_prefs_options_beta', 0),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 } 
 
 /**
-  * Handle validation of preference general settings form.
-  */
+ * Handle validation of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_validate($form, &$form_state) {
 }
 
 /**
-  * Handle submission of preference general settings form.
-  */
+ * Handle submission of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_submit($form, &$form_state) {
-  variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
-  drupal_set_message('Preference options have been updated.');
+    variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
+    drupal_set_message('Preference options have been updated.');
 }
 
 /**
  * 
  */
 function boincwork_admin_prefs_upload_form(&$form_state) {
-  $form = array(); 
-  $form['prefs_xml'] = array(
+    $form = array(); 
+    $form['prefs_xml'] = array(
     '#type' => 'textarea',
     '#title' => t('Project specific preferences XML'),
     '#default_value' => variable_get('boinc_project_specific_prefs_config', "<project_specific_preferences>\n\n</project_specific_preferences>"),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 } 
 
 /**
-  * Handle validation of preference upload form.
-  */
+ * Handle validation of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
-  $xml = new DomDocument();
-  $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
+    $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+    libxml_use_internal_errors(true);
+    $xml = new DomDocument();
+    $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
+    if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
-  }
+    }
 }
 
 /**
-  * Handle submission of preference upload form.
-  */
+ * Handle submission of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_submit($form, &$form_state) {
-  variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
-  drupal_set_message('The XML has been validated and any changes to
+    variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
+    drupal_set_message('The XML has been validated and any changes to
       preferences are now in place.');
 }
 
@@ -91,14 +91,14 @@ 
  * 
  */
 function boincwork_admin_prefs_presets_page($preset = 'standard') {
-  // Configure preference presets
-  if (function_exists('jump_quickly')) {
+    // Configure preference presets
+    if (function_exists('jump_quickly')) {
     $path = 'admin/boinc/prefs/presets';
     $preset_options = array(
-      "{$path}/standard" => t('Standard'),
-      "{$path}/maximum" => t('Maximum'),
-      "{$path}/green" => t('Green'),
-      "{$path}/minimum" => t('Minimum')
+        "{$path}/standard" => t('Standard'),
+        "{$path}/maximum" => t('Maximum'),
+        "{$path}/green" => t('Green'),
+        "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -106,15 +106,15 @@ 
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
     $output .= '</div></div>';
-  }
-  $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
+    }
+    $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
 
-  $output .= '<div>';
-  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '<p>';
-  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '</div>';
-  return $output;
+    $output .= '<div>';
+    $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '<p>';
+    $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -122,141 +122,141 @@ 
  */
 function boincwork_admin_prefs_presets_form(&$form_state, $preset = 'standard') {
 
-  // Check database for preset prefs
-  if (!variable_get('boincwork_preset_prefs', null))
+    // Check database for preset prefs
+    if (!variable_get('boincwork_preset_prefs', null))
     drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), NULL, 'boinc:admin-boinc-preference-presets'), 'status');
 
-  // Load a copy of the general prefs form
-  $form = boincwork_generalprefs_form($form_state, NULL, $preset);
-  if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
+    // Load a copy of the general prefs form
+    $form = boincwork_generalprefs_form($form_state, NULL, $preset);
+    if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
     unset($form['#submit'][$key]);
-  }
-  $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
+    }
+    $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
   
-  // Just keep the necessary items
-  $form['processor'] = $form['prefs']['advanced']['processor'];
-  $form['storage'] = $form['prefs']['advanced']['storage'];
-  $form['network'] = $form['prefs']['advanced']['network'];
-  unset($form['prefs']);
+    // Just keep the necessary items
+    $form['processor'] = $form['prefs']['advanced']['processor'];
+    $form['storage'] = $form['prefs']['advanced']['storage'];
+    $form['network'] = $form['prefs']['advanced']['network'];
+    unset($form['prefs']);
   
-  // Tweak some things so it behaves a little better
-  $form['#tree'] = TRUE;
-  $form['processor']['#collapsible'] = TRUE;
-  $form['storage']['#collapsible'] = TRUE;
-  $form['network']['#collapsible'] = TRUE;
+    // Tweak some things so it behaves a little better
+    $form['#tree'] = TRUE;
+    $form['processor']['#collapsible'] = TRUE;
+    $form['storage']['#collapsible'] = TRUE;
+    $form['network']['#collapsible'] = TRUE;
   
-  // Add a submit button and a hidden field to pass the preset
-  $form['submit'] = array(
+    // Add a submit button and a hidden field to pass the preset
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration')
-  );
-  $form['saveuseconfigxml'] = array (
-      '#type' => 'submit',
-      '#value' => t('Save configuration with disk usage settings from config.xml'),
-      '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
-  );
-  $form['preset'] = array(
+    );
+    $form['saveuseconfigxml'] = array (
+        '#type' => 'submit',
+        '#value' => t('Save configuration with disk usage settings from config.xml'),
+        '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
+    );
+    $form['preset'] = array(
     '#type' => 'hidden',
     '#value' => $preset
-  );
+    );
   
-  // Add the official mechanical things and return
-  drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
-  return $form;
+    // Add the official mechanical things and return
+    drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
+    return $form;
 }
 
 /**
-  * Validate the preference presets form.
-  */
+ * Validate the preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values'];
+    require_boinc('util');
+    $values = $form_state['values'];
   
-  // Verify all non-boolean user input values and notify form API of failures
+    // Verify all non-boolean user input values and notify form API of failures
   
-  // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+    // Processing preferences
+    if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
 
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
 
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
-  * Handle post-validation submission of preference presets form.
-  */
+ * Handle post-validation submission of preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_submit($form, &$form_state) {
-  $values = $form_state['values'];
-  $preset = $form_state['values']['preset'];
+    $values = $form_state['values'];
+    $preset = $form_state['values']['preset'];
   
-  // Load baseline settings from configuration
-  $prefs = boincwork_get_preset_prefs($preset);
+    // Load baseline settings from configuration
+    $prefs = boincwork_get_preset_prefs($preset);
   
-  // Processing preferences
-  $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
-  $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
-  $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
-  $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
-  $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
-  $prefs['start_hour'] = $values['processor']['start_hour'];
-  $prefs['end_hour'] = $values['processor']['end_hour'];
-  $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
-  $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
-  $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
-  $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
+    // Processing preferences
+    $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
+    $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
+    $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+    $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
+    $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
+    $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
+    $prefs['start_hour'] = $values['processor']['start_hour'];
+    $prefs['end_hour'] = $values['processor']['end_hour'];
+    $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
+    $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
+    $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
+    $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
   
-  // Storage preferences
-  $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
-  $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
-  $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
-  $prefs['disk_interval'] = $values['storage']['disk_interval'];
-  $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
-  $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
-  $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
+    // Storage preferences
+    $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
+    $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
+    $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
+    $prefs['disk_interval'] = $values['storage']['disk_interval'];
+    $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
+    $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
+    $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
   
-  // Network preferences
-  $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
-  $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
-  $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
-  $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
-  $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
-  $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
-  $prefs['net_start_hour'] = $values['network']['net_start_hour'];
-  $prefs['net_end_hour'] = $values['network']['net_end_hour'];
-  $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
-  $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
-  $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
+    // Network preferences
+    $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
+    $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
+    $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
+    $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
+    $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
+    $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
+    $prefs['net_start_hour'] = $values['network']['net_start_hour'];
+    $prefs['net_end_hour'] = $values['network']['net_end_hour'];
+    $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
+    $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
+    $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
   
-  //Remove @attributes to match new format (see boincwork.forms.inc
-  //function boincwork_generalprefs_form)
-  unset($prefs['@attributes']['preset']);
+    //Remove @attributes to match new format (see boincwork.forms.inc
+    //function boincwork_generalprefs_form)
+    unset($prefs['@attributes']['preset']);
   
-  // Update the configuration
-  boincwork_save_preset_prefs($prefs, $preset);
-  drupal_set_message(t('The "@name" preset has been updated.',
+    // Update the configuration
+    boincwork_save_preset_prefs($prefs, $preset);
+    drupal_set_message(t('The "@name" preset has been updated.',
     array('@name' => $preset)));
 }
 
@@ -265,26 +265,26 @@ 
  */
 function boincwork_save_preset_prefs($updated_prefs, $preset = 'standard') {
   
-  // Get the full configuration
-  $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+    // Get the full configuration
+    $all_presets = boincwork_get_preset_prefs();
+    $all_presets = (array) $all_presets['general_preferences'];
   
-  // Check for sane config
-  if (isset($all_presets['preset'])) {
+    // Check for sane config
+    if (isset($all_presets['preset'])) {
     if (!is_numeric(key($all_presets['preset']))) {
-      $all_presets['preset'] = array($all_presets['preset']);
+        $all_presets['preset'] = array($all_presets['preset']);
     }
     foreach ($all_presets['preset'] as $key => $old_preset) {
-      // Find the preset being updated and... update it
-      if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
+        // Find the preset being updated and... update it
+        if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
         $all_presets['preset'][$key] = $updated_prefs + $old_preset;
-      }
+        }
+    }
     }
-  }
   
-  // Convert prefs back to XML and save to database
-  $all_presets = array('general_preferences' => $all_presets);
-  variable_set('boincwork_preset_prefs', save_configuration($all_presets));
+    // Convert prefs back to XML and save to database
+    $all_presets = array('general_preferences' => $all_presets);
+    variable_set('boincwork_preset_prefs', save_configuration($all_presets));
 }
 
 /**

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

Indentation +32 added lines, -32 removed lines

@@ -26,16 +26,16 @@ 
  * Implementation of hook_comment(); 
  */
 function flag_comment_notify_comment(&$a1, $op) {
-  switch ($op) {
-  case 'insert':
+    switch ($op) {
+    case 'insert':
     module_load_include('inc', 'drupal_queue', 'drupal_queue');
     $queue = DrupalQueue::get('flag_comment_notify');
     $subscribed_users = array_keys((array) flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
     foreach ($subscribed_users as $uid) {
-      $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
+        $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -43,12 +43,12 @@ 
  * Implementation of hook_cron_queue_info()
  */
 function flag_comment_notify_cron_queue_info() {
-  $queues = array();
-  $queues['flag_comment_notify'] = array(
+    $queues = array();
+    $queues['flag_comment_notify'] = array(
     'worker callback' => 'flag_comment_notify_send_notification',
     'time' => 60,
-  );
-  return $queues;
+    );
+    return $queues;
 }
 
 
@@ -57,44 +57,44 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function flag_comment_notify_send_notification($data) {
-  $account = user_load($data['uid']);
-  $comment = _comment_load($data['cid']);
-  $node = node_load($comment->nid);
-  $author = user_load($comment->uid);
-  if ($account->mail AND $node->nid) {
+    $account = user_load($data['uid']);
+    $comment = _comment_load($data['cid']);
+    $node = node_load($comment->nid);
+    $author = user_load($comment->uid);
+    if ($account->mail AND $node->nid) {
     // Don't send notifications to the author of the comment
     if ($account->uid != $author->uid) {
-      $params['account'] = $account;
-      $params['comment'] = $comment;
-      $params['node'] = $node;
-      $params['author'] = $author;
-      drupal_mail('flag_comment_notify', 'comment_posted', $account->mail,
+        $params['account'] = $account;
+        $params['comment'] = $comment;
+        $params['node'] = $node;
+        $params['author'] = $author;
+        drupal_mail('flag_comment_notify', 'comment_posted', $account->mail,
         user_preferred_language($account), $params);
     }
-  }
+    }
 }
 
 
 function flag_comment_notify_mail($key, &$message, $params) {
-  $language = $message['language'];
-  $variables = user_mail_tokens($params['account'], $language);
-  $variables['!comment_url'] = url(
+    $language = $message['language'];
+    $variables = user_mail_tokens($params['account'], $language);
+    $variables['!comment_url'] = url(
     "goto/comment/{$params['comment']->cid}",
     array(
-      'absolute' => TRUE,
+        'absolute' => TRUE,
     )
-  );
-  $variables['!topic_name'] = $params['node']->title;
-  $variables['!author'] = $params['author']->name;
-  switch($key) {
-  case 'comment_posted':
+    );
+    $variables['!topic_name'] = $params['node']->title;
+    $variables['!author'] = $params['author']->name;
+    switch($key) {
+    case 'comment_posted':
     $message['subject'] = bts('!site: comment posted to "!topic_name"', $variables,
-      $language->language, 'boinc:forum-topic-subscription-email-notification');
+        $language->language, 'boinc:forum-topic-subscription-email-notification');
     $message['body'][] = bts('!author has posted a reply to "!topic_name".',
-      $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
+        $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
     $message['body'][] = bts("To view this topic at !site, click here: \n!comment_url",
-      $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
+        $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
     break;
-  default:
+    default:
   }
 }

drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc

Indentation +99 added lines, -99 removed lines

@@ -14,84 +14,84 @@ 
  * The definition of the create team form
  */
 function boincteam_forum_create_form(&$form_state) {
-  $form = array();
+    $form = array();
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $default = array(
+    $default = array(
     'title' => '',
     'min_time_between_posts' => '',
     'min_total_credit_to_post' => '',
     'min_avg_credit_to_post' => '',
     'public' => 0,
     'description' => '',
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Form elements
-  $form['title'] = array(
+    // Form elements
+    $form['title'] = array(
     '#title' => bts('Message board title', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['min_time_between_posts'] = array(
+    );
+    $form['min_time_between_posts'] = array(
     '#title' => bts('Minimum time between posts', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
     '#description' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
-  );
-  $form['min_total_credit_to_post'] = array(
+    );
+    $form['min_total_credit_to_post'] = array(
     '#title' => bts('Minimum total credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
-  );
-  $form['min_avg_credit_to_post'] = array(
+    );
+    $form['min_avg_credit_to_post'] = array(
     '#title' => bts('Minimum avg credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
-  );
-  $form['public'] = array(
+    );
+    $form['public'] = array(
     '#title' => bts('Allow public to read board?', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description', array(), NULL, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Create message board', array(), NULL, 'boinc:team-forum-create/edit'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
-  );
+    );
   
-  $form['#redirect'] = "community/teams/{$account->team}";
+    $form['#redirect'] = "community/teams/{$account->team}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -99,33 +99,33 @@ 
  */
 function boincteam_forum_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
   
-  if (!$values['title']) {
+    if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.', array(), NULL, 'boinc:team-forum-create/edit'));
-  }
-  if (!is_numeric($values['min_time_between_posts']) OR
+    }
+    if (!is_numeric($values['min_time_between_posts']) OR
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts',
-      bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
+        bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_total_credit_to_post']) OR
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
-      bts('Please set the minimum total credit that a user'
+        bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_avg_credit_to_post']) OR
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post',
-      bts('Please set the minimum average credit that a user'
+        bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
+    }
 }
 
 /**
@@ -133,13 +133,13 @@ 
  */
 function boincteam_forum_create_form_submit($form, &$form_state) {
   
-  $values = $form_state['values'];
+    $values = $form_state['values'];
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  // Add the team forum to the db
-  db_query("
+    // Add the team forum to the db
+    db_query("
     INSERT INTO {boincteam_forum} SET
       nid = %d,
       title = '%s',
@@ -157,9 +157,9 @@ 
     (int) $values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description']
-  );
+    );
   
-  drupal_set_message(t('Message board "@forum" has been created.',
+    drupal_set_message(t('Message board "@forum" has been created.',
     array('@forum' => $values['title'])));
 }
 
@@ -171,84 +171,84 @@ 
  * The definition of the edit team forum form
  */
 function boincteam_forum_edit_form(&$form_state, $tfid) {
-  $form = array();
-  $boincteam_forum = boincteam_forum_load($tfid);
+    $form = array();
+    $boincteam_forum = boincteam_forum_load($tfid);
   
-  $form_state['storage']['tfid'] = $tfid;
+    $form_state['storage']['tfid'] = $tfid;
   
-  $default = array(
+    $default = array(
     'title' => $boincteam_forum->title,
     'min_time_between_posts' => $boincteam_forum->min_time_between_posts,
     'min_total_credit_to_post' => $boincteam_forum->min_total_credit_to_post,
     'min_avg_credit_to_post' => $boincteam_forum->min_avg_credit_to_post,
     'public' => ($boincteam_forum->public) ? 1 : 0,
     'description' => $boincteam_forum->description,
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Form elements
-  $form['title'] = array(
+    // Form elements
+    $form['title'] = array(
     '#title' => bts('Message board title', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['min_time_between_posts'] = array(
+    );
+    $form['min_time_between_posts'] = array(
     '#title' => bts('Minimum time between posts', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
     '#description' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
-  );
-  $form['min_total_credit_to_post'] = array(
+    );
+    $form['min_total_credit_to_post'] = array(
     '#title' => bts('Minimum total credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
-  );
-  $form['min_avg_credit_to_post'] = array(
+    );
+    $form['min_avg_credit_to_post'] = array(
     '#title' => bts('Minimum avg credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
-  );
-  $form['public'] = array(
+    );
+    $form['public'] = array(
     '#title' => bts('Allow public to read board?', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description', array(), NULL, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save message board', array(), NULL, 'boinc:team-forum-create/edit'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
-  );
+    );
   
-  $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
+    $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -256,33 +256,33 @@ 
  */
 function boincteam_forum_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
   
-  if (!$values['title']) {
+    if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.', array(), NULL, 'boinc:team-forum-create/edit'));
-  }
-  if (!is_numeric($values['min_time_between_posts']) OR
+    }
+    if (!is_numeric($values['min_time_between_posts']) OR
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts', 
-      bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
+        bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_total_credit_to_post']) OR
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
-      bts('Please set the minimum total credit that a user'
+        bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_avg_credit_to_post']) OR
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post', 
-      bts('Please set the minimum average credit that a user'
+        bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
+    }
 }
 
 /**
@@ -290,11 +290,11 @@ 
  */
 function boincteam_forum_edit_form_submit($form, &$form_state) {
   
-  $tfid = $form_state['storage']['tfid'];
-  $values = $form_state['values'];
+    $tfid = $form_state['storage']['tfid'];
+    $values = $form_state['values'];
   
-  // Update the team forum in the db
-  db_query("
+    // Update the team forum in the db
+    db_query("
     UPDATE {boincteam_forum} SET
       title = '%s',
       min_time_between_posts = '%d',
@@ -311,11 +311,11 @@ 
     ($values['public']) ? 1 : 0,
     $values['description'],
     $tfid
-  );
+    );
   
-  drupal_set_message(t('Details for message board "@forum" have been updated.',
+    drupal_set_message(t('Details for message board "@forum" have been updated.',
     array('@forum' => $values['title'])));
   
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }

html/ops/show_log.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 echo 'Hint: Example greps: "RESULT#106876", "26fe99aa_25636_00119.wu_1", "WU#8152", "too many errors", "2003-07-17", "CRITICAL" <br>';
 
 if (strlen($f)) {
-	$f = "../log*/". $f;
+    $f = "../log*/". $f;
 } else {
     $f = "../log*/*.log";
 }

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

Indentation +35 added lines, -35 removed lines

@@ -4,33 +4,33 @@ 
  * Implementation of hook_default_panels_mini().
  */
 function user_account_project_list_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_project_list';
-  $mini->category = 'BOINC';
-  $mini->admin_title = 'User project list';
-  $mini->admin_description = 'A list of all BOINC projects in which a user is participating';
-  $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_project_list';
+    $mini->category = 'BOINC';
+    $mini->admin_title = 'User project list';
+    $mini->admin_description = 'A list of all BOINC projects in which a user is participating';
+    $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 = '';
-  $display->storage_type = 'panels_mini';
-  $display->storage_id = 'user_project_list';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = '';
+    $display->storage_type = 'panels_mini';
+    $display->storage_id = 'user_project_list';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'middle';
@@ -39,25 +39,25 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Dashboard project table',
-      'title' => bts('Projects', array(), NULL, 'boinc:account-dashboard'),
-      'body' => '<?php echo boincuser_get_projects_table(); ?>',
-      'format' => '3',
-      'substitute' => TRUE,
+        'admin_title' => 'Dashboard project table',
+        'title' => bts('Projects', array(), NULL, 'boinc:account-dashboard'),
+        'body' => '<?php echo boincuser_get_projects_table(); ?>',
+        '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_FIXED;
-  $display->title_pane = 'new-1';
-  $mini->display = $display;
-  $export['user_project_list'] = $mini;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = 'new-1';
+    $mini->display = $display;
+    $export['user_project_list'] = $mini;
 
-  return $export;
+    return $export;
 }

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

Indentation +44 added lines, -44 removed lines

@@ -4,40 +4,40 @@ 
  * Implementation of hook_default_panels_mini().
  */
 function user_profiles_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_profile';
-  $mini->category = 'BOINC';
-  $mini->admin_title = 'User profile';
-  $mini->admin_description = 'A user\'s profile information, including background and opinions';
-  $mini->requiredcontexts = 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_profile';
+    $mini->category = 'BOINC';
+    $mini->admin_title = 'User profile';
+    $mini->admin_description = 'A user\'s profile information, including background and opinions';
+    $mini->requiredcontexts = array(
     0 => array(
-      'name' => 'user',
-      'id' => 1,
-      'identifier' => 'User',
-      'keyword' => 'user',
+        'name' => 'user',
+        'id' => 1,
+        'identifier' => 'User',
+        'keyword' => 'user',
     ),
-  );
-  $mini->contexts = array();
-  $mini->relationships = array();
-  $display = new panels_display;
-  $display->layout = 'onecol';
-  $display->layout_settings = array();
-  $display->panel_settings = 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 = '';
-  $display->storage_type = 'panels_mini';
-  $display->storage_id = 'user_profile';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = '';
+    $display->storage_type = 'panels_mini';
+    $display->storage_id = 'user_profile';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'middle';
@@ -46,13 +46,13 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'context' => 'requiredcontext_user_1',
-      'override_title' => 1,
-      'override_title_text' => '',
+        'context' => 'requiredcontext_user_1',
+        'override_title' => 1,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array();
     $pane->extras = array();
@@ -67,25 +67,25 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Flag user',
-      'title' => '',
-      'body' => '<?php print boincuser_get_profile_links(%user:uid); ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'admin_title' => 'Flag user',
+        'title' => '',
+        'body' => '<?php print boincuser_get_profile_links(%user:uid); ?>',
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array();
     $pane->extras = array();
     $pane->position = 1;
     $display->content['new-2'] = $pane;
     $display->panels['middle'][1] = 'new-2';
-  $display->hide_title = PANELS_TITLE_NONE;
-  $display->title_pane = 'new-1';
-  $mini->display = $display;
-  $export['user_profile'] = $mini;
+    $display->hide_title = PANELS_TITLE_NONE;
+    $display->title_pane = 'new-1';
+    $mini->display = $display;
+    $export['user_profile'] = $mini;
 
-  return $export;
+    return $export;
 }