BOINC / boinc

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

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

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

Indentation +403 added lines, -403 removed lines

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

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

Indentation +17 added lines, -17 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         $node = node_load($nid);
         if ($node->comment !== 0 AND user_access('post comments', $user)) {
           $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+          $block['content'] = '<h2>'.bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment').'</h2>';
           $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid)); 
         }
       }

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

@@ -17,9 +17,9 @@ 
       if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         global $user;
         $node = node_load($nid);
-        if ($node->comment !== 0 AND user_access('post comments', $user)) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+        if ($node->comment !== 0 and user_access('post comments', $user)) {
+          $block['subject'] = null; // This should be NULL otherwise there will be duplicate h2 elements.
+          $block['content'] = '<h2>' . bts('Post new comment', array(), null, 'boinc:forum-post-new-comment') . '</h2>';
           $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid)); 
         }
       }
@@ -39,7 +39,7 @@ 
  */
 function comment_form_block_block_info() {
   $blocks['comment_form'] = array(
-    'info' => bts('Comment form', array(), NULL, 'boinc:forum-comment-form'),
+    'info' => bts('Comment form', array(), null, 'boinc:forum-comment-form'),
   );
 
   return $blocks;
@@ -83,7 +83,7 @@ 
 function comment_form_block_form_block_admin_configure_alter(&$form, &$form_state) {
   if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'comment_form') {
-      $form['settings']['title']['#disabled'] = TRUE;
+      $form['settings']['title']['#disabled'] = true;
       $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
     }
   }

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

Switch Indentation +19 added lines, -19 removed lines

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

Braces +29 added lines, -58 removed lines

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

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

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

Indentation +705 added lines, -705 removed lines

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

Spacing +33 added lines, -33 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -119,7 +119,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>'
   );
   
   return $form;
@@ -163,7 +163,7 @@ 
   
   // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
+  require_boinc(array('user', 'team'));
   $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
@@ -199,10 +199,10 @@ 
     'teaser' => $teaser,
     'uid' => $user->uid,
     'path' => null,
-    'status' => 1,  // published or not - always publish
+    'status' => 1, // published or not - always publish
     'promote' => 0,
     'created' => $created_time,
-    'comment' => 0,  // comments disabled
+    'comment' => 0, // comments disabled
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
@@ -229,7 +229,7 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+  $node = (object)$node; // node_save requires an object form
   
   /*
   $node->field_description[]['value'] = $boincteam->description;
@@ -379,12 +379,12 @@ 
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
     );
   }
   else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+      '#prefix' => '<div class="form-item"><label>'.bts('Description', array(), NULL, 'boinc:team-description').':</label></div><div class="form-item">',
       '#value' => $default['description'],
       '#suffix' => '</div>',
     );
@@ -538,7 +538,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";

Braces +10 added lines, -20 removed lines

@@ -135,8 +135,7 @@ 
   
   if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+  } else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
@@ -177,8 +176,7 @@ 
   if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
@@ -212,8 +210,7 @@ 
   if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
@@ -381,8 +378,7 @@ 
     $form['form control tabs'] = array(
       '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+  } else {
     $form['description'] = array(
       '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
@@ -412,12 +408,10 @@ 
   
   if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+  } else {
     if (!$name) {
       form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-    }
-    else {
+    } else {
       $team = node_load($form_state['storage']['team_id']);
       if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
@@ -559,8 +553,7 @@ 
   
   if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+  } else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
@@ -570,24 +563,21 @@ 
           '@username' => $account->boincuser_name
         ),
       NULL, 'boinc:team-add-admin'));
-    }
-    elseif (boincteam_is_founder($team_id, $account->uid)) {
+    } elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
-    }
-    elseif (boincteam_is_admin($team_id, $account->uid)) {
+    } elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('username', bts('@user is already an admin of @team.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
-    }
-    else {
+    } else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
       $form_state['storage']['boincuser_name'] = $account->boincuser_name;
     }

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

@@ -22,22 +22,22 @@ 
     'website' => '',
     'type' => 0,
     'country' => 0,
-    'joinable' => TRUE,
+    'joinable' => true,
     'description' => '',
   );
   
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
   );
   
   // Vocabulary based option sets
   $form['type_options'] = array(
     '#type' => 'value',
-    '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
+    '#value' => array(0 => bts('Choose type', array(), null, 'boinc:form-choose'))
   );
-  $vocabs = taxonomy_get_vocabularies(NULL);
+  $vocabs = taxonomy_get_vocabularies(null);
   foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
@@ -59,40 +59,40 @@ 
   
   // Form elements
   $form['name'] = array(
-    '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
-    '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('Text only, no HTML tags', array(), null, 'boinc:team-form-help'),
   );
   $form['name_html'] = array(
-    '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name -- HTML version (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
-    '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('You may use limited HTML tags', array(), null, 'boinc:team-form-help'),
   );
   $form['website'] = array(
-    '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team website (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
-    '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
+    '#description' => bts("Displayed on the team's page", array(), null, 'boinc:team-create/edit'),
   );
   $form['type'] = array(
-    '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Type of team', array(), null, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
   );
   $form['country'] = array(
-    '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    '#title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
   );
   $form['joinable'] = array(
-    '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Accept new members?', array(), null, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
@@ -100,11 +100,11 @@ 
     '#size' => 34,
   );
   $form['description'] = array(
-    '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Description of team', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-    '#description' => NULL,
+    '#description' => null,
   );
   $form['format'] = filter_form();
   
@@ -115,11 +115,11 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
+    '#value' => bts('Save team', array(), null, 'boinc:team-form-save'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>'
   );
   
   return $form;
@@ -134,18 +134,18 @@ 
   $name = $values['name'];
   
   if (!$name) {
-    form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+    form_set_error('name', bts('Team name is required.', array(), null, 'boinc:team-create/edit'));
   }
   else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
-        array('@name' => $name), NULL, 'boinc:team-create/edit'));
+        array('@name' => $name), null, 'boinc:team-create/edit'));
     }
   }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-    form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+  if (!$values['type'] or !isset($values['type_options'][$values['type']])) {
+    form_set_error('type', bts('Please select a team type.', array(), null, 'boinc:team-create/edit'));
   }
 }
 
@@ -183,7 +183,7 @@ 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
-    return FALSE;
+    return false;
   }
   
   // Create the team node in Drupal
@@ -264,7 +264,7 @@ 
   $team = node_load($team_id);
   $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+  $is_boinc_wide = ($boincteam->seti_id > 0) ? true : false;
   
   $form_state['storage']['team_id'] = $team_id;
   $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
@@ -282,15 +282,15 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
   );
   
   // Vocabulary based option sets
   $form['type_options'] = array(
     '#type' => 'value',
-    '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
+    '#value' => array(0 => bts('Choose type', array(), null, 'boinc:form-choose'))
   );
-  $vocabs = taxonomy_get_vocabularies(NULL);
+  $vocabs = taxonomy_get_vocabularies(null);
   foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
@@ -312,45 +312,45 @@ 
   
   // Form elements
   $form['name'] = array(
-    '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
-    '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('Text only, no HTML tags', array(), null, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
   );
   $form['name_html'] = array(
-    '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name -- HTML version (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
-    '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('You may use limited HTML tags', array(), null, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
   );
   $form['website'] = array(
-    '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team website (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
-    '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
+    '#description' => bts("Displayed on the team's page", array(), null, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
   );
   $form['type'] = array(
-    '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Type of team', array(), null, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
   );
   $form['country'] = array(
-    '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    '#title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
   );
   $form['joinable'] = array(
-    '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Accept new members?', array(), null, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
@@ -360,11 +360,11 @@ 
   );
   if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+      '#title' => bts('Description of team', array(), null, 'boinc:team-create/edit'),
       '#type' => 'textarea',
       '#default_value' => $default['description'],
       '#size' => 5,
-      '#description' => NULL,
+      '#description' => null,
     );
     $form['format'] = filter_form();
     
@@ -375,25 +375,25 @@ 
     $form['submit'] = array(
       '#prefix' => '<li class="first tab">',
       '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+      '#value' => bts('Save changes', array(), null, 'boinc:form-save'),
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', true)) . '</li>'
     );
   }
   else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), null, 'boinc:team-description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
       '#suffix' => '</div>',
     );
     drupal_set_message(
       bts('This is a BOINC-wide team. Changes can be made at the !site.',
-        array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
+        array('!site' => l(bts('BOINC-wide teams site', array(), null, 'boinc:link-to-BOINC-wide-teams-Website'),
           'http://boinc.berkeley.edu/teams/'
         )),
-        NULL, 'boinc:team-edit-warning-message'),
+        null, 'boinc:team-edit-warning-message'),
       'warning');
   }
   
@@ -411,11 +411,11 @@ 
   $name = $values['name'];
   
   if ($form_state['storage']['is_boinc_wide']) {
-    form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
+    form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), null, 'boinc:team-create/edit'));
   }
   else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+      form_set_error('name', bts('Team name is required.', array(), null, 'boinc:team-create/edit'));
     }
     else {
       $team = node_load($form_state['storage']['team_id']);
@@ -424,13 +424,13 @@ 
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
           form_set_error('name', bts('A team named "@name" already exists.',
-            array('@name' => $name), NULL, 'boinc:team-create/edit'));
+            array('@name' => $name), null, 'boinc:team-create/edit'));
         }
       }
     }
   
-    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    if (!$values['type'] or !isset($values['type_options'][$values['type']])) {
+      form_set_error('type', bts('Please select a team type.', array(), null, 'boinc:team-create/edit'));
     }
   }
 }
@@ -521,7 +521,7 @@ 
   
   // Form elements
   $form['username'] = array(
-    '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
+    '#title' => bts('Enter BOINC username', array(), null, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
@@ -536,11 +536,11 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
+    '#value' => bts('Add', array(), null, 'boinc:form-add'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', true)) . '</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";
@@ -558,18 +558,18 @@ 
   $team = node_load($team_id);
   
   if (!$values['username']) {
-    form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
+    form_set_error('username', bts('BOINC username is required.', array(), null, 'boinc:team-add-admin'));
   }
   else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
-    if ((!$account) OR ($account->team != $team_id)) {
+    if ((!$account) or ($account->team != $team_id)) {
       form_set_error('username', bts('There is no user on your team with name @username.',
         array(
           '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+      null, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
@@ -577,7 +577,7 @@ 
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
-        NULL, 'boinc:team-add-admin'));
+        null, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('username', bts('@user is already an admin of @team.',
@@ -585,7 +585,7 @@ 
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
-        NULL, 'boinc:team-add-admin'));
+        null, 'boinc:team-add-admin'));
     }
     else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;

Indentation +233 added lines, -233 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
   
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name), NULL, 'boinc:team-create/edit'));
     }
-  }
+    }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
   
-  // Create the team node in Drupal
+    // Create the team node in Drupal
   
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
   
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
   
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // Use pathauto function, if available, to clean up the path
+    if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
   
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
   
-  // Save the team node
-  node_save($node);
+    // Save the team node
+    node_save($node);
   
-  // Save the team IDs to a BOINC <--> Drupal reference table.
-  db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
   
-  drupal_set_message(t('Team "@name" has been created.', 
+    drupal_set_message(t('Team "@name" has been created.', 
     array('@name' => $values['name'])));
   
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
   
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
   
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
     
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         )),
         NULL, 'boinc:team-edit-warning-message'),
-      'warning');
-  }
+        'warning');
+    }
   
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name), NULL, 'boinc:team-create/edit'));
         }
-      }
+        }
     }
   
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Update the team node in Drupal
+    // Update the team node in Drupal
   
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
   
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
   
-  drupal_set_message(t('Details for "@team" have been updated.', 
+    drupal_set_message(t('Details for "@team" have been updated.', 
     array('@team' => $values['name'])));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,44 +508,44 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
   
-  $default = array(
+    $default = array(
     'username' => '',
-  );
+    );
   
-  // Form elements
-  $form['username'] = array(
+    // Form elements
+    $form['username'] = array(
     '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
     '#size' => 34,
     '#autocomplete_path' => "community/teams/${team_id}/user-name-autocomplete",
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
   
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -553,45 +553,45 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
-  $team = node_load($team_id);
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
+    $team = node_load($team_id);
   
-  if (!$values['username']) {
+    if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+    }
+    else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('username', bts('There is no user on your team with name @username.',
+        form_set_error('username', bts('There is no user on your team with name @username.',
         array(
-          '@username' => $account->boincuser_name
+            '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+        NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
+        form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is already an admin of @team.',
+        form_set_error('username', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -599,17 +599,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -617,15 +617,15 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
   
   
-  drupal_set_message(t('@user has been added as an admin.', 
+    drupal_set_message(t('@user has been added as an admin.', 
     array('@user' => $user_name)));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }

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

Indentation +99 added lines, -99 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)).'</li>'
   );
   
   $form['#redirect'] = "community/teams/{$account->team}";
@@ -152,9 +152,9 @@ 
       updated = UNIX_TIMESTAMP()",
     $account->team,
     $values['title'],
-    (int) $values['min_time_between_posts'],
-    (int) $values['min_total_credit_to_post'],
-    (int) $values['min_avg_credit_to_post'],
+    (int)$values['min_time_between_posts'],
+    (int)$values['min_total_credit_to_post'],
+    (int)$values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description']
   );
@@ -243,7 +243,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)).'</li>'
   );
   
   $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
@@ -305,9 +305,9 @@ 
       updated = UNIX_TIMESTAMP()
     WHERE tfid='%d'",
     $values['title'],
-    (int) $values['min_time_between_posts'],
-    (int) $values['min_total_credit_to_post'],
-    (int) $values['min_avg_credit_to_post'],
+    (int)$values['min_time_between_posts'],
+    (int)$values['min_total_credit_to_post'],
+    (int)$values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description'],
     $tfid

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

@@ -31,45 +31,45 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
   );
   
   // Form elements
   $form['title'] = array(
-    '#title' => bts('Message board title', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Message board title', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
-    '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('Text only, no HTML tags', array(), null, 'boinc:team-form-help'),
   );
   $form['min_time_between_posts'] = array(
-    '#title' => bts('Minimum time between posts', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Minimum time between posts', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
-    '#description' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
+    '#description' => bts('seconds', array(), null, 'boinc:unit-of-time'),
   );
   $form['min_total_credit_to_post'] = array(
-    '#title' => bts('Minimum total credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Minimum total credit to post', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
   );
   $form['min_avg_credit_to_post'] = array(
-    '#title' => bts('Minimum avg credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Minimum avg credit to post', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
   );
   $form['public'] = array(
-    '#title' => bts('Allow public to read board?', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Allow public to read board?', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
   );
   $form['description'] = array(
-    '#title' => bts('Description', array(), NULL, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
+    '#title' => bts('Description', array(), null, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
@@ -82,11 +82,11 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Create message board', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#value' => bts('Create message board', array(), null, 'boinc:team-forum-create/edit'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', true)) . '</li>'
   );
   
   $form['#redirect'] = "community/teams/{$account->team}";
@@ -102,28 +102,28 @@ 
   $values = $form_state['values'];
   
   if (!$values['title']) {
-    form_set_error('name', bts('Message board title is required.', array(), NULL, 'boinc:team-forum-create/edit'));
+    form_set_error('name', bts('Message board title is required.', array(), null, 'boinc:team-forum-create/edit'));
   }
-  if (!is_numeric($values['min_time_between_posts']) OR
+  if (!is_numeric($values['min_time_between_posts']) or
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts',
-      bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
+      bts('Please set the minimum time required between posts.', array(), null, 'boinc:team-forum-create/edit')
     );
   }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+  if (!is_numeric($values['min_total_credit_to_post']) or
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
       bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.',
-        array(), NULL, 'boinc:team-forum-create/edit')
+        array(), null, 'boinc:team-forum-create/edit')
     );
   }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+  if (!is_numeric($values['min_avg_credit_to_post']) or
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post',
       bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.',
-        array(), NULL, 'boinc:team-forum-create/edit')
+        array(), null, 'boinc:team-forum-create/edit')
     );
   }
 }
@@ -188,45 +188,45 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
   );
   
   // Form elements
   $form['title'] = array(
-    '#title' => bts('Message board title', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Message board title', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
-    '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('Text only, no HTML tags', array(), null, 'boinc:team-form-help'),
   );
   $form['min_time_between_posts'] = array(
-    '#title' => bts('Minimum time between posts', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Minimum time between posts', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
-    '#description' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
+    '#description' => bts('seconds', array(), null, 'boinc:unit-of-time'),
   );
   $form['min_total_credit_to_post'] = array(
-    '#title' => bts('Minimum total credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Minimum total credit to post', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
   );
   $form['min_avg_credit_to_post'] = array(
-    '#title' => bts('Minimum avg credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Minimum avg credit to post', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
   );
   $form['public'] = array(
-    '#title' => bts('Allow public to read board?', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#title' => bts('Allow public to read board?', array(), null, 'boinc:team-forum-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
   );
   $form['description'] = array(
-    '#title' => bts('Description', array(), NULL, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
+    '#title' => bts('Description', array(), null, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
@@ -239,11 +239,11 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save message board', array(), NULL, 'boinc:team-forum-create/edit'),
+    '#value' => bts('Save message board', array(), null, 'boinc:team-forum-create/edit'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', true)) . '</li>'
   );
   
   $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
@@ -259,28 +259,28 @@ 
   $values = $form_state['values'];
   
   if (!$values['title']) {
-    form_set_error('name', bts('Message board title is required.', array(), NULL, 'boinc:team-forum-create/edit'));
+    form_set_error('name', bts('Message board title is required.', array(), null, 'boinc:team-forum-create/edit'));
   }
-  if (!is_numeric($values['min_time_between_posts']) OR
+  if (!is_numeric($values['min_time_between_posts']) or
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts', 
-      bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
+      bts('Please set the minimum time required between posts.', array(), null, 'boinc:team-forum-create/edit')
     );
   }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+  if (!is_numeric($values['min_total_credit_to_post']) or
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
       bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.',
-        array(), NULL, 'boinc:team-forum-create/edit')
+        array(), null, 'boinc:team-forum-create/edit')
     );
   }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+  if (!is_numeric($values['min_avg_credit_to_post']) or
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post', 
       bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.',
-        array(), NULL, 'boinc:team-forum-create/edit')
+        array(), null, 'boinc:team-forum-create/edit')
     );
   }
 }

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

html/user/openid_login.php

Spacing +10 added lines, -10 removed lines

@@ -35,23 +35,23 @@ 
     $openid = new LightOpenID;
     echo "<pre>";
     print_r($openid); exit;
-    if(!$openid->mode) {
-        if(isset($_POST['openid_identifier'])) {
+    if (!$openid->mode) {
+        if (isset($_POST['openid_identifier'])) {
             $openid->identity = $_POST['openid_identifier'];
             $openid->required = array('namePerson/friendly', 'contact/email');
             $openid->optional = array('contact/country/home');
-            header('Location: ' . $openid->authUrl());
+            header('Location: '.$openid->authUrl());
         }
-        if(isset($_GET['openid_identifier'])) {
+        if (isset($_GET['openid_identifier'])) {
             $openid->identity = $_GET['openid_identifier'];
             $openid->required = array('namePerson/friendly', 'contact/email');
             $openid->optional = array('contact/country/home');
-            header('Location: ' . $openid->authUrl());
+            header('Location: '.$openid->authUrl());
         }
-    } elseif($openid->mode == 'cancel') {
+    } elseif ($openid->mode == 'cancel') {
         echo 'User has canceled authentication!';
     } else {
-        echo 'User ' . ($openid->validate() ? $openid->identity . ' has ' : 'has not ') . 'logged in.';
+        echo 'User '.($openid->validate() ? $openid->identity.' has ' : 'has not ').'logged in.';
         //print_r($openid->getAttributes());
         // Create the user in the DB
         $data = $openid->getAttributes();
@@ -125,13 +125,13 @@ 
             
             $user = make_user(
                 $new_email_addr, $new_name, $passwd_hash,
-                $country, '', $project_prefs="", $teamid=0
+                $country, '', $project_prefs = "", $teamid = 0
             );
             if (!$user) {
                 show_error("Couldn't create account");
             }
             
-            if(defined('INVITE_CODES')) {
+            if (defined('INVITE_CODES')) {
                 error_log("Account '$new_email_addr' created using invitation code '$invite_code'");
             }
         }
@@ -153,7 +153,7 @@ 
         send_cookie('auth', $user->authenticator, true);
 
     }
-} catch(ErrorException $e) {
+} catch (ErrorException $e) {
     echo $e->getMessage();
 }
 

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

Indentation +28 added lines, -28 removed lines

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