BOINC / boinc

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";
 }

Spacing +4 added lines, -4 removed lines

@@ -27,19 +27,19 @@ 
     exit("Error: couldn't get log_dir from config file.");
 }
 
-if( isset($_GET["f"]) ){
+if (isset($_GET["f"])) {
     $f = $_GET["f"];
     $f = escapeshellcmd($f);
 } else {
     $f = "";
 }
-if( isset($_GET["s"]) ){
+if (isset($_GET["s"])) {
     $s = $_GET["s"];
     $s = escapeshellcmd($s);
 } else {
     $s = "";
 }
-if( isset($_GET["l"]) ){
+if (isset($_GET["l"])) {
     $l = (int)$_GET["l"];
 } else {
     $l = 0;
@@ -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";
 }

Braces +3 added lines, -3 removed lines

@@ -27,19 +27,19 @@
     exit("Error: couldn't get log_dir from config file.");
 }
 
-if( isset($_GET["f"]) ){
+if( isset($_GET["f"]) ) {
     $f = $_GET["f"];
     $f = escapeshellcmd($f);
 } else {
     $f = "";
 }
-if( isset($_GET["s"]) ){
+if( isset($_GET["s"]) ) {
     $s = $_GET["s"];
     $s = escapeshellcmd($s);
 } else {
     $s = "";
 }
-if( isset($_GET["l"]) ){
+if( isset($_GET["l"]) ) {
     $l = (int)$_GET["l"];
 } else {
     $l = 0;

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

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

@@ -14,7 +14,7 @@ 
   $view->base_table = 'node';
   $view->core = 0;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
     'content_profile_rel' => array(
@@ -70,9 +70,9 @@ 
         'news' => 'news',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'type',
@@ -84,9 +84,9 @@ 
       'operator' => '=',
       'value' => '1',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'status',
@@ -311,7 +311,7 @@ 
       'hide_empty' => 1,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -467,9 +467,9 @@ 
         'news' => 'news',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'type',
@@ -481,9 +481,9 @@ 
       'operator' => '=',
       'value' => '1',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'status',
@@ -500,9 +500,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'changed',
@@ -516,7 +516,7 @@ 
   ));
   $handler->override_option('style_plugin', 'rss');
   $handler->override_option('style_options', array(
-    'mission_description' => FALSE,
+    'mission_description' => false,
     'description' => '',
   ));
   $handler->override_option('row_plugin', 'node_rss');
@@ -544,7 +544,7 @@ 
     'page_2' => 'page_2',
     'default' => 0,
   ));
-  $handler->override_option('sitename_title', FALSE);
+  $handler->override_option('sitename_title', false);
   $handler = $view->new_display('page', 'Short blurbs', 'page_2');
   $handler->override_option('relationships', array());
   $handler->override_option('fields', array(
@@ -825,7 +825,7 @@ 
       'hide_empty' => 1,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -882,9 +882,9 @@ 
         'news' => 'news',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'type',
@@ -896,9 +896,9 @@ 
       'operator' => '=',
       'value' => '1',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'status',
@@ -910,9 +910,9 @@ 
       'operator' => '=',
       'value' => '1',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'promote',

Indentation +491 added lines, -491 removed lines

@@ -4,114 +4,114 @@ 
  * Implementation of hook_views_default_views().
  */
 function news_views_default_views() {
-  $views = array();
+    $views = array();
 
-  // Exported view: news
-  $view = new view;
-  $view->name = 'news';
-  $view->description = '';
-  $view->tag = '';
-  $view->base_table = 'node';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
+    // Exported view: news
+    $view = new view;
+    $view->name = 'news';
+    $view->description = '';
+    $view->tag = '';
+    $view->base_table = 'node';
+    $view->core = 0;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('relationships', array(
     'content_profile_rel' => array(
-      'id' => 'content_profile_rel',
-      'table' => 'users',
-      'field' => 'content_profile_rel',
+        'id' => 'content_profile_rel',
+        'table' => 'users',
+        'field' => 'content_profile_rel',
     ),
-  ));
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('fields', array(
     'comment_count' => array(
-      'id' => 'comment_count',
-      'table' => 'node_comment_statistics',
-      'field' => 'comment_count',
+        'id' => 'comment_count',
+        'table' => 'node_comment_statistics',
+        'field' => 'comment_count',
     ),
     'view_node' => array(
-      'id' => 'view_node',
-      'table' => 'node',
-      'field' => 'view_node',
+        'id' => 'view_node',
+        'table' => 'node',
+        'field' => 'view_node',
     ),
     'created' => array(
-      'id' => 'created',
-      'table' => 'node',
-      'field' => 'created',
+        'id' => 'created',
+        'table' => 'node',
+        'field' => 'created',
     ),
     'teaser' => array(
-      'id' => 'teaser',
-      'table' => 'node_revisions',
-      'field' => 'teaser',
+        'id' => 'teaser',
+        'table' => 'node_revisions',
+        'field' => 'teaser',
     ),
     'title' => array(
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
     ),
-  ));
-  $handler->override_option('sorts', array(
+    ));
+    $handler->override_option('sorts', array(
     'created_1' => array(
-      'order' => 'DESC',
-      'granularity' => 'second',
-      'id' => 'created_1',
-      'table' => 'node',
-      'field' => 'created',
-      'override' => array(
+        'order' => 'DESC',
+        'granularity' => 'second',
+        'id' => 'created_1',
+        'table' => 'node',
+        'field' => 'created',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'type' => array(
-      'operator' => 'in',
-      'value' => array(
+        'operator' => 'in',
+        'value' => array(
         'news' => 'news',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'relationship' => 'none',
+        ),
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'relationship' => 'none',
     ),
     'status' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'status',
-      'table' => 'node',
-      'field' => 'status',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'id' => 'status',
+        'table' => 'node',
+        'field' => 'status',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('empty', 'No news is good news...');
-  $handler->override_option('empty_format', '5');
-  $handler->override_option('items_per_page', 3);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('row_plugin', 'node');
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('relationships', array());
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('empty', 'No news is good news...');
+    $handler->override_option('empty_format', '5');
+    $handler->override_option('items_per_page', 3);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('row_plugin', 'node');
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('relationships', array());
+    $handler->override_option('fields', array(
     'title' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '<h2>[title]</h2>',
         'make_link' => 0,
@@ -128,23 +128,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'link_to_node' => 0,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'link_to_node' => 0,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'created' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -161,24 +161,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'custom',
-      'custom_date_format' => 'F d, Y',
-      'exclude' => 0,
-      'id' => 'created',
-      'table' => 'node',
-      'field' => 'created',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'custom',
+        'custom_date_format' => 'F d, Y',
+        'exclude' => 0,
+        'id' => 'created',
+        'table' => 'node',
+        'field' => 'created',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => ' / Posted by [name]',
         'make_link' => 0,
@@ -197,26 +197,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 0,
-      'overwrite_anonymous' => 0,
-      'anonymous_text' => '',
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 0,
+        'overwrite_anonymous' => 0,
+        'anonymous_text' => '',
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'users',
+        'field' => 'name',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'teaser' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -235,23 +235,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'teaser',
-      'table' => 'node_revisions',
-      'field' => 'teaser',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'teaser',
+        'table' => 'node_revisions',
+        'field' => 'teaser',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'view_node' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -270,24 +270,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'text' => 'more',
-      'exclude' => 0,
-      'id' => 'view_node',
-      'table' => 'node',
-      'field' => 'view_node',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'text' => 'more',
+        'exclude' => 0,
+        'id' => 'view_node',
+        'table' => 'node',
+        'field' => 'view_node',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'comment_count' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -306,32 +306,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'comment_count',
-      'table' => 'node_comment_statistics',
-      'field' => 'comment_count',
-      'override' => array(
+        ),
+        'empty' => '0',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'comment_count',
+        'table' => 'node_comment_statistics',
+        'field' => 'comment_count',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'nothing' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'text' => '<div class="clearfix"></div>',
         'make_link' => 0,
         'path' => '',
@@ -347,210 +347,210 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'nothing',
-      'table' => 'views',
-      'field' => 'nothing',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'nothing',
+        'table' => 'views',
+        'field' => 'nothing',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('title', 'News');
-  $handler->override_option('row_plugin', 'fields');
-  $handler->override_option('path', 'news');
-  $handler->override_option('menu', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('title', 'News');
+    $handler->override_option('row_plugin', 'fields');
+    $handler->override_option('path', 'news');
+    $handler->override_option('menu', array(
     'type' => 'normal',
     'title' => 'News',
     'description' => '',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('feed', 'Feed', 'feed_1');
-  $handler->override_option('arguments', array(
+    ));
+    $handler = $view->new_display('feed', 'Feed', 'feed_1');
+    $handler->override_option('arguments', array(
     'null' => array(
-      'default_action' => 'default',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '%1 | News',
-      'breadcrumb' => '',
-      'default_argument_type' => 'php',
-      'default_argument' => '',
-      'validate_type' => 'none',
-      'validate_fail' => 'not found',
-      'must_not_be' => 0,
-      'id' => 'null',
-      'table' => 'views',
-      'field' => 'null',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'default',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '%1 | News',
+        'breadcrumb' => '',
+        'default_argument_type' => 'php',
+        'default_argument' => '',
+        'validate_type' => 'none',
+        'validate_fail' => 'not found',
+        'must_not_be' => 0,
+        'id' => 'null',
+        'table' => 'views',
+        'field' => 'null',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         4 => 0,
         7 => 0,
         5 => 0,
         3 => 0,
         6 => 0,
-      ),
-      'me_redirect' => 0,
-      'me_validate_user_argument_type' => 'uid',
-      'me_validate_user_roles' => array(
+        ),
+        'me_redirect' => 0,
+        'me_validate_user_argument_type' => 'uid',
+        'me_validate_user_roles' => array(
         2 => 0,
         4 => 0,
         7 => 0,
         5 => 0,
         3 => 0,
         6 => 0,
-      ),
-      'override' => array(
+        ),
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_taxonomy_tid_term_page' => 0,
-      'default_taxonomy_tid_node' => 0,
-      'default_taxonomy_tid_limit' => 0,
-      'default_taxonomy_tid_vids' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_taxonomy_tid_term_page' => 0,
+        'default_taxonomy_tid_node' => 0,
+        'default_taxonomy_tid_limit' => 0,
+        'default_taxonomy_tid_vids' => array(
         1 => 0,
         2 => 0,
-      ),
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '// Use this to set a custom feed title that works both in the feed and
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '// Use this to set a custom feed title that works both in the feed and
 // in the auto discovery link in the page header
 return variable_get(\'site_name\', \'Drupal-BOINC\');
 ',
-      'validate_argument_node_type' => array(
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
         'forum' => 0,
         'panel' => 0,
         'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
         2 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_node_flag_name' => '*relationship*',
-      'validate_argument_node_flag_test' => 'flaggable',
-      'validate_argument_node_flag_id_type' => 'id',
-      'validate_argument_user_flag_name' => '*relationship*',
-      'validate_argument_user_flag_test' => 'flaggable',
-      'validate_argument_user_flag_id_type' => 'id',
-      'validate_argument_php' => '',
-      'me_validate_user_restrict_roles' => 0,
-    ),
-  ));
-  $handler->override_option('filters', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_node_flag_name' => '*relationship*',
+        'validate_argument_node_flag_test' => 'flaggable',
+        'validate_argument_node_flag_id_type' => 'id',
+        'validate_argument_user_flag_name' => '*relationship*',
+        'validate_argument_user_flag_test' => 'flaggable',
+        'validate_argument_user_flag_id_type' => 'id',
+        'validate_argument_php' => '',
+        'me_validate_user_restrict_roles' => 0,
+    ),
+    ));
+    $handler->override_option('filters', array(
     'type' => array(
-      'operator' => 'in',
-      'value' => array(
+        'operator' => 'in',
+        'value' => array(
         'news' => 'news',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'relationship' => 'none',
+        ),
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'relationship' => 'none',
     ),
     'status' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'status',
-      'table' => 'node',
-      'field' => 'status',
-      'relationship' => 'none',
+        ),
+        'id' => 'status',
+        'table' => 'node',
+        'field' => 'status',
+        'relationship' => 'none',
     ),
     'changed' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'type' => 'offset',
         'value' => '-90 days',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'override' => array(
+        ),
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('style_plugin', 'rss');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('style_plugin', 'rss');
+    $handler->override_option('style_options', array(
     'mission_description' => FALSE,
     'description' => '',
-  ));
-  $handler->override_option('row_plugin', 'node_rss');
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('row_plugin', 'node_rss');
+    $handler->override_option('row_options', array(
     'relationship' => 'none',
     'item_length' => 'default',
-  ));
-  $handler->override_option('path', 'rss_main.php');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'rss_main.php');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler->override_option('displays', array(
+    ));
+    $handler->override_option('displays', array(
     'page_1' => 'page_1',
     'page_2' => 'page_2',
     'default' => 0,
-  ));
-  $handler->override_option('sitename_title', FALSE);
-  $handler = $view->new_display('page', 'Short blurbs', 'page_2');
-  $handler->override_option('relationships', array());
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('sitename_title', FALSE);
+    $handler = $view->new_display('page', 'Short blurbs', 'page_2');
+    $handler->override_option('relationships', array());
+    $handler->override_option('fields', array(
     'nid' => array(
-      'label' => 'Nid',
-      'alter' => array(
+        'label' => 'Nid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -569,24 +569,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'nid',
-      'table' => 'node',
-      'field' => 'nid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'nid',
+        'table' => 'node',
+        'field' => 'nid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'comment' => array(
-      'label' => 'Comment status',
-      'alter' => array(
+        'label' => 'Comment status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -605,23 +605,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'comment',
-      'table' => 'node',
-      'field' => 'comment',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'comment',
+        'table' => 'node',
+        'field' => 'comment',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'title' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '<h2>[title]</h2>',
         'make_link' => 0,
@@ -638,23 +638,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'link_to_node' => 0,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'link_to_node' => 0,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'created' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -671,24 +671,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'custom',
-      'custom_date_format' => 'F d, Y',
-      'exclude' => 0,
-      'id' => 'created',
-      'table' => 'node',
-      'field' => 'created',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'custom',
+        'custom_date_format' => 'F d, Y',
+        'exclude' => 0,
+        'id' => 'created',
+        'table' => 'node',
+        'field' => 'created',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'teaser' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -707,23 +707,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'teaser',
-      'table' => 'node_revisions',
-      'field' => 'teaser',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'teaser',
+        'table' => 'node_revisions',
+        'field' => 'teaser',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'view_node_1' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -742,24 +742,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'text' => 'more',
-      'exclude' => 0,
-      'id' => 'view_node_1',
-      'table' => 'node',
-      'field' => 'view_node',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'text' => 'more',
+        'exclude' => 0,
+        'id' => 'view_node_1',
+        'table' => 'node',
+        'field' => 'view_node',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -778,30 +778,30 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if ($data->node_comment == COMMENT_NODE_READ_WRITE) {
     $cid = boincuser_get_first_unread_comment_id($data->nid);
     $link = ($cid) ? "goto/comment/{$cid}" : "node/{$data->nid}";
     return l(bts(\'discuss\', array(), NULL, \'boinc:front-page-discuss-news\'), $link);
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'comment_count' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -820,32 +820,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'comment_count',
-      'table' => 'node_comment_statistics',
-      'field' => 'comment_count',
-      'override' => array(
+        ),
+        'empty' => '0',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'comment_count',
+        'table' => 'node_comment_statistics',
+        'field' => 'comment_count',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'nothing' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'text' => '<div class="clearfix"></div>',
         'make_link' => 0,
         'path' => '',
@@ -861,88 +861,88 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'nothing',
-      'table' => 'views',
-      'field' => 'nothing',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'nothing',
+        'table' => 'views',
+        'field' => 'nothing',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'type' => array(
-      'operator' => 'in',
-      'value' => array(
+        'operator' => 'in',
+        'value' => array(
         'news' => 'news',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'relationship' => 'none',
+        ),
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'relationship' => 'none',
     ),
     'status' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'status',
-      'table' => 'node',
-      'field' => 'status',
-      'relationship' => 'none',
+        ),
+        'id' => 'status',
+        'table' => 'node',
+        'field' => 'status',
+        'relationship' => 'none',
     ),
     'promote' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'promote',
-      'table' => 'node',
-      'field' => 'promote',
-      'override' => array(
+        ),
+        'id' => 'promote',
+        'table' => 'node',
+        'field' => 'promote',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('title', 'News');
-  $handler->override_option('row_plugin', 'fields');
-  $handler->override_option('path', 'news');
-  $handler->override_option('menu', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('title', 'News');
+    $handler->override_option('row_plugin', 'fields');
+    $handler->override_option('path', 'news');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'News',
     'description' => '',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  return $views;
+    return $views;
 }

drupal/sites/default/boinc/themes/boinc/template.php

Switch Indentation +24 added lines, -24 removed lines

@@ -626,13 +626,13 @@ 
   $sender = user_load($sender->uid);
   
   switch ($status) {
-    case FLAG_FRIEND_FLAGGED:
-      // Sender accepted recipient's friend request
-      $email['subject'] = bts('!name accepted your friend request [!site]', array(
-        '!name' => $sender->boincuser_name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name confirmed you as a friend on !site.
+  case FLAG_FRIEND_FLAGGED:
+    // Sender accepted recipient's friend request
+    $email['subject'] = bts('!name accepted your friend request [!site]', array(
+      '!name' => $sender->boincuser_name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      ), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
 !link
@@ -641,17 +641,17 @@ 
 
 Thanks,
 The !site team', array(
-        '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
-        ), array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+      '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+      ), array(), NULL, 'boinc:friend-request-email');
+    break;
 
-    case FLAG_FRIEND_PENDING:
-      // Sender is requesting to be recipient's friend
-      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
+  case FLAG_FRIEND_PENDING:
+    // Sender is requesting to be recipient's friend
+    $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
 !link
@@ -660,13 +660,13 @@ 
 
 Thanks,
 The !site team', array(
-        '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
-        ),
-      array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+      '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
+      ),
+    array(), NULL, 'boinc:friend-request-email');
+    break;
   }
   return $email;
 }

Spacing +45 added lines, -45 removed lines

@@ -82,7 +82,7 @@ 
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
   $html = '';
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+  $html .= '<ul id="'.$menu['id'].'" class="'.$menu['class'].'">'."\n";
   $item_count = count($links);
   $i = 1;
   foreach ($links as $key => $link) {
@@ -90,7 +90,7 @@ 
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
-    $html .= '<li class="' . implode(' ', $classes) .'">';
+    $html .= '<li class="'.implode(' ', $classes).'">';
     if ($link['title'] == 'Home') {
       $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
     }
@@ -99,7 +99,7 @@ 
       if ($link['href'] == 'dashboard') {
         $item_count = privatemsg_unread_count();
         if ($item_count) {
-          $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+          $link['title'] .= '</a> <a href="'.url('messages').'" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
           $link['html'] = TRUE;
           $link['attributes']['class'] = 'compound';
         }
@@ -109,7 +109,7 @@ 
     if ($link['href'] == 'moderate') {
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
-        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
         $link['html'] = TRUE;
       }
     }
@@ -117,7 +117,7 @@ 
     $html .= '</li>';
     $i++;
   }
-  $html .= '</ul>' . "\n";
+  $html .= '</ul>'."\n";
   return $html;
 }
 
@@ -132,7 +132,7 @@ 
     return '';
   }
   else {
-    return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
+    return '<li '.($active ? 'class="active" ' : '').'>'.$link."</li>\n";
   }
 }
 
@@ -197,7 +197,7 @@ 
   if (empty($locality)) {
     $locality = "en";
   }
-  $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
+  $vars['flag_path'] = base_path().path_to_theme()."/images/flags/{$locality}.png";
 
   $server_status_url = variable_get('boinc_server_status_url', '');
   if (!$server_status_url) {
@@ -219,16 +219,16 @@ 
   if (arg(0) == 'search') {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  else if ((arg(0) == 'account') AND (is_numeric(arg(1))) AND (empty(arg(2)))) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  else if ((arg(0) == 'account') AND (arg(1) == 'profile')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='dashboard') ) {
+  else if ((arg(0) == 'dashboard')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  else if ((arg(0) == 'community') AND ((arg(1) == 'teams') OR (arg(1) == 'stats'))) {
     unset($vars['title']);
   }
 
@@ -244,7 +244,7 @@ 
               $tab = str_replace('li class="', 'li class="first ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+              $tab = str_replace('li class="', 'li class="last ', $tab).'</ul>';
           }
       }
       elseif (strpos($tab, 'li ')) {
@@ -252,7 +252,7 @@ 
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+              $tab = str_replace('li ', 'li class="last" ', $tab).'</ul>';
           }
       }
   }
@@ -289,7 +289,7 @@ 
 
   // Optionally, run node-type-specific preprocess functions, like
   // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
+  $function = __FUNCTION__.'_'.$vars['node']->type;
   if (function_exists($function)) {
     $function($vars, $hook);
   }
@@ -340,7 +340,7 @@ 
   $vars['node']->comment = 0;
 
   $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
-  $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
+  $page_count = max(ceil($vars['comment_count']/$comments_per_page), 1);
   $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
@@ -452,7 +452,7 @@ 
   case 'boinc_host':
       $view = views_get_current_view();
       if (!($view->result)) {
-        $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
+        $vars['footer'] = '<h3>'.bts('Host not found in database.', array(), NULL, 'boinc:host-details').'</h3>';
       }
     break;
   case 'boinc_host_list':
@@ -471,10 +471,10 @@ 
 
     if ($result) {
       // Display the stderr output in the footer
-      $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
-      $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
+      $vars['footer'] = '<h3>'.bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog').'</h3>';
+      $vars['footer'] .= '<pre>'.htmlspecialchars($result->result_stderr_out).'</pre>';
     } else {
-      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Task not found in database.', array(), NULL, 'boinc:task-details').'</h3>';
     }
     break;
   case 'boinc_teams':
@@ -487,7 +487,7 @@ 
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
-    require_boinc(array('util','boinc_db'));
+    require_boinc(array('util', 'boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     if ($wu) {
       // Output from admin defined BOINC project-specific function
@@ -495,7 +495,7 @@ 
       // Output of project_workunit() gets caught in the buffer
       $vars['footer'] = ob_get_clean();
     } else {
-      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Workunit not found in database.', array(), NULL, 'boinc:workunit-details').'</h3>';
     }
   default:
   }
@@ -517,7 +517,7 @@ 
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
-      $author_picture .= '<img src="' . $user_image . '"/>';
+      $author_picture .= '<img src="'.$user_image.'"/>';
     }
   }
   $author_picture .= '</div>';
@@ -556,14 +556,14 @@ 
   case 'profile':
   case 'user':
     $node = $variables['result']['node'];
-    $variables['url'] = url('account/' . $node->is_uid);
+    $variables['url'] = url('account/'.$node->is_uid);
     $variables['title'] = $node->tos_name;
     $variables['user_image'] = boincuser_get_user_profile_image($node->is_uid);
     $variables['account'] = user_load($node->is_uid);
     break;
   case 'team':
     $node = $variables['result']['node'];
-    $variables['url'] = url('/community/teams/' . $node->entity_id);;
+    $variables['url'] = url('/community/teams/'.$node->entity_id); ;
     break;
   case 'forum':
     $node = $variables['result']['node'];
@@ -581,7 +581,7 @@ 
     // Parent forum topic title
     $variables['parent_title'] = $drupalnode->title;
     // Link to the parent forum topic
-    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/' . $nid) );
+    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/'.$nid));
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
@@ -599,7 +599,7 @@ 
   if (!arg(2)) {
     $message = '';
   }
-  return '<p>' . $message . '</p>';
+  return '<p>'.$message.'</p>';
 }
 
 /**
@@ -615,11 +615,11 @@ 
 
     // Shorten the name when it is too long or it will break many tables.
     if (drupal_strlen($name) > 20) {
-      $name = drupal_substr($name, 0, 15) . '...';
+      $name = drupal_substr($name, 0, 15).'...';
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
+      $output = l($name, 'account/'.$object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
     }
     else {
       $output = check_plain($name);
@@ -637,7 +637,7 @@ 
       $output = check_plain($object->name);
     }
 
-    $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
+    $output .= ' ('.bts('not verified', array(), NULL, 'boinc:user-not-found').')';
   }
   else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
@@ -650,7 +650,7 @@ 
  * Remove the link under text areas that reads:
  * "More information about formatting options"
  */
-function boinc_filter_tips_more_info () {
+function boinc_filter_tips_more_info() {
   return '';
 }
 
@@ -692,8 +692,8 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
+        '!link' => url('account/'.$sender->uid, array('absolute' => TRUE)),
         ), array(), NULL, 'boinc:friend-request-email');
       break;
 
@@ -711,7 +711,7 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
         '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
         ),
       array(), NULL, 'boinc:friend-request-email');
@@ -724,13 +724,13 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
     }
     // Reorder the links however you need them.
-    $links = reorder_links($links, array('comment_edit','quote','comment_add','comment_reply','flag-abuse_comment','flag-abuse_node'), array('comment_delete'));
+    $links = reorder_links($links, array('comment_edit', 'quote', 'comment_add', 'comment_reply', 'flag-abuse_comment', 'flag-abuse_node'), array('comment_delete'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
   }
@@ -813,7 +813,7 @@ 
   // are the class attribute for the <li> tags.
   $dom = new DOMDocument;
   $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
-  foreach($dom->getElementsByTagName('li') as $node) {
+  foreach ($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
   }
@@ -826,7 +826,7 @@ 
     "hide", "unhide",
     "comment_delete",
   );
-  foreach(array_keys($alllinks) as $key1) {
+  foreach (array_keys($alllinks) as $key1) {
     // Select string up to first space, if present.
     $class1 = strtok($key1, ' ');
     if (in_array($class1, $selected_classes)) {
@@ -855,7 +855,7 @@ 
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
-    if ($myli->length>0) {
+    if ($myli->length > 0) {
       $newclasses = trim(($myli[0]->getAttribute("class"))." first");
       $myli[0]->setAttribute("class", $newclasses);
       $alink = $dom->saveHTML($myli[0]);
@@ -872,13 +872,13 @@ 
 
   $output = '<ul class="menu"><li class="first">';
   if ($user->uid) {
-    $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('logout').'">'.bts('Logout', array(), NULL, 'boinc:menu-link').'</a>';
   } else {
-    $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('user/login', array('query' => drupal_get_destination())).'">'.bts('Login', array(), NULL, 'boinc:menu-link').'</a>';
   }
   $output .= '</li>';
   if (module_exists('global_search') OR module_exists('global_search_solr')) {
-    $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), NULL, 'boinc:menu-link') .'</a> </l1>';
+    $output .= '<li class="last"> <a class="search" href="'.url('search/site').'">'.bts('search', array(), NULL, 'boinc:menu-link').'</a> </l1>';
   }
   $output .= '</ul>';
   return $output;
@@ -905,8 +905,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
@@ -921,8 +921,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),

Braces +15 added lines, -29 removed lines

@@ -130,8 +130,7 @@ 
   AND strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
-  }
-  else {
+  } else {
     return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
   }
 }
@@ -218,17 +217,13 @@ 
   // See: https://dev.gridrepublic.org/browse/DBOINC-65
   if (arg(0) == 'search') {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  } else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  } else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='dashboard') ) {
+  } else if ( (arg(0)=='dashboard') ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  } else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
     unset($vars['title']);
   }
 
@@ -246,8 +241,7 @@ 
           if ($key == $last_key) {
               $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
           }
-      }
-      elseif (strpos($tab, 'li ')) {
+      } elseif (strpos($tab, 'li ')) {
           if ($key == 0) {
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
@@ -400,8 +394,7 @@ 
         $cid = boincuser_get_first_unread_comment_id($topic->nid);
         if ($cid) {
           $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
-        }
-        else {
+        } else {
           // User hasn't visited this topic before, so all replies are new...
           $topic->new_replies = NULL;
         }
@@ -458,8 +451,7 @@ 
   case 'boinc_host_list':
     if ($vars['display_id'] == 'page_2') {
      $vars['empty'] = boincwork_views_host_list_empty_text();
-    }
-    elseif ($vars['display_id'] == 'page_1') {
+    } elseif ($vars['display_id'] == 'page_1') {
       $vars['empty'] = boincwork_views_host_list_empty_text('active');
     }
     break;
@@ -515,8 +507,7 @@ 
   if ($user_image) {
     if (is_array($user_image) AND $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-    }
-    elseif (is_string($user_image)) {
+    } elseif (is_string($user_image)) {
       $author_picture .= '<img src="' . $user_image . '"/>';
     }
   }
@@ -620,26 +611,22 @@ 
 
     if (user_access('access user profiles')) {
       $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
-    }
-    else {
+    } else {
       $output = check_plain($name);
     }
-  }
-  else if ($object->name) {
+  } else if ($object->name) {
     // Sometimes modules display content composed by people who are
     // not registered members of the site (e.g. mailing list or news
     // aggregator modules). This clause enables modules to display
     // the true author of the content.
     if (!empty($object->homepage)) {
       $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
-    }
-    else {
+    } else {
       $output = check_plain($object->name);
     }
 
     $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
-  }
-  else {
+  } else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
   }
 
@@ -724,7 +711,7 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
@@ -913,8 +900,7 @@ 
         ),
       );
     }
-  }
-  else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+  } else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
       $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }

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

@@ -92,7 +92,7 @@ 
     if ($i == $item_count) $classes[] = 'last';
     $html .= '<li class="' . implode(' ', $classes) .'">';
     if ($link['title'] == 'Home') {
-      $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
+      $link['title'] = bts('Home', array(), null, 'boinc:menu-link');
     }
     if (module_exists('privatemsg')) {
       // Put a new mail notification next to the Account menu item
@@ -100,7 +100,7 @@ 
         $item_count = privatemsg_unread_count();
         if ($item_count) {
           $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
-          $link['html'] = TRUE;
+          $link['html'] = true;
           $link['attributes']['class'] = 'compound';
         }
       }
@@ -110,7 +110,7 @@ 
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
         $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
-        $link['html'] = TRUE;
+        $link['html'] = true;
       }
     }
     $html .= l($link['title'], $link['href'], $link);
@@ -125,9 +125,9 @@ 
 /**
  * Remove undesired local task tabs
  */
-function boinc_menu_local_task($link, $active = FALSE) {
-  if (strpos($link, 'admin/build/pages') !== FALSE
-  AND strpos($link, 'Edit Panel')) {
+function boinc_menu_local_task($link, $active = false) {
+  if (strpos($link, 'admin/build/pages') !== false
+  and strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
   }
@@ -219,16 +219,16 @@ 
   if (arg(0) == 'search') {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  else if ( (arg(0)=='account') and (is_numeric(arg(1))) and (empty(arg(2))) ) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  else if ( (arg(0)=='account') and (arg(1)=='profile') ) {
     unset($vars['title']);
   }
   else if ( (arg(0)=='dashboard') ) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  else if ( (arg(0)=='community') and ( (arg(1)=='teams') or (arg(1)=='stats') ) ) {
     unset($vars['title']);
   }
 
@@ -307,7 +307,7 @@ 
     unset($vars['links']['forum']);
     // Add a link to manage subscriptions for the user
     $vars['links']['subscriptions'] = array(
-      'title' => bts('Manage subscriptions', array(), NULL, 'boinc:forum-footer'),
+      'title' => bts('Manage subscriptions', array(), null, 'boinc:forum-footer'),
       'href' => 'account/prefs/subscriptions',
     );
   }
@@ -331,17 +331,17 @@ 
   $vars['signature'] = check_markup($account->signature, $vars['node']->format);
 
   // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+  $vars['show_signatures'] = ($user->hide_signatures) ? false : true;
 
   // Expose comment sort order so that the template can put the topic node
   // content (i.e. initial post) at the very end if "Newest post first" is the
   // preference used by this user
-  $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
+  $vars['oldest_post_first'] = ($user->sort != 1) ? true : false;
   $vars['node']->comment = 0;
 
-  $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
+  $vars['first_page'] = (!isset($_GET['page']) or ($_GET['page'] < 1));
   $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
-  $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
+  $vars['last_page'] = ($page_count == 1 or ($page_count > 1 and $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
   $moderator_links = array();
@@ -378,7 +378,7 @@ 
   $vars['locality'] = $language->language;
 
   // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+  $vars['show_signatures'] = ($user->hide_signatures) ? false : true;
 
   $links = $vars['links'];
   $moderator_links = array();
@@ -403,7 +403,7 @@ 
         }
         else {
           // User hasn't visited this topic before, so all replies are new...
-          $topic->new_replies = NULL;
+          $topic->new_replies = null;
         }
       }
       // Use same logic in forum.module to change message if topic has
@@ -452,7 +452,7 @@ 
   case 'boinc_host':
       $view = views_get_current_view();
       if (!($view->result)) {
-        $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
+        $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), null, 'boinc:host-details') . '</h3>';
       }
     break;
   case 'boinc_host_list':
@@ -471,10 +471,10 @@ 
 
     if ($result) {
       // Display the stderr output in the footer
-      $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
+      $vars['footer'] = '<h3>' . bts('Stderr output', array(), null, 'boinc:task-details-errorlog') .'</h3>';
       $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
     } else {
-      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
+      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), null, 'boinc:task-details') . '</h3>';
     }
     break;
   case 'boinc_teams':
@@ -495,7 +495,7 @@ 
       // Output of project_workunit() gets caught in the buffer
       $vars['footer'] = ob_get_clean();
     } else {
-      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
+      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), null, 'boinc:workunit-details') . '</h3>';
     }
   default:
   }
@@ -513,7 +513,7 @@ 
   $author_picture = '<div class="picture">';
   $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
   if ($user_image) {
-    if (is_array($user_image) AND $user_image['image']['filepath']) {
+    if (is_array($user_image) and $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
@@ -595,7 +595,7 @@ 
 // Remove the mess of text under the search form and don't display "no results"
 // if a search hasn't even been submitted
 function boinc_apachesolr_search_noresults() {
-  $message = bts('No results found...', array(), NULL, 'boinc:search-with-no-results');
+  $message = bts('No results found...', array(), null, 'boinc:search-with-no-results');
   if (!arg(2)) {
     $message = '';
   }
@@ -619,7 +619,7 @@ 
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
+      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), null, 'boinc:users-table'))));
     }
     else {
       $output = check_plain($name);
@@ -637,10 +637,10 @@ 
       $output = check_plain($object->name);
     }
 
-    $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
+    $output .= ' (' . bts('not verified', array(), null, 'boinc:user-not-found') . ')';
   }
   else {
-    $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
+    $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), null, 'boinc:anonymous-user')));
   }
 
   return $output;
@@ -680,7 +680,7 @@ 
       $email['subject'] = bts('!name accepted your friend request [!site]', array(
         '!name' => $sender->boincuser_name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:friend-request-email');
+        ), null, 'boinc:friend-request-email');
       $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
@@ -692,14 +692,14 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
-        ), array(), NULL, 'boinc:friend-request-email');
+        '!message' => $flag->friend_message ? bts('Message', array(), null, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+        '!link' => url('account/'. $sender->uid, array('absolute' => true)),
+        ), array(), null, 'boinc:friend-request-email');
       break;
 
     case FLAG_FRIEND_PENDING:
       // Sender is requesting to be recipient's friend
-      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
+      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:friend-request-email');
       $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
@@ -711,10 +711,10 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
+        '!message' => $flag->friend_message ? bts('Message', array(), null, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+        '!link' => url('goto/friend-requests', array('absolute' => true)),
         ),
-      array(), NULL, 'boinc:friend-request-email');
+      array(), null, 'boinc:friend-request-email');
       break;
   }
   return $email;
@@ -872,13 +872,13 @@ 
 
   $output = '<ul class="menu"><li class="first">';
   if ($user->uid) {
-    $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), null, 'boinc:menu-link') . '</a>';
   } else {
-    $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), null, 'boinc:menu-link') . '</a>';
   }
   $output .= '</li>';
-  if (module_exists('global_search') OR module_exists('global_search_solr')) {
-    $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), NULL, 'boinc:menu-link') .'</a> </l1>';
+  if (module_exists('global_search') or module_exists('global_search_solr')) {
+    $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), null, 'boinc:menu-link') .'</a> </l1>';
   }
   $output .= '</ul>';
   return $output;
@@ -888,7 +888,7 @@ 
  * Private function, based on ignore_user ignore_user_link()
  * function. Modified for boinc functionality.
  */
-function _boinc_ignore_user_link($type, $object = NULL, $teaser = FALSE) {
+function _boinc_ignore_user_link($type, $object = null, $teaser = false) {
   global $user;
 
   if (!$user || !$user->uid) {
@@ -904,12 +904,12 @@ 
     }
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
-        'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        'title' => bts('Ignore user', array(), null, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
         'query' => 'destination='. $_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
-          'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
+          'title' => bts('Add user to your ignore list', array(), null, 'boinc:ignore-user-add'),
         ),
       );
     }
@@ -920,12 +920,12 @@ 
     }
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
-        'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        'title' => bts('Ignore user', array(), null, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
         'query' => 'destination='. $_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
-          'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
+          'title' => bts('Add user to your ignore list', array(), null, 'boinc:ignore-user-add'),
         ),
       );
     }

Indentation +321 added lines, -321 removed lines

@@ -67,13 +67,13 @@ 
  * Implementation of HOOK_theme().
  */
 function boinc_theme(&$existing, $type, $theme, $path) {
-  $hooks = zen_theme($existing, $type, $theme, $path);
-  // Add your theme hooks like this:
-  /*
+    $hooks = zen_theme($existing, $type, $theme, $path);
+    // Add your theme hooks like this:
+    /*
   $hooks['hook_name_here'] = array( // Details go here );
   */
-  // @TODO: Needs detailed comments. Patches welcome!
-  return $hooks;
+    // @TODO: Needs detailed comments. Patches welcome!
+    return $hooks;
 }
 
 
@@ -81,44 +81,44 @@ 
  * Adjust the rendering of the menu
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
-  $html = '';
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
-  $item_count = count($links);
-  $i = 1;
-  foreach ($links as $key => $link) {
+    $html = '';
+    $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+    $item_count = count($links);
+    $i = 1;
+    foreach ($links as $key => $link) {
     $classes = array($key);
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
     $html .= '<li class="' . implode(' ', $classes) .'">';
     if ($link['title'] == 'Home') {
-      $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
+        $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
     }
     if (module_exists('privatemsg')) {
-      // Put a new mail notification next to the Account menu item
-      if ($link['href'] == 'dashboard') {
+        // Put a new mail notification next to the Account menu item
+        if ($link['href'] == 'dashboard') {
         $item_count = privatemsg_unread_count();
         if ($item_count) {
-          $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
-          $link['html'] = TRUE;
-          $link['attributes']['class'] = 'compound';
+            $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+            $link['html'] = TRUE;
+            $link['attributes']['class'] = 'compound';
+        }
         }
-      }
     }
     // Put a count of items on the Moderation menu item
     if ($link['href'] == 'moderate') {
-      $item_count = boincuser_moderation_queue_count();
-      if ($item_count) {
+        $item_count = boincuser_moderation_queue_count();
+        if ($item_count) {
         $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
         $link['html'] = TRUE;
-      }
+        }
     }
     $html .= l($link['title'], $link['href'], $link);
     $html .= '</li>';
     $i++;
-  }
-  $html .= '</ul>' . "\n";
-  return $html;
+    }
+    $html .= '</ul>' . "\n";
+    return $html;
 }
 
 
@@ -126,14 +126,14 @@ 
  * Remove undesired local task tabs
  */
 function boinc_menu_local_task($link, $active = FALSE) {
-  if (strpos($link, 'admin/build/pages') !== FALSE
+    if (strpos($link, 'admin/build/pages') !== FALSE
   AND strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
-  }
-  else {
+    }
+    else {
     return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
-  }
+    }
 }
 
 
@@ -169,103 +169,103 @@ 
  *   The name of the template being rendered ("page" in this case.)
  */
 function boinc_preprocess_page(&$vars, $hook) {
-  // Responsive Design: Add viewport meta tag to HTML head
-  drupal_set_html_head('<meta name="viewport" content="width=device-width, initial-scale=1.0" />');
-  $vars['head'] = drupal_get_html_head();
-  //dpm($vars['head'], "preprocess (all) vars[head]");
-
-  // Expose comments to template files; this is needed so that comments can be
-  // rendered in locations other than directly below the node content
-  $vars['comments'] = $vars['comment_form'] = '';
-  if (module_exists('comment') && isset($vars['node'])) {
+    // Responsive Design: Add viewport meta tag to HTML head
+    drupal_set_html_head('<meta name="viewport" content="width=device-width, initial-scale=1.0" />');
+    $vars['head'] = drupal_get_html_head();
+    //dpm($vars['head'], "preprocess (all) vars[head]");
+
+    // Expose comments to template files; this is needed so that comments can be
+    // rendered in locations other than directly below the node content
+    $vars['comments'] = $vars['comment_form'] = '';
+    if (module_exists('comment') && isset($vars['node'])) {
     $vars['comments'] = comment_render($vars['node']);
     $vars['comment_form'] = drupal_get_form('comment_form', array('nid' => $vars['node']->nid));
-  }
+    }
 
-  // Determine locale region code so the correct flag is displayed in footer
-  global $language;
-  global $theme_path;
-  $locality = $language->language;
-  if (strpos($language->language, '-')) {
+    // Determine locale region code so the correct flag is displayed in footer
+    global $language;
+    global $theme_path;
+    $locality = $language->language;
+    if (strpos($language->language, '-')) {
     $flag_icon = "{$theme_path}/images/flags/{$language->language}.png";
     if (!file_exists($flag_icon)) {
-      $lang_code = explode('-', $language->language);
-      $locality = $lang_code[0];
+        $lang_code = explode('-', $language->language);
+        $locality = $lang_code[0];
     }
-  }
-  // If there is no language set for some reason, default to English (en).
-  if (empty($locality)) {
+    }
+    // If there is no language set for some reason, default to English (en).
+    if (empty($locality)) {
     $locality = "en";
-  }
-  $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
+    }
+    $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
 
-  $server_status_url = variable_get('boinc_server_status_url', '');
-  if (!$server_status_url) {
+    $server_status_url = variable_get('boinc_server_status_url', '');
+    if (!$server_status_url) {
     $server_status_url = 'server_status.php';
-  }
-  $vars['server_status_url'] = $server_status_url;
+    }
+    $vars['server_status_url'] = $server_status_url;
 
-  $app_list_url = variable_get('boinc_app_list_url', '');
-  if (!$app_list_url) {
+    $app_list_url = variable_get('boinc_app_list_url', '');
+    if (!$app_list_url) {
     $app_list_url = 'apps.php';
-  }
-  $vars['app_list_url'] = $app_list_url;
-
-  // Remove title from certain pages using URL.
-  // This is a kludge to remove the title of the page but not the
-  // "head_title" which is placed in the HTML <head> section. Most of
-  // these pages are defined in the Page Manager module.
-  // See: https://dev.gridrepublic.org/browse/DBOINC-65
-  if (arg(0) == 'search') {
+    }
+    $vars['app_list_url'] = $app_list_url;
+
+    // Remove title from certain pages using URL.
+    // This is a kludge to remove the title of the page but not the
+    // "head_title" which is placed in the HTML <head> section. Most of
+    // these pages are defined in the Page Manager module.
+    // See: https://dev.gridrepublic.org/browse/DBOINC-65
+    if (arg(0) == 'search') {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+    }
+    else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+    }
+    else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='dashboard') ) {
+    }
+    else if ( (arg(0)=='dashboard') ) {
     unset($vars['title']);
-  }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+    }
+    else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
     unset($vars['title']);
-  }
+    }
 
-  // Apply classes to tabs to allow for better styling options
-  $tabs = explode("\n", $vars['tabs']);
-  array_pop($tabs);
-  end($tabs);
-  $last_key = key($tabs);
-
-  foreach ($tabs as $key => &$tab) {
-      if (strpos($tab, 'li class=')) {
-          if ($key == 0) {
-              $tab = str_replace('li class="', 'li class="first ', $tab);
-          }
-          if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
-          }
-      }
-      elseif (strpos($tab, 'li ')) {
-          if ($key == 0) {
-              $tab = str_replace('li ', 'li class="first" ', $tab);
-          }
-          if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
-          }
-      }
-  }
-  $vars['tabs'] = implode("\n", $tabs);
+    // Apply classes to tabs to allow for better styling options
+    $tabs = explode("\n", $vars['tabs']);
+    array_pop($tabs);
+    end($tabs);
+    $last_key = key($tabs);
+
+    foreach ($tabs as $key => &$tab) {
+        if (strpos($tab, 'li class=')) {
+            if ($key == 0) {
+                $tab = str_replace('li class="', 'li class="first ', $tab);
+            }
+            if ($key == $last_key) {
+                $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+            }
+        }
+        elseif (strpos($tab, 'li ')) {
+            if ($key == 0) {
+                $tab = str_replace('li ', 'li class="first" ', $tab);
+            }
+            if ($key == $last_key) {
+                $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+            }
+        }
+    }
+    $vars['tabs'] = implode("\n", $tabs);
 
-  // Get the main menu but only for the branch the page is on.
-  $vars['menu_tree_onlyactive'] = menu_tree('primary-links');
+    // Get the main menu but only for the branch the page is on.
+    $vars['menu_tree_onlyactive'] = menu_tree('primary-links');
 
-  // Create tertiary menu
-  $vars['tertiary_links'] = menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 2);
+    // Create tertiary menu
+    $vars['tertiary_links'] = menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 2);
 
-  // Create action links
-  $vars['action_links'] = _boinc_action_links();
+    // Create action links
+    $vars['action_links'] = _boinc_action_links();
 }
 
 /**
@@ -278,79 +278,79 @@ 
  */
 function boinc_preprocess_node(&$vars, $hook) {
 
-  //$vars['sample_variable'] = t('Lorem ipsum.');
+    //$vars['sample_variable'] = t('Lorem ipsum.');
 
-  // Detach subscribe link from the links list. Subscribe link will be placed
-  // on page separately from links.
-  if (!empty($vars['node']->links['flag-subscriptions']['title'])) {
+    // Detach subscribe link from the links list. Subscribe link will be placed
+    // on page separately from links.
+    if (!empty($vars['node']->links['flag-subscriptions']['title'])) {
     $vars['subscribe_link'] = $vars['node']->links['flag-subscriptions']['title'];
     unset($vars['node']->links['flag-subscriptions']);
-  }
+    }
 
-  // Optionally, run node-type-specific preprocess functions, like
-  // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
-  if (function_exists($function)) {
+    // Optionally, run node-type-specific preprocess functions, like
+    // boinc_preprocess_node_page() or boinc_preprocess_node_story().
+    $function = __FUNCTION__ . '_' . $vars['node']->type;
+    if (function_exists($function)) {
     $function($vars, $hook);
-  }
+    }
 }
 
 /**
  * Preprocessing for forum lists
  */
 function boinc_preprocess_forums(&$vars, $hook) {
-  // Add a link to mark all forums as read
-  module_load_include('inc', 'forum_tweaks', 'includes/mark-read');
-  forum_tweaks_get_mark_read_link($vars['tid'], $vars['links']);
-  if (!$vars['parents']) {
+    // Add a link to mark all forums as read
+    module_load_include('inc', 'forum_tweaks', 'includes/mark-read');
+    forum_tweaks_get_mark_read_link($vars['tid'], $vars['links']);
+    if (!$vars['parents']) {
     // Remove the "Post new forum topic" link from the top level forum list
     unset($vars['links']['forum']);
     // Add a link to manage subscriptions for the user
     $vars['links']['subscriptions'] = array(
-      'title' => bts('Manage subscriptions', array(), NULL, 'boinc:forum-footer'),
-      'href' => 'account/prefs/subscriptions',
+        'title' => bts('Manage subscriptions', array(), NULL, 'boinc:forum-footer'),
+        'href' => 'account/prefs/subscriptions',
     );
-  }
+    }
 }
 
 /**
  * Preprocessing for forum type nodes
  */
 function boinc_preprocess_node_forum(&$vars, $hook) {
-  global $language;
-  global $user;
+    global $language;
+    global $user;
 
-  // Locality
-  $vars['locality'] = $language->language;
+    // Locality
+    $vars['locality'] = $language->language;
 
-  // Get the author of the node
-  $account = user_load($vars['uid']);
-  $comments_per_page = ($user->comments_per_page) ? $user->comments_per_page : variable_get("comment_default_per_page_{$vars['node']->type}", 50);
+    // Get the author of the node
+    $account = user_load($vars['uid']);
+    $comments_per_page = ($user->comments_per_page) ? $user->comments_per_page : variable_get("comment_default_per_page_{$vars['node']->type}", 50);
 
-  // Add signature
-  $vars['signature'] = check_markup($account->signature, $vars['node']->format);
+    // Add signature
+    $vars['signature'] = check_markup($account->signature, $vars['node']->format);
 
-  // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+    // Show signatures based on user preference
+    $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
 
-  // Expose comment sort order so that the template can put the topic node
-  // content (i.e. initial post) at the very end if "Newest post first" is the
-  // preference used by this user
-  $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
-  $vars['node']->comment = 0;
+    // Expose comment sort order so that the template can put the topic node
+    // content (i.e. initial post) at the very end if "Newest post first" is the
+    // preference used by this user
+    $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
+    $vars['node']->comment = 0;
 
-  $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
-  $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
-  $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
+    $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
+    $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
+    $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
 
-  $links = $vars['links'];
-  $moderator_links = array();
-  _boinc_create_moderator_links($links, $moderator_links);
-  $vars['links'] = $links;
-  $vars['moderator_links'] = $moderator_links;
+    $links = $vars['links'];
+    $moderator_links = array();
+    _boinc_create_moderator_links($links, $moderator_links);
+    $vars['links'] = $links;
+    $vars['moderator_links'] = $moderator_links;
 
-  // Ignore user link
-  $vars['ignore_link'] = _boinc_ignore_user_link('node', $vars['node']);
+    // Ignore user link
+    $vars['ignore_link'] = _boinc_ignore_user_link('node', $vars['node']);
 }
 
 
@@ -371,48 +371,48 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function boinc_preprocess_comment(&$vars, $hook) {
-  global $language;
-  global $user;
+    global $language;
+    global $user;
 
-  // Locality
-  $vars['locality'] = $language->language;
+    // Locality
+    $vars['locality'] = $language->language;
 
-  // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+    // Show signatures based on user preference
+    $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
 
-  $links = $vars['links'];
-  $moderator_links = array();
-  _boinc_create_moderator_links($links, $moderator_links);
-  $vars['links'] = $links;
-  $vars['moderator_links'] = $moderator_links;
+    $links = $vars['links'];
+    $moderator_links = array();
+    _boinc_create_moderator_links($links, $moderator_links);
+    $vars['links'] = $links;
+    $vars['moderator_links'] = $moderator_links;
 
-  // Ignore user link
-  $vars['ignore_link'] = _boinc_ignore_user_link('comment', $vars['comment']);
+    // Ignore user link
+    $vars['ignore_link'] = _boinc_ignore_user_link('comment', $vars['comment']);
 }
 
 /**
  *
  */
 function boinc_preprocess_forum_topic_list(&$variables) {
-  if (!empty($variables['topics'])) {
+    if (!empty($variables['topics'])) {
     foreach ($variables['topics'] as $id => $topic) {
-      if ($topic->new_replies) {
+        if ($topic->new_replies) {
         $cid = boincuser_get_first_unread_comment_id($topic->nid);
         if ($cid) {
-          $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
+            $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
         }
         else {
-          // User hasn't visited this topic before, so all replies are new...
-          $topic->new_replies = NULL;
+            // User hasn't visited this topic before, so all replies are new...
+            $topic->new_replies = NULL;
+        }
         }
-      }
-      // Use same logic in forum.module to change message if topic has
-      // moved. Changed link to match boinc path-added "community".
-      if ($topic->forum_tid != $variables['tid']) {
+        // Use same logic in forum.module to change message if topic has
+        // moved. Changed link to match boinc path-added "community".
+        if ($topic->forum_tid != $variables['tid']) {
         $variables['topics'][$id]->message = l(t('This topic has been moved'), "community/forum/$topic->forum_tid");
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -425,79 +425,79 @@ 
  */
 ///* -- Delete this line if you want to use this function
 function boinc_preprocess_views_view(&$vars, $hook) {
-  switch ($vars['name']) {
-  case 'boinc_account_computers':
+    switch ($vars['name']) {
+    case 'boinc_account_computers':
     switch ($vars['display_id']) {
     case 'page_1':
     case 'panel_pane_1':
       $vars['empty'] = boincwork_views_host_list_empty_text();
-      break;
+        break;
     case 'page_2':
       $vars['empty'] = boincwork_views_host_list_empty_text('active');
-      break;
+        break;
     case 'block_1':
       $vars['empty'] = boincwork_views_host_list_empty_text('preferences');
-      break;
+        break;
     default:
     }
     break;
-  case 'boinc_account_tasks_all':
+    case 'boinc_account_tasks_all':
     $vars['empty'] = boincwork_views_task_list_empty_text();
     break;
-  case 'boinc_friends':
+    case 'boinc_friends':
     if ($vars['display_id'] == 'block_1') {
-      $vars['header'] = boincuser_views_friends_block_header();
+        $vars['header'] = boincuser_views_friends_block_header();
     }
     break;
-  case 'boinc_host':
+    case 'boinc_host':
       $view = views_get_current_view();
-      if (!($view->result)) {
+        if (!($view->result)) {
         $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
-      }
+        }
     break;
-  case 'boinc_host_list':
+    case 'boinc_host_list':
     if ($vars['display_id'] == 'page_2') {
-     $vars['empty'] = boincwork_views_host_list_empty_text();
+        $vars['empty'] = boincwork_views_host_list_empty_text();
     }
     elseif ($vars['display_id'] == 'page_1') {
-      $vars['empty'] = boincwork_views_host_list_empty_text('active');
+        $vars['empty'] = boincwork_views_host_list_empty_text('active');
     }
     break;
-  case 'boinc_task':
+    case 'boinc_task':
     // Load view object (view data is not available in header / footer); execute view query
     $view = views_get_current_view();
     $view->execute();
     $result = reset($view->result);
 
     if ($result) {
-      // Display the stderr output in the footer
-      $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
-      $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
+        // Display the stderr output in the footer
+        $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
+        $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
     } else {
-      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
+        $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
     }
     break;
-  case 'boinc_teams':
+    case 'boinc_teams':
     if ($vars['display_id'] == 'panel_pane_3') {
-      $team_id = arg(2);
-      $vars['header'] = boincteam_manage_admins_panel_header($team_id);
+        $team_id = arg(2);
+        $vars['header'] = boincteam_manage_admins_panel_header($team_id);
     }
     break;
-  case 'boinc_workunit':
+    case 'boinc_workunit':
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
     require_boinc(array('util','boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     if ($wu) {
-      // Output from admin defined BOINC project-specific function
-      project_workunit($wu);
-      // Output of project_workunit() gets caught in the buffer
-      $vars['footer'] = ob_get_clean();
+        // Output from admin defined BOINC project-specific function
+        project_workunit($wu);
+        // Output of project_workunit() gets caught in the buffer
+        $vars['footer'] = ob_get_clean();
     } else {
-      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
+        $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
     }
-  default:
+    default:
   }
 }
 // */
@@ -510,19 +510,19 @@ 
  */
 ///* -- Delete this line if you want to use this function
 function boinc_preprocess_privatemsg_view(&$vars, $hook) {
-  $author_picture = '<div class="picture">';
-  $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
-  if ($user_image) {
+    $author_picture = '<div class="picture">';
+    $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
+    if ($user_image) {
     if (is_array($user_image) AND $user_image['image']['filepath']) {
-      $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
+        $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
-      $author_picture .= '<img src="' . $user_image . '"/>';
+        $author_picture .= '<img src="' . $user_image . '"/>';
     }
-  }
-  $author_picture .= '</div>';
-  $vars['author_picture'] = $author_picture;
-  $vars['message_timestamp'] = date('j M Y G:i:s T', $vars['message']['timestamp']);
+    }
+    $author_picture .= '</div>';
+    $vars['author_picture'] = $author_picture;
+    $vars['message_timestamp'] = date('j M Y G:i:s T', $vars['message']['timestamp']);
 }
 // */
 
@@ -541,19 +541,19 @@ 
 // */
 
 function boinc_preprocess_search_result(&$variables) {
-  global $language;
-  // Locality
-  $variables['locality'] = $language->language;
+    global $language;
+    // Locality
+    $variables['locality'] = $language->language;
 
-  // Change the format of the search result date/time in the info string.
-  if ($variables['result']['date']) {
+    // Change the format of the search result date/time in the info string.
+    if ($variables['result']['date']) {
     $variables['info_split']['date'] = date('j M Y G:i:s T', $variables['result']['date']);
-  }
-  $variables['info'] = implode(' - ', $variables['info_split']);
+    }
+    $variables['info'] = implode(' - ', $variables['info_split']);
 
-  $type = strtolower($variables['result']['bundle']);
-  switch ($type) {
-  case 'profile':
+    $type = strtolower($variables['result']['bundle']);
+    switch ($type) {
+    case 'profile':
   case 'user':
     $node = $variables['result']['node'];
     $variables['url'] = url('account/' . $node->is_uid);
@@ -561,20 +561,20 @@ 
     $variables['user_image'] = boincuser_get_user_profile_image($node->is_uid);
     $variables['account'] = user_load($node->is_uid);
     break;
-  case 'team':
+    case 'team':
     $node = $variables['result']['node'];
     $variables['url'] = url('/community/teams/' . $node->entity_id);;
     break;
-  case 'forum':
+    case 'forum':
     $node = $variables['result']['node'];
     $drupalnode = node_load($node->entity_id);
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
-      $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
+        $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
     }
     break;
-  case 'comment':
+    case 'comment':
     // Get the node id for this comment
     $nid = $variables['result']['fields']['tos_content_extra'];
     $drupalnode = node_load($nid);
@@ -585,21 +585,21 @@ 
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
-      $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
+        $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
     }
-  break;
-  default:
+    break;
+    default:
   }
 }
 
 // Remove the mess of text under the search form and don't display "no results"
 // if a search hasn't even been submitted
 function boinc_apachesolr_search_noresults() {
-  $message = bts('No results found...', array(), NULL, 'boinc:search-with-no-results');
-  if (!arg(2)) {
+    $message = bts('No results found...', array(), NULL, 'boinc:search-with-no-results');
+    if (!arg(2)) {
     $message = '';
-  }
-  return '<p>' . $message . '</p>';
+    }
+    return '<p>' . $message . '</p>';
 }
 
 /**
@@ -608,42 +608,42 @@ 
  */
 function phptemplate_username($object) {
 
-  if ($object->uid && $object->name) {
+    if ($object->uid && $object->name) {
 
     // Show the profile name in general, not the username
     $name = user_load($object->uid)->boincuser_name;
 
     // Shorten the name when it is too long or it will break many tables.
     if (drupal_strlen($name) > 20) {
-      $name = drupal_substr($name, 0, 15) . '...';
+        $name = drupal_substr($name, 0, 15) . '...';
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
+        $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
     }
     else {
-      $output = check_plain($name);
+        $output = check_plain($name);
     }
-  }
-  else if ($object->name) {
+    }
+    else if ($object->name) {
     // Sometimes modules display content composed by people who are
     // not registered members of the site (e.g. mailing list or news
     // aggregator modules). This clause enables modules to display
     // the true author of the content.
     if (!empty($object->homepage)) {
-      $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
+        $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
     }
     else {
-      $output = check_plain($object->name);
+        $output = check_plain($object->name);
     }
 
     $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
-  }
-  else {
+    }
+    else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -651,7 +651,7 @@ 
  * "More information about formatting options"
  */
 function boinc_filter_tips_more_info () {
-  return '';
+    return '';
 }
 
 /**
@@ -669,19 +669,19 @@ 
  *   An array containing the email [type] (mailkey), [subject] and [body].
  */
 function boinc_flag_friend_message_email($status, $flag, $recipient, $sender) {
-  $email = array();
-  $email['type'] = 'flag-friend';
-  // Reload the sender to get a full user object
-  $sender = user_load($sender->uid);
+    $email = array();
+    $email['type'] = 'flag-friend';
+    // Reload the sender to get a full user object
+    $sender = user_load($sender->uid);
 
-  switch ($status) {
+    switch ($status) {
     case FLAG_FRIEND_FLAGGED:
       // Sender accepted recipient's friend request
       $email['subject'] = bts('!name accepted your friend request [!site]', array(
         '!name' => $sender->boincuser_name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name confirmed you as a friend on !site.
+        $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
 !link
@@ -695,12 +695,12 @@ 
         '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
         '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
         ), array(), NULL, 'boinc:friend-request-email');
-      break;
+        break;
 
     case FLAG_FRIEND_PENDING:
       // Sender is requesting to be recipient's friend
       $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
+        $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
 !link
@@ -714,26 +714,26 @@ 
         '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
         '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
         ),
-      array(), NULL, 'boinc:friend-request-email');
-      break;
-  }
-  return $email;
+        array(), NULL, 'boinc:friend-request-email');
+        break;
+    }
+    return $email;
 }
 
 /**
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+    if ($links){
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
-      unset($links['flag-subscriptions']);
+        unset($links['flag-subscriptions']);
     }
     // Reorder the links however you need them.
     $links = reorder_links($links, array('comment_edit','quote','comment_add','comment_reply','flag-abuse_comment','flag-abuse_node'), array('comment_delete'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
-  }
+    }
 }
 
 /**
@@ -777,8 +777,8 @@ 
  * That is to say, get rid of it and use the views-view-table.tpl.php template.
  */
 function boinc_tablesort_indicator($style) {
-  return '';
-  /*
+    return '';
+    /*
   if ($style == "asc") {
     return theme('image', 'misc/arrow-asc.png', t('sort icon'), t('sort ascending'));
   }
@@ -801,48 +801,48 @@ 
  *
  */
 function _boinc_create_moderator_links(&$links, &$moderator_links) {
-  // If there are no links, then do nothing
-  if (empty($links)) {
+    // If there are no links, then do nothing
+    if (empty($links)) {
     return;
-  }
+    }
 
-  $alllinks = array();
-  $modlinks = array();
+    $alllinks = array();
+    $modlinks = array();
 
-  // Create an array of HTML elements from the $links string, keys
-  // are the class attribute for the <li> tags.
-  $dom = new DOMDocument;
-  $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
-  foreach($dom->getElementsByTagName('li') as $node) {
+    // Create an array of HTML elements from the $links string, keys
+    // are the class attribute for the <li> tags.
+    $dom = new DOMDocument;
+    $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
+    foreach($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
-  }
+    }
 
-  // Select classes to be placed into moderator links array
-  $selected_classes = array(
+    // Select classes to be placed into moderator links array
+    $selected_classes = array(
     "make_sticky", "make_unsticky",
     "lock", "unlock",
     "convert",
     "hide", "unhide",
     "comment_delete",
-  );
-  foreach(array_keys($alllinks) as $key1) {
+    );
+    foreach(array_keys($alllinks) as $key1) {
     // Select string up to first space, if present.
     $class1 = strtok($key1, ' ');
     if (in_array($class1, $selected_classes)) {
-      if (empty($modlinks)) {
+        if (empty($modlinks)) {
         _boinc_firstlink($alllinks[$key1]);
-      }
-      $modlinks[$key1] = $alllinks[$key1];
-      unset($alllinks[$key1]);
+        }
+        $modlinks[$key1] = $alllinks[$key1];
+        unset($alllinks[$key1]);
     }
-  }
-  // Convert the HTML arrays back into strings, wrap them in <ul>
-  // tags
-  $links = "<ul class=\"links\">".implode($alllinks)."</ul>";
-  $moderator_links = "<ul class=\"links\">".implode($modlinks)."</ul>";
+    }
+    // Convert the HTML arrays back into strings, wrap them in <ul>
+    // tags
+    $links = "<ul class=\"links\">".implode($alllinks)."</ul>";
+    $moderator_links = "<ul class=\"links\">".implode($modlinks)."</ul>";
 
-  return;
+    return;
 }
 
 /*
@@ -850,38 +850,38 @@ 
  * attribute to class.
  */
 function _boinc_firstlink(&$alink) {
-  if (!empty($alink)) {
+    if (!empty($alink)) {
     $dom = new DomDocument;
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
     if ($myli->length>0) {
-      $newclasses = trim(($myli[0]->getAttribute("class"))." first");
-      $myli[0]->setAttribute("class", $newclasses);
-      $alink = $dom->saveHTML($myli[0]);
+        $newclasses = trim(($myli[0]->getAttribute("class"))." first");
+        $myli[0]->setAttribute("class", $newclasses);
+        $alink = $dom->saveHTML($myli[0]);
+    }
     }
-  }
 }
 
 /*
  * Private function to generate the action links
  */
 function _boinc_action_links() {
-  global $user;
-  global $base_path;
+    global $user;
+    global $base_path;
 
-  $output = '<ul class="menu"><li class="first">';
-  if ($user->uid) {
+    $output = '<ul class="menu"><li class="first">';
+    if ($user->uid) {
     $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
-  } else {
+    } else {
     $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), NULL, 'boinc:menu-link') . '</a>';
-  }
-  $output .= '</li>';
-  if (module_exists('global_search') OR module_exists('global_search_solr')) {
+    }
+    $output .= '</li>';
+    if (module_exists('global_search') OR module_exists('global_search_solr')) {
     $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), NULL, 'boinc:menu-link') .'</a> </l1>';
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
@@ -889,47 +889,47 @@ 
  * function. Modified for boinc functionality.
  */
 function _boinc_ignore_user_link($type, $object = NULL, $teaser = FALSE) {
-  global $user;
+    global $user;
 
-  if (!$user || !$user->uid) {
+    if (!$user || !$user->uid) {
     return;
-  }
+    }
 
-  static $ignored;
-  $links = array();
+    static $ignored;
+    $links = array();
 
-  if ($type == 'node' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+    if ($type == 'node' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
-      $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
+        $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }
     if ($ignored[$object->uid] == 0) {
-      $links['ignore_user'] = array(
+        $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
         'query' => 'destination='. $_GET['q'],
         'attributes' => array(
-          'class' => 'ignore-user',
-          'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
+            'class' => 'ignore-user',
+            'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
         ),
-      );
+        );
     }
-  }
-  else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+    }
+    else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
-      $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
+        $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }
     if ($ignored[$object->uid] == 0) {
-      $links['ignore_user'] = array(
+        $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
         'query' => 'destination='. $_GET['q'],
         'attributes' => array(
-          'class' => 'ignore-user',
-          'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
+            'class' => 'ignore-user',
+            'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
         ),
-      );
+        );
+    }
     }
-  }
 
-  return $links;
+    return $links;
 }

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

Indentation +233 added lines, -233 removed lines

@@ -4,41 +4,41 @@ 
  * Implementation of hook_content_default_fields().
  */
 function user_profiles_content_default_fields() {
-  $fields = array();
+    $fields = array();
 
-  // Exported field: field_background
-  $fields['profile-field_background'] = array(
+    // Exported field: field_background
+    $fields['profile-field_background'] = array(
     'field_name' => 'field_background',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -51,56 +51,56 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => '10',
-      'size' => 60,
-      'default_value' => array(
+        'rows' => '10',
+        'size' => 60,
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_background][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => bts('Your personal background', array(), NULL, 'boinc:account-profile-edit'),
-      'weight' => '3',
-      'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), NULL, 'boinc:account-profile-edit'),
-      'type' => 'text_textarea',
-      'module' => 'text',
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_background][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => bts('Your personal background', array(), NULL, 'boinc:account-profile-edit'),
+        'weight' => '3',
+        'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), NULL, 'boinc:account-profile-edit'),
+        'type' => 'text_textarea',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Exported field: field_country
-  $fields['profile-field_country'] = array(
+    // Exported field: field_country
+    $fields['profile-field_country'] = array(
     'field_name' => 'field_country',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -345,53 +345,53 @@ 
 Zimbabwe|Zimbabwe',
     'allowed_values_php' => 'return boinccore_get_country_list();',
     'widget' => array(
-      'default_value' => array(
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => 'Country',
-      'weight' => '5',
-      'description' => '',
-      'type' => 'optionwidgets_select',
-      'module' => 'optionwidgets',
+            'value' => '',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => 'Country',
+        'weight' => '5',
+        'description' => '',
+        'type' => 'optionwidgets_select',
+        'module' => 'optionwidgets',
     ),
-  );
+    );
 
-  // Exported field: field_image
-  $fields['profile-field_image'] = array(
+    // Exported field: field_image
+    $fields['profile-field_image'] = array(
     'field_name' => 'field_image',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'filefield',
@@ -403,19 +403,19 @@ 
     'list_default' => 1,
     'description_field' => '0',
     'widget' => array(
-      'file_extensions' => 'png gif jpg jpeg',
-      'file_path' => 'profiles',
-      'progress_indicator' => 'bar',
-      'max_filesize_per_file' => '512K',
-      'max_filesize_per_node' => '',
-      'max_resolution' => '300x300',
-      'min_resolution' => '50x50',
-      'alt' => '',
-      'custom_alt' => 0,
-      'title' => '',
-      'custom_title' => 0,
-      'title_type' => 'textfield',
-      'default_image' => array(
+        'file_extensions' => 'png gif jpg jpeg',
+        'file_path' => 'profiles',
+        'progress_indicator' => 'bar',
+        'max_filesize_per_file' => '512K',
+        'max_filesize_per_node' => '',
+        'max_resolution' => '300x300',
+        'min_resolution' => '50x50',
+        'alt' => '',
+        'custom_alt' => 0,
+        'title' => '',
+        'custom_title' => 0,
+        'title_type' => 'textfield',
+        'default_image' => array(
         'filename' => 'default-avatar.png',
         'filepath' => 'sites/default/files/imagefield_default_images/default-avatar.png',
         'filemime' => 'image/png',
@@ -426,49 +426,49 @@ 
         'status' => 1,
         'timestamp' => 1347855344,
         'fid' => '1',
-      ),
-      'use_default_image' => 1,
-      'label' => 'Avatar',
-      'weight' => '7',
-      'description' => '',
-      'type' => 'imagefield_widget',
-      'module' => 'imagefield',
+        ),
+        'use_default_image' => 1,
+        'label' => 'Avatar',
+        'weight' => '7',
+        'description' => '',
+        'type' => 'imagefield_widget',
+        'module' => 'imagefield',
     ),
-  );
+    );
 
-  // Exported field: field_opinions
-  $fields['profile-field_opinions'] = array(
+    // Exported field: field_opinions
+    $fields['profile-field_opinions'] = array(
     'field_name' => 'field_opinions',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -481,60 +481,60 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => '10',
-      'size' => 60,
-      'default_value' => array(
+        'rows' => '10',
+        'size' => 60,
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_opinions][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit'),
-      'weight' => '4',
-      'description' => bts('Tell us your thoughts about @this_project
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_opinions][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit'),
+        'weight' => '4',
+        'description' => bts('Tell us your thoughts about @this_project
    1. Why do you run @this_project?
    2. What are your views about the project?
    3. Any suggestions?',
-      array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-profile-edit'),
-      'type' => 'text_textarea',
-      'module' => 'text',
+        array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-profile-edit'),
+        'type' => 'text_textarea',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Exported field: field_profile_image
-  $fields['profile-field_profile_image'] = array(
+    // Exported field: field_profile_image
+    $fields['profile-field_profile_image'] = array(
     'field_name' => 'field_profile_image',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'filefield',
@@ -546,19 +546,19 @@ 
     'list_default' => 1,
     'description_field' => '0',
     'widget' => array(
-      'file_extensions' => 'png gif jpg jpeg',
-      'file_path' => 'profiles',
-      'progress_indicator' => 'bar',
-      'max_filesize_per_file' => '512K',
-      'max_filesize_per_node' => '',
-      'max_resolution' => '640x480',
-      'min_resolution' => '100x100',
-      'alt' => '',
-      'custom_alt' => 0,
-      'title' => '',
-      'custom_title' => 0,
-      'title_type' => 'textfield',
-      'default_image' => array(
+        'file_extensions' => 'png gif jpg jpeg',
+        'file_path' => 'profiles',
+        'progress_indicator' => 'bar',
+        'max_filesize_per_file' => '512K',
+        'max_filesize_per_node' => '',
+        'max_resolution' => '640x480',
+        'min_resolution' => '100x100',
+        'alt' => '',
+        'custom_alt' => 0,
+        'title' => '',
+        'custom_title' => 0,
+        'title_type' => 'textfield',
+        'default_image' => array(
         'filename' => 'default-user.png',
         'filepath' => 'sites/default/files/imagefield_default_images/default-user.png',
         'filemime' => 'image/png',
@@ -569,49 +569,49 @@ 
         'status' => 1,
         'timestamp' => 1362770990,
         'fid' => '5',
-      ),
-      'use_default_image' => 1,
-      'label' => 'Profile image',
-      'weight' => '8',
-      'description' => '',
-      'type' => 'imagefield_widget',
-      'module' => 'imagefield',
+        ),
+        'use_default_image' => 1,
+        'label' => 'Profile image',
+        'weight' => '8',
+        'description' => '',
+        'type' => 'imagefield_widget',
+        'module' => 'imagefield',
     ),
-  );
+    );
 
-  // Exported field: field_url
-  $fields['profile-field_url'] = array(
+    // Exported field: field_url
+    $fields['profile-field_url'] = array(
     'field_name' => 'field_url',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -624,56 +624,56 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => 5,
-      'size' => '42',
-      'default_value' => array(
+        'rows' => 5,
+        'size' => '42',
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_url][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => 'Website URL',
-      'weight' => '9',
-      'description' => '',
-      'type' => 'text_textfield',
-      'module' => 'text',
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_url][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => 'Website URL',
+        'weight' => '9',
+        'description' => '',
+        'type' => 'text_textfield',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Exported field: field_zip
-  $fields['profile-field_zip'] = array(
+    // Exported field: field_zip
+    $fields['profile-field_zip'] = array(
     'field_name' => 'field_zip',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -686,32 +686,32 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => 5,
-      'size' => '10',
-      'default_value' => array(
+        'rows' => 5,
+        'size' => '10',
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_zip][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => bts('Postal code', array(), NULL, 'boinc:account-profile-edit'),
-      'weight' => '6',
-      'description' => '',
-      'type' => 'text_textfield',
-      'module' => 'text',
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_zip][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => bts('Postal code', array(), NULL, 'boinc:account-profile-edit'),
+        'weight' => '6',
+        'description' => '',
+        'type' => 'text_textfield',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Translatables
-  // Use bts() function to translate additional strings.
-  bts('Avatar', array(), NULL, 'boinc:account-profile-edit');
-  bts('Country', array(), NULL, 'boinc:country-of-origin');
-  bts('Profile image', array(), NULL, 'boinc:account-profile-edit');
-  bts('Website URL', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your personal background', array(), NULL, 'boinc:account-profile-edit');
-  bts('Postal code', array(), NULL, 'boinc:account-profile-edit');
+    // Translatables
+    // Use bts() function to translate additional strings.
+    bts('Avatar', array(), NULL, 'boinc:account-profile-edit');
+    bts('Country', array(), NULL, 'boinc:country-of-origin');
+    bts('Profile image', array(), NULL, 'boinc:account-profile-edit');
+    bts('Website URL', array(), NULL, 'boinc:account-profile-edit');
+    bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit');
+    bts('Your personal background', array(), NULL, 'boinc:account-profile-edit');
+    bts('Postal code', array(), NULL, 'boinc:account-profile-edit');
 
-  return $fields;
+    return $fields;
 }

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

@@ -59,10 +59,10 @@ 
           '_error_element' => 'default_value_widget][field_background][0][value',
         ),
       ),
-      'default_value_php' => NULL,
-      'label' => bts('Your personal background', array(), NULL, 'boinc:account-profile-edit'),
+      'default_value_php' => null,
+      'label' => bts('Your personal background', array(), null, 'boinc:account-profile-edit'),
       'weight' => '3',
-      'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), NULL, 'boinc:account-profile-edit'),
+      'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), null, 'boinc:account-profile-edit'),
       'type' => 'text_textarea',
       'module' => 'text',
     ),
@@ -350,7 +350,7 @@ 
           'value' => '',
         ),
       ),
-      'default_value_php' => NULL,
+      'default_value_php' => null,
       'label' => 'Country',
       'weight' => '5',
       'description' => '',
@@ -489,14 +489,14 @@ 
           '_error_element' => 'default_value_widget][field_opinions][0][value',
         ),
       ),
-      'default_value_php' => NULL,
-      'label' => bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit'),
+      'default_value_php' => null,
+      'label' => bts('Your opinions about this project', array(), null, 'boinc:account-profile-edit'),
       'weight' => '4',
       'description' => bts('Tell us your thoughts about @this_project
    1. Why do you run @this_project?
    2. What are your views about the project?
    3. Any suggestions?',
-      array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-profile-edit'),
+      array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:account-profile-edit'),
       'type' => 'text_textarea',
       'module' => 'text',
     ),
@@ -632,7 +632,7 @@ 
           '_error_element' => 'default_value_widget][field_url][0][value',
         ),
       ),
-      'default_value_php' => NULL,
+      'default_value_php' => null,
       'label' => 'Website URL',
       'weight' => '9',
       'description' => '',
@@ -694,8 +694,8 @@ 
           '_error_element' => 'default_value_widget][field_zip][0][value',
         ),
       ),
-      'default_value_php' => NULL,
-      'label' => bts('Postal code', array(), NULL, 'boinc:account-profile-edit'),
+      'default_value_php' => null,
+      'label' => bts('Postal code', array(), null, 'boinc:account-profile-edit'),
       'weight' => '6',
       'description' => '',
       'type' => 'text_textfield',
@@ -705,13 +705,13 @@ 
 
   // Translatables
   // Use bts() function to translate additional strings.
-  bts('Avatar', array(), NULL, 'boinc:account-profile-edit');
-  bts('Country', array(), NULL, 'boinc:country-of-origin');
-  bts('Profile image', array(), NULL, 'boinc:account-profile-edit');
-  bts('Website URL', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your personal background', array(), NULL, 'boinc:account-profile-edit');
-  bts('Postal code', array(), NULL, 'boinc:account-profile-edit');
+  bts('Avatar', array(), null, 'boinc:account-profile-edit');
+  bts('Country', array(), null, 'boinc:country-of-origin');
+  bts('Profile image', array(), null, 'boinc:account-profile-edit');
+  bts('Website URL', array(), null, 'boinc:account-profile-edit');
+  bts('Your opinions about this project', array(), null, 'boinc:account-profile-edit');
+  bts('Your personal background', array(), null, 'boinc:account-profile-edit');
+  bts('Postal code', array(), null, 'boinc:account-profile-edit');
 
   return $fields;
 }

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

Indentation +35 added lines, -35 removed lines

@@ -4,33 +4,33 @@ 
  * Implementation of hook_default_panels_mini().
  */
 function stats_charts_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 = 'project_stats_overview';
-  $mini->category = 'BOINC';
-  $mini->admin_title = 'Project stats overview';
-  $mini->admin_description = 'General statistical information for the project';
-  $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 = 'project_stats_overview';
+    $mini->category = 'BOINC';
+    $mini->admin_title = 'Project stats overview';
+    $mini->admin_description = 'General statistical information for the project';
+    $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 = 'project_stats_overview';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = '';
+    $display->storage_type = 'panels_mini';
+    $display->storage_id = 'project_stats_overview';
+    $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' => 'Project stats overview',
-      'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:frontpage'),
-      'body' => '<?php echo boincstats_get_project_stats_overview(); ?>',
-      'format' => '3',
-      'substitute' => TRUE,
+        'admin_title' => 'Project stats overview',
+        'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:frontpage'),
+        'body' => '<?php echo boincstats_get_project_stats_overview(); ?>',
+        '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['project_stats_overview'] = $mini;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = 'new-1';
+    $mini->display = $display;
+    $export['project_stats_overview'] = $mini;
 
-  return $export;
+    return $export;
 }

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

@@ -7,7 +7,7 @@ 
   $export = array();
 
   $mini = new stdClass;
-  $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */
+  $mini->disabled = false; /* Edit this to true to make a default mini disabled initially */
   $mini->api_version = 1;
   $mini->name = 'project_stats_overview';
   $mini->category = 'BOINC';
@@ -21,8 +21,8 @@ 
   $display->layout_settings = array();
   $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'middle' => NULL,
+      'default' => null,
+      'middle' => null,
     ),
   );
   $display->cache = array();
@@ -36,18 +36,18 @@ 
     $pane->panel = 'middle';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'Project stats overview',
-      'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:frontpage'),
+      'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:frontpage'),
       'body' => '<?php echo boincstats_get_project_stats_overview(); ?>',
       'format' => '3',
-      'substitute' => TRUE,
+      'substitute' => true,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array();
     $pane->extras = array();

html/ops/fix_project_prefs.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
             // changing the tree in a loop has strange results so do it separately
             $to_remove = array();
             $ids = array();
-            foreach($appids as $elem) {
+            foreach ($appids as $elem) {
                 $ids[] = $elem->nodeValue;
                 $to_remove[] = $elem;
             }
@@ -94,7 +94,7 @@ 
         exit(1);
     }
     $appids = $node->getElementsByTagName("app_id");
-    if ($appids->length == 0 ) return;
+    if ($appids->length == 0) return;
     // changing the tree in a loop has strange results so do it separately
     $to_remove = array();
     $ids = array();
@@ -129,7 +129,7 @@ 
         $to_remove = array();
         foreach ($subNodes as $subNode) {
             // ignore empty text nodes which are basically whitespace from indentation (only relevant if preserveWhiteSpace is set to true above)
-            if (($subNode->nodeType != XML_TEXT_NODE) || (($subNode->nodeType == XML_TEXT_NODE) &&(strlen(trim($subNode->wholeText))>=1))) {
+            if (($subNode->nodeType != XML_TEXT_NODE) || (($subNode->nodeType == XML_TEXT_NODE) && (strlen(trim($subNode->wholeText)) >= 1))) {
                 if ($subNode->nodeName == "venue") {
                     if (!$subNode->hasChildNodes()) {
                         // empty venue tag, clean this up too

html/user/forum_search_action.php

Indentation +2 added lines, -2 removed lines

@@ -219,8 +219,8 @@
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",
-         "<a href=\"https://www.google.com/search?domains=".url_base()."&sitesearch=".url_base()."forum_thread.php&q=".htmlentities($search_keywords)."\">",
-         "</a>")
+            "<a href=\"https://www.google.com/search?domains=".url_base()."&sitesearch=".url_base()."forum_thread.php&q=".htmlentities($search_keywords)."\">",
+            "</a>")
     ."</p>";
 }
 echo "<p><a href=\"forum_search.php\">".tra("Perform another search")."</a></p>";

Spacing +23 added lines, -23 removed lines

@@ -31,10 +31,10 @@ 
 // Optionally filters by forum, user, time, or hidden if specified.
 //
 function search_thread_titles(
-    $keyword_list, $forum="", $user="", $time="", $limit=200,
-    $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
-    $search_string="%";
+    $keyword_list, $forum = "", $user = "", $time = "", $limit = 200,
+    $sort_style = CREATE_TIME_NEW, $show_hidden = false
+) {
+    $search_string = "%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
@@ -51,7 +51,7 @@ 
     if (!$show_hidden) {
         $query .= " and thread.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $query .= ' ORDER BY timestamp DESC';
         break;
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
-    $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    $search_string = "%";
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -100,20 +100,20 @@ 
     }
     $query = "select post.* from ".$db->db_name.".post".$optional_join." where content like '".$search_string."'";
     if ($forum) {
-        $query.=" and forum = $forum->id";
+        $query .= " and forum = $forum->id";
     }
     if ($user) {
-        $query.=" and post.user = $user->id ";
+        $query .= " and post.user = $user->id ";
     }
     if ($time) {
-        $query.=" and post.timestamp > $time";
+        $query .= " and post.timestamp > $time";
     }
     if (!$show_hidden) {
         $query .= " AND post.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case VIEWS_MOST:
-        $query.= ' ORDER BY views DESC';
+        $query .= ' ORDER BY views DESC';
         break;
     case CREATE_TIME_NEW:
         $query .= ' ORDER by post.timestamp desc';
@@ -128,13 +128,13 @@ 
         $query .= ' ORDER BY post.timestamp DESC';
         break;
     }
-    $query.= " limit $limit";
+    $query .= " limit $limit";
     return BoincPost::enum_general($query);
 }
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -147,7 +147,7 @@ 
 $search_max_time = post_int("search_max_time");
 $search_forum = post_int("search_forum");
 $search_sort = post_int("search_sort");
-$search_list = explode(" ",$search_keywords);
+$search_list = explode(" ", $search_keywords);
 if ($search_max_time) {
     $min_timestamp = time() - ($search_max_time*3600*24);
 } else {
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum == -1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -176,11 +176,11 @@ 
 
 // Display the threads
 //
-if (count($threads)){
-    echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
+if (count($threads)) {
+    echo "<h3>".tra("Thread titles matching your query:")."</h3>";
     start_table('table-striped');
     thread_list_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if (!$show_hidden_posts) {
             $u = BoincUser::lookup_id($thread->owner);
             if ($u && is_banished($u)) continue;
@@ -200,8 +200,8 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
-    echo "<h3>" . tra("Messages matching your query:") . "</h3>";
+if (count($posts)) {
+    echo "<h3>".tra("Messages matching your query:")."</h3>";
     start_table('table-striped');
     row_heading_array(['Info', 'Post'], ['', 'width=70%']);
     $n = 1;
@@ -228,7 +228,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",

Braces +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
 function search_thread_titles(
     $keyword_list, $forum="", $user="", $time="", $limit=200,
     $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
+) {
     $search_string="%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
     $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -134,7 +134,7 @@ 
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum==-1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -176,11 +176,11 @@ 
 
 // Display the threads
 //
-if (count($threads)){
+if (count($threads)) {
     echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
     start_table('table-striped');
     thread_list_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if (!$show_hidden_posts) {
             $u = BoincUser::lookup_id($thread->owner);
             if ($u && is_banished($u)) continue;
@@ -200,7 +200,7 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
+if (count($posts)) {
     echo "<h3>" . tra("Messages matching your query:") . "</h3>";
     start_table('table-striped');
     row_heading_array(['Info', 'Post'], ['', 'width=70%']);
@@ -228,7 +228,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",

html/user/prefs.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         ".tra("Your preferences have been updated, and
           will take effect when your computer communicates with %1
           or you issue the %2 Update %3 command from the BOINC Manager.",
-          PROJECT, "<strong>", "</strong>")."
+            PROJECT, "<strong>", "</strong>")."
         </p>
     ";
 }
@@ -42,7 +42,7 @@ 
         ".tra("Your preferences have been reset to the defaults, and
           will take effect when your computer communicates with %1
           or you issue the %2 Update %3 command from the BOINC Manager.",
-          PROJECT, "<strong>", "</strong>")."
+            PROJECT, "<strong>", "</strong>")."
         </p>
     ";
 }

drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module

Braces +1 added lines, -2 removed lines

@@ -387,8 +387,7 @@
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
       array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
   }
   $output .= '<ul>';

Indentation +121 added lines, -121 removed lines

@@ -25,29 +25,29 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_forum_menu() {
-  $items = array();
+    $items = array();
 
-  return $items;
+    return $items;
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Team forum node edit form
-  case 'team_forum_node_form':
+    switch ($form_id) {
+    // Team forum node edit form
+    case 'team_forum_node_form':
 
     // Internal fields to indicate where these changes are taking place
     array_unshift($form, array(
-      'tfid' => array(
+        'tfid' => array(
         '#type' => 'hidden',
         '#value' => arg(3),
-      ),
+        ),
     ));
     break;
 
-  default:
+    default:
   }
 }
 
@@ -56,26 +56,26 @@ 
  * Obsolete in Drupal 7...
  */
 function boincteam_forum_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // In Drupal 7, these operation cases will all exist as their own hooks,
-  // so let's approximate that here so that this function can simply be removed
-  // upon migration to 7
-  switch($op) {
-  case 'insert':
+    // In Drupal 7, these operation cases will all exist as their own hooks,
+    // so let's approximate that here so that this function can simply be removed
+    // upon migration to 7
+    switch($op) {
+    case 'insert':
     boincteam_forum_node_insert($node);
     break;
-  case 'load':
+    case 'load':
     boincteam_forum_node_load($node);
     break;
-  case 'update':
+    case 'update':
     boincteam_forum_node_update($node);
     break;
-  case 'validate':
+    case 'validate':
     boincteam_forum_node_validate($node);
     break;
-  case 'view':
+    case 'view':
     boincteam_forum_node_view($node);
     break;
-  default:
+    default:
   }
 }
 
@@ -84,21 +84,21 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     if ($account->team == $team_id) {
-      db_query("
+        db_query("
         INSERT INTO {boincteam_forum_node} SET
           nid = %d,
           tfid = %d",
         $node->nid, $node->tfid
-      );
+        );
     }
     unset($node->tfid);
     break;
-  default:
+    default:
   }
 }
 
@@ -107,15 +107,15 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
       WHERE nid = %d", $node->nid
     ));
     break;
 
-  default:
+    default:
 
   }
 }
@@ -125,12 +125,12 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
 
     break;
 
-  default:
+    default:
 
   }
 }
@@ -140,8 +140,8 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
     if (!($node->tfid)) {
@@ -154,11 +154,11 @@ 
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
     if (!$account->team OR $account->team != $team_id) {
-      drupal_set_message(t('Failed to add team forum topic.'), 'error');
-      drupal_goto('community/forum');
+        drupal_set_message(t('Failed to add team forum topic.'), 'error');
+        drupal_goto('community/forum');
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -167,19 +167,19 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
     if (!$public_forum AND !$is_member AND !$is_global_moderator) {
-      drupal_not_found();
-      module_invoke_all('exit');
-      exit();
+        drupal_not_found();
+        module_invoke_all('exit');
+        exit();
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -187,17 +187,17 @@ 
 * Implementation of hook_views_api().
 */
 function boincteam_forum_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam_forum')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_forum_perm() {
-  return array('manage boincteam forum');
+    return array('manage boincteam forum');
 }
 
 
@@ -209,43 +209,43 @@ 
  * Check if the user has global access to moderate team forums
  */
 function boincteam_forum_is_global_moderator() {
-  global $user;
-  return user_access('manage boincteam forum');
+    global $user;
+    return user_access('manage boincteam forum');
 }
 
 /*
  * Check if any forums for a team are public
  */
 function boincteam_forum_is_any_public($team_id) {
-  $forums = boincteam_forum_list($team_id);
-  foreach ($forums as $forum) {
+    $forums = boincteam_forum_list($team_id);
+    foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /*
  * Check if a team forum should be visible to everyone
  */
 function boincteam_forum_is_public($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT public FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 /*
  * Load the forums for a team, if any exist
  */
 function boincteam_forum_list($team_id = NULL) {
-  if (!$team_id) {
+    if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
     $team_id = $account->team;
-  }
-  $team_forums = array();
-  if ($team_id) {
+    }
+    $team_forums = array();
+    if ($team_id) {
     // Load any team forum objects for the user's team
     $result = db_query("
       SELECT tfid, nid, title, description, created, updated, public,
@@ -255,26 +255,26 @@ 
     $row = 0;
     while ($team_forum = db_fetch_object($result)) {
 
-      $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
-      $team_forum->new_topics = 0; // TODO: Track user views of team topics
-      $team_forum->new_text = '';
-      $team_forum->new_url = '';
-      $team_forum->num_topics = db_result(db_query("
+        $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
+        $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+        $team_forum->new_topics = 0; // TODO: Track user views of team topics
+        $team_forum->new_text = '';
+        $team_forum->new_url = '';
+        $team_forum->num_topics = db_result(db_query("
         SELECT COUNT(nid) FROM {boincteam_forum_node}
         WHERE tfid = %d",
         $team_forum->tfid
-      ));
-      $team_forum->num_posts = db_result(db_query("
+        ));
+        $team_forum->num_posts = db_result(db_query("
         SELECT COALESCE(SUM(ncs.comment_count),0) + COUNT(ncs.nid)
         FROM {boincteam_forum_node} bfn
         JOIN {node_comment_statistics} ncs ON ncs.nid = bfn.nid
         JOIN {node} n ON n.nid = ncs.nid
         WHERE bfn.tfid = %d AND n.status = 1",
         $team_forum->tfid
-      ));
-      $last_post = new stdClass();
-      $last_post->timestamp = db_result(db_query("
+        ));
+        $last_post = new stdClass();
+        $last_post->timestamp = db_result(db_query("
         SELECT ncs.last_comment_timestamp FROM {node} n
         INNER JOIN {boincteam_forum_node} bfn
         INNER JOIN {node_comment_statistics} ncs ON n.nid = bfn.nid AND n.nid = ncs.nid
@@ -282,36 +282,36 @@ 
         ORDER BY ncs.last_comment_timestamp DESC
         LIMIT 1",
         $team_forum->tfid
-      ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
-      $team_forums[$team_forum->tfid] = $team_forum;
-      $row++;
+        ));
+        $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+        $team_forums[$team_forum->tfid] = $team_forum;
+        $row++;
     }
-  }
-  return $team_forums;
+    }
+    return $team_forums;
 }
 
 /*
  * Load a team forum by ID
  */
 function boincteam_forum_load($tfid) {
-  // Load any team forum objects for the user's team
-  $result = db_query("
+    // Load any team forum objects for the user's team
+    $result = db_query("
     SELECT tfid, nid, title, description, created, updated, public,
       min_time_between_posts, min_total_credit_to_post, min_avg_credit_to_post
     FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  );
-  return db_fetch_object($result);
+    );
+    return db_fetch_object($result);
 }
 
 /*
  * Look up the team ID for a given team forum
  */
 function boincteam_forum_lookup_nid($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT nid FROM {boincteam_forum}
     WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 
@@ -323,80 +323,80 @@ 
  * Create team forum form
  */
 function boincteam_forum_create_form_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
     . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_create_form');
+    $output .= drupal_get_form('boincteam_forum_create_form');
 
-  return $output;
+    return $output;
 }
 
 /**
  * Edit team forum form
  */
 function boincteam_forum_edit_form_panel($tfid) {
-  $team_forum = boincteam_forum_load($tfid);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
+    $team_forum = boincteam_forum_load($tfid);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
     $team_forum->title . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
+    $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
 
-  return $output;
+    return $output;
 }
 
 /**
  * Link to team forums
  */
 function boincteam_forum_link_panel($team_id) {
-  $show_public_only = (
+    $show_public_only = (
     !boincteam_is_member($team_id) AND
     !boincteam_forum_is_global_moderator()
-  );
-  $forums = boincteam_forum_list($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
-  $output .= '<p>'
+    );
+    $forums = boincteam_forum_list($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
+    $output .= '<p>'
     . bts('A discussion forum has been set up for team members.', array(), NULL, 'boinc:team-forum')
     . '</p>';
-  $output .= '<ul class="tab-list action-list">';
-  foreach ($forums as $forum) {
+    $output .= '<ul class="tab-list action-list">';
+    foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' .
+        $output .= '  <li class="tab primary">' .
         l(
-          //$forum->title,
-          bts('Enter forum', array(), NULL, 'boinc:team-forum'),
-          "community/teams/{$team_id}/forum/{$forum->tfid}"
+            //$forum->title,
+            bts('Enter forum', array(), NULL, 'boinc:team-forum'),
+            "community/teams/{$team_id}/forum/{$forum->tfid}"
         ) . '</li>';
-      // Since we're only supporting one team forum for now, we've labeled the
-      // link in a generic way above and will now just break out of the loop
-      break;
+        // Since we're only supporting one team forum for now, we've labeled the
+        // link in a generic way above and will now just break out of the loop
+        break;
     }
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team forums
  */
 function boincteam_forum_topic_overview_panel($nid = NULL) {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
-  $output .= '<div>';
-  if ($nid) {
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
+    $output .= '<div>';
+    if ($nid) {
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
-  }
-  else {
+        array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
+    }
+    else {
     $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
-  }
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
+    }
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
+    $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
+    $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
     '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }

Spacing +20 added lines, -20 removed lines

@@ -59,7 +59,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'insert':
     boincteam_forum_node_insert($node);
     break;
@@ -84,7 +84,7 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
@@ -107,7 +107,7 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
@@ -125,7 +125,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
 
     break;
@@ -140,7 +140,7 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
@@ -167,7 +167,7 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
@@ -256,7 +256,7 @@ 
     while ($team_forum = db_fetch_object($result)) {
 
       $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+      $team_forum->zebra = $row%2 ? 'even' : 'odd';
       $team_forum->new_topics = 0; // TODO: Track user views of team topics
       $team_forum->new_text = '';
       $team_forum->new_url = '';
@@ -324,7 +324,7 @@ 
  */
 function boincteam_forum_create_form_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
+  $output .= '<h2 class="pane-title">'.bts('Create team message board', array(), NULL, 'boinc:team-forum')
     . '</h2>';
   $output .= drupal_get_form('boincteam_forum_create_form');
 
@@ -337,8 +337,8 @@ 
 function boincteam_forum_edit_form_panel($tfid) {
   $team_forum = boincteam_forum_load($tfid);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
-    $team_forum->title . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Edit message board', array(), NULL, 'boinc:team-forum').': '.
+    $team_forum->title.'</h2>';
   $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
 
   return $output;
@@ -354,19 +354,19 @@ 
   );
   $forums = boincteam_forum_list($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Team forum', array(), NULL, 'boinc:team-forum').'</h2>';
   $output .= '<p>'
     . bts('A discussion forum has been set up for team members.', array(), NULL, 'boinc:team-forum')
     . '</p>';
   $output .= '<ul class="tab-list action-list">';
   foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' .
+      $output .= '  <li class="tab primary">'.
         l(
           //$forum->title,
           bts('Enter forum', array(), NULL, 'boinc:team-forum'),
           "community/teams/{$team_id}/forum/{$forum->tfid}"
-        ) . '</li>';
+        ).'</li>';
       // Since we're only supporting one team forum for now, we've labeled the
       // link in a generic way above and will now just break out of the loop
       break;
@@ -381,20 +381,20 @@ 
  */
 function boincteam_forum_topic_overview_panel($nid = NULL) {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About message boards', array(), NULL, 'boinc:team-forum').'</h2>';
   $output .= '<div>';
   if ($nid) {
     $team = node_load($nid);
-    $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>'.bts('You may create a message board for use by @team',
+      array('@team' => $team->title), NULL, 'boinc:team-forum').':</p>';
   }
   else {
-    $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>'.bts('This is a team-only message board', array(), NULL, 'boinc:team-forum').':</p>';
   }
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
+  $output .= '  <li>'.bts('Only members may post', array(), NULL, 'boinc:team-forum').'</li>';
+  $output .= '  <li>'.bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum').'</li>';
+  $output .= '  <li>'.bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum').
     '</li>';
   $output .= '</ul>';
   $output .= '</div>';

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

@@ -153,7 +153,7 @@ 
         $tfid = $node->tfid;
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
-    if (!$account->team OR $account->team != $team_id) {
+    if (!$account->team or $account->team != $team_id) {
       drupal_set_message(t('Failed to add team forum topic.'), 'error');
       drupal_goto('community/forum');
     }
@@ -173,7 +173,7 @@ 
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
-    if (!$public_forum AND !$is_member AND !$is_global_moderator) {
+    if (!$public_forum and !$is_member and !$is_global_moderator) {
       drupal_not_found();
       module_invoke_all('exit');
       exit();
@@ -220,10 +220,10 @@ 
   $forums = boincteam_forum_list($team_id);
   foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /*
@@ -238,7 +238,7 @@ 
 /*
  * Load the forums for a team, if any exist
  */
-function boincteam_forum_list($team_id = NULL) {
+function boincteam_forum_list($team_id = null) {
   if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
@@ -283,7 +283,7 @@ 
         LIMIT 1",
         $team_forum->tfid
       ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : null);
       $team_forums[$team_forum->tfid] = $team_forum;
       $row++;
     }
@@ -324,7 +324,7 @@ 
  */
 function boincteam_forum_create_form_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
+  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), null, 'boinc:team-forum')
     . '</h2>';
   $output .= drupal_get_form('boincteam_forum_create_form');
 
@@ -337,7 +337,7 @@ 
 function boincteam_forum_edit_form_panel($tfid) {
   $team_forum = boincteam_forum_load($tfid);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
+  $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), null, 'boinc:team-forum') . ': ' .
     $team_forum->title . '</h2>';
   $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
 
@@ -349,22 +349,22 @@ 
  */
 function boincteam_forum_link_panel($team_id) {
   $show_public_only = (
-    !boincteam_is_member($team_id) AND
+    !boincteam_is_member($team_id) and
     !boincteam_forum_is_global_moderator()
   );
   $forums = boincteam_forum_list($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), null, 'boinc:team-forum') . '</h2>';
   $output .= '<p>'
-    . bts('A discussion forum has been set up for team members.', array(), NULL, 'boinc:team-forum')
+    . bts('A discussion forum has been set up for team members.', array(), null, 'boinc:team-forum')
     . '</p>';
   $output .= '<ul class="tab-list action-list">';
   foreach ($forums as $forum) {
-    if (!$show_public_only OR $forum->public) {
+    if (!$show_public_only or $forum->public) {
       $output .= '  <li class="tab primary">' .
         l(
           //$forum->title,
-          bts('Enter forum', array(), NULL, 'boinc:team-forum'),
+          bts('Enter forum', array(), null, 'boinc:team-forum'),
           "community/teams/{$team_id}/forum/{$forum->tfid}"
         ) . '</li>';
       // Since we're only supporting one team forum for now, we've labeled the
@@ -379,22 +379,22 @@ 
 /**
  * General info about team forums
  */
-function boincteam_forum_topic_overview_panel($nid = NULL) {
+function boincteam_forum_topic_overview_panel($nid = null) {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('About message boards', array(), null, 'boinc:team-forum') . '</h2>';
   $output .= '<div>';
   if ($nid) {
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
+      array('@team' => $team->title), null, 'boinc:team-forum') . ':</p>';
   }
   else {
-    $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>' . bts('This is a team-only message board', array(), null, 'boinc:team-forum') . ':</p>';
   }
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
+  $output .= '  <li>' . bts('Only members may post', array(), null, 'boinc:team-forum') . '</li>';
+  $output .= '  <li>' . bts('Only members may read (optional)', array(), null, 'boinc:team-forum') . '</li>';
+  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), null, 'boinc:team-forum') .
     '</li>';
   $output .= '</ul>';
   $output .= '</div>';