Inspection of "[WIP] Deploy: enable bintray cleanup script" - BOINC/boinc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#3196)

by Christian

created 2019-06-27 08:15 UTC

Status

Upper-Lower-Casing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@  discard block
 block discarded – undo
   $view->base_table = 'user';
   $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(
     'id' => array(
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -1364,7 +1364,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -1583,9 +1583,9 @@  discard block
 block discarded – undo
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'send_email',
@@ -1655,7 +1655,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2144,7 +2144,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2616,7 +2616,7 @@  discard block
 block discarded – undo
   $view->base_table = 'team';
   $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(
     'rownumber' => array(
@@ -2677,7 +2677,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2952,9 +2952,9 @@  discard block
 block discarded – undo
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'total_credit',
@@ -3050,9 +3050,9 @@  discard block
 block discarded – undo
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'total_credit',
@@ -3184,7 +3184,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3300,7 +3300,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3550,7 +3550,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3594,7 +3594,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3818,9 +3818,9 @@  discard block
 block discarded – undo
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'userid',
@@ -3960,7 +3960,7 @@  discard block
 block discarded – undo
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4148,9 +4148,9 @@  discard block
 block discarded – undo
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'total_credit',

Please login to merge, or discard this patch.

Indentation +2112 added lines, -2112 removed lines patch added patch discarded remove patch

@@ -4,22 +4,22 @@  discard block
 block discarded – undo
  * Implementation of hook_views_default_views().
  */
 function teams_views_default_views() {
-  $views = array();
+    $views = array();
 
-  // Exported view: boinc_team_members
-  $view = new view;
-  $view->name = 'boinc_team_members';
-  $view->description = '';
-  $view->tag = '';
-  $view->base_table = 'user';
-  $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: boinc_team_members
+    $view = new view;
+    $view->name = 'boinc_team_members';
+    $view->description = '';
+    $view->tag = '';
+    $view->base_table = 'user';
+    $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(
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -38,29 +38,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -79,20 +79,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -111,29 +111,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -152,29 +152,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'country' => array(
-      'label' => 'Country',
-      'alter' => array(
+        'label' => 'Country',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -193,20 +193,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'country',
-      'table' => 'user',
-      'field' => 'country',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'country',
+        'table' => 'user',
+        'field' => 'country',
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Member since',
-      'alter' => array(
+        'label' => 'Member since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -225,31 +225,31 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler = $view->new_display('panel_pane', 'Team member list', 'panel_pane_1');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('panel_pane', 'Team member list', 'panel_pane_1');
+    $handler->override_option('fields', array(
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -268,23 +268,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -303,32 +303,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -347,26 +347,26 @@  discard block
 block discarded – undo
         '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
   echo boincuser_lookup_uid($data->id);
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -385,23 +385,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -420,32 +420,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -464,29 +464,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'country' => array(
-      'label' => 'Country',
-      'alter' => array(
+        'label' => 'Country',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -505,23 +505,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'country',
-      'table' => 'user',
-      'field' => 'country',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'country',
+        'table' => 'user',
+        'field' => 'country',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Member Since',
-      'alter' => array(
+        'label' => 'Member Since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -540,43 +540,43 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'teamid' => array(
-      'default_action' => 'empty',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'teamid',
-      'table' => 'user',
-      'field' => 'teamid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'empty',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'teamid',
+        'table' => 'user',
+        'field' => 'teamid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -585,10 +585,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -597,23 +597,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -621,82 +621,82 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', 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('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'name' => 'name',
-      'email_addr' => 'email_addr',
-      'total_credit' => 'total_credit',
-      'expavg_credit' => 'expavg_credit',
-      'country' => 'country',
-      'create_time' => 'create_time',
+        'id' => 'id',
+        'name' => 'name',
+        'email_addr' => 'email_addr',
+        'total_credit' => 'total_credit',
+        'expavg_credit' => 'expavg_credit',
+        'country' => 'country',
+        'create_time' => 'create_time',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'email_addr' => array(
+        ),
+        'email_addr' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('pane_title', 'Team member list');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', 'Team member list');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -706,24 +706,24 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'teamid' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Team ID',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('panel_pane', 'Team member list for admin', 'panel_pane_2');
-  $handler->override_option('fields', array(
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Team ID',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('panel_pane', 'Team member list for admin', 'panel_pane_2');
+    $handler->override_option('fields', array(
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -742,23 +742,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -777,32 +777,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode_2' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -821,26 +821,26 @@  discard block
 block discarded – undo
         '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
   echo boincuser_lookup_uid($data->id);
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -859,23 +859,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -894,32 +894,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -938,29 +938,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'country' => array(
-      'label' => 'Country',
-      'alter' => array(
+        'label' => 'Country',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -979,23 +979,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'country',
-      'table' => 'user',
-      'field' => 'country',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'country',
+        'table' => 'user',
+        'field' => 'country',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Member Since',
-      'alter' => array(
+        'label' => 'Member Since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1014,25 +1014,25 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode_1' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1051,12 +1051,12 @@  discard block
 block discarded – undo
         '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
   global $user;
   $team_id = arg(2);
   $user_id = boincuser_lookup_uid($data->id);
@@ -1064,36 +1064,36 @@  discard block
 block discarded – undo
     echo l(bts(\'Remove\', array(), NULL, \'boinc:remove-team-member\'), "community/teams/{$team_id}/edit/members/remove/{$user_id}");
   }
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'teamid' => array(
-      'default_action' => 'empty',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'teamid',
-      'table' => 'user',
-      'field' => 'teamid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'empty',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'teamid',
+        'table' => 'user',
+        'field' => 'teamid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -1102,10 +1102,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -1114,23 +1114,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -1138,82 +1138,82 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', 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('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'name' => 'name',
-      'email_addr' => 'email_addr',
-      'total_credit' => 'total_credit',
-      'expavg_credit' => 'expavg_credit',
-      'country' => 'country',
-      'create_time' => 'create_time',
+        'id' => 'id',
+        'name' => 'name',
+        'email_addr' => 'email_addr',
+        'total_credit' => 'total_credit',
+        'expavg_credit' => 'expavg_credit',
+        'country' => 'country',
+        'create_time' => 'create_time',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'email_addr' => array(
+        ),
+        'email_addr' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('pane_title', 'Team member list with email');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', 'Team member list with email');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -1223,24 +1223,24 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'teamid' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Team ID',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('panel_pane', 'Team email list', 'panel_pane_3');
-  $handler->override_option('fields', array(
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Team ID',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('panel_pane', 'Team email list', 'panel_pane_3');
+    $handler->override_option('fields', array(
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1259,32 +1259,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1303,23 +1303,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'email_addr' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '[name] <[email_addr]>',
         'make_link' => 0,
@@ -1338,23 +1338,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'email_addr',
-      'table' => 'user',
-      'field' => 'email_addr',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'email_addr',
+        'table' => 'user',
+        'field' => 'email_addr',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'create_time' => array(
-      'label' => 'Member since',
-      'alter' => array(
+        'label' => 'Member since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1373,43 +1373,43 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'teamid' => array(
-      'default_action' => 'empty',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'teamid',
-      'table' => 'user',
-      'field' => 'teamid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'empty',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'teamid',
+        'table' => 'user',
+        'field' => 'teamid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -1418,10 +1418,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -1430,23 +1430,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -1454,57 +1454,57 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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(
     'send_email' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'send_email',
-      'table' => 'user',
-      'field' => 'send_email',
-      'override' => array(
+        ),
+        'id' => 'send_email',
+        'table' => 'user',
+        'field' => 'send_email',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('pane_title', 'Team email list');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('pane_title', 'Team email list');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -1514,24 +1514,24 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'teamid' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Team ID',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('panel_pane', 'Team member edit', 'panel_pane_5');
-  $handler->override_option('fields', array(
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Team ID',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('panel_pane', 'Team member edit', 'panel_pane_5');
+    $handler->override_option('fields', array(
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1550,32 +1550,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1594,26 +1594,26 @@  discard block
 block discarded – undo
         '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
   echo boincuser_lookup_uid($data->id);
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1632,20 +1632,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1664,32 +1664,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1708,32 +1708,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'create_time' => array(
-      'label' => 'Member Since',
-      'alter' => array(
+        'label' => 'Member Since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1752,25 +1752,25 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1789,12 +1789,12 @@  discard block
 block discarded – undo
         '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
   global $user;
   $team_id = arg(2);
   $user_id = boincuser_lookup_uid($data->id);
@@ -1802,36 +1802,36 @@  discard block
 block discarded – undo
     echo l(bts(\'Remove\', array(), NULL, \'boinc:remove-team-member\'), "community/teams/{$team_id}/edit/members/remove/{$user_id}");
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'teamid' => array(
-      'default_action' => 'empty',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'teamid',
-      'table' => 'user',
-      'field' => 'teamid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'empty',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'teamid',
+        'table' => 'user',
+        'field' => 'teamid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -1840,10 +1840,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -1852,23 +1852,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -1876,90 +1876,90 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', 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('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'asc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'name' => 'name',
-      'send_email' => 'send_email',
-      'email_addr' => 'email_addr',
-      'phpcode' => 'phpcode',
-      'total_credit' => 'total_credit',
-      'expavg_credit' => 'expavg_credit',
-      'create_time' => 'create_time',
-      'phpcode_1' => 'phpcode_1',
+        'id' => 'id',
+        'name' => 'name',
+        'send_email' => 'send_email',
+        'email_addr' => 'email_addr',
+        'phpcode' => 'phpcode',
+        'total_credit' => 'total_credit',
+        'expavg_credit' => 'expavg_credit',
+        'create_time' => 'create_time',
+        'phpcode_1' => 'phpcode_1',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'send_email' => array(
+        ),
+        'send_email' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'email_addr' => array(
+        ),
+        'email_addr' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'name',
-  ));
-  $handler->override_option('pane_title', 'Edit team members');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', 'Edit team members');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -1969,24 +1969,24 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'teamid' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Team ID',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('panel_pane', 'Team change founder', 'panel_pane_4');
-  $handler->override_option('fields', array(
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Team ID',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('panel_pane', 'Team change founder', 'panel_pane_4');
+    $handler->override_option('fields', array(
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2005,32 +2005,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2049,26 +2049,26 @@  discard block
 block discarded – undo
         '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
   echo boincuser_lookup_uid($data->id);
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2087,20 +2087,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2119,32 +2119,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2163,32 +2163,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'create_time' => array(
-      'label' => 'Member Since',
-      'alter' => array(
+        'label' => 'Member Since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2207,25 +2207,25 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2244,12 +2244,12 @@  discard block
 block discarded – undo
         '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
   global $user;
   $team_id = arg(2);
   $user_id = boincuser_lookup_uid($data->id);
@@ -2257,36 +2257,36 @@  discard block
 block discarded – undo
     echo l(bts(\'Make founder\', array(), NULL, \'boinc:team-make-founder\'), "community/teams/{$team_id}/edit/founder/set/{$user_id}");
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'teamid' => array(
-      'default_action' => 'empty',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'teamid',
-      'table' => 'user',
-      'field' => 'teamid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'empty',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'teamid',
+        'table' => 'user',
+        'field' => 'teamid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -2295,10 +2295,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -2307,23 +2307,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -2331,90 +2331,90 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', 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('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'asc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'name' => 'name',
-      'send_email' => 'send_email',
-      'email_addr' => 'email_addr',
-      'phpcode' => 'phpcode',
-      'total_credit' => 'total_credit',
-      'expavg_credit' => 'expavg_credit',
-      'create_time' => 'create_time',
-      'phpcode_1' => 'phpcode_1',
+        'id' => 'id',
+        'name' => 'name',
+        'send_email' => 'send_email',
+        'email_addr' => 'email_addr',
+        'phpcode' => 'phpcode',
+        'total_credit' => 'total_credit',
+        'expavg_credit' => 'expavg_credit',
+        'create_time' => 'create_time',
+        'phpcode_1' => 'phpcode_1',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'send_email' => array(
+        ),
+        'send_email' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'email_addr' => array(
+        ),
+        'email_addr' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'name',
-  ));
-  $handler->override_option('pane_title', 'Change team founder');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', 'Change team founder');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -2424,36 +2424,36 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'teamid' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Team ID',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Team ID',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_teams
-  $view = new view;
-  $view->name = 'boinc_teams';
-  $view->description = '';
-  $view->tag = '';
-  $view->base_table = 'team';
-  $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: boinc_teams
+    $view = new view;
+    $view->name = 'boinc_teams';
+    $view->description = '';
+    $view->tag = '';
+    $view->base_table = 'team';
+    $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(
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2472,20 +2472,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2504,29 +2504,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'team',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'team',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2545,20 +2545,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'team',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'team',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2577,24 +2577,24 @@  discard block
 block discarded – undo
         '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
   $team_id = boincteam_lookup_nid($data->id);
   echo l($data->team_name, "community/teams/{$team_id}");
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2613,29 +2613,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'team',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'team',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2654,57 +2654,57 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'team',
-      'field' => 'total_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'team',
+        'field' => 'total_credit',
+        'relationship' => 'none',
     ),
     'country' => array(
-      'id' => 'country',
-      'table' => 'team',
-      'field' => 'country',
+        'id' => 'country',
+        'table' => 'team',
+        'field' => 'country',
     ),
     'nusers' => array(
-      'id' => 'nusers',
-      'table' => 'team',
-      'field' => 'nusers',
+        'id' => 'nusers',
+        'table' => 'team',
+        'field' => 'nusers',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'id' => array(
-      'default_action' => 'ignore',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'id',
-      'table' => 'team',
-      'field' => 'id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'ignore',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'id',
+        'table' => 'team',
+        'field' => 'id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -2713,10 +2713,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -2725,20 +2725,20 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      '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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -2746,119 +2746,119 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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('access', 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('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('header_format', '1');
-  $handler->override_option('header_empty', 1);
-  $handler = $view->new_display('panel_pane', 'Top teams overview pane', 'panel_pane_1');
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('header_format', '1');
+    $handler->override_option('header_empty', 1);
+    $handler = $view->new_display('panel_pane', 'Top teams overview pane', 'panel_pane_1');
+    $handler->override_option('filters', array(
     'total_credit' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'total_credit',
-      'table' => 'team',
-      'field' => 'total_credit',
-      'override' => array(
+        ),
+        'id' => 'total_credit',
+        'table' => 'team',
+        'field' => 'total_credit',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('use_more', 1);
-  $handler->override_option('use_more_always', 1);
-  $handler->override_option('use_more_text', 'view more');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('use_more', 1);
+    $handler->override_option('use_more_always', 1);
+    $handler->override_option('use_more_text', 'view more');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'rownumber' => 'rownumber',
-      'id' => 'id',
-      'name' => 'name',
-      'phpcode' => 'phpcode',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'country' => 'country',
-      'nusers' => 'nusers',
+        'rownumber' => 'rownumber',
+        'id' => 'id',
+        'name' => 'name',
+        'phpcode' => 'phpcode',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'country' => 'country',
+        'nusers' => 'nusers',
     ),
     'info' => array(
-      'rownumber' => array(
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'nusers' => array(
+        ),
+        'nusers' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('pane_title', '');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', '');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 'use_pager',
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -2868,131 +2868,131 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array());
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('argument_input', array());
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('filters', array(
     'total_credit' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'total_credit',
-      'table' => 'team',
-      'field' => 'total_credit',
-      'override' => array(
+        ),
+        'id' => 'total_credit',
+        'table' => 'team',
+        'field' => 'total_credit',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('items_per_page', 100);
-  $handler->override_option('use_pager', '0');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('items_per_page', 100);
+    $handler->override_option('use_pager', '0');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'rownumber' => 'rownumber',
-      'id' => 'id',
-      'name' => 'name',
-      'phpcode' => 'phpcode',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'country' => 'country',
-      'nusers' => 'nusers',
+        'rownumber' => 'rownumber',
+        'id' => 'id',
+        'name' => 'name',
+        'phpcode' => 'phpcode',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'country' => 'country',
+        'nusers' => 'nusers',
     ),
     'info' => array(
-      'rownumber' => array(
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'nusers' => array(
+        ),
+        'nusers' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('path', 'community/stats/teams');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'community/stats/teams');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Top Teams',
     'description' => '',
     'weight' => '10',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('panel_pane', 'Team history', 'panel_pane_2');
-  $handler->override_option('relationships', array(
+    ));
+    $handler = $view->new_display('panel_pane', 'Team history', 'panel_pane_2');
+    $handler->override_option('relationships', array(
     'id' => array(
-      'label' => 'Team History',
-      'required' => 0,
-      'id' => 'id',
-      'table' => 'team',
-      'field' => 'id',
-      'override' => array(
+        'label' => 'Team History',
+        'required' => 0,
+        'id' => 'id',
+        'table' => 'team',
+        'field' => 'id',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'userid' => array(
-      'label' => 'User (Team History)',
-      'required' => 0,
-      'id' => 'userid',
-      'table' => 'team_delta',
-      'field' => 'userid',
-      'relationship' => 'id',
-      'override' => array(
+        'label' => 'User (Team History)',
+        'required' => 0,
+        'id' => 'userid',
+        'table' => 'team_delta',
+        'field' => 'userid',
+        'relationship' => 'id',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
-  ));
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('fields', array(
     'userid' => array(
-      'label' => 'User ID',
-      'alter' => array(
+        'label' => 'User ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3011,32 +3011,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'userid',
-      'table' => 'team_delta',
-      'field' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'userid',
+        'table' => 'team_delta',
+        'field' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'id',
+        ),
+        'relationship' => 'id',
     ),
     'timestamp' => array(
-      'label' => 'Timestamp',
-      'alter' => array(
+        'label' => 'Timestamp',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3055,25 +3055,25 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 0,
-      'id' => 'timestamp',
-      'table' => 'team_delta',
-      'field' => 'timestamp',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 0,
+        'id' => 'timestamp',
+        'table' => 'team_delta',
+        'field' => 'timestamp',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'id',
+        ),
+        'relationship' => 'id',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3092,23 +3092,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'joining' => array(
-      'label' => 'User joined',
-      'alter' => array(
+        'label' => 'User joined',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3127,32 +3127,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      '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' => 'joining',
-      'table' => 'team_delta',
-      'field' => 'joining',
-      'override' => array(
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        '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' => 'joining',
+        'table' => 'team_delta',
+        'field' => 'joining',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'id',
+        ),
+        'relationship' => 'id',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3171,50 +3171,50 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'team_delta',
-      'field' => 'total_credit',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'team_delta',
+        'field' => 'total_credit',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'id',
+        ),
+        'relationship' => 'id',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'id' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'id',
-      'table' => 'team',
-      'field' => 'id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'id',
+        'table' => 'team',
+        'field' => 'id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -3223,10 +3223,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -3235,23 +3235,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -3259,66 +3259,66 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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('style_plugin', 'table');
-  $handler->override_option('style_options', 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('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'asc',
     'summary' => '',
     'columns' => array(
-      'timestamp' => 'timestamp',
-      'total_credit' => 'total_credit',
-      'userid' => 'userid',
-      'joining' => 'joining',
+        'timestamp' => 'timestamp',
+        'total_credit' => 'total_credit',
+        'userid' => 'userid',
+        'joining' => 'joining',
     ),
     'info' => array(
-      'timestamp' => array(
+        'timestamp' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'userid' => array(
+        ),
+        'userid' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'joining' => array(
+        ),
+        'joining' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'timestamp',
-  ));
-  $handler->override_option('pane_title', 'Team history');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', 'Team history');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -3328,37 +3328,37 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'id' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Id',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('panel_pane', 'Team admins', 'panel_pane_3');
-  $handler->override_option('relationships', array(
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Id',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('panel_pane', 'Team admins', 'panel_pane_3');
+    $handler->override_option('relationships', array(
     'userid' => array(
-      'label' => 'User',
-      'required' => 0,
-      'id' => 'userid',
-      'table' => 'team_admin',
-      'field' => 'userid',
-      'override' => array(
+        'label' => 'User',
+        'required' => 0,
+        'id' => 'userid',
+        'table' => 'team_admin',
+        'field' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('fields', array(
     'teamid' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3377,32 +3377,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'teamid',
-      'table' => 'team_admin',
-      'field' => 'teamid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'teamid',
+        'table' => 'team_admin',
+        'field' => 'teamid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'userid' => array(
-      'label' => 'User ID',
-      'alter' => array(
+        'label' => 'User ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3421,32 +3421,32 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'userid',
-      'table' => 'team_admin',
-      'field' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'userid',
+        'table' => 'team_admin',
+        'field' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3465,23 +3465,23 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'create_time' => array(
-      'label' => 'Admin since',
-      'alter' => array(
+        'label' => 'Admin since',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3500,25 +3500,25 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'team_admin',
-      'field' => 'create_time',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'team_admin',
+        'field' => 'create_time',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3537,46 +3537,46 @@  discard block
 block discarded – undo
         '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
 $team_id = boincteam_lookup_nid($data->id);
 $user_id = get_drupal_id($data->team_admin_userid);
 echo l(bts(\'Remove\', array(), NULL, \'boinc:remove-team-member\'), "community/teams/{$team_id}/edit/admins/remove/{$user_id}");
 ?>',
-      '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('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'id' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'id',
-      'table' => 'team',
-      'field' => 'id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'id',
+        'table' => 'team',
+        'field' => 'id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -3585,10 +3585,10 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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,
         3519698132 => 0,
         1110965548 => 0,
@@ -3597,23 +3597,23 @@  discard block
 block discarded – undo
         268174006 => 0,
         1271379760 => 0,
         933038561 => 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' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
@@ -3621,95 +3621,95 @@  discard block
 block discarded – undo
         'panel' => 0,
         'story' => 0,
         'team' => 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(
     'userid' => array(
-      'operator' => 'not empty',
-      'value' => array(
+        'operator' => 'not empty',
+        'value' => array(
         'value' => '',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'userid',
-      'table' => 'team_admin',
-      'field' => 'userid',
-      'override' => array(
+        ),
+        'id' => 'userid',
+        'table' => 'team_admin',
+        'field' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('empty', 'There are currently no team admins.');
-  $handler->override_option('empty_format', '5');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('empty', 'There are currently no team admins.');
+    $handler->override_option('empty_format', '5');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'asc',
     'summary' => '',
     'columns' => array(
-      'teamid' => 'teamid',
-      'userid' => 'userid',
-      'name' => 'name',
-      'create_time' => 'create_time',
-      'phpcode' => 'phpcode',
+        'teamid' => 'teamid',
+        'userid' => 'userid',
+        'name' => 'name',
+        'create_time' => 'create_time',
+        'phpcode' => 'phpcode',
     ),
     'info' => array(
-      'teamid' => array(
+        'teamid' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'userid' => array(
+        ),
+        'userid' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'create_time',
-  ));
-  $handler->override_option('pane_title', 'Team admins');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', 'Team admins');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 0,
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -3719,24 +3719,24 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array(
+    ));
+    $handler->override_option('argument_input', array(
     'id' => array(
-      'type' => 'panel',
-      'context' => 'term.description',
-      'context_optional' => 0,
-      'panel' => '0',
-      'fixed' => '',
-      'label' => 'BOINC: Id',
-    ),
-  ));
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
-  $handler = $view->new_display('panel_pane', 'Top teams pane', 'panel_pane_4');
-  $handler->override_option('fields', array(
+        'type' => 'panel',
+        'context' => 'term.description',
+        'context_optional' => 0,
+        'panel' => '0',
+        'fixed' => '',
+        'label' => 'BOINC: Id',
+    ),
+    ));
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
+    $handler = $view->new_display('panel_pane', 'Top teams pane', 'panel_pane_4');
+    $handler->override_option('fields', array(
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3755,20 +3755,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3787,29 +3787,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'team',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'team',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3828,20 +3828,20 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'team',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'team',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3860,34 +3860,34 @@  discard block
 block discarded – undo
         '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
   $team_id = boincteam_lookup_nid($data->id);
   echo l($data->team_name, "community/teams/{$team_id}");
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'nusers' => array(
-      'id' => 'nusers',
-      'table' => 'team',
-      'field' => 'nusers',
+        'id' => 'nusers',
+        'table' => 'team',
+        'field' => 'nusers',
     ),
     'country' => array(
-      'id' => 'country',
-      'table' => 'team',
-      'field' => 'country',
+        'id' => 'country',
+        'table' => 'team',
+        'field' => 'country',
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3906,29 +3906,29 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'team',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'team',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3947,115 +3947,115 @@  discard block
 block discarded – undo
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'team',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'team',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'total_credit' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'total_credit',
-      'table' => 'team',
-      'field' => 'total_credit',
-      'override' => array(
+        ),
+        'id' => 'total_credit',
+        'table' => 'team',
+        'field' => 'total_credit',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('title', 'Top teams');
-  $handler->override_option('use_more', 1);
-  $handler->override_option('use_more_always', 1);
-  $handler->override_option('use_more_text', 'view more');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('title', 'Top teams');
+    $handler->override_option('use_more', 1);
+    $handler->override_option('use_more_always', 1);
+    $handler->override_option('use_more_text', 'view more');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 0,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'rownumber' => 'rownumber',
-      'id' => 'id',
-      'name' => 'name',
-      'phpcode' => 'phpcode',
-      'nusers' => 'nusers',
-      'country' => 'country',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
+        'rownumber' => 'rownumber',
+        'id' => 'id',
+        'name' => 'name',
+        'phpcode' => 'phpcode',
+        'nusers' => 'nusers',
+        'country' => 'country',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
     ),
     'info' => array(
-      'rownumber' => array(
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'nusers' => array(
+        ),
+        'nusers' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('pane_title', '');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', '');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => 'use_pager',
     'items_per_page' => 'items_per_page',
     'offset' => 0,
@@ -4065,12 +4065,12 @@  discard block
 block discarded – undo
     'title_override' => 'title_override',
     'exposed_form' => 0,
     'fields_override' => 0,
-  ));
-  $handler->override_option('argument_input', array());
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
+    ));
+    $handler->override_option('argument_input', array());
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  return $views;
+    return $views;
 }

Please login to merge, or discard this patch.

drupal/sites/default/boinc/modules/boincteam/includes/boincteam.helpers.inc 4 patches

Braces +3 added lines, -6 removed lines patch added patch discarded remove patch

@@ -44,8 +44,7 @@  discard block
 block discarded – undo
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
       }
-    }
-    else {
+    } else {
       // Import new teams created by RPC or ops/team_import.php
       $success = boincteam_import($boinc_team);
     }
@@ -77,8 +76,7 @@  discard block
 block discarded – undo
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+  } else {
     // Construct the team as a new node
     $node = array(
       'type' => 'team',
@@ -132,8 +130,7 @@  discard block
 block discarded – undo
   }
   if ($boincid) {
     return $ids;
-  }
-  else {
+  } else {
     return array_map('boincuser_lookup_uid', $ids);
   }
 }

Please login to merge, or discard this patch.

Indentation +73 added lines, -73 removed lines patch added patch discarded remove patch

@@ -15,41 +15,41 @@  discard block
 block discarded – undo
  */
 function boincteam_sync() {
   
-  // Get the list of teams to import
-  db_set_active('boinc_rw');
-  $boinc_teams = db_query('
+    // Get the list of teams to import
+    db_set_active('boinc_rw');
+    $boinc_teams = db_query('
     SELECT id, name, description, userid, create_time, seti_id
     FROM team
     WHERE mod_time > FROM_UNIXTIME(%d)',
     variable_get('boincteam_last_sync', 0)
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  $existing_teams = array();
+    $existing_teams = array();
   
-  // Get the list of teams already in Drupal to be sure we're not importing
-  // any twice
-  $result = db_query('
+    // Get the list of teams already in Drupal to be sure we're not importing
+    // any twice
+    $result = db_query('
     SELECT nid, team_id FROM {boincteam}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_teams[$row->team_id] = $row->nid;
-  }
+    }
   
-  while ($boinc_team = db_fetch_object($boinc_teams)) {
+    while ($boinc_team = db_fetch_object($boinc_teams)) {
     $success = NULL;
     if (isset($existing_teams[$boinc_team->id])) {
-      if ($boinc_team->seti_id > 0) {
+        if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
-      }
+        }
     }
     else {
-      // Import new teams created by RPC or ops/team_import.php
-      $success = boincteam_import($boinc_team);
+        // Import new teams created by RPC or ops/team_import.php
+        $success = boincteam_import($boinc_team);
+    }
     }
-  }
 }
 
 
@@ -58,58 +58,58 @@  discard block
 block discarded – undo
  */
 function boincteam_import($boincteam, $nid = NULL) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $team_type_map = variable_get('boincimport_team_types', array()); 
+    $input_format = variable_get('boincimport_input_format', 0);
+    $team_type_map = variable_get('boincimport_team_types', array()); 
   
-  // Save the team type affiliation
-  $team_type_tid = $team_type_map[$boincteam->type];
+    // Save the team type affiliation
+    $team_type_tid = $team_type_map[$boincteam->type];
   
-  $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
-  // Be sure the text is filtered for the default input format
-  $boincteam->description = check_markup($boincteam->description, $input_format);
+    $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
+    // Be sure the text is filtered for the default input format
+    $boincteam->description = check_markup($boincteam->description, $input_format);
   
-  $teaser = node_teaser($boincteam->description);
+    $teaser = node_teaser($boincteam->description);
   
-  if ($nid) {
+    if ($nid) {
     // Update an existing node
     $node = node_load($nid);
     $node->title = $boincteam->name;
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+    }
+    else {
     // Construct the team as a new node
     $node = array(
-      'type' => 'team',
-      'title' => $boincteam->name,
-      'body' => $boincteam->description,
-      'teaser' => $teaser,
-      'uid' => boincuser_lookup_uid($boincteam->userid),
-      'path' => null,
-      'status' => 1,  // published or not - always publish
-      'promote' => 0,
-      'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
-      'moderate' => 0,
-      'sticky' => 0,
-      'format' => $input_format
+        'type' => 'team',
+        'title' => $boincteam->name,
+        'body' => $boincteam->description,
+        'teaser' => $teaser,
+        'uid' => boincuser_lookup_uid($boincteam->userid),
+        'path' => null,
+        'status' => 1,  // published or not - always publish
+        'promote' => 0,
+        'created' => $boincteam->create_time,
+        'comment' => 0,  // comments disabled
+        'moderate' => 0,
+        'sticky' => 0,
+        'format' => $input_format
     );
     $node = (object) $node; // node_save requires an object form
-  }
+    }
   
-  $node->taxonomy[] = taxonomy_get_term($team_type_tid);
+    $node->taxonomy[] = taxonomy_get_term($team_type_tid);
   
-  // Save the team node
-  node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+    // Save the team node
+    node_save($node);
+    $success = ($node->nid) ? TRUE : FALSE;
   
-  if (!$nid) {
+    if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed
     db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam->id, $node->nid);
-  }
+    }
   
-  return $success;
+    return $success;
 }
 
 /**
@@ -126,25 +126,25 @@  discard block
 block discarded – undo
  *   respected. This is useful the list of users are to be contacted.
  */
 function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
-  $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
-  if ($respectprivacy) {
+    $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
+    if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
-  }
+    }
 
-  db_set_active('boinc_ro');
-  $dbres = db_query($sql, $boincteamid);
-  db_set_active('default');
+    db_set_active('boinc_ro');
+    $dbres = db_query($sql, $boincteamid);
+    db_set_active('default');
 
-  $ids = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+    $ids = array();
+    while (($result = db_fetch_object($dbres)) != FALSE) {
     $ids[] = $result->id;
-  }
-  if ($boincid) {
+    }
+    if ($boincid) {
     return $ids;
-  }
-  else {
+    }
+    else {
     return array_map('boincuser_lookup_uid', $ids);
-  }
+    }
 }
 
 /**
@@ -158,18 +158,18 @@  discard block
 block discarded – undo
  *   respected. This is useful the list of users are to be contacted.
  */
 function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
-  $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
-  if ($respectprivacy) {
+    $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
+    if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
-  }
+    }
 
-  db_set_active('boinc_ro');
-  $dbres = db_query($sql, $boincteamid);
-  db_set_active('default');
+    db_set_active('boinc_ro');
+    $dbres = db_query($sql, $boincteamid);
+    db_set_active('default');
 
-  $emails = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+    $emails = array();
+    while (($result = db_fetch_object($dbres)) != FALSE) {
     $emails[] = $result->email_addr;
-  }
-  return $emails;
+    }
+    return $emails;
 }

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -87,15 +87,15 @@  discard block
 block discarded – undo
       'teaser' => $teaser,
       'uid' => boincuser_lookup_uid($boincteam->userid),
       'path' => null,
-      'status' => 1,  // published or not - always publish
+      'status' => 1, // published or not - always publish
       'promote' => 0,
       'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
+      'comment' => 0, // comments disabled
       'moderate' => 0,
       'sticky' => 0,
       'format' => $input_format
     );
-    $node = (object) $node; // node_save requires an object form
+    $node = (object)$node; // node_save requires an object form
   }
   
   $node->taxonomy[] = taxonomy_get_term($team_type_tid);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
+function _boincteam_userids($boincteamid, $boincid = TRUE, $respectprivacy = TRUE) {
   $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
+function _boincteam_emails($boincteamid, $respectprivacy = TRUE) {
   $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';

Please login to merge, or discard this patch.

Upper-Lower-Casing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
   }
   
   while ($boinc_team = db_fetch_object($boinc_teams)) {
-    $success = NULL;
+    $success = null;
     if (isset($existing_teams[$boinc_team->id])) {
       if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 /**
  * Import a given BOINC team object into Drupal
  */
-function boincteam_import($boincteam, $nid = NULL) {
+function boincteam_import($boincteam, $nid = null) {
   
   $input_format = variable_get('boincimport_input_format', 0);
   $team_type_map = variable_get('boincimport_team_types', array()); 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
   
   // Save the team node
   node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+  $success = ($node->nid) ? true : false;
   
   if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
+function _boincteam_userids($boincteamid, $boincid=true, $respectprivacy=true) {
   $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
   db_set_active('default');
 
   $ids = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+  while (($result = db_fetch_object($dbres)) != false) {
     $ids[] = $result->id;
   }
   if ($boincid) {
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
+function _boincteam_emails($boincteamid, $respectprivacy=true) {
   $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
   db_set_active('default');
 
   $emails = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+  while (($result = db_fetch_object($dbres)) != false) {
     $emails[] = $result->email_addr;
   }
   return $emails;

Please login to merge, or discard this patch.

drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc 3 patches

Indentation +185 added lines, -185 removed lines patch added patch discarded remove patch

@@ -5,45 +5,45 @@  discard block
 block discarded – undo
  * Callback admin/boinc/import/settings
  */
 function boincimport_admin_settings() {
-  global $conf ;
-  global $db_url;
-  global $base_url;
-  $stage = variable_get('boincimport_config_stage', 0); 
+    global $conf ;
+    global $db_url;
+    global $base_url;
+    $stage = variable_get('boincimport_config_stage', 0); 
   
-  // Start with a quick sanity check on the BOINC environment
-  boinc_get_path();
+    // Start with a quick sanity check on the BOINC environment
+    boinc_get_path();
   
-  //We'll be checking that the setup is complete.
-  //If it is not complete, the migration will not go ahead.
-  $ready_for_migration = 1;
+    //We'll be checking that the setup is complete.
+    //If it is not complete, the migration will not go ahead.
+    $ready_for_migration = 1;
 
-  // Checking that the migration has been tested on a copy first.
-  $form['test'] = array(
+    // Checking that the migration has been tested on a copy first.
+    $form['test'] = array(
     '#type' => 'fieldset',
     '#title' => t('Test on copy first'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
     
-  $output = '';
-  if (!variable_get('boincimport_tested', 0)) {
+    $output = '';
+    if (!variable_get('boincimport_tested', 0)) {
     $form['test']['#collapsed']= FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
-  }
-  $output .= '<p>' . t('The migration will modify and even destroy some data. You
+    }
+    $output .= '<p>' . t('The migration will modify and even destroy some data. You
     must test this module on a copy of your data first, several times if necessary.
     Only use this module on your live data when you are familiar with the procedure
     and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you
     should make a full backup of your database just prior to performing the
     migration on the live data. It is better to turn off both the BOINC site and the
     Drupal site during the migration.') . '</p>';
-  if (!variable_get('boincimport_tested', 0)) {
+    if (!variable_get('boincimport_tested', 0)) {
     $output .= '</span>';
-  }
-  $form['test']['intro'] = array('#value' => $output);
+    }
+    $form['test']['intro'] = array('#value' => $output);
 
-  $form['test']['boincimport_tested'] = array(
+    $form['test']['boincimport_tested'] = array(
     '#type' => 'checkbox',
     '#title' => t('I am running a trial migration on a disposable copy of the database
       OR I have already done so and I am running this on my live site, confident that
@@ -51,64 +51,64 @@  discard block
 block discarded – undo
     '#return_value' => 1,
     '#default_value' => variable_get('boincimport_tested', 0),
     '#description' => '',
-  );
+    );
   
-  // Where is BOINC data?
-  $pre = variable_get('boincimport_table_prefix', '');
-  $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
-  $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
-  $result = _boincimport_check_tables($tables, $db, 0);
+    // Where is BOINC data?
+    $pre = variable_get('boincimport_table_prefix', '');
+    $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
+    $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
+    $result = _boincimport_check_tables($tables, $db, 0);
   
-  $config_path = conf_path();
-  $form['boinc_data'] = array(
+    $config_path = conf_path();
+    $form['boinc_data'] = array(
     '#type' => 'fieldset',
     '#title' => t('Location of BOINC data'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['boinc_data']['boincimport_db_configured'] = array(
+    );
+    $form['boinc_data']['boincimport_db_configured'] = array(
     '#type' => 'checkbox',
     '#title' => t('There is a \'boinc\' database connection string configured in %file',
-      array('%file' => "{$config_path}/settings.php")),
+        array('%file' => "{$config_path}/settings.php")),
     '#return_value' => 1,
     '#default_value' => variable_get('boincimport_db_configured', 1),
     '#description' => '',
     '#disabled' => ($result['result']) ? TRUE : FALSE
-  );
-  if (variable_get('boincimport_db_configured', 1) != 1) {
+    );
+    if (variable_get('boincimport_db_configured', 1) != 1) {
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
     $url = variable_get('boincimport_db_url', $default_db_url);
     if (!preg_match('{(mysql|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) {
-      $output = '<p class="marker">'. t('Set the address of the BOINC database
+        $output = '<p class="marker">'. t('Set the address of the BOINC database
         according to the following format:') . '<br /><pre>
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
-      $ready_for_migration = 0;
-      $form['boinc_data']['#collapsed'] = FALSE;
-      $form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
+        $ready_for_migration = 0;
+        $form['boinc_data']['#collapsed'] = FALSE;
+        $form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
     }
 
     $form['boinc_data']['boincimport_db_url'] = array(
-      '#type' => 'textfield',
-      '#title' => t('BOINC database location'),
-      '#default_value' => variable_get('boincimport_db_url', $default_db_url),
-      '#size' => 80,
-      '#maxlength' => 255,
-      '#description' => '',
+        '#type' => 'textfield',
+        '#title' => t('BOINC database location'),
+        '#default_value' => variable_get('boincimport_db_url', $default_db_url),
+        '#size' => 80,
+        '#maxlength' => 255,
+        '#description' => '',
     );
-  }
+    }
 
-  $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
+    $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
     import messages from one database type to another database type. E.g, we
     cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import
     the data into the same type of database first (import all the BOINC data, as is,
     from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on
     postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
     'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
-  $form['boinc_data']['note'] = array('#value' => $output);
+    $form['boinc_data']['note'] = array('#value' => $output);
   
-  // BOINC table prefix
-  $form['boinc_data']['boincimport_table_prefix'] = array(
+    // BOINC table prefix
+    $form['boinc_data']['boincimport_table_prefix'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC table prefix'),
     '#default_value' => variable_get('boincimport_table_prefix', ''),
@@ -116,30 +116,30 @@  discard block
 block discarded – undo
     '#maxlength' => 255,
     '#description' => t('What prefix is used for your BOINC tables?'),
     '#disabled' => ($result['result']) ? TRUE : FALSE
-  );
+    );
   
-  $output = $result['html'];
-  if ($result['result'] != 1) {
+    $output = $result['html'];
+    if ($result['result'] != 1) {
     $ready_for_migration = 0;
     $form['boinc_data']['#collapsed']= FALSE;
     $output .= '<span class="marker">';
     $output .= t('Some tables couldn\'t be found. Are the database settings correct?
       Please correct the errors so that the BOINC tables can be accessed.');
     $output .= '</span>';
-  }
+    }
 
-  $form['boinc_data']['result'] = array('#value' => $output);
+    $form['boinc_data']['result'] = array('#value' => $output);
   
-  // USERS settings
-  $form['users'] = array(
+    // USERS settings
+    $form['users'] = array(
     '#type' => 'fieldset',
     '#title' => t('User import'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  // User import batch size
-  $form['users']['boincimport_user_batch_size'] = array(
+    // User import batch size
+    $form['users']['boincimport_user_batch_size'] = array(
     '#type' => 'textfield',
     '#title' => t('Number of accounts to process at a time'),
     '#default_value' => variable_get('boincimport_user_batch_size', 50),
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
     '#description' => t('Due to memory intensive API calls, this value may have to
       be adjusted to avoid exhausting system resources. The default value is a
       balance between performance and reliability.')
-  );
+    );
 
-  // Import users who have never posted?
-  $form['users']['boincimport_import_lurkers'] = array(
+    // Import users who have never posted?
+    $form['users']['boincimport_import_lurkers'] = array(
     '#type' => 'checkbox',
     '#title' => t('Import users who have never posted?'),
     '#return_value' => 1,
@@ -160,199 +160,199 @@  discard block
 block discarded – undo
       involvement? This may not be desired, as it can take a very long time to
       import tens or hundreds of thousands of accounts. (note that users who
       are not imported now will still be imported on-the-fly upon login)'),
-  );
+    );
 
-  // Input format settings
-  $form['input'] = array(
+    // Input format settings
+    $form['input'] = array(
     '#type' => 'fieldset',
     '#title' => t('Input format settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE
-  );
-  $output = '<p>'. t('Select which !input_format should be used for the imported
+    );
+    $output = '<p>'. t('Select which !input_format should be used for the imported
     messages. It is highly-recommended that this value be left as it is, as the
     Full HTML and PHP code formats can be very dangerous!', 
     array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>';
-  $form['input']['intro'] = array('#value' => $output);
+    $form['input']['intro'] = array('#value' => $output);
   
-  $formats = db_query('SELECT format, name FROM {filter_formats}');
-  while ($format = db_fetch_array($formats)) {
+    $formats = db_query('SELECT format, name FROM {filter_formats}');
+    while ($format = db_fetch_array($formats)) {
     $input_formats[$format['format']]= $format['name'];
-  }
+    }
   
-  // By default, use the format named "Rich text"; fall back to Filtered HTML
-  $default_input_format = db_result(db_query("
+    // By default, use the format named "Rich text"; fall back to Filtered HTML
+    $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
-  if (!$default_input_format) $default_input_format = 1;
+    if (!$default_input_format) $default_input_format = 1;
   
-  $input_format = variable_get('boincimport_input_format', $default_input_format);
-  $form['input']['boincimport_input_format'] = array(
+    $input_format = variable_get('boincimport_input_format', $default_input_format);
+    $form['input']['boincimport_input_format'] = array(
     '#type' => 'radios',
     '#title' => t('Input format'),
     '#default_value' => $input_format,
     '#options' => $input_formats
-  );
-  if (!$input_format) {
+    );
+    if (!$input_format) {
     $ready_for_migration = 0;
     $form['input']['#collapsed']= FALSE;
-  }
-  $output = '<p><em>'. t('This setting will be applied to all posts and private
+    }
+    $output = '<p><em>'. t('This setting will be applied to all posts and private
     messages.') .'</em></p>';
-  $form['input']['result'] = array('#value' => $output);
+    $form['input']['result'] = array('#value' => $output);
   
-  // BBcode settings
-  $form['bbcode'] = array(
+    // BBcode settings
+    $form['bbcode'] = array(
     '#type' => 'fieldset',
     '#title' => t('BBcode settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
   
-  $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
+    $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
     import process, BBcode can be handled in two diffent ways') . ':</p>';
-  $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
+    $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
     after the migration to filter the imported posts. In this case, the module
     is not required during the migration, but will need to be installed and
     configured later.',
     array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode',
     array('attributes' => array('target' => '_blank'))))) . '</li>';
-  $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
+    $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
     The BBcode module will be required during the migration process, but can
     be disabled afterwards.') . '</li></ul>';
-  $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
+    $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
     as it will affect how the post is displayed. For example, if BBcode is
     removed and replaced by HTML, some HTML tags will be stripped by the
     "Filtered HTML" input format unless they are first added to the list of
     allowed tags in that format. See the !input_formats page.',
     array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>';
     
-  $form['bbcode']['intro'] = array('#value' => $output);
-  $form['bbcode']['boincimport_bbcode'] = array(
+    $form['bbcode']['intro'] = array('#value' => $output);
+    $form['bbcode']['boincimport_bbcode'] = array(
     '#type' => 'radios',
     '#title' => t('BBcode handling'),
     '#default_value' => variable_get('boincimport_bbcode', 0),
     '#options' => array(t('Leave BBcode as is.'), t('Transform BBcode into HTML.')),
     '#description' => '',
-  );
+    );
   
-  $module_status = _boincimport_check_module('bbcode');
-  $bbcode_disabled = ($module_status['result'] == 0) ? true : false;
-  $output = $module_status['html'];
+    $module_status = _boincimport_check_module('bbcode');
+    $bbcode_disabled = ($module_status['result'] == 0) ? true : false;
+    $output = $module_status['html'];
   
-  if (variable_get('boincimport_bbcode', 0)) {
+    if (variable_get('boincimport_bbcode', 0)) {
     if ($bbcode_disabled) {
-      $ready_for_migration = 0;
-      $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p><span class="marker">';
-      $output .= t('The !bbcode_module is required to transform BBcode into HTML.
+        $ready_for_migration = 0;
+        $form['bbcode']['#collapsed'] = FALSE;
+        $output .= '<p><span class="marker">';
+        $output .= t('The !bbcode_module is required to transform BBcode into HTML.
         You first need to !enable_bbcode', array(
-          '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
-          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules')));
-      $output .= '</span></p>';
+            '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
+            '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules')));
+        $output .= '</span></p>';
     }
     $sql = "SELECT COUNT(*) FROM {filters} WHERE module = 'bbcode' AND format = %d";
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
-      $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
+        $form['bbcode']['#collapsed'] = FALSE;
+        $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
         then !configure_bbcode_options', array(
-          '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
+            '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
+            '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
     }
     $output .= '<p>'. t('For best results, !disable_all_options', 
     array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
-  } else {
+    } else {
     if ($bbcode_disabled) {
-      $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
+        $form['bbcode']['#collapsed'] = FALSE;
+        $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
         You may !enable_bbcode after having installed it.', array(
-          '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
-          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
+            '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
+            '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
     }
     $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
-      '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
+        '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
+        '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
     $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>';
-  }
-  $output .= '<p><em>'. t('This setting will be applied to all posts, private
+    }
+    $output .= '<p><em>'. t('This setting will be applied to all posts, private
     messages and the users\' signature.') .'</em></p>';
     
-  $form['bbcode']['result'] = array('#value' => $output);
+    $form['bbcode']['result'] = array('#value' => $output);
   
-  // URL transform settings
-  $form['url_transforms'] = array(
+    // URL transform settings
+    $form['url_transforms'] = array(
     '#type' => 'fieldset',
     '#title' => t('URL transforms'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  if (!variable_get('boincimport_base_url_boinc', 0)) {
+    );
+    if (!variable_get('boincimport_base_url_boinc', 0)) {
     $form['url_transforms']['#collapsed']= FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
-  }
+    }
 
-  // List of BOINC domains possible in URLs to transform
-  $form['url_transforms']['boincimport_base_url_boinc'] = array(
+    // List of BOINC domains possible in URLs to transform
+    $form['url_transforms']['boincimport_base_url_boinc'] = array(
     '#type' => 'textarea',
     '#title' => t('BOINC base URLs to transform'),
     '#default_value' => variable_get('boincimport_base_url_boinc', ''),
     '#description' => t('List URL bases that should be transformed from
       BOINC format to Drupal format (enter one domain per line, including http://).'),
-  );
+    );
 
-  // The Drupal domain to use in URL transform results
-  $form['url_transforms']['boincimport_base_url_drupal'] = array(
+    // The Drupal domain to use in URL transform results
+    $form['url_transforms']['boincimport_base_url_drupal'] = array(
     '#type' => 'textfield',
     '#title' => t('Target Drupal base URL'),
     '#default_value' => variable_get('boincimport_base_url_drupal', ''),
     '#description' => t('Specify the URL base to use in transform results. If
       left blank, the base_url configured in this Drupal environment will be
       used (currently: %url)', array('%url' =>$base_url)),
-  );
+    );
   
-  // Are we ready for migration?
-  $form['migration'] = array(
+    // Are we ready for migration?
+    $form['migration'] = array(
     '#type' => 'fieldset',
     '#title' => 'Migration',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-  );
-  variable_set('boincimport_ready', $ready_for_migration);
-  if ($ready_for_migration) {
+    );
+    variable_set('boincimport_ready', $ready_for_migration);
+    if ($ready_for_migration) {
     $output = '<p>'. t('Check the settings above one more time. If everything
       is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>';
-  } else {
+    } else {
     $output = '<p class="marker">'. t('You are not ready for the migration yet.
       Please check the settings above.') .'</p>';
-  }
+    }
   
-  $form['migration']['info'] = array('#value' => $output);
-  return system_settings_form($form); 
+    $form['migration']['info'] = array('#value' => $output);
+    return system_settings_form($form); 
 }
 
 /**
  * Callback admin/boinc/import/post_configuration
  */
 function boincimport_post_configuration() {
-  $output = '<p>'. t('This page will help to tie up any loose ends following
+    $output = '<p>'. t('This page will help to tie up any loose ends following
     the BOINC data import process. Before continuing, it may be best to have
     already:') .'</p>';
-  $output .= '<ul>';
-  $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
+    $output .= '<ul>';
+    $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
     import module') .'</li>';
-  $output .= '<li>'. t('Imported any additional data using add on modules if
+    $output .= '<li>'. t('Imported any additional data using add on modules if
     available.') .'</li>';
-  $output .= '</ul>';
-  //User Set up
-  $output .= '<h2>'. t('User settings') .'</h2>';  
-  $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
+    $output .= '</ul>';
+    //User Set up
+    $output .= '<h2>'. t('User settings') .'</h2>';  
+    $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
     you can enable or disable signatures there. ', array(
-      '!user_settings' => l(t('user settings'), 'admin/user/settings')
+        '!user_settings' => l(t('user settings'), 'admin/user/settings')
     )) .'</p>'; 
-  $output .= '<p>' . t('Note that avatar/picture support is not tied to user
+    $output .= '<p>' . t('Note that avatar/picture support is not tied to user
     settings Picture support at this time.') . '</p>';
-  /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
+    /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
     enable pictures on this page and also:') . '</p>';
   $output .= '<ul>';
   $output .= '<li>'. t('Tick the checkboxes to allow "User pictures in posts" and/or
@@ -365,73 +365,73 @@  discard block
 block discarded – undo
     )) .'</li>';
   $output .= '</ul>'; */
   
-  // Forum Set up
-  $output .= '<h2>'. t('Forum settings') .'</h2>';
-  $output .= '<p>'. t('Check any additional changes to make on the
+    // Forum Set up
+    $output .= '<h2>'. t('Forum settings') .'</h2>';
+    $output .= '<p>'. t('Check any additional changes to make on the
     !forum_settings page.', array(
-      '!forum_settings' =>  l(t('forum settings'), 'admin/content/forum/settings')
+        '!forum_settings' =>  l(t('forum settings'), 'admin/content/forum/settings')
     )) .'</p>';
-  $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
+    $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
     verify that all necessary containers and forums are in place.', array(
-      '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
+        '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
     )) .'</p>';
-  /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
+    /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
     !documentation.', array(
       '!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank')))
     )) .'</p>';
     */
-  /*
+    /*
   // Redirection from old URLs:
   $output .= '<h2>'. t('Redirection from BOINC forum URLs to new Drupal forum URLs') .'</h2>';
   $output .= '<p>'. t('Enable the boincforum_redirect.module. This way, users
     accessing URLs from your old BOINC installation will be redirected to your new
     Drupal forum.') .'</p>';
   */
-  // BBcode
-  $bbcode = variable_get('boincimport_bbcode', 0);
-  if ($bbcode) {
+    // BBcode
+    $bbcode = variable_get('boincimport_bbcode', 0);
+    if ($bbcode) {
     $output .= '<h2>'. t('Remove BBcode module') .'</h2>';
     $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t
       need the bbcode module anymore. You can disable it.') .'</p>';
-  } else {
+    } else {
     $output .= '<h2>'. t('Configure BBcode module') .'</h2>';
     $output .= '<p>'. t('Most likely, there are many BOINC forum postings
       formatted in BBcode. It would be a good idea to verify that BBcode is
       being formatted correctly in the imported posts. Have a look around
       !the_forum.', array(
         '!the_forum' =>  l(t('the forum'), 'community')
-      )) . '</p>';
-  }
+        )) . '</p>';
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
  * Callback admin/boinc/import
  */
 function boincimport_main() {
-  // Start with a quick sanity check on the BOINC environment
-  boinc_get_path();
-  // If that's ok, on with the show
-  $output .= t('You may want to !check_documentation before starting.', array(
+    // Start with a quick sanity check on the BOINC environment
+    boinc_get_path();
+    // If that's ok, on with the show
+    $output .= t('You may want to !check_documentation before starting.', array(
     '!check_documentation' => l(t('check the documentation'), 'http://boinc.berkeley.edu/trac/wiki/InstallDrupal', array('attributes' =>array('target' => '_blank')))
-  ));
-  $output = '<ol><li>';
-  $output .= l(t('Configure the migration'), 'admin/boinc/import/settings');
-  $output .= '</li>';
-  $output .= '<li>';
-  $output .= l(t('Execute the migration'), 'admin/boinc/import/process');
-  $output .= '</li>';
-  $output .= '<li>';
-  $output .= l(t('Post migration configuration'), 'admin/boinc/import/post_configuration');
-  $output .= '</li>';
-  $output .= '<li>';
-  $output .= t('!cleanup (Accessing this link will delete all the saved BOINC forum
+    ));
+    $output = '<ol><li>';
+    $output .= l(t('Configure the migration'), 'admin/boinc/import/settings');
+    $output .= '</li>';
+    $output .= '<li>';
+    $output .= l(t('Execute the migration'), 'admin/boinc/import/process');
+    $output .= '</li>';
+    $output .= '<li>';
+    $output .= l(t('Post migration configuration'), 'admin/boinc/import/post_configuration');
+    $output .= '</li>';
+    $output .= '<li>';
+    $output .= t('!cleanup (Accessing this link will delete all the saved BOINC forum
     conversion settings: click only when you\'re done with all the above.)', array(
-      '!cleanup' => l(t('Cleanup'), 'admin/boinc/import/cleanup')
+        '!cleanup' => l(t('Cleanup'), 'admin/boinc/import/cleanup')
     ));
-  $output .= '</li>';
-  /*$output .= '<li>';
+    $output .= '</li>';
+    /*$output .= '<li>';
   $output .= t('Enable the boincforum_redirect module for seamless redirection
     from the old forums to the new. This module requires !clean_urls to be active.', array(
       '!clean_urls' => l(t('Clean URLs'), 'admin/settings/clean-urls')
@@ -442,14 +442,14 @@  discard block
 block discarded – undo
     uninstall BOINC forum - This will delete tables necessary for redirection. You can,
     however, deactivate the module safely.');
   $output .= '</li>';*/
-  $output .= '</ol>';
+    $output .= '</ol>';
 
-  // process will die() if the link to the BOINC database is wrong:
-  $output .= '<p>'. t('If the BOINC data is in another database, but you made a
+    // process will die() if the link to the BOINC database is wrong:
+    $output .= '<p>'. t('If the BOINC data is in another database, but you made a
     mistake while setting up the data base url, you may be unable to access the
     setting page due to some limitations of the core of Drupal. !reset_db_url.', array(
-      '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
+        '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
     )) .'</p>';
 
-  return $output;
+    return $output;
 }

Please login to merge, or discard this patch.

Spacing +66 added lines, -66 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
  * Callback admin/boinc/import/settings
  */
 function boincimport_admin_settings() {
-  global $conf ;
+  global $conf;
   global $db_url;
   global $base_url;
   $stage = variable_get('boincimport_config_stage', 0); 
@@ -27,17 +27,17 @@  discard block
 block discarded – undo
     
   $output = '';
   if (!variable_get('boincimport_tested', 0)) {
-    $form['test']['#collapsed']= FALSE;
+    $form['test']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
-  $output .= '<p>' . t('The migration will modify and even destroy some data. You
+  $output .= '<p>'.t('The migration will modify and even destroy some data. You
     must test this module on a copy of your data first, several times if necessary.
     Only use this module on your live data when you are familiar with the procedure
-    and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you
+    and you\'re confident everything will run smoothly.').'</p><p>'.t('Also, you
     should make a full backup of your database just prior to performing the
     migration on the live data. It is better to turn off both the BOINC site and the
-    Drupal site during the migration.') . '</p>';
+    Drupal site during the migration.').'</p>';
   if (!variable_get('boincimport_tested', 0)) {
     $output .= '</span>';
   }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
   
   // Where is BOINC data?
   $pre = variable_get('boincimport_table_prefix', '');
-  $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
+  $tables = array($pre.'forum', $pre.'post', $pre.'thread', $pre.'user');
   $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
   $result = _boincimport_check_tables($tables, $db, 0);
   
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
     $url = variable_get('boincimport_db_url', $default_db_url);
     if (!preg_match('{(mysql|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) {
-      $output = '<p class="marker">'. t('Set the address of the BOINC database
-        according to the following format:') . '<br /><pre>
+      $output = '<p class="marker">'.t('Set the address of the BOINC database
+        according to the following format:').'<br /><pre>
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
       $ready_for_migration = 0;
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
     );
   }
 
-  $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
+  $output = '<p>'.t('Note that due to a limitation within Drupal core, we cannot
     import messages from one database type to another database type. E.g, we
     cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import
     the data into the same type of database first (import all the BOINC data, as is,
-    from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on
+    from mysql to postgresql).').'</p><p>'.t('If both BOINC and Drupal are on
     postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
-    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
+    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))).'</p>';
   $form['boinc_data']['note'] = array('#value' => $output);
   
   // BOINC table prefix
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
   $output = $result['html'];
   if ($result['result'] != 1) {
     $ready_for_migration = 0;
-    $form['boinc_data']['#collapsed']= FALSE;
+    $form['boinc_data']['#collapsed'] = FALSE;
     $output .= '<span class="marker">';
     $output .= t('Some tables couldn\'t be found. Are the database settings correct?
       Please correct the errors so that the BOINC tables can be accessed.');
@@ -169,15 +169,15 @@  discard block
 block discarded – undo
     '#collapsible' => TRUE,
     '#collapsed' => TRUE
   );
-  $output = '<p>'. t('Select which !input_format should be used for the imported
+  $output = '<p>'.t('Select which !input_format should be used for the imported
     messages. It is highly-recommended that this value be left as it is, as the
     Full HTML and PHP code formats can be very dangerous!', 
-    array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>';
+    array('!input_format' => l(t('input format'), 'admin/settings/filters'))).'</p>';
   $form['input']['intro'] = array('#value' => $output);
   
   $formats = db_query('SELECT format, name FROM {filter_formats}');
   while ($format = db_fetch_array($formats)) {
-    $input_formats[$format['format']]= $format['name'];
+    $input_formats[$format['format']] = $format['name'];
   }
   
   // By default, use the format named "Rich text"; fall back to Filtered HTML
@@ -194,10 +194,10 @@  discard block
 block discarded – undo
   );
   if (!$input_format) {
     $ready_for_migration = 0;
-    $form['input']['#collapsed']= FALSE;
+    $form['input']['#collapsed'] = FALSE;
   }
-  $output = '<p><em>'. t('This setting will be applied to all posts and private
-    messages.') .'</em></p>';
+  $output = '<p><em>'.t('This setting will be applied to all posts and private
+    messages.').'</em></p>';
   $form['input']['result'] = array('#value' => $output);
   
   // BBcode settings
@@ -208,23 +208,23 @@  discard block
 block discarded – undo
     '#collapsed' => TRUE,
   );
   
-  $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
-    import process, BBcode can be handled in two diffent ways') . ':</p>';
-  $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
+  $output = '<p>'.t('BOINC posts are often formatted in BBcode. During the
+    import process, BBcode can be handled in two diffent ways').':</p>';
+  $output .= '<ul><li>'.t('Leave the BBcode as is and use the !bbcode_module
     after the migration to filter the imported posts. In this case, the module
     is not required during the migration, but will need to be installed and
     configured later.',
     array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode',
-    array('attributes' => array('target' => '_blank'))))) . '</li>';
-  $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
+    array('attributes' => array('target' => '_blank'))))).'</li>';
+  $output .= '<li>'.t('Filter the BBcode now and replace it with plain HTML.
     The BBcode module will be required during the migration process, but can
-    be disabled afterwards.') . '</li></ul>';
-  $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
+    be disabled afterwards.').'</li></ul>';
+  $output .= '<p>'.t('An appropriate input filter should be chosen, as well,
     as it will affect how the post is displayed. For example, if BBcode is
     removed and replaced by HTML, some HTML tags will be stripped by the
     "Filtered HTML" input format unless they are first added to the list of
     allowed tags in that format. See the !input_formats page.',
-    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>';
+    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))).'</p>';
     
   $form['bbcode']['intro'] = array('#value' => $output);
   $form['bbcode']['boincimport_bbcode'] = array(
@@ -254,28 +254,28 @@  discard block
 block discarded – undo
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
+      $output .= '<p class="marker">'.t('You need to !enable_bbcode_input and
         then !configure_bbcode_options', array(
           '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
+          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
     }
-    $output .= '<p>'. t('For best results, !disable_all_options', 
-    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
+    $output .= '<p>'.t('For best results, !disable_all_options', 
+    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))).'.</p>';
   } else {
     if ($bbcode_disabled) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
+      $output .= '<p>'.t('The !bbcode_module is recommended, but not required.
         You may !enable_bbcode after having installed it.', array(
           '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
-          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
+          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))).'</p>';
     }
-    $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
+    $output .= '<p>'.t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
       '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
-    $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>';
+      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
+    $output .= '<p>'.t('You may want to enable it for other input formats, too.').'</p>';
   }
-  $output .= '<p><em>'. t('This setting will be applied to all posts, private
-    messages and the users\' signature.') .'</em></p>';
+  $output .= '<p><em>'.t('This setting will be applied to all posts, private
+    messages and the users\' signature.').'</em></p>';
     
   $form['bbcode']['result'] = array('#value' => $output);
   
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
     '#collapsed' => TRUE,
   );
   if (!variable_get('boincimport_base_url_boinc', 0)) {
-    $form['url_transforms']['#collapsed']= FALSE;
+    $form['url_transforms']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -320,11 +320,11 @@  discard block
 block discarded – undo
   );
   variable_set('boincimport_ready', $ready_for_migration);
   if ($ready_for_migration) {
-    $output = '<p>'. t('Check the settings above one more time. If everything
-      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>';
+    $output = '<p>'.t('Check the settings above one more time. If everything
+      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))).'</p>';
   } else {
-    $output = '<p class="marker">'. t('You are not ready for the migration yet.
-      Please check the settings above.') .'</p>';
+    $output = '<p class="marker">'.t('You are not ready for the migration yet.
+      Please check the settings above.').'</p>';
   }
   
   $form['migration']['info'] = array('#value' => $output);
@@ -335,23 +335,23 @@  discard block
 block discarded – undo
  * Callback admin/boinc/import/post_configuration
  */
 function boincimport_post_configuration() {
-  $output = '<p>'. t('This page will help to tie up any loose ends following
+  $output = '<p>'.t('This page will help to tie up any loose ends following
     the BOINC data import process. Before continuing, it may be best to have
-    already:') .'</p>';
+    already:').'</p>';
   $output .= '<ul>';
-  $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
-    import module') .'</li>';
-  $output .= '<li>'. t('Imported any additional data using add on modules if
-    available.') .'</li>';
+  $output .= '<li>'.t('Imported users, teams, and forums using the BOINC
+    import module').'</li>';
+  $output .= '<li>'.t('Imported any additional data using add on modules if
+    available.').'</li>';
   $output .= '</ul>';
   //User Set up
-  $output .= '<h2>'. t('User settings') .'</h2>';  
-  $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
+  $output .= '<h2>'.t('User settings').'</h2>';  
+  $output .= '<p>'.t('Make sure your !user_settings are correct. Specifically,
     you can enable or disable signatures there. ', array(
       '!user_settings' => l(t('user settings'), 'admin/user/settings')
-    )) .'</p>'; 
-  $output .= '<p>' . t('Note that avatar/picture support is not tied to user
-    settings Picture support at this time.') . '</p>';
+    )).'</p>'; 
+  $output .= '<p>'.t('Note that avatar/picture support is not tied to user
+    settings Picture support at this time.').'</p>';
   /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
     enable pictures on this page and also:') . '</p>';
   $output .= '<ul>';
@@ -366,15 +366,15 @@  discard block
 block discarded – undo
   $output .= '</ul>'; */
   
   // Forum Set up
-  $output .= '<h2>'. t('Forum settings') .'</h2>';
-  $output .= '<p>'. t('Check any additional changes to make on the
+  $output .= '<h2>'.t('Forum settings').'</h2>';
+  $output .= '<p>'.t('Check any additional changes to make on the
     !forum_settings page.', array(
       '!forum_settings' =>  l(t('forum settings'), 'admin/content/forum/settings')
-    )) .'</p>';
-  $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
+    )).'</p>';
+  $output .= '<p>'.t('It also may be a good idea to look at the !forum_list to
     verify that all necessary containers and forums are in place.', array(
       '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
-    )) .'</p>';
+    )).'</p>';
   /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
     !documentation.', array(
       '!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank')))
@@ -390,17 +390,17 @@  discard block
 block discarded – undo
   // BBcode
   $bbcode = variable_get('boincimport_bbcode', 0);
   if ($bbcode) {
-    $output .= '<h2>'. t('Remove BBcode module') .'</h2>';
-    $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t
-      need the bbcode module anymore. You can disable it.') .'</p>';
+    $output .= '<h2>'.t('Remove BBcode module').'</h2>';
+    $output .= '<p>'.t('The BBcode has been cleaned from the posts. You shouldn\'t
+      need the bbcode module anymore. You can disable it.').'</p>';
   } else {
-    $output .= '<h2>'. t('Configure BBcode module') .'</h2>';
-    $output .= '<p>'. t('Most likely, there are many BOINC forum postings
+    $output .= '<h2>'.t('Configure BBcode module').'</h2>';
+    $output .= '<p>'.t('Most likely, there are many BOINC forum postings
       formatted in BBcode. It would be a good idea to verify that BBcode is
       being formatted correctly in the imported posts. Have a look around
       !the_forum.', array(
         '!the_forum' =>  l(t('the forum'), 'community')
-      )) . '</p>';
+      )).'</p>';
   }
 
   return $output;
@@ -445,11 +445,11 @@  discard block
 block discarded – undo
   $output .= '</ol>';
 
   // process will die() if the link to the BOINC database is wrong:
-  $output .= '<p>'. t('If the BOINC data is in another database, but you made a
+  $output .= '<p>'.t('If the BOINC data is in another database, but you made a
     mistake while setting up the data base url, you may be unable to access the
     setting page due to some limitations of the core of Drupal. !reset_db_url.', array(
       '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
-    )) .'</p>';
+    )).'</p>';
 
   return $output;
 }

Please login to merge, or discard this patch.

Upper-Lower-Casing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -21,13 +21,13 @@  discard block
 block discarded – undo
   $form['test'] = array(
     '#type' => 'fieldset',
     '#title' => t('Test on copy first'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
     
   $output = '';
   if (!variable_get('boincimport_tested', 0)) {
-    $form['test']['#collapsed']= FALSE;
+    $form['test']['#collapsed']= false;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -56,15 +56,15 @@  discard block
 block discarded – undo
   // Where is BOINC data?
   $pre = variable_get('boincimport_table_prefix', '');
   $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
-  $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
+  $db = (is_array($db_url) and isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
   $result = _boincimport_check_tables($tables, $db, 0);
   
   $config_path = conf_path();
   $form['boinc_data'] = array(
     '#type' => 'fieldset',
     '#title' => t('Location of BOINC data'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
   $form['boinc_data']['boincimport_db_configured'] = array(
     '#type' => 'checkbox',
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
     '#return_value' => 1,
     '#default_value' => variable_get('boincimport_db_configured', 1),
     '#description' => '',
-    '#disabled' => ($result['result']) ? TRUE : FALSE
+    '#disabled' => ($result['result']) ? true : false
   );
   if (variable_get('boincimport_db_configured', 1) != 1) {
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
       $ready_for_migration = 0;
-      $form['boinc_data']['#collapsed'] = FALSE;
+      $form['boinc_data']['#collapsed'] = false;
       $form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
     }
 
@@ -115,13 +115,13 @@  discard block
 block discarded – undo
     '#size' => 20,
     '#maxlength' => 255,
     '#description' => t('What prefix is used for your BOINC tables?'),
-    '#disabled' => ($result['result']) ? TRUE : FALSE
+    '#disabled' => ($result['result']) ? true : false
   );
   
   $output = $result['html'];
   if ($result['result'] != 1) {
     $ready_for_migration = 0;
-    $form['boinc_data']['#collapsed']= FALSE;
+    $form['boinc_data']['#collapsed']= false;
     $output .= '<span class="marker">';
     $output .= t('Some tables couldn\'t be found. Are the database settings correct?
       Please correct the errors so that the BOINC tables can be accessed.');
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
   $form['users'] = array(
     '#type' => 'fieldset',
     '#title' => t('User import'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
 
   // User import batch size
@@ -166,8 +166,8 @@  discard block
 block discarded – undo
   $form['input'] = array(
     '#type' => 'fieldset',
     '#title' => t('Input format settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE
+    '#collapsible' => true,
+    '#collapsed' => true
   );
   $output = '<p>'. t('Select which !input_format should be used for the imported
     messages. It is highly-recommended that this value be left as it is, as the
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
   );
   if (!$input_format) {
     $ready_for_migration = 0;
-    $form['input']['#collapsed']= FALSE;
+    $form['input']['#collapsed']= false;
   }
   $output = '<p><em>'. t('This setting will be applied to all posts and private
     messages.') .'</em></p>';
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
   $form['bbcode'] = array(
     '#type' => 'fieldset',
     '#title' => t('BBcode settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
   
   $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
   if (variable_get('boincimport_bbcode', 0)) {
     if ($bbcode_disabled) {
       $ready_for_migration = 0;
-      $form['bbcode']['#collapsed'] = FALSE;
+      $form['bbcode']['#collapsed'] = false;
       $output .= '<p><span class="marker">';
       $output .= t('The !bbcode_module is required to transform BBcode into HTML.
         You first need to !enable_bbcode', array(
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
     $sql = "SELECT COUNT(*) FROM {filters} WHERE module = 'bbcode' AND format = %d";
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
-      $form['bbcode']['#collapsed'] = FALSE;
+      $form['bbcode']['#collapsed'] = false;
       $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
         then !configure_bbcode_options', array(
           '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
     array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
   } else {
     if ($bbcode_disabled) {
-      $form['bbcode']['#collapsed'] = FALSE;
+      $form['bbcode']['#collapsed'] = false;
       $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
         You may !enable_bbcode after having installed it.', array(
           '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
@@ -283,11 +283,11 @@  discard block
 block discarded – undo
   $form['url_transforms'] = array(
     '#type' => 'fieldset',
     '#title' => t('URL transforms'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
   if (!variable_get('boincimport_base_url_boinc', 0)) {
-    $form['url_transforms']['#collapsed']= FALSE;
+    $form['url_transforms']['#collapsed']= false;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
   $form['migration'] = array(
     '#type' => 'fieldset',
     '#title' => 'Migration',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
   );
   variable_set('boincimport_ready', $ready_for_migration);
   if ($ready_for_migration) {

Please login to merge, or discard this patch.

all/features/private_messages/private_messages.features.user_permission.inc 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -4,48 +4,48 @@
 block discarded – undo
  * Implementation of hook_user_default_permissions().
  */
 function private_messages_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: administer privatemsg settings
-  $permissions['administer privatemsg settings'] = array(
+    // Exported permission: administer privatemsg settings
+    $permissions['administer privatemsg settings'] = array(
     'name' => 'administer privatemsg settings',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete privatemsg
-  $permissions['delete privatemsg'] = array(
+    // Exported permission: delete privatemsg
+    $permissions['delete privatemsg'] = array(
     'name' => 'delete privatemsg',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: read all private messages
-  $permissions['read all private messages'] = array(
+    // Exported permission: read all private messages
+    $permissions['read all private messages'] = array(
     'name' => 'read all private messages',
     'roles' => array(),
-  );
+    );
 
-  // Exported permission: read privatemsg
-  $permissions['read privatemsg'] = array(
+    // Exported permission: read privatemsg
+    $permissions['read privatemsg'] = array(
     'name' => 'read privatemsg',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: write privatemsg
-  $permissions['write privatemsg'] = array(
+    // Exported permission: write privatemsg
+    $permissions['write privatemsg'] = array(
     'name' => 'write privatemsg',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
+        '0' => 'administrator',
+        '1' => 'community member',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

Please login to merge, or discard this patch.

drupal/sites/default/boinc/modules/boincwork/includes/boincwork.helpers.inc 5 patches

Upper-Lower-Casing +122 added lines, -122 removed lines patch added patch discarded remove patch

@@ -173,7 +173,7 @@  discard block
 block discarded – undo
         $preset_prefs['preset'] = array($preset_prefs['preset']);
       }
       foreach ($preset_prefs['preset'] as $key => $prefs) {
-        if (isset($prefs['@attributes']['name']) AND $prefs['@attributes']['name'] == $preset) {
+        if (isset($prefs['@attributes']['name']) and $prefs['@attributes']['name'] == $preset) {
           return $preset_prefs['preset'][$key];
         }
       }
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
     $lines = explode("\r", $raw_config_data);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
       ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
-    return NULL;
+    return null;
   }
   
   // Convert XML to array for validation
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
     $xml = $xml['project_specific_preferences'];
   }
   foreach ($xml as $type => $elements) {
-    if (is_array($elements) AND !is_numeric(key($elements))) {
+    if (is_array($elements) and !is_numeric(key($elements))) {
       $elements = array($elements);
     }
     switch ($type) {
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
   }
   foreach ($xml as $type => $elements) {
     $structure_data = array();
-    if (is_array($elements) AND !is_numeric(key($elements))) {
+    if (is_array($elements) and !is_numeric(key($elements))) {
       $elements = array($elements);
     }
     switch ($type) {
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
     case 'boolean':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
-        if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
+        if (isset($element['@attributes']['entitytype']) and $element['@attributes']['entitytype'] == 'attribute') {
           $defaults['@attributes'][$name] = $values[$name];
         }
         else {
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
         $user_pref = $user_prefs['@attributes'];
       }
       if (isset($user_pref[$name])) {
-        if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
+        if (is_array($user_pref[$name]) and isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
         }
         else {
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description . bts(' Default value: @default', array('@default' => $default), null, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
     foreach ($elements as $element) {
       $name = $element['@attributes']['name'];
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
+      $default = (isset($element['@attributes']['selected']) and $element['@attributes']['selected'] == 'true') ? 1 : 0;
       $description = '';
       if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
         $user_pref = $user_prefs['@attributes'];
       }
       if (isset($user_pref[$name])) {
-        if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
+        if (is_array($user_pref[$name]) and isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
         }
         else {
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
       $form[$name] = array(
         '#title' => $title,
         '#type' => 'radios',
-        '#options' => 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')),
+        '#options' => 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')),
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description
@@ -487,8 +487,8 @@  discard block
 block discarded – undo
       foreach($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
-          if ($default === NULL AND
-              isset($item['@attributes']) AND
+          if ($default === null and
+              isset($item['@attributes']) and
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
           }
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), null, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -541,11 +541,11 @@  discard block
 block discarded – undo
       }
     
     $form['applications'] = array(
-      '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
+      '#title' => bts('Applications', array(), null, 'boinc:account-preferences'),
       '#type' => 'fieldset',
       '#description' => $title,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+      '#collapsible' => true,
+      '#collapsed' => false
     );
     $applications = array();
     if (!is_array($user_prefs['app_id'])) {
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
     }
     foreach ($user_prefs['app_id'] as $app) {
       if (!$app) continue;
-      if (is_array($app) AND isset($app['@value'])) {
+      if (is_array($app) and isset($app['@value'])) {
         $app = $app['@value'];
       }
       $applications[] = $app;
@@ -561,18 +561,18 @@  discard block
 block discarded – undo
     foreach ($elements['app'] as $app) {
       $app_id = $app['@attributes']['id'];
       $app_name = $app['@value'];
-      $app_enabled = TRUE;
-      if (isset($app['@attributes']['enabled']) AND
+      $app_enabled = true;
+      if (isset($app['@attributes']['enabled']) and
           $app['@attributes']['enabled'] == 'false') {
-        $app_enabled = FALSE;
+        $app_enabled = false;
       }
       if ($applications) {
         $checked = in_array($app_id, $applications);
       } else {
-        $checked = TRUE;
-        if (isset($app['@attributes']['selected']) AND
+        $checked = true;
+        if (isset($app['@attributes']['selected']) and
             $app['@attributes']['selected'] == 'false') {
-          $checked = FALSE;
+          $checked = false;
         }
       }
       $form['applications']["app_{$app_id}"] = array(
@@ -603,10 +603,10 @@  discard block
 block discarded – undo
       $form[$name] = array(
           '#title' => $title,
           '#type' => 'fieldset',
-          '#tree' => FALSE,
+          '#tree' => false,
           //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
+          '#collapsible' => true,
+          '#collapsed' => false
       );
       // Recursively populate the compound element
       foreach ($element as $child_type => $child) {
@@ -633,8 +633,8 @@  discard block
 block discarded – undo
           '#title' => $title,
           '#type' => 'fieldset',
           //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
+          '#collapsible' => true,
+          '#collapsed' => false
       );
       // Recursively populate the compound element
       foreach ($element['attributes'] as $child_type => $child) {
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
  * Generate a tabular structure out of preferences for use in comparison
  * views of preference sets
  */
-function boincwork_make_prefs_table($prefs, $top_level = TRUE) {
+function boincwork_make_prefs_table($prefs, $top_level = true) {
 
   $prefs_table = array();
   $uncategorized = array();
@@ -662,15 +662,15 @@  discard block
 block discarded – undo
   foreach ($prefs as $key => $element) {
     
     // Determine which type of element this is and act accordingly
-    $element_type = NULL;
-    if (is_array($element) AND isset($element['#type'])) {
+    $element_type = null;
+    if (is_array($element) and isset($element['#type'])) {
       $element_type = $element['#type'];
     }
     switch ($element_type) {
     case 'fieldset':
       $prefs_table[$key] = array(
         'name' => $element['#title'],
-        'elements' => boincwork_make_prefs_table($element, FALSE),
+        'elements' => boincwork_make_prefs_table($element, false),
       );
       break;
     case 'textfield':
@@ -681,10 +681,10 @@  discard block
 block discarded – undo
       if (in_array($key, array('start_hour', 'net_start_hour'))) {
         switch ($key) {
         case 'start_hour':
-          $element['#title'] = bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing');
+          $element['#title'] = bts('Compute only between:', array(), null, 'boinc:account-preferences-computing');
           break;
         case 'net_start_hour':
-          $element['#title'] = bts('Transfer files only between:', array(), NULL, 'boinc:account-preferences-comuting');
+          $element['#title'] = bts('Transfer files only between:', array(), null, 'boinc:account-preferences-comuting');
           break;
         default:
         }
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
       $prefs_element = array(
         'name' => (isset($element['#title'])) ? $element['#title'] : '',
         'description' => (isset($element['#description'])) ? $element['#description'] : '',
-        'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : NULL,
+        'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : null,
       );
       if ($top_level) {
         $uncategorized[$key] = $prefs_element;
@@ -705,17 +705,17 @@  discard block
 block discarded – undo
     }
   }
   
-  if ($prefs_table AND $uncategorized) {
+  if ($prefs_table and $uncategorized) {
     // Throw any settings that don't fit elsewhere into "other"
     $prefs_table['other'] = array(
-      'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
+      'name' => bts('Other settings', array(), null, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
   }
   elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
-      'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
+      'name' => bts('Settings', array(), null, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
   }
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
   }
   
   // Return general preferences or a subset based on venue
-  if (!$venue OR $venue == 'generic') {
+  if (!$venue or $venue == 'generic') {
     unset($main_prefs['venue']);
     // Use the length of the $main_prefs array as a condition as to
     // whether the preferences have already been set. This is
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
         $main_prefs['venue'] = array($main_prefs['venue']);
       }
       foreach ($main_prefs['venue'] as $key => $prefs_venue) {
-        if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
+        if (isset($prefs_venue['@attributes']['name']) and $prefs_venue['@attributes']['name'] == $venue) {
           return $main_prefs['venue'][$key];
         }
       }
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
   // Save all preferences or a subset based on venue
   //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
   $new_venue = true;
-  if (!$venue OR $venue == 'generic') {
+  if (!$venue or $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
   }
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
         $main_prefs['venue'] = array($main_prefs['venue']);
       }
       foreach ($main_prefs['venue'] as $key => $prefs_venue) {
-        if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
+        if (isset($prefs_venue['@attributes']['name']) and $prefs_venue['@attributes']['name'] == $venue) {
           if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
           }
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
  *Add another user to the current user's ignore list using a BOINC
  *username. Called from privacy preference form.
  */
-function boincwork_ignore_user_add_user_username($name = NULL) {
+function boincwork_ignore_user_add_user_username($name = null) {
   global $user;
 
   if (isset($name)) {
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
     $iuid = get_drupal_id($boincid);
 
     if ($user->uid == $iuid) {
-      drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
+      drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), null, 'boinc:ignore-user-error-message'), 'error');
       drupal_goto('account/prefs/privacy');
     }
 
@@ -933,11 +933,11 @@  discard block
 block discarded – undo
 /**
  * Add another user's UID to the current user's ignore list.
  */
-function boincwork_ignore_user_add_user($iuid = NULL) {
+function boincwork_ignore_user_add_user($iuid = null) {
   global $user;
 
   if ($user->uid == $iuid) {
-    drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
+    drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), null, 'boinc:ignore-user-error-message'), 'error');
     drupal_goto();
   }
 
@@ -958,9 +958,9 @@  discard block
 block discarded – undo
       bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
         array(
           '@username' => $otheraccount->boincuser_name,
-          '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
+          '!privacy_preferences' => l(bts('privacy preferences', array(), null, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
         ),
-        NULL, 'boinc:ignore-user-add'),
+        null, 'boinc:ignore-user-add'),
       'status');
     drupal_goto();
   }
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
 /**
  * Remove user from user's ignore list.
  */
-function boincwork_ignore_user_remove_user($iuid = NULL) {
+function boincwork_ignore_user_remove_user($iuid = null) {
   global $user;
   $otheraccount = user_load($iuid);
 
@@ -984,9 +984,9 @@  discard block
 block discarded – undo
     bts('@username has been removed from your ignore list. See your !privacy_preferences for more details.',
       array(
         '@username' => $otheraccount->boincuser_name,
-        '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
+        '!privacy_preferences' => l(bts('privacy preferences', array(), null, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
       ),
-      NULL, 'boinc:ignore-user-add'),
+      null, 'boinc:ignore-user-add'),
     'status');
   drupal_goto('account/prefs/privacy');
 }
@@ -1038,14 +1038,14 @@  discard block
 block discarded – undo
       else {
         $form_field = $field;
       }
-      if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
-        form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
+      if (isset($rules['datatype']) and !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
+        form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), null, 'boinc:account-preferences'));
       }
-      if (isset($rules['min']) AND $values[$field] < $rules['min']) {
-        form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
+      if (isset($rules['min']) and $values[$field] < $rules['min']) {
+        form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), null, 'boinc:account-preferences'));
       }
-      if (isset($rules['max']) AND $values[$field] > $rules['max']) {
-        form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
+      if (isset($rules['max']) and $values[$field] > $rules['max']) {
+        form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), null, 'boinc:account-preferences'));
       }
     }
   }
@@ -1054,25 +1054,25 @@  discard block
 block discarded – undo
 /**
  * Check that numeric data conforms to specifications
  */
-function boincwork_validate_datatype($data, $datatype = NULL) {
+function boincwork_validate_datatype($data, $datatype = null) {
   switch ($datatype) {
   case 'float':
     if (!is_numeric($data)) {
-      return FALSE;
+      return false;
     }
     $data += 0.0;
     if (!is_float($data)) {
-      return FALSE;
+      return false;
     }
     break;
     
   case 'integer':
     if (!is_numeric($data)) {
-      return FALSE;
+      return false;
     }
     $data += 0;
     if (!is_int($data)) {
-      return FALSE;
+      return false;
     }
     break;
   
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
   default:
     
   }
-  return TRUE;
+  return true;
 }
 
 /**
@@ -1158,7 +1158,7 @@  discard block
 block discarded – undo
       if (is_array($value)) {
         if (is_numeric(key($value))) {
           foreach ($value as $item) {
-            if (is_array($item) AND isset($item['@position'])) {
+            if (is_array($item) and isset($item['@position'])) {
               $ordered_array[$item['@position']] = array(
                 $name => $item
               );
@@ -1311,10 +1311,10 @@  discard block
 block discarded – undo
               $sibling = $node->nextSibling;
               
               // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+              while (($sibling) and (($sibling->nodeType != XML_ELEMENT_NODE) or ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
               if (!$sibling) {
                   $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                  while (($sibling) and (($sibling->nodeType != XML_ELEMENT_NODE) or ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
               }
               
               if ($sibling) {
@@ -1324,7 +1324,7 @@  discard block
 block discarded – undo
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
-                      if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
+                      if ($result[$node_name][$index] !== '' and !is_array($result[$node_name][$index])) {
                           $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
                       }
                       foreach ($attributes as $key => $attribute) {
@@ -1347,7 +1347,7 @@  discard block
 block discarded – undo
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
-                      if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
+                      if ($result[$node_name] !== '' and !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
                       foreach($attributes as $key => $attribute) {
@@ -1378,7 +1378,7 @@  discard block
 block discarded – undo
 /**
   * Determine output for host list views when no hosts are found.
   */
-function boincwork_views_host_list_empty_text($context = NULL) {
+function boincwork_views_host_list_empty_text($context = null) {
   
   // Pull the BOINC user ID from the view arguments to get show_hosts 
   // preference for that user
@@ -1392,28 +1392,28 @@  discard block
 block discarded – undo
   if ($boincuser->show_hosts) {
     switch($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
+      $output .=  '<h2>' . bts('No active computers', array(), null, 'boinc:host-list') . '</h2>';
       $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' active in the last 30 days.', array(), null, 'boinc:host-list') . '</p>';
       break;
       
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
+      $output .=  '<h2>' . bts('No computers', array(), null, 'boinc:host-list') . '</h2>';
       $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' preference set.', array(), null, 'boinc:host-list') . '</p>';
       break;
     
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
+      $output .=  '<h2>' . bts('Computers pending', array(), null, 'boinc:host-list') . '</h2>';
       $output .=  '<p>' . bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), null, 'boinc:host-list') . '</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
+    $output .=  '<h2>' . bts('Computers hidden', array(), null, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
+    . ' about their computers.', array(), null, 'boinc:host-list') . '</p>';
   }
   return $output;
 }
@@ -1421,15 +1421,15 @@  discard block
 block discarded – undo
 /**
   * Determine output for task list views when no tasks are found.
   */
-function boincwork_views_task_list_empty_text($context = NULL) {
+function boincwork_views_task_list_empty_text($context = null) {
   
   // 
   $output = '';
   switch($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), null, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), null, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1443,18 +1443,18 @@  discard block
 block discarded – undo
   if (boincwork_host_user_is_owner($host_id)) {
     // Show merge hosts option
     $output = '<ul class="tab-list"><li class="first tab">';
-    $output .= l(bts('Merge', array(), NULL, 'boinc:form-merge'), "host/{$host_id}/merge");
+    $output .= l(bts('Merge', array(), null, 'boinc:form-merge'), "host/{$host_id}/merge");
     $output .= '</li>';
     // If host has no tasks, allow the host to be deleted
     if (!boincwork_host_get_task_count($host_id)) {
       $output .= '<li class="tab">';
-      $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
+      $output .= l(bts('Delete', array(), null, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
+              null, 'boinc:account-host-delete') . '\')'
           )
         )
       );
@@ -1494,7 +1494,7 @@  discard block
 block discarded – undo
 /**
  * Check whether a user is the owner of a host
  */
-function boincwork_host_user_is_owner($host_id, $uid = NULL) {
+function boincwork_host_user_is_owner($host_id, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
@@ -1513,18 +1513,18 @@  discard block
 block discarded – undo
 /**
   * Determine output for host last contact time
   */
-function boincwork_host_last_contact($timestamp, $host_id = NULL, $context = NULL) {
+function boincwork_host_last_contact($timestamp, $host_id = null, $context = null) {
   $output = '---';
   $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
   $log = '';
   if ($timestamp) {
     $output = date('j M Y G:i:s T', $timestamp);
   }
-  if ($root_log_dir AND $host_id) {
-    $subdir = substr($host_id, 0, -3) OR $subdir = 0;
+  if ($root_log_dir and $host_id) {
+    $subdir = substr($host_id, 0, -3) or $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
   }
-  if ($log AND file_exists($log)) {
+  if ($log and file_exists($log)) {
     $output = l($output, "host/{$host_id}/log");
   }
   return $output;
@@ -1538,10 +1538,10 @@  discard block
 block discarded – undo
   if (function_exists('jump_quickly')) {
     $path = "host/{$host_id}/set-venue";
     $venues = array(
-      "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-      "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
+      "{$path}/generic" => bts('Generic', array(), null, 'boinc:account-preferences-location'),
+      "{$path}/home" => bts('Home', array(), null, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+      "{$path}/work" => bts('Work', array(), null, 'boinc:account-preferences-location'),
+      "{$path}/school" => bts('School', array(), null, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -1561,9 +1561,9 @@  discard block
 block discarded – undo
 /**
   * Determine output for task reported time / deadline
   */
-function boincwork_task_time_reported($received_time = NULL, $deadline = NULL, $context = NULL) {
+function boincwork_task_time_reported($received_time = null, $deadline = null, $context = null) {
   $output = '---';
-  if ($received_time OR $deadline) {
+  if ($received_time or $deadline) {
     $timestamp = ($received_time) ? $received_time : $deadline;
     $output = date('j M Y G:i:s T', $timestamp);
     // Add a wrapper to deadline text
@@ -1606,9 +1606,9 @@  discard block
 block discarded – undo
  * @param int $tablerows
  *   Number of table row to display per page. Defaults to 20.
  */
-function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
+function boincwork_tasktable($category = 0, $queryid = 1, $tselect = null, $app_id = 0, $tablerows = 20) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if ( ($category!=0) and ($category!=1) and ($category!=2) ) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
@@ -1681,7 +1681,7 @@  discard block
 block discarded – undo
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if ( ($result->appid==$app_id) or ($app_id==0) or ($app_id==-1) ) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1704,7 +1704,7 @@  discard block
 block discarded – undo
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ( ($mystate == $tselect) or ($tselect==STATE_ALL) ) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1716,8 +1716,8 @@  discard block
 block discarded – undo
   
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
-  $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[-1] = bts('Application', array(), null, 'boinc:task-table');
+  $applications[0] = bts('All applications', array(), null, 'boinc:task-table') . ' (' . $allcount . ')';
   // Create application filter from application_map and application_select_count.
   foreach($application_map as $akey => $aname) {
     $acount = 0;
@@ -1729,37 +1729,37 @@  discard block
 block discarded – undo
   // Header array for (sub) results table.
   $resultheader = array(
     array(
-      'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Task ID', array(), null, 'boinc:task-table'),
       'field' => 'id',
     ),
     array(
-      'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Workunit ID', array(), null, 'boinc:task-table'),
       'field' => 'workunitid',
     ),
     array(
-      'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Computer', array(), null, 'boinc:task-table'),
       'field' => 'hostid',
     ),
     array(
-      'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Sent', array(), null, 'boinc:task-table'),
       'field' => 'sent_time',
     ),
     array(
-      'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
+      'data' => bts('Time Reported or Deadline', array(), null, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Status', array(), NULL, 'boinc:task-table')
+      'data' => bts('Status', array(), null, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Run time', array(), null, 'boinc:task-table'),
       'field' => 'elapsed_time',
     ),
     array(
-      'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
+      'data' => bts('CPU time', array(), null, 'boinc:task-table'),
       'field' => 'cpu_time',
     ),
     array(
-      'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Granted Credit', array(), null, 'boinc:task-table'),
       'field' => 'granted_credit',
     ),
     // Application is a column, but won't be added until after tablesort_sql().
@@ -1833,14 +1833,14 @@  discard block
 block discarded – undo
   default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) and $app_id>0 ) {
     $sqlwhere[] = "r.appid = '%s'";
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
+    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, null, $queryid, $app_id);
   }
   else {
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
+    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, null, $queryid);
   }
   db_set_active('default');
 
@@ -1850,7 +1850,7 @@  discard block
 block discarded – undo
       // state_num() function changes $result object, clone $result
       // object for use in state_num()
       // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ( (state_num(clone $result) == $tselect) or ($tselect==STATE_ALL) ) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1889,18 +1889,18 @@  discard block
 block discarded – undo
     $pathprefix = 'host/' . $queryid . '/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
-  $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
+  $application_map[0] = bts('All', array(), null, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab task-app-name">' . bts('All', array(), null, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), null, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => true) ),
     );
     if ($state==$tselect) {
       $myitem['class'] = 'active';
@@ -1909,10 +1909,10 @@  discard block
 block discarded – undo
   }
   // Add reset button
   $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $ltext = '<span class="tab">' . bts('Reset', array(), null, 'boinc:task-table') . '</span>';
+  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => true) ) );
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, null, 'ul' . ' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
@@ -1923,10 +1923,10 @@  discard block
 block discarded – undo
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if ( is_array($resultheader) and is_array($resultdata) ) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if ( ($category==1) or ($category==2) ) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }

Please login to merge, or discard this patch.

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch

@@ -167,7 +167,7 @@  discard block
 block discarded – undo
   
   if ($preset) {
     // Load preset from configuration
-    $preset_prefs = (array) $preset_prefs['general_preferences'];
+    $preset_prefs = (array)$preset_prefs['general_preferences'];
     if (isset($preset_prefs['preset'])) {
       if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
 function boincwork_get_project_specific_config() {
   $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   
   $xml = new DomDocument();
@@ -196,8 +196,8 @@  discard block
 block discarded – undo
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $raw_config_data);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
   }
   
@@ -392,13 +392,13 @@  discard block
 block discarded – undo
       
       // Use appropriate datatype
       if (isset($element['@attributes']['datatype'])) {
-        switch($element['@attributes']['datatype']) {
+        switch ($element['@attributes']['datatype']) {
         case 'integer':
-          $value = (int) $value;
+          $value = (int)$value;
           break;
           
         case 'float':
-          $value = number_format((float) $value, 2);
+          $value = number_format((float)$value, 2);
           break;
         
         default:
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
       $name = $element['@attributes']['name'];
       $default = null;
       $options = array();
-      foreach($element['items']['item'] as $item) {
+      foreach ($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
           if ($default === NULL AND
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
     }
     foreach ($elements as $key => $element) {
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
+      $name = str_replace(' ', '_', strtolower($title));
       $name = "group_{$name}";
       
       // Translate elements as appropriate
@@ -743,13 +743,13 @@  discard block
 block discarded – undo
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -801,13 +801,13 @@  discard block
 block discarded – undo
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -1001,11 +1001,11 @@  discard block
 block discarded – undo
   $magnitude = 0;
   $precision = 0;
   if ($digits > $max_digits) {
-    $magnitude = floor(($digits - ($max_digits - 3)) / 3);
-    $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
-    $number = round($number / pow(1000, $magnitude), $precision);
+    $magnitude = floor(($digits - ($max_digits - 3))/3);
+    $precision = $max_digits - ($digits - ($magnitude*3) + 1);
+    $number = round($number/pow(1000, $magnitude), $precision);
   }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+  $number = number_format($number, $precision).(($magnitude) ? "{$suffix[$magnitude]}" : '');
   
   return $number;
 }
@@ -1183,7 +1183,7 @@  discard block
 block discarded – undo
   
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if (!($xml->loadXML($text))) return false;
     return $xml;
   }
   
@@ -1200,7 +1200,7 @@  discard block
 block discarded – undo
       while (!is_null($node)) {
           switch ($node->nodeType) {
           case XML_TEXT_NODE:
-              if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
+              if (trim($node->nodeValue) != '') $result = $node->nodeValue;
               break;
           case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
@@ -1217,7 +1217,7 @@  discard block
 block discarded – undo
               if ($sibling) {
                   $result[$node_name][$index] = '';
                   if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
+                      $result[$node_name][$index] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
@@ -1240,14 +1240,14 @@  discard block
 block discarded – undo
               } else {
                   $result[$node_name] = '';
                   if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
+                      $result[$node_name] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
                       if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
-                      foreach($attributes as $key => $attribute) {
+                      foreach ($attributes as $key => $attribute) {
                           $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
                       }
                   }
@@ -1287,30 +1287,30 @@  discard block
 block discarded – undo
   // Determine if hosts are associated at all or just hidden
   $output = '';
   if ($boincuser->show_hosts) {
-    switch($context) {
+    switch ($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No active computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user has no computers that have been'
+      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list').'</p>';
       break;
       
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('There are no computers assigned to this'
+      . ' preference set.', array(), NULL, 'boinc:host-list').'</p>';
       break;
     
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
+      $output .= '<h2>'.bts('Computers pending', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), NULL, 'boinc:host-list').'</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
-    $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
+    $output .= '<h2>'.bts('Computers hidden', array(), NULL, 'boinc:host-list').'</h2>';
+    $output .= '<p>'.bts('This user has chosen not to show information'
+    . ' about their computers.', array(), NULL, 'boinc:host-list').'</p>';
   }
   return $output;
 }
@@ -1322,11 +1322,11 @@  discard block
 block discarded – undo
   
   // 
   $output = '';
-  switch($context) {
+  switch ($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .= '<h2>'.bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .= '<p>'.bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1348,10 +1348,10 @@  discard block
 block discarded – undo
       $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will delete host @id'
+            'onclick' => 'return confirm(\''.bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
+              NULL, 'boinc:account-host-delete').'\')'
           )
         )
       );
@@ -1441,8 +1441,8 @@  discard block
 block discarded – undo
       "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-    drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+    drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
     // Get current venue
     db_set_active('boinc_ro');
     $venue = db_result(db_query(
@@ -1466,10 +1466,10 @@  discard block
 block discarded – undo
     // Add a wrapper to deadline text
     if (!$received_time) {
       if (time() < $deadline) {
-        $output = '<span class="on-time">' . $output . '</span>';
+        $output = '<span class="on-time">'.$output.'</span>';
       }
       else {
-        $output = '<span class="past-due">' . $output . '</span>';
+        $output = '<span class="past-due">'.$output.'</span>';
       }
     }
   }
@@ -1505,15 +1505,15 @@  discard block
 block discarded – undo
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if (($category != 0) AND ($category != 1) AND ($category != 2)) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
 
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   global $language;
-  $locality=$language->language;
+  $locality = $language->language;
   $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
   $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
   $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
@@ -1561,13 +1561,13 @@  discard block
 block discarded – undo
       ."ON r.appid=a.id ";
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlall .= " WHERE r.userid='%s' ";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlall .= " WHERE r.hostid='%s' ";
   }
   $sqlall .= " ORDER BY user_friendly_name";
@@ -1578,7 +1578,7 @@  discard block
 block discarded – undo
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if (($result->appid == $app_id) OR ($app_id == 0) OR ($app_id == -1)) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1601,7 +1601,7 @@  discard block
 block discarded – undo
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if (($mystate == $tselect) OR ($tselect == STATE_ALL)) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1614,14 +1614,14 @@  discard block
 block discarded – undo
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
   $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table').' ('.$allcount.')';
   // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+  foreach ($application_map as $akey => $aname) {
     $acount = 0;
-    if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
+    if ($application_select_count and array_key_exists($akey, $application_select_count)) {
       $acount = $application_select_count[$akey];
     }
-    $applications[$akey] = $aname . ' ('. $acount . ')';
+    $applications[$akey] = $aname.' ('.$acount.')';
   }
   // Header array for (sub) results table.
   $resultheader = array(
@@ -1700,13 +1700,13 @@  discard block
 block discarded – undo
   $sqlwhere = array();
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlwhere[] = "r.userid = '%s'";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlwhere[] = "r.workunitid = '%s'";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlwhere[] = "r.hostid = '%s'";
   }
 
@@ -1730,14 +1730,14 @@  discard block
 block discarded – undo
   default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) AND $app_id > 0) {
     $sqlwhere[] = "r.appid = '%s'";
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
   }
   else {
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
   }
   db_set_active('default');
 
@@ -1747,7 +1747,7 @@  discard block
 block discarded – undo
       // state_num() function changes $result object, clone $result
       // object for use in state_num()
       // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ((state_num(clone $result) == $tselect) OR ($tselect == STATE_ALL)) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1763,7 +1763,7 @@  discard block
 block discarded – undo
           $nf->format($result->cpu_time),
           $nf->format($result->granted_credit),
           array(
-            'data' => $result->user_friendly_name . " " . pretty_application_version($result->app_version_id,$result->version_number, $result->plan_class, $result->platform),
+            'data' => $result->user_friendly_name." ".pretty_application_version($result->app_version_id, $result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
           ),
         );
@@ -1776,54 +1776,54 @@  discard block
 block discarded – undo
   // Begin result navigation
 
   // Set pathprefix based on type
-  if ($category==0) {
+  if ($category == 0) {
     $pathprefix = 'account/tasks';
   }
-  elseif ($category==1) {
-    $pathprefix = 'workunit/' . $queryid . '/tasks';
+  elseif ($category == 1) {
+    $pathprefix = 'workunit/'.$queryid.'/tasks';
   }
-  elseif ($category==2) {
-    $pathprefix = 'host/' . $queryid . '/tasks';
+  elseif ($category == 2) {
+    $pathprefix = 'host/'.$queryid.'/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
   $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
-    $mypath = $pathprefix . '/' . $state . '/' . $app_id;
-    if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+    $mypath = $pathprefix.'/'.$state.'/'.$app_id;
+    if ($state == STATE_ALL) {
+      $ltext = '<span class="tab task-app-name">'.bts('All', array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">'.bts($state_hnames[$state], array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => TRUE)),
     );
-    if ($state==$tselect) {
+    if ($state == $tselect) {
       $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
   }
   // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $mypath = $pathprefix.'/0/0';
+  $ltext = '<span class="tab">'.bts('Reset', array(), NULL, 'boinc:task-table').'</span>';
+  $stitems[] = array('data' => l($ltext, $mypath, array('html' => TRUE)));
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, NULL, 'ul'.' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
   // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
-    $app_id=-1;
+  if ($app_id == 0) {
+    $app_id = -1;
   }
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if (is_array($resultheader) AND is_array($resultdata)) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if (($category == 1) OR ($category == 2)) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }
@@ -1840,7 +1840,7 @@  discard block
 block discarded – undo
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
+  return array_walk($array, function(&$v) use ($offset) {
      array_splice($v, $offset, 1);
   });
 }

Please login to merge, or discard this patch.

Braces +41 added lines, -72 removed lines patch added patch discarded remove patch

@@ -332,8 +332,7 @@  discard block
 block discarded – undo
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
           $defaults['@attributes'][$name] = $values[$name];
-        }
-        else {
+        } else {
           $defaults[$name] = $values[$name];
         }
       }
@@ -384,8 +383,7 @@  discard block
 block discarded – undo
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -447,8 +445,7 @@  discard block
 block discarded – undo
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -492,8 +489,7 @@  discard block
 block discarded – undo
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
           }
-        }
-        else {
+        } else {
           $value = $item;
         }
         $options[$value] = $value;
@@ -696,8 +692,7 @@  discard block
 block discarded – undo
       );
       if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+      } else {
         $prefs_table[$key] = $prefs_element;
       }
       break;
@@ -711,8 +706,7 @@  discard block
 block discarded – undo
       'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+  } elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
       'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
@@ -745,8 +739,7 @@  discard block
 block discarded – undo
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -762,8 +755,7 @@  discard block
 block discarded – undo
     if (count($main_prefs) < 3)
         $main_prefs['@attributes'] = array('cleared' => 1);
     return $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -803,8 +795,7 @@  discard block
 block discarded – undo
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -817,8 +808,7 @@  discard block
 block discarded – undo
   if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -827,8 +817,7 @@  discard block
 block discarded – undo
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
           if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+          } else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
@@ -875,8 +864,7 @@  discard block
 block discarded – undo
     db_set_active('boinc_rw');
     $result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  else {
+  } else {
     $main_prefs = array('global_preferences' => $main_prefs);
     $boincuser->global_prefs = save_configuration($main_prefs);
     db_set_active('boinc_rw');
@@ -963,8 +951,7 @@  discard block
 block discarded – undo
         NULL, 'boinc:ignore-user-add'),
       'status');
     drupal_goto();
-  }
-  else {
+  } else {
     drupal_not_found();
   }// endif iuid
 }
@@ -1027,15 +1014,13 @@  discard block
 block discarded – undo
       // Process nested form elements
       $parents[] = $field;
       boincwork_validate_form($rules, $values[$field], $parents);
-    }
-    else {
+    } else {
       if ($parents) {
         // form_set_error() identifies nested form elements with '][' as a
         // delimiter between each parent and child element
         $parents[] = $field;
         $form_field = implode('][', $parents);
-      }
-      else {
+      } else {
         $form_field = $field;
       }
       if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
@@ -1118,8 +1103,7 @@  discard block
 block discarded – undo
   //  load_configuration(): Convert structured text/xml to array
   //------------------------------------------------------------------------------------------------
   
-  function load_configuration($text)
-  {
+  function load_configuration($text) {
       if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
       if ($xml = text_to_xml($text)) return xml_to_array($xml);
       return false;
@@ -1129,8 +1113,7 @@  discard block
 block discarded – undo
   //  save_configuration(): Convert array to structured text/xml
   //------------------------------------------------------------------------------------------------
   
-  function save_configuration($array)
-  {
+  function save_configuration($array) {
       if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
       return false;
   }
@@ -1162,26 +1145,22 @@  discard block
 block discarded – undo
               $ordered_array[$item['@position']] = array(
                 $name => $item
               );
-            }
-            else {
+            } else {
               $unordered_array[] = array(
                 $name => $item
               );
             }
           }
-        }
-        elseif (isset($value['@position'])) {
+        } elseif (isset($value['@position'])) {
           $ordered_array[$value['@position']] = array(
             $name => $value
           );
-        }
-        else {
+        } else {
           $unordered_array[] = array(
             $name => $value
           );
         }
-      }
-      else {
+      } else {
         $unordered_array[] = array(
           $name => $value
         );
@@ -1267,8 +1246,7 @@  discard block
 block discarded – undo
   //  xml_to_text(): Convert an XML DOM object to string format
   //------------------------------------------------------------------------------------------------
   
-  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
-  {
+  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false) {
       $xml->formatOutput = true;
       $text = $xml->saveXML();
       if (!$include_xml_declaration) {
@@ -1311,10 +1289,14 @@  discard block
 block discarded – undo
               $sibling = $node->nextSibling;
               
               // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
+                  $sibling = $sibling->nextSibling;
+              }
               if (!$sibling) {
                   $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
+                      $sibling = $sibling->previousSibling;
+                  }
               }
               
               if ($sibling) {
@@ -1409,8 +1391,7 @@  discard block
 block discarded – undo
       . ' computers. Computers will be displayed when they have earned their'
       . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
     }
-  }
-  else {
+  } else {
     $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
@@ -1570,8 +1551,7 @@  discard block
 block discarded – undo
     if (!$received_time) {
       if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+      } else {
         $output = '<span class="past-due">' . $output . '</span>';
       }
     }
@@ -1666,11 +1646,9 @@  discard block
 block discarded – undo
   // Use userid, hostid, or workunitid
   if ($category==0) {
     $sqlall .= " WHERE r.userid='%s' ";
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $sqlall .= " WHERE r.hostid='%s' ";
   }
   $sqlall .= " ORDER BY user_friendly_name";
@@ -1710,8 +1688,7 @@  discard block
 block discarded – undo
       }// if mystate
 
     }// while
-  }
-  else {
+  } else {
   }
   
   // Entry for all applications.
@@ -1805,11 +1782,9 @@  discard block
 block discarded – undo
   // Use userid, hostid, or workunitid
   if ($category==0) {
     $sqlwhere[] = "r.userid = '%s'";
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $sqlwhere[] = "r.workunitid = '%s'";
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $sqlwhere[] = "r.hostid = '%s'";
   }
 
@@ -1837,8 +1812,7 @@  discard block
 block discarded – undo
     $sqlwhere[] = "r.appid = '%s'";
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
-  }
-  else {
+  } else {
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
   }
@@ -1873,19 +1847,16 @@  discard block
 block discarded – undo
         $resultdata[] = array_values($prettyresult);
       }
     }// while
-  }
-  else {
+  } else {
   }
   // Begin result navigation
 
   // Set pathprefix based on type
   if ($category==0) {
     $pathprefix = 'account/tasks';
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $pathprefix = 'workunit/' . $queryid . '/tasks';
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $pathprefix = 'host/' . $queryid . '/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
@@ -1895,8 +1866,7 @@  discard block
 block discarded – undo
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
       $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
-    }
-    else {
+    } else {
       $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
@@ -1984,8 +1954,7 @@  discard block
 block discarded – undo
       // that is not handled by the above case statements.
       if ($appverid < 0) {
         return "Unknown Anonymous platform";
-      }
-      else {
+      } else {
         $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
         $prettyc = ($plan_class) ? "($av->plan_class)" : '';
         return "v$prettyv $prettyc $plfm";

Please login to merge, or discard this patch.

Indentation +863 added lines, -863 removed lines patch added patch discarded remove patch

@@ -11,19 +11,19 @@  discard block
 block discarded – undo
  * that was selected
  */
 function boincwork_ahah_helper_venue_submit($form, &$form_state) {
-  $form_state['storage']['prefs']['preset'] = null;
-  ahah_helper_generic_submit($form, $form_state);
+    $form_state['storage']['prefs']['preset'] = null;
+    ahah_helper_generic_submit($form, $form_state);
 }
 
 /**
  * Get a predetermined set of preferences
  */
 function boincwork_get_preset_prefs($preset = null) {
-  $saved_state = variable_get('boincwork_preset_prefs', null);
+    $saved_state = variable_get('boincwork_preset_prefs', null);
   
-  // If not configured yet, use these values as for inital
-  // computing/general preferences.
-  if (!$saved_state) {
+    // If not configured yet, use these values as for inital
+    // computing/general preferences.
+    if (!$saved_state) {
     // Get BOINC project disk space configurations from config.xml to
     // fill in initial preference values.
     require_boinc(array('db', 'prefs'));
@@ -160,88 +160,88 @@  discard block
 block discarded – undo
           <dont_verify_images>0</dont_verify_images>
         </preset>
       </general_preferences>';
-  }
+    }
   
-  // Convert XML data to array format
-  $preset_prefs = load_configuration($saved_state);
+    // Convert XML data to array format
+    $preset_prefs = load_configuration($saved_state);
   
-  if ($preset) {
+    if ($preset) {
     // Load preset from configuration
     $preset_prefs = (array) $preset_prefs['general_preferences'];
     if (isset($preset_prefs['preset'])) {
-      if (!is_numeric(key($preset_prefs['preset']))) {
+        if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
-      }
-      foreach ($preset_prefs['preset'] as $key => $prefs) {
+        }
+        foreach ($preset_prefs['preset'] as $key => $prefs) {
         if (isset($prefs['@attributes']['name']) AND $prefs['@attributes']['name'] == $preset) {
-          return $preset_prefs['preset'][$key];
+            return $preset_prefs['preset'][$key];
+        }
         }
-      }
     }
-  }
-  return $preset_prefs;
+    }
+    return $preset_prefs;
 }
 
 /**
  * Load (and validate) the project specific configuration XML
  */
 function boincwork_get_project_specific_config() {
-  $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
+    $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
+    $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+    libxml_use_internal_errors(true);
   
-  $xml = new DomDocument();
-  $xml->loadXML($raw_config_data, LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
+    $xml = new DomDocument();
+    $xml->loadXML($raw_config_data, LIBXML_NOBLANKS);
+    if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $raw_config_data);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
-  }
+    }
   
-  // Convert XML to array for validation
-  $xml = load_configuration($raw_config_data);
-  return $xml;
+    // Convert XML to array for validation
+    $xml = load_configuration($raw_config_data);
+    return $xml;
 }
 
 /**
  * Get rules by which to validate project specific data
  */
 function boincwork_get_project_specific_config_validation_rules($xml = array()) {
-  $rules = array();
-  if (!$xml) {
+    $rules = array();
+    if (!$xml) {
     // Read the config XML
     $xml = boincwork_get_project_specific_config();
     $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
+    }
+    foreach ($xml as $type => $elements) {
     if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     switch ($type) {
     case 'compound':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules[$name] = boincwork_get_project_specific_config_validation_rules($element['attributes']);
-      }
-      break;
+        }
+        break;
       
     case 'text':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules[$name] = array(
-          'datatype' => $element['@attributes']['datatype']
+            'datatype' => $element['@attributes']['datatype']
         );
         if (isset($element['@attributes']['min'])) {
-          $rules[$name]['min'] = $element['@attributes']['min'];
+            $rules[$name]['min'] = $element['@attributes']['min'];
         }
         if (isset($element['@attributes']['max'])) {
-          $rules[$name]['max'] = $element['@attributes']['max'];
+            $rules[$name]['max'] = $element['@attributes']['max'];
         }
-      }
-      break;
+        }
+        break;
     /*
     case 'radio':
     case 'dropdown':
@@ -265,24 +265,24 @@  discard block
 block discarded – undo
       $rules['apps'] = array(
         'minimum selected' => 1,
         'list' => array()
-      );
-      foreach ($elements as $element) {
+        );
+        foreach ($elements as $element) {
         foreach ($element['app'] as $app) {
-          $name = "app_{$app['@attributes']['id']}";
-          $rules['apps']['list'][] = $name;
-          //$rules[$name] = array(
-          //  'options' => $options
-          //);
+            $name = "app_{$app['@attributes']['id']}";
+            $rules['apps']['list'][] = $name;
+            //$rules[$name] = array(
+            //  'options' => $options
+            //);
         }
-      }
-      break;
+        }
+        break;
       
     case 'group':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules += boincwork_get_project_specific_config_validation_rules($element);
-      }
-      break;
+        }
+        break;
     /*
     case 'boolean':
       // Shouldn't need to validate boolean...
@@ -290,39 +290,39 @@  discard block
 block discarded – undo
       */
     default:
     }
-  }
-  return $rules;
+    }
+    return $rules;
 }
 
 /**
  * Define how project specific settings should be saved
  */
 function boincwork_format_project_specific_prefs_data($values, $xml = array()) {
-  $defaults = array();
-  if (!$xml) {
+    $defaults = array();
+    if (!$xml) {
     // Read the config XML
     $xml = boincwork_get_project_specific_config();
     $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
+    }
+    foreach ($xml as $type => $elements) {
     $structure_data = array();
     if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     switch ($type) {
     case 'compound':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $default[$name]['@attributes'] = boincwork_format_project_specific_prefs_data($values[$name], $element['attributes']);
-      }
-      $defaults += $default;
-      break;
+        }
+        $defaults += $default;
+        break;
       
     case 'group':
       foreach ($elements as $element) {
         $defaults += boincwork_format_project_specific_prefs_data($values, $element);
-      }
-      break;
+        }
+        break;
       
     case 'text':
     case 'radio':
@@ -331,315 +331,315 @@  discard block
 block discarded – undo
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
-          $defaults['@attributes'][$name] = $values[$name];
+            $defaults['@attributes'][$name] = $values[$name];
         }
         else {
-          $defaults[$name] = $values[$name];
+            $defaults[$name] = $values[$name];
         }
-      }
-      break;
+        }
+        break;
     
     case 'apps':
       foreach ($elements as $element) {
         $defaults['app_id'] = array();
         foreach ($element['app'] as $app) {
-          $app_id = $app['@attributes']['id'];
-          if ($values['applications']["app_{$app_id}"]) {
+            $app_id = $app['@attributes']['id'];
+            if ($values['applications']["app_{$app_id}"]) {
             $defaults['app_id'][] = $app_id;
-          }
+            }
         }
-      }
-      break;
+        }
+        break;
       
     default:
     }
-  }
-  return $defaults;
+    }
+    return $defaults;
 }
 
 /**
  * Add an element to the form based on its definition
  */
 function boincwork_generate_prefs_element(&$form, $type, $elements, $user_prefs = null) {
-  switch ($type) {
-  case 'text':
+    switch ($type) {
+    case 'text':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $default = $element['@attributes']['default'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $description = '';
-      if (isset($element['description'])) {
+        $name = $element['@attributes']['name'];
+        $default = $element['@attributes']['default'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
+        }
       
-      $value = $default;
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        $value = $default;
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      if (isset($user_pref[$name])) {
+        }
+        if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
-          $value = $user_pref[$name]['@value'];
+            $value = $user_pref[$name]['@value'];
         }
         else {
-          $value = $user_pref[$name];
+            $value = $user_pref[$name];
+        }
         }
-      }
       
-      // Use appropriate datatype
-      if (isset($element['@attributes']['datatype'])) {
+        // Use appropriate datatype
+        if (isset($element['@attributes']['datatype'])) {
         switch($element['@attributes']['datatype']) {
         case 'integer':
           $value = (int) $value;
-          break;
+            break;
           
         case 'float':
           $value = number_format((float) $value, 2);
-          break;
+            break;
         
         default:
         }
-      }
+        }
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($description));
         $description = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($description));
-      }
+        }
       
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
         '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     break;
     
-  case 'boolean':
+    case 'boolean':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
-      $description = '';
-      if (isset($element['description'])) {
+        $name = $element['@attributes']['name'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
+        }
       
-      $value = $default;
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        $value = $default;
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      if (isset($user_pref[$name])) {
+        }
+        if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
-          $value = $user_pref[$name]['@value'];
+            $value = $user_pref[$name]['@value'];
         }
         else {
-          $value = $user_pref[$name];
+            $value = $user_pref[$name];
+        }
         }
-      }
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($description));
         $description = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($description));
-      }
+        }
       
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => 'radios',
         '#options' => 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')),
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description
-      );
+        );
     }
     break;
     
-  case 'radio':
+    case 'radio':
   case 'dropdown':
     
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $default = null;
-      $options = array();
-      foreach($element['items']['item'] as $item) {
+        $name = $element['@attributes']['name'];
+        $default = null;
+        $options = array();
+        foreach($element['items']['item'] as $item) {
         if (is_array($item)) {
-          $value = $item['@value'];
-          if ($default === NULL AND
+            $value = $item['@value'];
+            if ($default === NULL AND
               isset($item['@attributes']) AND
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
-          }
+            }
         }
         else {
-          $value = $item;
+            $value = $item;
         }
         $options[$value] = $value;
-      }
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $description = '';
-      if (isset($element['description'])) {
+        }
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        }
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      $value = isset($user_pref[$name]) ? $user_pref[$name] : $default;
+        }
+        $value = isset($user_pref[$name]) ? $user_pref[$name] : $default;
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($description));
         $description = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($description));
-      }
+        }
       
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => ($type == 'radio') ? 'radios' : 'select',
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     break;
     
-  case 'apps':
+    case 'apps':
     $title = is_array($elements['title']) ? $elements['title']['@value'] : $elements['title'];
     
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
+        }
     
     $form['applications'] = array(
-      '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
-      '#type' => 'fieldset',
-      '#description' => $title,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
+        '#type' => 'fieldset',
+        '#description' => $title,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
     $applications = array();
     if (!is_array($user_prefs['app_id'])) {
-      $user_prefs['app_id'] = array($user_prefs['app_id']);
+        $user_prefs['app_id'] = array($user_prefs['app_id']);
     }
     foreach ($user_prefs['app_id'] as $app) {
-      if (!$app) continue;
-      if (is_array($app) AND isset($app['@value'])) {
+        if (!$app) continue;
+        if (is_array($app) AND isset($app['@value'])) {
         $app = $app['@value'];
-      }
-      $applications[] = $app;
+        }
+        $applications[] = $app;
     }
     foreach ($elements['app'] as $app) {
-      $app_id = $app['@attributes']['id'];
-      $app_name = $app['@value'];
-      $app_enabled = TRUE;
-      if (isset($app['@attributes']['enabled']) AND
+        $app_id = $app['@attributes']['id'];
+        $app_name = $app['@value'];
+        $app_enabled = TRUE;
+        if (isset($app['@attributes']['enabled']) AND
           $app['@attributes']['enabled'] == 'false') {
         $app_enabled = FALSE;
-      }
-      if ($applications) {
+        }
+        if ($applications) {
         $checked = in_array($app_id, $applications);
-      } else {
+        } else {
         $checked = TRUE;
         if (isset($app['@attributes']['selected']) AND
             $app['@attributes']['selected'] == 'false') {
-          $checked = FALSE;
+            $checked = FALSE;
         }
-      }
-      $form['applications']["app_{$app_id}"] = array(
+        }
+        $form['applications']["app_{$app_id}"] = array(
         '#title' => $app_name,
         '#type' => 'checkbox',
         '#default_value' => ($checked) ? 'x' : false,
         '#disabled' => !$app_enabled
-      );
+        );
     }
     
     break;
     
-  case 'group':
+    case 'group':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $key => $element) {
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
-      $name = "group_{$name}";
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $name = str_replace(' ','_',strtolower($title));
+        $name = "group_{$name}";
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
+        }
       
-      $form[$name] = array(
-          '#title' => $title,
-          '#type' => 'fieldset',
-          '#tree' => FALSE,
-          //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
-      );
-      // Recursively populate the compound element
-      foreach ($element as $child_type => $child) {
+        $form[$name] = array(
+            '#title' => $title,
+            '#type' => 'fieldset',
+            '#tree' => FALSE,
+            //'#description' => t('Notes about this group of fields'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE
+        );
+        // Recursively populate the compound element
+        foreach ($element as $child_type => $child) {
         boincwork_generate_prefs_element($form[$name], $child_type, $child, $user_prefs);
-      }
+        }
     }
     break;
     
-  case 'compound':
+    case 'compound':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $name = $element['@attributes']['name'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
+        }
       
-      $form[$name] = array(
-          '#title' => $title,
-          '#type' => 'fieldset',
-          //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
-      );
-      // Recursively populate the compound element
-      foreach ($element['attributes'] as $child_type => $child) {
+        $form[$name] = array(
+            '#title' => $title,
+            '#type' => 'fieldset',
+            //'#description' => t('Notes about this group of fields'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE
+        );
+        // Recursively populate the compound element
+        foreach ($element['attributes'] as $child_type => $child) {
         boincwork_generate_prefs_element($form[$name], $child_type, $child, $user_prefs[$name]['@attributes']);
-      }
+        }
     }
     break;
     
@@ -655,24 +655,24 @@  discard block
 block discarded – undo
  */
 function boincwork_make_prefs_table($prefs, $top_level = TRUE) {
 
-  $prefs_table = array();
-  $uncategorized = array();
+    $prefs_table = array();
+    $uncategorized = array();
   
-  // Parse the project preferences form
-  foreach ($prefs as $key => $element) {
+    // Parse the project preferences form
+    foreach ($prefs as $key => $element) {
     
     // Determine which type of element this is and act accordingly
     $element_type = NULL;
     if (is_array($element) AND isset($element['#type'])) {
-      $element_type = $element['#type'];
+        $element_type = $element['#type'];
     }
     switch ($element_type) {
     case 'fieldset':
       $prefs_table[$key] = array(
         'name' => $element['#title'],
         'elements' => boincwork_make_prefs_table($element, FALSE),
-      );
-      break;
+        );
+        break;
     case 'textfield':
     case 'radios':
     case 'checkbox':
@@ -682,45 +682,45 @@  discard block
 block discarded – undo
         switch ($key) {
         case 'start_hour':
           $element['#title'] = bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing');
-          break;
+            break;
         case 'net_start_hour':
           $element['#title'] = bts('Transfer files only between:', array(), NULL, 'boinc:account-preferences-comuting');
-          break;
+            break;
         default:
         }
-      }
-      $prefs_element = array(
+        }
+        $prefs_element = array(
         'name' => (isset($element['#title'])) ? $element['#title'] : '',
         'description' => (isset($element['#description'])) ? $element['#description'] : '',
         'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : NULL,
-      );
-      if ($top_level) {
+        );
+        if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+        }
+        else {
         $prefs_table[$key] = $prefs_element;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
+    }
   
-  if ($prefs_table AND $uncategorized) {
+    if ($prefs_table AND $uncategorized) {
     // Throw any settings that don't fit elsewhere into "other"
     $prefs_table['other'] = array(
-      'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
-      'elements' => $uncategorized,
+        'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
+        'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+    }
+    elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
-      'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
-      'elements' => $uncategorized,
+        'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
+        'elements' => $uncategorized,
     );
-  }
+    }
   
-  return $prefs_table;
+    return $prefs_table;
 }
  
 /**
@@ -728,33 +728,33 @@  discard block
 block discarded – undo
  */
 function boincwork_load_prefs($type = 'general', $venue = null, $account = null) {
   
-  require_boinc(array('user'));
+    require_boinc(array('user'));
   
-  // Load the BOINC user object
-  if (!$account) {
+    // Load the BOINC user object
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $account = user_load($account->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    }
+    $account = user_load($account->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Load the desired preferences for the user
-  $main_prefs = array();
-  if ($type == 'project') {
+    // Load the desired preferences for the user
+    $main_prefs = array();
+    if ($type == 'project') {
     if ($boincuser->project_prefs) {
-      $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+        $main_prefs = load_configuration($boincuser->project_prefs);
+        $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+    }
+    else {
     if ($boincuser->global_prefs) {
-      $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+        $main_prefs = load_configuration($boincuser->global_prefs);
+        $main_prefs = (array) $main_prefs['global_preferences'];
+    }
     }
-  }
   
-  // Return general preferences or a subset based on venue
-  if (!$venue OR $venue == 'generic') {
+    // Return general preferences or a subset based on venue
+    if (!$venue OR $venue == 'generic') {
     unset($main_prefs['venue']);
     // Use the length of the $main_prefs array as a condition as to
     // whether the preferences have already been set. This is
@@ -762,23 +762,23 @@  discard block
 block discarded – undo
     if (count($main_prefs) < 3)
         $main_prefs['@attributes'] = array('cleared' => 1);
     return $main_prefs;
-  }
-  else {
+    }
+    else {
     if (isset($main_prefs['venue'])) {
-      if (!is_numeric(key($main_prefs['venue']))) {
+        if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
-      }
-      foreach ($main_prefs['venue'] as $key => $prefs_venue) {
+        }
+        foreach ($main_prefs['venue'] as $key => $prefs_venue) {
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
-          return $main_prefs['venue'][$key];
+            return $main_prefs['venue'][$key];
+        }
         }
-      }
     }
-  }
+    }
 
-  return array(
+    return array(
     '@attributes' => array('name' => $venue, 'cleared' => 1)
-  );
+    );
 }
 
 /**
@@ -786,104 +786,104 @@  discard block
 block discarded – undo
  */
 function boincwork_save_prefs($prefs, $type = 'general', $venue = null, $account = null) {
   
-  require_boinc(array('user'));
+    require_boinc(array('user'));
   
-  // Load existing project prefs from the BOINC user object
-  if (!$account) {
+    // Load existing project prefs from the BOINC user object
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $account = user_load($account->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    }
+    $account = user_load($account->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Load the specified preferences for the user
-  $main_prefs = array();
-  if ($type == 'project') {
+    // Load the specified preferences for the user
+    $main_prefs = array();
+    if ($type == 'project') {
     if ($boincuser->project_prefs) {
-      $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+        $main_prefs = load_configuration($boincuser->project_prefs);
+        $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+    }
+    else {
     if ($boincuser->global_prefs) {
-      $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+        $main_prefs = load_configuration($boincuser->global_prefs);
+        $main_prefs = (array) $main_prefs['global_preferences'];
+    }
     }
-  }
   
-  // Save all preferences or a subset based on venue
-  //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
-  $new_venue = true;
-  if (!$venue OR $venue == 'generic') {
+    // Save all preferences or a subset based on venue
+    //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
+    $new_venue = true;
+    if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+    }
+    else {
     if (isset($main_prefs['venue'])) {
-      if (!is_numeric(key($main_prefs['venue']))) {
+        if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
-      }
-      foreach ($main_prefs['venue'] as $key => $prefs_venue) {
+        }
+        foreach ($main_prefs['venue'] as $key => $prefs_venue) {
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
-          if ($prefs) {
+            if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+            }
+            else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
-              // If that was the only preference set configured, unset the
-              // venue tag altogether
-              unset($main_prefs['venue']);
+                // If that was the only preference set configured, unset the
+                // venue tag altogether
+                unset($main_prefs['venue']);
             }
-          }
-          $new_venue = false;
-          break;
+            }
+            $new_venue = false;
+            break;
+        }
         }
-      }
     }
     if ($new_venue) {
-      $main_prefs['venue'][] = $prefs;
+        $main_prefs['venue'][] = $prefs;
+    }
     }
-  }
 
-  // Set modified time
-  if ($type == 'project') {
+    // Set modified time
+    if ($type == 'project') {
     if (!isset($main_prefs['modified'])) {
-      $main_prefs = array_merge(array('modified' => 0), $main_prefs);
+        $main_prefs = array_merge(array('modified' => 0), $main_prefs);
     }
     $main_prefs['modified'] = time();
-  } else {
+    } else {
     if (!isset($main_prefs['mod_time'])) {
-      $main_prefs = array_merge(array('mod_time' => 0), $main_prefs);
+        $main_prefs = array_merge(array('mod_time' => 0), $main_prefs);
     }
     $main_prefs['mod_time'] = time();
     // unset source information, the Client will fill this in again
     if (isset($main_prefs['source_project'])) {
-      unset($main_prefs['source_project']);
+        unset($main_prefs['source_project']);
     }
     if (isset($main_prefs['source_scheduler'])) {
-      unset($main_prefs['source_scheduler']);
+        unset($main_prefs['source_scheduler']);
+    }
     }
-  }
 
-  // Convert prefs back to XML and save to database
-  $result = null;
-  if ($type == 'project') {
+    // Convert prefs back to XML and save to database
+    $result = null;
+    if ($type == 'project') {
     $main_prefs = array('project_preferences' => $main_prefs);
     $boincuser->project_prefs = save_configuration($main_prefs);
     db_set_active('boinc_rw');
     $result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  else {
+    }
+    else {
     $main_prefs = array('global_preferences' => $main_prefs);
     $boincuser->global_prefs = save_configuration($main_prefs);
     db_set_active('boinc_rw');
     $result = db_query("UPDATE user SET global_prefs = '{$boincuser->global_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  return $result;
+    }
+    return $result;
 }
 
 
@@ -900,9 +900,9 @@  discard block
 block discarded – undo
  *username. Called from privacy preference form.
  */
 function boincwork_ignore_user_add_user_username($name = NULL) {
-  global $user;
+    global $user;
 
-  if (isset($name)) {
+    if (isset($name)) {
     // Get the BOINC ID from the name string, and lookup the
     // corresponding drupal user.
     $boincname = substr($name, 0, strrpos($name, '_'));
@@ -911,84 +911,84 @@  discard block
 block discarded – undo
     $iuid = get_drupal_id($boincid);
 
     if ($user->uid == $iuid) {
-      drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
-      drupal_goto('account/prefs/privacy');
+        drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
+        drupal_goto('account/prefs/privacy');
     }
 
     if (is_numeric($iuid) && $iuid > 0) {
-      if (!db_result(db_query('SELECT COUNT(iuid) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid))) {
+        if (!db_result(db_query('SELECT COUNT(iuid) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid))) {
         db_query('INSERT INTO {ignore_user} (uid, iuid) VALUES (%d, %d)', $user->uid, $iuid);
-      }// endif db_result
+        }// endif db_result
 
-      if (module_exists('pm_block_user')) {
+        if (module_exists('pm_block_user')) {
         if (!db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid))) {
-          db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $iuid, $user->uid);
+            db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $iuid, $user->uid);
         }// endif db_result
-      }// endif module_exists('pm_block_user')
+        }// endif module_exists('pm_block_user')
 
     }// endif $iuid
-  }
+    }
 }
 
 /**
  * Add another user's UID to the current user's ignore list.
  */
 function boincwork_ignore_user_add_user($iuid = NULL) {
-  global $user;
+    global $user;
 
-  if ($user->uid == $iuid) {
+    if ($user->uid == $iuid) {
     drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
     drupal_goto();
-  }
+    }
 
-  $otheraccount = user_load($iuid);
+    $otheraccount = user_load($iuid);
 
-  if (is_numeric($iuid) && $iuid > 0) {
+    if (is_numeric($iuid) && $iuid > 0) {
     if (!db_result(db_query('SELECT COUNT(iuid) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid))) {
-      db_query('INSERT INTO {ignore_user} (uid, iuid) VALUES (%d, %d)', $user->uid, $iuid);
+        db_query('INSERT INTO {ignore_user} (uid, iuid) VALUES (%d, %d)', $user->uid, $iuid);
     }// endif db_result
 
     if (module_exists('pm_block_user')) {
-      if (!db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid))) {
+        if (!db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid))) {
         db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $iuid, $user->uid);
-      }// endif db_result
+        }// endif db_result
     }// endif module_exists('pm_block_user')
 
     drupal_set_message(
-      bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
+        bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
         array(
-          '@username' => $otheraccount->boincuser_name,
-          '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
+            '@username' => $otheraccount->boincuser_name,
+            '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
         ),
         NULL, 'boinc:ignore-user-add'),
-      'status');
+        'status');
     drupal_goto();
-  }
-  else {
+    }
+    else {
     drupal_not_found();
-  }// endif iuid
+    }// endif iuid
 }
 
 /**
  * Remove user from user's ignore list.
  */
 function boincwork_ignore_user_remove_user($iuid = NULL) {
-  global $user;
-  $otheraccount = user_load($iuid);
+    global $user;
+    $otheraccount = user_load($iuid);
 
-  db_query('DELETE FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid);
-  if (module_exists('pm_block_user')) {
+    db_query('DELETE FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid);
+    if (module_exists('pm_block_user')) {
     db_query('DELETE FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid);
-  }// endif module_exists
-  drupal_set_message(
+    }// endif module_exists
+    drupal_set_message(
     bts('@username has been removed from your ignore list. See your !privacy_preferences for more details.',
-      array(
+        array(
         '@username' => $otheraccount->boincuser_name,
         '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
-      ),
-      NULL, 'boinc:ignore-user-add'),
+        ),
+        NULL, 'boinc:ignore-user-add'),
     'status');
-  drupal_goto('account/prefs/privacy');
+    drupal_goto('account/prefs/privacy');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1002,18 +1002,18 @@  discard block
 block discarded – undo
  */
 function boincwork_load_privacyconsenttypes() {
 
-  db_set_active('boinc_rw');
-  $db_result = db_query("SELECT id,shortname,description FROM consent_type WHERE enabled=1 AND privacypref=1 ORDER by project_specific ASC");
-  db_set_active('drupal');
+    db_set_active('boinc_rw');
+    $db_result = db_query("SELECT id,shortname,description FROM consent_type WHERE enabled=1 AND privacypref=1 ORDER by project_specific ASC");
+    db_set_active('drupal');
 
-  if ($db_result) {
+    if ($db_result) {
     $consent_types = array();
     while ($result = db_fetch_array($db_result)) {
-      $consent_types[] = $result;
+        $consent_types[] = $result;
     }
     return $consent_types;
-  }
-  return array();
+    }
+    return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1025,94 +1025,94 @@  discard block
 block discarded – undo
  */ 
 function boincwork_set_default_venue($venue = '') {
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  if ($venue == 'generic') {
+    if ($venue == 'generic') {
     $venue = '';
-  }
+    }
   
-  db_set_active('boinc_rw');
-  db_query("
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE user
     SET venue = '%s'
     WHERE id = %d",
     $venue, $account->boincuser_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 }
 
 /**
  * Recursively validate submitted form values against a set of rules
  */ 
 function boincwork_validate_form($validation_rules, $values, $path = array()) {
-  foreach ($validation_rules as $field => $rules) {
+    foreach ($validation_rules as $field => $rules) {
     $parents = $path;
     if (is_array($values[$field])) {
-      // Process nested form elements
-      $parents[] = $field;
-      boincwork_validate_form($rules, $values[$field], $parents);
+        // Process nested form elements
+        $parents[] = $field;
+        boincwork_validate_form($rules, $values[$field], $parents);
     }
     else {
-      if ($parents) {
+        if ($parents) {
         // form_set_error() identifies nested form elements with '][' as a
         // delimiter between each parent and child element
         $parents[] = $field;
         $form_field = implode('][', $parents);
-      }
-      else {
+        }
+        else {
         $form_field = $field;
-      }
-      if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
+        }
+        if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
         form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
-      if (isset($rules['min']) AND $values[$field] < $rules['min']) {
+        }
+        if (isset($rules['min']) AND $values[$field] < $rules['min']) {
         form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
-      if (isset($rules['max']) AND $values[$field] > $rules['max']) {
+        }
+        if (isset($rules['max']) AND $values[$field] > $rules['max']) {
         form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Check that numeric data conforms to specifications
  */
 function boincwork_validate_datatype($data, $datatype = NULL) {
-  switch ($datatype) {
-  case 'float':
+    switch ($datatype) {
+    case 'float':
     if (!is_numeric($data)) {
-      return FALSE;
+        return FALSE;
     }
     $data += 0.0;
     if (!is_float($data)) {
-      return FALSE;
+        return FALSE;
     }
     break;
     
-  case 'integer':
+    case 'integer':
     if (!is_numeric($data)) {
-      return FALSE;
+        return FALSE;
     }
     $data += 0;
     if (!is_int($data)) {
-      return FALSE;
+        return FALSE;
     }
     break;
   
-  case 'text':
+    case 'text':
   default:
     
   }
-  return TRUE;
+    return TRUE;
 }
 
 /**
  * Format a number to be displayed using a maximum number of digits
  */ 
 function boincwork_format_stats($number, $max_digits = 4) {
-  $suffix = array(
+    $suffix = array(
     0 => '',
     1 => 'k',
     2 => 'M',
@@ -1122,94 +1122,94 @@  discard block
 block discarded – undo
     6 => 'E',
     7 => 'Z',
     8 => 'Y'
-  );
-  if (!is_numeric($number)) $number = 0;
+    );
+    if (!is_numeric($number)) $number = 0;
   
-  $digits = floor(log($number, 10)) + 1;
-  $magnitude = 0;
-  $precision = 0;
-  if ($digits > $max_digits) {
+    $digits = floor(log($number, 10)) + 1;
+    $magnitude = 0;
+    $precision = 0;
+    if ($digits > $max_digits) {
     $magnitude = floor(($digits - ($max_digits - 3)) / 3);
     $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
     $number = round($number / pow(1000, $magnitude), $precision);
-  }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+    }
+    $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
   
-  return $number;
+    return $number;
 }
 
-  //------------------------------------------------------------------------------------------------
-  //  load_configuration(): Convert structured text/xml to array
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  load_configuration(): Convert structured text/xml to array
+    //------------------------------------------------------------------------------------------------
   
-  function load_configuration($text)
-  {
-      if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
-      if ($xml = text_to_xml($text)) return xml_to_array($xml);
-      return false;
-  }
+    function load_configuration($text)
+    {
+        if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
+        if ($xml = text_to_xml($text)) return xml_to_array($xml);
+        return false;
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  save_configuration(): Convert array to structured text/xml
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  save_configuration(): Convert array to structured text/xml
+    //------------------------------------------------------------------------------------------------
   
-  function save_configuration($array)
-  {
-      if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
-      return false;
-  }
+    function save_configuration($array)
+    {
+        if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
+        return false;
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  array_to_xml(): Take a multidimensional array and convert it to a structured
-  //  DOM XML object
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  array_to_xml(): Take a multidimensional array and convert it to a structured
+    //  DOM XML object
+    //------------------------------------------------------------------------------------------------
   
-  function array_to_xml($array, $dom = false, $parent_node = false) {
+    function array_to_xml($array, $dom = false, $parent_node = false) {
     $is_root = false;
     if (!$dom) $dom = new DomDocument('1.0');
     if (!$parent_node) {
-      $parent_node = $dom;
-      $is_root = true;
+        $parent_node = $dom;
+        $is_root = true;
     }
     // Created an intermediate array to attempt to sort by @position
     $ordered_array = array();
     $unordered_array = array();
     foreach ($array as $name => $value) {
-      if ($is_root) {
+        if ($is_root) {
         $unordered_array[] = $array;
         break;
-      }
-      if (is_array($value)) {
+        }
+        if (is_array($value)) {
         if (is_numeric(key($value))) {
-          foreach ($value as $item) {
+            foreach ($value as $item) {
             if (is_array($item) AND isset($item['@position'])) {
-              $ordered_array[$item['@position']] = array(
+                $ordered_array[$item['@position']] = array(
                 $name => $item
-              );
+                );
             }
             else {
-              $unordered_array[] = array(
+                $unordered_array[] = array(
                 $name => $item
-              );
+                );
+            }
             }
-          }
         }
         elseif (isset($value['@position'])) {
-          $ordered_array[$value['@position']] = array(
+            $ordered_array[$value['@position']] = array(
             $name => $value
-          );
+            );
         }
         else {
-          $unordered_array[] = array(
+            $unordered_array[] = array(
             $name => $value
-          );
+            );
         }
-      }
-      else {
+        }
+        else {
         $unordered_array[] = array(
-          $name => $value
+            $name => $value
         );
-      }
+        }
     }
     
     // Now append items without explicit positions at the end
@@ -1217,39 +1217,39 @@  discard block
 block discarded – undo
     
     // Convert to XML...
     foreach ($primed_array as $item) {
-      list($name, $value) = each($item);
-      if (strcmp($name, '@attributes') == 0) {
+        list($name, $value) = each($item);
+        if (strcmp($name, '@attributes') == 0) {
         if (!is_array($value)) continue;
         foreach ($value as $attributeName => $attributeValue) {
-          $parent_node->setAttribute($attributeName, $attributeValue);
+            $parent_node->setAttribute($attributeName, $attributeValue);
         }
-      } elseif (strcmp($name, '@value') == 0) {
+        } elseif (strcmp($name, '@value') == 0) {
         if (isset($value)) $parent_node->nodeValue = $value;
-      } elseif (strcmp($name, '@position') == 0) {
+        } elseif (strcmp($name, '@position') == 0) {
         continue;
-      } else {
+        } else {
         if (is_numeric($name)) {
-          $name = $parent_node->tagName;
+            $name = $parent_node->tagName;
         }
         $current_item = $dom->createElement($name);
         if (is_array($value)) {
-          if (is_numeric(key($value))) {
+            if (is_numeric(key($value))) {
             $current_node = $parent_node->appendChild($current_item);
             $current_node = array_to_xml($value, $dom, $current_node);
             $child_count = $current_node->childNodes->length;
             for ($i = 0; $i < $child_count; $i++) {
-              $parent_node->appendChild($current_node->childNodes->item(0));
+                $parent_node->appendChild($current_node->childNodes->item(0));
             }
             $parent_node->removeChild($current_node);
-          } else {
+            } else {
             $current_node = $dom->appendChild($current_item);
             $parent_node->appendChild(array_to_xml($value, $dom, $current_node));
-          }
+            }
         } else {
-          if (isset($value)) $current_item->nodeValue = $value;
-          $parent_node->appendChild($current_item);
+            if (isset($value)) $current_item->nodeValue = $value;
+            $parent_node->appendChild($current_item);
+        }
         }
-      }
     }
     /*
     foreach ($array as $name => $value) {
@@ -1285,114 +1285,114 @@  discard block
 block discarded – undo
       }
     }*/
     return $parent_node;
-  }
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  xml_to_text(): Convert an XML DOM object to string format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  xml_to_text(): Convert an XML DOM object to string format
+    //------------------------------------------------------------------------------------------------
   
-  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
-  {
-      $xml->formatOutput = true;
-      $text = $xml->saveXML();
-      if (!$include_xml_declaration) {
+    function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
+    {
+        $xml->formatOutput = true;
+        $text = $xml->saveXML();
+        if (!$include_xml_declaration) {
         $text = preg_replace('/<\?xml version=.*\?>\s*/i', '', $text, 1);
-      }
-      if ($add_carriage_returns) {;
+        }
+        if ($add_carriage_returns) {;
         $text = preg_replace('/\n/i', "\r\n", $text);
-      }
-      return trim($text);
-  }
+        }
+        return trim($text);
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  text_to_xml(): Convert an XML DOM object to string format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  text_to_xml(): Convert an XML DOM object to string format
+    //------------------------------------------------------------------------------------------------
   
-  function text_to_xml($text) {
+    function text_to_xml($text) {
     $xml = new DomDocument();
     if ( !($xml->loadXML($text)) ) return false;
     return $xml;
-  }
+    }
   
   
-  //------------------------------------------------------------------------------------------------
-  //  xml_to_array(): Convert an XML DOM object to array format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  xml_to_array(): Convert an XML DOM object to array format
+    //------------------------------------------------------------------------------------------------
   
-  function xml_to_array($xml) {
-      $node = $xml->firstChild; //$xml->first_child();
-      $result = '';
-      $index = 1;
-      $position = 0;
-      while (!is_null($node)) {
-          switch ($node->nodeType) {
-          case XML_TEXT_NODE:
+    function xml_to_array($xml) {
+        $node = $xml->firstChild; //$xml->first_child();
+        $result = '';
+        $index = 1;
+        $position = 0;
+        while (!is_null($node)) {
+            switch ($node->nodeType) {
+            case XML_TEXT_NODE:
               if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
-              break;
-          case XML_ELEMENT_NODE:
+                break;
+            case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
-              $parent = $node->parentNode;
-              $sibling = $node->nextSibling;
+                $parent = $node->parentNode;
+                $sibling = $node->nextSibling;
               
-              // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
-              if (!$sibling) {
-                  $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
-              }
+                // Determine if this node forms a set with siblings (share a node name)
+                while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+                if (!$sibling) {
+                    $sibling = $node->previousSibling;
+                    while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                }
               
-              if ($sibling) {
-                  $result[$node_name][$index] = '';
-                  if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
-                  }
-                  if ($node->hasAttributes()) {
-                      $attributes = $node->attributes;
-                      if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
-                          $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
-                      }
-                      foreach ($attributes as $key => $attribute) {
-                          $result[$node_name][$index]['@attributes'][$attribute->name] = $attribute->value;
-                      }
-                  }
-                  // Retain the position of the element
-                  if (!is_array($result[$node_name][$index])) {
+                if ($sibling) {
+                    $result[$node_name][$index] = '';
+                    if ($node->childNodes) {
+                        $result[$node_name][$index] = xml_to_array($node) ;
+                    }
+                    if ($node->hasAttributes()) {
+                        $attributes = $node->attributes;
+                        if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
+                            $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
+                        }
+                        foreach ($attributes as $key => $attribute) {
+                            $result[$node_name][$index]['@attributes'][$attribute->name] = $attribute->value;
+                        }
+                    }
+                    // Retain the position of the element
+                    if (!is_array($result[$node_name][$index])) {
                     $result[$node_name][$index] = array(
-                      '@value' => $result[$node_name][$index]
+                        '@value' => $result[$node_name][$index]
                     );
-                  }
-                  $result[$node_name][$index]['@position'] = $position;
-                  $position++;
-                  $index++;
-              } else {
-                  $result[$node_name] = '';
-                  if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
-                  }
-                  if ($node->hasAttributes()) {
-                      $attributes = $node->attributes;
-                      if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
-                          $result[$node_name] = array('@value' => $result[$node_name]);
-                      }
-                      foreach($attributes as $key => $attribute) {
-                          $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
-                      }
-                  }
-                  // Retain the position of the element
-                  if (!is_array($result[$node_name])) {
+                    }
+                    $result[$node_name][$index]['@position'] = $position;
+                    $position++;
+                    $index++;
+                } else {
+                    $result[$node_name] = '';
+                    if ($node->childNodes) {
+                        $result[$node_name] = xml_to_array($node) ;
+                    }
+                    if ($node->hasAttributes()) {
+                        $attributes = $node->attributes;
+                        if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
+                            $result[$node_name] = array('@value' => $result[$node_name]);
+                        }
+                        foreach($attributes as $key => $attribute) {
+                            $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
+                        }
+                    }
+                    // Retain the position of the element
+                    if (!is_array($result[$node_name])) {
                     $result[$node_name] = array(
-                      '@value' => $result[$node_name]
+                        '@value' => $result[$node_name]
                     );
-                  }
-                  $result[$node_name]['@position'] = $position;
-                  $position++;
-              }
-              break;
-          }
-          $node = $node->nextSibling;
-      }
-      return $result;
-  }
+                    }
+                    $result[$node_name]['@position'] = $position;
+                    $position++;
+                }
+                break;
+            }
+            $node = $node->nextSibling;
+        }
+        return $result;
+    }
   
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1400,172 +1400,172 @@  discard block
 block discarded – undo
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Determine output for host list views when no hosts are found.
-  */
+ * Determine output for host list views when no hosts are found.
+ */
 function boincwork_views_host_list_empty_text($context = NULL) {
   
-  // Pull the BOINC user ID from the view arguments to get show_hosts 
-  // preference for that user
-  require_boinc('boinc_db');
-  $view = views_get_current_view();
-  $account = user_load($view->args[0]);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    // Pull the BOINC user ID from the view arguments to get show_hosts 
+    // preference for that user
+    require_boinc('boinc_db');
+    $view = views_get_current_view();
+    $account = user_load($view->args[0]);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Determine if hosts are associated at all or just hidden
-  $output = '';
-  if ($boincuser->show_hosts) {
+    // Determine if hosts are associated at all or just hidden
+    $output = '';
+    if ($boincuser->show_hosts) {
     switch($context) {
     case 'active':
       $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
-      break;
+        $output .=  '<p>' . bts('This user has no computers that have been'
+        . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+        break;
       
     case 'preferences':
       $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
-      break;
+        $output .=  '<p>' . bts('There are no computers assigned to this'
+        . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+        break;
     
     default:
       $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
-      . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+        $output .=  '<p>' . bts('This user does not yet have any associated'
+        . ' computers. Computers will be displayed when they have earned their'
+        . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
     }
-  }
-  else {
+    }
+    else {
     $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Determine output for task list views when no tasks are found.
-  */
+ * Determine output for task list views when no tasks are found.
+ */
 function boincwork_views_task_list_empty_text($context = NULL) {
   
-  // 
-  $output = '';
-  switch($context) {
-  default:
+    // 
+    $output = '';
+    switch($context) {
+    default:
     $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
     $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Output links to perform host actions
-  */
+ * Output links to perform host actions
+ */
 function boincwork_host_action_links($host_id) {
-  $output = '';
-  if (boincwork_host_user_is_owner($host_id)) {
+    $output = '';
+    if (boincwork_host_user_is_owner($host_id)) {
     // Show merge hosts option
     $output = '<ul class="tab-list"><li class="first tab">';
     $output .= l(bts('Merge', array(), NULL, 'boinc:form-merge'), "host/{$host_id}/merge");
     $output .= '</li>';
     // If host has no tasks, allow the host to be deleted
     if (!boincwork_host_get_task_count($host_id)) {
-      $output .= '<li class="tab">';
-      $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
+        $output .= '<li class="tab">';
+        $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
-          'attributes' => array(
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will delete host @id'
-              . ' from your account forever. Are you sure this is OK?',
-              array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
-          )
+                . ' from your account forever. Are you sure this is OK?',
+                array('@id' => $host_id),
+                NULL, 'boinc:account-host-delete') . '\')'
+            )
         )
-      );
-      $output .= '</li>';
+        );
+        $output .= '</li>';
     }
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Get details for a given host
  */
 function boincwork_host_get_info($host_id) {
-  db_set_active('boinc_ro');
-  $host = db_fetch_object(db_query(
+    db_set_active('boinc_ro');
+    $host = db_fetch_object(db_query(
     "SELECT * FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return $host;
+    ));
+    db_set_active('default');
+    return $host;
 }
 
 /**
  * Get the number of tasks associated with a given host
  */
 function boincwork_host_get_task_count($host_id) {
-  db_set_active('boinc_ro');
-  $count = db_result(db_query(
+    db_set_active('boinc_ro');
+    $count = db_result(db_query(
     "SELECT COUNT(*) FROM {result} WHERE hostid = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return $count;
+    ));
+    db_set_active('default');
+    return $count;
 }
 
 /**
  * Check whether a user is the owner of a host
  */
 function boincwork_host_user_is_owner($host_id, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  $account = user_load($uid);
-  // Get host owner
-  db_set_active('boinc_ro');
-  $owner = db_result(db_query(
+    }
+    $account = user_load($uid);
+    // Get host owner
+    db_set_active('boinc_ro');
+    $owner = db_result(db_query(
     "SELECT userid FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return ($account->boincuser_id === $owner);
+    ));
+    db_set_active('default');
+    return ($account->boincuser_id === $owner);
 }
 
 /**
-  * Determine output for host last contact time
-  */
+ * Determine output for host last contact time
+ */
 function boincwork_host_last_contact($timestamp, $host_id = NULL, $context = NULL) {
-  $output = '---';
-  $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
-  $log = '';
-  if ($timestamp) {
+    $output = '---';
+    $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
+    $log = '';
+    if ($timestamp) {
     $output = date('j M Y G:i:s T', $timestamp);
-  }
-  if ($root_log_dir AND $host_id) {
+    }
+    if ($root_log_dir AND $host_id) {
     $subdir = substr($host_id, 0, -3) OR $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
-  }
-  if ($log AND file_exists($log)) {
+    }
+    if ($log AND file_exists($log)) {
     $output = l($output, "host/{$host_id}/log");
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * 
  */
 function boincwork_host_venue_selector($host_id) {
-  $output = '';
-  if (function_exists('jump_quickly')) {
+    $output = '';
+    if (function_exists('jump_quickly')) {
     $path = "host/{$host_id}/set-venue";
     $venues = array(
-      "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-      "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
+        "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
+        "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+        "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
+        "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -1573,34 +1573,34 @@  discard block
 block discarded – undo
     // Get current venue
     db_set_active('boinc_ro');
     $venue = db_result(db_query(
-      "SELECT venue FROM {host} WHERE id = '%d'",
-      $host_id
+        "SELECT venue FROM {host} WHERE id = '%d'",
+        $host_id
     ));
     db_set_active('default');
     $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Determine output for task reported time / deadline
-  */
+ * Determine output for task reported time / deadline
+ */
 function boincwork_task_time_reported($received_time = NULL, $deadline = NULL, $context = NULL) {
-  $output = '---';
-  if ($received_time OR $deadline) {
+    $output = '---';
+    if ($received_time OR $deadline) {
     $timestamp = ($received_time) ? $received_time : $deadline;
     $output = date('j M Y G:i:s T', $timestamp);
     // Add a wrapper to deadline text
     if (!$received_time) {
-      if (time() < $deadline) {
+        if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+        }
+        else {
         $output = '<span class="past-due">' . $output . '</span>';
-      }
+        }
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1631,345 +1631,345 @@  discard block
 block discarded – undo
  *   Number of table row to display per page. Defaults to 20.
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
-  // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+    // Check type parameter, if not (0,2) then return an error.
+    if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
-  }
+    }
 
-  require_boinc( array('util', 'result') );
+    require_boinc( array('util', 'result') );
 
-  global $language;
-  $locality=$language->language;
-  $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
-  $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
-  $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
+    global $language;
+    $locality=$language->language;
+    $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
+    $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
+    $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
 
-  $output = '';
+    $output = '';
 
-  $state_hnames = array(
+    $state_hnames = array(
     STATE_ALL => 'All',
     STATE_IN_PROGRESS => 'In progress',
     STATE_PENDING => 'Pending',
     STATE_VALID => 'Valid',
     STATE_INVALID => 'Invalid',
     STATE_ERROR => 'Error',
-  );
-  // Array (hash) to count total number of results/tasks, and their states.
-  $taskstates = array(
+    );
+    // Array (hash) to count total number of results/tasks, and their states.
+    $taskstates = array(
     STATE_ALL => 0,
     STATE_IN_PROGRESS => 0,
     STATE_PENDING => 0,
     STATE_VALID => 0,
     STATE_INVALID => 0,
     STATE_ERROR => 0,
-  );
-  // Array to hold pretty-print result data to be displayed in a table.
-  $resultdata = array();
-  // Arrays for applications. Form below uses $applications as parameter.
-  $application_map = array();
-  $application_select_count = array();
-  $applications = array();
-
-  // BOINC DB queries for results, application names
-  db_set_active('boinc_ro');
-
-  // Query to retreive all results, in order to calculate status for a
-  // host with application names for each result.
-  $sqlall = "SELECT user_friendly_name,"
-      ."r.appid as appid,"
-      ."r.server_state AS server_state,"
-      ."r.outcome AS outcome,"
-      ."r.client_state AS client_state,"
-      ."r.validate_state AS validate_state,"
-      ."r.exit_status AS exit_status "
-      ."FROM {result} AS r "
-      ."INNER JOIN {app} AS a "
-      ."ON r.appid=a.id ";
-
-  // Use userid, hostid, or workunitid
-  if ($category==0) {
+    );
+    // Array to hold pretty-print result data to be displayed in a table.
+    $resultdata = array();
+    // Arrays for applications. Form below uses $applications as parameter.
+    $application_map = array();
+    $application_select_count = array();
+    $applications = array();
+
+    // BOINC DB queries for results, application names
+    db_set_active('boinc_ro');
+
+    // Query to retreive all results, in order to calculate status for a
+    // host with application names for each result.
+    $sqlall = "SELECT user_friendly_name,"
+        ."r.appid as appid,"
+        ."r.server_state AS server_state,"
+        ."r.outcome AS outcome,"
+        ."r.client_state AS client_state,"
+        ."r.validate_state AS validate_state,"
+        ."r.exit_status AS exit_status "
+        ."FROM {result} AS r "
+        ."INNER JOIN {app} AS a "
+        ."ON r.appid=a.id ";
+
+    // Use userid, hostid, or workunitid
+    if ($category==0) {
     $sqlall .= " WHERE r.userid='%s' ";
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $sqlall .= " WHERE r.hostid='%s' ";
-  }
-  $sqlall .= " ORDER BY user_friendly_name";
-  $dbres_all = db_query($sqlall, $queryid);
-  db_set_active('default');
+    }
+    $sqlall .= " ORDER BY user_friendly_name";
+    $dbres_all = db_query($sqlall, $queryid);
+    db_set_active('default');
 
-  // Loop 1 of DB results
-  if ($dbres_all) {
+    // Loop 1 of DB results
+    if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
-      $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+        $mystate = state_num($result);
+        if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
           $taskstates[STATE_IN_PROGRESS]++;
-          break;
+            break;
         case STATE_PENDING:
           $taskstates[STATE_PENDING]++;
-          break;
+            break;
         case STATE_VALID:
           $taskstates[STATE_VALID]++;
-          break;
+            break;
         case STATE_INVALID:
           $taskstates[STATE_INVALID]++;
-          break;
+            break;
         case STATE_ERROR:
           $taskstates[STATE_ERROR]++;
-          break;
+            break;
         }
-      }// if app_id
+        }// if app_id
 
-      //map holds a map between app ids and user friendly names for all applications.
-      $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+        //map holds a map between app ids and user friendly names for all applications.
+        $application_map[$result->appid] = $result->user_friendly_name;
+        if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
-      }// if mystate
+        }// if mystate
 
     }// while
-  }
-  else {
-  }
+    }
+    else {
+    }
   
-  // Entry for all applications.
-  $allcount = $application_select_count ? array_sum($application_select_count) : 0;
-  $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
-  // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+    // Entry for all applications.
+    $allcount = $application_select_count ? array_sum($application_select_count) : 0;
+    $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
+    $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+    // Create application filter from application_map and application_select_count.
+    foreach($application_map as $akey => $aname) {
     $acount = 0;
     if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
-      $acount = $application_select_count[$akey];
+        $acount = $application_select_count[$akey];
     }
     $applications[$akey] = $aname . ' ('. $acount . ')';
-  }
-  // Header array for (sub) results table.
-  $resultheader = array(
+    }
+    // Header array for (sub) results table.
+    $resultheader = array(
     array(
-      'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
-      'field' => 'id',
+        'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
+        'field' => 'id',
     ),
     array(
-      'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
-      'field' => 'workunitid',
+        'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
+        'field' => 'workunitid',
     ),
     array(
-      'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
-      'field' => 'hostid',
+        'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
+        'field' => 'hostid',
     ),
     array(
-      'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
-      'field' => 'sent_time',
+        'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
+        'field' => 'sent_time',
     ),
     array(
-      'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
+        'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Status', array(), NULL, 'boinc:task-table')
+        'data' => bts('Status', array(), NULL, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
-      'field' => 'elapsed_time',
+        'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
+        'field' => 'elapsed_time',
     ),
     array(
-      'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
-      'field' => 'cpu_time',
+        'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
+        'field' => 'cpu_time',
     ),
     array(
-      'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
-      'field' => 'granted_credit',
+        'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
+        'field' => 'granted_credit',
     ),
     // Application is a column, but won't be added until after tablesort_sql().
-  );
-
-  // Query to retreive a subset of the total results for the results table.
-  db_set_active('boinc_ro');
-  $sqlsub = "SELECT r.id AS id,"
-      ."r.name AS name,"
-      ."r.workunitid AS workunitid,"
-      ."r.hostid as hostid,"
-      ."r.sent_time AS sent_time,"
-      ."r.received_time AS received_time,"
-      ."r.report_deadline AS report_deadline,"
-      ."r.server_state AS server_state,"
-      ."r.outcome AS outcome,"
-      ."r.client_state AS client_state,"
-      ."r.validate_state AS validate_state,"
-      ."r.exit_status AS exit_status,"
-      ."r.elapsed_time AS elapsed_time,"
-      ."r.cpu_time AS cpu_time,"
-      ."r.granted_credit AS granted_credit,"
-      ."r.appid AS appid,"
-      ."r.app_version_id AS app_version_id,"
-      ."a.user_friendly_name,"
-      ."av.version_num AS version_number,"
-      ."av.plan_class AS plan_class,"
-      ."pl.name AS platform "
-      ."FROM {result} AS r "
-      ."INNER JOIN {app} AS a "
-      ."ON r.appid=a.id "
-      ."LEFT JOIN {app_version} AS av "
-      ."ON r.app_version_id=av.id "
-      ."LEFT JOIN {platform} AS pl "
-      ."ON av.platformid=pl.id ";
-
-  // Build an array for the WHERE clauses. The individual clauses are
-  // placed into an array, and implode() is used to combine them into
-  // a WHERE statement for the sql query. If no such clauses are added
-  // to the array, then no WHERE statement will be included.
-  $sqlwhere = array();
-
-  // Use userid, hostid, or workunitid
-  if ($category==0) {
+    );
+
+    // Query to retreive a subset of the total results for the results table.
+    db_set_active('boinc_ro');
+    $sqlsub = "SELECT r.id AS id,"
+        ."r.name AS name,"
+        ."r.workunitid AS workunitid,"
+        ."r.hostid as hostid,"
+        ."r.sent_time AS sent_time,"
+        ."r.received_time AS received_time,"
+        ."r.report_deadline AS report_deadline,"
+        ."r.server_state AS server_state,"
+        ."r.outcome AS outcome,"
+        ."r.client_state AS client_state,"
+        ."r.validate_state AS validate_state,"
+        ."r.exit_status AS exit_status,"
+        ."r.elapsed_time AS elapsed_time,"
+        ."r.cpu_time AS cpu_time,"
+        ."r.granted_credit AS granted_credit,"
+        ."r.appid AS appid,"
+        ."r.app_version_id AS app_version_id,"
+        ."a.user_friendly_name,"
+        ."av.version_num AS version_number,"
+        ."av.plan_class AS plan_class,"
+        ."pl.name AS platform "
+        ."FROM {result} AS r "
+        ."INNER JOIN {app} AS a "
+        ."ON r.appid=a.id "
+        ."LEFT JOIN {app_version} AS av "
+        ."ON r.app_version_id=av.id "
+        ."LEFT JOIN {platform} AS pl "
+        ."ON av.platformid=pl.id ";
+
+    // Build an array for the WHERE clauses. The individual clauses are
+    // placed into an array, and implode() is used to combine them into
+    // a WHERE statement for the sql query. If no such clauses are added
+    // to the array, then no WHERE statement will be included.
+    $sqlwhere = array();
+
+    // Use userid, hostid, or workunitid
+    if ($category==0) {
     $sqlwhere[] = "r.userid = '%s'";
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $sqlwhere[] = "r.workunitid = '%s'";
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $sqlwhere[] = "r.hostid = '%s'";
-  }
+    }
 
-  // Append additional where clauses based on task selection.
-  switch ($tselect) {
-  case STATE_IN_PROGRESS:
+    // Append additional where clauses based on task selection.
+    switch ($tselect) {
+    case STATE_IN_PROGRESS:
     $sqlwhere[] = "r.server_state = 4";
     break;
-  case STATE_PENDING:
+    case STATE_PENDING:
     $sqlwhere[] = "(r.server_state = 5) AND (r.outcome = 1) AND (r.validate_state >= 0) AND (r.validate_state <= 0 OR r.validate_state >= 4) AND (r.validate_state <= 4)";
     break;
-  case STATE_VALID:
+    case STATE_VALID:
     $sqlwhere[] = "(r.server_state = 5) AND (r.outcome = 1) AND (r.validate_state = 1)";
     break;
-  case STATE_INVALID:
+    case STATE_INVALID:
     $sqlwhere[] = "(r.server_state = 5) AND ((r.outcome = 6) OR ((r.outcome = 1) AND ((r.validate_state = 2) OR (r.validate_state = 3) OR (r.validate_state = 5))))";
     break;
-  case STATE_ERROR:
+    case STATE_ERROR:
     $sqlwhere[] = "(r.server_state = 5) AND (r.outcome >= 3) AND (r.outcome <= 4 OR r.outcome >= 7) AND (r.outcome <= 7)";
     break;
-  default:
+    default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+    if (is_numeric($app_id) AND $app_id>0 ) {
     $sqlwhere[] = "r.appid = '%s'";
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
-  }
-  else {
+    }
+    else {
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
 
-  // Loop 2 over DB results.
-  if ($dbres_sub) {
+    // Loop 2 over DB results.
+    if ($dbres_sub) {
     while ($result = db_fetch_object($dbres_sub)) {
-      // state_num() function changes $result object, clone $result
-      // object for use in state_num()
-      // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+        // state_num() function changes $result object, clone $result
+        // object for use in state_num()
+        // check if state matches selection
+        if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
         // create pretty result row
         $prettyresult = array(
-          array(
+            array(
             'data' => l($result->name, "task/{$result->id}"),
             'class' => 'task-name',
-          ),
-          l($result->workunitid, "workunit/{$result->workunitid}"),
-          l($result->hostid, "host/{$result->hostid}"),
-          date('j M Y G:i:s T', $result->sent_time),
-          boincwork_task_time_reported($result->received_time, $result->report_deadline),
-          state_string($result),
-          $nf->format($result->elapsed_time),
-          $nf->format($result->cpu_time),
-          $nf->format($result->granted_credit),
-          array(
+            ),
+            l($result->workunitid, "workunit/{$result->workunitid}"),
+            l($result->hostid, "host/{$result->hostid}"),
+            date('j M Y G:i:s T', $result->sent_time),
+            boincwork_task_time_reported($result->received_time, $result->report_deadline),
+            state_string($result),
+            $nf->format($result->elapsed_time),
+            $nf->format($result->cpu_time),
+            $nf->format($result->granted_credit),
+            array(
             'data' => $result->user_friendly_name . " " . pretty_application_version($result->app_version_id,$result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
-          ),
+            ),
         );
         $resultdata[] = array_values($prettyresult);
-      }
+        }
     }// while
-  }
-  else {
-  }
-  // Begin result navigation
+    }
+    else {
+    }
+    // Begin result navigation
 
-  // Set pathprefix based on type
-  if ($category==0) {
+    // Set pathprefix based on type
+    if ($category==0) {
     $pathprefix = 'account/tasks';
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $pathprefix = 'workunit/' . $queryid . '/tasks';
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $pathprefix = 'host/' . $queryid . '/tasks';
-  }
-  // Need an "All" tab as well, maps to app_id of zero.
-  $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
-  $stitems = array();
-  foreach ($taskstates as $state => $numstates) {
+    }
+    // Need an "All" tab as well, maps to app_id of zero.
+    $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
+    $stitems = array();
+    foreach ($taskstates as $state => $numstates) {
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+        $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+        $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+        'data' => l($ltext, $mypath, array('html' => TRUE) ),
     );
     if ($state==$tselect) {
-      $myitem['class'] = 'active';
+        $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
-  }
-  // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+    }
+    // Add reset button
+    $mypath = $pathprefix . '/0/0';
+    $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
+    $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+    $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
 
-  // Application select-drop down form
-  // Hack to place Application form into header
-  // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
+    // Application select-drop down form
+    // Hack to place Application form into header
+    // App ID of zero maps to "-1" for drop-down box.
+    if ($app_id==0) {
     $app_id=-1;
-  }
-  $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
+    }
+    $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
-  // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+    // Begin table of results
+    if ( is_array($resultheader) AND is_array($resultdata) ) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
     if ( ($category==1) OR ($category==2) ) {
-      unset($resultheader[$category]);
-      delete_col($resultdata, $category);
+        unset($resultheader[$category]);
+        delete_col($resultdata, $category);
     }
 
     $output .= theme_table($resultheader, $resultdata);
     if (count($resultdata) > 0) {
-      $output .= theme('pager');
+        $output .= theme('pager');
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
-     array_splice($v, $offset, 1);
-  });
+    return array_walk($array, function (&$v) use ($offset) {
+        array_splice($v, $offset, 1);
+    });
 }
 
 /**
@@ -1989,7 +1989,7 @@  discard block
 block discarded – undo
  *  platform name, may be NULL
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
-  switch ($appverid) {
+    switch ($appverid) {
     case ANON_PLATFORM_UNKNOWN:
       return "Anonymous platform";
     case ANON_PLATFORM_CPU:
@@ -2008,11 +2008,11 @@  discard block
 block discarded – undo
       // that is not handled by the above case statements.
       if ($appverid < 0) {
         return "Unknown Anonymous platform";
-      }
-      else {
+        }
+        else {
         $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
         $prettyc = ($plan_class) ? "($av->plan_class)" : '';
         return "v$prettyv $prettyc $plfm";
-      }
-  }
+        }
+    }
 }

Please login to merge, or discard this patch.

Switch Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -643,9 +643,9 @@  discard block
 block discarded – undo
     }
     break;
     
-    default:
-      // Don't generate form elements for things that aren't explicitly form
-      // elements (i.e. 'title', '@attributes' keys, and the like)
+  default:
+    // Don't generate form elements for things that aren't explicitly form
+    // elements (i.e. 'title', '@attributes' keys, and the like)
   }
 }
 
@@ -1990,29 +1990,29 @@  discard block
 block discarded – undo
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
   switch ($appverid) {
-    case ANON_PLATFORM_UNKNOWN:
-      return "Anonymous platform";
-    case ANON_PLATFORM_CPU:
-      return "Anonymous platform CPU";
-    case ANON_PLATFORM_NVIDIA:
-      return "Anonymous platform NVIDIA GPU";
-    case ANON_PLATFORM_ATI:
-      return "Anonymous platform AMD GPU";
-    case ANON_PLATFORM_INTEL:
-      return "Anonymous platform Intel GPU";
-    case 0:
-      return "---";
-    default:
-      // Handle the case where the appversid is still negative. This
-      // may be cause BOINC has introduced a new anonymous platform
-      // that is not handled by the above case statements.
-      if ($appverid < 0) {
-        return "Unknown Anonymous platform";
-      }
-      else {
-        $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
-        $prettyc = ($plan_class) ? "($av->plan_class)" : '';
-        return "v$prettyv $prettyc $plfm";
-      }
+  case ANON_PLATFORM_UNKNOWN:
+    return "Anonymous platform";
+  case ANON_PLATFORM_CPU:
+    return "Anonymous platform CPU";
+  case ANON_PLATFORM_NVIDIA:
+    return "Anonymous platform NVIDIA GPU";
+  case ANON_PLATFORM_ATI:
+    return "Anonymous platform AMD GPU";
+  case ANON_PLATFORM_INTEL:
+    return "Anonymous platform Intel GPU";
+  case 0:
+    return "---";
+  default:
+    // Handle the case where the appversid is still negative. This
+    // may be cause BOINC has introduced a new anonymous platform
+    // that is not handled by the above case statements.
+    if ($appverid < 0) {
+      return "Unknown Anonymous platform";
+    }
+    else {
+      $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
+      $prettyc = ($plan_class) ? "($av->plan_class)" : '';
+      return "v$prettyv $prettyc $plfm";
+    }
   }
 }

Please login to merge, or discard this patch.

html/ops/errorwus.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -176,8 +176,8 @@
 block discarded – undo
 echo "<tr><th>WU ID</th><th>WU name</th><th>App ID</th><th>Quorum</th><th>Unsent</th><th>In Progress</th><th>Success</th>";
 echo "<th>Download Errors</th><th>Compute Errors</th><th>Validate Errors</th><th>Error mask</th></tr>\n";
 
-$hidden=0;
-foreach($row_array as $row) {
+$hidden = 0;
+foreach ($row_array as $row) {
     if ($hide_canceled == 'on' && (($row->error_mask & WU_ERROR_CANCELLED) == WU_ERROR_CANCELLED)) {
         $hidden++;
         continue;

Please login to merge, or discard this patch.

html/user/bolt_sched.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 }
 
 function default_mode($item) {
-    return $item->is_exercise()?BOLT_MODE_SHOW:BOLT_MODE_LESSON;
+    return $item->is_exercise() ?BOLT_MODE_SHOW:BOLT_MODE_LESSON;
 }
 
 // A page is being shown to the user; make a record of it
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
 
 // show an item (lesson, exercise, answer page)
 //
-function show_item($iter, $view_id, $prev_view_id, $mode, $repeat=null) {
+function show_item($iter, $view_id, $prev_view_id, $mode, $repeat = null) {
     global $user;
     global $course;
     global $bolt_ex;
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
     $bolt_ex->score = 0;
     $bolt_query_string = $item->query_string;
     srand($view_id);
-    ob_start();     // buffer output to avoid showing exercise text
+    ob_start(); // buffer output to avoid showing exercise text
     require($item->filename);
     ob_end_clean();
 

Please login to merge, or discard this patch.

html/inc/util.inc 3 patches

Braces +7 added lines, -6 removed lines patch added patch discarded remove patch

@@ -207,7 +207,7 @@  discard block
 block discarded – undo
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
@@ -293,7 +293,8 @@  discard block
 block discarded – undo
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch($title) {
+//kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -309,7 +310,7 @@  discard block
 block discarded – undo
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
     $show_date=false,
         // true for pages that are generated periodically rather than on the fly
@@ -330,7 +331,7 @@  discard block
 block discarded – undo
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
     for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
@@ -816,7 +817,7 @@  discard block
 block discarded – undo
     return $str;
 }
 
-function strip_bbcode($string){
+function strip_bbcode($string) {
     return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
 }
 
@@ -1047,7 +1048,7 @@  discard block
 block discarded – undo
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
     $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";

Please login to merge, or discard this patch.

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch

@@ -38,17 +38,17 @@  discard block
 block discarded – undo
 //
 $config = get_config();
 global $master_url;
-$master_url = parse_config($config , "<master_url>");
+$master_url = parse_config($config, "<master_url>");
 $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
 $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
 
 // the following default to on
 //
 $x = parse_config($config, "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config($config, "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // don't allow /... at the end of URL
 //
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     global $master_url;
 
     // the following allows independent login for projects on the same server
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path);
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     global $master_url;
     $url = parse_url($master_url);
     $path = $url['path'];
@@ -161,13 +161,13 @@  discard block
 block discarded – undo
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) return $g_logged_in_user;
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -219,11 +219,11 @@  discard block
 block discarded – undo
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -232,10 +232,10 @@  discard block
 block discarded – undo
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -274,11 +274,11 @@  discard block
 block discarded – undo
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -329,13 +329,13 @@  discard block
 block discarded – undo
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -350,10 +350,10 @@  discard block
 block discarded – undo
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
-    for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
+    for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
         echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
     }
 }
@@ -378,23 +378,23 @@  discard block
 block discarded – undo
 // takes argument in second and returns a human formatted time string
 // in the form D days + h Hours + m Min + s sec.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = (int)($x % 60);
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = (int)($x%60);
 
     $datestring = "";
     if ($days) {
         $datestring .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($datestring))) {
+    if ($res > 0 && ($hours || strlen($datestring))) {
         $datestring .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($datestring))) {
+    if ($res > 1 && ($minutes || strlen($datestring))) {
         $datestring .= "$minutes ".tra("min")." ";
     }
-    if ($res>2 && ($seconds)) {
+    if ($res > 2 && ($seconds)) {
         $datestring .= "$seconds ".tra("sec")." ";
     }
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', $x) . " UTC";
+    return gmdate('j M Y, G:i:s', $x)." UTC";
 }
 
 function local_time_str($x) {
@@ -421,14 +421,14 @@  discard block
 block discarded – undo
     return time_str($x);
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
 define('VALUE_ATTRS', 'style="padding-left:12px"');
 define('VALUE_ATTRS_ERR', 'class="danger" style="padding-left:12px"');
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
     ";
 }
 
-function row2_init($x, $y, $lwidth='40%') {
+function row2_init($x, $y, $lwidth = '40%') {
     echo '<tr>
         <td class="text-right " width="'.$lwidth.'"  style="padding-right: 20px;">'.$x.'</td>
         <td '.VALUE_ATTRS.'>'.$y.'
@@ -519,20 +519,20 @@  discard block
 block discarded – undo
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -671,8 +671,8 @@  discard block
 block discarded – undo
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -830,8 +830,8 @@  discard block
 block discarded – undo
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
 
-function button_text($url, $text, $desc=null, $class="btn-success btn-sm") {
+function button_text($url, $text, $desc = null, $class = "btn-success btn-sm") {
     if (!$desc) {
         $desc = $text;
     }
@@ -868,19 +868,19 @@  discard block
 block discarded – undo
     );
 }
 
-function show_button($url, $text, $desc=null, $class="btn-success btn-sm") {
-    echo button_text($url, $text, $desc=null, $class);
+function show_button($url, $text, $desc = null, $class = "btn-success btn-sm") {
+    echo button_text($url, $text, $desc = null, $class);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text($url, $text, $desc, "btn-primary btn-xs");
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -988,7 +988,7 @@  discard block
 block discarded – undo
 function sanitize_numeric($x) {
     if (is_numeric($x)) {
         return $x;
-    } else if (trim($x) == '' ) {
+    } else if (trim($x) == '') {
         return '';
     } else {
         return "not numeric";
@@ -1011,9 +1011,9 @@  discard block
 block discarded – undo
     return $c/(200/24);
 }
 
-function do_download($path,$name="") {
-    if (strcmp($name,"") == 0) {
-        $name=basename($path);
+function do_download($path, $name = "") {
+    if (strcmp($name, "") == 0) {
+        $name = basename($path);
     }
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
@@ -1022,7 +1022,7 @@  discard block
 block discarded – undo
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1071,10 +1071,10 @@  discard block
 block discarded – undo
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1103,7 +1103,7 @@  discard block
 block discarded – undo
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1133,7 +1133,7 @@  discard block
 block discarded – undo
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1146,9 +1146,9 @@  discard block
 block discarded – undo
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -556,14 +556,14 @@
 block discarded – undo
     $tnow = get_str('tnow', true);
     $ttok = get_str('ttok', true);
     if (!$tnow) {
-      if (isset($_POST['tnow'])) {
-          $tnow = $_POST['tnow'];
-      }
+        if (isset($_POST['tnow'])) {
+            $tnow = $_POST['tnow'];
+        }
     }
     if (!$ttok) {
-      if (isset($_POST['ttok'])) {
-          $ttok = $_POST['ttok'];
-      }
+        if (isset($_POST['ttok'])) {
+            $ttok = $_POST['ttok'];
+        }
     }
     if (!$tnow) return false;
     if (!$ttok) return false;

Please login to merge, or discard this patch.

drupal/sites/default/boinc/modules/boinccore/includes/boinccore.rules.inc 2 patches

Upper-Lower-Casing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@
 block discarded – undo
 function boinccore_rules_event_info() {
   return array(
     'boinccore_comment_convert' => array(
-      'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
+      'label' => bts('A comment was converted to a new forum topic.', array(), null, 'boinc:rule-event'),
       'module' => 'BOINCcore',
       'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
     ),

Please login to merge, or discard this patch.

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -16,16 +16,16 @@
 block discarded – undo
  */
 
 function boinccore_rules_event_info() {
-  return array(
+    return array(
     'boinccore_comment_convert' => array(
-      'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'BOINCcore',
-      'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
+        'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'BOINCcore',
+        'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
     ),
     'boinccore_comment_unhidden' => array(
-      'label' => bts('A comment was unhidden.', array(), 'boinc:rule-event'),
-      'module' => 'BOINCcore',
-      'arguments' => rules_events_hook_comment_arguments(t('unhidden comment')),
+        'label' => bts('A comment was unhidden.', array(), 'boinc:rule-event'),
+        'module' => 'BOINCcore',
+        'arguments' => rules_events_hook_comment_arguments(t('unhidden comment')),
     ),
-  );
+    );
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	$view->base_table = 'user';
15	15	$view->core = 6;
16	16	$view->api_version = '2';
17		- $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
	17	+ $view->disabled = false; /* Edit this to true to make a default view disabled initially */
18	18	$handler = $view->new_display('default', 'Defaults', 'default');
19	19	$handler->override_option('fields', array(
20	20	'id' => array(
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	'hide_empty' => 0,
44	44	'empty_zero' => 0,
45	45	'hide_alter_empty' => 1,
46		- 'set_precision' => FALSE,
	46	+ 'set_precision' => false,
47	47	'precision' => 0,
48	48	'decimal' => '.',
49	49	'separator' => ',',
		@@ -340,7 +340,7 @@ discard block
		block discarded – undo
340	340	'hide_empty' => 0,
341	341	'empty_zero' => 0,
342	342	'hide_alter_empty' => 1,
343		- 'set_precision' => FALSE,
	343	+ 'set_precision' => false,
344	344	'precision' => 0,
345	345	'decimal' => '.',
346	346	'separator' => '',
		@@ -848,7 +848,7 @@ discard block
		block discarded – undo
848	848	'hide_empty' => 0,
849	849	'empty_zero' => 0,
850	850	'hide_alter_empty' => 1,
851		- 'set_precision' => FALSE,
	851	+ 'set_precision' => false,
852	852	'precision' => 0,
853	853	'decimal' => '.',
854	854	'separator' => '',
		@@ -1364,7 +1364,7 @@ discard block
		block discarded – undo
1364	1364	'hide_empty' => 0,
1365	1365	'empty_zero' => 0,
1366	1366	'hide_alter_empty' => 1,
1367		- 'set_precision' => FALSE,
	1367	+ 'set_precision' => false,
1368	1368	'precision' => 0,
1369	1369	'decimal' => '.',
1370	1370	'separator' => '',
		@@ -1583,9 +1583,9 @@ discard block
		block discarded – undo
1583	1583	'max' => '',
1584	1584	),
1585	1585	'group' => '0',
1586		- 'exposed' => FALSE,
	1586	+ 'exposed' => false,
1587	1587	'expose' => array(
1588		- 'operator' => FALSE,
	1588	+ 'operator' => false,
1589	1589	'label' => '',
1590	1590	),
1591	1591	'id' => 'send_email',
		@@ -1655,7 +1655,7 @@ discard block
		block discarded – undo
1655	1655	'hide_empty' => 0,
1656	1656	'empty_zero' => 0,
1657	1657	'hide_alter_empty' => 1,
1658		- 'set_precision' => FALSE,
	1658	+ 'set_precision' => false,
1659	1659	'precision' => 0,
1660	1660	'decimal' => '.',
1661	1661	'separator' => '',
		@@ -2144,7 +2144,7 @@ discard block
		block discarded – undo
2144	2144	'hide_empty' => 0,
2145	2145	'empty_zero' => 0,
2146	2146	'hide_alter_empty' => 1,
2147		- 'set_precision' => FALSE,
	2147	+ 'set_precision' => false,
2148	2148	'precision' => 0,
2149	2149	'decimal' => '.',
2150	2150	'separator' => '',
		@@ -2616,7 +2616,7 @@ discard block
		block discarded – undo
2616	2616	$view->base_table = 'team';
2617	2617	$view->core = 6;
2618	2618	$view->api_version = '2';
2619		- $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
	2619	+ $view->disabled = false; /* Edit this to true to make a default view disabled initially */
2620	2620	$handler = $view->new_display('default', 'Defaults', 'default');
2621	2621	$handler->override_option('fields', array(
2622	2622	'rownumber' => array(
		@@ -2677,7 +2677,7 @@ discard block
		block discarded – undo
2677	2677	'hide_empty' => 0,
2678	2678	'empty_zero' => 0,
2679	2679	'hide_alter_empty' => 1,
2680		- 'set_precision' => FALSE,
	2680	+ 'set_precision' => false,
2681	2681	'precision' => 0,
2682	2682	'decimal' => '.',
2683	2683	'separator' => '',
		@@ -2952,9 +2952,9 @@ discard block
		block discarded – undo
2952	2952	'max' => '',
2953	2953	),
2954	2954	'group' => '0',
2955		- 'exposed' => FALSE,
	2955	+ 'exposed' => false,
2956	2956	'expose' => array(
2957		- 'operator' => FALSE,
	2957	+ 'operator' => false,
2958	2958	'label' => '',
2959	2959	),
2960	2960	'id' => 'total_credit',
		@@ -3050,9 +3050,9 @@ discard block
		block discarded – undo
3050	3050	'max' => '',
3051	3051	),
3052	3052	'group' => '0',
3053		- 'exposed' => FALSE,
	3053	+ 'exposed' => false,
3054	3054	'expose' => array(
3055		- 'operator' => FALSE,
	3055	+ 'operator' => false,
3056	3056	'label' => '',
3057	3057	),
3058	3058	'id' => 'total_credit',
		@@ -3184,7 +3184,7 @@ discard block
		block discarded – undo
3184	3184	'hide_empty' => 0,
3185	3185	'empty_zero' => 0,
3186	3186	'hide_alter_empty' => 1,
3187		- 'set_precision' => FALSE,
	3187	+ 'set_precision' => false,
3188	3188	'precision' => 0,
3189	3189	'decimal' => '.',
3190	3190	'separator' => '',
		@@ -3300,7 +3300,7 @@ discard block
		block discarded – undo
3300	3300	'hide_empty' => 0,
3301	3301	'empty_zero' => 0,
3302	3302	'hide_alter_empty' => 0,
3303		- 'set_precision' => FALSE,
	3303	+ 'set_precision' => false,
3304	3304	'precision' => 0,
3305	3305	'decimal' => '.',
3306	3306	'separator' => '',
		@@ -3550,7 +3550,7 @@ discard block
		block discarded – undo
3550	3550	'hide_empty' => 0,
3551	3551	'empty_zero' => 0,
3552	3552	'hide_alter_empty' => 1,
3553		- 'set_precision' => FALSE,
	3553	+ 'set_precision' => false,
3554	3554	'precision' => 0,
3555	3555	'decimal' => '.',
3556	3556	'separator' => '',
		@@ -3594,7 +3594,7 @@ discard block
		block discarded – undo
3594	3594	'hide_empty' => 0,
3595	3595	'empty_zero' => 0,
3596	3596	'hide_alter_empty' => 1,
3597		- 'set_precision' => FALSE,
	3597	+ 'set_precision' => false,
3598	3598	'precision' => 0,
3599	3599	'decimal' => '.',
3600	3600	'separator' => '',
		@@ -3818,9 +3818,9 @@ discard block
		block discarded – undo
3818	3818	'max' => '',
3819	3819	),
3820	3820	'group' => '0',
3821		- 'exposed' => FALSE,
	3821	+ 'exposed' => false,
3822	3822	'expose' => array(
3823		- 'operator' => FALSE,
	3823	+ 'operator' => false,
3824	3824	'label' => '',
3825	3825	),
3826	3826	'id' => 'userid',
		@@ -3960,7 +3960,7 @@ discard block
		block discarded – undo
3960	3960	'hide_empty' => 0,
3961	3961	'empty_zero' => 0,
3962	3962	'hide_alter_empty' => 1,
3963		- 'set_precision' => FALSE,
	3963	+ 'set_precision' => false,
3964	3964	'precision' => 0,
3965	3965	'decimal' => '.',
3966	3966	'separator' => '',
		@@ -4148,9 +4148,9 @@ discard block
		block discarded – undo
4148	4148	'max' => '',
4149	4149	),
4150	4150	'group' => '0',
4151		- 'exposed' => FALSE,
	4151	+ 'exposed' => false,
4152	4152	'expose' => array(
4153		- 'operator' => FALSE,
	4153	+ 'operator' => false,
4154	4154	'label' => '',
4155	4155	),
4156	4156	'id' => 'total_credit',

		@@ -44,8 +44,7 @@ discard block
		block discarded – undo
44	44	$nid = $existing_teams[$boinc_team->id];
45	45	$success = boincteam_import($boinc_team, $nid);
46	46	}
47		- }
48		- else {
	47	+ } else {
49	48	// Import new teams created by RPC or ops/team_import.php
50	49	$success = boincteam_import($boinc_team);
51	50	}
		@@ -77,8 +76,7 @@ discard block
		block discarded – undo
77	76	$node->body = $boincteam->description;
78	77	$node->teaser = $teaser;
79	78	$node->uid = boincuser_lookup_uid($boincteam->userid);
80		- }
81		- else {
	79	+ } else {
82	80	// Construct the team as a new node
83	81	$node = array(
84	82	'type' => 'team',
		@@ -132,8 +130,7 @@ discard block
		block discarded – undo
132	130	}
133	131	if ($boincid) {
134	132	return $ids;
135		- }
136		- else {
	133	+ } else {
137	134	return array_map('boincuser_lookup_uid', $ids);
138	135	}
139	136	}

		@@ -15,41 +15,41 @@ discard block
		block discarded – undo
15	15	*/
16	16	function boincteam_sync() {
17	17
18		- // Get the list of teams to import
19		- db_set_active('boinc_rw');
20		- $boinc_teams = db_query('
	18	+ // Get the list of teams to import
	19	+ db_set_active('boinc_rw');
	20	+ $boinc_teams = db_query('
21	21	SELECT id, name, description, userid, create_time, seti_id
22	22	FROM team
23	23	WHERE mod_time > FROM_UNIXTIME(%d)',
24	24	variable_get('boincteam_last_sync', 0)
25		- );
26		- db_set_active('default');
	25	+ );
	26	+ db_set_active('default');
27	27
28		- $existing_teams = array();
	28	+ $existing_teams = array();
29	29
30		- // Get the list of teams already in Drupal to be sure we're not importing
31		- // any twice
32		- $result = db_query('
	30	+ // Get the list of teams already in Drupal to be sure we're not importing
	31	+ // any twice
	32	+ $result = db_query('
33	33	SELECT nid, team_id FROM {boincteam}'
34		- );
35		- while ($row = db_fetch_object($result)) {
	34	+ );
	35	+ while ($row = db_fetch_object($result)) {
36	36	$existing_teams[$row->team_id] = $row->nid;
37		- }
	37	+ }
38	38
39		- while ($boinc_team = db_fetch_object($boinc_teams)) {
	39	+ while ($boinc_team = db_fetch_object($boinc_teams)) {
40	40	$success = NULL;
41	41	if (isset($existing_teams[$boinc_team->id])) {
42		- if ($boinc_team->seti_id > 0) {
	42	+ if ($boinc_team->seti_id > 0) {
43	43	// Sync BOINC-wide teams
44	44	$nid = $existing_teams[$boinc_team->id];
45	45	$success = boincteam_import($boinc_team, $nid);
46		- }
	46	+ }
47	47	}
48	48	else {
49		- // Import new teams created by RPC or ops/team_import.php
50		- $success = boincteam_import($boinc_team);
	49	+ // Import new teams created by RPC or ops/team_import.php
	50	+ $success = boincteam_import($boinc_team);
	51	+ }
51	52	}
52		- }
53	53	}
54	54
55	55
		@@ -58,58 +58,58 @@ discard block
		block discarded – undo
58	58	*/
59	59	function boincteam_import($boincteam, $nid = NULL) {
60	60
61		- $input_format = variable_get('boincimport_input_format', 0);
62		- $team_type_map = variable_get('boincimport_team_types', array());
	61	+ $input_format = variable_get('boincimport_input_format', 0);
	62	+ $team_type_map = variable_get('boincimport_team_types', array());
63	63
64		- // Save the team type affiliation
65		- $team_type_tid = $team_type_map[$boincteam->type];
	64	+ // Save the team type affiliation
	65	+ $team_type_tid = $team_type_map[$boincteam->type];
66	66
67		- $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
68		- // Be sure the text is filtered for the default input format
69		- $boincteam->description = check_markup($boincteam->description, $input_format);
	67	+ $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
	68	+ // Be sure the text is filtered for the default input format
	69	+ $boincteam->description = check_markup($boincteam->description, $input_format);
70	70
71		- $teaser = node_teaser($boincteam->description);
	71	+ $teaser = node_teaser($boincteam->description);
72	72
73		- if ($nid) {
	73	+ if ($nid) {
74	74	// Update an existing node
75	75	$node = node_load($nid);
76	76	$node->title = $boincteam->name;
77	77	$node->body = $boincteam->description;
78	78	$node->teaser = $teaser;
79	79	$node->uid = boincuser_lookup_uid($boincteam->userid);
80		- }
81		- else {
	80	+ }
	81	+ else {
82	82	// Construct the team as a new node
83	83	$node = array(
84		- 'type' => 'team',
85		- 'title' => $boincteam->name,
86		- 'body' => $boincteam->description,
87		- 'teaser' => $teaser,
88		- 'uid' => boincuser_lookup_uid($boincteam->userid),
89		- 'path' => null,
90		- 'status' => 1, // published or not - always publish
91		- 'promote' => 0,
92		- 'created' => $boincteam->create_time,
93		- 'comment' => 0, // comments disabled
94		- 'moderate' => 0,
95		- 'sticky' => 0,
96		- 'format' => $input_format
	84	+ 'type' => 'team',
	85	+ 'title' => $boincteam->name,
	86	+ 'body' => $boincteam->description,
	87	+ 'teaser' => $teaser,
	88	+ 'uid' => boincuser_lookup_uid($boincteam->userid),
	89	+ 'path' => null,
	90	+ 'status' => 1, // published or not - always publish
	91	+ 'promote' => 0,
	92	+ 'created' => $boincteam->create_time,
	93	+ 'comment' => 0, // comments disabled
	94	+ 'moderate' => 0,
	95	+ 'sticky' => 0,
	96	+ 'format' => $input_format
97	97	);
98	98	$node = (object) $node; // node_save requires an object form
99		- }
	99	+ }
100	100
101		- $node->taxonomy[] = taxonomy_get_term($team_type_tid);
	101	+ $node->taxonomy[] = taxonomy_get_term($team_type_tid);
102	102
103		- // Save the team node
104		- node_save($node);
105		- $success = ($node->nid) ? TRUE : FALSE;
	103	+ // Save the team node
	104	+ node_save($node);
	105	+ $success = ($node->nid) ? TRUE : FALSE;
106	106
107		- if (!$nid) {
	107	+ if (!$nid) {
108	108	// Save the team IDs to a BOINC <--> Drupal reference table, if needed
109	109	db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam->id, $node->nid);
110		- }
	110	+ }
111	111
112		- return $success;
	112	+ return $success;
113	113	}
114	114
115	115	/**
		@@ -126,25 +126,25 @@ discard block
		block discarded – undo
126	126	* respected. This is useful the list of users are to be contacted.
127	127	*/
128	128	function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
129		- $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
130		- if ($respectprivacy) {
	129	+ $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
	130	+ if ($respectprivacy) {
131	131	$sql .= ' AND user.send_email=1';
132		- }
	132	+ }
133	133
134		- db_set_active('boinc_ro');
135		- $dbres = db_query($sql, $boincteamid);
136		- db_set_active('default');
	134	+ db_set_active('boinc_ro');
	135	+ $dbres = db_query($sql, $boincteamid);
	136	+ db_set_active('default');
137	137
138		- $ids = array();
139		- while (($result = db_fetch_object($dbres)) != FALSE) {
	138	+ $ids = array();
	139	+ while (($result = db_fetch_object($dbres)) != FALSE) {
140	140	$ids[] = $result->id;
141		- }
142		- if ($boincid) {
	141	+ }
	142	+ if ($boincid) {
143	143	return $ids;
144		- }
145		- else {
	144	+ }
	145	+ else {
146	146	return array_map('boincuser_lookup_uid', $ids);
147		- }
	147	+ }
148	148	}
149	149
150	150	/**
		@@ -158,18 +158,18 @@ discard block
		block discarded – undo
158	158	* respected. This is useful the list of users are to be contacted.
159	159	*/
160	160	function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
161		- $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
162		- if ($respectprivacy) {
	161	+ $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
	162	+ if ($respectprivacy) {
163	163	$sql .= ' AND user.send_email=1';
164		- }
	164	+ }
165	165
166		- db_set_active('boinc_ro');
167		- $dbres = db_query($sql, $boincteamid);
168		- db_set_active('default');
	166	+ db_set_active('boinc_ro');
	167	+ $dbres = db_query($sql, $boincteamid);
	168	+ db_set_active('default');
169	169
170		- $emails = array();
171		- while (($result = db_fetch_object($dbres)) != FALSE) {
	170	+ $emails = array();
	171	+ while (($result = db_fetch_object($dbres)) != FALSE) {
172	172	$emails[] = $result->email_addr;
173		- }
174		- return $emails;
	173	+ }
	174	+ return $emails;
175	175	}

		@@ -87,15 +87,15 @@ discard block
		block discarded – undo
87	87	'teaser' => $teaser,
88	88	'uid' => boincuser_lookup_uid($boincteam->userid),
89	89	'path' => null,
90		- 'status' => 1, // published or not - always publish
	90	+ 'status' => 1, // published or not - always publish
91	91	'promote' => 0,
92	92	'created' => $boincteam->create_time,
93		- 'comment' => 0, // comments disabled
	93	+ 'comment' => 0, // comments disabled
94	94	'moderate' => 0,
95	95	'sticky' => 0,
96	96	'format' => $input_format
97	97	);
98		- $node = (object) $node; // node_save requires an object form
	98	+ $node = (object)$node; // node_save requires an object form
99	99	}
100	100
101	101	$node->taxonomy[] = taxonomy_get_term($team_type_tid);
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	* flag send_email=1, meaning their notification privacy will be
126	126	* respected. This is useful the list of users are to be contacted.
127	127	*/
128		-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
	128	+function _boincteam_userids($boincteamid, $boincid = TRUE, $respectprivacy = TRUE) {
129	129	$sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
130	130	if ($respectprivacy) {
131	131	$sql .= ' AND user.send_email=1';
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	* flag send_email=1, meaning their notification privacy will be
158	158	* respected. This is useful the list of users are to be contacted.
159	159	*/
160		-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
	160	+function _boincteam_emails($boincteamid, $respectprivacy = TRUE) {
161	161	$sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
162	162	if ($respectprivacy) {
163	163	$sql .= ' AND user.send_email=1';

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	}
38	38
39	39	while ($boinc_team = db_fetch_object($boinc_teams)) {
40		- $success = NULL;
	40	+ $success = null;
41	41	if (isset($existing_teams[$boinc_team->id])) {
42	42	if ($boinc_team->seti_id > 0) {
43	43	// Sync BOINC-wide teams
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	/**
57	57	* Import a given BOINC team object into Drupal
58	58	*/
59		-function boincteam_import($boincteam, $nid = NULL) {
	59	+function boincteam_import($boincteam, $nid = null) {
60	60
61	61	$input_format = variable_get('boincimport_input_format', 0);
62	62	$team_type_map = variable_get('boincimport_team_types', array());
		@@ -102,7 +102,7 @@ discard block
		block discarded – undo
102	102
103	103	// Save the team node
104	104	node_save($node);
105		- $success = ($node->nid) ? TRUE : FALSE;
	105	+ $success = ($node->nid) ? true : false;
106	106
107	107	if (!$nid) {
108	108	// Save the team IDs to a BOINC <--> Drupal reference table, if needed
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	* flag send_email=1, meaning their notification privacy will be
126	126	* respected. This is useful the list of users are to be contacted.
127	127	*/
128		-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
	128	+function _boincteam_userids($boincteamid, $boincid=true, $respectprivacy=true) {
129	129	$sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
130	130	if ($respectprivacy) {
131	131	$sql .= ' AND user.send_email=1';
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	db_set_active('default');
137	137
138	138	$ids = array();
139		- while (($result = db_fetch_object($dbres)) != FALSE) {
	139	+ while (($result = db_fetch_object($dbres)) != false) {
140	140	$ids[] = $result->id;
141	141	}
142	142	if ($boincid) {
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	* flag send_email=1, meaning their notification privacy will be
158	158	* respected. This is useful the list of users are to be contacted.
159	159	*/
160		-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
	160	+function _boincteam_emails($boincteamid, $respectprivacy=true) {
161	161	$sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
162	162	if ($respectprivacy) {
163	163	$sql .= ' AND user.send_email=1';
		@@ -168,7 +168,7 @@ discard block
		block discarded – undo
168	168	db_set_active('default');
169	169
170	170	$emails = array();
171		- while (($result = db_fetch_object($dbres)) != FALSE) {
	171	+ while (($result = db_fetch_object($dbres)) != false) {
172	172	$emails[] = $result->email_addr;
173	173	}
174	174	return $emails;

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	* Callback admin/boinc/import/settings
6	6	*/
7	7	function boincimport_admin_settings() {
8		- global $conf ;
	8	+ global $conf;
9	9	global $db_url;
10	10	global $base_url;
11	11	$stage = variable_get('boincimport_config_stage', 0);
		@@ -27,17 +27,17 @@ discard block
		block discarded – undo
27	27
28	28	$output = '';
29	29	if (!variable_get('boincimport_tested', 0)) {
30		- $form['test']['#collapsed']= FALSE;
	30	+ $form['test']['#collapsed'] = FALSE;
31	31	$output = '<span class="marker">';
32	32	$ready_for_migration = 0;
33	33	}
34		- $output .= '<p>' . t('The migration will modify and even destroy some data. You
	34	+ $output .= '<p>'.t('The migration will modify and even destroy some data. You
35	35	must test this module on a copy of your data first, several times if necessary.
36	36	Only use this module on your live data when you are familiar with the procedure
37		- and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you
	37	+ and you\'re confident everything will run smoothly.').'</p><p>'.t('Also, you
38	38	should make a full backup of your database just prior to performing the
39	39	migration on the live data. It is better to turn off both the BOINC site and the
40		- Drupal site during the migration.') . '</p>';
	40	+ Drupal site during the migration.').'</p>';
41	41	if (!variable_get('boincimport_tested', 0)) {
42	42	$output .= '</span>';
43	43	}
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55
56	56	// Where is BOINC data?
57	57	$pre = variable_get('boincimport_table_prefix', '');
58		- $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
	58	+ $tables = array($pre.'forum', $pre.'post', $pre.'thread', $pre.'user');
59	59	$db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
60	60	$result = _boincimport_check_tables($tables, $db, 0);
61	61
		@@ -79,8 +79,8 @@ discard block
		block discarded – undo
79	79	$default_db_url = is_array($db_url) ? end($db_url) : $db_url;
80	80	$url = variable_get('boincimport_db_url', $default_db_url);
81	81	if (!preg_match('{(mysql\|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) {
82		- $output = '<p class="marker">'. t('Set the address of the BOINC database
83		- according to the following format:') . '<br /><pre>
	82	+ $output = '<p class="marker">'.t('Set the address of the BOINC database
	83	+ according to the following format:').'<br /><pre>
84	84	mysql://boinc_username:boinc_password@localhost/boinc_database
85	85	</pre></p>';
86	86	$ready_for_migration = 0;
		@@ -98,13 +98,13 @@ discard block
		block discarded – undo
98	98	);
99	99	}
100	100
101		- $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
	101	+ $output = '<p>'.t('Note that due to a limitation within Drupal core, we cannot
102	102	import messages from one database type to another database type. E.g, we
103	103	cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import
104	104	the data into the same type of database first (import all the BOINC data, as is,
105		- from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on
	105	+ from mysql to postgresql).').'</p><p>'.t('If both BOINC and Drupal are on
106	106	postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
107		- 'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
	107	+ 'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))).'</p>';
108	108	$form['boinc_data']['note'] = array('#value' => $output);
109	109
110	110	// BOINC table prefix
		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	$output = $result['html'];
122	122	if ($result['result'] != 1) {
123	123	$ready_for_migration = 0;
124		- $form['boinc_data']['#collapsed']= FALSE;
	124	+ $form['boinc_data']['#collapsed'] = FALSE;
125	125	$output .= '<span class="marker">';
126	126	$output .= t('Some tables couldn\'t be found. Are the database settings correct?
127	127	Please correct the errors so that the BOINC tables can be accessed.');
		@@ -169,15 +169,15 @@ discard block
		block discarded – undo
169	169	'#collapsible' => TRUE,
170	170	'#collapsed' => TRUE
171	171	);
172		- $output = '<p>'. t('Select which !input_format should be used for the imported
	172	+ $output = '<p>'.t('Select which !input_format should be used for the imported
173	173	messages. It is highly-recommended that this value be left as it is, as the
174	174	Full HTML and PHP code formats can be very dangerous!',
175		- array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>';
	175	+ array('!input_format' => l(t('input format'), 'admin/settings/filters'))).'</p>';
176	176	$form['input']['intro'] = array('#value' => $output);
177	177
178	178	$formats = db_query('SELECT format, name FROM {filter_formats}');
179	179	while ($format = db_fetch_array($formats)) {
180		- $input_formats[$format['format']]= $format['name'];
	180	+ $input_formats[$format['format']] = $format['name'];
181	181	}
182	182
183	183	// By default, use the format named "Rich text"; fall back to Filtered HTML
		@@ -194,10 +194,10 @@ discard block
		block discarded – undo
194	194	);
195	195	if (!$input_format) {
196	196	$ready_for_migration = 0;
197		- $form['input']['#collapsed']= FALSE;
	197	+ $form['input']['#collapsed'] = FALSE;
198	198	}
199		- $output = '<p><em>'. t('This setting will be applied to all posts and private
200		- messages.') .'</em></p>';
	199	+ $output = '<p><em>'.t('This setting will be applied to all posts and private
	200	+ messages.').'</em></p>';
201	201	$form['input']['result'] = array('#value' => $output);
202	202
203	203	// BBcode settings
		@@ -208,23 +208,23 @@ discard block
		block discarded – undo
208	208	'#collapsed' => TRUE,
209	209	);
210	210
211		- $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
212		- import process, BBcode can be handled in two diffent ways') . ':</p>';
213		- $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
	211	+ $output = '<p>'.t('BOINC posts are often formatted in BBcode. During the
	212	+ import process, BBcode can be handled in two diffent ways').':</p>';
	213	+ $output .= '<ul><li>'.t('Leave the BBcode as is and use the !bbcode_module
214	214	after the migration to filter the imported posts. In this case, the module
215	215	is not required during the migration, but will need to be installed and
216	216	configured later.',
217	217	array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode',
218		- array('attributes' => array('target' => '_blank'))))) . '</li>';
219		- $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
	218	+ array('attributes' => array('target' => '_blank'))))).'</li>';
	219	+ $output .= '<li>'.t('Filter the BBcode now and replace it with plain HTML.
220	220	The BBcode module will be required during the migration process, but can
221		- be disabled afterwards.') . '</li></ul>';
222		- $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
	221	+ be disabled afterwards.').'</li></ul>';
	222	+ $output .= '<p>'.t('An appropriate input filter should be chosen, as well,
223	223	as it will affect how the post is displayed. For example, if BBcode is
224	224	removed and replaced by HTML, some HTML tags will be stripped by the
225	225	"Filtered HTML" input format unless they are first added to the list of
226	226	allowed tags in that format. See the !input_formats page.',
227		- array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>';
	227	+ array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))).'</p>';
228	228
229	229	$form['bbcode']['intro'] = array('#value' => $output);
230	230	$form['bbcode']['boincimport_bbcode'] = array(
		@@ -254,28 +254,28 @@ discard block
		block discarded – undo
254	254	$result = db_query($sql, $input_format);
255	255	if (!db_result($result)) {
256	256	$form['bbcode']['#collapsed'] = FALSE;
257		- $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
	257	+ $output .= '<p class="marker">'.t('You need to !enable_bbcode_input and
258	258	then !configure_bbcode_options', array(
259	259	'!enable_bbcode_input' => l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
260		- '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
	260	+ '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
261	261	}
262		- $output .= '<p>'. t('For best results, !disable_all_options',
263		- array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
	262	+ $output .= '<p>'.t('For best results, !disable_all_options',
	263	+ array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))).'.</p>';
264	264	} else {
265	265	if ($bbcode_disabled) {
266	266	$form['bbcode']['#collapsed'] = FALSE;
267		- $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
	267	+ $output .= '<p>'.t('The !bbcode_module is recommended, but not required.
268	268	You may !enable_bbcode after having installed it.', array(
269	269	'!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
270		- '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
	270	+ '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))).'</p>';
271	271	}
272		- $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
	272	+ $output .= '<p>'.t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
273	273	'!enable_bbcode_input' => l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
274		- '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
275		- $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>';
	274	+ '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
	275	+ $output .= '<p>'.t('You may want to enable it for other input formats, too.').'</p>';
276	276	}
277		- $output .= '<p><em>'. t('This setting will be applied to all posts, private
278		- messages and the users\' signature.') .'</em></p>';
	277	+ $output .= '<p><em>'.t('This setting will be applied to all posts, private
	278	+ messages and the users\' signature.').'</em></p>';
279	279
280	280	$form['bbcode']['result'] = array('#value' => $output);
281	281
		@@ -287,7 +287,7 @@ discard block
		block discarded – undo
287	287	'#collapsed' => TRUE,
288	288	);
289	289	if (!variable_get('boincimport_base_url_boinc', 0)) {
290		- $form['url_transforms']['#collapsed']= FALSE;
	290	+ $form['url_transforms']['#collapsed'] = FALSE;
291	291	$output = '<span class="marker">';
292	292	$ready_for_migration = 0;
293	293	}
		@@ -320,11 +320,11 @@ discard block
		block discarded – undo
320	320	);
321	321	variable_set('boincimport_ready', $ready_for_migration);
322	322	if ($ready_for_migration) {
323		- $output = '<p>'. t('Check the settings above one more time. If everything
324		- is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>';
	323	+ $output = '<p>'.t('Check the settings above one more time. If everything
	324	+ is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))).'</p>';
325	325	} else {
326		- $output = '<p class="marker">'. t('You are not ready for the migration yet.
327		- Please check the settings above.') .'</p>';
	326	+ $output = '<p class="marker">'.t('You are not ready for the migration yet.
	327	+ Please check the settings above.').'</p>';
328	328	}
329	329
330	330	$form['migration']['info'] = array('#value' => $output);
		@@ -335,23 +335,23 @@ discard block
		block discarded – undo
335	335	* Callback admin/boinc/import/post_configuration
336	336	*/
337	337	function boincimport_post_configuration() {
338		- $output = '<p>'. t('This page will help to tie up any loose ends following
	338	+ $output = '<p>'.t('This page will help to tie up any loose ends following
339	339	the BOINC data import process. Before continuing, it may be best to have
340		- already:') .'</p>';
	340	+ already:').'</p>';
341	341	$output .= '<ul>';
342		- $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
343		- import module') .'</li>';
344		- $output .= '<li>'. t('Imported any additional data using add on modules if
345		- available.') .'</li>';
	342	+ $output .= '<li>'.t('Imported users, teams, and forums using the BOINC
	343	+ import module').'</li>';
	344	+ $output .= '<li>'.t('Imported any additional data using add on modules if
	345	+ available.').'</li>';
346	346	$output .= '</ul>';
347	347	//User Set up
348		- $output .= '<h2>'. t('User settings') .'</h2>';
349		- $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
	348	+ $output .= '<h2>'.t('User settings').'</h2>';
	349	+ $output .= '<p>'.t('Make sure your !user_settings are correct. Specifically,
350	350	you can enable or disable signatures there. ', array(
351	351	'!user_settings' => l(t('user settings'), 'admin/user/settings')
352		- )) .'</p>';
353		- $output .= '<p>' . t('Note that avatar/picture support is not tied to user
354		- settings Picture support at this time.') . '</p>';
	352	+ )).'</p>';
	353	+ $output .= '<p>'.t('Note that avatar/picture support is not tied to user
	354	+ settings Picture support at this time.').'</p>';
355	355	/*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
356	356	enable pictures on this page and also:') . '</p>';
357	357	$output .= '<ul>';
		@@ -366,15 +366,15 @@ discard block
		block discarded – undo
366	366	$output .= '</ul>'; */
367	367
368	368	// Forum Set up
369		- $output .= '<h2>'. t('Forum settings') .'</h2>';
370		- $output .= '<p>'. t('Check any additional changes to make on the
	369	+ $output .= '<h2>'.t('Forum settings').'</h2>';
	370	+ $output .= '<p>'.t('Check any additional changes to make on the
371	371	!forum_settings page.', array(
372	372	'!forum_settings' => l(t('forum settings'), 'admin/content/forum/settings')
373		- )) .'</p>';
374		- $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
	373	+ )).'</p>';
	374	+ $output .= '<p>'.t('It also may be a good idea to look at the !forum_list to
375	375	verify that all necessary containers and forums are in place.', array(
376	376	'!forum_list' => l(t('forum list'), 'admin/content/forum')
377		- )) .'</p>';
	377	+ )).'</p>';
378	378	/*$output .= '<p>'. t('If need be, set up the private forums as explained in the
379	379	!documentation.', array(
380	380	'!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank')))
		@@ -390,17 +390,17 @@ discard block
		block discarded – undo
390	390	// BBcode
391	391	$bbcode = variable_get('boincimport_bbcode', 0);
392	392	if ($bbcode) {
393		- $output .= '<h2>'. t('Remove BBcode module') .'</h2>';
394		- $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t
395		- need the bbcode module anymore. You can disable it.') .'</p>';
	393	+ $output .= '<h2>'.t('Remove BBcode module').'</h2>';
	394	+ $output .= '<p>'.t('The BBcode has been cleaned from the posts. You shouldn\'t
	395	+ need the bbcode module anymore. You can disable it.').'</p>';
396	396	} else {
397		- $output .= '<h2>'. t('Configure BBcode module') .'</h2>';
398		- $output .= '<p>'. t('Most likely, there are many BOINC forum postings
	397	+ $output .= '<h2>'.t('Configure BBcode module').'</h2>';
	398	+ $output .= '<p>'.t('Most likely, there are many BOINC forum postings
399	399	formatted in BBcode. It would be a good idea to verify that BBcode is
400	400	being formatted correctly in the imported posts. Have a look around
401	401	!the_forum.', array(
402	402	'!the_forum' => l(t('the forum'), 'community')
403		- )) . '</p>';
	403	+ )).'</p>';
404	404	}
405	405
406	406	return $output;
		@@ -445,11 +445,11 @@ discard block
		block discarded – undo
445	445	$output .= '</ol>';
446	446
447	447	// process will die() if the link to the BOINC database is wrong:
448		- $output .= '<p>'. t('If the BOINC data is in another database, but you made a
	448	+ $output .= '<p>'.t('If the BOINC data is in another database, but you made a
449	449	mistake while setting up the data base url, you may be unable to access the
450	450	setting page due to some limitations of the core of Drupal. !reset_db_url.', array(
451	451	'!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
452		- )) .'</p>';
	452	+ )).'</p>';
453	453
454	454	return $output;
455	455	}

		@@ -21,13 +21,13 @@ discard block
		block discarded – undo
21	21	$form['test'] = array(
22	22	'#type' => 'fieldset',
23	23	'#title' => t('Test on copy first'),
24		- '#collapsible' => TRUE,
25		- '#collapsed' => TRUE,
	24	+ '#collapsible' => true,
	25	+ '#collapsed' => true,
26	26	);
27	27
28	28	$output = '';
29	29	if (!variable_get('boincimport_tested', 0)) {
30		- $form['test']['#collapsed']= FALSE;
	30	+ $form['test']['#collapsed']= false;
31	31	$output = '<span class="marker">';
32	32	$ready_for_migration = 0;
33	33	}
		@@ -56,15 +56,15 @@ discard block
		block discarded – undo
56	56	// Where is BOINC data?
57	57	$pre = variable_get('boincimport_table_prefix', '');
58	58	$tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
59		- $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
	59	+ $db = (is_array($db_url) and isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
60	60	$result = _boincimport_check_tables($tables, $db, 0);
61	61
62	62	$config_path = conf_path();
63	63	$form['boinc_data'] = array(
64	64	'#type' => 'fieldset',
65	65	'#title' => t('Location of BOINC data'),
66		- '#collapsible' => TRUE,
67		- '#collapsed' => TRUE,
	66	+ '#collapsible' => true,
	67	+ '#collapsed' => true,
68	68	);
69	69	$form['boinc_data']['boincimport_db_configured'] = array(
70	70	'#type' => 'checkbox',
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	'#return_value' => 1,
74	74	'#default_value' => variable_get('boincimport_db_configured', 1),
75	75	'#description' => '',
76		- '#disabled' => ($result['result']) ? TRUE : FALSE
	76	+ '#disabled' => ($result['result']) ? true : false
77	77	);
78	78	if (variable_get('boincimport_db_configured', 1) != 1) {
79	79	$default_db_url = is_array($db_url) ? end($db_url) : $db_url;
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	mysql://boinc_username:boinc_password@localhost/boinc_database
85	85	</pre></p>';
86	86	$ready_for_migration = 0;
87		- $form['boinc_data']['#collapsed'] = FALSE;
	87	+ $form['boinc_data']['#collapsed'] = false;
88	88	$form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
89	89	}
90	90
		@@ -115,13 +115,13 @@ discard block
		block discarded – undo
115	115	'#size' => 20,
116	116	'#maxlength' => 255,
117	117	'#description' => t('What prefix is used for your BOINC tables?'),
118		- '#disabled' => ($result['result']) ? TRUE : FALSE
	118	+ '#disabled' => ($result['result']) ? true : false
119	119	);
120	120
121	121	$output = $result['html'];
122	122	if ($result['result'] != 1) {
123	123	$ready_for_migration = 0;
124		- $form['boinc_data']['#collapsed']= FALSE;
	124	+ $form['boinc_data']['#collapsed']= false;
125	125	$output .= '<span class="marker">';
126	126	$output .= t('Some tables couldn\'t be found. Are the database settings correct?
127	127	Please correct the errors so that the BOINC tables can be accessed.');
		@@ -134,8 +134,8 @@ discard block
		block discarded – undo
134	134	$form['users'] = array(
135	135	'#type' => 'fieldset',
136	136	'#title' => t('User import'),
137		- '#collapsible' => TRUE,
138		- '#collapsed' => TRUE,
	137	+ '#collapsible' => true,
	138	+ '#collapsed' => true,
139	139	);
140	140
141	141	// User import batch size
		@@ -166,8 +166,8 @@ discard block
		block discarded – undo
166	166	$form['input'] = array(
167	167	'#type' => 'fieldset',
168	168	'#title' => t('Input format settings'),
169		- '#collapsible' => TRUE,
170		- '#collapsed' => TRUE
	169	+ '#collapsible' => true,
	170	+ '#collapsed' => true
171	171	);
172	172	$output = '<p>'. t('Select which !input_format should be used for the imported
173	173	messages. It is highly-recommended that this value be left as it is, as the
		@@ -194,7 +194,7 @@ discard block
		block discarded – undo
194	194	);
195	195	if (!$input_format) {
196	196	$ready_for_migration = 0;
197		- $form['input']['#collapsed']= FALSE;
	197	+ $form['input']['#collapsed']= false;
198	198	}
199	199	$output = '<p><em>'. t('This setting will be applied to all posts and private
200	200	messages.') .'</em></p>';
		@@ -204,8 +204,8 @@ discard block
		block discarded – undo
204	204	$form['bbcode'] = array(
205	205	'#type' => 'fieldset',
206	206	'#title' => t('BBcode settings'),
207		- '#collapsible' => TRUE,
208		- '#collapsed' => TRUE,
	207	+ '#collapsible' => true,
	208	+ '#collapsed' => true,
209	209	);
210	210
211	211	$output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
		@@ -242,7 +242,7 @@ discard block
		block discarded – undo
242	242	if (variable_get('boincimport_bbcode', 0)) {
243	243	if ($bbcode_disabled) {
244	244	$ready_for_migration = 0;
245		- $form['bbcode']['#collapsed'] = FALSE;
	245	+ $form['bbcode']['#collapsed'] = false;
246	246	$output .= '<p><span class="marker">';
247	247	$output .= t('The !bbcode_module is required to transform BBcode into HTML.
248	248	You first need to !enable_bbcode', array(
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	$sql = "SELECT COUNT(*) FROM {filters} WHERE module = 'bbcode' AND format = %d";
254	254	$result = db_query($sql, $input_format);
255	255	if (!db_result($result)) {
256		- $form['bbcode']['#collapsed'] = FALSE;
	256	+ $form['bbcode']['#collapsed'] = false;
257	257	$output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
258	258	then !configure_bbcode_options', array(
259	259	'!enable_bbcode_input' => l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
		@@ -263,7 +263,7 @@ discard block
		block discarded – undo
263	263	array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
264	264	} else {
265	265	if ($bbcode_disabled) {
266		- $form['bbcode']['#collapsed'] = FALSE;
	266	+ $form['bbcode']['#collapsed'] = false;
267	267	$output .= '<p>'. t('The !bbcode_module is recommended, but not required.
268	268	You may !enable_bbcode after having installed it.', array(
269	269	'!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
		@@ -283,11 +283,11 @@ discard block
		block discarded – undo
283	283	$form['url_transforms'] = array(
284	284	'#type' => 'fieldset',
285	285	'#title' => t('URL transforms'),
286		- '#collapsible' => TRUE,
287		- '#collapsed' => TRUE,
	286	+ '#collapsible' => true,
	287	+ '#collapsed' => true,
288	288	);
289	289	if (!variable_get('boincimport_base_url_boinc', 0)) {
290		- $form['url_transforms']['#collapsed']= FALSE;
	290	+ $form['url_transforms']['#collapsed']= false;
291	291	$output = '<span class="marker">';
292	292	$ready_for_migration = 0;
293	293	}
		@@ -315,8 +315,8 @@ discard block
		block discarded – undo
315	315	$form['migration'] = array(
316	316	'#type' => 'fieldset',
317	317	'#title' => 'Migration',
318		- '#collapsible' => TRUE,
319		- '#collapsed' => FALSE,
	318	+ '#collapsible' => true,
	319	+ '#collapsed' => false,
320	320	);
321	321	variable_set('boincimport_ready', $ready_for_migration);
322	322	if ($ready_for_migration) {

		@@ -4,48 +4,48 @@
		block discarded – undo
4	4	* Implementation of hook_user_default_permissions().
5	5	*/
6	6	function private_messages_user_default_permissions() {
7		- $permissions = array();
	7	+ $permissions = array();
8	8
9		- // Exported permission: administer privatemsg settings
10		- $permissions['administer privatemsg settings'] = array(
	9	+ // Exported permission: administer privatemsg settings
	10	+ $permissions['administer privatemsg settings'] = array(
11	11	'name' => 'administer privatemsg settings',
12	12	'roles' => array(
13		- '0' => 'administrator',
	13	+ '0' => 'administrator',
14	14	),
15		- );
	15	+ );
16	16
17		- // Exported permission: delete privatemsg
18		- $permissions['delete privatemsg'] = array(
	17	+ // Exported permission: delete privatemsg
	18	+ $permissions['delete privatemsg'] = array(
19	19	'name' => 'delete privatemsg',
20	20	'roles' => array(
21		- '0' => 'administrator',
22		- '1' => 'authenticated user',
	21	+ '0' => 'administrator',
	22	+ '1' => 'authenticated user',
23	23	),
24		- );
	24	+ );
25	25
26		- // Exported permission: read all private messages
27		- $permissions['read all private messages'] = array(
	26	+ // Exported permission: read all private messages
	27	+ $permissions['read all private messages'] = array(
28	28	'name' => 'read all private messages',
29	29	'roles' => array(),
30		- );
	30	+ );
31	31
32		- // Exported permission: read privatemsg
33		- $permissions['read privatemsg'] = array(
	32	+ // Exported permission: read privatemsg
	33	+ $permissions['read privatemsg'] = array(
34	34	'name' => 'read privatemsg',
35	35	'roles' => array(
36		- '0' => 'administrator',
37		- '1' => 'authenticated user',
	36	+ '0' => 'administrator',
	37	+ '1' => 'authenticated user',
38	38	),
39		- );
	39	+ );
40	40
41		- // Exported permission: write privatemsg
42		- $permissions['write privatemsg'] = array(
	41	+ // Exported permission: write privatemsg
	42	+ $permissions['write privatemsg'] = array(
43	43	'name' => 'write privatemsg',
44	44	'roles' => array(
45		- '0' => 'administrator',
46		- '1' => 'community member',
	45	+ '0' => 'administrator',
	46	+ '1' => 'community member',
47	47	),
48		- );
	48	+ );
49	49
50		- return $permissions;
	50	+ return $permissions;
51	51	}

		@@ -332,8 +332,7 @@ discard block
		block discarded – undo
332	332	$name = $element['@attributes']['name'];
333	333	if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
334	334	$defaults['@attributes'][$name] = $values[$name];
335		- }
336		- else {
	335	+ } else {
337	336	$defaults[$name] = $values[$name];
338	337	}
339	338	}
		@@ -384,8 +383,7 @@ discard block
		block discarded – undo
384	383	if (isset($user_pref[$name])) {
385	384	if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
386	385	$value = $user_pref[$name]['@value'];
387		- }
388		- else {
	386	+ } else {
389	387	$value = $user_pref[$name];
390	388	}
391	389	}
		@@ -447,8 +445,7 @@ discard block
		block discarded – undo
447	445	if (isset($user_pref[$name])) {
448	446	if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
449	447	$value = $user_pref[$name]['@value'];
450		- }
451		- else {
	448	+ } else {
452	449	$value = $user_pref[$name];
453	450	}
454	451	}
		@@ -492,8 +489,7 @@ discard block
		block discarded – undo
492	489	isset($item['@attributes']['selected'])) {
493	490	$default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
494	491	}
495		- }
496		- else {
	492	+ } else {
497	493	$value = $item;
498	494	}
499	495	$options[$value] = $value;
		@@ -696,8 +692,7 @@ discard block
		block discarded – undo
696	692	);
697	693	if ($top_level) {
698	694	$uncategorized[$key] = $prefs_element;
699		- }
700		- else {
	695	+ } else {
701	696	$prefs_table[$key] = $prefs_element;
702	697	}
703	698	break;
		@@ -711,8 +706,7 @@ discard block
		block discarded – undo
711	706	'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
712	707	'elements' => $uncategorized,
713	708	);
714		- }
715		- elseif ($uncategorized) {
	709	+ } elseif ($uncategorized) {
716	710	// If nothing is categorized, output all prefs under a general "settings"
717	711	$prefs_table['settings'] = array(
718	712	'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
		@@ -745,8 +739,7 @@ discard block
		block discarded – undo
745	739	$main_prefs = load_configuration($boincuser->project_prefs);
746	740	$main_prefs = (array) $main_prefs['project_preferences'];
747	741	}
748		- }
749		- else {
	742	+ } else {
750	743	if ($boincuser->global_prefs) {
751	744	$main_prefs = load_configuration($boincuser->global_prefs);
752	745	$main_prefs = (array) $main_prefs['global_preferences'];
		@@ -762,8 +755,7 @@ discard block
		block discarded – undo
762	755	if (count($main_prefs) < 3)
763	756	$main_prefs['@attributes'] = array('cleared' => 1);
764	757	return $main_prefs;
765		- }
766		- else {
	758	+ } else {
767	759	if (isset($main_prefs['venue'])) {
768	760	if (!is_numeric(key($main_prefs['venue']))) {
769	761	$main_prefs['venue'] = array($main_prefs['venue']);
		@@ -803,8 +795,7 @@ discard block
		block discarded – undo
803	795	$main_prefs = load_configuration($boincuser->project_prefs);
804	796	$main_prefs = (array) $main_prefs['project_preferences'];
805	797	}
806		- }
807		- else {
	798	+ } else {
808	799	if ($boincuser->global_prefs) {
809	800	$main_prefs = load_configuration($boincuser->global_prefs);
810	801	$main_prefs = (array) $main_prefs['global_preferences'];
		@@ -817,8 +808,7 @@ discard block
		block discarded – undo
817	808	if (!$venue OR $venue == 'generic') {
818	809	//$main_prefs = $prefs;
819	810	$main_prefs = $prefs + $main_prefs;
820		- }
821		- else {
	811	+ } else {
822	812	if (isset($main_prefs['venue'])) {
823	813	if (!is_numeric(key($main_prefs['venue']))) {
824	814	$main_prefs['venue'] = array($main_prefs['venue']);
		@@ -827,8 +817,7 @@ discard block
		block discarded – undo
827	817	if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
828	818	if ($prefs) {
829	819	$main_prefs['venue'][$key] = $prefs;
830		- }
831		- else {
	820	+ } else {
832	821	// If prefs is null, clear out this preference set
833	822	unset($main_prefs['venue'][$key]);
834	823	if (count($main_prefs['venue']) == 0) {
		@@ -875,8 +864,7 @@ discard block
		block discarded – undo
875	864	db_set_active('boinc_rw');
876	865	$result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
877	866	db_set_active('default');
878		- }
879		- else {
	867	+ } else {
880	868	$main_prefs = array('global_preferences' => $main_prefs);
881	869	$boincuser->global_prefs = save_configuration($main_prefs);
882	870	db_set_active('boinc_rw');
		@@ -963,8 +951,7 @@ discard block
		block discarded – undo
963	951	NULL, 'boinc:ignore-user-add'),
964	952	'status');
965	953	drupal_goto();
966		- }
967		- else {
	954	+ } else {
968	955	drupal_not_found();
969	956	}// endif iuid
970	957	}
		@@ -1027,15 +1014,13 @@ discard block
		block discarded – undo
1027	1014	// Process nested form elements
1028	1015	$parents[] = $field;
1029	1016	boincwork_validate_form($rules, $values[$field], $parents);
1030		- }
1031		- else {
	1017	+ } else {
1032	1018	if ($parents) {
1033	1019	// form_set_error() identifies nested form elements with '][' as a
1034	1020	// delimiter between each parent and child element
1035	1021	$parents[] = $field;
1036	1022	$form_field = implode('][', $parents);
1037		- }
1038		- else {
	1023	+ } else {
1039	1024	$form_field = $field;
1040	1025	}
1041	1026	if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
		@@ -1118,8 +1103,7 @@ discard block
		block discarded – undo
1118	1103	// load_configuration(): Convert structured text/xml to array
1119	1104	//------------------------------------------------------------------------------------------------
1120	1105
1121		- function load_configuration($text)
1122		- {
	1106	+ function load_configuration($text) {
1123	1107	if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
1124	1108	if ($xml = text_to_xml($text)) return xml_to_array($xml);
1125	1109	return false;
		@@ -1129,8 +1113,7 @@ discard block
		block discarded – undo
1129	1113	// save_configuration(): Convert array to structured text/xml
1130	1114	//------------------------------------------------------------------------------------------------
1131	1115
1132		- function save_configuration($array)
1133		- {
	1116	+ function save_configuration($array) {
1134	1117	if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
1135	1118	return false;
1136	1119	}
		@@ -1162,26 +1145,22 @@ discard block
		block discarded – undo
1162	1145	$ordered_array[$item['@position']] = array(
1163	1146	$name => $item
1164	1147	);
1165		- }
1166		- else {
	1148	+ } else {
1167	1149	$unordered_array[] = array(
1168	1150	$name => $item
1169	1151	);
1170	1152	}
1171	1153	}
1172		- }
1173		- elseif (isset($value['@position'])) {
	1154	+ } elseif (isset($value['@position'])) {
1174	1155	$ordered_array[$value['@position']] = array(
1175	1156	$name => $value
1176	1157	);
1177		- }
1178		- else {
	1158	+ } else {
1179	1159	$unordered_array[] = array(
1180	1160	$name => $value
1181	1161	);
1182	1162	}
1183		- }
1184		- else {
	1163	+ } else {
1185	1164	$unordered_array[] = array(
1186	1165	$name => $value
1187	1166	);
		@@ -1267,8 +1246,7 @@ discard block
		block discarded – undo
1267	1246	// xml_to_text(): Convert an XML DOM object to string format
1268	1247	//------------------------------------------------------------------------------------------------
1269	1248
1270		- function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
1271		- {
	1249	+ function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false) {
1272	1250	$xml->formatOutput = true;
1273	1251	$text = $xml->saveXML();
1274	1252	if (!$include_xml_declaration) {
		@@ -1311,10 +1289,14 @@ discard block
		block discarded – undo
1311	1289	$sibling = $node->nextSibling;
1312	1290
1313	1291	// Determine if this node forms a set with siblings (share a node name)
1314		- while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
	1292	+ while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
	1293	+ $sibling = $sibling->nextSibling;
	1294	+ }
1315	1295	if (!$sibling) {
1316	1296	$sibling = $node->previousSibling;
1317		- while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
	1297	+ while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
	1298	+ $sibling = $sibling->previousSibling;
	1299	+ }
1318	1300	}
1319	1301
1320	1302	if ($sibling) {
		@@ -1409,8 +1391,7 @@ discard block
		block discarded – undo
1409	1391	. ' computers. Computers will be displayed when they have earned their'
1410	1392	. ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
1411	1393	}
1412		- }
1413		- else {
	1394	+ } else {
1414	1395	$output .= '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
1415	1396	$output .= '<p>' . bts('This user has chosen not to show information'
1416	1397	. ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
		@@ -1570,8 +1551,7 @@ discard block
		block discarded – undo
1570	1551	if (!$received_time) {
1571	1552	if (time() < $deadline) {
1572	1553	$output = '<span class="on-time">' . $output . '</span>';
1573		- }
1574		- else {
	1554	+ } else {
1575	1555	$output = '<span class="past-due">' . $output . '</span>';
1576	1556	}
1577	1557	}
		@@ -1666,11 +1646,9 @@ discard block
		block discarded – undo
1666	1646	// Use userid, hostid, or workunitid
1667	1647	if ($category==0) {
1668	1648	$sqlall .= " WHERE r.userid='%s' ";
1669		- }
1670		- elseif ($category==1) {
	1649	+ } elseif ($category==1) {
1671	1650	$sqlall .= " WHERE r.workunitid='%s' ";
1672		- }
1673		- elseif ($category==2) {
	1651	+ } elseif ($category==2) {
1674	1652	$sqlall .= " WHERE r.hostid='%s' ";
1675	1653	}
1676	1654	$sqlall .= " ORDER BY user_friendly_name";
		@@ -1710,8 +1688,7 @@ discard block
		block discarded – undo
1710	1688	}// if mystate
1711	1689
1712	1690	}// while
1713		- }
1714		- else {
	1691	+ } else {
1715	1692	}
1716	1693
1717	1694	// Entry for all applications.
		@@ -1805,11 +1782,9 @@ discard block
		block discarded – undo
1805	1782	// Use userid, hostid, or workunitid
1806	1783	if ($category==0) {
1807	1784	$sqlwhere[] = "r.userid = '%s'";
1808		- }
1809		- elseif ($category==1) {
	1785	+ } elseif ($category==1) {
1810	1786	$sqlwhere[] = "r.workunitid = '%s'";
1811		- }
1812		- elseif ($category==2) {
	1787	+ } elseif ($category==2) {
1813	1788	$sqlwhere[] = "r.hostid = '%s'";
1814	1789	}
1815	1790
		@@ -1837,8 +1812,7 @@ discard block
		block discarded – undo
1837	1812	$sqlwhere[] = "r.appid = '%s'";
1838	1813	if ($sqlwhere) $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
1839	1814	$dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
1840		- }
1841		- else {
	1815	+ } else {
1842	1816	if ($sqlwhere) $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
1843	1817	$dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
1844	1818	}
		@@ -1873,19 +1847,16 @@ discard block
		block discarded – undo
1873	1847	$resultdata[] = array_values($prettyresult);
1874	1848	}
1875	1849	}// while
1876		- }
1877		- else {
	1850	+ } else {
1878	1851	}
1879	1852	// Begin result navigation
1880	1853
1881	1854	// Set pathprefix based on type
1882	1855	if ($category==0) {
1883	1856	$pathprefix = 'account/tasks';
1884		- }
1885		- elseif ($category==1) {
	1857	+ } elseif ($category==1) {
1886	1858	$pathprefix = 'workunit/' . $queryid . '/tasks';
1887		- }
1888		- elseif ($category==2) {
	1859	+ } elseif ($category==2) {
1889	1860	$pathprefix = 'host/' . $queryid . '/tasks';
1890	1861	}
1891	1862	// Need an "All" tab as well, maps to app_id of zero.
		@@ -1895,8 +1866,7 @@ discard block
		block discarded – undo
1895	1866	$mypath = $pathprefix . '/' . $state . '/' . $app_id;
1896	1867	if ($state==STATE_ALL) {
1897	1868	$ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
1898		- }
1899		- else {
	1869	+ } else {
1900	1870	$ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
1901	1871	}
1902	1872	$myitem = array(
		@@ -1984,8 +1954,7 @@ discard block
		block discarded – undo
1984	1954	// that is not handled by the above case statements.
1985	1955	if ($appverid < 0) {
1986	1956	return "Unknown Anonymous platform";
1987		- }
1988		- else {
	1957	+ } else {
1989	1958	$prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
1990	1959	$prettyc = ($plan_class) ? "($av->plan_class)" : '';
1991	1960	return "v$prettyv $prettyc $plfm";

		@@ -643,9 +643,9 @@ discard block
		block discarded – undo
643	643	}
644	644	break;
645	645
646		- default:
647		- // Don't generate form elements for things that aren't explicitly form
648		- // elements (i.e. 'title', '@attributes' keys, and the like)
	646	+ default:
	647	+ // Don't generate form elements for things that aren't explicitly form
	648	+ // elements (i.e. 'title', '@attributes' keys, and the like)
649	649	}
650	650	}
651	651
		@@ -1990,29 +1990,29 @@ discard block
		block discarded – undo
1990	1990	*/
1991	1991	function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
1992	1992	switch ($appverid) {
1993		- case ANON_PLATFORM_UNKNOWN:
1994		- return "Anonymous platform";
1995		- case ANON_PLATFORM_CPU:
1996		- return "Anonymous platform CPU";
1997		- case ANON_PLATFORM_NVIDIA:
1998		- return "Anonymous platform NVIDIA GPU";
1999		- case ANON_PLATFORM_ATI:
2000		- return "Anonymous platform AMD GPU";
2001		- case ANON_PLATFORM_INTEL:
2002		- return "Anonymous platform Intel GPU";
2003		- case 0:
2004		- return "---";
2005		- default:
2006		- // Handle the case where the appversid is still negative. This
2007		- // may be cause BOINC has introduced a new anonymous platform
2008		- // that is not handled by the above case statements.
2009		- if ($appverid < 0) {
2010		- return "Unknown Anonymous platform";
2011		- }
2012		- else {
2013		- $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
2014		- $prettyc = ($plan_class) ? "($av->plan_class)" : '';
2015		- return "v$prettyv $prettyc $plfm";
2016		- }
	1993	+ case ANON_PLATFORM_UNKNOWN:
	1994	+ return "Anonymous platform";
	1995	+ case ANON_PLATFORM_CPU:
	1996	+ return "Anonymous platform CPU";
	1997	+ case ANON_PLATFORM_NVIDIA:
	1998	+ return "Anonymous platform NVIDIA GPU";
	1999	+ case ANON_PLATFORM_ATI:
	2000	+ return "Anonymous platform AMD GPU";
	2001	+ case ANON_PLATFORM_INTEL:
	2002	+ return "Anonymous platform Intel GPU";
	2003	+ case 0:
	2004	+ return "---";
	2005	+ default:
	2006	+ // Handle the case where the appversid is still negative. This
	2007	+ // may be cause BOINC has introduced a new anonymous platform
	2008	+ // that is not handled by the above case statements.
	2009	+ if ($appverid < 0) {
	2010	+ return "Unknown Anonymous platform";
	2011	+ }
	2012	+ else {
	2013	+ $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
	2014	+ $prettyc = ($plan_class) ? "($av->plan_class)" : '';
	2015	+ return "v$prettyv $prettyc $plfm";
	2016	+ }
2017	2017	}
2018	2018	}

		@@ -176,8 +176,8 @@
		block discarded – undo
176	176	echo "<tr><th>WU ID</th><th>WU name</th><th>App ID</th><th>Quorum</th><th>Unsent</th><th>In Progress</th><th>Success</th>";
177	177	echo "<th>Download Errors</th><th>Compute Errors</th><th>Validate Errors</th><th>Error mask</th></tr>\n";
178	178
179		-$hidden=0;
180		-foreach($row_array as $row) {
	179	+$hidden = 0;
	180	+foreach ($row_array as $row) {
181	181	if ($hide_canceled == 'on' && (($row->error_mask & WU_ERROR_CANCELLED) == WU_ERROR_CANCELLED)) {
182	182	$hidden++;
183	183	continue;

		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77	}
78	78
79	79	function default_mode($item) {
80		- return $item->is_exercise()?BOLT_MODE_SHOW:BOLT_MODE_LESSON;
	80	+ return $item->is_exercise() ?BOLT_MODE_SHOW:BOLT_MODE_LESSON;
81	81	}
82	82
83	83	// A page is being shown to the user; make a record of it
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170
171	171	// show an item (lesson, exercise, answer page)
172	172	//
173		-function show_item($iter, $view_id, $prev_view_id, $mode, $repeat=null) {
	173	+function show_item($iter, $view_id, $prev_view_id, $mode, $repeat = null) {
174	174	global $user;
175	175	global $course;
176	176	global $bolt_ex;
		@@ -462,7 +462,7 @@ discard block
		block discarded – undo
462	462	$bolt_ex->score = 0;
463	463	$bolt_query_string = $item->query_string;
464	464	srand($view_id);
465		- ob_start(); // buffer output to avoid showing exercise text
	465	+ ob_start(); // buffer output to avoid showing exercise text
466	466	require($item->filename);
467	467	ob_end_clean();
468	468

		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	// with an existing web framework can more easily do so.
208	208	// To do so, define page_head() in the project include file.
209	209	//
210		-if (!function_exists("page_head")){
	210	+if (!function_exists("page_head")) {
211	211	function page_head(
212	212	$title,
213	213	// page title. Put in <title>, used as title for browser tab.
		@@ -293,7 +293,8 @@ discard block
		block discarded – undo
293	293	echo '<div class="container-fluid">
294	294	';
295	295
296		- switch($title) { //kludge
	296	+ switch($title) {
	297	+//kludge
297	298	case tra("Log in"):
298	299	case tra("Create an account"):
299	300	case tra("Server status page"):
		@@ -309,7 +310,7 @@ discard block
		block discarded – undo
309	310
310	311	// See the comments for page_head()
311	312	//
312		-if (!function_exists("page_tail")){
	313	+if (!function_exists("page_tail")) {
313	314	function page_tail(
314	315	$show_date=false,
315	316	// true for pages that are generated periodically rather than on the fly
		@@ -330,7 +331,7 @@ discard block
		block discarded – undo
330	331	}
331	332	}
332	333
333		-function display_cvs_versions(){
	334	+function display_cvs_versions() {
334	335	global $cvs_version_tracker;
335	336	echo "\n<!-- SVN VERSIONS -->\n";
336	337	for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
		@@ -816,7 +817,7 @@ discard block
		block discarded – undo
816	817	return $str;
817	818	}
818	819
819		-function strip_bbcode($string){
	820	+function strip_bbcode($string) {
820	821	return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
821	822	}
822	823
		@@ -1047,7 +1048,7 @@ discard block
		block discarded – undo
1047	1048	// Otherwise return 0.
1048	1049	// Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
1049	1050	//
1050		-function boinc_client_version(){
	1051	+function boinc_client_version() {
1051	1052	if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
1052	1053	$x = $_SERVER['HTTP_USER_AGENT'];
1053	1054	$e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";

		@@ -38,17 +38,17 @@ discard block
		block discarded – undo
38	38	//
39	39	$config = get_config();
40	40	global $master_url;
41		-$master_url = parse_config($config , "<master_url>");
	41	+$master_url = parse_config($config, "<master_url>");
42	42	$recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
43	43	$recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
44	44
45	45	// the following default to on
46	46	//
47	47	$x = parse_config($config, "<user_country>");
48		-define('USER_COUNTRY', ($x===null)?1:(int)$x);
	48	+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
49	49
50	50	$x = parse_config($config, "<user_url>");
51		-define('USER_URL', ($x===null)?1:(int)$x);
	51	+define('USER_URL', ($x === null) ? 1 : (int)$x);
52	52
53	53	// don't allow /... at the end of URL
54	54	//
		@@ -135,10 +135,10 @@ discard block
		block discarded – undo
135	135	}
136	136
137	137	function url_base() {
138		- return is_https()?secure_url_base():URL_BASE;
	138	+ return is_https() ?secure_url_base() : URL_BASE;
139	139	}
140	140
141		-function send_cookie($name, $value, $permanent, $ops=false) {
	141	+function send_cookie($name, $value, $permanent, $ops = false) {
142	142	global $master_url;
143	143
144	144	// the following allows independent login for projects on the same server
		@@ -149,11 +149,11 @@ discard block
		block discarded – undo
149	149	$path = substr($path, 0, -1);
150	150	$path .= "_ops/";
151	151	}
152		- $expire = $permanent?time()+360024365:0;
	152	+ $expire = $permanent ?time() + 360024365 : 0;
153	153	setcookie($name, $value, $expire, $path);
154	154	}
155	155
156		-function clear_cookie($name, $ops=false) {
	156	+function clear_cookie($name, $ops = false) {
157	157	global $master_url;
158	158	$url = parse_url($master_url);
159	159	$path = $url['path'];
		@@ -161,13 +161,13 @@ discard block
		block discarded – undo
161	161	$path = substr($path, 0, -1);
162	162	$path .= "_ops/";
163	163	}
164		- setcookie($name, '', time()-3600, $path);
	164	+ setcookie($name, '', time() - 3600, $path);
165	165	}
166	166
167	167	$g_logged_in_user = null;
168	168	$got_logged_in_user = false;
169	169
170		-function get_logged_in_user($must_be_logged_in=true) {
	170	+function get_logged_in_user($must_be_logged_in = true) {
171	171	global $g_logged_in_user, $got_logged_in_user;
172	172	if ($got_logged_in_user) return $g_logged_in_user;
173	173
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	$next_url = $_SERVER['REQUEST_URI'];
187	187	$n = strrpos($next_url, "/");
188	188	if ($n) {
189		- $next_url = substr($next_url, $n+1);
	189	+ $next_url = substr($next_url, $n + 1);
190	190	}
191	191	}
192	192	$next_url = urlencode($next_url);
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	return $g_logged_in_user;
198	198	}
199	199
200		-function show_login_info($prefix="") {
	200	+function show_login_info($prefix = "") {
201	201	$user = get_logged_in_user(false);
202	202	if ($user) {
203	203	$url_tokens = url_tokens($user->authenticator);
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	}
208	208	}
209	209
210		-$cache_control_extra="";
	210	+$cache_control_extra = "";
211	211	$is_login_page = false;
212	212
213	213	// Call this to start pages.
		@@ -219,11 +219,11 @@ discard block
		block discarded – undo
219	219	// with an existing web framework can more easily do so.
220	220	// To do so, define page_head() in the project include file.
221	221	//
222		-if (!function_exists("page_head")){
	222	+if (!function_exists("page_head")) {
223	223	function page_head(
224	224	$title,
225	225	// page title. Put in <title>, used as title for browser tab.
226		- $body_attrs=null,
	226	+ $body_attrs = null,
227	227	// <body XXXX>
228	228	// e.g. Javascript to put focus in an input field
229	229	// (onload="document.form.foo.focus()")
		@@ -232,10 +232,10 @@ discard block
		block discarded – undo
232	232	// if set, include schedulers.txt.
233	233	// also pass to project_banner() in case you want a different
234	234	// header for your main page.
235		- $url_prefix="",
	235	+ $url_prefix = "",
236	236	// prepend this to links.
237	237	// Use for web pages not in the top directory
238		- $head_extra=null
	238	+ $head_extra = null
239	239	// extra stuff to put in <head>. E.g.:
240	240	// reCAPTCHA code (create_profile.php)
241	241	// bbcode javascript (forums)
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	header("Content-type: text/html; charset=utf-8");
254	254	header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
255	255	// Date in the past
256		- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
	256	+ header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
257	257	// always modified
258	258	header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
259	259	// for HTTP/1.1
		@@ -274,11 +274,11 @@ discard block
		block discarded – undo
274	274	if ($head_extra) {
275	275	echo "\n$head_extra\n";
276	276	}
277		- if ($is_main && (!defined('NO_COMPUTING')\|\|!NO_COMPUTING)) {
	277	+ if ($is_main && (!defined('NO_COMPUTING') \|\| !NO_COMPUTING)) {
278	278	readfile("schedulers.txt");
279	279	}
280	280
281		- $t = $title?$title:PROJECT;
	281	+ $t = $title ? $title : PROJECT;
282	282	echo "<title>$t</title>\n";
283	283	echo '
284	284	<meta charset="utf-8">
		@@ -314,7 +314,7 @@ discard block
		block discarded – undo
314	314	echo '<div class="container-fluid">
315	315	';
316	316
317		- switch($title) { //kludge
	317	+ switch ($title) { //kludge
318	318	case tra("Log in"):
319	319	case tra("Create an account"):
320	320	case tra("Server status page"):
		@@ -329,13 +329,13 @@ discard block
		block discarded – undo
329	329
330	330	// See the comments for page_head()
331	331	//
332		-if (!function_exists("page_tail")){
	332	+if (!function_exists("page_tail")) {
333	333	function page_tail(
334		- $show_date=false,
	334	+ $show_date = false,
335	335	// true for pages that are generated periodically rather than on the fly
336		- $url_prefix="",
	336	+ $url_prefix = "",
337	337	// use for pages not at top level
338		- $is_main=false
	338	+ $is_main = false
339	339	// passed to project_footer;
340	340	) {
341	341	echo "<br>\n";
		@@ -350,10 +350,10 @@ discard block
		block discarded – undo
350	350	}
351	351	}
352	352
353		-function display_cvs_versions(){
	353	+function display_cvs_versions() {
354	354	global $cvs_version_tracker;
355	355	echo "\n<!-- SVN VERSIONS -->\n";
356		- for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
	356	+ for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
357	357	echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
358	358	}
359	359	}
		@@ -378,23 +378,23 @@ discard block
		block discarded – undo
378	378	// takes argument in second and returns a human formatted time string
379	379	// in the form D days + h Hours + m Min + s sec.
380	380
381		-function time_diff($x, $res=3) {
	381	+function time_diff($x, $res = 3) {
382	382	$days = (int)($x/86400);
383		- $hours = (int)(($x-$days*86400)/3600);
384		- $minutes = (int)(($x-$days86400-$hours3600)/60);
385		- $seconds = (int)($x % 60);
	383	+ $hours = (int)(($x - $days*86400)/3600);
	384	+ $minutes = (int)(($x - $days86400 - $hours3600)/60);
	385	+ $seconds = (int)($x%60);
386	386
387	387	$datestring = "";
388	388	if ($days) {
389	389	$datestring .= "$days ".tra("days")." ";
390	390	}
391		- if ($res>0 && ($hours \|\| strlen($datestring))) {
	391	+ if ($res > 0 && ($hours \|\| strlen($datestring))) {
392	392	$datestring .= "$hours ".tra("hours")." ";
393	393	}
394		- if ($res>1 && ($minutes \|\| strlen($datestring))) {
	394	+ if ($res > 1 && ($minutes \|\| strlen($datestring))) {
395	395	$datestring .= "$minutes ".tra("min")." ";
396	396	}
397		- if ($res>2 && ($seconds)) {
	397	+ if ($res > 2 && ($seconds)) {
398	398	$datestring .= "$seconds ".tra("sec")." ";
399	399	}
400	400
		@@ -409,7 +409,7 @@ discard block
		block discarded – undo
409	409
410	410	function time_str($x) {
411	411	if ($x == 0) return "---";
412		- return gmdate('j M Y, G:i:s', $x) . " UTC";
	412	+ return gmdate('j M Y, G:i:s', $x)." UTC";
413	413	}
414	414
415	415	function local_time_str($x) {
		@@ -421,14 +421,14 @@ discard block
		block discarded – undo
421	421	return time_str($x);
422	422	}
423	423
424		-function start_table_str($class="", $style="") {
425		- $s = $style?'style="'.$style.'"':'';
	424	+function start_table_str($class = "", $style = "") {
	425	+ $s = $style ? 'style="'.$style.'"' : '';
426	426	return '<div class="table">
427	427	<table '.$s.' width="100%" class="table table-condensed '.$class.'" >
428	428	';
429	429	}
430	430
431		-function start_table($class="", $style="") {
	431	+function start_table($class = "", $style = "") {
432	432	echo start_table_str($class, $style);
433	433	}
434	434
		@@ -473,7 +473,7 @@ discard block
		block discarded – undo
473	473	echo "</tr>\n";
474	474	}
475	475
476		-function row1($x, $ncols=2, $class="heading") {
	476	+function row1($x, $ncols = 2, $class = "heading") {
477	477	if ($class == "heading") {
478	478	echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
479	479	} else {
		@@ -485,10 +485,10 @@ discard block
		block discarded – undo
485	485	define('VALUE_ATTRS', 'style="padding-left:12px"');
486	486	define('VALUE_ATTRS_ERR', 'class="danger" style="padding-left:12px"');
487	487
488		-function row2($x, $y, $show_error=false, $lwidth='40%') {
489		- if ($x==="") $x="<br>";
490		- if ($y==="") $y="<br>";
491		- $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
	488	+function row2($x, $y, $show_error = false, $lwidth = '40%') {
	489	+ if ($x === "") $x = "<br>";
	490	+ if ($y === "") $y = "<br>";
	491	+ $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
492	492	echo "<tr>
493	493	<td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
494	494	<td $attrs >$y</td>
		@@ -496,7 +496,7 @@ discard block
		block discarded – undo
496	496	";
497	497	}
498	498
499		-function row2_init($x, $y, $lwidth='40%') {
	499	+function row2_init($x, $y, $lwidth = '40%') {
500	500	echo '<tr>
501	501	<td class="text-right " width="'.$lwidth.'" style="padding-right: 20px;">'.$x.'</td>
502	502	<td '.VALUE_ATTRS.'>'.$y.'
		@@ -519,20 +519,20 @@ discard block
		block discarded – undo
519	519	echo "</tr>\n";
520	520	}
521	521
522		-define ('ALIGN_RIGHT', 'style="text-align:right;"');
	522	+define('ALIGN_RIGHT', 'style="text-align:right;"');
523	523
524		-function row_heading_array($x, $attrs=null, $class='bg-primary') {
	524	+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
525	525	echo "<tr>";
526	526	$i = 0;
527	527	foreach ($x as $h) {
528		- $a = $attrs?$attrs[$i]:"";
	528	+ $a = $attrs ? $attrs[$i] : "";
529	529	echo "<th $a class=\"$class\">$h</th>";
530	530	$i++;
531	531	}
532	532	echo "</tr>\n";
533	533	}
534	534
535		-function row_heading($x, $class='bg-primary') {
	535	+function row_heading($x, $class = 'bg-primary') {
536	536	echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
537	537	', $class, $x
538	538	);
		@@ -588,7 +588,7 @@ discard block
		block discarded – undo
588	588	// If $ellipsis is true, then an ellipsis is added to any sentence which
589	589	// is cut short.
590	590
591		-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
	591	+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
592	592	$words = explode($delimiter, $sentence);
593	593	$total_chars = 0;
594	594	$trunc = false;
		@@ -671,8 +671,8 @@ discard block
		block discarded – undo
671	671
672	672	// returns null if the arg is optional and missing
673	673	//
674		-function get_int($name, $optional=false) {
675		- $x=null;
	674	+function get_int($name, $optional = false) {
	675	+ $x = null;
676	676	if (isset($_GET[$name])) $x = $_GET[$name];
677	677	if (!is_numeric($x)) {
678	678	if ($optional) {
		@@ -691,7 +691,7 @@ discard block
		block discarded – undo
691	691
692	692	// returns null if the arg is optional and missing
693	693	//
694		-function post_num($name, $optional=false) {
	694	+function post_num($name, $optional = false) {
695	695	$x = null;
696	696	if (isset($_POST[$name])) $x = $_POST[$name];
697	697	if (!is_numeric($x)) {
		@@ -706,7 +706,7 @@ discard block
		block discarded – undo
706	706
707	707	// returns null if the arg is optional and missing
708	708	//
709		-function post_int($name, $optional=false) {
	709	+function post_int($name, $optional = false) {
710	710	$x = post_num($name, $optional);
711	711	if (is_null($x)) return null;
712	712	$y = (int)$x;
		@@ -724,7 +724,7 @@ discard block
		block discarded – undo
724	724	}
725	725	}
726	726
727		-function get_str($name, $optional=false) {
	727	+function get_str($name, $optional = false) {
728	728	if (isset($_GET[$name])) {
729	729	$x = $_GET[$name];
730	730	} else {
		@@ -736,7 +736,7 @@ discard block
		block discarded – undo
736	736	return undo_magic_quotes($x);
737	737	}
738	738
739		-function post_str($name, $optional=false) {
	739	+function post_str($name, $optional = false) {
740	740	if (isset($_POST[$name])) {
741	741	$x = $_POST[$name];
742	742	} else {
		@@ -748,7 +748,7 @@ discard block
		block discarded – undo
748	748	return undo_magic_quotes($x);
749	749	}
750	750
751		-function post_arr($name, $optional=false) {
	751	+function post_arr($name, $optional = false) {
752	752	if (isset($_POST[$name]) && is_array($_POST[$name])) {
753	753	$x = $_POST[$name];
754	754	} else {
		@@ -764,7 +764,7 @@ discard block
		block discarded – undo
764	764	// the mb_* functions are not included by default
765	765	// return (mb_detect_encoding($passwd) -= 'ASCII');
766	766
767		- for ($i=0; $i<strlen($str); $i++) {
	767	+ for ($i = 0; $i < strlen($str); $i++) {
768	768	$c = ord(substr($str, $i));
769	769	if ($c < 32 \|\| $c > 127) return false;
770	770	}
		@@ -788,7 +788,7 @@ discard block
		block discarded – undo
788	788	$number = str_replace(',', '.', $number); // replace the german decimal separator
789	789	// if no value was entered and this is ok
790	790	//
791		- if ($number=='' && !$low) return true;
	791	+ if ($number == '' && !$low) return true;
792	792
793	793	// the supplied value contains alphabetic characters
794	794	//
		@@ -805,7 +805,7 @@ discard block
		block discarded – undo
805	805
806	806	// Generate a "select" element from an array of values
807	807	//
808		-function select_from_array($name, $array, $selection=null, $width=240) {
	808	+function select_from_array($name, $array, $selection = null, $width = 240) {
809	809	$out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
810	810
811	811	foreach ($array as $key => $value) {
		@@ -830,8 +830,8 @@ discard block
		block discarded – undo
830	830	return $str;
831	831	}
832	832
833		-function strip_bbcode($string){
834		- return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
	833	+function strip_bbcode($string) {
	834	+ return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
835	835	}
836	836
837	837	function current_url() {
		@@ -859,7 +859,7 @@ discard block
		block discarded – undo
859	859	// @param class The optional CSS class of the button. Defaults to a standard button
860	860	//
861	861
862		-function button_text($url, $text, $desc=null, $class="btn-success btn-sm") {
	862	+function button_text($url, $text, $desc = null, $class = "btn-success btn-sm") {
863	863	if (!$desc) {
864	864	$desc = $text;
865	865	}
		@@ -868,19 +868,19 @@ discard block
		block discarded – undo
868	868	);
869	869	}
870	870
871		-function show_button($url, $text, $desc=null, $class="btn-success btn-sm") {
872		- echo button_text($url, $text, $desc=null, $class);
	871	+function show_button($url, $text, $desc = null, $class = "btn-success btn-sm") {
	872	+ echo button_text($url, $text, $desc = null, $class);
873	873	}
874	874
875	875	// for places with a bunch of buttons, like forum posts
876	876	//
877		-function show_button_small($url, $text, $desc=null) {
	877	+function show_button_small($url, $text, $desc = null) {
878	878	echo button_text($url, $text, $desc, "btn-primary btn-xs");
879	879	}
880	880
881	881	// used for showing icons
882	882	//
883		-function show_image($src, $title, $alt, $height=null) {
	883	+function show_image($src, $title, $alt, $height = null) {
884	884	$h = "";
885	885	if ($height) {
886	886	$h = "height=\"$height\"";
		@@ -917,7 +917,7 @@ discard block
		block discarded – undo
917	917	// tries instead to connect to <replica_db_host> if tag exists.
918	918	// DEPRECATED - use boinc_db.inc
919	919	//
920		-function db_init($try_replica=false) {
	920	+function db_init($try_replica = false) {
921	921	check_web_stopped();
922	922	$retval = db_init_aux($try_replica);
923	923	if ($retval == 1) {
		@@ -988,7 +988,7 @@ discard block
		block discarded – undo
988	988	function sanitize_numeric($x) {
989	989	if (is_numeric($x)) {
990	990	return $x;
991		- } else if (trim($x) == '' ) {
	991	+ } else if (trim($x) == '') {
992	992	return '';
993	993	} else {
994	994	return "not numeric";
		@@ -1011,9 +1011,9 @@ discard block
		block discarded – undo
1011	1011	return $c/(200/24);
1012	1012	}
1013	1013
1014		-function do_download($path,$name="") {
1015		- if (strcmp($name,"") == 0) {
1016		- $name=basename($path);
	1014	+function do_download($path, $name = "") {
	1015	+ if (strcmp($name, "") == 0) {
	1016	+ $name = basename($path);
1017	1017	}
1018	1018	header('Content-Description: File Transfer');
1019	1019	header('Content-Type: application/octet-stream');
		@@ -1022,7 +1022,7 @@ discard block
		block discarded – undo
1022	1022	header('Expires: 0');
1023	1023	header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
1024	1024	header('Pragma: public');
1025		- header('Content-Length: ' . filesize($path));
	1025	+ header('Content-Length: '.filesize($path));
1026	1026	flush();
1027	1027	readfile($path);
1028	1028	}
		@@ -1071,10 +1071,10 @@ discard block
		block discarded – undo
1071	1071	// Otherwise return 0.
1072	1072	// Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
1073	1073	//
1074		-function boinc_client_version(){
	1074	+function boinc_client_version() {
1075	1075	if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
1076	1076	$x = $_SERVER['HTTP_USER_AGENT'];
1077		- $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
	1077	+ $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
1078	1078	if (preg_match($e, $x, $matches)) {
1079	1079	return $matches[1]10000 + $matches[2]100 + $matches[3];
1080	1080	}
		@@ -1103,7 +1103,7 @@ discard block
		block discarded – undo
1103	1103	$rem_name = $name."_remaining";
1104	1104	return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
1105	1105	onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
1106		- <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
	1106	+ <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
1107	1107	;
1108	1108	}
1109	1109
		@@ -1133,7 +1133,7 @@ discard block
		block discarded – undo
1133	1133	// use the following around text with long lines,
1134	1134	// to limit the width and make it more readable.
1135	1135	//
1136		-function text_start($width=640) {
	1136	+function text_start($width = 640) {
1137	1137	echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
1138	1138	}
1139	1139	function text_end() {
		@@ -1146,9 +1146,9 @@ discard block
		block discarded – undo
1146	1146	}
1147	1147
1148	1148	function cert_filename() {
1149		- return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
	1149	+ return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
1150	1150	}
1151	1151
1152		-$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit
	1152	+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
1153	1153
1154	1154	?>

		@@ -556,14 +556,14 @@
		block discarded – undo
556	556	$tnow = get_str('tnow', true);
557	557	$ttok = get_str('ttok', true);
558	558	if (!$tnow) {
559		- if (isset($_POST['tnow'])) {
560		- $tnow = $_POST['tnow'];
561		- }
	559	+ if (isset($_POST['tnow'])) {
	560	+ $tnow = $_POST['tnow'];
	561	+ }
562	562	}
563	563	if (!$ttok) {
564		- if (isset($_POST['ttok'])) {
565		- $ttok = $_POST['ttok'];
566		- }
	564	+ if (isset($_POST['ttok'])) {
	565	+ $ttok = $_POST['ttok'];
	566	+ }
567	567	}
568	568	if (!$tnow) return false;
569	569	if (!$ttok) return false;

		@@ -18,7 +18,7 @@
		block discarded – undo
18	18	function boinccore_rules_event_info() {
19	19	return array(
20	20	'boinccore_comment_convert' => array(
21		- 'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
	21	+ 'label' => bts('A comment was converted to a new forum topic.', array(), null, 'boinc:rule-event'),
22	22	'module' => 'BOINCcore',
23	23	'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
24	24	),

		@@ -16,16 +16,16 @@
		block discarded – undo
16	16	*/
17	17
18	18	function boinccore_rules_event_info() {
19		- return array(
	19	+ return array(
20	20	'boinccore_comment_convert' => array(
21		- 'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
22		- 'module' => 'BOINCcore',
23		- 'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
	21	+ 'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
	22	+ 'module' => 'BOINCcore',
	23	+ 'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
24	24	),
25	25	'boinccore_comment_unhidden' => array(
26		- 'label' => bts('A comment was unhidden.', array(), 'boinc:rule-event'),
27		- 'module' => 'BOINCcore',
28		- 'arguments' => rules_events_hook_comment_arguments(t('unhidden comment')),
	26	+ 'label' => bts('A comment was unhidden.', array(), 'boinc:rule-event'),
	27	+ 'module' => 'BOINCcore',
	28	+ 'arguments' => rules_events_hook_comment_arguments(t('unhidden comment')),
29	29	),
30		- );
	30	+ );
31	31	}
32	32	\ No newline at end of file

BOINC / boinc

Pull Request — master (#3196)

Status

Category

Upper-Lower-Casing +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +2112 added lines, -2112 removed lines patch added patch discarded remove patch

Braces +3 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +73 added lines, -73 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Upper-Lower-Casing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +185 added lines, -185 removed lines patch added patch discarded remove patch

Spacing +66 added lines, -66 removed lines patch added patch discarded remove patch

Upper-Lower-Casing +25 added lines, -25 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Upper-Lower-Casing +122 added lines, -122 removed lines patch added patch discarded remove patch

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch

Braces +41 added lines, -72 removed lines patch added patch discarded remove patch

Indentation +863 added lines, -863 removed lines patch added patch discarded remove patch

Switch Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +7 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +77 added lines, -77 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Upper-Lower-Casing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch