BOINC / boinc

drupal/sites/default/boinc/modules/boincwork/views/views_handler_field_boincwork_app_version_number.inc

Indentation +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
  */
 
 class views_handler_field_boincwork_app_version_number extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     return sprintf("%01.2f", $values->app_version_host_app_version_version_num / 100);
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
   }
 
   function render($values) {
-    return sprintf("%01.2f", $values->app_version_host_app_version_version_num / 100);
+    return sprintf("%01.2f", $values->app_version_host_app_version_version_num/100);
   }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -1637,7 +1637,7 @@
   
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincwork') . '/views',
+      'path' => drupal_get_path('module', 'boincwork').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincuser_id' => array(

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

@@ -49,16 +49,16 @@ 
   // Primary keys allowed as arguments
   
   $data['host']['id'] = array(
-    'title' => bts('Computer ID', array(), NULL, 'boinc:host-list'),
+    'title' => bts('Computer ID', array(), null, 'boinc:host-list'),
     'help' => t('The ID number of this host.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -69,11 +69,11 @@ 
     )
   );
   $data['host']['venue'] = array(
-    'title' => bts('Location', array(), NULL, 'boinc:host-list'),
+    'title' => bts('Location', array(), null, 'boinc:host-list'),
     'help' => t('The name of the preference set assigned to this host.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
@@ -90,7 +90,7 @@ 
   // Foreign key fields
   
   $data['host']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    'title' => bts('User ID', array(), null, 'boinc:user-details'),
     'help' => t('The owner of this host.'),
     // Because this is a foreign key to the {user} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
@@ -98,7 +98,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -109,7 +109,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -122,12 +122,12 @@ 
   // Descriptions of general host fields (alphabetized)
   
   $data['host']['active_frac'] = array(
-    'title' => bts('While BOINC running, % of time work is allowed', array(), NULL, 'boinc:host-details'),
+    'title' => bts('While BOINC running, % of time work is allowed', array(), null, 'boinc:host-details'),
     'help' => t('The percentage of time that work is allowed.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -137,12 +137,12 @@ 
     )
   );
   $data['host']['avg_turnaround'] = array(
-    'title' => bts('Average turnaround time', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Average turnaround time', array(), null, 'boinc:host-details'),
     'help' => t('The average time required for work to be completed.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -152,11 +152,11 @@ 
     )
   );
   $data['host']['create_time'] = array(
-    'title' => bts('Created', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Created', array(), null, 'boinc:host-details'),
     'help' => t('The time the host record was created.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -166,12 +166,12 @@ 
     )
   );
   $data['host']['connected_frac'] = array(
-    'title' => bts('While BOINC running, % of time host has an Internet connection', array(), NULL, 'boinc:host-details'),
+    'title' => bts('While BOINC running, % of time host has an Internet connection', array(), null, 'boinc:host-details'),
     'help' => t('The percentage of time that the host has an Internet connection.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -181,12 +181,12 @@ 
     )
   );
   $data['host']['cpu_efficiency'] = array(
-    'title' => bts('Average CPU efficiency', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Average CPU efficiency', array(), null, 'boinc:host-details'),
     'help' => t('The average efficiency of the host CPU.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -196,11 +196,11 @@ 
     )
   );
   $data['host']['d_free'] = array(
-    'title' => bts('Free disk space', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Free disk space', array(), null, 'boinc:host-details'),
     'help' => t('The amount of disk space that is not in use.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -210,11 +210,11 @@ 
     )
   );
   $data['host']['d_total'] = array(
-    'title' => bts('Total disk space', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Total disk space', array(), null, 'boinc:host-details'),
     'help' => t('The size of the disk on which BOINC is installed.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -224,11 +224,11 @@ 
     )
   );
   $data['host']['domain_name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+    'title' => bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the host.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -238,12 +238,12 @@ 
     )
   );
   $data['host']['duration_correction_factor'] = array(
-    'title' => bts('Task duration correction factor', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Task duration correction factor', array(), null, 'boinc:host-details'),
     'help' => t('Task duration correction factor.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -253,12 +253,12 @@ 
     )
   );
   $data['host']['expavg_credit'] = array(
-    'title' => bts('Avg. credit', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Avg. credit', array(), null, 'boinc:host-details'),
     'help' => t('A decaying average of credit per day.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -268,11 +268,11 @@ 
     )
   );
   $data['host']['external_ip_addr'] = array(
-    'title' => bts('External IP address', array(), NULL, 'boinc:host-details'),
+    'title' => bts('External IP address', array(), null, 'boinc:host-details'),
     'help' => t('The IP address from which the host last communicated.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -282,11 +282,11 @@ 
     )
   );
   $data['host']['host_cpid'] = array(
-    'title' => bts('Cross project ID', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Cross project ID', array(), null, 'boinc:host-details'),
     'help' => t('The consistent identifier of the host across projects.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -296,11 +296,11 @@ 
     )
   );
   $data['host']['last_ip_addr'] = array(
-    'title' => bts('Last IP address', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Last IP address', array(), null, 'boinc:host-details'),
     'help' => t('The IP address of the host at last communication.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -310,11 +310,11 @@ 
     )
   );
   $data['host']['m_cache'] = array(
-    'title' => bts('Cache', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Cache', array(), null, 'boinc:host-details'),
     'help' => t('The amount of cache on the processor(s).'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -324,11 +324,11 @@ 
     )
   );
   $data['host']['m_nbytes'] = array(
-    'title' => bts('Memory', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Memory', array(), null, 'boinc:host-details'),
     'help' => t('The amount of memory installed.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -338,11 +338,11 @@ 
     )
   );
   $data['host']['m_swap'] = array(
-    'title' => bts('Swap space', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Swap space', array(), null, 'boinc:host-details'),
     'help' => t('The amount of swap space configured.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -352,11 +352,11 @@ 
     )
   );
   $data['host']['max_results_day'] = array(
-    'title' => bts('Maximum daily WU quota per CPU', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Maximum daily WU quota per CPU', array(), null, 'boinc:host-details'),
     'help' => t('The maximum number of workunits to be allocated per CPU.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -366,12 +366,12 @@ 
     )
   );
   $data['host']['n_bwdown'] = array(
-    'title' => bts('Average download rate', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Average download rate', array(), null, 'boinc:host-details'),
     'help' => t('The average rate at which new work is downloaded.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -381,12 +381,12 @@ 
     )
   );
   $data['host']['n_bwup'] = array(
-    'title' => bts('Average upload rate', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Average upload rate', array(), null, 'boinc:host-details'),
     'help' => t('The average rate at which completed work is uploaded.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -396,11 +396,11 @@ 
     )
   );
   $data['host']['nsame_ip_addr'] = array(
-    'title' => bts('Same IP address count', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Same IP address count', array(), null, 'boinc:host-details'),
     'help' => t('The number of times the last IP address.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -410,12 +410,12 @@ 
     )
   );
   $data['host']['on_frac'] = array(
-    'title' => bts('% of time BOINC client is running', array(), NULL, 'boinc:host-details'),
+    'title' => bts('% of time BOINC client is running', array(), null, 'boinc:host-details'),
     'help' => t('The percentage of time that the BOINC client is running.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -425,11 +425,11 @@ 
     )
   );
   $data['host']['os_name'] = array(
-    'title' => bts('Operating system', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Operating system', array(), null, 'boinc:host-details'),
     'help' => t('The name of the host operating system.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -439,11 +439,11 @@ 
     )
   );  
   $data['host']['os_version'] = array(
-    'title' => bts('Operating system version', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Operating system version', array(), null, 'boinc:host-details'),
     'help' => t('The version of the host operating system.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -453,12 +453,12 @@ 
     )
   );
   $data['host']['p_fpops'] = array(
-    'title' => bts('Measured floating point speed', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Measured floating point speed', array(), null, 'boinc:host-details'),
     'help' => t('The capability of the host in floating point operations per second.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -468,12 +468,12 @@ 
     )
   );
   $data['host']['p_iops'] = array(
-    'title' => bts('Measured integer speed', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Measured integer speed', array(), null, 'boinc:host-details'),
     'help' => t('The capability of the host in integer operations per second.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -483,11 +483,11 @@ 
     )
   );
   $data['host']['p_model'] = array(
-    'title' => bts('CPU model', array(), NULL, 'boinc:host-details'),
+    'title' => bts('CPU model', array(), null, 'boinc:host-details'),
     'help' => t('The model of the CPU in the host.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -497,11 +497,11 @@ 
     )
   );
   $data['host']['p_ncpus'] = array(
-    'title' => bts('Number of processors', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Number of processors', array(), null, 'boinc:host-details'),
     'help' => t('The count of CPU cores in the system.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -511,11 +511,11 @@ 
     )
   );
   $data['host']['p_vendor'] = array(
-    'title' => bts('CPU', array(), NULL, 'boinc:host-details'),
+    'title' => bts('CPU', array(), null, 'boinc:host-details'),
     'help' => t('The manufacturer of the CPU in the host.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -525,11 +525,11 @@ 
     )
   );
   $data['host']['rpc_seqno'] = array(
-    'title' => bts('Number of times client has contacted server', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Number of times client has contacted server', array(), null, 'boinc:host-details'),
     'help' => t('The number of times the client has contacted the server.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -539,11 +539,11 @@ 
     )
   );
   $data['host']['rpc_time'] = array(
-    'title' => bts('Last contact', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Last contact', array(), null, 'boinc:host-details'),
     'help' => t('The time of the last RPC contact with the host.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -553,11 +553,11 @@ 
     )
   );
   $data['host']['serialnum'] = array(
-    'title' => bts('Serial number', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Serial number', array(), null, 'boinc:host-details'),
     'help' => t('Contains the release number of the BOINC application in use and the GPU of the host.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -567,11 +567,11 @@ 
     )
   );
   $data['host']['timezone'] = array(
-    'title' => bts('Timezone', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Timezone', array(), null, 'boinc:host-details'),
     'help' => t('The UTC offset of the local time.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -581,12 +581,12 @@ 
     )
   );
   $data['host']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+    'title' => bts('Total credit', array(), null, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for a host.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -611,16 +611,16 @@ 
   // Primary keys allowed as arguments
 
   $data['platform']['id'] = array(
-    'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
+    'title' => bts('Platform ID', array(), null, 'boinc:platform-details'),
     'help' => t('The ID number of the platform.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -634,11 +634,11 @@ 
   // Descriptions of app fields (alphabetized)
   
   $data['platform']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+    'title' => bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the platform.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -680,16 +680,16 @@ 
   // Primary keys allowed as arguments
 
   $data['result']['id'] = array(
-    'title' => bts('Task ID', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Task ID', array(), null, 'boinc:task-details'),
     'help' => t('The ID number of this result.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -703,13 +703,13 @@ 
   // Foreign key fields
   
   $data['result']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    'title' => bts('User ID', array(), null, 'boinc:user-details'),
     'help' => t('The owner of this result.'),
     // Foreign key to the {user} table
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -720,13 +720,13 @@ 
     )
   );
   $data['result']['workunitid'] = array(
-    'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Workunit ID', array(), null, 'boinc:workunit-details'),
     'help' => t('The workunit associated with this result.'),
     // Foreign key to the {workunit} table
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -737,7 +737,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -747,13 +747,13 @@ 
     )
   );
   $data['result']['hostid'] = array(
-    'title' => bts('Host ID', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Host ID', array(), null, 'boinc:task-details'),
     'help' => t('The host associated with this result.'),
     // Foreign key to the {host} table
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -764,7 +764,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -777,11 +777,11 @@ 
   // Descriptions of result fields (alphabetized)
   
   $data['result']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Application ID', array(), null, 'boinc:application-details'),
     'help' => t('The ID number of the application.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -791,11 +791,11 @@ 
     )
   );
   $data['result']['app_version_id'] = array(
-    'title' => bts('Application version', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Application version', array(), null, 'boinc:task-details'),
     'help' => t('The version number of the application.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -805,12 +805,12 @@ 
     )
   );
   $data['result']['claimed_credit'] = array(
-    'title' => bts('Claimed credit', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Claimed credit', array(), null, 'boinc:task-details'),
     'help' => t('The credit claimed for this result.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -820,11 +820,11 @@ 
     )
   );
   $data['result']['client_state'] = array(
-    'title' => bts('Client state', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Client state', array(), null, 'boinc:task-details'),
     'help' => t('The state of the task on the client side.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -834,12 +834,12 @@ 
     )
   );
   $data['result']['cpu_time'] = array(
-    'title' => bts('CPU time', array(), NULL, 'boinc:task-details'),
+    'title' => bts('CPU time', array(), null, 'boinc:task-details'),
     'help' => t('The CPU time spent on the task.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -849,11 +849,11 @@ 
     )
   );
   $data['result']['create_time'] = array(
-    'title' => bts('Created', array(), NULL, 'boinc:task-details:-1:ignoreoverwrite'),
+    'title' => bts('Created', array(), null, 'boinc:task-details:-1:ignoreoverwrite'),
     'help' => t('The time that the task was created.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -863,12 +863,12 @@ 
     )
   );
   $data['result']['elapsed_time'] = array(
-    'title' => bts('Run time', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Run time', array(), null, 'boinc:task-details'),
     'help' => t('The run time of the task.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -878,11 +878,11 @@ 
     )
   );
   $data['result']['exit_status'] = array(
-    'title' => bts('Exit status', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Exit status', array(), null, 'boinc:task-details'),
     'help' => t('The exit code of the task.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -892,12 +892,12 @@ 
     )
   );
   $data['result']['granted_credit'] = array(
-    'title' => bts('Granted credit', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Granted credit', array(), null, 'boinc:task-details'),
     'help' => t('The credit granted for this result.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -907,11 +907,11 @@ 
     )
   );
   $data['result']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+    'title' => bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the task.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -921,11 +921,11 @@ 
     )
   );
   $data['result']['outcome'] = array(
-    'title' => bts('Outcome', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Outcome', array(), null, 'boinc:task-details'),
     'help' => t('The outcome of the task.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -935,11 +935,11 @@ 
     )
   );
   $data['result']['received_time'] = array(
-    'title' => bts('Received time', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Received time', array(), null, 'boinc:task-details'),
     'help' => t('The time that the result was received.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -949,11 +949,11 @@ 
     )
   );
   $data['result']['report_deadline'] = array(
-    'title' => bts('Report deadline', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Report deadline', array(), null, 'boinc:task-details'),
     'help' => t('The deadline for the task.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -963,11 +963,11 @@ 
     )
   );
   $data['result']['sent_time'] = array(
-    'title' => bts('Sent', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Sent', array(), null, 'boinc:task-details'),
     'help' => t('The time that the task was sent.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -977,11 +977,11 @@ 
     )
   );
   $data['result']['server_state'] = array(
-    'title' => bts('Server state', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Server state', array(), null, 'boinc:task-details'),
     'help' => t('The state of task on the server side.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -991,11 +991,11 @@ 
     )
   );
   $data['result']['stderr_out'] = array(
-    'title' => bts('Stderr out', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Stderr out', array(), null, 'boinc:task-details'),
     'help' => t('The output to standard error.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1005,11 +1005,11 @@ 
     )
   );
   $data['result']['validate_state'] = array(
-    'title' => bts('Validation state', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Validation state', array(), null, 'boinc:task-details'),
     'help' => t('The state of validation of this result.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1019,11 +1019,11 @@ 
     )
   );
   $data['result']['peak_working_set_size'] = array(
-    'title' => bts('Peak working set size', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Peak working set size', array(), null, 'boinc:task-details'),
     'help' => t('Peak working set size.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1033,11 +1033,11 @@ 
     )
   );
   $data['result']['peak_swap_size'] = array(
-    'title' => bts('Peak swap size', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Peak swap size', array(), null, 'boinc:task-details'),
     'help' => t('Peak swap size.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1047,11 +1047,11 @@ 
     )
   );
     $data['result']['peak_disk_usage'] = array(
-    'title' => bts('Peak disk usage', array(), NULL, 'boinc:task-details'),
+    'title' => bts('Peak disk usage', array(), null, 'boinc:task-details'),
     'help' => t('Peak disk usage.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1086,16 +1086,16 @@ 
   // Primary keys allowed as arguments
   
   $data['workunit']['id'] = array(
-    'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Workunit ID', array(), null, 'boinc:workunit-details'),
     'help' => t('The ID number of this workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1109,12 +1109,12 @@ 
   // Foreign key fields
   
   $data['workunit']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Application ID', array(), null, 'boinc:application-details'),
     'help' => t('The application associated with this workunit.'), 
     'argument' => array( // foreign key to the {app} table
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1125,7 +1125,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1138,12 +1138,12 @@ 
   // Descriptions of workunit fields (alphabetized)
   
   $data['workunit']['canonical_credit'] = array(
-    'title' => bts('Canonical credit', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Canonical credit', array(), null, 'boinc:workunit-details'),
     'help' => t('The canonical credit of the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1153,11 +1153,11 @@ 
     )
   );
   $data['workunit']['canonical_resultid'] = array(
-    'title' => bts('Canonical result ID', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Canonical result ID', array(), null, 'boinc:workunit-details'),
     'help' => t('The ID of the canonical result associated with the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1167,11 +1167,11 @@ 
     )
   );
   $data['workunit']['create_time'] = array(
-    'title' => bts('Created time', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Created time', array(), null, 'boinc:workunit-details'),
     'help' => t('The time that the workunit was created.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -1181,11 +1181,11 @@ 
     )
   );
   $data['workunit']['error_mask'] = array(
-    'title' => bts('Error mask', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Error mask', array(), null, 'boinc:workunit-details'),
     'help' => t('Error mask of the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1195,11 +1195,11 @@ 
     )
   );
   $data['workunit']['min_quorum'] = array(
-    'title' => bts('Minimum quorum', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Minimum quorum', array(), null, 'boinc:workunit-details'),
     'help' => t('Minimum quorum of the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1209,11 +1209,11 @@ 
     )
   );
   $data['workunit']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
+    'title' => bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
     'help' => t('The name of the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1223,11 +1223,11 @@ 
     )
   );
   $data['workunit']['max_error_results'] = array(
-    'title' => bts('Max error tasks', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Max error tasks', array(), null, 'boinc:workunit-details'),
     'help' => t('The maximum number of error tasks in the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1237,11 +1237,11 @@ 
     )
   );
   $data['workunit']['max_success_results'] = array(
-    'title' => bts('Max success tasks', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Max success tasks', array(), null, 'boinc:workunit-details'),
     'help' => t('The maximum number of successful tasks in the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1251,11 +1251,11 @@ 
     )
   );
   $data['workunit']['max_total_results'] = array(
-    'title' => bts('Max total tasks', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Max total tasks', array(), null, 'boinc:workunit-details'),
     'help' => t('The maximum number of total tasks in the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1265,11 +1265,11 @@ 
     )
   );
   $data['workunit']['need_validate'] = array(
-    'title' => bts('Needs validation', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Needs validation', array(), null, 'boinc:workunit-details'),
     'help' => t('Whether or not a workunit needs validation.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1279,11 +1279,11 @@ 
     )
   );
   $data['workunit']['target_nresults'] = array(
-    'title' => bts('Initial replication', array(), NULL, 'boinc:workunit-details'),
+    'title' => bts('Initial replication', array(), null, 'boinc:workunit-details'),
     'help' => t('The target number of results for the workunit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1308,16 +1308,16 @@ 
   // Primary keys allowed as arguments
 
   $data['app']['id'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Application ID', array(), null, 'boinc:application-details'),
     'help' => t('The ID number of this application.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1331,11 +1331,11 @@ 
   // Descriptions of app fields (alphabetized)
   
   $data['app']['target_nresults'] = array(
-    'title' => bts('Target number of results', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Target number of results', array(), null, 'boinc:application-details'),
     'help' => t('The number of times to replicate tasks in this application.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1345,11 +1345,11 @@ 
     )
   );
   $data['app']['user_friendly_name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+    'title' => bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The user friendly name of the application.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1374,16 +1374,16 @@ 
   // Primary keys allowed as arguments
 
   $data['app_version']['id'] = array(
-    'title' => bts('Application version ID', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Application version ID', array(), null, 'boinc:application-details'),
     'help' => t('The ID number of this application version.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1397,7 +1397,7 @@ 
   // Foreign key fields
   
   $data['app_version']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Application ID', array(), null, 'boinc:application-details'),
     'help' => t('The application ID associated with this app version.'),
     // Because this is a foreign key to the {app} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
@@ -1405,7 +1405,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1416,7 +1416,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1427,7 +1427,7 @@ 
   );
   
   $data['app_version']['platformid'] = array(
-    'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
+    'title' => bts('Platform ID', array(), null, 'boinc:platform-details'),
     'help' => t('The platform ID associated with this app version.'),
     // Because this is a foreign key to the {platform} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
@@ -1435,7 +1435,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1446,7 +1446,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1459,11 +1459,11 @@ 
   // Descriptions of app fields (alphabetized)
   
   $data['app_version']['plan_class'] = array(
-    'title' => bts('Plan class', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Plan class', array(), null, 'boinc:application-details'),
     'help' => t('App version plan class.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1473,12 +1473,12 @@ 
     )
   );
   $data['app_version']['version_num'] = array(
-    'title' => bts('Version number', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Version number', array(), null, 'boinc:application-details'),
     'help' => t('The application version number.'),
     'field' => array(
       'handler' => 'views_handler_field_boincwork_app_version_number',
-      'click sortable' => TRUE,
-      'float' => TRUE,
+      'click sortable' => true,
+      'float' => true,
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1512,16 +1512,16 @@ 
   // Primary keys allowed as arguments
 
   $data['host_app_version']['host_id'] = array(
-    'title' => bts('Computer', array(), NULL, 'boinc:host-details'),
+    'title' => bts('Computer', array(), null, 'boinc:host-details'),
     'help' => t('The host ID connected to this app version data.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1535,7 +1535,7 @@ 
   // Foreign key fields
   
   $data['host_app_version']['app_version_id'] = array(
-    'title' => bts('App version ID', array(), NULL, 'boinc:application-details'),
+    'title' => bts('App version ID', array(), null, 'boinc:application-details'),
     'help' => t('The app version ID connected to this host data.'),
     // Because this is a foreign key to the {host} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
@@ -1543,7 +1543,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1554,7 +1554,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1567,11 +1567,11 @@ 
   // Descriptions of host_app_version fields (alphabetized)
   
   $data['host_app_version']['consecutive_valid'] = array(
-    'title' => bts('Consecutive valid tasks', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Consecutive valid tasks', array(), null, 'boinc:application-details'),
     'help' => t('The number of consecutive valid tasks for this app and by this host.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1585,7 +1585,7 @@ 
     'help' => t('The "et_avg" for this app and by this host.'),
     'field' => array(
       'handler' => 'views_handler_field_boincwork_host_app_et_avg',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1595,11 +1595,11 @@ 
     )
   );
   $data['host_app_version']['et_n'] = array(
-    'title' => bts('Number of tasks completed', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Number of tasks completed', array(), null, 'boinc:application-details'),
     'help' => t('The tasks completed for this app and by this host.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1609,11 +1609,11 @@ 
     )
   );
   $data['host_app_version']['max_jobs_per_day'] = array(
-    'title' => bts('Max tasks per day', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Max tasks per day', array(), null, 'boinc:application-details'),
     'help' => t('The maximum tasks per day for this app and by this host.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1623,11 +1623,11 @@ 
     )
   );
   $data['host_app_version']['n_jobs_today'] = array(
-    'title' => bts('Number of tasks today', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Number of tasks today', array(), null, 'boinc:application-details'),
     'help' => t('The number of tasks today for this app and by this host.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1637,12 +1637,12 @@ 
     )
   );
   $data['host_app_version']['turnaround_avg'] = array(
-    'title' => bts('Average turnaround time', array(), NULL, 'boinc:application-details:-1:ignoreoverwrite'),
+    'title' => bts('Average turnaround time', array(), null, 'boinc:application-details:-1:ignoreoverwrite'),
     'help' => t('The average turnaround time per task for this app and by this host.'),
     'field' => array(
       'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
-      'click sortable' => TRUE,
-      'float' => TRUE,
+      'click sortable' => true,
+      'float' => true,
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1652,11 +1652,11 @@ 
     )
   );
   $data['host_app_version']['user_friendly_name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+    'title' => bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The user friendly name of the application.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'

Indentation +793 added lines, -793 removed lines

@@ -13,1660 +13,1660 @@ 
  */
 function boincwork_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for host table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for host table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['host']['table']['group'] = t('BOINC');
+    $data['host']['table']['group'] = t('BOINC');
   
-  $data['host']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC host'),
-      'help' => t('Computers attached to BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['host']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC host'),
+        'help' => t('Computers attached to BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // This table references the {user} table.
-  // This join creates an 'implicit' relationship to the user table, so that when
-  // "User" is the base table, the fields are automatically available.
+    // This table references the {user} table.
+    // This join creates an 'implicit' relationship to the user table, so that when
+    // "User" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
   
-  $data['host']['table']['join'] = array(
+    $data['host']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid',
+        'left_field' => 'id',
+        'field' => 'userid',
     )
-  );
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['host']['id'] = array(
+    $data['host']['id'] = array(
     'title' => bts('Computer ID', array(), NULL, 'boinc:host-list'),
     'help' => t('The ID number of this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['venue'] = array(
+    );
+    $data['host']['venue'] = array(
     'title' => bts('Location', array(), NULL, 'boinc:host-list'),
     'help' => t('The name of the preference set assigned to this host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['host']['userid'] = array(
+    $data['host']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The owner of this host.'),
     // Because this is a foreign key to the {user} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general host fields (alphabetized)
+    // Descriptions of general host fields (alphabetized)
   
-  $data['host']['active_frac'] = array(
+    $data['host']['active_frac'] = array(
     'title' => bts('While BOINC running, % of time work is allowed', array(), NULL, 'boinc:host-details'),
     'help' => t('The percentage of time that work is allowed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['avg_turnaround'] = array(
+    );
+    $data['host']['avg_turnaround'] = array(
     'title' => bts('Average turnaround time', array(), NULL, 'boinc:host-details'),
     'help' => t('The average time required for work to be completed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['create_time'] = array(
+    );
+    $data['host']['create_time'] = array(
     'title' => bts('Created', array(), NULL, 'boinc:host-details'),
     'help' => t('The time the host record was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['host']['connected_frac'] = array(
+    );
+    $data['host']['connected_frac'] = array(
     'title' => bts('While BOINC running, % of time host has an Internet connection', array(), NULL, 'boinc:host-details'),
     'help' => t('The percentage of time that the host has an Internet connection.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['cpu_efficiency'] = array(
+    );
+    $data['host']['cpu_efficiency'] = array(
     'title' => bts('Average CPU efficiency', array(), NULL, 'boinc:host-details'),
     'help' => t('The average efficiency of the host CPU.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['d_free'] = array(
+    );
+    $data['host']['d_free'] = array(
     'title' => bts('Free disk space', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of disk space that is not in use.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['d_total'] = array(
+    );
+    $data['host']['d_total'] = array(
     'title' => bts('Total disk space', array(), NULL, 'boinc:host-details'),
     'help' => t('The size of the disk on which BOINC is installed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['domain_name'] = array(
+    );
+    $data['host']['domain_name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['duration_correction_factor'] = array(
+    );
+    $data['host']['duration_correction_factor'] = array(
     'title' => bts('Task duration correction factor', array(), NULL, 'boinc:host-details'),
     'help' => t('Task duration correction factor.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['expavg_credit'] = array(
+    );
+    $data['host']['expavg_credit'] = array(
     'title' => bts('Avg. credit', array(), NULL, 'boinc:host-details'),
     'help' => t('A decaying average of credit per day.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['external_ip_addr'] = array(
+    );
+    $data['host']['external_ip_addr'] = array(
     'title' => bts('External IP address', array(), NULL, 'boinc:host-details'),
     'help' => t('The IP address from which the host last communicated.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['host_cpid'] = array(
+    );
+    $data['host']['host_cpid'] = array(
     'title' => bts('Cross project ID', array(), NULL, 'boinc:host-details'),
     'help' => t('The consistent identifier of the host across projects.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['last_ip_addr'] = array(
+    );
+    $data['host']['last_ip_addr'] = array(
     'title' => bts('Last IP address', array(), NULL, 'boinc:host-details'),
     'help' => t('The IP address of the host at last communication.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['m_cache'] = array(
+    );
+    $data['host']['m_cache'] = array(
     'title' => bts('Cache', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of cache on the processor(s).'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['m_nbytes'] = array(
+    );
+    $data['host']['m_nbytes'] = array(
     'title' => bts('Memory', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of memory installed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['m_swap'] = array(
+    );
+    $data['host']['m_swap'] = array(
     'title' => bts('Swap space', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of swap space configured.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['max_results_day'] = array(
+    );
+    $data['host']['max_results_day'] = array(
     'title' => bts('Maximum daily WU quota per CPU', array(), NULL, 'boinc:host-details'),
     'help' => t('The maximum number of workunits to be allocated per CPU.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['n_bwdown'] = array(
+    );
+    $data['host']['n_bwdown'] = array(
     'title' => bts('Average download rate', array(), NULL, 'boinc:host-details'),
     'help' => t('The average rate at which new work is downloaded.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['n_bwup'] = array(
+    );
+    $data['host']['n_bwup'] = array(
     'title' => bts('Average upload rate', array(), NULL, 'boinc:host-details'),
     'help' => t('The average rate at which completed work is uploaded.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['nsame_ip_addr'] = array(
+    );
+    $data['host']['nsame_ip_addr'] = array(
     'title' => bts('Same IP address count', array(), NULL, 'boinc:host-details'),
     'help' => t('The number of times the last IP address.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['on_frac'] = array(
+    );
+    $data['host']['on_frac'] = array(
     'title' => bts('% of time BOINC client is running', array(), NULL, 'boinc:host-details'),
     'help' => t('The percentage of time that the BOINC client is running.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['os_name'] = array(
+    );
+    $data['host']['os_name'] = array(
     'title' => bts('Operating system', array(), NULL, 'boinc:host-details'),
     'help' => t('The name of the host operating system.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );  
-  $data['host']['os_version'] = array(
+    );  
+    $data['host']['os_version'] = array(
     'title' => bts('Operating system version', array(), NULL, 'boinc:host-details'),
     'help' => t('The version of the host operating system.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_fpops'] = array(
+    );
+    $data['host']['p_fpops'] = array(
     'title' => bts('Measured floating point speed', array(), NULL, 'boinc:host-details'),
     'help' => t('The capability of the host in floating point operations per second.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['p_iops'] = array(
+    );
+    $data['host']['p_iops'] = array(
     'title' => bts('Measured integer speed', array(), NULL, 'boinc:host-details'),
     'help' => t('The capability of the host in integer operations per second.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['p_model'] = array(
+    );
+    $data['host']['p_model'] = array(
     'title' => bts('CPU model', array(), NULL, 'boinc:host-details'),
     'help' => t('The model of the CPU in the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_ncpus'] = array(
+    );
+    $data['host']['p_ncpus'] = array(
     'title' => bts('Number of processors', array(), NULL, 'boinc:host-details'),
     'help' => t('The count of CPU cores in the system.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_vendor'] = array(
+    );
+    $data['host']['p_vendor'] = array(
     'title' => bts('CPU', array(), NULL, 'boinc:host-details'),
     'help' => t('The manufacturer of the CPU in the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['rpc_seqno'] = array(
+    );
+    $data['host']['rpc_seqno'] = array(
     'title' => bts('Number of times client has contacted server', array(), NULL, 'boinc:host-details'),
     'help' => t('The number of times the client has contacted the server.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['rpc_time'] = array(
+    );
+    $data['host']['rpc_time'] = array(
     'title' => bts('Last contact', array(), NULL, 'boinc:host-details'),
     'help' => t('The time of the last RPC contact with the host.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['host']['serialnum'] = array(
+    );
+    $data['host']['serialnum'] = array(
     'title' => bts('Serial number', array(), NULL, 'boinc:host-details'),
     'help' => t('Contains the release number of the BOINC application in use and the GPU of the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['timezone'] = array(
+    );
+    $data['host']['timezone'] = array(
     'title' => bts('Timezone', array(), NULL, 'boinc:host-details'),
     'help' => t('The UTC offset of the local time.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['total_credit'] = array(
+    );
+    $data['host']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for a host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for platform table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for platform table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['platform']['table']['group'] = t('BOINC');
-  $data['platform']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC platform'),
-      'help' => t('Operating system platforms'),
-      'database' => 'boinc_ro'
-  );
+    $data['platform']['table']['group'] = t('BOINC');
+    $data['platform']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC platform'),
+        'help' => t('Operating system platforms'),
+        'database' => 'boinc_ro'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['platform']['id'] = array(
+    $data['platform']['id'] = array(
     'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
     'help' => t('The ID number of the platform.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['platform']['name'] = array(
+    $data['platform']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the platform.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for result (task) table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for result (task) table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['result']['table']['group'] = t('BOINC');
-  $data['result']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC result'),
-      'help' => t('Results produced by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['result']['table']['group'] = t('BOINC');
+    $data['result']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC result'),
+        'help' => t('Results produced by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Create implicit relationships to the user, workunit, and host tables
+    // Create implicit relationships to the user, workunit, and host tables
   
-  $data['result']['table']['join'] = array(
+    $data['result']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid'
+        'left_field' => 'id',
+        'field' => 'userid'
     ),
     'workunit' => array(
-      'left_field' => 'id',
-      'field' => 'workunitid'
+        'left_field' => 'id',
+        'field' => 'workunitid'
     ),
     'host' => array(
-      'left_field' => 'id',
-      'field' => 'hostid'
+        'left_field' => 'id',
+        'field' => 'hostid'
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['result']['id'] = array(
+    $data['result']['id'] = array(
     'title' => bts('Task ID', array(), NULL, 'boinc:task-details'),
     'help' => t('The ID number of this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['result']['userid'] = array(
+    $data['result']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The owner of this result.'),
     // Foreign key to the {user} table
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     )
-  );
-  $data['result']['workunitid'] = array(
+    );
+    $data['result']['workunitid'] = array(
     'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The workunit associated with this result.'),
     // Foreign key to the {workunit} table
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'workunit',
-      'field' => 'workunitid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Workunit')
+        'base' => 'workunit',
+        'field' => 'workunitid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Workunit')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['hostid'] = array(
+    );
+    $data['result']['hostid'] = array(
     'title' => bts('Host ID', array(), NULL, 'boinc:task-details'),
     'help' => t('The host associated with this result.'),
     // Foreign key to the {host} table
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'host',
-      'field' => 'hostid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Host')
+        'base' => 'host',
+        'field' => 'hostid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Host')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of result fields (alphabetized)
+    // Descriptions of result fields (alphabetized)
   
-  $data['result']['appid'] = array(
+    $data['result']['appid'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The ID number of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['app_version_id'] = array(
+    );
+    $data['result']['app_version_id'] = array(
     'title' => bts('Application version', array(), NULL, 'boinc:task-details'),
     'help' => t('The version number of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['claimed_credit'] = array(
+    );
+    $data['result']['claimed_credit'] = array(
     'title' => bts('Claimed credit', array(), NULL, 'boinc:task-details'),
     'help' => t('The credit claimed for this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['client_state'] = array(
+    );
+    $data['result']['client_state'] = array(
     'title' => bts('Client state', array(), NULL, 'boinc:task-details'),
     'help' => t('The state of the task on the client side.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['cpu_time'] = array(
+    );
+    $data['result']['cpu_time'] = array(
     'title' => bts('CPU time', array(), NULL, 'boinc:task-details'),
     'help' => t('The CPU time spent on the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['create_time'] = array(
+    );
+    $data['result']['create_time'] = array(
     'title' => bts('Created', array(), NULL, 'boinc:task-details:-1:ignoreoverwrite'),
     'help' => t('The time that the task was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['elapsed_time'] = array(
+    );
+    $data['result']['elapsed_time'] = array(
     'title' => bts('Run time', array(), NULL, 'boinc:task-details'),
     'help' => t('The run time of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['exit_status'] = array(
+    );
+    $data['result']['exit_status'] = array(
     'title' => bts('Exit status', array(), NULL, 'boinc:task-details'),
     'help' => t('The exit code of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['granted_credit'] = array(
+    );
+    $data['result']['granted_credit'] = array(
     'title' => bts('Granted credit', array(), NULL, 'boinc:task-details'),
     'help' => t('The credit granted for this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['name'] = array(
+    );
+    $data['result']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['result']['outcome'] = array(
+    );
+    $data['result']['outcome'] = array(
     'title' => bts('Outcome', array(), NULL, 'boinc:task-details'),
     'help' => t('The outcome of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['received_time'] = array(
+    );
+    $data['result']['received_time'] = array(
     'title' => bts('Received time', array(), NULL, 'boinc:task-details'),
     'help' => t('The time that the result was received.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['report_deadline'] = array(
+    );
+    $data['result']['report_deadline'] = array(
     'title' => bts('Report deadline', array(), NULL, 'boinc:task-details'),
     'help' => t('The deadline for the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['sent_time'] = array(
+    );
+    $data['result']['sent_time'] = array(
     'title' => bts('Sent', array(), NULL, 'boinc:task-details'),
     'help' => t('The time that the task was sent.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['server_state'] = array(
+    );
+    $data['result']['server_state'] = array(
     'title' => bts('Server state', array(), NULL, 'boinc:task-details'),
     'help' => t('The state of task on the server side.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['stderr_out'] = array(
+    );
+    $data['result']['stderr_out'] = array(
     'title' => bts('Stderr out', array(), NULL, 'boinc:task-details'),
     'help' => t('The output to standard error.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['result']['validate_state'] = array(
+    );
+    $data['result']['validate_state'] = array(
     'title' => bts('Validation state', array(), NULL, 'boinc:task-details'),
     'help' => t('The state of validation of this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['peak_working_set_size'] = array(
+    );
+    $data['result']['peak_working_set_size'] = array(
     'title' => bts('Peak working set size', array(), NULL, 'boinc:task-details'),
     'help' => t('Peak working set size.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['peak_swap_size'] = array(
+    );
+    $data['result']['peak_swap_size'] = array(
     'title' => bts('Peak swap size', array(), NULL, 'boinc:task-details'),
     'help' => t('Peak swap size.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
     $data['result']['peak_disk_usage'] = array(
     'title' => bts('Peak disk usage', array(), NULL, 'boinc:task-details'),
     'help' => t('Peak disk usage.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for workunit table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for workunit table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['workunit']['table']['group'] = t('BOINC');
-  $data['workunit']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC workunit'),
-      'help' => t('Workunits produced by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['workunit']['table']['group'] = t('BOINC');
+    $data['workunit']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC workunit'),
+        'help' => t('Workunits produced by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Create implicit relationship to the app table
+    // Create implicit relationship to the app table
   
-  $data['workunit']['table']['join'] = array(
+    $data['workunit']['table']['join'] = array(
     'app' => array(
-      'left_field' => 'id',
-      'field' => 'appid'
+        'left_field' => 'id',
+        'field' => 'appid'
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['workunit']['id'] = array(
+    $data['workunit']['id'] = array(
     'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The ID number of this workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['workunit']['appid'] = array(
+    $data['workunit']['appid'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The application associated with this workunit.'), 
     'argument' => array( // foreign key to the {app} table
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'app',
-      'field' => 'appid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Application')
+        'base' => 'app',
+        'field' => 'appid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Application')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of workunit fields (alphabetized)
+    // Descriptions of workunit fields (alphabetized)
   
-  $data['workunit']['canonical_credit'] = array(
+    $data['workunit']['canonical_credit'] = array(
     'title' => bts('Canonical credit', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The canonical credit of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['canonical_resultid'] = array(
+    );
+    $data['workunit']['canonical_resultid'] = array(
     'title' => bts('Canonical result ID', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The ID of the canonical result associated with the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['create_time'] = array(
+    );
+    $data['workunit']['create_time'] = array(
     'title' => bts('Created time', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The time that the workunit was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['workunit']['error_mask'] = array(
+    );
+    $data['workunit']['error_mask'] = array(
     'title' => bts('Error mask', array(), NULL, 'boinc:workunit-details'),
     'help' => t('Error mask of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['min_quorum'] = array(
+    );
+    $data['workunit']['min_quorum'] = array(
     'title' => bts('Minimum quorum', array(), NULL, 'boinc:workunit-details'),
     'help' => t('Minimum quorum of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['name'] = array(
+    );
+    $data['workunit']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
     'help' => t('The name of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['workunit']['max_error_results'] = array(
+    );
+    $data['workunit']['max_error_results'] = array(
     'title' => bts('Max error tasks', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The maximum number of error tasks in the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['max_success_results'] = array(
+    );
+    $data['workunit']['max_success_results'] = array(
     'title' => bts('Max success tasks', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The maximum number of successful tasks in the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['max_total_results'] = array(
+    );
+    $data['workunit']['max_total_results'] = array(
     'title' => bts('Max total tasks', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The maximum number of total tasks in the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['need_validate'] = array(
+    );
+    $data['workunit']['need_validate'] = array(
     'title' => bts('Needs validation', array(), NULL, 'boinc:workunit-details'),
     'help' => t('Whether or not a workunit needs validation.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['target_nresults'] = array(
+    );
+    $data['workunit']['target_nresults'] = array(
     'title' => bts('Initial replication', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The target number of results for the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for app table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for app table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['app']['table']['group'] = t('BOINC');
-  $data['app']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC app'),
-      'help' => t('Research applications run by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['app']['table']['group'] = t('BOINC');
+    $data['app']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC app'),
+        'help' => t('Research applications run by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['app']['id'] = array(
+    $data['app']['id'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The ID number of this application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['app']['target_nresults'] = array(
+    $data['app']['target_nresults'] = array(
     'title' => bts('Target number of results', array(), NULL, 'boinc:application-details'),
     'help' => t('The number of times to replicate tasks in this application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['app']['user_friendly_name'] = array(
+    );
+    $data['app']['user_friendly_name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The user friendly name of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for app_version table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for app_version table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['app_version']['table']['group'] = t('BOINC');
-  $data['app_version']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC app version'),
-      'help' => t('Versions of research applications run by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['app_version']['table']['group'] = t('BOINC');
+    $data['app_version']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC app version'),
+        'help' => t('Versions of research applications run by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['app_version']['id'] = array(
+    $data['app_version']['id'] = array(
     'title' => bts('Application version ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The ID number of this application version.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['app_version']['appid'] = array(
+    $data['app_version']['appid'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The application ID associated with this app version.'),
     // Because this is a foreign key to the {app} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'app',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('App ID')
+        'base' => 'app',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('App ID')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  $data['app_version']['platformid'] = array(
+    $data['app_version']['platformid'] = array(
     'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
     'help' => t('The platform ID associated with this app version.'),
     // Because this is a foreign key to the {platform} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'platform',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Platform ID')
+        'base' => 'platform',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Platform ID')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['app_version']['plan_class'] = array(
+    $data['app_version']['plan_class'] = array(
     'title' => bts('Plan class', array(), NULL, 'boinc:application-details'),
     'help' => t('App version plan class.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['app_version']['version_num'] = array(
+    );
+    $data['app_version']['version_num'] = array(
     'title' => bts('Version number', array(), NULL, 'boinc:application-details'),
     'help' => t('The application version number.'),
     'field' => array(
-      'handler' => 'views_handler_field_boincwork_app_version_number',
-      'click sortable' => TRUE,
-      'float' => TRUE,
+        'handler' => 'views_handler_field_boincwork_app_version_number',
+        'click sortable' => TRUE,
+        'float' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for host_app_version table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for host_app_version table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['host_app_version']['table']['group'] = t('BOINC');
+    $data['host_app_version']['table']['group'] = t('BOINC');
   
-  // This table references the {host} table.
-  // This join creates an 'implicit' relationship to the host table, so that when
-  // "Host" is the base table, the fields are automatically available.
+    // This table references the {host} table.
+    // This join creates an 'implicit' relationship to the host table, so that when
+    // "Host" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
   
-  $data['host_app_version']['table']['join'] = array(
+    $data['host_app_version']['table']['join'] = array(
     'host' => array(
-      'left_field' => 'id',
-      'field' => 'host_id',
+        'left_field' => 'id',
+        'field' => 'host_id',
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['host_app_version']['host_id'] = array(
+    $data['host_app_version']['host_id'] = array(
     'title' => bts('Computer', array(), NULL, 'boinc:host-details'),
     'help' => t('The host ID connected to this app version data.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['host_app_version']['app_version_id'] = array(
+    $data['host_app_version']['app_version_id'] = array(
     'title' => bts('App version ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The app version ID connected to this host data.'),
     // Because this is a foreign key to the {host} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'app_version',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('App version')
+        'base' => 'app_version',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('App version')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of host_app_version fields (alphabetized)
+    // Descriptions of host_app_version fields (alphabetized)
   
-  $data['host_app_version']['consecutive_valid'] = array(
+    $data['host_app_version']['consecutive_valid'] = array(
     'title' => bts('Consecutive valid tasks', array(), NULL, 'boinc:application-details'),
     'help' => t('The number of consecutive valid tasks for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['et_avg'] = array(
+    );
+    $data['host_app_version']['et_avg'] = array(
     'title' => t('Average processing rate'),
     'help' => t('The "et_avg" for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_boincwork_host_app_et_avg',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_boincwork_host_app_et_avg',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['et_n'] = array(
+    );
+    $data['host_app_version']['et_n'] = array(
     'title' => bts('Number of tasks completed', array(), NULL, 'boinc:application-details'),
     'help' => t('The tasks completed for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['max_jobs_per_day'] = array(
+    );
+    $data['host_app_version']['max_jobs_per_day'] = array(
     'title' => bts('Max tasks per day', array(), NULL, 'boinc:application-details'),
     'help' => t('The maximum tasks per day for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['n_jobs_today'] = array(
+    );
+    $data['host_app_version']['n_jobs_today'] = array(
     'title' => bts('Number of tasks today', array(), NULL, 'boinc:application-details'),
     'help' => t('The number of tasks today for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['turnaround_avg'] = array(
+    );
+    $data['host_app_version']['turnaround_avg'] = array(
     'title' => bts('Average turnaround time', array(), NULL, 'boinc:application-details:-1:ignoreoverwrite'),
     'help' => t('The average turnaround time per task for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
-      'click sortable' => TRUE,
-      'float' => TRUE,
+        'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
+        'click sortable' => TRUE,
+        'float' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['user_friendly_name'] = array(
+    );
+    $data['host_app_version']['user_friendly_name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The user friendly name of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -1678,23 +1678,23 @@ 
 
 function boincwork_views_handlers() {
   
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincwork') . '/views',
+        'path' => drupal_get_path('module', 'boincwork') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
+        'views_handler_argument_boincuser_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_field_boincwork_app_version_number' => array(
+        ),
+        'views_handler_field_boincwork_app_version_number' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_et_avg' => array(
+        ),
+        'views_handler_field_boincwork_host_app_et_avg' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_turnaround_avg' => array(
+        ),
+        'views_handler_field_boincwork_host_app_turnaround_avg' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
+        ),
     )
-  );
+    );
 }

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

Switch Indentation +6 added lines, -6 removed lines

@@ -180,12 +180,12 @@
  */
 function boincwork_locale($op = 'groups', $group = NULL) {
   switch ($op) {
-    case 'groups':
-      return array('project' => bts('Project'));
-    case 'info':
-      $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
-      return $info;
+  case 'groups':
+    return array('project' => bts('Project'));
+  case 'info':
+    $info['project']['refresh callback'] = 'boincwork_locale_refresh';
+    $info['project']['format'] = FALSE;
+    return $info;
   }
 }
 

Braces +9 added lines, -18 removed lines

@@ -279,8 +279,7 @@ 
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
       );
-    }
-    else {
+    } else {
       $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
@@ -387,8 +386,7 @@ 
             }
             if (!$special) {
               $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-            }
-            else {
+            } else {
               // The "very special" case where we merge two prefs
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
@@ -396,8 +394,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else {
             $output .= '<td>---</td>';
           }
         }
@@ -923,22 +920,19 @@ 
         drupal_set_message(t('Host @id has been removed from your account.',
           array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+      } else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
           array('@id' => $host_id)), 'error'
         );
       }
-    }
-    else {
+    } else {
       drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.', 
         array('@id' => $host_id)), 'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.', 
       array('@id' => $host_id)), 'error'
@@ -986,15 +980,13 @@ 
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
       );
-    }
-    else {
+    } else {
       drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
       'warning'
@@ -1129,8 +1121,7 @@ 
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);
     }
-  }
-  else {
+  } else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;

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

@@ -232,13 +232,13 @@ 
 /**
  * Implementation of hook_locale().
  */
-function boincwork_locale($op = 'groups', $group = NULL) {
+function boincwork_locale($op = 'groups', $group = null) {
   switch ($op) {
     case 'groups':
       return array('project' => bts('Project'));
     case 'info':
       $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
+      $info['project']['format'] = false;
       return $info;
   }
 }
@@ -254,7 +254,7 @@ 
     'project_specific' => array(),
   );
   boincwork_add_project_specific_prefs($form, $prefs);
-  return TRUE; // Meaning it completed with no issues
+  return true; // Meaning it completed with no issues
 }
 
 
@@ -275,14 +275,14 @@ 
   if ($user->uid != $author->uid) {
     if ($vars['message']['is_blocked']) {
       $vars['message_actions']['unignore_user'] = array(
-        'title' => bts('Stop Ignoring User', array(), NULL, 'boinc:ignore-user-remove'),
+        'title' => bts('Stop Ignoring User', array(), null, 'boinc:ignore-user-remove'),
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
       );
     }
     else {
       $vars['message_actions']['ignore_user'] = array(
-        'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
+        'title' => bts('Ignore User', array(), null, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
       );
@@ -298,7 +298,7 @@ 
   require_boinc('boinc_db');
   $num_deleted = BoincHostDeleted::delete_expired();
   if ($num_deleted>0) {
-    watchdog('boincwork', "Deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE);
+    watchdog('boincwork', "deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE);
   }
 }
 
@@ -310,7 +310,7 @@ 
   * General preferences menu callback.
   * Called when user goes to edit preferences page
   */
-function generalprefs_page($action = null, $venue = null, $advanced = FALSE) {
+function generalprefs_page($action = null, $venue = null, $advanced = false) {
   
   // Keep the venue selected across preference pages
   boincwork_select_venue($venue);
@@ -325,8 +325,8 @@ 
   
   case 'clear':
     // Remove settings from this preference set
-    if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'general', $venue);
+    if ($venue and $venue != 'generic') {
+      boincwork_save_prefs(null, 'general', $venue);
       drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
       // Set the generic preference set as active
@@ -344,10 +344,10 @@ 
       drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
-    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
+    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), null, 'boinc:account-preferences-computing') . '<br/>';
+    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), null, 'boinc:account-preferences-computing') . '</p>';
+    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), null, 'boinc:account-preferences') . '</p>';
+    $output .= '<h2>' . bts('Combined preferences', array(), null, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), null, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -369,9 +369,9 @@ 
           'daily_xfer_limit_mb' => 'daily_xfer_period_days',
         );
         $special_delimiter = array(
-          'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
-          'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
-          'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
+          'start_hour' => bts('and', array(), null, 'boinc:account-preference'),
+          'net_start_hour'=> bts('and', array(), null, 'boinc:account-preference'),
+          'daily_xfer_limit_mb' => bts('every', array(), null, 'boinc:account-preference'),
         );
         $special = isset($special_map[$name]);
         $very_special = in_array($name, $special_map);
@@ -386,8 +386,8 @@ 
         // Output values for each preference set, again with ugly hacks for
         // time range preferences
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND 
-              $prefs[$pref_set]['#established'] AND
+          if (($prefs[$pref_set]) and 
+              $prefs[$pref_set]['#established'] and
               isset($prefs[$pref_set]['prefs']['advanced'][$category])) {
             $pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
@@ -430,19 +430,19 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), null, 'boinc:form-edit') : bts('Add', array(), null, 'boinc:form-add');
       $output .= '<td><ul class="tab-list"><li class="first tab">';
       $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
         array('fragment' => "")
       );
       // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
+      if ($pref_set != 'generic' and $prefs[$pref_set]['#established']) {
+        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), null, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
               'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
+                array('@name' => ucfirst($pref_set)), null, 'boinc:account-computing-preferences') . '\')'
             )
           )
         );
@@ -462,10 +462,10 @@ 
     if (function_exists('jump_quickly')) {
       $path = 'account/prefs/computing/edit';
       $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}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
-        "{$path}/work" => bts('Work', 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}/school" => bts('School', array(), null, 'boinc:account-preferences-location'),
+        "{$path}/work" => bts('Work', array(), null, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
       drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -478,7 +478,7 @@ 
       $output .= '  </div>';
       $output .= '</div>';
     }
-    $output .= drupal_get_form('boincwork_generalprefs_form', $venue, NULL, $advanced);
+    $output .= drupal_get_form('boincwork_generalprefs_form', $venue, null, $advanced);
     
     // If viewing the edit page for a preference set that doesn't
     // exist, inform the user that preferences are not set.
@@ -490,7 +490,7 @@ 
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
           array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+          null, 'boinc:account-preferences'), 'status');
     }
     
     break;
@@ -520,8 +520,8 @@ 
   
   case 'clear':
     // Remove settings from this preference set
-    if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'project', $venue);
+    if ($venue and $venue != 'generic') {
+      boincwork_save_prefs(null, 'project', $venue);
       drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
       
@@ -548,8 +548,8 @@ 
       drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
+    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), null, 'boinc:account-preferences') . '</p>';
+    $output .= '<h2>' . bts('Combined preferences', array(), null, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), null, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -569,8 +569,8 @@ 
         $output .= "<div class=\"description\">{$setting['description']}</div>";
         $output .= '</td>';
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND
-              $prefs[$pref_set]['#established'] AND
+          if (($prefs[$pref_set]) and
+              $prefs[$pref_set]['#established'] and
               isset($prefs[$pref_set][$category])) {
             $pref_setting = $prefs[$pref_set][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
@@ -596,17 +596,17 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), null, 'boinc:form-edit') : bts('Add', array(), null, 'boinc:form-add');
       $output .= '<td><ul class="tab-list"><li class="first tab">';
       $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
       // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
+      if ($pref_set != 'generic' and $prefs[$pref_set]['#established']) {
+        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), null, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
               'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
+                array('@name' => ucfirst($pref_set)), null, 'boinc:account-preferences-project') . '\')'
             )
           )
         );
@@ -622,7 +622,7 @@ 
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
-    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project') );
+    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), null, 'boinc:account-preferences-project') );
     drupal_goto('account/prefs/project/combined');
     break;
     
@@ -635,10 +635,10 @@ 
     if (function_exists('jump_quickly')) {
       $path = 'account/prefs/project/edit';
       $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}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
-        "{$path}/work" => bts('Work', 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}/school" => bts('School', array(), null, 'boinc:account-preferences-location'),
+        "{$path}/work" => bts('Work', array(), null, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
       drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -663,7 +663,7 @@ 
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
           array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+          null, 'boinc:account-preferences'), 'status');
     }
     
     break;
@@ -719,7 +719,7 @@ 
       foreach ($section as $name => $setting) {
         if ($name{0} == '#') continue;
         $value = isset($setting['#default_value']) ? $setting['#default_value'] : '';
-        if ($value AND isset($setting['#options'])) $value = $setting['#options'][$value];
+        if ($value and isset($setting['#options'])) $value = $setting['#options'][$value];
         elseif ($value == '') $value = '---';
         if (!isset($setting['#title'])) $setting['#title'] = '';
         if (!isset($setting['#description'])) $setting['#description'] = '';
@@ -734,7 +734,7 @@ 
     // Edit preferences link
     $output .= '<tr>';
     $output .= '<td></td>';
-    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
+    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), null, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
     $output .= '</tr>';
     
     $output .= '</table>';
@@ -966,17 +966,17 @@ 
 function boincwork_host_log($host_id = null) {
   $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
   $log = '';
-  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)) {
     header('Content-type: text/plain');
     include($log);
   }
 }
 
-function boincwork_host_set_venue($host_id = NULL, $venue = NULL) {
+function boincwork_host_set_venue($host_id = null, $venue = null) {
   global $user;
   $account = user_load($user->uid);
   db_set_active('boinc_ro');
@@ -986,7 +986,7 @@ 
     $host_id
   ));
   db_set_active('default');
-  if ($host_owner AND $host_owner == $account->boincuser_id) {
+  if ($host_owner and $host_owner == $account->boincuser_id) {
     db_set_active('boinc_rw');
     $updated = db_query(
       "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
@@ -995,20 +995,20 @@ 
     db_set_active('default');
     if ($updated) {
       drupal_set_message(
-        bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
-        . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
+        bts('The location for this host has been updated.', array(), null, 'boinc:account-host-details')
+        . bts('This will take effect next time the host contacts the project.', array(), null, 'boinc:account-host-details')
       );
     }
     else {
       drupal_set_message(
-        bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
+        bts('Unable to save changes to this host for some reason!', array(), null, 'boinc:account-host-details'),
         'error'
       );
     }
   }
   else {
     drupal_set_message(
-      bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
+      bts('You are not allowed to make changes to this host.', array(), null, 'boinc:account-host-details'),
       'warning'
     );
   }
@@ -1060,7 +1060,7 @@ 
 
   // obtain Drupal variables
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  $overrideboinctou = variable_get('boinc_weboptions_overrideboinctou', FALSE);
+  $overrideboinctou = variable_get('boinc_weboptions_overrideboinctou', false);
 
   // If terms of use string exists and override is true, set terms-of-use
   // to Drupal varaible.
@@ -1096,8 +1096,8 @@ 
 /**
  * Page callback for user account task table
  */
-function boincwork_account_task_table($tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
+function boincwork_account_task_table($tselect = null, $app_id = null) {
+  $title = bts('Tasks for your account', array(), null, 'boinc:account-task-table');
   drupal_set_title($title);
 
   global $user;
@@ -1108,14 +1108,14 @@ 
 /**
  * Page callback for host task table
  */
-function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
+function boincwork_host_task_table($host_id = null, $tselect = null, $app_id = null) {
   require_boinc( array('util', 'result') );
 
-  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
+  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), null, 'boinc:host-task-table');
   drupal_set_title($title);
 
   if (is_null($host_id)) {
-    drupal_set_message(bts('ERROR: Invalid host ID', array(), NULL, 'boinc:host-task-table'), 'error');
+    drupal_set_message(bts('ERROR: Invalid host ID', array(), null, 'boinc:host-task-table'), 'error');
     return '';
   }
 
@@ -1125,12 +1125,12 @@ 
 /**
  * Page callback for workunit task table
  */
-function boincwork_workunit_task_table($workunit_id = NULL, $tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
+function boincwork_workunit_task_table($workunit_id = null, $tselect = null, $app_id = null) {
+  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), null, 'boinc:workunit-task-table');
   drupal_set_title($title);
 
   if (is_null($workunit_id)) {
-    drupal_set_message(bts('ERROR: Invalid workunit ID', array(), NULL, 'boinc:workunit-task-table'), 'error');
+    drupal_set_message(bts('ERROR: Invalid workunit ID', array(), null, 'boinc:workunit-task-table'), 'error');
     return '';
   }
   
@@ -1156,7 +1156,7 @@ 
  */
 function boincwork_select_venue(&$venue) {
   if (!$venue) {
-    $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : NULL;
+    $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : null;
     if ($active_venue) {
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);

Indentation +381 added lines, -381 removed lines

@@ -2,9 +2,9 @@ 
 // $Id$
 
 /**
-  * @file
-  * Enable BOINC features related to processing work and credit.
-  */
+ * @file
+ * Enable BOINC features related to processing work and credit.
+ */
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -20,70 +20,70 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Implementation of hook_menu().
-  */
+ * Implementation of hook_menu().
+ */
 function boincwork_menu() {
-  require_boinc('util');
-  $items['account/prefs'] = array(
+    require_boinc('util');
+    $items['account/prefs'] = array(
     'title' => 'Computing',
     'description' => '',
     'page callback' => 'generalprefs_page', 
     'access callback' => 'user_is_logged_in',
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['account/prefs/computing'] = array(
+    );
+    $items['account/prefs/computing'] = array(
     'title' => 'Computing',
     'page callback' => 'generalprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['account/prefs/project'] = array(
+    );
+    $items['account/prefs/project'] = array(
     'title' => 'Project',
     'page callback' => 'projectprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['account/prefs/community'] = array(
+    );
+    $items['account/prefs/community'] = array(
     'title' => 'Community',
     'page callback' => 'communityprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 10
-  );
-  $items['account/prefs/privacy'] = array(
+    );
+    $items['account/prefs/privacy'] = array(
     'title' => 'Privacy',
     'page callback' => 'privacyprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 15
-  );
-  if (module_exists('ignore_user')) {
+    );
+    if (module_exists('ignore_user')) {
     $items['account/prefs/privacy/ignore_user/add'] = array(
-      'title' => 'Add from ignore list',
-      'description' => 'Add user that you with to ignore to your ignore list.',
-      'page callback' => 'boincwork_ignore_user_add_user',
-      'access callback' => 'user_access',
-      'access arguments' => array('ignore user'),
-      'type' => MENU_CALLBACK,
+        'title' => 'Add from ignore list',
+        'description' => 'Add user that you with to ignore to your ignore list.',
+        'page callback' => 'boincwork_ignore_user_add_user',
+        'access callback' => 'user_access',
+        'access arguments' => array('ignore user'),
+        'type' => MENU_CALLBACK,
     );
     $items['account/prefs/privacy/ignore_user/remove'] = array(
-      'title' => 'Remove from ignore list',
-      'description' => 'Remove user from your ignore list.',
-      'page callback' => 'boincwork_ignore_user_remove_user',
-      'access callback' => 'user_access',
-      'access arguments' => array('ignore user'),
-      'type' => MENU_CALLBACK,
+        'title' => 'Remove from ignore list',
+        'description' => 'Remove user from your ignore list.',
+        'page callback' => 'boincwork_ignore_user_remove_user',
+        'access callback' => 'user_access',
+        'access arguments' => array('ignore user'),
+        'type' => MENU_CALLBACK,
     );
-  }// endif module_exists
-  $items['account/certs'] = array(
+    }// endif module_exists
+    $items['account/certs'] = array(
     'title' =>'Account certificate',
     'page callback' => 'boincwork_certificates',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc/prefs/general'] = array(
+    );
+    $items['admin/boinc/prefs/general'] = array(
     'title' => 'Preferences: General',
     'description' => 'Set options for BOINC preference set pages',
     'page callback' => 'drupal_get_form',
@@ -91,16 +91,16 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['admin/boinc/prefs/presets'] = array(
+    );
+    $items['admin/boinc/prefs/presets'] = array(
     'title' => 'Preferences: Presets',
     'description' => 'Set values for BOINC preference set presets.',
     'page callback' => 'boincwork_admin_prefs_presets_page',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['admin/boinc/prefs/upload'] = array(
+    );
+    $items['admin/boinc/prefs/upload'] = array(
     'title' => 'Preferences: Project-specific XML upload',
     'description' => 'Upload XML configuration for project specific preferences.',
     'page callback' => 'drupal_get_form',
@@ -108,153 +108,153 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['host/%/delete'] = array(
+    );
+    $items['host/%/delete'] = array(
     'title' => 'Delete host',
     'page callback' => 'boincwork_host_delete',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/log'] = array(
+    );
+    $items['host/%/log'] = array(
     'title' => 'Host log',
     'page callback' => 'boincwork_host_log',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/merge'] = array(
+    );
+    $items['host/%/merge'] = array(
     'title' => 'Merge computer',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincwork_host_merge_form', 1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/set-venue/%'] = array(
+    );
+    $items['host/%/set-venue/%'] = array(
     'title' => 'Set host venue',
     'page callback' => 'boincwork_host_set_venue',
     'page arguments' => array(1,3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['user/%/mobile'] = array(
+    );
+    $items['user/%/mobile'] = array(
     'title' => 'Mobile stats',
     'page callback' => 'boincwork_mobile_stats',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK
-  );
-  $items['server_status.php'] = array(
+    );
+    $items['server_status.php'] = array(
     'title' => 'Server status',
     'page callback' => 'boincwork_server_status',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['job_file.php'] = array(
+    );
+    $items['job_file.php'] = array(
     'title' => 'Job file input',
     'page callback' => 'boincwork_job_file',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['get_output.php'] = array(
+    );
+    $items['get_output.php'] = array(
     'title' => 'Get output file',
     'page callback' => 'boincwork_get_output',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['get_project_config.php'] = array(
+    );
+    $items['get_project_config.php'] = array(
     'title' => 'Project config',
     'page callback' => 'boincwork_get_project_config',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['submit_rpc_handler.php'] = array(
+    );
+    $items['submit_rpc_handler.php'] = array(
     'title' => 'Remote job submission',
     'page callback' => 'boincwork_submit_rpc_handler',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['userw.php'] = array(
+    );
+    $items['userw.php'] = array(
     'title' => 'User WAP',
     'page callback' => 'boincwork_user_wap',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['account/tasks/%/%'] = array(
+    );
+    $items['account/tasks/%/%'] = array(
     'title' => 'Account Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_account_task_table',
     'page arguments' => array(2,3),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/tasks/%/%'] = array(
+    );
+    $items['host/%/tasks/%/%'] = array(
     'title' => 'Host Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_host_task_table',
     'page arguments' => array(1,3,4),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  // Workunit task table disabled
-  //$items['workunit/%/tasks/%/%'] = array(
-  //  'title' => 'Workunit Tasks Table',
-  //  'description' => '',
-  //  'page callback' => 'boincwork_workunit_task_table',
-  //  'page arguments' => array(1,3,4),
-  //  'access arguments' => array('access content'),
-  //  'type' => MENU_CALLBACK,
-  //);
-  return $items;
+    );
+    // Workunit task table disabled
+    //$items['workunit/%/tasks/%/%'] = array(
+    //  'title' => 'Workunit Tasks Table',
+    //  'description' => '',
+    //  'page callback' => 'boincwork_workunit_task_table',
+    //  'page arguments' => array(1,3,4),
+    //  'access arguments' => array('access content'),
+    //  'type' => MENU_CALLBACK,
+    //);
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function boincwork_theme() {
-  return array(
+    return array(
     'boincwork_privacyprefs_form' => array(
-      'arguments' => array('form'),
+        'arguments' => array('form'),
     ),
-  );
+    );
 }
 
 /**
 * Implementation of hook_views_api().
 */
 function boincwork_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincwork')
-  );
+    );
 }
 
 /**
  * Implementation of hook_locale().
  */
 function boincwork_locale($op = 'groups', $group = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'groups':
       return array('project' => bts('Project'));
     case 'info':
       $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
-      return $info;
-  }
+        $info['project']['format'] = FALSE;
+        return $info;
+    }
 }
 
 /**
  * Refresh strings.
  */
 function boincwork_locale_refresh() {
-  // Mimic process of adding project specific prefs to the project preferences
-  // form -- this parses the prefs XML and calls i18nstrings_update()
-  $form = array();
-  $prefs = array(
+    // Mimic process of adding project specific prefs to the project preferences
+    // form -- this parses the prefs XML and calls i18nstrings_update()
+    $form = array();
+    $prefs = array(
     'project_specific' => array(),
-  );
-  boincwork_add_project_specific_prefs($form, $prefs);
-  return TRUE; // Meaning it completed with no issues
+    );
+    boincwork_add_project_specific_prefs($form, $prefs);
+    return TRUE; // Meaning it completed with no issues
 }
 
 
@@ -263,43 +263,43 @@ 
  */
 
 function boincwork_privatemsg_message_view_alter(&$vars) {
-  global $user;
+    global $user;
 
-  $author = $vars['message']['author'];
-  if (!isset($vars['message']['thread_id'])) {
+    $author = $vars['message']['author'];
+    if (!isset($vars['message']['thread_id'])) {
     // No thread id, this is probably only a preview
     return;
-  }
-  $thread_id = $vars['message']['thread_id'];
+    }
+    $thread_id = $vars['message']['thread_id'];
 
-  if ($user->uid != $author->uid) {
+    if ($user->uid != $author->uid) {
     if ($vars['message']['is_blocked']) {
-      $vars['message_actions']['unignore_user'] = array(
+        $vars['message_actions']['unignore_user'] = array(
         'title' => bts('Stop Ignoring User', array(), NULL, 'boinc:ignore-user-remove'),
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
-      );
+        );
     }
     else {
-      $vars['message_actions']['ignore_user'] = array(
+        $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
-      );
+        );
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincwork_cron() {
-  // Delete expired hosts in the BOINC database, host_delete table.
-  require_boinc('boinc_db');
-  $num_deleted = BoincHostDeleted::delete_expired();
-  if ($num_deleted>0) {
+    // Delete expired hosts in the BOINC database, host_delete table.
+    require_boinc('boinc_db');
+    $num_deleted = BoincHostDeleted::delete_expired();
+    if ($num_deleted>0) {
     watchdog('boincwork', "Deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE);
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -307,41 +307,41 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
  
 /**
-  * General preferences menu callback.
-  * Called when user goes to edit preferences page
-  */
+ * General preferences menu callback.
+ * Called when user goes to edit preferences page
+ */
 function generalprefs_page($action = null, $venue = null, $advanced = FALSE) {
   
-  // Keep the venue selected across preference pages
-  boincwork_select_venue($venue);
+    // Keep the venue selected across preference pages
+    boincwork_select_venue($venue);
   
-  $pref_sets = array('generic', 'home', 'school', 'work');
-  $output = null;
-  // Set the page title
-  $title = 'Computing';
-  drupal_set_title($title);
+    $pref_sets = array('generic', 'home', 'school', 'work');
+    $output = null;
+    // Set the page title
+    $title = 'Computing';
+    drupal_set_title($title);
   
-  switch ($action) {
+    switch ($action) {
   
-  case 'clear':
+    case 'clear':
     // Remove settings from this preference set
     if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'general', $venue);
-      drupal_set_message(t('Settings for the "@name" preference set have been
+        boincwork_save_prefs(NULL, 'general', $venue);
+        drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
-      // Set the generic preference set as active
-      $_SESSION['prefs venue'] = 'generic';
+        // Set the generic preference set as active
+        $_SESSION['prefs venue'] = 'generic';
     }
     drupal_goto();
     break;
     
-  case 'combined':
+    case 'combined':
     // Compare preference sets; tabular view
     
     foreach ($pref_sets as $pref_set) {
-      $form_state = array();
-      $prefs[$pref_set] = drupal_retrieve_form('boincwork_generalprefs_form', $form_state, $pref_set);
-      drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
+        $form_state = array();
+        $prefs[$pref_set] = drupal_retrieve_form('boincwork_generalprefs_form', $form_state, $pref_set);
+        drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
     $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
@@ -354,29 +354,29 @@ 
     $prefs_table = boincwork_make_prefs_table($prefs['generic']['prefs']['advanced']);
     
     foreach ($prefs_table as $category => $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['name']}</td>";
-      foreach ($pref_sets as $pref_set) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['name']}</td>";
+        foreach ($pref_sets as $pref_set) {
         $output .= '<td>' . $pref_set . '</td>';
-      }
-      $output .= '</tr>';
-      foreach ($section['elements'] as $name => $setting) {
+        }
+        $output .= '</tr>';
+        foreach ($section['elements'] as $name => $setting) {
         // Output the setting name and description, with an ugly exception
         // made for preferences with special formatting
         $special_map = array(
-          'start_hour' => 'end_hour',
-          'net_start_hour'=> 'net_end_hour',
-          'daily_xfer_limit_mb' => 'daily_xfer_period_days',
+            'start_hour' => 'end_hour',
+            'net_start_hour'=> 'net_end_hour',
+            'daily_xfer_limit_mb' => 'daily_xfer_period_days',
         );
         $special_delimiter = array(
-          'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
-          'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
-          'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
+            'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
+            'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
+            'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
         );
         $special = isset($special_map[$name]);
         $very_special = in_array($name, $special_map);
         if ($very_special) {
-          continue;
+            continue;
         }
         $output .= '<tr>';
         $output .= '<td>';
@@ -386,35 +386,35 @@ 
         // Output values for each preference set, again with ugly hacks for
         // time range preferences
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND 
+            if (($prefs[$pref_set]) AND 
               $prefs[$pref_set]['#established'] AND
               isset($prefs[$pref_set]['prefs']['advanced'][$category])) {
             $pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
             if ($value == '') {
-              $value = '---';
+                $value = '---';
             }
             if (!isset($pref_setting['#field_suffix'])) {
-              $pref_setting['#field_suffix'] = '';
+                $pref_setting['#field_suffix'] = '';
             }
             if (!$special) {
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
+                $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
             }
             else {
-              // The "very special" case where we merge two prefs
-              $second_pref = $special_map[$name];
-              $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
-              $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
+                // The "very special" case where we merge two prefs
+                $second_pref = $special_map[$name];
+                $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
+                $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
+                $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+            }
+            else  {
             $output .= '<td>---</td>';
-          }
+            }
         }
         $output .= '</tr>';
-      }
+        }
     }
     
     // Empty line above action links... :/
@@ -430,24 +430,24 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
-      $output .= '<td><ul class="tab-list"><li class="first tab">';
-      $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
+        $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+        $output .= '<td><ul class="tab-list"><li class="first tab">';
+        $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
         array('fragment' => "")
-      );
-      // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
+        );
+        // Show Clear links for established preference sets
+        if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
         $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
-          array(
+            array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
                 array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
             )
-          )
+            )
         );
-      }
-      $output .= '</li></ul></td>';
+        }
+        $output .= '</li></ul></td>';
     }
     $output .= '</tr>';
     
@@ -455,28 +455,28 @@ 
     
     break;
     
-  case 'edit':
+    case 'edit':
   default:
   
     // Return the HTML generated from the $form data structure.
     if (function_exists('jump_quickly')) {
-      $path = 'account/prefs/computing/edit';
-      $venues = array(
+        $path = 'account/prefs/computing/edit';
+        $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}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/work" => bts('Work', 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');
+        );
+        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');
       
-      $output .= '<div id="venue-selector" class="simple-form-controls">';
-      $output .= '  <div class="form-item venue">';
-      $output .= '    <label>Preference set:</label>';
-      $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '<div id="venue-selector" class="simple-form-controls">';
+        $output .= '  <div class="form-item venue">';
+        $output .= '    <label>Preference set:</label>';
+        $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
+        $output .= '  </div>';
+        $output .= '</div>';
     }
     $output .= drupal_get_form('boincwork_generalprefs_form', $venue, NULL, $advanced);
     
@@ -487,54 +487,54 @@ 
     drupal_prepare_form('boincwork_generalprefs_form', $current_set, $form_state);
 
     if (!$current_set['#established']) {
-      drupal_set_message(bts(
-          "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+        drupal_set_message(bts(
+            "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
+            array( '@venue' => $venue, ),
+            NULL, 'boinc:account-preferences'), 'status');
     }
     
     break;
-  }
+    }
   
-  return $output;
+    return $output;
 }
 
 /**
-  * Project preferences menu callback
-  * Called when user goes to edit project preferences page.
-  */
+ * Project preferences menu callback
+ * Called when user goes to edit project preferences page.
+ */
 function projectprefs_page($action = null, $venue = null) {
   
-  // Keep the venue selected across preference pages
-  boincwork_select_venue($venue);
+    // Keep the venue selected across preference pages
+    boincwork_select_venue($venue);
   
-  require_boinc(array('util', 'prefs'));
-  global $project_has_beta;
-  $pref_sets = array('generic', 'home', 'school', 'work');
-  $output = null;
+    require_boinc(array('util', 'prefs'));
+    global $project_has_beta;
+    $pref_sets = array('generic', 'home', 'school', 'work');
+    $output = null;
   
-  $title = 'Project';
-  drupal_set_title($title);
+    $title = 'Project';
+    drupal_set_title($title);
   
-  switch ($action) {
+    switch ($action) {
   
-  case 'clear':
+    case 'clear':
     // Remove settings from this preference set
     if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'project', $venue);
-      drupal_set_message(t('Settings for the "@name" preference set have been
+        boincwork_save_prefs(NULL, 'project', $venue);
+        drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
       
-      // Set the generic preference set as active
-      $_SESSION['prefs venue'] = 'generic';
+        // Set the generic preference set as active
+        $_SESSION['prefs venue'] = 'generic';
       
-      // If the user has removed their default preference set, make it generic
-      boincwork_set_default_venue();
+        // If the user has removed their default preference set, make it generic
+        boincwork_set_default_venue();
     }
     drupal_goto();
     break;
     
-  case 'combined':
+    case 'combined':
   
     // Compare preference sets; tabular view
     
@@ -543,9 +543,9 @@ 
     $boincuser = BoincUser::lookup_id($account->boincuser_id);
     
     foreach ($pref_sets as $pref_set) {
-      $form_state = array();
-      $prefs[$pref_set] = drupal_retrieve_form('boincwork_projectprefs_form', $form_state, $pref_set);
-      drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
+        $form_state = array();
+        $prefs[$pref_set] = drupal_retrieve_form('boincwork_projectprefs_form', $form_state, $pref_set);
+        drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
 
     $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
@@ -556,20 +556,20 @@ 
     $prefs_table = boincwork_make_prefs_table($prefs['generic']);
     
     foreach ($prefs_table as $category => $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['name']}</td>";
-      foreach ($pref_sets as $pref_set) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['name']}</td>";
+        foreach ($pref_sets as $pref_set) {
         $output .= '<td>' . $pref_set . '</td>';
-      }
-      $output .= '</tr>';
-      foreach ($section['elements'] as $name => $setting) {
+        }
+        $output .= '</tr>';
+        foreach ($section['elements'] as $name => $setting) {
         $output .= '<tr>';
         $output .= '<td>';
         $output .= "<div class=\"title\">{$setting['name']}</div>";
         $output .= "<div class=\"description\">{$setting['description']}</div>";
         $output .= '</td>';
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND
+            if (($prefs[$pref_set]) AND
               $prefs[$pref_set]['#established'] AND
               isset($prefs[$pref_set][$category])) {
             $pref_setting = $prefs[$pref_set][$category][$name];
@@ -577,10 +577,10 @@ 
             if ($value == '') $value = '---';
             if (!isset($pref_setting['#field_suffix'])) $pref_setting['#field_suffix'] = '';
             $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-          } else $output .= '<td>---</td>';
+            } else $output .= '<td>---</td>';
         }
         $output .= '</tr>';
-      }
+        }
     }
     
     // Empty line above action links... :/
@@ -596,29 +596,29 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
-      $output .= '<td><ul class="tab-list"><li class="first tab">';
-      $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
-      // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
+        $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+        $output .= '<td><ul class="tab-list"><li class="first tab">';
+        $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
+        // Show Clear links for established preference sets
+        if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
         $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
-          array(
+            array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
                 array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
             )
-          )
+            )
         );
-      }
-      $output .= '</li></ul></td>';
+        }
+        $output .= '</li></ul></td>';
     }
     
     $output .= '</table>';
     
     break;
     
-  case 'set-default':
+    case 'set-default':
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
@@ -626,30 +626,30 @@ 
     drupal_goto('account/prefs/project/combined');
     break;
     
-  case 'edit':
+    case 'edit':
   default:
     
     // Return the HTML generated from the $form data structure.
     require_boinc('util');
     
     if (function_exists('jump_quickly')) {
-      $path = 'account/prefs/project/edit';
-      $venues = array(
+        $path = 'account/prefs/project/edit';
+        $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}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/work" => bts('Work', 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');
+        );
+        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');
       
-      $output .= '<div id="venue-selector" class="simple-form-controls">';
-      $output .= '  <div class="form-item venue">';
-      $output .= '    <label>Preference set:</label>';
-      $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '<div id="venue-selector" class="simple-form-controls">';
+        $output .= '  <div class="form-item venue">';
+        $output .= '    <label>Preference set:</label>';
+        $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
+        $output .= '  </div>';
+        $output .= '</div>';
     }
     $output .= drupal_get_form('boincwork_projectprefs_form', $venue);
     
@@ -660,63 +660,63 @@ 
     drupal_prepare_form('boincwork_projectprefs_form', $current_set, $form_state);
     
     if (!$current_set['#established']) {
-      drupal_set_message(bts(
-          "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+        drupal_set_message(bts(
+            "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
+            array( '@venue' => $venue, ),
+            NULL, 'boinc:account-preferences'), 'status');
     }
     
     break;
     
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Community preferences menu callback
-  * Called when user goes to edit community preferences page.
-  */
+ * Community preferences menu callback
+ * Called when user goes to edit community preferences page.
+ */
 function communityprefs_page($action = null) {
   
-  require_boinc(array('util', 'prefs'));
-  $output = null;
+    require_boinc(array('util', 'prefs'));
+    $output = null;
   
-  $title = 'Community';
-  drupal_set_title($title);
+    $title = 'Community';
+    drupal_set_title($title);
   
-  //$output .= '<h2>Community preferences</h2>';
+    //$output .= '<h2>Community preferences</h2>';
   
-  $output .= drupal_get_form('communityprefs_form');
+    $output .= drupal_get_form('communityprefs_form');
   
-  return $output;
+    return $output;
 }
 
 /**
-  * Privacy preferences menu callback
-  * Called when user goes to edit privacy preferences page.
-  */
+ * Privacy preferences menu callback
+ * Called when user goes to edit privacy preferences page.
+ */
 function privacyprefs_page($action = null) {
   
-  require_boinc(array('util', 'prefs'));
-  $output = null;
-  $title = 'Privacy';
-  drupal_set_title($title);
+    require_boinc(array('util', 'prefs'));
+    $output = null;
+    $title = 'Privacy';
+    drupal_set_title($title);
   
-  switch ($action) {
-  case 'view':
+    switch ($action) {
+    case 'view':
     $form_state = array();
     $prefs = drupal_retrieve_form('boincwork_privacyprefs_form', $form_state);
     drupal_prepare_form('boincwork_privacyprefs_form', $prefs, $form_state);
     $output .= '<table>';
     
     $sections = array(
-      'privacy' => $prefs['privacy']
+        'privacy' => $prefs['privacy']
     );
     
     foreach ($sections as $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['#title']}</td></tr>";
-      foreach ($section as $name => $setting) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['#title']}</td></tr>";
+        foreach ($section as $name => $setting) {
         if ($name{0} == '#') continue;
         $value = isset($setting['#default_value']) ? $setting['#default_value'] : '';
         if ($value AND isset($setting['#options'])) $value = $setting['#options'][$value];
@@ -728,7 +728,7 @@ 
         $output .= "<td>{$setting['#title']}<br/>{$setting['#description']}</td>";
         $output .= "<td>{$value} {$setting['#field_suffix']}</td>";
         $output .= '</tr>';
-      }
+        }
     }
     
     // Edit preferences link
@@ -741,33 +741,33 @@ 
     
     break;
     
-  case 'edit':
+    case 'edit':
   default:
     require_boinc('util');
     // Return the HTML generated from the $form data structure.
     $output .= drupal_get_form('boincwork_privacyprefs_form');
     break;
     
-  }
+    }
   
-  return $output;
+    return $output;
 }
 
 /**
-  * Certificates menu callback
-  * Called when user goes to account certificate pages
-  */
+ * Certificates menu callback
+ * Called when user goes to account certificate pages
+ */
 function boincwork_certificates($type = null, $border = null) {
-  global $user;
-  $drupuser = user_load($user->uid);
-  // Load BOINC account and pre-authenticate with BOINC code
-  require_boinc(array('util', 'cert'));
-  $boincuser = BoincUser::lookup_id($drupuser->boincuser_id);
-  //global $g_logged_in_user;
-  //$g_logged_in_user = $boincuser;
-  //print_r($boincuser); exit;
-  switch ($type) {
-  case 'all':
+    global $user;
+    $drupuser = user_load($user->uid);
+    // Load BOINC account and pre-authenticate with BOINC code
+    require_boinc(array('util', 'cert'));
+    $boincuser = BoincUser::lookup_id($drupuser->boincuser_id);
+    //global $g_logged_in_user;
+    //$g_logged_in_user = $boincuser;
+    //print_r($boincuser); exit;
+    switch ($type) {
+    case 'all':
     //include_boinc('user/cert_all.php');
     require_boinc(array('util','cert','user'));
 
@@ -837,7 +837,7 @@ 
     ";
     break;
     
-  case 'account':
+    case 'account':
   default:
     //include_boinc('user/cert1.php');
     require_boinc(array('util','cert'));
@@ -913,7 +913,7 @@ 
     echo "
     </td><tr></table>
     ";
-  }
+    }
 }
 
 /**
@@ -921,42 +921,42 @@ 
  * Called when user selects to delete a host
  */
 function boincwork_host_delete($host_id) {
-  // Verify that host has no tasks
-  if (boincwork_host_user_is_owner($host_id)) {
+    // Verify that host has no tasks
+    if (boincwork_host_user_is_owner($host_id)) {
     if (!boincwork_host_get_task_count($host_id)) {
-      // Delete the host record
-      db_set_active('boinc_rw');
-      $host_deleted = db_query(
+        // Delete the host record
+        db_set_active('boinc_rw');
+        $host_deleted = db_query(
         "DELETE FROM {host} WHERE id = '%d'",
         $host_id
-      );
-      db_set_active('default');
-      if ($host_deleted) {
+        );
+        db_set_active('default');
+        if ($host_deleted) {
         drupal_set_message(t('Host @id has been removed from your account.',
-          array('@id' => $host_id)));
+            array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
-          array('@id' => $host_id)), 'error'
+            array('@id' => $host_id)), 'error'
         );
-      }
+        }
     }
     else {
-      drupal_set_message(t('Host @id cannot be deleted because it still has
+        drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.', 
         array('@id' => $host_id)), 'warning'
-      );
+        );
+    }
     }
-  }
-  else {
+    else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.', 
-      array('@id' => $host_id)), 'error'
+        array('@id' => $host_id)), 'error'
     );
-  }
-  drupal_goto("host/{$host_id}");
+    }
+    drupal_goto("host/{$host_id}");
 }
 
 /**
@@ -964,55 +964,55 @@ 
  * Called when user accesses the log for a host
  */
 function boincwork_host_log($host_id = null) {
-  $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
-  $log = '';
-  if ($root_log_dir AND $host_id) {
+    $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
+    $log = '';
+    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)) {
     header('Content-type: text/plain');
     include($log);
-  }
+    }
 }
 
 function boincwork_host_set_venue($host_id = NULL, $venue = NULL) {
-  global $user;
-  $account = user_load($user->uid);
-  db_set_active('boinc_ro');
-  // Verify that this is my host
-  $host_owner = db_result(db_query(
+    global $user;
+    $account = user_load($user->uid);
+    db_set_active('boinc_ro');
+    // Verify that this is my host
+    $host_owner = db_result(db_query(
     "SELECT userid FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  if ($host_owner AND $host_owner == $account->boincuser_id) {
+    ));
+    db_set_active('default');
+    if ($host_owner AND $host_owner == $account->boincuser_id) {
     db_set_active('boinc_rw');
     $updated = db_query(
-      "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
-      $venue, $host_id
+        "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
+        $venue, $host_id
     );
     db_set_active('default');
     if ($updated) {
-      drupal_set_message(
+        drupal_set_message(
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
-      );
+        );
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
-      'warning'
+        bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
+        'warning'
     );
-  }
-  drupal_goto("host/{$host_id}");
+    }
+    drupal_goto("host/{$host_id}");
 }
 
 /**
@@ -1020,8 +1020,8 @@ 
  * Called when user accesses cell phone stats
  */
 function boincwork_mobile_stats($userid = null) {
-  $_GET['id'] = $userid;
-  include_boinc('user/userw.php');
+    $_GET['id'] = $userid;
+    include_boinc('user/userw.php');
 }
 
 /**
@@ -1029,7 +1029,7 @@ 
  * Called to build the server status page
  */
 function boincwork_server_status() {
-  include_boinc('user/server_status.php');
+    include_boinc('user/server_status.php');
 }
 
 /**
@@ -1037,7 +1037,7 @@ 
  * RPC for managing job input files
  */
 function boincwork_job_file() {
-  include_boinc('user/job_file.php');
+    include_boinc('user/job_file.php');
 }
 
 /**
@@ -1045,7 +1045,7 @@ 
  * Get output file from remote job submission
  */
 function boincwork_get_output() {
-  include_boinc('user/get_output.php');
+    include_boinc('user/get_output.php');
 }
 
 /**
@@ -1053,28 +1053,28 @@ 
  * Get the project configuration XML; used by client software
  */
 function boincwork_get_project_config() {
-  ob_start();
-  include_boinc('user/get_project_config.php');
-  $xml = ob_get_clean();
-  $xml = load_configuration($xml);
-
-  // obtain Drupal variables
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  $overrideboinctou = variable_get('boinc_weboptions_overrideboinctou', FALSE);
-
-  // If terms of use string exists and override is true, set terms-of-use
-  // to Drupal varaible.
-  if ( (!empty($termsofuse) && ($overrideboinctou)) ) {
+    ob_start();
+    include_boinc('user/get_project_config.php');
+    $xml = ob_get_clean();
+    $xml = load_configuration($xml);
+
+    // obtain Drupal variables
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    $overrideboinctou = variable_get('boinc_weboptions_overrideboinctou', FALSE);
+
+    // If terms of use string exists and override is true, set terms-of-use
+    // to Drupal varaible.
+    if ( (!empty($termsofuse) && ($overrideboinctou)) ) {
     if (!empty($xml['project_config']['terms_of_use'])) {
-      // Remove any existing terms of use
-      unset($xml['project_config']['terms_of_use']);
+        // Remove any existing terms of use
+        unset($xml['project_config']['terms_of_use']);
     }
 
     // Add terms of use from Drupal
     $xml['project_config']['terms_of_use']['@value'] = $termsofuse;
-  }
+    }
 
-  print save_configuration($xml);
+    print save_configuration($xml);
 }
 
 
@@ -1082,16 +1082,16 @@ 
  * Page callback for the remote job submission RPC (submit_rpc_handler.php).
  */
 function boincwork_submit_rpc_handler() {
-  include_boinc('user/submit_rpc_handler.php');
+    include_boinc('user/submit_rpc_handler.php');
 }
 
 /**
  * Page callback for user WAP (userw.php).
  */
 function boincwork_user_wap() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  include_boinc('user/userw.php');
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    include_boinc('user/userw.php');
 }
 
 
@@ -1099,44 +1099,44 @@ 
  * Page callback for user account task table
  */
 function boincwork_account_task_table($tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
+    drupal_set_title($title);
 
-  global $user;
-  $account = user_load($user->uid);
-  return boincwork_tasktable(0, $account->boincuser_id, $tselect, $app_id);
+    global $user;
+    $account = user_load($user->uid);
+    return boincwork_tasktable(0, $account->boincuser_id, $tselect, $app_id);
 }
 
 /**
  * Page callback for host task table
  */
 function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
-  require_boinc( array('util', 'result') );
+    require_boinc( array('util', 'result') );
 
-  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
+    drupal_set_title($title);
 
-  if (is_null($host_id)) {
+    if (is_null($host_id)) {
     drupal_set_message(bts('ERROR: Invalid host ID', array(), NULL, 'boinc:host-task-table'), 'error');
     return '';
-  }
+    }
 
-  return boincwork_tasktable(2, $host_id, $tselect, $app_id);
+    return boincwork_tasktable(2, $host_id, $tselect, $app_id);
 }
 
 /**
  * Page callback for workunit task table
  */
 function boincwork_workunit_task_table($workunit_id = NULL, $tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
+    drupal_set_title($title);
 
-  if (is_null($workunit_id)) {
+    if (is_null($workunit_id)) {
     drupal_set_message(bts('ERROR: Invalid workunit ID', array(), NULL, 'boinc:workunit-task-table'), 'error');
     return '';
-  }
+    }
   
-  return boincwork_tasktable(1, $workunit_id, $tselect, $app_id);
+    return boincwork_tasktable(1, $workunit_id, $tselect, $app_id);
 }
 
 /**
@@ -1144,8 +1144,8 @@ 
  * Take a node ID and render that node as a page
  */
 function boincwork_view_page($nid) {
-  $node = node_load($nid);
-  return node_page_view($node);
+    $node = node_load($nid);
+    return node_page_view($node);
 }
 
 
@@ -1157,16 +1157,16 @@ 
  * Determine which venue should be selected
  */
 function boincwork_select_venue(&$venue) {
-  if (!$venue) {
+    if (!$venue) {
     $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : NULL;
     if ($active_venue) {
-      $venue = $active_venue;
-      //unset($_SESSION['prefs venue']);
+        $venue = $active_venue;
+        //unset($_SESSION['prefs venue']);
+    }
     }
-  }
-  else {
+    else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;
-  }
+    }
 }

Spacing +41 added lines, -41 removed lines

@@ -133,7 +133,7 @@ 
   $items['host/%/set-venue/%'] = array(
     'title' => 'Set host venue',
     'page callback' => 'boincwork_host_set_venue',
-    'page arguments' => array(1,3),
+    'page arguments' => array(1, 3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
   );
@@ -184,7 +184,7 @@ 
     'title' => 'Account Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_account_task_table',
-    'page arguments' => array(2,3),
+    'page arguments' => array(2, 3),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
@@ -192,7 +192,7 @@ 
     'title' => 'Host Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_host_task_table',
-    'page arguments' => array(1,3,4),
+    'page arguments' => array(1, 3, 4),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
@@ -276,15 +276,15 @@ 
     if ($vars['message']['is_blocked']) {
       $vars['message_actions']['unignore_user'] = array(
         'title' => bts('Stop Ignoring User', array(), NULL, 'boinc:ignore-user-remove'),
-        'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
-        'query' => 'destination=messages/view/' . $thread_id,
+        'href' => 'account/prefs/privacy/ignore_user/remove/'.$author->uid,
+        'query' => 'destination=messages/view/'.$thread_id,
       );
     }
     else {
       $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
-        'query' => 'destination=messages/view/' . $thread_id,
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$author->uid,
+        'query' => 'destination=messages/view/'.$thread_id,
       );
     }
   }
@@ -297,7 +297,7 @@ 
   // Delete expired hosts in the BOINC database, host_delete table.
   require_boinc('boinc_db');
   $num_deleted = BoincHostDeleted::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boincwork', "Deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE);
   }
 }
@@ -344,10 +344,10 @@ 
       drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
-    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
+    $output .= '<p>'.bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing').'<br/>';
+    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing').'</p>';
+    $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences').'</p>';
+    $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/computing').'</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -357,7 +357,7 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['name']}</td>";
       foreach ($pref_sets as $pref_set) {
-        $output .= '<td>' . $pref_set . '</td>';
+        $output .= '<td>'.$pref_set.'</td>';
       }
       $output .= '</tr>';
       foreach ($section['elements'] as $name => $setting) {
@@ -405,11 +405,11 @@ 
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
               $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
+              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}".
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
           }
-          else  {
+          else {
             $output .= '<td>---</td>';
           }
         }
@@ -437,12 +437,12 @@ 
       );
       // Show Clear links for established preference sets
       if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
+        $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
+              'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences').'\')'
             )
           )
         );
@@ -468,8 +468,8 @@ 
         "{$path}/work" => bts('Work', 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');
       
       $output .= '<div id="venue-selector" class="simple-form-controls">';
       $output .= '  <div class="form-item venue">';
@@ -489,7 +489,7 @@ 
     if (!$current_set['#established']) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
+          array('@venue' => $venue,),
           NULL, 'boinc:account-preferences'), 'status');
     }
     
@@ -548,8 +548,8 @@ 
       drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
+    $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences').'</p>';
+    $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/project').'</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -559,7 +559,7 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['name']}</td>";
       foreach ($pref_sets as $pref_set) {
-        $output .= '<td>' . $pref_set . '</td>';
+        $output .= '<td>'.$pref_set.'</td>';
       }
       $output .= '</tr>';
       foreach ($section['elements'] as $name => $setting) {
@@ -601,12 +601,12 @@ 
       $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
       // Show Clear links for established preference sets
       if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
+        $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
+              'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project').'\')'
             )
           )
         );
@@ -622,7 +622,7 @@ 
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
-    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project') );
+    drupal_set_message(bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project'));
     drupal_goto('account/prefs/project/combined');
     break;
     
@@ -641,8 +641,8 @@ 
         "{$path}/work" => bts('Work', 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');
       
       $output .= '<div id="venue-selector" class="simple-form-controls">';
       $output .= '  <div class="form-item venue">';
@@ -662,7 +662,7 @@ 
     if (!$current_set['#established']) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
+          array('@venue' => $venue,),
           NULL, 'boinc:account-preferences'), 'status');
     }
     
@@ -734,7 +734,7 @@ 
     // Edit preferences link
     $output .= '<tr>';
     $output .= '<td></td>';
-    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
+    $output .= '<td>'.l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit").'</td>';
     $output .= '</tr>';
     
     $output .= '</table>';
@@ -769,15 +769,15 @@ 
   switch ($type) {
   case 'all':
     //include_boinc('user/cert_all.php');
-    require_boinc(array('util','cert','user'));
+    require_boinc(array('util', 'cert', 'user'));
 
     $join = date('j F Y', $boincuser->create_time);
     $today = date('j F Y', time(0));
 
-    if ($border=="no") {
+    if ($border == "no") {
         $border = 0;
     } else {
-        $border=8;
+        $border = 8;
     }
 
     $title_font = "\"Optima,ZapfChancery\"";
@@ -821,7 +821,7 @@ 
         <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
     ";
     foreach ($boincuser->projects as $p) {
-        if ($p->total_credit<100) continue;
+        if ($p->total_credit < 100) continue;
         show_proj($p);
     }
     echo "
@@ -840,15 +840,15 @@ 
   case 'account':
   default:
     //include_boinc('user/cert1.php');
-    require_boinc(array('util','cert'));
+    require_boinc(array('util', 'cert'));
 
     $join = date('j F Y', $boincuser->create_time);
     $today = date('j F Y', time(0));
 
-    if ($border=="no") {
+    if ($border == "no") {
         $border = 0;
     } else {
-        $border=8;
+        $border = 8;
     }
 
     $credit = credit_string($boincuser->total_credit, false);
@@ -1064,7 +1064,7 @@ 
 
   // If terms of use string exists and override is true, set terms-of-use
   // to Drupal varaible.
-  if ( (!empty($termsofuse) && ($overrideboinctou)) ) {
+  if ((!empty($termsofuse) && ($overrideboinctou))) {
     if (!empty($xml['project_config']['terms_of_use'])) {
       // Remove any existing terms of use
       unset($xml['project_config']['terms_of_use']);
@@ -1111,7 +1111,7 @@ 
  * Page callback for host task table
  */
 function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
   drupal_set_title($title);

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

Switch Indentation +109 added lines, -109 removed lines

@@ -300,125 +300,125 @@
   }
   
   switch ($form_state['values']['import']) {
-    case 'users':
-      boincimport_users();
-      break;
-
-    case 'teams':
-      boincimport_teams();
-      if (!variable_get('boincimport_import_team_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      break;
+  case 'users':
+    boincimport_users();
+    break;
 
-    case 'friends':
-      boincimport_friends();
-      if (!variable_get('boincimport_import_friend_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      break;
+  case 'teams':
+    boincimport_teams();
+    if (!variable_get('boincimport_import_team_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'teams';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    break;
 
-    case 'preferences':
-      boincimport_preferences();
-      if (!variable_get('boincimport_import_preferences_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      break;
+  case 'friends':
+    boincimport_friends();
+    if (!variable_get('boincimport_import_friend_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    break;
 
-    case 'private messages':
-      boincimport_private_msgs();
-      if (!variable_get('boincimport_import_private_msg_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      break;
+  case 'preferences':
+    boincimport_preferences();
+    if (!variable_get('boincimport_import_preferences_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    break;
 
-    case 'categories':
-      boincimport_forum_categories();
-      if (!variable_get('boincimport_import_category_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      break;
+  case 'private messages':
+    boincimport_private_msgs();
+    if (!variable_get('boincimport_import_private_msg_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    break;
 
-    case 'topics':      
-      boincimport_forum_topics();
-      if (!variable_get('boincimport_import_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      break;
+  case 'categories':
+    boincimport_forum_categories();
+    if (!variable_get('boincimport_import_category_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    break;
+
+  case 'topics':      
+    boincimport_forum_topics();
+    if (!variable_get('boincimport_import_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    break;
       
-    case 'posts':
-      boincimport_forum_posts();
-      if (!variable_get('boincimport_import_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'posts':
+    boincimport_forum_posts();
+    if (!variable_get('boincimport_import_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
 
-    case 'team forums':
-      boincimport_team_forums();
-      if (!variable_get('boincimport_team_forum_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      break;
+  case 'team forums':
+    boincimport_team_forums();
+    if (!variable_get('boincimport_team_forum_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team forums';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    break;
 
-    case 'team topics':      
-      boincimport_team_forum_topics();
-      if (!variable_get('boincimport_team_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      break;
+  case 'team topics':      
+    boincimport_team_forum_topics();
+    if (!variable_get('boincimport_team_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    break;
       
-    case 'team posts':
-      boincimport_team_forum_posts();
-      if (!variable_get('boincimport_team_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'team posts':
+    boincimport_team_forum_posts();
+    if (!variable_get('boincimport_team_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
 
-    case 'url':
-      boincimport_replace_urls();
-      if (!variable_get('boincimport_replace_url_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
-        drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
-        watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
-        unset($_SESSION['boincimport_stage_selected']);
-      }
-      break;
-    default:
-      $_SESSION['boincimport_stage_selected'] = 'users';
-      break;
+  case 'url':
+    boincimport_replace_urls();
+    if (!variable_get('boincimport_replace_url_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    else {
+      drupal_set_message('Congratulations.  Import Finished');
+      drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+      watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
+      unset($_SESSION['boincimport_stage_selected']);
+    }
+    break;
+  default:
+    $_SESSION['boincimport_stage_selected'] = 'users';
+    break;
   }
 }
 

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

@@ -661,7 +661,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -977,13 +977,13 @@ 
 function boincimport_friends_op($friendship, &$context) {
   
   $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+  $success = false;
   $message = '';
   
   // Convert BOINC friends to Drupal friends
   $uid = boincuser_lookup_uid($friendship->user_src);
   $friend_uid = boincuser_lookup_uid($friendship->user_dest);
-  if ($uid AND $friend_uid) {
+  if ($uid and $friend_uid) {
     $success = db_query("
       INSERT IGNORE INTO {flag_friend}
       SET uid = '%d', friend_uid = '%d', created = '%d'",
@@ -1046,7 +1046,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -1145,7 +1145,7 @@ 
  */
 function boincimport_quarrels_op($boinc_user, &$context) {
   
-  $success = FALSE;
+  $success = false;
   $uid = boincuser_lookup_uid($boinc_user->userid);
   $ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
   foreach ($ignored_users as $ignored_user) {
@@ -1165,7 +1165,7 @@ 
       $uid, $ignored_user_uid
     );
     if ($user_ignored) {
-      $success = TRUE;
+      $success = true;
     }
     else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
@@ -1231,7 +1231,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -1357,7 +1357,7 @@ 
   );
   
   $message = '';
-  if ($message_added AND $recipient_added AND $sender_added) {
+  if ($message_added and $recipient_added and $sender_added) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
@@ -1408,7 +1408,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -1547,7 +1547,7 @@ 
   if (!$hidden_forum_tid) {
     $operations[] = array(
       'boincimport_forum_categories_op', array(
-        NULL, $forum_vid, $pre, TRUE
+        null, $forum_vid, $pre, true
       )
     );
   }
@@ -1561,7 +1561,7 @@ 
     else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
-          $boinc_forum_category, $forum_vid, $pre, FALSE
+          $boinc_forum_category, $forum_vid, $pre, false
         )
       );
     }
@@ -1630,16 +1630,16 @@ 
   $parent_id = 0;
   $description = '';
   $weight = 0;
-  $hidden = FALSE;
+  $hidden = false;
   
   $category_map = variable_get('boincimport_forum_category_map', array());
   
-  if (!$category AND $create_hidden) {
+  if (!$category and $create_hidden) {
     // Create the special "hidden" container
     $category = new stdClass();
     $category->name = 'Hidden';
     $category->id = 0;
-    $hidden = TRUE;
+    $hidden = true;
   }
   else {
     // If this container is empty, put it into the hidden container
@@ -1652,7 +1652,7 @@ 
     db_set_active('default');
     if (!$forums_contained) {
       $parent_id = $category_map[0];
-      $hidden = TRUE;
+      $hidden = true;
     }
   }
   
@@ -1682,7 +1682,7 @@ 
   $message = '';
   if ($success) {
     // Store some result for post-processing in the finished callback.
-    if (!$category AND $create_hidden) {
+    if (!$category and $create_hidden) {
       $message = "Created special hidden container";
     }
     else {
@@ -1719,8 +1719,8 @@ 
  */
 function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
   
-  $hidden_forum = FALSE;
-  $open_forum = FALSE;
+  $hidden_forum = false;
+  $open_forum = false;
   $category_map = variable_get('boincimport_forum_category_map', array());
   
   // Set term parameters for forums
@@ -1731,11 +1731,11 @@ 
   $weight = $boincforum->orderID;
   if ($parent_id == $category_map[0]) {
     // If this forum is hidden, flag for appropriate access controls
-    $hidden_forum = TRUE;
+    $hidden_forum = true;
   }
   if ($name == 'Getting Started') {
     // Must allow users to post in this forum even if they have no credit!
-    $open_forum = TRUE;
+    $open_forum = true;
   }
   
   // Try to detect a BOINC news forum and flag it so that news can be
@@ -1743,7 +1743,7 @@ 
   if ($name == 'News') {
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
-    $success = TRUE;
+    $success = true;
   }
   else {
     // Save all other forums as taxonomy terms
@@ -1794,7 +1794,7 @@ 
 /**
  * Helper function to set permissions on forums upon import
  */
-function boincimport_forum_set_permissions($forum, $hidden = FALSE, $open = FALSE) {
+function boincimport_forum_set_permissions($forum, $hidden = false, $open = false) {
   
   // Set access controls
   $forum_perms = array();
@@ -1892,7 +1892,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -2040,8 +2040,8 @@ 
       $topic->id
     ));
     
-    if ($duplicate OR !$post) {
-      $success = FALSE;
+    if ($duplicate or !$post) {
+      $success = false;
     }
     
     else {
@@ -2069,7 +2069,7 @@ 
       }
       
       // If dealing with a News topic, be sure it is imported as such
-      if ($news_forum_id AND $topic->forum == $news_forum_id) {
+      if ($news_forum_id and $topic->forum == $news_forum_id) {
         $node_type = 'news';
         $promote = 1;
       }
@@ -2096,7 +2096,7 @@ 
       $node = (object) $node; // node_save requires an object form
       node_save($node);
       taxonomy_node_save($node, array($tid));
-      $success = ($node->nid) ? TRUE : FALSE;
+      $success = ($node->nid) ? true : false;
       if ($success) {
         $success = db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
@@ -2127,7 +2127,7 @@ 
     }
     elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
-      $message = "Topic {$topic->id} was already imported";
+      $message = "topic {$topic->id} was already imported";
     }
     elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
@@ -2194,7 +2194,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -2335,8 +2335,8 @@ 
     db_set_active('default');
     
     $first_post = true;
-    $topic_has_responses = FALSE;
-    $success = FALSE;
+    $topic_has_responses = false;
+    $success = false;
     $posts_imported = 0;
     $empty_posts = 0;
     $error_posts = 0;
@@ -2351,7 +2351,7 @@ 
       }
       
       // Making it this far confirms that there are posts to import
-      $topic_has_responses = TRUE;
+      $topic_has_responses = true;
       
       $is_duplicate = db_result(db_query('
         SELECT COUNT(*) FROM {boincimport_temp_post}
@@ -2397,14 +2397,14 @@ 
         ));
         $post_reply = $pid;
         
-        if ($post_reply OR $topic_reply) {
+        if ($post_reply or $topic_reply) {
           // Create a subject for the post from the post content. The body may be in 
           // any format, so we:
           //  1) Filter it into HTML
           //  2) Strip out all HTML tags
           //  3) Convert entities back to plain-text.
           // Note: format is checked by check_markup().
-          $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
+          $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, true);
           // Replace "Quote:" with "RE:"
           $subject = str_replace('Quote:', 'RE: ', $subject);
           // Fringe cases where the comment body is populated only by HTML tags
@@ -2456,10 +2456,10 @@ 
     }
     
     $message = '';
-    if ($success OR !$topic_has_responses) {
+    if ($success or !$topic_has_responses) {
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $boinc_topic->id;
-      $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
+      $message = "imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
     }
     else {
       $context['results']['failure'][] = $boinc_topic->id;
@@ -2528,7 +2528,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -2725,7 +2725,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -2852,7 +2852,7 @@ 
 function boincimport_team_topics_op($topic, &$context) {
   
   $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+  $success = false;
   $missing_parent = array();
   $empty_topics = array();
   
@@ -2937,7 +2937,7 @@ 
           WHERE nid = %d',
           $node->created, $node->nid
         );
-        $success = TRUE;
+        $success = true;
       }
     }
   }
@@ -2994,7 +2994,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -3149,7 +3149,7 @@ 
 function boincimport_team_posts_op($post, &$context) {
   
   $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+  $success = false;
   
   // Make sure the post is valid
   if ($post->content) {
@@ -3183,14 +3183,14 @@ 
     ));
     $post_reply = $pid;
     
-    if ($post_reply OR $topic_reply) {
+    if ($post_reply or $topic_reply) {
       // Create a subject for the post from the post content. The body may be in 
       // any format, so we:
       //  1) Filter it into HTML
       //  2) Strip out all HTML tags
       //  3) Convert entities back to plain-text.
       // Note: format is checked by check_markup().
-      $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
+      $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, true);
       // Replace "Quote:" with "RE:"
       $subject = str_replace('Quote:', 'RE: ', $subject);
       // Fringe cases where the comment body is populated only by HTML tags
@@ -3276,7 +3276,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -3427,7 +3427,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -3477,7 +3477,7 @@ 
     FROM {pm_message} pm'
   ));
   
-  if (!$node_count AND !$comment_count AND !$pm_count) {
+  if (!$node_count and !$comment_count and !$pm_count) {
     drupal_set_message(
       t('There were no nodes, comments, or private messages found: Aborting script'), 'warning'
     );
@@ -3579,14 +3579,14 @@ 
   );
   
   while ($node = db_fetch_object($nodes)) {
-    $updated = FALSE;
+    $updated = false;
     
     // Update URLs in node contents
     $original_body = $node->body;
     $original_teaser = $node->teaser;
     $node->body = _boincimport_replace_links($node->body);
     $node->teaser = _boincimport_replace_links($node->teaser);
-    if ($node->body != $original_body OR $node->teaser != $original_teaser) {
+    if ($node->body != $original_body or $node->teaser != $original_teaser) {
       $updated = db_query("
         UPDATE {node_revisions}
         SET body= '%s', teaser = '%s'
@@ -3645,7 +3645,7 @@ 
   );
   
   while ($comment = db_fetch_object($comments)) {
-    $updated = FALSE;
+    $updated = false;
     
     // Update URLs in comment contents
     $original_comment = $comment->comment;
@@ -3708,7 +3708,7 @@ 
   );
   
   while ($pm = db_fetch_object($messages)) {
-    $updated = FALSE;
+    $updated = false;
     
     // Update URLs in private message body
     $original_pm_body = $pm->body;
@@ -3812,7 +3812,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
   
@@ -4009,7 +4009,7 @@ 
     foreach ($boinc_base_urls as $url) {
       $domain = parse_url($url, PHP_URL_HOST);
       if ($domain) {
-        $this->boincDomains[$domain] = TRUE;
+        $this->boincDomains[$domain] = true;
       }
     }
     if (!$this->boincDomains) {
@@ -4031,7 +4031,7 @@ 
       }
       else {
         // This URL should not be transformed
-        return NULL;
+        return null;
       }
     }
     else {
@@ -4047,7 +4047,7 @@ 
   function transformPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
@@ -4072,7 +4072,7 @@ 
   function transformOldPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
@@ -4093,7 +4093,7 @@ 
   function transformTopicLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = db_result(db_query('
         SELECT nid
         FROM {boincimport_temp_topic}
@@ -4108,7 +4108,7 @@ 
   function transformForumLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $forum = db_fetch_object(db_query('
         SELECT tid
         FROM {boincimport_temp_forum}
@@ -4123,7 +4123,7 @@ 
   function transformUserLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       // Make sure this isn't an RPC link (no need to transform those)
       if (!$matches[5]) {
         // TODO: This regex doesn't seem to capture the format=xml part of the
@@ -4139,7 +4139,7 @@ 
   function transformWorkUnitLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}workunit/{$id}";
     }
@@ -4149,7 +4149,7 @@ 
   function transformResultLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}task/{$id}";
     }
@@ -4159,7 +4159,7 @@ 
   function transformHostResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}host/{$id}/tasks";
     }
@@ -4169,7 +4169,7 @@ 
   function transformUserResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $link = "{$newBaseUrl}account/tasks";
     }
     return $link;
@@ -4178,7 +4178,7 @@ 
   function transformHostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}host/{$id}";
     }
@@ -4188,7 +4188,7 @@ 
   function transformUserHostsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $uid = boincuser_lookup_uid($matches[3]);
       if ($uid) {
         $link = "{$newBaseUrl}account/{$uid}/computers";
@@ -4200,7 +4200,7 @@ 
   function transformForumIndexLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $link = "{$newBaseUrl}community/forum";
     }
     return $link;

Spacing +77 added lines, -77 removed lines

@@ -105,8 +105,8 @@ 
   $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
   variable_set('boincimport_db_url', $boinc_db_url);
   variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+  return '<p>'.t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+      array('@configlink' => url('admin/boinc/import/settings'))).'</p>';
 }
 
 /**
@@ -114,18 +114,18 @@ 
  */
 function boincimport_unlock() {
   variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+  return '<p>'.t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
       '!proceed_with_import' => l(t('proceed with the import'),
         'admin/boinc/import/process')
-    )) .'</p>';
+    )).'</p>';
 }
 
 /**
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+  return boincimport_process_cleanup().'<p>'.t('Drupal database cleaned.').'</p>';
 }
 
 /**
@@ -138,7 +138,7 @@ 
  * fails, the process will die() which is a bit too much since we only
  * want to test. Therefore, the test part of the code is not used, now.
  */
-function _boincimport_db_connect($test= 0) {
+function _boincimport_db_connect($test = 0) {
   global $db_url;
   $db_ready = variable_get('boincimport_db_configured', 1);
   if (!$db_ready) {
@@ -148,7 +148,7 @@ 
       $db_url2['default'] = $db_url;
     }
     $db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
-    $GLOBALS['db_url'] =& $db_url2;
+    $GLOBALS['db_url'] = & $db_url2;
     if ($test) {
       if (!db_connect($db_url2['boinc_rw'])) {
         return 0;
@@ -171,10 +171,10 @@ 
   $result = module_exists($module);
   $out['result'] = $result;
   if ($result == 1) {
-    $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
+    $out['html'] .= '<li>'.t('Module %module is enabled. OK!', array('%module' => $module)).'</li>';
   }
   else {
-    $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
+    $out['html'] .= '<li><span class="marker">'.t('Module %module is disabled.', array('%module' => $module)).'</span></li>';
   }
   $out['html'] .= '</ul>';
   return $out;
@@ -187,32 +187,32 @@ 
  *   $out['html'] = formatted html.
  *   $out['result'] = boolean.
  */
-function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
+function _boincimport_check_tables($tables = array(), $db = 'default', $prefix = 1) {
   _boincimport_db_connect();
 
   $out['html'] = '<ul>';
-  $out['result']= 1;
+  $out['result'] = 1;
   foreach ($tables as $table) {
     if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
+      $table = db_prefix_tables('{'.$table.'}');
     }  
 
     db_set_active($db);
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+      $result = (bool)db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
     }
     else {
       // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+      $result = (bool)db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+      $out['html'] .= '<li>'.t('Table %table: OK!', array('%table' => $table)).'</li>';
     }
     else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
+      $out['html'] .= '<li><span class="marker">'.t('Table <strong>%table</strong> does not exist!', array('%table' => $table)).'</span></li>';
+      $out['result'] = 0;
     }
   }
   $out['html'] .= '</ul>';
@@ -226,7 +226,7 @@ 
   boinc_get_path();
   
   if (!variable_get('boincimport_ready', 0)) {
-    return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
+    return '<p>'.t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))).'</p>';
   }
 
   $output = 'BOINC import process form';
@@ -236,7 +236,7 @@ 
 
 function boincimport_process_form() {
   $form = array();
-  _boincimport_db_connect() ;
+  _boincimport_db_connect();
   // Causes problems with form api redirect
   //ini_set('display_errors', TRUE);
 
@@ -411,7 +411,7 @@ 
       }
       else {
         drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+        drupal_set_message('Please visit the '.l('Post migration configuration', 'admin/boinc/import/post_configuration').' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
         unset($_SESSION['boincimport_stage_selected']);
       }
@@ -632,7 +632,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -661,7 +661,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -845,7 +845,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1018,7 +1018,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1046,7 +1046,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1202,7 +1202,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1231,7 +1231,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1381,7 +1381,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1408,7 +1408,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1709,7 +1709,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1787,7 +1787,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1800,34 +1800,34 @@ 
   $forum_perms = array();
   $role_map = array_flip(user_roles());
   $forum_perms[$role_map['anonymous user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['authenticated user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['community member']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) $open,
+    'create' => (int)$open,
   );
   $forum_perms[$role_map['verified contributor']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['moderator']] = array(
-    'view' => (int) !$hidden,
-    'update' => (int) !$hidden,
+    'view' => (int)!$hidden,
+    'update' => (int)!$hidden,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['administrator']] = array(
     'view' => 1,
@@ -1892,7 +1892,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1962,7 +1962,7 @@ 
   $batch_size = 100;
   
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2079,7 +2079,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2093,7 +2093,7 @@ 
       $node['tid'] = $tid;
       
       // Save the topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
       taxonomy_node_save($node, array($tid));
       $success = ($node->nid) ? TRUE : FALSE;
@@ -2156,7 +2156,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2194,7 +2194,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2270,7 +2270,7 @@ 
   $batch_size = 100;
   
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2484,7 +2484,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2502,10 +2502,10 @@ 
     $empty_posts = count($results['posts']['empty']);
     $failed_posts = count($results['posts']['failure']);
     $message = t(
-      'Successfully imported @post_count posts in @topic_count topics ' .
-      '(@skipped topics either had no replies or all replies were already imported, ' .
-      '@duplicates posts were skipped as already imported, ' .
-      '@empty_posts had no content, ' .
+      'Successfully imported @post_count posts in @topic_count topics '.
+      '(@skipped topics either had no replies or all replies were already imported, '.
+      '@duplicates posts were skipped as already imported, '.
+      '@empty_posts had no content, '.
       'and @error_posts encountered errors during import)',
       array(
         '@post_count' => $posts_imported,
@@ -2528,7 +2528,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2698,7 +2698,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2725,7 +2725,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2907,7 +2907,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2921,7 +2921,7 @@ 
       );
       
       // Save the team topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
 
       if ($node->nid) {
@@ -2967,7 +2967,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2994,7 +2994,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3249,7 +3249,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3276,7 +3276,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3398,7 +3398,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3427,7 +3427,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3503,7 +3503,7 @@ 
   $batch_size = 100;
   
   // Create node batches to process
-  for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $node_count; $offset += $batch_size) {
     $nodes_per_batch = $batch_size;
     if ($offset + $batch_size > $node_count) {
       $nodes_per_batch = $node_count - $offset;
@@ -3515,7 +3515,7 @@ 
     );
   }
   // Add comment batches
-  for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $comment_count; $offset += $batch_size) {
     $comments_per_batch = $batch_size;
     if ($offset + $batch_size > $comment_count) {
       $comments_per_batch = $comment_count - $offset;
@@ -3527,7 +3527,7 @@ 
     );
   }
   // And don't forget to process private messages
-  for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $pm_count; $offset += $batch_size) {
     $messages_per_batch = $batch_size;
     if ($offset + $batch_size > $pm_count) {
       $messages_per_batch = $pm_count - $offset;
@@ -3616,7 +3616,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3680,7 +3680,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3743,7 +3743,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3812,7 +3812,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3881,18 +3881,18 @@ 
     $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid']));
     // Strip the "/" from the end of the thread.
     $max = rtrim($max, '/');
-    $thread = int2vancode(vancode2int($max)+1) .'/';
+    $thread = int2vancode(vancode2int($max) + 1).'/';
   } else {
     // This is comment with a parent comment: we increase the part of the thread
     // value at the proper depth.
     $parent = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $edit['pid']));
     // Strip the "/" from the end of the parent thread.
-    $parent->thread = (string) rtrim((string) $parent->thread, '/');
+    $parent->thread = (string)rtrim((string)$parent->thread, '/');
     // Get the max value in _this_ thread.
     $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid']));
     if ($max == '') {
       // First child of this parent.
-      $thread = $parent->thread .'.'. int2vancode(1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(1).'/';
     } else {
       // Strip the "/" at the end of the thread.
       $max = rtrim($max, '/');
@@ -3901,14 +3901,14 @@ 
       $parent_depth = count(explode('.', $parent->thread));
       $last = $parts[$parent_depth];
       // Finally, build the thread field for this new comment.
-      $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(vancode2int($last) + 1).'/';
     }
   }
 
   $status = 0; // 1 - not published, 0 - published
   $format = variable_get('boincimport_input_format', 0);
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
-  $users = serialize(array(0 => 1));  // default value for everybody!!
+  $users = serialize(array(0 => 1)); // default value for everybody!!
   
   if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
@@ -3942,7 +3942,7 @@ 
   // BBcode to normal html
   if (variable_get('boincimport_bbcode', 0)) {
     $input_format = variable_get('boincimport_input_format', 0);
-    $text = bbcode_filter('process', 0 , $input_format, $text);
+    $text = bbcode_filter('process', 0, $input_format, $text);
   }
   return $text;
 }

Braces +91 added lines, -180 removed lines

@@ -172,8 +172,7 @@ 
   $out['result'] = $result;
   if ($result == 1) {
     $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
+  } else {
     $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
   }
   $out['html'] .= '</ul>';
@@ -201,16 +200,14 @@ 
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
       $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
-    }
-    else {
+    } else {
       // adapt from db_table_exists in database.mysql.inc
       $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
       $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
-    }
-    else {
+    } else {
       $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
       $out['result']= 0;
     }
@@ -252,8 +249,7 @@ 
       array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
       ), WATCHDOG_WARNING); 
-  }
-  else {
+  } else {
     $boincimport_functions = array(
       'users' => t('Import users'),
       'teams' => t('Import teams'),
@@ -288,8 +284,7 @@ 
   // Lock the import process
   if (!variable_get('boincimport_process_locked', 0)) {
     variable_set('boincimport_process_locked', 1);
-  }
-  else {
+  } else {
     watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING); 
   }
@@ -303,8 +298,7 @@ 
       boincimport_teams();
       if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
       }
       break;
@@ -313,8 +307,7 @@ 
       boincimport_friends();
       if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
       }
       break;
@@ -323,8 +316,7 @@ 
       boincimport_preferences();
       if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
       }
       break;
@@ -333,8 +325,7 @@ 
       boincimport_private_msgs();
       if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
       }
       break;
@@ -343,8 +334,7 @@ 
       boincimport_forum_categories();
       if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
       }
       break;
@@ -353,8 +343,7 @@ 
       boincimport_forum_topics();
       if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
       }
       break;
@@ -363,8 +352,7 @@ 
       boincimport_forum_posts();
       if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -373,8 +361,7 @@ 
       boincimport_team_forums();
       if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
       }
       break;
@@ -383,8 +370,7 @@ 
       boincimport_team_forum_topics();
       if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
       }
       break;
@@ -393,8 +379,7 @@ 
       boincimport_team_forum_posts();
       if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -403,8 +388,7 @@ 
       boincimport_replace_urls();
       if (!variable_get('boincimport_replace_url_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
+      } else {
         drupal_set_message('Congratulations.  Import Finished');
         drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
@@ -473,8 +457,7 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysqli_num_rows($boinc_accounts);
-  }
-  else {
+  } else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array(0);
@@ -550,8 +533,7 @@ 
      if (isset($existing_users[$boinc_account->id])) {
       // This user has already been imported
       $duplicates[] = $boinc_account->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_users_op', array(
           $boinc_account->id
@@ -607,8 +589,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boinc_id;
     $message = "Successfully imported user {$boinc_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boinc_id;
     $message = "Failed to import user {$boinc_id}!";
     watchdog('boincimport',
@@ -625,8 +606,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -651,8 +631,7 @@ 
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -714,8 +693,7 @@ 
         $team_type = array(
           'tid' => $team_type_id
         );
-      }
-      else {
+      } else {
         if (!$name) continue;
         $team_type = array(
           'name' => strip_tags($name),
@@ -778,8 +756,7 @@ 
      if (isset($existing_teams[$boinc_team->id])) {
       // This team has already been imported
       $duplicates[] = $boinc_team->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_teams_op', array(
           $boinc_team
@@ -820,8 +797,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincteam->id;
     $message = "Successfully imported team {$boincteam->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincteam->id;
     $message = "Failed to import team {$boincteam->id}!";
     watchdog('boincimport',
@@ -838,8 +814,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -862,8 +837,7 @@ 
     // Set the team import successful flag in the variable table
     variable_set('boincimport_import_team_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'friends';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -984,8 +958,7 @@ 
       SET uid = '%d', friend_uid = '%d', created = '%d'",
       $uid, $friend_uid, $friendship->create_time
     );
-  }
-  else {
+  } else {
     $boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
     $message = "No Drupal account exists for BOINC user {$boinc_id}!";
   }
@@ -994,8 +967,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully made users {$uid} and {$friend_uid} friends";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     if (!$message) {
       $message = "Failed to make users {$uid} and {$friend_uid} friends!";
@@ -1011,8 +983,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1036,8 +1007,7 @@ 
     // Set the friend import successful flag in the variable table
     variable_set('boincimport_import_friend_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'preferences';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1161,8 +1131,7 @@ 
     );
     if ($user_ignored) {
       $success = TRUE;
-    }
-    else {
+    } else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
       watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
@@ -1177,8 +1146,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully imported ignored users for user {$uid}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     $message = "Failed to import any user filter preferences for user {$uid}!";
     watchdog('boincimport',
@@ -1195,8 +1163,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1221,8 +1188,7 @@ 
     // Set the preference import successful flag in the variable table
     variable_set('boincimport_import_preferences_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'private messages';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1356,8 +1322,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $pm->id;
     $message = "Failed to import private message {$pm->id}!";
     watchdog('boincimport',
@@ -1374,8 +1339,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1398,8 +1362,7 @@ 
     // Set the private message import successful flag in the variable table
     variable_set('boincimport_import_private_msg_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'categories';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1552,8 +1515,7 @@ 
     if (in_array($boinc_forum_category->name, $existing_categories)) {
       // This category has already been imported
       $duplicate_categories[] = $boinc_forum_category->name;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
           $boinc_forum_category, $forum_vid, $pre, FALSE
@@ -1567,8 +1529,7 @@ 
      if (isset($existing_forums[$boinc_forum->id])) {
       // This forum has already been imported
       $duplicates[] = $boinc_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forums_op', array(
           $boinc_forum, $forum_vid, $pre
@@ -1635,8 +1596,7 @@ 
     $category->name = 'Hidden';
     $category->id = 0;
     $hidden = TRUE;
-  }
-  else {
+  } else {
     // If this container is empty, put it into the hidden container
     db_set_active('boinc_rw');
     $forums_contained = db_result(db_query('
@@ -1679,13 +1639,11 @@ 
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
       $message = "Created special hidden container";
-    }
-    else {
+    } else {
       $context['results']['categories']['success'][] = $category->id;
       $message = "Successfully imported container {$category->id}";
     }
-  }
-  else {
+  } else {
     $context['results']['categories']['failure'][] = $category->id;
     $message = "Failed to import container {$category->id}!";
     watchdog('boincimport',
@@ -1702,8 +1660,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1739,8 +1696,7 @@ 
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
     $success = TRUE;
-  }
-  else {
+  } else {
     // Save all other forums as taxonomy terms
     $forum = array(
       'name' => $name,
@@ -1766,8 +1722,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['forums']['success'][] = $forum_id;
     $message = "Successfully imported forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['forums']['failure'][] = $forum_id;
     $message = "Failed to import forum {$forum_id}!";
   }
@@ -1780,8 +1735,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1882,8 +1836,7 @@ 
     // Set the forum import successful flag in the variable table
     variable_set('boincimport_import_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2037,9 +1990,7 @@ 
     
     if ($duplicate OR !$post) {
       $success = FALSE;
-    }
-    
-    else {
+    } else {
       // Get the user and term IDs along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
       $tid = db_result(db_query('
@@ -2103,12 +2054,10 @@ 
           if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
           }
-        }
-        else {
+        } else {
           $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+      } else {
         $error_detail = 'failed to save topic node to database';
       }
     }
@@ -2119,16 +2068,13 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $topic->id;
       $message = "Successfully imported topic {$topic->id}";
-    }
-    elseif ($duplicate) {
+    } elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
       $message = "Topic {$topic->id} was already imported";
-    }
-    elseif (!$post) {
+    } elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
       $message = "Skipping topic {$topic->id} as empty";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $topic->id;
       $message = "Failed to import topic {$topic->id}!";
       watchdog('boincimport',
@@ -2149,8 +2095,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -2184,8 +2129,7 @@ 
     // Set the topic import successful flag in the variable table
     variable_set('boincimport_import_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2433,18 +2377,15 @@ 
           if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+          } else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
           }
-        }
-        else {
+        } else {
           $context['results']['posts']['failure'][] = $post->id;
           $error_posts++;
         }
-      }
-      else {
+      } else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
       }
@@ -2455,8 +2396,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $boinc_topic->id;
       $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $boinc_topic->id;
       $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
       watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
@@ -2477,8 +2417,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -2518,8 +2457,7 @@ 
     // Set the post import successful flag in the variable table
     variable_set('boincimport_import_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team forums';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2606,8 +2544,7 @@ 
      if (isset($existing_team_forums[$boincteam_forum->id])) {
       // This team has already been imported
       $duplicates[] = $boincteam_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_forums_op', array(
           $boincteam_forum
@@ -2673,8 +2610,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $forum_id;
     $message = "Successfully imported team forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $forum_id;
     $message = "Failed to import team forum {$forum_id}!";
     watchdog('boincimport',
@@ -2691,8 +2627,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -2715,8 +2650,7 @@ 
     // Set the team forum import successful flag in the variable table
     variable_set('boincimport_import_team_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2811,8 +2745,7 @@ 
      if (isset($existing_team_topics[$boincteam_topic->id])) {
       // This team topic has already been imported
       $duplicates[] = $boincteam_topic->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_topics_op', array(
           $boincteam_topic
@@ -2859,8 +2792,7 @@ 
   ));
   if (!$team_forum_id) {
     $missing_parent[] = $topic->id;
-  }
-  else {
+  } else {
     // Get the content of the post that started the topic
     db_set_active('boinc_rw');
     $query = db_query('
@@ -2877,8 +2809,7 @@ 
       // Empty topics should have already been filtered out of the import, so
       // consider this an error condition
       $empty_topics[] = $topic->id;
-    }
-    else {
+    } else {
       // Get the user ID along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
        if (!$topic->owner) {
@@ -2942,8 +2873,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $topic->id;
     $message = "Successfully imported team topic {$topic->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $topic->id;
     $message = "Failed to import team topic {$topic->id}!";
     watchdog('boincimport',
@@ -2960,8 +2890,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -2984,8 +2913,7 @@ 
     // Set the BLAH import successful flag in the variable table
     variable_set('boincimport_import_team_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3107,8 +3035,7 @@ 
       if (isset($existing_posts[$boincteam_post->id])) {
         // This post has already been imported
         $duplicates[] = $boincteam_post->id;
-      }
-      else {
+      } else {
         $operations[] = array(
           'boincimport_team_posts_op', array(
             $boincteam_post
@@ -3224,8 +3151,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $post->id;
     $message = "Successfully imported team post {$post->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $post->id;
     $message = "Failed to import team post {$post->id}!";
     watchdog('boincimport',
@@ -3242,8 +3168,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -3266,8 +3191,7 @@ 
     // Set the team post import successful flag in the variable table
     variable_set('boincimport_import_team_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3373,8 +3297,7 @@ 
     $context['results']['success'][] = $boincuser_id;
     $context['results']['subscriptions'][$boincuser_id] = $count;
     $message = "Successfully imported {$count} subscriptions for user {$boincuser_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincuser_id;
     $message = "Failed to import subscriptions for user {$boincuser_id}!";
     watchdog('boincimport',
@@ -3391,8 +3314,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -3417,8 +3339,7 @@ 
     // Set the subscription import successful flag in the variable table
     variable_set('boincimport_import_subscription_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3596,8 +3517,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['nodes']['updated'][] = $node->nid;
       $message = "Successfully updated node {$node->nid}";
-    }
-    else {
+    } else {
       $message = "No changes made to node {$node->nid}!";
     }
     
@@ -3609,8 +3529,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3660,8 +3579,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['comments']['updated'][] = $comment->cid;
       $message = "Successfully updated comment {$comment->cid}";
-    }
-    else {
+    } else {
       $message = "No changes made to comment {$comment->cid}!";
     }
     
@@ -3673,8 +3591,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3723,8 +3640,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['pm']['updated'][] = $pm->mid;
       $message = "Successfully updated private message {$pm->mid}";
-    }
-    else {
+    } else {
       $message = "No changes made to private message {$pm->mid}!";
     }
     
@@ -3736,8 +3652,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3802,8 +3717,7 @@ 
     // Set the replace URLs successful flag in the variable table
     variable_set('boincimport_replace_urls_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'users';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3905,7 +3819,8 @@ 
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
   $users = serialize(array(0 => 1));  // default value for everybody!!
   
-  if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
+  if ($edit['uid'] === $user->uid) {
+// '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
   }
 
@@ -4028,13 +3943,11 @@ 
       if (isset($this->boincDomains[$domain])) {
         // This is a URL configured to be transformed
         return "{$http}://{$this->drupalDomain}{$this->basePath}";
-      }
-      else {
+      } else {
         // This URL should not be transformed
         return NULL;
       }
-    }
-    else {
+    } else {
       // This is a relative URL
       return $this->basePath;
     }
@@ -4056,8 +3969,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }
@@ -4081,8 +3993,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }

Indentation +1726 added lines, -1726 removed lines

@@ -19,9 +19,9 @@ 
  * Implementation of hook_menu()
  */
 function boincimport_menu() {
-  $items = array();
+    $items = array();
   
-  $items['admin/boinc/import'] = array(
+    $items['admin/boinc/import'] = array(
     'title' => 'Environment: Data import',
     'description' => 'Overview of the BOINC data import process.',
     'access callback' => 'user_access',
@@ -29,8 +29,8 @@ 
     'page callback' => 'boincimport_main',
     'file' => 'boincimport.pages.inc',
     'type' => MENU_NORMAL_ITEM,
-  );
-  $items['admin/boinc/import/post_configuration'] = array(
+    );
+    $items['admin/boinc/import/post_configuration'] = array(
     'title' => 'Post-migration configuration',
     'description' => 'Tie up a few odds and ends in the system configuration
       after data importation is complete.',
@@ -39,44 +39,44 @@ 
     'page callback' => 'boincimport_post_configuration', 
     'file' => 'boincimport.pages.inc',
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/cleanup'] = array(
+    );
+    $items['admin/boinc/import/cleanup'] = array(
     'title' => 'Cleanup',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_cleanup', 
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/complete/%'] = array(
+    );
+    $items['admin/boinc/import/complete/%'] = array(
     'title' => 'Complete',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_complete',
     'page arguments' => array(4),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/process'] = array(
+    );
+    $items['admin/boinc/import/process'] = array(
     'title' => 'Execute migration',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_process', 
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/reset'] = array(
+    );
+    $items['admin/boinc/import/reset'] = array(
     'title' => 'Reset BOINC database URL',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_reset',
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/unlock'] = array(
+    );
+    $items['admin/boinc/import/unlock'] = array(
     'title' => 'Unlock BOINC import process',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_unlock',
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/settings'] = array(
+    );
+    $items['admin/boinc/import/settings'] = array(
     'title' => 'BOINC data import settings',
     'description' => 'Configure the BOINC data import process in preparation
       for pulling user accounts, teams, and forums into Drupal.',
@@ -86,37 +86,37 @@ 
     'page arguments' => array('boincimport_admin_settings'),
     'file' => 'boincimport.pages.inc',
     'type' => MENU_CALLBACK,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincimport_perm() {
-  return array('import boinc data');
+    return array('import boinc data');
 }
 
 /**
  * Callback admin/boinc/import/reset
  */
 function boincimport_reset() {
-  global $db_url;
-  $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
-  variable_set('boincimport_db_url', $boinc_db_url);
-  variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+    global $db_url;
+    $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
+    variable_set('boincimport_db_url', $boinc_db_url);
+    variable_set('boincimport_ready', 0);
+    return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+        array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
 }
 
 /**
  * Callback admin/boinc/import/unlock
  */
 function boincimport_unlock() {
-  variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+    variable_del('boincimport_process_locked');
+    return '<p>'. t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
-      '!proceed_with_import' => l(t('proceed with the import'),
+        '!proceed_with_import' => l(t('proceed with the import'),
         'admin/boinc/import/process')
     )) .'</p>';
 }
@@ -125,7 +125,7 @@ 
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+    return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
 }
 
 /**
@@ -139,23 +139,23 @@ 
  * want to test. Therefore, the test part of the code is not used, now.
  */
 function _boincimport_db_connect($test= 0) {
-  global $db_url;
-  $db_ready = variable_get('boincimport_db_configured', 1);
-  if (!$db_ready) {
+    global $db_url;
+    $db_ready = variable_get('boincimport_db_configured', 1);
+    if (!$db_ready) {
     if (is_array($db_url)) {
-      $db_url2 = $db_url;
+        $db_url2 = $db_url;
     } else {
-      $db_url2['default'] = $db_url;
+        $db_url2['default'] = $db_url;
     }
     $db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
     $GLOBALS['db_url'] =& $db_url2;
     if ($test) {
-      if (!db_connect($db_url2['boinc_rw'])) {
+        if (!db_connect($db_url2['boinc_rw'])) {
         return 0;
-      }
+        }
     }
-  }
-  return 1;
+    }
+    return 1;
   
 }
 
@@ -167,17 +167,17 @@ 
  *    $out['result'] = boolean.
  */
 function _boincimport_check_module($module) {
-  $out['html'] = '<ul>';
-  $result = module_exists($module);
-  $out['result'] = $result;
-  if ($result == 1) {
+    $out['html'] = '<ul>';
+    $result = module_exists($module);
+    $out['result'] = $result;
+    if ($result == 1) {
     $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
+    }
+    else {
     $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
-  }
-  $out['html'] .= '</ul>';
-  return $out;
+    }
+    $out['html'] .= '</ul>';
+    return $out;
 }
 
 /**
@@ -188,259 +188,259 @@ 
  *   $out['result'] = boolean.
  */
 function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
-  _boincimport_db_connect();
+    _boincimport_db_connect();
 
-  $out['html'] = '<ul>';
-  $out['result']= 1;
-  foreach ($tables as $table) {
+    $out['html'] = '<ul>';
+    $out['result']= 1;
+    foreach ($tables as $table) {
     if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
+        $table = db_prefix_tables('{'. $table .'}');
     }  
 
     db_set_active($db);
     if ($GLOBALS['db_type'] == 'pgsql') {
-      // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+        // adapt from db_table_exists in database.pgsql.inc
+        $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
     }
     else {
-      // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+        // adapt from db_table_exists in database.mysql.inc
+        $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+        $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
     }
     else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
+        $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
+        $out['result']= 0;
     }
-  }
-  $out['html'] .= '</ul>';
-  return $out;
+    }
+    $out['html'] .= '</ul>';
+    return $out;
 }
 
 
 
 function boincimport_process() {
-  // 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();
   
-  if (!variable_get('boincimport_ready', 0)) {
+    if (!variable_get('boincimport_ready', 0)) {
     return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
-  }
+    }
 
-  $output = 'BOINC import process form';
-  $output .= drupal_get_form('boincimport_process_form');
-  return $output;
+    $output = 'BOINC import process form';
+    $output .= drupal_get_form('boincimport_process_form');
+    return $output;
 }
 
 function boincimport_process_form() {
-  $form = array();
-  _boincimport_db_connect() ;
-  // Causes problems with form api redirect
-  //ini_set('display_errors', TRUE);
+    $form = array();
+    _boincimport_db_connect() ;
+    // Causes problems with form api redirect
+    //ini_set('display_errors', TRUE);
 
-  // Adjust how long you want the script to run...
-  if (!ini_get('safe_mode')) {
+    // Adjust how long you want the script to run...
+    if (!ini_get('safe_mode')) {
     // This will always be set on PHP7, but not on PHP5 with safe mode
     set_time_limit(variable_get('boincimport_time_limit', 0));
-  }
+    }
 
-  // Check for a lock on the import process
-  if (variable_get('boincimport_process_locked', 0)) {
+    // Check for a lock on the import process
+    if (variable_get('boincimport_process_locked', 0)) {
     drupal_set_message(t('The import process is locked. If you are sure that
       it is no longer running, you may !unlock_it', 
-      array('!unlock_it' => l(t('release the lock'),
+        array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
-      )), 'warning');
+        )), 'warning');
     watchdog('boincimport', 'The import process is locked. If you are sure that
       it is no longer running, you may !unlock_it', 
-      array('!unlock_it' => l(t('release the lock'),
+        array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
-      ), WATCHDOG_WARNING); 
-  }
-  else {
+        ), WATCHDOG_WARNING); 
+    }
+    else {
     $boincimport_functions = array(
-      'users' => t('Import users'),
-      'teams' => t('Import teams'),
-      'friends' => t('Import friendships'), 
-      'preferences' => t('Import user preferences'),
-      'private messages' => t('Import private messages'),
-      'categories' => t('Import forum containers'),
-      'topics' => t('Import topics'),
-      'posts' => t('Import posts'),
-      'team forums' => t('Import team forums'),
-      'team topics' => t('Import team topics'),
-      'team posts' => t('Import team posts'),
-      'url' => t('Transform URLs'),
+        'users' => t('Import users'),
+        'teams' => t('Import teams'),
+        'friends' => t('Import friendships'), 
+        'preferences' => t('Import user preferences'),
+        'private messages' => t('Import private messages'),
+        'categories' => t('Import forum containers'),
+        'topics' => t('Import topics'),
+        'posts' => t('Import posts'),
+        'team forums' => t('Import team forums'),
+        'team topics' => t('Import team topics'),
+        'team posts' => t('Import team posts'),
+        'url' => t('Transform URLs'),
     );
 
     $form['import'] = array(
-      '#type' => 'select',
-      '#title' => t('Next import to perform'),
-      '#default_value' => $_SESSION['boincimport_stage_selected'],
-      '#options' => $boincimport_functions,
+        '#type' => 'select',
+        '#title' => t('Next import to perform'),
+        '#default_value' => $_SESSION['boincimport_stage_selected'],
+        '#options' => $boincimport_functions,
     );
     $form[] = array(
-      '#type' => 'submit',
-      '#value' => t('Import'),
+        '#type' => 'submit',
+        '#value' => t('Import'),
     );
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function boincimport_process_form_submit($form, $form_state) {
   
-  // Lock the import process
-  if (!variable_get('boincimport_process_locked', 0)) {
+    // Lock the import process
+    if (!variable_get('boincimport_process_locked', 0)) {
     variable_set('boincimport_process_locked', 1);
-  }
-  else {
+    }
+    else {
     watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING); 
-  }
+    }
   
-  switch ($form_state['values']['import']) {
+    switch ($form_state['values']['import']) {
     case 'users':
       boincimport_users();
-      break;
+        break;
 
     case 'teams':
       boincimport_teams();
-      if (!variable_get('boincimport_import_team_successful', 0)) {
+        if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      break;
+        }
+        break;
 
     case 'friends':
       boincimport_friends();
-      if (!variable_get('boincimport_import_friend_successful', 0)) {
+        if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      break;
+        }
+        break;
 
     case 'preferences':
       boincimport_preferences();
-      if (!variable_get('boincimport_import_preferences_successful', 0)) {
+        if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      break;
+        }
+        break;
 
     case 'private messages':
       boincimport_private_msgs();
-      if (!variable_get('boincimport_import_private_msg_successful', 0)) {
+        if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      break;
+        }
+        break;
 
     case 'categories':
       boincimport_forum_categories();
-      if (!variable_get('boincimport_import_category_successful', 0)) {
+        if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      break;
+        }
+        break;
 
     case 'topics':      
       boincimport_forum_topics();
-      if (!variable_get('boincimport_import_topic_successful', 0)) {
+        if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      break;
+        }
+        break;
       
     case 'posts':
       boincimport_forum_posts();
-      if (!variable_get('boincimport_import_post_successful', 0)) {
+        if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+        }
+        break;
 
     case 'team forums':
       boincimport_team_forums();
-      if (!variable_get('boincimport_team_forum_successful', 0)) {
+        if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      break;
+        }
+        break;
 
     case 'team topics':      
       boincimport_team_forum_topics();
-      if (!variable_get('boincimport_team_topic_successful', 0)) {
+        if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      break;
+        }
+        break;
       
     case 'team posts':
       boincimport_team_forum_posts();
-      if (!variable_get('boincimport_team_post_successful', 0)) {
+        if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+        }
+        break;
 
     case 'url':
       boincimport_replace_urls();
-      if (!variable_get('boincimport_replace_url_successful', 0)) {
+        if (!variable_get('boincimport_replace_url_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
+        }
+        else {
         drupal_set_message('Congratulations.  Import Finished');
         drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
         unset($_SESSION['boincimport_stage_selected']);
-      }
-      break;
+        }
+        break;
     default:
       $_SESSION['boincimport_stage_selected'] = 'users';
-      break;
-  }
+        break;
+    }
 }
 
 function boincimport_complete($section) {
-  switch ($section) {
-  case 'users':
+    switch ($section) {
+    case 'users':
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
     break;
-  case 'teams':
+    case 'teams':
     
     break;
   
-  default:
+    default:
   }
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
   
-  drupal_goto('admin/boinc/import/process');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -452,26 +452,26 @@ 
  * Import users (at least those required for further data import)
  */
 function boincimport_users() {
-  // Check whether the user table has been successfully imported already
-  if (variable_get('boincimport_import_user_successful', 0)) {
+    // Check whether the user table has been successfully imported already
+    if (variable_get('boincimport_import_user_successful', 0)) {
     drupal_set_message(t('Note: user import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: user import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: user import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  } 
+    } 
 
-  if (!variable_get('boincimport_import_user_started', 0)) {
+    if (!variable_get('boincimport_import_user_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_user_started', 1);
-  }
+    }
 
-  $pre = variable_get('boincimport_table_prefix', '');
-  $import_lurkers = variable_get('boincimport_import_lurkers', 1);
+    $pre = variable_get('boincimport_table_prefix', '');
+    $import_lurkers = variable_get('boincimport_import_lurkers', 1);
 
-  // Determine which users need to be processed
-  db_set_active('boinc_rw');
-  if ($import_lurkers) {
+    // Determine which users need to be processed
+    db_set_active('boinc_rw');
+    if ($import_lurkers) {
     // Import all users, even those who have no community participation; other
     // users will be imported when they first try to log into the drupal site
     $boinc_accounts = db_query('
@@ -479,8 +479,8 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysqli_num_rows($boinc_accounts);
-  }
-  else {
+    }
+    else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array(0);
@@ -491,7 +491,7 @@ 
       ORDER BY userid ASC"
     );
     while ($ignoring_user = db_fetch_object($ignoring_users)) {
-      $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
+        $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
     }
     $ignored_user_list = array_keys($ignored_user_list);
     // Get IDs for all users who will need to be imported now
@@ -507,86 +507,86 @@ 
         (SELECT DISTINCT userid FROM {private_messages}) UNION
         (SELECT DISTINCT senderid FROM {private_messages})
       ) AS usersToImport",
-      implode(',', $ignored_user_list)
+        implode(',', $ignored_user_list)
     );
     $user_count = mysqli_num_rows($boinc_accounts);
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
   
-  if (!$user_count) {
+    if (!$user_count) {
     drupal_set_message(
-      t('There were no users found: Aborting script'), 'error'
+        t('There were no users found: Aborting script'), 'error'
     );
     watchdog('boincimport',
-      'There were no users found: Aborting script', array(), WATCHDOG_INFO
+        'There were no users found: Aborting script', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no users found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %user_count users: Beginning import',
     array('%user_count' => $user_count), WATCHDOG_INFO
-  ); 
-  
-  // User import relies on Drupal and BOINC APIs to manage data being read
-  // from one database and saved to the other. This approach keeps things
-  // clean and simple, but since a sizable user base will wreak havoc on system
-  // resources, the job is broken into batches here and each batch is processed
-  // by a separate process. 
-  
-  //$batch_size = variable_get('boincimport_user_batch_size', 50);
-  //$batch_count = $user_count - ($user_count % $batch_size) + $batch_size;
-  $operations = array();
-  $existing_users = array();
-  $duplicates = array();
-  
-  // Get the list of users already in Drupal to be sure we're not importing
-  // any twice
-  $result = db_query('
+    ); 
+  
+    // User import relies on Drupal and BOINC APIs to manage data being read
+    // from one database and saved to the other. This approach keeps things
+    // clean and simple, but since a sizable user base will wreak havoc on system
+    // resources, the job is broken into batches here and each batch is processed
+    // by a separate process. 
+  
+    //$batch_size = variable_get('boincimport_user_batch_size', 50);
+    //$batch_count = $user_count - ($user_count % $batch_size) + $batch_size;
+    $operations = array();
+    $existing_users = array();
+    $duplicates = array();
+  
+    // Get the list of users already in Drupal to be sure we're not importing
+    // any twice
+    $result = db_query('
     SELECT uid, boinc_id FROM {boincuser}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_users[$row->boinc_id] = $row->uid;
-  }
+    }
   
-  // Create batches to process
-  while ($boinc_account = db_fetch_object($boinc_accounts)) {
-     if (isset($existing_users[$boinc_account->id])) {
-      // This user has already been imported
-      $duplicates[] = $boinc_account->id;
+    // Create batches to process
+    while ($boinc_account = db_fetch_object($boinc_accounts)) {
+        if (isset($existing_users[$boinc_account->id])) {
+        // This user has already been imported
+        $duplicates[] = $boinc_account->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_users_op', array(
-          $boinc_account->id
+            $boinc_account->id
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count accounts that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count accounts that were already imported',
+        array('@count' => count($duplicates))
     ));
     watchdog('boincimport',
-      'Skipped @count accounts that were already imported',
-      array('@count' => count($duplicates)), WATCHDOG_INFO
+        'Skipped @count accounts that were already imported',
+        array('@count' => count($duplicates)), WATCHDOG_INFO
     ); 
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_users_finished',
     'title' => t('Importing users'),
     'init_message' => t('Beginning user import...'),
     'progress_message' => t('Processed @current out of @total users.'),
     'error_message' => t('User import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -594,81 +594,81 @@ 
  */
 function boincimport_users_op($boinc_id, &$context) {
   
-  // Use the $context['sandbox'] to store information needed to track progress
-  // between successive calls.
-  if (!isset($context['sandbox']['progress'])) {
+    // Use the $context['sandbox'] to store information needed to track progress
+    // between successive calls.
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['current_user'] = 0;
     $context['sandbox']['max'] = 1;
-  }
+    }
 
-  // Note about batch size: When a batch is processed, the batch update engine
-  // determines whether it should continue processing in the same request or
-  // provide progress feedback to the user and wait for the next request.
+    // Note about batch size: When a batch is processed, the batch update engine
+    // determines whether it should continue processing in the same request or
+    // provide progress feedback to the user and wait for the next request.
   
-  // Grab the BOINC user object and create a Drupal user from it
-  $account = boincuser_register_make_drupal_user($boinc_id);
-  $message = '';
-  if ($account) {
+    // Grab the BOINC user object and create a Drupal user from it
+    $account = boincuser_register_make_drupal_user($boinc_id);
+    $message = '';
+    if ($account) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boinc_id;
     $message = "Successfully imported user {$boinc_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $boinc_id;
     $message = "Failed to import user {$boinc_id}!";
     watchdog('boincimport',
-      'Failed to import user @id!',
-      array('@id' => $boinc_id), WATCHDOG_WARNING
+        'Failed to import user @id!',
+        array('@id' => $boinc_id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $boinc_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $boinc_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_users_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $total_failures = count($results['failure']);
     $message = t(
-      'Successfully imported @count users (@fail_count failures)',
-      array('@count' => $total_imported, '@fail_count' => $total_failures)
+        'Successfully imported @count users (@fail_count failures)',
+        array('@count' => $total_imported, '@fail_count' => $total_failures)
     );
     watchdog('boincimport',
-      'Successfully imported @count users (@fail_count failures).',
-      array('@count' => $total_imported, '@fail_count' => $total_failures),
-      WATCHDOG_INFO
+        'Successfully imported @count users (@fail_count failures).',
+        array('@count' => $total_imported, '@fail_count' => $total_failures),
+        WATCHDOG_INFO
     ); 
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -681,23 +681,23 @@ 
  */
 function boincimport_teams() {
   
-  // Check whether the team table has been successfully imported already
-  if (variable_get('boincimport_import_team_successful', 0)) {
+    // Check whether the team table has been successfully imported already
+    if (variable_get('boincimport_import_team_successful', 0)) {
     drupal_set_message(t('Note: team import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: team import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: team import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_started', 0)) {
+    if (!variable_get('boincimport_import_team_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_started', 1);
-  }
+    }
   
-  // Initialize the map of BOINC team types to taxonomy IDs, if needed
-  $team_type_map = variable_get('boincimport_team_types', array());
-  if (!$team_type_map) {
+    // Initialize the map of BOINC team types to taxonomy IDs, if needed
+    $team_type_map = variable_get('boincimport_team_types', array());
+    if (!$team_type_map) {
     // Import team types from BOINC to a Drupal vocabulary
     require_boinc('team_types');
     global $team_types;
@@ -705,112 +705,112 @@ 
     // Create vocabulary if it isn't set
     $team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
     if (!$team_vid) {
-      $team_vocab = array(
+        $team_vocab = array(
         'name' => t('Teams'),
         'description' => t('Types of BOINC teams'),
-      );
-      taxonomy_save_vocabulary($team_vocab);
-      $team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
+        );
+        taxonomy_save_vocabulary($team_vocab);
+        $team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
     }
     
     foreach ($team_types as $boinc_type_id => $name) {
-      // Check for an existing term in the vocabulary
-      $team_type_id = db_result(db_query("SELECT tid FROM {term_data} WHERE vid = '{$team_vid}' AND LOWER(name) = LOWER('%s')", trim($name)));
-      if ($team_type_id) {
+        // Check for an existing term in the vocabulary
+        $team_type_id = db_result(db_query("SELECT tid FROM {term_data} WHERE vid = '{$team_vid}' AND LOWER(name) = LOWER('%s')", trim($name)));
+        if ($team_type_id) {
         $team_type = array(
-          'tid' => $team_type_id
+            'tid' => $team_type_id
         );
-      }
-      else {
+        }
+        else {
         if (!$name) continue;
         $team_type = array(
-          'name' => strip_tags($name),
-          'vid' => $team_vid,
-          'description' => '',
-          'parent' => 0
+            'name' => strip_tags($name),
+            'vid' => $team_vid,
+            'description' => '',
+            'parent' => 0
         );
         taxonomy_save_term($team_type);
-      }
-      // Note the taxonomy ID for mapping forums to categories
-      $team_type_map[$boinc_type_id] = $team_type['tid'];
+        }
+        // Note the taxonomy ID for mapping forums to categories
+        $team_type_map[$boinc_type_id] = $team_type['tid'];
     }
     variable_set('boincimport_team_types', $team_type_map);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // 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
     FROM %steam',
     $pre
-  );
-  $team_count = mysqli_num_rows($boinc_teams);
-  db_set_active('default');
+    );
+    $team_count = mysqli_num_rows($boinc_teams);
+    db_set_active('default');
 
-  if (!$team_count) {
+    if (!$team_count) {
     drupal_set_message(
-      t('There were no teams found: Aborting script'), 'error'
+        t('There were no teams found: Aborting script'), 'error'
     );
     watchdog('boincimport',
-      'There were no teams found: Aborting script', array(), WATCHDOG_INFO
+        'There were no teams found: Aborting script', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no teams found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %team_count teams: Beginning Import',
     array('%team_count' => $team_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_teams = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_teams = array();
+    $duplicates = 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;
-  }
+    }
   
-  // Create batches to process
-  while ($boinc_team = db_fetch_object($boinc_teams)) {
-     if (isset($existing_teams[$boinc_team->id])) {
-      // This team has already been imported
-      $duplicates[] = $boinc_team->id;
+    // Create batches to process
+    while ($boinc_team = db_fetch_object($boinc_teams)) {
+        if (isset($existing_teams[$boinc_team->id])) {
+        // This team has already been imported
+        $duplicates[] = $boinc_team->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_teams_op', array(
-          $boinc_team
+            $boinc_team
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count teams that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count teams that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_teams_finished',
     'title' => t('Importing teams'),
     'init_message' => t('Beginning team import...'),
     'progress_message' => t('Processed @current out of @total teams.'),
     'error_message' => t('Team import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -819,67 +819,67 @@ 
  */
 function boincimport_teams_op($boincteam, &$context) {
   
-  $success = boincteam_import($boincteam);
+    $success = boincteam_import($boincteam);
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincteam->id;
     $message = "Successfully imported team {$boincteam->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $boincteam->id;
     $message = "Failed to import team {$boincteam->id}!";
     watchdog('boincimport',
-      'Failed to import team @id!',
-      array('@id' => $boincteam->id), WATCHDOG_WARNING
+        'Failed to import team @id!',
+        array('@id' => $boincteam->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_team'] = $boincteam->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_team'] = $boincteam->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_teams_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count teams',
-      array('@count' => $total_imported)
+        'Successfully imported @count teams',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count teams.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count teams.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the team import successful flag in the variable table
     variable_set('boincimport_import_team_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'friends';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -892,25 +892,25 @@ 
  */
 function boincimport_friends() {
   
-  // Check whether friendships have been successfully imported already
-  if (variable_get('boincimport_import_friend_successful', 0)) {
+    // Check whether friendships have been successfully imported already
+    if (variable_get('boincimport_import_friend_successful', 0)) {
     drupal_set_message(t('Note: Friends import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: Friends import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: Friends import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_friend_started', 0)) {
+    if (!variable_get('boincimport_import_friend_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_friend_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get stuff to import
-  db_set_active('boinc_rw');
-  $friendships = db_query('
+    // Get stuff to import
+    db_set_active('boinc_rw');
+    $friendships = db_query('
     SELECT
       f1.user_src,
       f1.user_dest,
@@ -924,51 +924,51 @@ 
       AND (f2.user_src IS NULL OR f1.create_time < f2.create_time)
     ORDER BY create_time',
     $pre, $pre
-  );
-  $friendship_count = mysqli_num_rows($friendships);
-  db_set_active('default');
+    );
+    $friendship_count = mysqli_num_rows($friendships);
+    db_set_active('default');
 
-  if (!$friendship_count) {
+    if (!$friendship_count) {
     drupal_set_message(
-      t('There were no friendships found: Aborting script'), 'error'
+        t('There were no friendships found: Aborting script'), 'error'
     );
     watchdog('boincimport',
-      'There were no friendships found: Aborting script', array(), WATCHDOG_INFO
+        'There were no friendships found: Aborting script', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no friendships found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count friend relationships: Beginning Import',
     array('%count' => $friendship_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // It doesn't matter if a friend relationship has already been imported, just
-  // do it again if so
+    // It doesn't matter if a friend relationship has already been imported, just
+    // do it again if so
   
-  // Create batches to process
-  while ($friendship = db_fetch_object($friendships)) {
+    // Create batches to process
+    while ($friendship = db_fetch_object($friendships)) {
     $operations[] = array(
-      'boincimport_friends_op', array(
+        'boincimport_friends_op', array(
         $friendship
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_friends_finished',
     'title' => t('Importing friend relationships'),
     'init_message' => t('Beginning friend import...'),
     'progress_message' => t('Processed @current out of @total friendships.'),
     'error_message' => t('Friend import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -977,83 +977,83 @@ 
  */
 function boincimport_friends_op($friendship, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
-  $message = '';
+    $input_format = variable_get('boincimport_input_format', 0);
+    $success = FALSE;
+    $message = '';
   
-  // Convert BOINC friends to Drupal friends
-  $uid = boincuser_lookup_uid($friendship->user_src);
-  $friend_uid = boincuser_lookup_uid($friendship->user_dest);
-  if ($uid AND $friend_uid) {
+    // Convert BOINC friends to Drupal friends
+    $uid = boincuser_lookup_uid($friendship->user_src);
+    $friend_uid = boincuser_lookup_uid($friendship->user_dest);
+    if ($uid AND $friend_uid) {
     $success = db_query("
       INSERT IGNORE INTO {flag_friend}
       SET uid = '%d', friend_uid = '%d', created = '%d'",
-      $uid, $friend_uid, $friendship->create_time
+        $uid, $friend_uid, $friendship->create_time
     );
-  }
-  else {
+    }
+    else {
     $boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
     $message = "No Drupal account exists for BOINC user {$boinc_id}!";
-  }
+    }
   
-  if ($success) {
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully made users {$uid} and {$friend_uid} friends";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $uid;
     if (!$message) {
-      $message = "Failed to make users {$uid} and {$friend_uid} friends!";
+        $message = "Failed to make users {$uid} and {$friend_uid} friends!";
     }
     watchdog('boincimport', $message, array(), WATCHDOG_WARNING);
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $uid;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $uid;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_friends_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $failures = count($results['failure']);
     $message = t(
-      'Successfully imported @count friendships (@failed failures)',
-      array(
+        'Successfully imported @count friendships (@failed failures)',
+        array(
         '@count' => $total_imported,
         '@failed' => $failures,
-      )
+        )
     );
     watchdog('boincimport', $message, array(), WATCHDOG_INFO); 
     // Set the friend import successful flag in the variable table
     variable_set('boincimport_import_friend_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'preferences';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1066,78 +1066,78 @@ 
  */
 function boincimport_preferences() {
   
-  // Check whether preferences have been successfully imported already
-  if (variable_get('boincimport_import_preferences_successful', 0)) {
+    // Check whether preferences have been successfully imported already
+    if (variable_get('boincimport_import_preferences_successful', 0)) {
     drupal_set_message(t('Note: preferences import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: preferences import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: preferences import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_preferences_started', 0)) {
+    if (!variable_get('boincimport_import_preferences_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_preferences_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
   
-  // Currently the only preferences being imported are BOINC "filtered users"
-  // This concept of users blocking other users when they don't get along maps
-  // to the Drupal ignore users module
+    // Currently the only preferences being imported are BOINC "filtered users"
+    // This concept of users blocking other users when they don't get along maps
+    // to the Drupal ignore users module
   
-  // Find users who are involved in quarrels
-  db_set_active('boinc_rw');
-  $quarrelers = db_query("
+    // Find users who are involved in quarrels
+    db_set_active('boinc_rw');
+    $quarrelers = db_query("
     SELECT userid, ignorelist
     FROM %sforum_preferences
     WHERE ignorelist <> ''",
     $pre
-  );
-  $quarreler_count = mysqli_num_rows($quarrelers);
-  db_set_active('default');
+    );
+    $quarreler_count = mysqli_num_rows($quarrelers);
+    db_set_active('default');
 
-  if (!$quarreler_count) {
+    if (!$quarreler_count) {
     drupal_set_message(
-      t('There were no quarrels found: Moving on...')
+        t('There were no quarrels found: Moving on...')
     );
     watchdog('boincimport',
-      'There were no quarrels found: Moving on...', array(), WATCHDOG_INFO
+        'There were no quarrels found: Moving on...', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no quarrels found: Moving on...');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count quarreling users: Beginning Import',
     array('%count' => $quarreler_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // It doesn't matter if a filtered user preference has already been imported,
-  // just do it again if so
+    // It doesn't matter if a filtered user preference has already been imported,
+    // just do it again if so
   
-  // Create batches to process
-  while ($quarreler = db_fetch_object($quarrelers)) {
+    // Create batches to process
+    while ($quarreler = db_fetch_object($quarrelers)) {
     $operations[] = array(
-      'boincimport_quarrels_op', array(
+        'boincimport_quarrels_op', array(
         $quarreler
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_preferences_finished',
     'title' => t('Importing preferences'),
     'init_message' => t('Beginning preference import...'),
     'progress_message' => t('Processed @current out of @total preferences.'),
     'error_message' => t('Preference import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1146,99 +1146,99 @@ 
  */
 function boincimport_quarrels_op($boinc_user, &$context) {
   
-  $success = FALSE;
-  $uid = boincuser_lookup_uid($boinc_user->userid);
-  $ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
-  foreach ($ignored_users as $ignored_user) {
+    $success = FALSE;
+    $uid = boincuser_lookup_uid($boinc_user->userid);
+    $ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
+    foreach ($ignored_users as $ignored_user) {
     $ignored_user_uid = boincuser_lookup_uid($ignored_user);
     if (!$ignored_user_uid) {
-      $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
-      watchdog('boincimport',
+        $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
+        watchdog('boincimport',
         'Error adding to ignore list of user @uid: No Drupal ID found for BOINC user @boinc_id',
         array('@boinc_id' => $ignored_user, '@uid' => $uid),
         WATCHDOG_WARNING
-      );
-      continue;
+        );
+        continue;
     }
     $user_ignored = db_query("
       INSERT IGNORE INTO {ignore_user}
       SET uid = '%d', iuid = '%d'",
-      $uid, $ignored_user_uid
+        $uid, $ignored_user_uid
     );
     if ($user_ignored) {
-      $success = TRUE;
+        $success = TRUE;
     }
     else {
-      $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
-      watchdog('boincimport',
+        $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
+        watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
         array('@ignored_uid' => $ignored_user_uid, '@uid' => $uid),
         WATCHDOG_WARNING
-      );
+        );
+    }
     }
-  }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully imported ignored users for user {$uid}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $uid;
     $message = "Failed to import any user filter preferences for user {$uid}!";
     watchdog('boincimport',
-      'Failed to import any user filter preferences for user @id!',
-      array('@id' => $uid), WATCHDOG_WARNING
+        'Failed to import any user filter preferences for user @id!',
+        array('@id' => $uid), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $uid;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $uid;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_preferences_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $total_warnings = count($results['warning']);
     $message = t(
-      'Successfully imported preferences for @count users (with @warn warnings)',
-      array('@count' => $total_imported, '@warn' => $total_warnings)
+        'Successfully imported preferences for @count users (with @warn warnings)',
+        array('@count' => $total_imported, '@warn' => $total_warnings)
     );
     watchdog('boincimport',
-      'Successfully imported preferences for @count users (with @warn warnings)',
-      array('@count' => $total_imported, '@warn' => $total_warnings),
-      WATCHDOG_INFO
+        'Successfully imported preferences for @count users (with @warn warnings)',
+        array('@count' => $total_imported, '@warn' => $total_warnings),
+        WATCHDOG_INFO
     );
     // Set the preference import successful flag in the variable table
     variable_set('boincimport_import_preferences_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'private messages';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1251,74 +1251,74 @@ 
  */
 function boincimport_private_msgs() {
   
-  // Check whether private messages have been successfully imported already
-  if (variable_get('boincimport_import_private_msg_successful', 0)) {
+    // Check whether private messages have been successfully imported already
+    if (variable_get('boincimport_import_private_msg_successful', 0)) {
     drupal_set_message(t('Private message import has already run successfully -- repeating this process could result in duplicate messages!'), 'warning');
     watchdog(
-      'boincimport', 'Private message import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Private message import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_private_msg_started', 0)) {
+    if (!variable_get('boincimport_import_private_msg_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_private_msg_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get stuff to import
-  db_set_active('boinc_rw');
-  $boinc_private_msgs = db_query('
+    // Get stuff to import
+    db_set_active('boinc_rw');
+    $boinc_private_msgs = db_query('
     SELECT id, subject, content, userid, senderid, date, opened
     FROM %sprivate_messages',
     $pre
-  );
-  $private_msg_count = mysqli_num_rows($boinc_private_msgs);
-  db_set_active('default');
+    );
+    $private_msg_count = mysqli_num_rows($boinc_private_msgs);
+    db_set_active('default');
 
-  if (!$private_msg_count) {
+    if (!$private_msg_count) {
     drupal_set_message(
-      t('There were no private messages found: Moving on...')
+        t('There were no private messages found: Moving on...')
     );
     watchdog('boincimport',
-      'There were no private messages found: Moving on...', array(), WATCHDOG_INFO
+        'There were no private messages found: Moving on...', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no private messages found: Moving on...');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count private messages: Beginning Import',
     array('%count' => $private_msg_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // We don't know if a given private message has been imported already or not;
-  // if this is needed, a relation table must be added to the Drupal DB
+    // We don't know if a given private message has been imported already or not;
+    // if this is needed, a relation table must be added to the Drupal DB
   
-  // Create batches to process
-  while ($boinc_private_msg = db_fetch_object($boinc_private_msgs)) {
+    // Create batches to process
+    while ($boinc_private_msg = db_fetch_object($boinc_private_msgs)) {
     $operations[] = array(
-      'boincimport_private_msgs_op', array(
+        'boincimport_private_msgs_op', array(
         $boinc_private_msg
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_private_msgs_finished',
     'title' => t('Importing private messages'),
     'init_message' => t('Beginning private message import...'),
     'progress_message' => t('Processed @current out of @total private messages.'),
     'error_message' => t('Private message import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1327,95 +1327,95 @@ 
  */
 function boincimport_private_msgs_op($pm, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  $uid = boincuser_lookup_uid($pm->userid);
-  $sender_uid = boincuser_lookup_uid($pm->senderid);
+    $uid = boincuser_lookup_uid($pm->userid);
+    $sender_uid = boincuser_lookup_uid($pm->senderid);
   
-  $pm->content = _boincimport_strip_bbcode($pm->content);
-  $pm->content = _boincimport_text_sanitize($pm->content);
+    $pm->content = _boincimport_strip_bbcode($pm->content);
+    $pm->content = _boincimport_text_sanitize($pm->content);
   
-  // First save the message
-  $message_added = db_query("
+    // First save the message
+    $message_added = db_query("
     INSERT INTO {pm_message} (subject, author, body, format, timestamp)
     VALUES ('%s', %d, '%s', %d, %d)",
     $pm->subject, $sender_uid, $pm->content, $input_format, $pm->date
-  );
-  $mid = db_last_insert_id('pm_message', 'mid');
+    );
+    $mid = db_last_insert_id('pm_message', 'mid');
   
-  // Then attach recipients and set status (note that threads are not a BOINC
-  // feature, so just consider every message to be a new thread)
-  $recipient_added = db_query("
+    // Then attach recipients and set status (note that threads are not a BOINC
+    // feature, so just consider every message to be a new thread)
+    $recipient_added = db_query("
     INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted)
     VALUES (%d, %d, %d, %d, 0)",
     $mid, $mid, $uid, !$pm->opened
-  );
-  // In Drupal, the sender should be attached as well
-  $sender_added = db_query("
+    );
+    // In Drupal, the sender should be attached as well
+    $sender_added = db_query("
     INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted)
     VALUES (%d, %d, %d, %d, 0)",
     $mid, $mid, $sender_uid, 0
-  );
+    );
   
-  $message = '';
-  if ($message_added AND $recipient_added AND $sender_added) {
+    $message = '';
+    if ($message_added AND $recipient_added AND $sender_added) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $pm->id;
     $message = "Failed to import private message {$pm->id}!";
     watchdog('boincimport',
-      'Failed to import private message @id!',
-      array('@id' => $pm->id), WATCHDOG_WARNING
+        'Failed to import private message @id!',
+        array('@id' => $pm->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_pm'] = $pm->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_pm'] = $pm->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_private_msgs_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count private messages',
-      array('@count' => $total_imported)
+        'Successfully imported @count private messages',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count private messages.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count private messages.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the private message import successful flag in the variable table
     variable_set('boincimport_import_private_msg_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'categories';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1428,196 +1428,196 @@ 
  */
 function boincimport_forum_categories() {
   
-  // Check whether forums have been successfully imported already
-  if (variable_get('boincimport_import_forum_category_successful', 0)) {
+    // Check whether forums have been successfully imported already
+    if (variable_get('boincimport_import_forum_category_successful', 0)) {
     drupal_set_message(t('Note: forum container import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: forum container import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: forum container import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_forum_category_started', 0)) {
+    if (!variable_get('boincimport_import_forum_category_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_forum_category_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Retrieve the vocabulary vid named "Forums"
-  //$forum_vid = variable_get('forum_nav_vocabulary', 0);
-  $forum_vid = db_result(db_query('
+    // Retrieve the vocabulary vid named "Forums"
+    //$forum_vid = variable_get('forum_nav_vocabulary', 0);
+    $forum_vid = db_result(db_query('
     SELECT vid FROM {vocabulary}
     WHERE name="%s"',
     'Forums'
-  ));
-  if (!$forum_vid) {
+    ));
+    if (!$forum_vid) {
     $forum_vocab = array(
-      'name' => t('Forums'),
-      'description' => t('The different forum categories / containers'),
+        'name' => t('Forums'),
+        'description' => t('The different forum categories / containers'),
     );
     taxonomy_save_vocabulary($forum_vocab);
     $forum_vid = db_result(db_query('
       SELECT vid FROM {vocabulary}
       WHERE name="%s"',
-      'Forums'
+        'Forums'
     ));
-  }
+    }
   
-  // Get both categories and forums from BOINC
-  db_set_active('boinc_rw');
-  $boinc_forum_categories = db_query('
+    // Get both categories and forums from BOINC
+    db_set_active('boinc_rw');
+    $boinc_forum_categories = db_query('
     SELECT id, name
     FROM %scategory
     ORDER BY orderID',
     $pre
-  );
-  $forum_category_count = mysqli_num_rows($boinc_forum_categories);
-  $boinc_forums = db_query('
+    );
+    $forum_category_count = mysqli_num_rows($boinc_forum_categories);
+    $boinc_forums = db_query('
     SELECT id, category, title, description, orderID
     FROM %sforum
     WHERE parent_type = 0
     ORDER BY category',
     $pre
-  );
-  $forum_count = mysqli_num_rows($boinc_forums);
-  db_set_active('default');
+    );
+    $forum_count = mysqli_num_rows($boinc_forums);
+    db_set_active('default');
 
-  if (!$forum_category_count) {
+    if (!$forum_category_count) {
     drupal_set_message(
-      t('There were no forum containers found: Aborting script'), 'warning'
+        t('There were no forum containers found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no forum containers found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no forum containers found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no forum containers found: Aborting script.');
-  }
-  if (!$forum_count) {
+    }
+    if (!$forum_count) {
     drupal_set_message(
-      t('There were no forums found: Aborting script'), 'warning'
+        t('There were no forums found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no forums found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no forums found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no forums found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %forum_count forums in %category_count containers: Beginning Import',
     array(
-      '%forum_count' => $forum_count,
-      '%category_count' => $forum_category_count,
+        '%forum_count' => $forum_count,
+        '%category_count' => $forum_category_count,
     ), WATCHDOG_INFO
-  );
-  
-  $operations = array();
-  $existing_categories = array();
-  $existing_forums = array();
-  $duplicate_categories = array();
-  $duplicate_forums = array();
-  $category_map = array();
-  
-  // Get the list of categories already in Drupal so as not to import any twice
-  $category_tree = taxonomy_get_tree($forum_vid, 0, -1, 1);
-  foreach ($category_tree as $term) {
+    );
+  
+    $operations = array();
+    $existing_categories = array();
+    $existing_forums = array();
+    $duplicate_categories = array();
+    $duplicate_forums = array();
+    $category_map = array();
+  
+    // Get the list of categories already in Drupal so as not to import any twice
+    $category_tree = taxonomy_get_tree($forum_vid, 0, -1, 1);
+    foreach ($category_tree as $term) {
     $existing_categories[] = $term->name;
-  }
+    }
   
-  // Get the list of forums already in Drupal
-  $result = db_query('
+    // Get the list of forums already in Drupal
+    $result = db_query('
     SELECT forum_id, tid FROM {boincimport_temp_forum}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_forums[$row->forum_id] = $row->tid;
-  }
+    }
   
-  // Create batches to process
+    // Create batches to process
   
-  // Set up the "hidden" category, if necessary
-  // This is to support automatic hiding of empty categories
-  $hidden_forum_tid = db_result(db_query('
+    // Set up the "hidden" category, if necessary
+    // This is to support automatic hiding of empty categories
+    $hidden_forum_tid = db_result(db_query('
     SELECT tid FROM {term_data}
     WHERE vid = %d
     AND name = "%s"',
     $forum_vid, 'Hidden'
-  ));
-  if (!$hidden_forum_tid) {
+    ));
+    if (!$hidden_forum_tid) {
     $operations[] = array(
-      'boincimport_forum_categories_op', array(
+        'boincimport_forum_categories_op', array(
         NULL, $forum_vid, $pre, TRUE
-      )
+        )
     );
-  }
+    }
   
-  // Import categories
-  while ($boinc_forum_category = db_fetch_object($boinc_forum_categories)) {
+    // Import categories
+    while ($boinc_forum_category = db_fetch_object($boinc_forum_categories)) {
     if (in_array($boinc_forum_category->name, $existing_categories)) {
-      // This category has already been imported
-      $duplicate_categories[] = $boinc_forum_category->name;
+        // This category has already been imported
+        $duplicate_categories[] = $boinc_forum_category->name;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_forum_categories_op', array(
-          $boinc_forum_category, $forum_vid, $pre, FALSE
+            $boinc_forum_category, $forum_vid, $pre, FALSE
         )
-      );
+        );
+    }
     }
-  }
   
-  // Import forums
-  while ($boinc_forum = db_fetch_object($boinc_forums)) {
-     if (isset($existing_forums[$boinc_forum->id])) {
-      // This forum has already been imported
-      $duplicates[] = $boinc_forum->id;
+    // Import forums
+    while ($boinc_forum = db_fetch_object($boinc_forums)) {
+        if (isset($existing_forums[$boinc_forum->id])) {
+        // This forum has already been imported
+        $duplicates[] = $boinc_forum->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_forums_op', array(
-          $boinc_forum, $forum_vid, $pre
+            $boinc_forum, $forum_vid, $pre
         )
-      );
+        );
+    }
     }
-  }
   
-  // Report any duplicates that were skipped
-  $skipped_message = array();
-  $categories_skipped = count($duplicate_categories);
-  $forums_skipped = count($duplicate_forums);
-  if ($categories_skipped) {
+    // Report any duplicates that were skipped
+    $skipped_message = array();
+    $categories_skipped = count($duplicate_categories);
+    $forums_skipped = count($duplicate_forums);
+    if ($categories_skipped) {
     $skipped_message[] = format_plural(
-      $categories_skipped,
-      '1 container',
-      '@count containers'
+        $categories_skipped,
+        '1 container',
+        '@count containers'
     );
-  }
-  if ($forums_skipped) {
+    }
+    if ($forums_skipped) {
     $skipped_message[] = format_plural(
-      $forums_skipped,
-      '1 forum',
-      '@count forums'
+        $forums_skipped,
+        '1 forum',
+        '@count forums'
     );
-  }
-  if ($skipped_message) {
+    }
+    if ($skipped_message) {
     drupal_set_message(t('Skipped @forums that were already imported',
-      array('@forums' => implode(' and ', $skipped_message))
+        array('@forums' => implode(' and ', $skipped_message))
     ));
-  }
+    }
   
-  // Create and run the batch
-  $batch = array(
+    // Create and run the batch
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_forums_finished',
     'title' => t('Importing forums'),
     'init_message' => t('Beginning forum import...'),
     'progress_message' => t('Processed @current out of @total forums.'),
     'error_message' => t('Forum import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1626,92 +1626,92 @@ 
  */
 function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hidden, &$context) {
   
-  // Set term parameters for categories
-  $forum_id = 0;
-  $parent_id = 0;
-  $description = '';
-  $weight = 0;
-  $hidden = FALSE;
+    // Set term parameters for categories
+    $forum_id = 0;
+    $parent_id = 0;
+    $description = '';
+    $weight = 0;
+    $hidden = FALSE;
   
-  $category_map = variable_get('boincimport_forum_category_map', array());
+    $category_map = variable_get('boincimport_forum_category_map', array());
   
-  if (!$category AND $create_hidden) {
+    if (!$category AND $create_hidden) {
     // Create the special "hidden" container
     $category = new stdClass();
     $category->name = 'Hidden';
     $category->id = 0;
     $hidden = TRUE;
-  }
-  else {
+    }
+    else {
     // If this container is empty, put it into the hidden container
     db_set_active('boinc_rw');
     $forums_contained = db_result(db_query('
       SELECT count(*) FROM %sforum
       WHERE parent_type = 0
       AND category = %d',
-      $pre, $category->id));
+        $pre, $category->id));
     db_set_active('default');
     if (!$forums_contained) {
-      $parent_id = $category_map[0];
-      $hidden = TRUE;
+        $parent_id = $category_map[0];
+        $hidden = TRUE;
+    }
     }
-  }
   
-  $forum = array(
+    $forum = array(
     'name' => $category->name,
     'vid' => $forum_vid,
     'description' => $description,
     'parent' => $parent_id,
     'weight' => $weight,
-  );
-  $forum['description'] = strip_tags($forum['description']);
+    );
+    $forum['description'] = strip_tags($forum['description']);
 
-  taxonomy_save_term($forum);
-  $success = isset($forum['tid']);
+    taxonomy_save_term($forum);
+    $success = isset($forum['tid']);
   
-  // Serialize the forum containers
-  $containers = variable_get('forum_containers', array());
-  $containers[] = $forum['tid'];
-  variable_set('forum_containers', $containers);
+    // Serialize the forum containers
+    $containers = variable_get('forum_containers', array());
+    $containers[] = $forum['tid'];
+    variable_set('forum_containers', $containers);
   
-  // Note the taxonomy ID for mapping forums to categories
-  $category_map[$category->id] = $forum['tid'];
-  variable_set('boincimport_forum_category_map', $category_map);
+    // Note the taxonomy ID for mapping forums to categories
+    $category_map[$category->id] = $forum['tid'];
+    variable_set('boincimport_forum_category_map', $category_map);
   
-  boincimport_forum_set_permissions($forum, $hidden);
+    boincimport_forum_set_permissions($forum, $hidden);
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
-      $message = "Created special hidden container";
+        $message = "Created special hidden container";
     }
     else {
-      $context['results']['categories']['success'][] = $category->id;
-      $message = "Successfully imported container {$category->id}";
+        $context['results']['categories']['success'][] = $category->id;
+        $message = "Successfully imported container {$category->id}";
     }
-  }
-  else {
+    }
+    else {
     $context['results']['categories']['failure'][] = $category->id;
     $message = "Failed to import container {$category->id}!";
     watchdog('boincimport',
-      'Failed to import container @id!',
-      array('@id' => $category->id), WATCHDOG_WARNING
+        'Failed to import container @id!',
+        array('@id' => $category->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_category'] = $category->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_category'] = $category->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
@@ -1720,40 +1720,40 @@ 
  */
 function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
   
-  $hidden_forum = FALSE;
-  $open_forum = FALSE;
-  $category_map = variable_get('boincimport_forum_category_map', array());
-  
-  // Set term parameters for forums
-  $forum_id = $boincforum->id;
-  $parent_id = isset($category_map[$boincforum->category]) ? $category_map[$boincforum->category] : $category_map[0];
-  $name = $boincforum->title;
-  $description = $boincforum->description;
-  $weight = $boincforum->orderID;
-  if ($parent_id == $category_map[0]) {
+    $hidden_forum = FALSE;
+    $open_forum = FALSE;
+    $category_map = variable_get('boincimport_forum_category_map', array());
+  
+    // Set term parameters for forums
+    $forum_id = $boincforum->id;
+    $parent_id = isset($category_map[$boincforum->category]) ? $category_map[$boincforum->category] : $category_map[0];
+    $name = $boincforum->title;
+    $description = $boincforum->description;
+    $weight = $boincforum->orderID;
+    if ($parent_id == $category_map[0]) {
     // If this forum is hidden, flag for appropriate access controls
     $hidden_forum = TRUE;
-  }
-  if ($name == 'Getting Started') {
+    }
+    if ($name == 'Getting Started') {
     // Must allow users to post in this forum even if they have no credit!
     $open_forum = TRUE;
-  }
+    }
   
-  // Try to detect a BOINC news forum and flag it so that news can be
-  // imported into a Drupal news content type later
-  if ($name == 'News') {
+    // Try to detect a BOINC news forum and flag it so that news can be
+    // imported into a Drupal news content type later
+    if ($name == 'News') {
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
     $success = TRUE;
-  }
-  else {
+    }
+    else {
     // Save all other forums as taxonomy terms
     $forum = array(
-      'name' => $name,
-      'vid' => $forum_vid,
-      'description' => $description,
-      'parent' => $parent_id,
-      'weight' => $weight,
+        'name' => $name,
+        'vid' => $forum_vid,
+        'description' => $description,
+        'parent' => $parent_id,
+        'weight' => $weight,
     );
     $forum['description'] = strip_tags($forum['description']);
 
@@ -1765,31 +1765,31 @@ 
     
     // Set access controls
     boincimport_forum_set_permissions($forum, $hidden_forum, $open_forum);
-  }
+    }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['forums']['success'][] = $forum_id;
     $message = "Successfully imported forum {$forum_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['forums']['failure'][] = $forum_id;
     $message = "Failed to import forum {$forum_id}!";
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_forum'] = $forum_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_forum'] = $forum_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
@@ -1797,46 +1797,46 @@ 
  */
 function boincimport_forum_set_permissions($forum, $hidden = FALSE, $open = FALSE) {
   
-  // Set access controls
-  $forum_perms = array();
-  $role_map = array_flip(user_roles());
-  $forum_perms[$role_map['anonymous user']] = array(
+    // Set access controls
+    $forum_perms = array();
+    $role_map = array_flip(user_roles());
+    $forum_perms[$role_map['anonymous user']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
-  );
-  $forum_perms[$role_map['authenticated user']] = array(
+    );
+    $forum_perms[$role_map['authenticated user']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
-  );
-  $forum_perms[$role_map['community member']] = array(
+    );
+    $forum_perms[$role_map['community member']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => (int) $open,
-  );
-  $forum_perms[$role_map['verified contributor']] = array(
+    );
+    $forum_perms[$role_map['verified contributor']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => (int) !$hidden,
-  );
-  $forum_perms[$role_map['moderator']] = array(
+    );
+    $forum_perms[$role_map['moderator']] = array(
     'view' => (int) !$hidden,
     'update' => (int) !$hidden,
     'delete' => 0,
     'create' => (int) !$hidden,
-  );
-  $forum_perms[$role_map['administrator']] = array(
+    );
+    $forum_perms[$role_map['administrator']] = array(
     'view' => 1,
     'update' => 1,
     'delete' => 1,
     'create' => 1,
-  );
-  foreach ($forum_perms as $role => $perm) {
+    );
+    foreach ($forum_perms as $role => $perm) {
     db_query('
       INSERT INTO {forum_access}
       SET  tid = %d, rid = %d,
@@ -1845,61 +1845,61 @@ 
       ON DUPLICATE KEY UPDATE
         grant_view = %d, grant_update = %d,
         grant_delete = %d, grant_create = %d',
-      $forum['tid'], $role,
-      $perm['view'], $perm['update'],
-      $perm['delete'], $perm['create'],
-      $perm['view'], $perm['update'],
-      $perm['delete'], $perm['create']);
-  }
+        $forum['tid'], $role,
+        $perm['view'], $perm['update'],
+        $perm['delete'], $perm['create'],
+        $perm['view'], $perm['update'],
+        $perm['delete'], $perm['create']);
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_forums_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $categories_imported = count($results['categories']['success']);
     $forums_imported = count($results['forums']['success']);
     
     $success_message = array();
     if ($categories_imported) {
-      $success_message[] = format_plural(
+        $success_message[] = format_plural(
         $categories_imported,
         '1 container',
         '@count containers'
-      );
+        );
     }
     if ($forums_imported) {
-      $success_message[] = format_plural(
+        $success_message[] = format_plural(
         $forums_imported,
         '1 forum',
         '@count forums'
-      );
+        );
     }
     $message = t(
-      'Successfully imported @forums',
-      array('@forums' => implode(' and ', $success_message))
+        'Successfully imported @forums',
+        array('@forums' => implode(' and ', $success_message))
     );
     watchdog('boincimport',
-      'Successfully imported @forums',
-      array('@forums' => implode(' and ', $success_message)), WATCHDOG_INFO
+        'Successfully imported @forums',
+        array('@forums' => implode(' and ', $success_message)), WATCHDOG_INFO
     ); 
     // Set the forum import successful flag in the variable table
     variable_set('boincimport_import_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'topics';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1911,82 +1911,82 @@ 
  */
 function boincimport_forum_topics() {
   
-  // Check whether topics have been successfully imported already
-  if (variable_get('boincimport_import_topic_successful', 0)) {
+    // Check whether topics have been successfully imported already
+    if (variable_get('boincimport_import_topic_successful', 0)) {
     drupal_set_message(t('Topic import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Topic import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Topic import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_topic_started', 0)) {
+    if (!variable_get('boincimport_import_topic_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_topic_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get the count of non-team topics to import
-  db_set_active('boinc_rw');
-  $topic_count = db_result(db_query('
+    // Get the count of non-team topics to import
+    db_set_active('boinc_rw');
+    $topic_count = db_result(db_query('
     SELECT COUNT(DISTINCT t.id)
     FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 0',
     $pre, $pre, $pre
-  ));
-  db_set_active('default');
+    ));
+    db_set_active('default');
 
-  if (!$topic_count) {
+    if (!$topic_count) {
     drupal_set_message(
-      t('There were no topics found: Aborting script'), 'warning'
+        t('There were no topics found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no topics found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no topics found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no topics found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count topics: Beginning Import',
     array('%count' => $topic_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $batch_size = 100;
+    $operations = array();
+    $batch_size = 100;
   
-  // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+    // Create batches to process
+    for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
-      $topics_per_batch = $topic_count - $offset;
+        $topics_per_batch = $topic_count - $offset;
     }
     $operations[] = array(
-      'boincimport_topics_op', array(
+        'boincimport_topics_op', array(
         $offset, $topics_per_batch, $pre
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_topics_finished',
     'title' => t('Importing topics'),
     'init_message' => t('Beginning topic import...'),
     'progress_message' => t('Processed @current out of @total batches (@size topics per batch).', array(
-      '@size' => $batch_size,
+        '@size' => $batch_size,
     )),
     'error_message' => t('Topic import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1994,18 +1994,18 @@ 
  * Create a Drupal node from the given BOINC topic object
  */
 function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $news_forum_id = variable_get('boincimport_news_forum_id', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
+    $news_forum_id = variable_get('boincimport_news_forum_id', 0);
   
-  // Get the topic to import
-  db_set_active('boinc_rw');
-  $topics = db_query('
+    // Get the topic to import
+    db_set_active('boinc_rw');
+    $topics = db_query('
     SELECT DISTINCT t.id, t.title, t.owner, t.forum, t.locked, t.hidden,
         t.sticky, t.timestamp, t.create_time
     FROM %sthread t
@@ -2015,10 +2015,10 @@ 
     ORDER BY t.id ASC
     LIMIT %d,%d',
     $pre, $pre, $pre, $offset, $batch_size
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  while ($topic = db_fetch_object($topics)) {
+    while ($topic = db_fetch_object($topics)) {
     
     $error_detail = '';
     
@@ -2031,52 +2031,52 @@ 
       WHERE thread = %d
       ORDER BY timestamp ASC
       LIMIT 1',
-      $pre, $topic->id
+        $pre, $topic->id
     ));
     db_set_active('default');
       
     $duplicate = db_result(db_query('
       SELECT COUNT(*) FROM {boincimport_temp_topic}
       WHERE topic_id = %d',
-      $topic->id
+        $topic->id
     ));
     
     if ($duplicate OR !$post) {
-      $success = FALSE;
+        $success = FALSE;
     }
     
     else {
-      // Get the user and term IDs along with other data to define the topic
-      $uid = boincuser_lookup_uid($topic->owner);
-      $tid = db_result(db_query('
+        // Get the user and term IDs along with other data to define the topic
+        $uid = boincuser_lookup_uid($topic->owner);
+        $tid = db_result(db_query('
         SELECT tid FROM {boincimport_temp_forum}
         WHERE forum_id = %d',
         $topic->forum
-      ));
-      if (!$topic->owner) {
+        ));
+        if (!$topic->owner) {
         $uid = 0;
-      }
+        }
       
-      $node_type = 'forum';
-      $promote = 0;
-      $comment = ($topic->locked) ? 1 : 2;
+        $node_type = 'forum';
+        $promote = 0;
+        $comment = ($topic->locked) ? 1 : 2;
       
-      $post->content = _boincimport_strip_bbcode($post->content);
-      $post->content = _boincimport_text_sanitize($post->content);
-      $teaser = node_teaser($post->content);
+        $post->content = _boincimport_strip_bbcode($post->content);
+        $post->content = _boincimport_text_sanitize($post->content);
+        $teaser = node_teaser($post->content);
       
-      if ($topic->timestamp < $topic->create_time) {
+        if ($topic->timestamp < $topic->create_time) {
         $topic->timestamp = $topic->create_time;
-      }
+        }
       
-      // If dealing with a News topic, be sure it is imported as such
-      if ($news_forum_id AND $topic->forum == $news_forum_id) {
+        // If dealing with a News topic, be sure it is imported as such
+        if ($news_forum_id AND $topic->forum == $news_forum_id) {
         $node_type = 'news';
         $promote = 1;
-      }
+        }
 
-      // Construct the thread as a forum topic node
-      $node = array(
+        // Construct the thread as a forum topic node
+        $node = array(
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
@@ -2090,61 +2090,61 @@ 
         'sticky' => $topic->sticky,
         'format' => $input_format,
         'teaser' => $teaser,
-      );
-      $node['tid'] = $tid;
+        );
+        $node['tid'] = $tid;
       
-      // Save the topic node
-      $node = (object) $node; // node_save requires an object form
-      node_save($node);
-      taxonomy_node_save($node, array($tid));
-      $success = ($node->nid) ? TRUE : FALSE;
-      if ($success) {
+        // Save the topic node
+        $node = (object) $node; // node_save requires an object form
+        node_save($node);
+        taxonomy_node_save($node, array($tid));
+        $success = ($node->nid) ? TRUE : FALSE;
+        if ($success) {
         $success = db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
           VALUES (%d, %d, %d)', $topic->id, $post->id, $node->nid
         );
         if ($success) {
-          // Hack to keep the topics in correct order
-          $success = db_query('UPDATE {node_comment_statistics} SET last_comment_timestamp = %d WHERE nid = %d', $node->created, $node->nid);
-          if (!$success) {
+            // Hack to keep the topics in correct order
+            $success = db_query('UPDATE {node_comment_statistics} SET last_comment_timestamp = %d WHERE nid = %d', $node->created, $node->nid);
+            if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
-          }
+            }
         }
         else {
-          $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
+            $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+        }
+        else {
         $error_detail = 'failed to save topic node to database';
-      }
+        }
     }
     
     // See if the import worked
     $message = '';
     if ($success) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['success'][] = $topic->id;
-      $message = "Successfully imported topic {$topic->id}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['success'][] = $topic->id;
+        $message = "Successfully imported topic {$topic->id}";
     }
     elseif ($duplicate) {
-      $context['results']['duplicate'][] = $topic->id;
-      $message = "Topic {$topic->id} was already imported";
+        $context['results']['duplicate'][] = $topic->id;
+        $message = "Topic {$topic->id} was already imported";
     }
     elseif (!$post) {
-      $context['results']['empty'][] = $topic->id;
-      $message = "Skipping topic {$topic->id} as empty";
+        $context['results']['empty'][] = $topic->id;
+        $message = "Skipping topic {$topic->id} as empty";
     }
     else {
-      $context['results']['failure'][] = $topic->id;
-      $message = "Failed to import topic {$topic->id}!";
-      watchdog('boincimport',
+        $context['results']['failure'][] = $topic->id;
+        $message = "Failed to import topic {$topic->id}!";
+        watchdog('boincimport',
         'Failed to import topic @id! (@error)',
         array(
-          '@id' => $topic->id,
-          '@error' => $error_detail,
+            '@id' => $topic->id,
+            '@error' => $error_detail,
         ),
         WATCHDOG_WARNING
-      ); 
+        ); 
     }
     
     // Update our progress information.
@@ -2154,54 +2154,54 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_topics_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $duplicates = count($results['duplicate']);
     $empty_topics = count($results['empty']);
     $message = t(
-      'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics)',
-      array(
+        'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics)',
+        array(
         '@count' => $total_imported,
         '@duplicates' => $duplicates,
         '@abandoned' => $empty_topics,
-      )
+        )
     );
     watchdog('boincimport',
-      'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics).',
-      array(
+        'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics).',
+        array(
         '@count' => $total_imported,
         '@duplicates' => $duplicates,
         '@abandoned' => $empty_topics,
-      ), WATCHDOG_INFO
+        ), WATCHDOG_INFO
     ); 
     // Set the topic import successful flag in the variable table
     variable_set('boincimport_import_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'posts';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -2214,91 +2214,91 @@ 
  */
 function boincimport_forum_posts() {
   
-  // Check whether forum posts have been successfully imported already
-  if (variable_get('boincimport_import_post_successful', 0)) {
+    // Check whether forum posts have been successfully imported already
+    if (variable_get('boincimport_import_post_successful', 0)) {
     drupal_set_message(t('Forum post import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Forum post import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Forum post import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_post_started', 0)) {
+    if (!variable_get('boincimport_import_post_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_post_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get the BOINC threads and get a count of posts to import
-  db_set_active('boinc_rw');
-  $topic_count = db_result(db_query("
+    // Get the BOINC threads and get a count of posts to import
+    db_set_active('boinc_rw');
+    $topic_count = db_result(db_query("
     SELECT COUNT(DISTINCT t.id) FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 0", $pre, $pre, $pre
-  ));
-  $total_post_count = db_result(db_query("
+    ));
+    $total_post_count = db_result(db_query("
     SELECT COUNT(p.id) FROM %spost p
     JOIN %sthread t ON t.id = p.thread
     JOIN %sforum f ON f.id = t.forum
     WHERE f.parent_type = 0", $pre, $pre, $pre
-  ));
-  $post_count = $total_post_count - $topic_count;
-  db_set_active('default');
+    ));
+    $post_count = $total_post_count - $topic_count;
+    db_set_active('default');
 
-  if ($post_count <= 0) {
+    if ($post_count <= 0) {
     drupal_set_message(
-      t('There were no posts found: Aborting script'), 'warning'
+        t('There were no posts found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no posts found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no posts found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no posts found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count posts: Beginning Import',
     array('%count' => $post_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $batch_size = 100;
+    $operations = array();
+    $batch_size = 100;
   
-  // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+    // Create batches to process
+    for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
-      $topics_per_batch = $topic_count - $offset;
+        $topics_per_batch = $topic_count - $offset;
     }
     $operations[] = array(
-      'boincimport_posts_op', array(
+        'boincimport_posts_op', array(
         $offset, $topics_per_batch
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_posts_finished',
     'title' => t('Importing posts'),
     'init_message' => t('Beginning post import...'),
     'progress_message' => t(
-      'Processed posts in @current out of @total batches (@size topics per batch).',
-      array(
+        'Processed posts in @current out of @total batches (@size topics per batch).',
+        array(
         '@size' => $batch_size,
         // @current and @total are managed by the batch API
-      )
+        )
     ),
     'error_message' => t('Post import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -2306,17 +2306,17 @@ 
  * Create a Drupal comment from the given BOINC post object
  */
 function boincimport_posts_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
- // Get the topics with posts to import
-  db_set_active('boinc_rw');
-  $boinc_topic_ids = db_query('
+    // Get the topics with posts to import
+    db_set_active('boinc_rw');
+    $boinc_topic_ids = db_query('
     SELECT DISTINCT t.id FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
@@ -2324,10 +2324,10 @@ 
     ORDER BY t.id
     LIMIT %d,%d', 
     $pre, $pre, $pre, $offset, $batch_size
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  while ($boinc_topic = db_fetch_object($boinc_topic_ids)) {
+    while ($boinc_topic = db_fetch_object($boinc_topic_ids)) {
     // Get the posts in this topic
     db_set_active('boinc_rw');
     $boinc_posts = db_query('
@@ -2345,29 +2345,29 @@ 
 
     while ($post = db_fetch_object($boinc_posts)) {
       
-      // Skip the first post as it has already been imported as a topic
-      if ($first_post) {
+        // Skip the first post as it has already been imported as a topic
+        if ($first_post) {
         $first_post = false;
         continue;
-      }
+        }
       
-      // Making it this far confirms that there are posts to import
-      $topic_has_responses = TRUE;
+        // Making it this far confirms that there are posts to import
+        $topic_has_responses = TRUE;
       
-      $is_duplicate = db_result(db_query('
+        $is_duplicate = db_result(db_query('
         SELECT COUNT(*) FROM {boincimport_temp_post}
         WHERE post_id = %d',
         $post->id
-      ));
-      if ($is_duplicate) {
+        ));
+        if ($is_duplicate) {
         // This post has already been imported
         $context['results']['posts']['duplicate'][] = $post->id;
         $duplicate_posts++;
         continue;
-      }
+        }
       
-      // Make sure the post is valid
-      if ($post->content) {
+        // Make sure the post is valid
+        if ($post->content) {
         
         // Get user, node, and parent IDs for the post and sanitize
         $uid = boincuser_lookup_uid($post->user);
@@ -2376,14 +2376,14 @@ 
           FROM {boincimport_temp_topic} btt
           LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid
           WHERE btt.topic_id = %d',
-          $post->thread
+            $post->thread
         ));
         $nid = $node->nid;
         $pid = db_result(db_query('
           SELECT cid
           FROM {boincimport_temp_post}
           WHERE post_id = %d',
-          $post->parent_post));
+            $post->parent_post));
         if (is_null($pid)) $pid = 0;
         if (!$uid) $uid = 0;
         
@@ -2394,85 +2394,85 @@ 
           SELECT COUNT(*)
           FROM {comments}
           WHERE nid = %d',
-          $nid
+            $nid
         ));
         $post_reply = $pid;
         
         if ($post_reply OR $topic_reply) {
-          // Create a subject for the post from the post content. The body may be in 
-          // any format, so we:
-          //  1) Filter it into HTML
-          //  2) Strip out all HTML tags
-          //  3) Convert entities back to plain-text.
-          // Note: format is checked by check_markup().
-          $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
-          // Replace "Quote:" with "RE:"
-          $subject = str_replace('Quote:', 'RE: ', $subject);
-          // Fringe cases where the comment body is populated only by HTML tags
-          // will require a default subject...
-          if ($subject === '')
+            // Create a subject for the post from the post content. The body may be in 
+            // any format, so we:
+            //  1) Filter it into HTML
+            //  2) Strip out all HTML tags
+            //  3) Convert entities back to plain-text.
+            // Note: format is checked by check_markup().
+            $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
+            // Replace "Quote:" with "RE:"
+            $subject = str_replace('Quote:', 'RE: ', $subject);
+            // Fringe cases where the comment body is populated only by HTML tags
+            // will require a default subject...
+            if ($subject === '')
             $subject = "RE: {$node->title}";
         } else {
-          // This is the first post in the topic
-          $subject = $node->title;
+            // This is the first post in the topic
+            $subject = $node->title;
         }
         
         // Construct the post as a Drupal comment
         $comment = array(
-          'pid' => $pid,
-          'nid' => $nid,
-          'uid' => $uid,
-          'subject' => $subject,
-          'comment' => $post->content,
-          'timestamp' => $post->timestamp,
-          'status' => $post->hidden,
-          'format' => $input_format
+            'pid' => $pid,
+            'nid' => $nid,
+            'uid' => $uid,
+            'subject' => $subject,
+            'comment' => $post->content,
+            'timestamp' => $post->timestamp,
+            'status' => $post->hidden,
+            'format' => $input_format
         );
         
         // Save the comment
         if (boincimport_forum_comment_save($comment)) {
-          $success = db_query('
+            $success = db_query('
             INSERT INTO {boincimport_temp_post} (post_id, cid)
             VALUES (%d, %d)',
             $post->id, $comment['cid']
-          );
-          if ($success) {
+            );
+            if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+            }
+            else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
-          }
+            }
         }
         else {
-          $context['results']['posts']['failure'][] = $post->id;
-          $error_posts++;
+            $context['results']['posts']['failure'][] = $post->id;
+            $error_posts++;
+        }
         }
-      }
-      else {
+        else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
-      }
+        }
     }
     
     $message = '';
     if ($success OR !$topic_has_responses) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['success'][] = $boinc_topic->id;
-      $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['success'][] = $boinc_topic->id;
+        $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
     }
     else {
-      $context['results']['failure'][] = $boinc_topic->id;
-      $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
-      watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
+        $context['results']['failure'][] = $boinc_topic->id;
+        $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
+        watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
         array(
-          '@id' => $boinc_topic->id,
-          '@error_posts' => $error_posts,
-          '@duplicate_posts' => $duplicate_posts,
-          '@empty_posts' => $empty_posts,
+            '@id' => $boinc_topic->id,
+            '@error_posts' => $error_posts,
+            '@duplicate_posts' => $duplicate_posts,
+            '@empty_posts' => $empty_posts,
         ), WATCHDOG_WARNING
-      ); 
+        ); 
     }
     
     // Update our progress information.
@@ -2482,19 +2482,19 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_posts_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $posts_imported = count($results['posts']['success']);
     $topic_count = count($results['success']);
@@ -2503,39 +2503,39 @@ 
     $empty_posts = count($results['posts']['empty']);
     $failed_posts = count($results['posts']['failure']);
     $message = t(
-      'Successfully imported @post_count posts in @topic_count topics ' .
-      '(@skipped topics either had no replies or all replies were already imported, ' .
-      '@duplicates posts were skipped as already imported, ' .
-      '@empty_posts had no content, ' .
-      'and @error_posts encountered errors during import)',
-      array(
+        'Successfully imported @post_count posts in @topic_count topics ' .
+        '(@skipped topics either had no replies or all replies were already imported, ' .
+        '@duplicates posts were skipped as already imported, ' .
+        '@empty_posts had no content, ' .
+        'and @error_posts encountered errors during import)',
+        array(
         '@post_count' => $posts_imported,
         '@topic_count' => $topic_count,
         '@skipped' => $topics_skipped,
         '@duplicates' => $duplicates,
         '@empty_posts' => $empty_posts,
         '@error_posts' => $failed_posts,
-      )
+        )
     );
     watchdog('boincimport',
-      $message,
-      array(), WATCHDOG_INFO
+        $message,
+        array(), WATCHDOG_INFO
     ); 
     // Set the post import successful flag in the variable table
     variable_set('boincimport_import_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team forums';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -2548,97 +2548,97 @@ 
  */
 function boincimport_team_forums() {
   
-  // Check whether team forums have been successfully imported already
-  if (variable_get('boincimport_import_team_forum_successful', 0)) {
+    // Check whether team forums have been successfully imported already
+    if (variable_get('boincimport_import_team_forum_successful', 0)) {
     drupal_set_message(t('Team forum import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Team forum import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Team forum import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_forum_started', 0)) {
+    if (!variable_get('boincimport_import_team_forum_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_forum_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get team forums from BOINC database
-  db_set_active('boinc_rw');
-  $boincteam_forums = db_query('
+    // Get team forums from BOINC database
+    db_set_active('boinc_rw');
+    $boincteam_forums = db_query('
     SELECT id, title, description, category, timestamp, post_min_interval,
       post_min_total_credit, post_min_expavg_credit
     FROM %sforum
     WHERE parent_type = 1
     ORDER BY id ASC',
     $pre
-  );
-  $team_forum_count = mysqli_num_rows($boincteam_forums);
-  db_set_active('default');
+    );
+    $team_forum_count = mysqli_num_rows($boincteam_forums);
+    db_set_active('default');
 
-  if (!$team_forum_count) {
+    if (!$team_forum_count) {
     drupal_set_message(
-      t('There were no team forums found: Aborting script'), 'warning'
+        t('There were no team forums found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no team forums found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no team forums found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no BLAH found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count team forums: Beginning Import',
     array('%count' => $team_forum_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_team_forums = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_team_forums = array();
+    $duplicates = array();
   
-  // Get the list of team forums already in Drupal to be sure we're not
-  // importing any twice
-  $result = db_query('
+    // Get the list of team forums already in Drupal to be sure we're not
+    // importing any twice
+    $result = db_query('
     SELECT nid, boinc_id FROM {boincteam_forum}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_team_forums[$row->boinc_id] = $row->nid;
-  }
+    }
   
-  // Create batches to process
-  while ($boincteam_forum = db_fetch_object($boincteam_forums)) {
-     if (isset($existing_team_forums[$boincteam_forum->id])) {
-      // This team has already been imported
-      $duplicates[] = $boincteam_forum->id;
+    // Create batches to process
+    while ($boincteam_forum = db_fetch_object($boincteam_forums)) {
+        if (isset($existing_team_forums[$boincteam_forum->id])) {
+        // This team has already been imported
+        $duplicates[] = $boincteam_forum->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_team_forums_op', array(
-          $boincteam_forum
+            $boincteam_forum
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count team forums that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count team forums that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_team_forums_finished',
     'title' => t('Importing team forums'),
     'init_message' => t('Beginning team forum import...'),
     'progress_message' => t('Processed @current out of @total team forums.'),
     'error_message' => t('Team forum import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -2648,15 +2648,15 @@ 
  */
 function boincimport_team_forums_op($boincteam_forum, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  // Set term parameters for forums
-  $forum_id = $boincteam_forum->id;
-  $team_id = boincteam_lookup_nid($boincteam_forum->category);
-  $name = $boincteam_forum->title;
-  $description = strip_tags($boincteam_forum->description);
+    // Set term parameters for forums
+    $forum_id = $boincteam_forum->id;
+    $team_id = boincteam_lookup_nid($boincteam_forum->category);
+    $name = $boincteam_forum->title;
+    $description = strip_tags($boincteam_forum->description);
   
-  $success = db_query("
+    $success = db_query("
     INSERT INTO {boincteam_forum} SET 
       boinc_id = %d,
       nid = %d,
@@ -2672,67 +2672,67 @@ 
     time(), 0, $boincteam_forum->post_min_interval, 
     $boincteam_forum->post_min_total_credit,
     $boincteam_forum->post_min_expavg_credit
-  );
+    );
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $forum_id;
     $message = "Successfully imported team forum {$forum_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $forum_id;
     $message = "Failed to import team forum {$forum_id}!";
     watchdog('boincimport',
-      'Failed to import team forum @id!',
-      array('@id' => $forum_id), WATCHDOG_WARNING
+        'Failed to import team forum @id!',
+        array('@id' => $forum_id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_forum'] = $forum_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_forum'] = $forum_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_team_forums_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count team forums',
-      array('@count' => $total_imported)
+        'Successfully imported @count team forums',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count team forums.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count team forums.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the team forum import successful flag in the variable table
     variable_set('boincimport_import_team_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team topics';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -2745,25 +2745,25 @@ 
  */
 function boincimport_team_forum_topics() {
   
-  // Check whether team forum topics have been successfully imported already
-  if (variable_get('boincimport_import_team_topic_successful', 0)) {
+    // Check whether team forum topics have been successfully imported already
+    if (variable_get('boincimport_import_team_topic_successful', 0)) {
     drupal_set_message(t('Team topic import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Team topic import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Team topic import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_topic_started', 0)) {
+    if (!variable_get('boincimport_import_team_topic_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_topic_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get all team topics to import from BOINC
-  db_set_active('boinc_rw');
-  $boincteam_topics = db_query('
+    // Get all team topics to import from BOINC
+    db_set_active('boinc_rw');
+    $boincteam_topics = db_query('
     SELECT DISTINCT t.id, t.title, t.owner, t.forum, t.locked, t.hidden,
       t.sticky, t.timestamp, t.create_time
     FROM %sthread t
@@ -2772,78 +2772,78 @@ 
     WHERE f.parent_type = 1
     ORDER BY id',
     $pre, $pre, $pre
-  );
-  $boincteam_topic_count = mysqli_num_rows($boincteam_topics);
-  $total_team_topic_count = db_result(db_query('
+    );
+    $boincteam_topic_count = mysqli_num_rows($boincteam_topics);
+    $total_team_topic_count = db_result(db_query('
     SELECT COUNT(*) FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     WHERE f.parent_type = 1', $pre, $pre
-  ));
-  $empty_topic_count = $total_team_topic_count - $boincteam_topic_count;
-  db_set_active('default');
+    ));
+    $empty_topic_count = $total_team_topic_count - $boincteam_topic_count;
+    db_set_active('default');
 
-  if (!$boincteam_topic_count) {
+    if (!$boincteam_topic_count) {
     drupal_set_message(
-      t('There were no team topics found: Aborting script'), 'warning'
+        t('There were no team topics found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no team topics found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no team topics found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no team topics found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count team topics: Beginning Import',
     array('%count' => $boincteam_topic_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_team_topics = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_team_topics = array();
+    $duplicates = array();
   
-  // Get the list of team topics already in Drupal to be sure we're not
-  // importing any twice
-  $result = db_query('
+    // Get the list of team topics already in Drupal to be sure we're not
+    // importing any twice
+    $result = db_query('
     SELECT nid, topic_id FROM {boincimport_temp_topic}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_team_topics[$row->topic_id] = $row->nid;
-  }
+    }
   
-  // Create batches to process
-  while ($boincteam_topic = db_fetch_object($boincteam_topics)) {
-     if (isset($existing_team_topics[$boincteam_topic->id])) {
-      // This team topic has already been imported
-      $duplicates[] = $boincteam_topic->id;
+    // Create batches to process
+    while ($boincteam_topic = db_fetch_object($boincteam_topics)) {
+        if (isset($existing_team_topics[$boincteam_topic->id])) {
+        // This team topic has already been imported
+        $duplicates[] = $boincteam_topic->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_team_topics_op', array(
-          $boincteam_topic
+            $boincteam_topic
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count team topics that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count team topics that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_team_topics_finished',
     'title' => t('Importing team topics'),
     'init_message' => t('Beginning team topic import...'),
     'progress_message' => t('Processed @current out of @total team topics.'),
     'error_message' => t('Team topic import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -2852,21 +2852,21 @@ 
  */
 function boincimport_team_topics_op($topic, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
-  $missing_parent = array();
-  $empty_topics = array();
+    $input_format = variable_get('boincimport_input_format', 0);
+    $success = FALSE;
+    $missing_parent = array();
+    $empty_topics = array();
   
-  // Verify that the team forum container has been imported
-  $team_forum_id = db_result(db_query("
+    // Verify that the team forum container has been imported
+    $team_forum_id = db_result(db_query("
     SELECT tfid FROM {boincteam_forum}
     WHERE boinc_id = %d",
     $topic->forum
-  ));
-  if (!$team_forum_id) {
+    ));
+    if (!$team_forum_id) {
     $missing_parent[] = $topic->id;
-  }
-  else {
+    }
+    else {
     // Get the content of the post that started the topic
     db_set_active('boinc_rw');
     $query = db_query('
@@ -2875,36 +2875,36 @@ 
       WHERE thread = %d
       ORDER BY timestamp ASC
       LIMIT 1',
-      $pre, $topic->id);
+        $pre, $topic->id);
     db_set_active('default');
       
     // Skip this topic if there are no posts
     if (!$post = db_fetch_object($query)) {
-      // Empty topics should have already been filtered out of the import, so
-      // consider this an error condition
-      $empty_topics[] = $topic->id;
+        // Empty topics should have already been filtered out of the import, so
+        // consider this an error condition
+        $empty_topics[] = $topic->id;
     }
     else {
-      // Get the user ID along with other data to define the topic
-      $uid = boincuser_lookup_uid($topic->owner);
-       if (!$topic->owner) {
+        // Get the user ID along with other data to define the topic
+        $uid = boincuser_lookup_uid($topic->owner);
+        if (!$topic->owner) {
         $uid = 0;
-      }
+        }
       
-      $node_type = 'team_forum';
-      $promote = 0;
-      $comment = ($topic->locked) ? 1 : 2;
+        $node_type = 'team_forum';
+        $promote = 0;
+        $comment = ($topic->locked) ? 1 : 2;
       
-      $post->content = _boincimport_strip_bbcode($post->content);
-      $post->content = _boincimport_text_sanitize($post->content);
-      $teaser = node_teaser($post->content);
+        $post->content = _boincimport_strip_bbcode($post->content);
+        $post->content = _boincimport_text_sanitize($post->content);
+        $teaser = node_teaser($post->content);
       
-      if ($topic->timestamp < $topic->create_time) {
+        if ($topic->timestamp < $topic->create_time) {
         $topic->timestamp = $topic->create_time;
-      }
+        }
 
-      // Construct the thread as a team_forum topic node
-      $node = array(
+        // Construct the thread as a team_forum topic node
+        $node = array(
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
@@ -2919,89 +2919,89 @@ 
         'format' => $input_format,
         'teaser' => $teaser,
         'tfid' => $team_forum_id,
-      );
+        );
       
-      // Save the team topic node
-      $node = (object) $node; // node_save requires an object form
-      node_save($node);
+        // Save the team topic node
+        $node = (object) $node; // node_save requires an object form
+        node_save($node);
 
-      if ($node->nid) {
+        if ($node->nid) {
         db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
           VALUES (%d, %d, %d)',
-          $topic->id, $post->id, $node->nid
+            $topic->id, $post->id, $node->nid
         );
         // Hack to keep the topics in correct order
         db_query('
           UPDATE {node_comment_statistics}
           SET last_comment_timestamp = %d
           WHERE nid = %d',
-          $node->created, $node->nid
+            $node->created, $node->nid
         );
         $success = TRUE;
-      }
+        }
+    }
     }
-  }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $topic->id;
     $message = "Successfully imported team topic {$topic->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $topic->id;
     $message = "Failed to import team topic {$topic->id}!";
     watchdog('boincimport',
-      'Failed to import team topic @id!',
-      array('@id' => $topic->id), WATCHDOG_WARNING
+        'Failed to import team topic @id!',
+        array('@id' => $topic->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_topic'] = $topic->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_topic'] = $topic->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_team_topics_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count team topics',
-      array('@count' => $total_imported)
+        'Successfully imported @count team topics',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count team topics.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count team topics.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the BLAH import successful flag in the variable table
     variable_set('boincimport_import_team_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team posts';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3014,81 +3014,81 @@ 
  */
 function boincimport_team_forum_posts() {
   
-  // Check whether team forum posts have been successfully imported already
-  if (variable_get('boincimport_import_team_post_successful', 0)) {
+    // Check whether team forum posts have been successfully imported already
+    if (variable_get('boincimport_import_team_post_successful', 0)) {
     drupal_set_message(t('Team forum post import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Team forum post import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Team forum post import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_post_started', 0)) {
+    if (!variable_get('boincimport_import_team_post_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_post_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get the BOINC threads and get a count of team posts to import
-  db_set_active('boinc_rw');
-  $team_topic_ids = db_query('
+    // Get the BOINC threads and get a count of team posts to import
+    db_set_active('boinc_rw');
+    $team_topic_ids = db_query('
     SELECT DISTINCT t.id FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 1
     ORDER BY id', $pre, $pre
-  );
-  $team_topic_count = db_result(db_query("
+    );
+    $team_topic_count = db_result(db_query("
     SELECT COUNT(DISTINCT t.id) FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 1", $pre, $pre, $pre
-  ));
-  $total_team_post_count = db_result(db_query("
+    ));
+    $total_team_post_count = db_result(db_query("
     SELECT COUNT(p.id) FROM %spost p
     JOIN %sthread t ON t.id = p.thread
     JOIN %sforum f ON f.id = t.forum
     WHERE f.parent_type = 1", $pre, $pre, $pre
-  ));
-  $team_post_count = $total_team_post_count - $team_topic_count;
-  db_set_active('default');
+    ));
+    $team_post_count = $total_team_post_count - $team_topic_count;
+    db_set_active('default');
 
-  if ($team_post_count <= 0) {
+    if ($team_post_count <= 0) {
     drupal_set_message(
-      t('There were no team posts found: Aborting script'), 'warning'
+        t('There were no team posts found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no team posts found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no team posts found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no posts found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count team posts: Beginning Import',
     array('%count' => $team_post_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_posts = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_posts = array();
+    $duplicates = array();
   
-  // Get the list of team posts already in Drupal to be sure we're not
-  // importing any twice
-  $result = db_query('
+    // Get the list of team posts already in Drupal to be sure we're not
+    // importing any twice
+    $result = db_query('
     SELECT cid, post_id FROM {boincimport_temp_post}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_posts[$row->post_id] = $row->cid;
-  }
+    }
   
-  // Create batches to process
-  while ($boincteam_topic = db_fetch_object($team_topic_ids)) {
+    // Create batches to process
+    while ($boincteam_topic = db_fetch_object($team_topic_ids)) {
     
     db_set_active('boinc_rw');
     $boincteam_posts = db_query('
@@ -3096,7 +3096,7 @@ 
       FROM %spost
       WHERE thread = %d
       ORDER BY timestamp ASC',
-      $pre, $boincteam_topic->id
+        $pre, $boincteam_topic->id
     );
     db_set_active('default');
     
@@ -3104,43 +3104,43 @@ 
 
     while ($boincteam_post = db_fetch_object($boincteam_posts)) {
       
-      // Skip the first post as it has already been imported as a topic
-      if ($first_post) {
+        // Skip the first post as it has already been imported as a topic
+        if ($first_post) {
         $first_post = false;
         continue;
-      }
+        }
 
-      if (isset($existing_posts[$boincteam_post->id])) {
+        if (isset($existing_posts[$boincteam_post->id])) {
         // This post has already been imported
         $duplicates[] = $boincteam_post->id;
-      }
-      else {
+        }
+        else {
         $operations[] = array(
-          'boincimport_team_posts_op', array(
+            'boincimport_team_posts_op', array(
             $boincteam_post
-          )
+            )
         );
-      }
+        }
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count team posts that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count team posts that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_team_posts_finished',
     'title' => t('Importing team posts'),
     'init_message' => t('Beginning team post import...'),
     'progress_message' => t('Processed @current out of @total team posts.'),
     'error_message' => t('Team post import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -3149,11 +3149,11 @@ 
  */
 function boincimport_team_posts_op($post, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+    $input_format = variable_get('boincimport_input_format', 0);
+    $success = FALSE;
   
-  // Make sure the post is valid
-  if ($post->content) {
+    // Make sure the post is valid
+    if ($post->content) {
     
     // Get user, node, and parent IDs for the post and sanitize
     $uid = boincuser_lookup_uid($post->user);
@@ -3162,14 +3162,14 @@ 
       FROM {boincimport_temp_topic} btt
       LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid
       WHERE btt.topic_id = %d',
-      $post->thread
+        $post->thread
     ));
     $nid = $node->nid;
     $pid = db_result(db_query('
       SELECT cid
       FROM {boincimport_temp_post}
       WHERE post_id = %d',
-      $post->parent_post));
+        $post->parent_post));
     if (is_null($pid)) $pid = 0;
     if (!$uid) $uid = 0;
     
@@ -3180,110 +3180,110 @@ 
       SELECT COUNT(*)
       FROM {comments}
       WHERE nid = %d',
-      $nid
+        $nid
     ));
     $post_reply = $pid;
     
     if ($post_reply OR $topic_reply) {
-      // Create a subject for the post from the post content. The body may be in 
-      // any format, so we:
-      //  1) Filter it into HTML
-      //  2) Strip out all HTML tags
-      //  3) Convert entities back to plain-text.
-      // Note: format is checked by check_markup().
-      $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
-      // Replace "Quote:" with "RE:"
-      $subject = str_replace('Quote:', 'RE: ', $subject);
-      // Fringe cases where the comment body is populated only by HTML tags
-      // will require a default subject...
-      if ($subject === '')
+        // Create a subject for the post from the post content. The body may be in 
+        // any format, so we:
+        //  1) Filter it into HTML
+        //  2) Strip out all HTML tags
+        //  3) Convert entities back to plain-text.
+        // Note: format is checked by check_markup().
+        $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
+        // Replace "Quote:" with "RE:"
+        $subject = str_replace('Quote:', 'RE: ', $subject);
+        // Fringe cases where the comment body is populated only by HTML tags
+        // will require a default subject...
+        if ($subject === '')
         $subject = "RE: {$node->title}";
     } else {
-      // This is the first post in the topic
-      $subject = $node->title;
+        // This is the first post in the topic
+        $subject = $node->title;
     }
     
     // Construct the post as a Drupal comment
     $comment = array(
-      'pid' => $pid,
-      'nid' => $nid,
-      'uid' => $uid,
-      'subject' => $subject,
-      'comment' => $post->content,
-      'timestamp' => $post->timestamp,
-      'status' => $post->hidden,
-      'format' => $input_format
+        'pid' => $pid,
+        'nid' => $nid,
+        'uid' => $uid,
+        'subject' => $subject,
+        'comment' => $post->content,
+        'timestamp' => $post->timestamp,
+        'status' => $post->hidden,
+        'format' => $input_format
     );
     
     // Save the comment
     if (boincimport_forum_comment_save($comment)) {
-      $success = db_query('
+        $success = db_query('
         INSERT INTO {boincimport_temp_post} (post_id, cid)
         VALUES (%d, %d)',
         $post->id, $comment['cid']
-      );
+        );
+    }
     }
-  }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $post->id;
     $message = "Successfully imported team post {$post->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $post->id;
     $message = "Failed to import team post {$post->id}!";
     watchdog('boincimport',
-      'Failed to import team post @id!',
-      array('@id' => $post->id), WATCHDOG_WARNING
+        'Failed to import team post @id!',
+        array('@id' => $post->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_post'] = $post->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_post'] = $post->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_team_posts_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count team posts',
-      array('@count' => $total_imported)
+        'Successfully imported @count team posts',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count team posts.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count team posts.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the team post import successful flag in the variable table
     variable_set('boincimport_import_team_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3296,71 +3296,71 @@ 
  */
 function boincimport_subscriptions() {
   
-  // Check whether subscriptions have been successfully imported already
-  if (variable_get('boincimport_import_subscription_successful', 0)) {
+    // Check whether subscriptions have been successfully imported already
+    if (variable_get('boincimport_import_subscription_successful', 0)) {
     drupal_set_message(t('Subscription import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Subscription import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Subscription import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_import_subscription_started', 0)) {
+    if (!variable_get('boincimport_import_subscription_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_subscription_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get users with subscriptions to import
-  db_set_active('boinc_rw');
-  $users_with_subscriptions = db_query('
+    // Get users with subscriptions to import
+    db_set_active('boinc_rw');
+    $users_with_subscriptions = db_query('
     SELECT DISTINCT userid
     FROM %ssubscriptions
     ORDER BY userid ASC',
     $pre
-  );
-  $user_count = mysqli_num_rows($users_with_subscriptions);
-  db_set_active('default');
+    );
+    $user_count = mysqli_num_rows($users_with_subscriptions);
+    db_set_active('default');
 
-  if (!$user_count) {
+    if (!$user_count) {
     drupal_set_message(
-      t('There were no subscriptions found: Aborting script'), 'warning'
+        t('There were no subscriptions found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no subscriptions found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no subscriptions found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no subscriptions found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count users with subscriptions: Beginning import',
     array('%count' => $user_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // Create batches to process
-  while ($subscribed_user = db_fetch_object($users_with_subscriptions)) {
+    // Create batches to process
+    while ($subscribed_user = db_fetch_object($users_with_subscriptions)) {
     $operations[] = array(
-      'boincimport_subscriptions_op', array(
+        'boincimport_subscriptions_op', array(
         $subscribed_user->userid
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_subscriptions_finished',
     'title' => t('Importing subscriptions'),
     'init_message' => t('Beginning subscription import...'),
     'progress_message' => t('Processed @current out of @total subscriptions.'),
     'error_message' => t('Subscription import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -3369,72 +3369,72 @@ 
  */
 function boincimport_subscriptions_op($boincuser_id, &$context) {
   
-  // Get the drupal user and pull subscriptions
-  $uid = get_drupal_id($boincuser_id);
-  $count = boincuser_pull_subscriptions($uid);
+    // Get the drupal user and pull subscriptions
+    $uid = get_drupal_id($boincuser_id);
+    $count = boincuser_pull_subscriptions($uid);
   
-  $message = '';
-  if ($count) {
+    $message = '';
+    if ($count) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincuser_id;
     $context['results']['subscriptions'][$boincuser_id] = $count;
     $message = "Successfully imported {$count} subscriptions for user {$boincuser_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $boincuser_id;
     $message = "Failed to import subscriptions for user {$boincuser_id}!";
     watchdog('boincimport',
-      'Failed to import subscriptions for user @id!',
-      array('@id' => $boincuser_id), WATCHDOG_WARNING
+        'Failed to import subscriptions for user @id!',
+        array('@id' => $boincuser_id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $boincuser_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $boincuser_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_subscriptions_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $user_count = count($results['success']);
     $subscriptions_imported = array_sum($results['subscriptions']);
     $message = t(
-      'Successfully imported @count subscriptions for @distinct users',
-      array('@count' => $subscriptions_imported, '@distinct' => $user_count)
+        'Successfully imported @count subscriptions for @distinct users',
+        array('@count' => $subscriptions_imported, '@distinct' => $user_count)
     );
     watchdog('boincimport',
-      'Successfully imported @count subscriptions for @distinct users.',
-      array('@count' => $subscriptions_imported, '@distinct' => $user_count),
-      WATCHDOG_INFO
+        'Successfully imported @count subscriptions for @distinct users.',
+        array('@count' => $subscriptions_imported, '@distinct' => $user_count),
+        WATCHDOG_INFO
     ); 
     // Set the subscription import successful flag in the variable table
     variable_set('boincimport_import_subscription_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3446,112 +3446,112 @@ 
  */
 function boincimport_replace_urls() {
   
-  // Check whether URLs have already been fixed
-  if (variable_get('boincimport_replace_url_successful', 0)) {
+    // Check whether URLs have already been fixed
+    if (variable_get('boincimport_replace_url_successful', 0)) {
     drupal_set_message(t('URLs have already been updated'), 'warning');
     watchdog(
-      'boincimport', 'URLs have already been updated',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'URLs have already been updated',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_replace_url_started', 0)) {
+    if (!variable_get('boincimport_replace_url_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_replace_url_started', 1);
-  }
+    }
   
-  // Get the count of nodes and comments to process for URL updates
-  $node_count = db_result(db_query('
+    // Get the count of nodes and comments to process for URL updates
+    $node_count = db_result(db_query('
     SELECT COUNT(DISTINCT btt.nid)
     FROM {boincimport_temp_topic} AS btt
     LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid'
-  ));
+    ));
   
-  $comment_count = db_result(db_query('
+    $comment_count = db_result(db_query('
     SELECT COUNT(c.cid)
     FROM {boincimport_temp_post} AS p
     LEFT JOIN {comments} AS c ON p.cid = c.cid'
-  ));
+    ));
   
-  $pm_count = db_result(db_query('
+    $pm_count = db_result(db_query('
     SELECT COUNT(*)
     FROM {pm_message} pm'
-  ));
+    ));
   
-  if (!$node_count AND !$comment_count AND !$pm_count) {
+    if (!$node_count AND !$comment_count AND !$pm_count) {
     drupal_set_message(
-      t('There were no nodes, comments, or private messages found: Aborting script'), 'warning'
+        t('There were no nodes, comments, or private messages found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no nodes,comments, or private messages found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no nodes,comments, or private messages found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no nodes, comments, or private messages found: Aborting script.');
-  }
+    }
   
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %node_count nodes, %comment_count comments, and %pm_count private messages: Updating URLs...',
     array(
-      '%node_count' => $node_count,
-      '%comment_count' => $comment_count,
-      '%pm_count' => $pm_count,
+        '%node_count' => $node_count,
+        '%comment_count' => $comment_count,
+        '%pm_count' => $pm_count,
     ),
     WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $batch_size = 100;
+    $operations = array();
+    $batch_size = 100;
   
-  // Create node batches to process
-  for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
+    // Create node batches to process
+    for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
     $nodes_per_batch = $batch_size;
     if ($offset + $batch_size > $node_count) {
-      $nodes_per_batch = $node_count - $offset;
+        $nodes_per_batch = $node_count - $offset;
     }
     $operations[] = array(
-      'boincimport_replace_urls_node_op', array(
+        'boincimport_replace_urls_node_op', array(
         $offset, $nodes_per_batch
-      )
+        )
     );
-  }
-  // Add comment batches
-  for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
+    }
+    // Add comment batches
+    for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
     $comments_per_batch = $batch_size;
     if ($offset + $batch_size > $comment_count) {
-      $comments_per_batch = $comment_count - $offset;
+        $comments_per_batch = $comment_count - $offset;
     }
     $operations[] = array(
-      'boincimport_replace_urls_comment_op', array(
+        'boincimport_replace_urls_comment_op', array(
         $offset, $comments_per_batch
-      )
+        )
     );
-  }
-  // And don't forget to process private messages
-  for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
+    }
+    // And don't forget to process private messages
+    for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
     $messages_per_batch = $batch_size;
     if ($offset + $batch_size > $pm_count) {
-      $messages_per_batch = $pm_count - $offset;
+        $messages_per_batch = $pm_count - $offset;
     }
     $operations[] = array(
-      'boincimport_replace_urls_pm_op', array(
+        'boincimport_replace_urls_pm_op', array(
         $offset, $messages_per_batch
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_replace_urls_finished',
     'title' => t('Updating URLs...'),
     'init_message' => t('Beginning URL update...'),
     'progress_message' => t('Processed URLs in @current out of @total batches (@size items per batch).', array(
-      '@size' => $batch_size,
+        '@size' => $batch_size,
     )),
     'error_message' => t('URL update has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -3559,27 +3559,27 @@ 
  * Find URLs for the old system and update them with Drupal paths
  */
 function boincimport_replace_urls_node_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
 
-  // Since topics have just been imported, there should be only one vid for
-  // each nid, so we can update node_revisions by nid
-  // Get nodes to process
-  $nodes = db_query('
+    // Since topics have just been imported, there should be only one vid for
+    // each nid, so we can update node_revisions by nid
+    // Get nodes to process
+    $nodes = db_query('
     SELECT btt.nid, nr.body, nr.teaser
     FROM {boincimport_temp_topic} AS btt
     LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid
     ORDER BY btt.nid
     LIMIT %d,%d',
     $offset, $batch_size
-  );
+    );
   
-  while ($node = db_fetch_object($nodes)) {
+    while ($node = db_fetch_object($nodes)) {
     $updated = FALSE;
     
     // Update URLs in node contents
@@ -3588,23 +3588,23 @@ 
     $node->body = _boincimport_replace_links($node->body);
     $node->teaser = _boincimport_replace_links($node->teaser);
     if ($node->body != $original_body OR $node->teaser != $original_teaser) {
-      $updated = db_query("
+        $updated = db_query("
         UPDATE {node_revisions}
         SET body= '%s', teaser = '%s'
         WHERE nid = %d",
         $node->body, $node->teaser, $node->nid
-      );
+        );
     }
     
     $message = '';
     $context['results']['success'][] = $node->nid;
     if ($updated) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['nodes']['updated'][] = $node->nid;
-      $message = "Successfully updated node {$node->nid}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['nodes']['updated'][] = $node->nid;
+        $message = "Successfully updated node {$node->nid}";
     }
     else {
-      $message = "No changes made to node {$node->nid}!";
+        $message = "No changes made to node {$node->nid}!";
     }
     
     // Update our progress information.
@@ -3614,12 +3614,12 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
@@ -3627,48 +3627,48 @@ 
  * Find URLs for the old system and update them with Drupal paths
  */
 function boincimport_replace_urls_comment_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  // Get comments to process
-  $comments = db_query('
+    // Get comments to process
+    $comments = db_query('
     SELECT c.cid, c.comment
     FROM {boincimport_temp_post} AS p
     LEFT JOIN {comments} AS c ON p.cid = c.cid
     ORDER BY c.cid
     LIMIT %d,%d',
     $offset, $batch_size
-  );
+    );
   
-  while ($comment = db_fetch_object($comments)) {
+    while ($comment = db_fetch_object($comments)) {
     $updated = FALSE;
     
     // Update URLs in comment contents
     $original_comment = $comment->comment;
     $comment->comment = _boincimport_replace_links($comment->comment);
     if ($comment->comment != $original_comment) {
-      $updated = db_query("
+        $updated = db_query("
         UPDATE {comments}
         SET comment= '%s'
         WHERE cid = %d",
         $comment->comment, $comment->cid
-      );
+        );
     }
     
     $message = '';
     $context['results']['success'][] = $comment->cid;
     if ($updated) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['comments']['updated'][] = $comment->cid;
-      $message = "Successfully updated comment {$comment->cid}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['comments']['updated'][] = $comment->cid;
+        $message = "Successfully updated comment {$comment->cid}";
     }
     else {
-      $message = "No changes made to comment {$comment->cid}!";
+        $message = "No changes made to comment {$comment->cid}!";
     }
     
     // Update our progress information.
@@ -3678,12 +3678,12 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
@@ -3691,47 +3691,47 @@ 
  * Find URLs for the old system and update them with Drupal paths
  */
 function boincimport_replace_urls_pm_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  // Get private messages to process
-  $messages = db_query('
+    // Get private messages to process
+    $messages = db_query('
     SELECT pm.mid, pm.body
     FROM {pm_message} pm
     ORDER BY pm.mid
     LIMIT %d,%d',
     $offset, $batch_size
-  );
+    );
   
-  while ($pm = db_fetch_object($messages)) {
+    while ($pm = db_fetch_object($messages)) {
     $updated = FALSE;
     
     // Update URLs in private message body
     $original_pm_body = $pm->body;
     $pm->body = _boincimport_replace_links($pm->body);
     if ($pm->body != $original_pm_body) {
-      $updated = db_query("
+        $updated = db_query("
         UPDATE {pm_message}
         SET body= '%s'
         WHERE mid = %d",
         $pm->body, $pm->mid
-      );
+        );
     }
     
     $message = '';
     $context['results']['success'][] = $pm->mid;
     if ($updated) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['pm']['updated'][] = $pm->mid;
-      $message = "Successfully updated private message {$pm->mid}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['pm']['updated'][] = $pm->mid;
+        $message = "Successfully updated private message {$pm->mid}";
     }
     else {
-      $message = "No changes made to private message {$pm->mid}!";
+        $message = "No changes made to private message {$pm->mid}!";
     }
     
     // Update our progress information.
@@ -3741,85 +3741,85 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_replace_urls_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_processed = count($results['success']);
     $nodes_updated = count($results['nodes']['updated']);
     $comments_updated = count($results['comments']['updated']);
     $private_messages_updated = count($results['pm']['updated']);
     $message = t(
-      'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
-      array(
+        'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
+        array(
         '@count' => $total_processed,
         '@nodes_updated' => $nodes_updated,
         '@comments_updated' => $comments_updated,
         '@pm_updated' => $private_messages_updated,
-      )
+        )
     );
     if ($private_messages_updated) {
-      watchdog('boincimport',
+        watchdog('boincimport',
         'Updated URLs in these private_messages: @mid_list',
         array(
-          '@mid_list' => implode(', ', $results['pm']['updated']),
+            '@mid_list' => implode(', ', $results['pm']['updated']),
         ),
         WATCHDOG_INFO
-      );
+        );
     }
     if ($comments_updated) {
-      watchdog('boincimport',
+        watchdog('boincimport',
         'Updated URLs in these comments: @cid_list',
         array(
-          '@cid_list' => implode(', ', $results['comments']['updated']),
+            '@cid_list' => implode(', ', $results['comments']['updated']),
         ),
         WATCHDOG_INFO
-      );
+        );
     }
     if ($nodes_updated) {
-      watchdog('boincimport',
+        watchdog('boincimport',
         'Updated URLs in these nodes: @nid_list',
         array(
-          '@nid_list' => implode(', ', $results['nodes']['updated']),
+            '@nid_list' => implode(', ', $results['nodes']['updated']),
         ),
         WATCHDOG_INFO
-      );
+        );
     }
     watchdog('boincimport',
-      'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
-      array(
+        'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
+        array(
         '@count' => $total_processed,
         '@nodes_updated' => $nodes_updated,
         '@comments_updated' => $comments_updated,
         '@pm_updated' => $private_messages_updated,
-      ),
-      WATCHDOG_INFO
+        ),
+        WATCHDOG_INFO
     );
     // Set the replace URLs successful flag in the variable table
     variable_set('boincimport_replace_urls_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'users';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3831,43 +3831,43 @@ 
  * Remove temporary variables, clear caches, etc.
  */
 function boincimport_process_cleanup() {
-  db_set_active('default');
-  
-  variable_del('boincimport_base_url_boinc');
-  variable_del('boincimport_base_url_drupal');
-  variable_del('boincimport_import_user_successful');
-  variable_del('boincimport_import_user_started');
-  variable_del('boincimport_import_team_successful');
-  variable_del('boincimport_import_team_started');
-  variable_del('boincimport_import_category_successful');
-  variable_del('boincimport_replace_url_successful');
-  variable_del('boincimport_import_category_started');
-  variable_del('boincimport_import_topic_successful');
-  variable_del('boincimport_import_topic_started');
-  variable_del('boincimport_import_post_successful');
-  variable_del('boincimport_import_post_started');
-  variable_del('boincimport_team_forum_successful');
-  variable_del('boincimport_team_topic_successful');
-  variable_del('boincimport_team_post_successful');
-  variable_del('boincimport_team_post_started');
-  variable_del('boincimport_ready');
-  variable_del('boincimport_db_url');
-  variable_del('boincimport_tested');
-  variable_del('boincimport_db_configured');
-  variable_del('boincimport_table_prefix');
-  variable_del('boincimport_team_types');
-  variable_del('boincimport_time_limit');
-  variable_del('boincimport_import_lurkers');
-  variable_del('boincimport_import_polls'); 
-  variable_del('boincimport_import_poll_started');
-  variable_del('boincimport_import_poll_successful');
-  variable_del('boincimport_import_pm_successful');
-  variable_del('boincimport_encode');
-  variable_del('boincimport_encoding_phpbb');
-  variable_del('boincimport_encoding_drupal');
-  variable_del('boincimport_version');
-
-  db_query('DELETE FROM {cache}');
+    db_set_active('default');
+  
+    variable_del('boincimport_base_url_boinc');
+    variable_del('boincimport_base_url_drupal');
+    variable_del('boincimport_import_user_successful');
+    variable_del('boincimport_import_user_started');
+    variable_del('boincimport_import_team_successful');
+    variable_del('boincimport_import_team_started');
+    variable_del('boincimport_import_category_successful');
+    variable_del('boincimport_replace_url_successful');
+    variable_del('boincimport_import_category_started');
+    variable_del('boincimport_import_topic_successful');
+    variable_del('boincimport_import_topic_started');
+    variable_del('boincimport_import_post_successful');
+    variable_del('boincimport_import_post_started');
+    variable_del('boincimport_team_forum_successful');
+    variable_del('boincimport_team_topic_successful');
+    variable_del('boincimport_team_post_successful');
+    variable_del('boincimport_team_post_started');
+    variable_del('boincimport_ready');
+    variable_del('boincimport_db_url');
+    variable_del('boincimport_tested');
+    variable_del('boincimport_db_configured');
+    variable_del('boincimport_table_prefix');
+    variable_del('boincimport_team_types');
+    variable_del('boincimport_time_limit');
+    variable_del('boincimport_import_lurkers');
+    variable_del('boincimport_import_polls'); 
+    variable_del('boincimport_import_poll_started');
+    variable_del('boincimport_import_poll_successful');
+    variable_del('boincimport_import_pm_successful');
+    variable_del('boincimport_encode');
+    variable_del('boincimport_encoding_phpbb');
+    variable_del('boincimport_encoding_drupal');
+    variable_del('boincimport_version');
+
+    db_query('DELETE FROM {cache}');
 }
 
 /**
@@ -3875,15 +3875,15 @@ 
  */
 
 function boincimport_forum_comment_save(&$edit) {
-  // Here we are building the thread field.  See the comment in comment_render().
-  if ($edit['pid'] == 0) {
+    // Here we are building the thread field.  See the comment in comment_render().
+    if ($edit['pid'] == 0) {
     // This is a comment with no parent comment (depth 0): we start by retrieving
     // the maximum thread level.
     $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid']));
     // Strip the "/" from the end of the thread.
     $max = rtrim($max, '/');
     $thread = int2vancode(vancode2int($max)+1) .'/';
-  } else {
+    } else {
     // This is comment with a parent comment: we increase the part of the thread
     // value at the proper depth.
     $parent = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $edit['pid']));
@@ -3892,71 +3892,71 @@ 
     // Get the max value in _this_ thread.
     $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid']));
     if ($max == '') {
-      // First child of this parent.
-      $thread = $parent->thread .'.'. int2vancode(1) .'/';
+        // First child of this parent.
+        $thread = $parent->thread .'.'. int2vancode(1) .'/';
     } else {
-      // Strip the "/" at the end of the thread.
-      $max = rtrim($max, '/');
-      // We need to get the value at the correct depth.
-      $parts = explode('.', $max);
-      $parent_depth = count(explode('.', $parent->thread));
-      $last = $parts[$parent_depth];
-      // Finally, build the thread field for this new comment.
-      $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+        // Strip the "/" at the end of the thread.
+        $max = rtrim($max, '/');
+        // We need to get the value at the correct depth.
+        $parts = explode('.', $max);
+        $parent_depth = count(explode('.', $parent->thread));
+        $last = $parts[$parent_depth];
+        // Finally, build the thread field for this new comment.
+        $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+    }
     }
-  }
 
-  $status = 0; // 1 - not published, 0 - published
-  $format = variable_get('boincimport_input_format', 0);
-  $score = 0; // 0 default value, comments get higher score depending on the author's roles
-  $users = serialize(array(0 => 1));  // default value for everybody!!
+    $status = 0; // 1 - not published, 0 - published
+    $format = variable_get('boincimport_input_format', 0);
+    $score = 0; // 0 default value, comments get higher score depending on the author's roles
+    $users = serialize(array(0 => 1));  // default value for everybody!!
   
-  if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
+    if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
-  }
+    }
 
-  $success = db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, thread, name) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s')", $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], ip_address(), $edit['timestamp'], $edit['status'], $thread, $edit['name']);
-  if ($success) {
+    $success = db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, thread, name) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s')", $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], ip_address(), $edit['timestamp'], $edit['status'], $thread, $edit['name']);
+    if ($success) {
     $edit['cid'] = db_last_insert_id('comments', 'cid');
     _comment_update_node_statistics($edit['nid']);
-  }
-  return $success;
+    }
+    return $success;
 }
 
 /**
  * Strips text of extra phpbb3 markup and if requested, also strips all bbcode from text.
  */
 function _boincimport_strip_bbcode($text) {
-  // Strip the text of extra markup - regular expressions taken from phpbb3 includes/function.php, function get_preg_expression().
-  $match = array(
+    // Strip the text of extra markup - regular expressions taken from phpbb3 includes/function.php, function get_preg_expression().
+    $match = array(
     '#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
     '#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
     '#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#',
     '#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
     '#<!\-\- .*? \-\->#s',
     '#<.*?>#s',
-  );
-  $replace = array('$1', '$1', '$2', '$1', '', '');
-  $text = preg_replace($match, $replace, $text);
+    );
+    $replace = array('$1', '$1', '$2', '$1', '', '');
+    $text = preg_replace($match, $replace, $text);
 
-  // If BBcode conversion to has been selected, the following will convert the
-  // BBcode to normal html
-  if (variable_get('boincimport_bbcode', 0)) {
+    // If BBcode conversion to has been selected, the following will convert the
+    // BBcode to normal html
+    if (variable_get('boincimport_bbcode', 0)) {
     $input_format = variable_get('boincimport_input_format', 0);
     $text = bbcode_filter('process', 0 , $input_format, $text);
-  }
-  return $text;
+    }
+    return $text;
 }
 
 /**
  * Function to properly encode strings.
  */
 function _boincimport_text_sanitize($text) {
-  $input_format = variable_get('boincimport_input_format', 0);
-  $text = html_entity_decode($text, ENT_QUOTES, 'utf-8');
-  // Be sure the text is filtered for the default input format
-  $text = check_markup($text, $input_format);
-  return $text;
+    $input_format = variable_get('boincimport_input_format', 0);
+    $text = html_entity_decode($text, ENT_QUOTES, 'utf-8');
+    // Be sure the text is filtered for the default input format
+    $text = check_markup($text, $input_format);
+    return $text;
 }
 
 
@@ -3965,25 +3965,25 @@ 
  */
 function _boincimport_replace_links($html) {
   
-  $transformer = new BoincImportUrlTransformer();
-  
-  // Update links to posts, threads, and forums
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)&postid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformPostLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?(#(\d+)?)}i', array($transformer, 'transformOldPostLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformTopicLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_forum\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformForumLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_user\.php\?userid=(\d+)((&\w+=\w*)+)?}i', array($transformer, 'transformUserLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)workunit\.php\?wuid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformWorkUnitLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)result\.php\?resultid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformResultLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserResultsLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostResultsLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_host_detail\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)hosts_user\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserHostsLinks'), $html);
-  
-  // Update any links to the top level index
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_index.php}i', array($transformer, 'transformForumIndexLinks'), $html);
-  
-  return $html;
+    $transformer = new BoincImportUrlTransformer();
+  
+    // Update links to posts, threads, and forums
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)&postid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformPostLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?(#(\d+)?)}i', array($transformer, 'transformOldPostLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformTopicLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_forum\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformForumLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_user\.php\?userid=(\d+)((&\w+=\w*)+)?}i', array($transformer, 'transformUserLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)workunit\.php\?wuid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformWorkUnitLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)result\.php\?resultid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformResultLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserResultsLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostResultsLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_host_detail\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)hosts_user\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserHostsLinks'), $html);
+  
+    // Update any links to the top level index
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_index.php}i', array($transformer, 'transformForumIndexLinks'), $html);
+  
+    return $html;
 }
 
 /**
@@ -3991,14 +3991,14 @@ 
  */
 class BoincImportUrlTransformer {
   
-  var $basePath;
-  var $boincDomain;
-  var $drupalDomain;
+    var $basePath;
+    var $boincDomain;
+    var $drupalDomain;
   
-  /**
-   * Constructor
-   */
-  function __construct() {
+    /**
+     * Constructor
+     */
+    function __construct() {
     global $base_url;
     global $base_path;
     $boinc_base_urls = variable_get('boincimport_base_url_boinc', '');
@@ -4008,208 +4008,208 @@ 
     $this->boincDomains = array();
     $boinc_base_urls = preg_split('/\s+/', $boinc_base_urls);
     foreach ($boinc_base_urls as $url) {
-      $domain = parse_url($url, PHP_URL_HOST);
-      if ($domain) {
+        $domain = parse_url($url, PHP_URL_HOST);
+        if ($domain) {
         $this->boincDomains[$domain] = TRUE;
-      }
+        }
     }
     if (!$this->boincDomains) {
-      watchdog('boincimport', 'No valid BOINC base URLs found to transform!',
+        watchdog('boincimport', 'No valid BOINC base URLs found to transform!',
         array(), WATCHDOG_WARNING); 
     }
-  }
+    }
 
-  // old-style constructor for backwards compatibility
-  function BoincImportUrlTransformer() {
+    // old-style constructor for backwards compatibility
+    function BoincImportUrlTransformer() {
     self::__construct();
-  }
+    }
   
-  /**
-   * Get what the new base URL should be (needed for every transformation)
-   */
-  function getNewBaseUrl($matches) {
+    /**
+     * Get what the new base URL should be (needed for every transformation)
+     */
+    function getNewBaseUrl($matches) {
     $http = $matches[1];
     $domain = trim($matches[2], '/');
     if ($http) {
-      if (isset($this->boincDomains[$domain])) {
+        if (isset($this->boincDomains[$domain])) {
         // This is a URL configured to be transformed
         return "{$http}://{$this->drupalDomain}{$this->basePath}";
-      }
-      else {
+        }
+        else {
         // This URL should not be transformed
         return NULL;
-      }
+        }
     }
     else {
-      // This is a relative URL
-      return $this->basePath;
+        // This is a relative URL
+        return $this->basePath;
+    }
     }
-  }
   
-  /**
-   * Replace links to specific posts. If the given post is the first in the
-   * thread, it is a topic node in Drupal, not a comment.
-   */
-  function transformPostLinks($matches) {
+    /**
+     * Replace links to specific posts. If the given post is the first in the
+     * thread, it is a topic node in Drupal, not a comment.
+     */
+    function transformPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = db_result(db_query('
+        $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
         WHERE p.post_id = %d',
         $matches[4]
-      ));
-      if ($id) {
+        ));
+        if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+        }
+        else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
-      }
+        }
     }
     return $link;
-  }
+    }
   
-  /**
-   * Replace links that include anchors to specific posts. If the given post is
-   * the first in the thread, it is a topic node in Drupal, not a comment.
-   */
-  function transformOldPostLinks($matches) {
+    /**
+     * Replace links that include anchors to specific posts. If the given post is
+     * the first in the thread, it is a topic node in Drupal, not a comment.
+     */
+    function transformOldPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = db_result(db_query('
+        $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
         WHERE p.post_id = %d',
         $matches[6]
-      ));
-      if ($id) {
+        ));
+        if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+        }
+        else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
-      }
+        }
     }
     return $link;
-  }
+    }
   
-  function transformTopicLinks($matches) {
+    function transformTopicLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = db_result(db_query('
+        $id = db_result(db_query('
         SELECT nid
         FROM {boincimport_temp_topic}
         WHERE topic_id = %d',
         $matches[3]
-      ));
-      $link = "{$newBaseUrl}node/{$id}";
+        ));
+        $link = "{$newBaseUrl}node/{$id}";
     }
     return $link;
-  }
+    }
 
-  function transformForumLinks($matches) {
+    function transformForumLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $forum = db_fetch_object(db_query('
+        $forum = db_fetch_object(db_query('
         SELECT tid
         FROM {boincimport_temp_forum}
         WHERE forum_id = %d',
         $matches[3]
-      ));
-      $link = "{$newBaseUrl}community/forum/{$forum->tid}";
+        ));
+        $link = "{$newBaseUrl}community/forum/{$forum->tid}";
     }
     return $link;
-  }
+    }
 
-  function transformUserLinks($matches) {
+    function transformUserLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      // Make sure this isn't an RPC link (no need to transform those)
-      if (!$matches[5]) {
+        // Make sure this isn't an RPC link (no need to transform those)
+        if (!$matches[5]) {
         // TODO: This regex doesn't seem to capture the format=xml part of the
         // URL, making it impossible to distinguish if this is an RPC or not...
         //watchdog('DEBUG', 'matches: @m', array('@m' => print_r($matches,true)), WATCHDOG_DEBUG);
         $uid = boincuser_lookup_uid($matches[3]);
         $link = "{$newBaseUrl}account/{$uid}";
-      }
+        }
     }
     return $link;
-  }
+    }
 
-  function transformWorkUnitLinks($matches) {
+    function transformWorkUnitLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}workunit/{$id}";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}workunit/{$id}";
     }
     return $link;
-  }
+    }
 
-  function transformResultLinks($matches) {
+    function transformResultLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}task/{$id}";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}task/{$id}";
     }
     return $link;
-  }
+    }
 
-  function transformHostResultsLinks($matches) {
+    function transformHostResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}host/{$id}/tasks";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}host/{$id}/tasks";
     }
     return $link;
-  }
+    }
   
-  function transformUserResultsLinks($matches) {
+    function transformUserResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $link = "{$newBaseUrl}account/tasks";
+        $link = "{$newBaseUrl}account/tasks";
     }
     return $link;
-  }
+    }
   
-  function transformHostLinks($matches) {
+    function transformHostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}host/{$id}";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}host/{$id}";
     }
     return $link;
-  }
+    }
   
-  function transformUserHostsLinks($matches) {
+    function transformUserHostsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $uid = boincuser_lookup_uid($matches[3]);
-      if ($uid) {
+        $uid = boincuser_lookup_uid($matches[3]);
+        if ($uid) {
         $link = "{$newBaseUrl}account/{$uid}/computers";
-      }
+        }
     }
     return $link;
-  }
+    }
   
-  function transformForumIndexLinks($matches) {
+    function transformForumIndexLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $link = "{$newBaseUrl}community/forum";
+        $link = "{$newBaseUrl}community/forum";
     }
     return $link;
-  }
+    }
 
 }

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

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
           
           if ($response == '404 NOT FOUND') {
             form_set_error(
-              'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
+              'boinc_translate_transifex_'.($project == $boinc_name ? 'standard' : 'project').'_resources',
               t('Resource %name not found in %project.',
                 array(
                   '%name' => $resource,

Braces +4 added lines, -8 removed lines

@@ -220,8 +220,7 @@ 
   if (!$values['boinc_translate_transifex_pass']) {
     if (!variable_get('boinc_translate_transifex_pass', '')) {
       form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
-    }
-    else {
+    } else {
       unset($form_state['values']['boinc_translate_transifex_pass']);
     }
   }
@@ -260,8 +259,7 @@ 
           'boinc_translate_transifex_pass',
           t('Transifex authentication failed.')
         );
-      }
-      else {
+      } else {
         $authenticated = TRUE;
       }
     }
@@ -278,14 +276,12 @@ 
       );
       if ($project_name AND $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
-      }
-      elseif ($project_name AND !$project_resources) {
+      } elseif ($project_name AND !$project_resources) {
         drupal_set_message(
           t('No project-specific resources were provided'),
           'warning'
         );
-      }
-      elseif ($project_resources AND !$project_name) {
+      } elseif ($project_resources AND !$project_name) {
         drupal_set_message(
           t('No project-specific Transifex project name was provided'),
           'warning'

Indentation +145 added lines, -145 removed lines

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

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

@@ -12,8 +12,8 @@ 
   */
 function boinctranslate_admin_settings(&$form_state) {
   $form = array();
-  $initialized = FALSE;
-  $import_enabled = FALSE;
+  $initialized = false;
+  $import_enabled = false;
   $default = array(
     'transifex_user' => variable_get('boinc_translate_transifex_user', ''),
     'transifex_pass' => variable_get('boinc_translate_transifex_pass', ''),
@@ -36,16 +36,16 @@ 
     ), 
   );
   
-  if ($default['transifex_user'] AND $default['transifex_pass']) {
+  if ($default['transifex_user'] and $default['transifex_pass']) {
     if (trim($default['transifex_boinc_resources'])
-    OR trim($default['transifex_project_resources'])) {
-      $import_enabled = TRUE;
+    or trim($default['transifex_project_resources'])) {
+      $import_enabled = true;
     }
     if ($default['transifex_boinc_name']
-    AND $default['transifex_project_name']
-    AND trim($default['transifex_boinc_resources'])
-    AND trim($default['transifex_project_resources'])) {
-      $initialized = TRUE;
+    and $default['transifex_project_name']
+    and trim($default['transifex_boinc_resources'])
+    and trim($default['transifex_project_resources'])) {
+      $initialized = true;
     }
   }
   
@@ -55,7 +55,7 @@ 
     '#title' => t('Transifex settings'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => $initialized,
     '#attributes' => array('class' => '')
   );
@@ -126,8 +126,8 @@ 
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
     '#attributes' => array('class' => '')
   );
   $form['tools']['initialize_languages_text'] = array(
@@ -138,7 +138,7 @@ 
   $form['tools']['initialize_languages'] = array(
     '#type' => 'button',
     '#value' => t('Install official BOINC languages'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_initialize_languages'),
     '#disabled' => !$initialized,
   );
@@ -150,7 +150,7 @@ 
   $form['tools']['import_now'] = array(
     '#type' => 'button',
     '#value' => t('Import all translations'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_import_now'),
     '#disabled' => !$import_enabled,
   );
@@ -162,7 +162,7 @@ 
   $form['tools']['download_boinc_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download official BOINC-Drupal .pot'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_download_boinc_pot'),
     '#disabled' => !$import_enabled,
   );
@@ -174,7 +174,7 @@ 
   $form['tools']['download_project_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download project-specific .pot'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_download_project_pot'),
     '#disabled' => !$import_enabled,
   );
@@ -187,7 +187,7 @@ 
     $form['tools']['update_official_boinc'] = array(
       '#type' => 'button',
       '#value' => t('Update official BOINC translations'),
-      '#executes_submit_callback' => TRUE,
+      '#executes_submit_callback' => true,
       '#submit' => array('boinctranslate_admin_settings_update_official_boinc'),
       '#disabled' => !$import_enabled,
     );
@@ -200,7 +200,7 @@ 
   $form['tools']['export_now'] = array(
     '#type' => 'button',
     '#value' => t('Update project-specific Resources'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_export_now'),
     '#disabled' => !$import_enabled,
   );
@@ -278,11 +278,11 @@ 
     $values['boinc_translate_transifex_standard_resources']
   );
   
-  if ($username AND $password AND $boinc_name AND $boinc_resources) {
+  if ($username and $password and $boinc_name and $boinc_resources) {
     // Test authentication
-    $authenticated = FALSE;
+    $authenticated = false;
     $path = "project/{$boinc_name}/resource/{$boinc_resources[0]}/translation/en";
-    $response = boinctranslate_transifex_request($path, NULL, TRUE, FALSE, $username, $password);
+    $response = boinctranslate_transifex_request($path, null, true, false, $username, $password);
     
     if ($response) {
       if ($response == '401 UNAUTHORIZED') {
@@ -292,7 +292,7 @@ 
         );
       }
       else {
-        $authenticated = TRUE;
+        $authenticated = true;
       }
     }
     
@@ -306,16 +306,16 @@ 
       $project_resources = boinctranslate_parse_resources(
         $values['boinc_translate_transifex_project_resources']
       );
-      if ($project_name AND $project_resources) {
+      if ($project_name and $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
       }
-      elseif ($project_name AND !$project_resources) {
+      elseif ($project_name and !$project_resources) {
         drupal_set_message(
           t('No project-specific resources were provided'),
           'warning'
         );
       }
-      elseif ($project_resources AND !$project_name) {
+      elseif ($project_resources and !$project_name) {
         drupal_set_message(
           t('No project-specific Transifex project name was provided'),
           'warning'

drupal/sites/default/boinc/modules/boincuser/boincuser.views.inc

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 function boincuser_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
+      'path' => drupal_get_path('module', 'boincuser').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincuser_id' => array(

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

@@ -34,16 +34,16 @@ 
   // Primary keys allowed as arguments
   
   $data['user']['id'] = array(
-    'title' => bts('Id', array(), NULL, 'boinc:user-id'),
+    'title' => bts('Id', array(), null, 'boinc:user-id'),
     'help' => t('The BOINC ID of the user account.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -54,16 +54,16 @@ 
     )
   );
   $data['user']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The ID of the user\'s team.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
+      'click sortable' => true,
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -77,11 +77,11 @@ 
   // Descriptions of general host fields (alphabetized)
   
   $data['user']['authenticator'] = array(
-    'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Account Key', array(), null, 'boinc:user-info'),
     'help' => t('The BOINC account key of the user.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -91,11 +91,11 @@ 
     )
   );
   $data['user']['country'] = array(
-    'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    'title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     'help' => t('The country of the user.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -105,11 +105,11 @@ 
     )
   );
   $data['user']['create_time'] = array(
-    'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Member since', array(), null, 'boinc:user-info'),
     'help' => t('When the BOINC account was created.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -119,11 +119,11 @@ 
     )
   );
   $data['user']['cross_project_id'] = array(
-    'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
+    'title' => bts('CPID', array(), null, 'boinc:user-info'),
     'help' => t('The cross project user identifier.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -133,11 +133,11 @@ 
     )
   );
   $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+      'title' => bts('Email Address', array(), null, 'boinc:user-info'),
     'help' => t('The BOINC account email address.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -147,12 +147,12 @@ 
     )
   );
   $data['user']['expavg_credit'] = array(
-    'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
+    'title' => bts('Recent average credit', array(), null, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of credit per day for the user.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -162,11 +162,11 @@ 
     )
   );
   $data['user']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+    'title' => bts('Name', array(), null, 'boinc:user-or-team-name'),
     'help' => t('The BOINC account user name.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -176,11 +176,11 @@ 
     )                           
   );
   $data['user']['passwd_hash'] = array(
-    'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Password Hash', array(), null, 'boinc:user-info'),
     'help' => t('The user password hash'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -190,11 +190,11 @@ 
     )
   );
   $data['user']['postal_code'] = array(
-    'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Postal Code', array(), null, 'boinc:user-info'),
     'help' => t('The postal code of the user.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -204,11 +204,11 @@ 
     )
   );
   $data['user']['send_email'] = array(
-    'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Send Email', array(), null, 'boinc:user-info'),
     'help' => t('User preference to allow email communications.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -218,11 +218,11 @@ 
     )
   );
   $data['user']['show_hosts'] = array(
-    'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Show Hosts', array(), null, 'boinc:user-info'),
     'help' => t('User preference to display owned computers.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -232,12 +232,12 @@ 
     )
   );
   $data['user']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+    'title' => bts('Total credit', array(), null, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for the user.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -247,11 +247,11 @@ 
     )
   );
   $data['user']['url'] = array(
-    'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
+    'title' => bts('URL', array(), null, 'boinc:website-of-user-or-team'),
     'help' => t('The URL provided by the user'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'

Indentation +125 added lines, -125 removed lines

@@ -13,255 +13,255 @@ 
  */
 function boincuser_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for user table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for user table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['user']['table']['group'] = t('BOINC');
+    $data['user']['table']['group'] = t('BOINC');
   
-  $data['user']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC user'),
-      'help' => t('BOINC account data for a user'),
-      'database' => 'boinc_ro'
-  );
+    $data['user']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC user'),
+        'help' => t('BOINC account data for a user'),
+        'database' => 'boinc_ro'
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['user']['id'] = array(
+    $data['user']['id'] = array(
     'title' => bts('Id', array(), NULL, 'boinc:user-id'),
     'help' => t('The BOINC ID of the user account.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['teamid'] = array(
+    );
+    $data['user']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The ID of the user\'s team.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general host fields (alphabetized)
+    // Descriptions of general host fields (alphabetized)
   
-  $data['user']['authenticator'] = array(
+    $data['user']['authenticator'] = array(
     'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
     'help' => t('The BOINC account key of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['country'] = array(
+    );
+    $data['user']['country'] = array(
     'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     'help' => t('The country of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['create_time'] = array(
+    );
+    $data['user']['create_time'] = array(
     'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
     'help' => t('When the BOINC account was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['user']['cross_project_id'] = array(
+    );
+    $data['user']['cross_project_id'] = array(
     'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
     'help' => t('The cross project user identifier.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+    );
+    $data['user']['email_addr'] = array(
+        'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
     'help' => t('The BOINC account email address.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['expavg_credit'] = array(
+    );
+    $data['user']['expavg_credit'] = array(
     'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of credit per day for the user.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['name'] = array(
+    );
+    $data['user']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     'help' => t('The BOINC account user name.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )                           
-  );
-  $data['user']['passwd_hash'] = array(
+    );
+    $data['user']['passwd_hash'] = array(
     'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
     'help' => t('The user password hash'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['postal_code'] = array(
+    );
+    $data['user']['postal_code'] = array(
     'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
     'help' => t('The postal code of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['send_email'] = array(
+    );
+    $data['user']['send_email'] = array(
     'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
     'help' => t('User preference to allow email communications.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['show_hosts'] = array(
+    );
+    $data['user']['show_hosts'] = array(
     'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
     'help' => t('User preference to display owned computers.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['total_credit'] = array(
+    );
+    $data['user']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for the user.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['url'] = array(
+    );
+    $data['user']['url'] = array(
     'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
     'help' => t('The URL provided by the user'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -272,17 +272,17 @@ 
  */
 
 function boincuser_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
+        'path' => drupal_get_path('module', 'boincuser') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
+        'views_handler_argument_boincuser_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_argument_boincteam_id' => array(
+        ),
+        'views_handler_argument_boincteam_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
+        ),
     )
-  );
+    );
 }

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

Braces +3 added lines, -6 removed lines

@@ -157,13 +157,11 @@ 
   if (!$values['boinc_root_dir']) {
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
       defined!'));
-  }
-  elseif (!is_dir($values['boinc_root_dir'])) {
+  } elseif (!is_dir($values['boinc_root_dir'])) {
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
       array('%directory' => $values['boinc_root_dir'])
     ));
-  }
-  else {
+  } else {
     // By default, try to automatically set specific directories from the root
     if (!$values['boinc_config_xml_dir']) {
       $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
@@ -285,8 +283,7 @@ 
   if (!$values['boinc_scheduler_urls']) {
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
       URL must be specified.'));
-  }
-  else {
+  } else {
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
     foreach ($urls as $key => $url) {
       if (!$url) {

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/server_status.php',
+        '%full_url' => $base_url.'/server_status.php',
         '%relative_url' => 'server_status.php',
       )
     ),
@@ -131,7 +131,7 @@ 
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/apps.php',
+        '%full_url' => $base_url.'/apps.php',
         '%relative_url' => 'apps.php',
       )
     ),
@@ -354,7 +354,7 @@ 
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
-    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
+    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ').l(t('User management -> User settings'), '/admin/user/settings').'. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
   );
 
   $form['boinc_weboptions_registrationtitle'] = array(
@@ -409,32 +409,32 @@ 
     '#rows' => 8,
     '#description' => t('A list of Drupal URLs/paths to ignore for Terms of Use (ToU). If the option above \'Are existing users forced to agree to the Terms of Use?\' is activated, then some paths need to be ignored when checking if a user has agreed to the ToU. A good example is the logout path, "logout", or else users will not be able to logout!
 <p>There is a default list of paths that must be ignored or else the site will not function. They are not included in this box. Here you may provide additional paths to be ignored, for example the privacy policy page may be accessible so that users may read it before agreeing to the site\'s ToU.
-<p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url . '/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with ' . $base_url . '/account/.'),
+<p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url.'/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with '.$base_url.'/account/.'),
   );
 
   $form['pathtitle'] = array(
     '#value' => '<h3>Path Options</h3>',
   );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+  $form['boinc_weboptions_accountfinish'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
   );
-  $form['boinc_weboptions_moderationpage'] = array (
+  $form['boinc_weboptions_moderationpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
   );
-  $form['boinc_weboptions_rulespolicies'] = array (
+  $form['boinc_weboptions_rulespolicies'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
   );
-  $form['boinc_other_frontpage'] = array (
+  $form['boinc_other_frontpage'] = array(
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
@@ -447,7 +447,7 @@ 
     '#value' => '<h3>Other Options</h3>',
   );
 
-  $form['boinc_weboptions_blacklisted_usernames'] = array (
+  $form['boinc_weboptions_blacklisted_usernames'] = array(
     '#type' => 'textarea',
     '#title' => t('BOINC username blacklist'),
     '#default_value' => $default['boinc_weboptions_blacklisted_usernames'],
@@ -466,17 +466,17 @@ 
   $values = $form_state['values'];
 
   $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+  if (($accountfinish) AND (!drupal_lookup_path('source', $accountfinish))) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+  if (($moderationpage) AND (!drupal_lookup_path('source', $moderationpage))) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+  if (($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies))) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
   }
 }
@@ -485,5 +485,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+  drupal_set_message(bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options'));
 }

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

@@ -49,7 +49,7 @@ 
   //drupal_set_message(print_r($default, true));
   //drupal_set_message(print_r($form_state, true));
   // Show overrides if the root dir is set and others have not been detected
-  $show_overrides = FALSE;
+  $show_overrides = false;
   if ($default['boinc_root_dir']) {
     foreach ($default as $key => $dir) {
       switch ($key) {
@@ -60,7 +60,7 @@ 
         // If any of these values are not set, show the overrides section
         if (!$dir) {
           $default[$key] = $form_state['values'][$key];
-          $show_overrides = TRUE;
+          $show_overrides = true;
           break;
         }
         break;
@@ -84,7 +84,7 @@ 
     '#title' => t('Overrides'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => !$show_overrides,
     '#attributes' => array('class' => 'advanced-settings')
   );
@@ -222,7 +222,7 @@ 
       ));
     }
     if ($values['boinc_host_sched_logs_dir']
-        AND !is_dir($values['boinc_host_sched_logs_dir'])
+        and !is_dir($values['boinc_host_sched_logs_dir'])
       ) {
       form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
         directory not found at %directory',
@@ -330,13 +330,13 @@ 
 
   //form defaults
   $default = array(
-    'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE),
+    'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', true),
     'boinc_weboptions_registrationtitle' => variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'),
     'boinc_weboptions_termsofuse' => variable_get('boinc_weboptions_termsofuse', ''),
-    'boinc_weboptions_overrideboinctou' => variable_get('boinc_weboptions_overrideboinctou', FALSE),
+    'boinc_weboptions_overrideboinctou' => variable_get('boinc_weboptions_overrideboinctou', false),
     'boinc_weboptions_agreequestion' => variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'),
     'boinc_weboptions_registrationtitle2' => variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'),
-    'boinc_weboptions_existinguser_tou' => variable_get('boinc_weboptions_existinguser_tou', FALSE),
+    'boinc_weboptions_existinguser_tou' => variable_get('boinc_weboptions_existinguser_tou', false),
     'boinc_weboptions_pathstoignore' => variable_get('boinc_weboptions_pathstoignore', "moderation\ncontent/moderation\nprivacy"),
     'boinc_weboptions_accountfinish' => variable_get('boinc_weboptions_accountfinish', ''),
     'boinc_weboptions_moderationpage' => variable_get('boinc_weboptions_moderationpage', ''),
@@ -436,11 +436,11 @@ 
   );
   $form['boinc_other_frontpage'] = array (
     '#type' => 'textarea',
-    '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
+    '#title' => bts('Message for site\'s Home Page', array(), null, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
     '#cols' => 60,
     '#rows' => 8,
-    '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), NULL, 'boinc:admin-boinc-other-options'),
+    '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), null, 'boinc:admin-boinc-other-options'),
   );
 
   $form['Othertitle'] = array(
@@ -466,17 +466,17 @@ 
   $values = $form_state['values'];
 
   $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+  if ( ($accountfinish) and (!drupal_lookup_path('source', $accountfinish)) ) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+  if ( ($moderationpage) and (!drupal_lookup_path('source', $moderationpage)) ) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+  if ( ($rulespolicies) and (!drupal_lookup_path('source', $rulespolicies)) ) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
   }
 }
@@ -485,5 +485,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), null, 'boinc:admin-boinc-website-options') );
 }

Indentation +183 added lines, -183 removed lines

@@ -28,13 +28,13 @@ 
 }*/
 
 /**
-  * The BOINC environment form allows paths to be set to connect Drupal to an
-  * existing BOINC web interface.
-  */
+ * The BOINC environment form allows paths to be set to connect Drupal to an
+ * existing BOINC web interface.
+ */
 function boincuser_admin_environment(&$form_state) {
-  global $base_url;
-  $form = array();
-  $default = array(
+    global $base_url;
+    $form = array();
+    $default = array(
     'boinc_root_dir' => variable_get('boinc_root_dir', ''),
     'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''),
     'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''),
@@ -47,303 +47,303 @@ 
     'boinc_admin_mailing_list_subject_tag' => variable_get('boinc_admin_mailing_list_subject_tag', ''),
     'boinc_debug_mode' => variable_get('boinc_debug_mode', 0),
     'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''),
-  );
-  //drupal_set_message(print_r($default, true));
-  //drupal_set_message(print_r($form_state, true));
-  // Show overrides if the root dir is set and others have not been detected
-  $show_overrides = FALSE;
-  if ($default['boinc_root_dir']) {
+    );
+    //drupal_set_message(print_r($default, true));
+    //drupal_set_message(print_r($form_state, true));
+    // Show overrides if the root dir is set and others have not been detected
+    $show_overrides = FALSE;
+    if ($default['boinc_root_dir']) {
     foreach ($default as $key => $dir) {
-      switch ($key) {
-      case 'boinc_config_xml_dir':
+        switch ($key) {
+        case 'boinc_config_xml_dir':
       case 'boinc_html_inc_dir':
       case 'boinc_project_config_dir':
       case 'boinc_user_image_dir':
         // If any of these values are not set, show the overrides section
         if (!$dir) {
-          $default[$key] = $form_state['values'][$key];
-          $show_overrides = TRUE;
-          break;
+            $default[$key] = $form_state['values'][$key];
+            $show_overrides = TRUE;
+            break;
         }
         break;
-      default:
+        default:
       }
-      if ($show_overrides) {
+        if ($show_overrides) {
         break;
-      }
+        }
+    }
     }
-  }
-  // Define the form
-  $form['boinc_root_dir'] = array(
+    // Define the form
+    $form['boinc_root_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC project root directory'),
     '#default_value' => $default['boinc_root_dir'], 
     '#description' => t('The filesystem path to the BOINC project root. This
       directory should contain config.xml as well as the html subdirectory,
       which itself contains inc/, project/, and user_profile/.'),
-  );
-  $form['overrides'] = array(
+    );
+    $form['overrides'] = array(
     '#title' => t('Overrides'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => !$show_overrides,
     '#attributes' => array('class' => 'advanced-settings')
-  );
-  $form['overrides']['boinc_config_xml_dir'] = array(
+    );
+    $form['overrides']['boinc_config_xml_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC config.xml directory'),
     '#default_value' => $default['boinc_config_xml_dir'],
     '#description' => t('The filesystem path that contains config.xml'),
-  );
-  $form['overrides']['boinc_html_inc_dir'] = array(
+    );
+    $form['overrides']['boinc_html_inc_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC web includes directory'),
     '#default_value' => $default['boinc_html_inc_dir'],
     '#description' => t('The filesystem path to the html/inc/ directory that
       contains util.inc'),
-  );
-  $form['overrides']['boinc_project_config_dir'] = array(
+    );
+    $form['overrides']['boinc_project_config_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC project config directory'),
     '#default_value' => $default['boinc_project_config_dir'],
     '#description' => t('The filesystem path to the project/ directory that
       contains project.inc'),
-  );
-  $form['overrides']['boinc_user_image_dir'] = array(
+    );
+    $form['overrides']['boinc_user_image_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC user profile image directory'),
     '#default_value' => $default['boinc_user_image_dir'],
     '#description' => t('The filesystem directory that contains user images'),
-  );
-  $form['boinc_server_status_url'] = array(
+    );
+    $form['boinc_server_status_url'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC server status page URL (optional)'),
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
-      array(
+        array(
         '%full_url' => $base_url . '/server_status.php',
         '%relative_url' => 'server_status.php',
-      )
+        )
     ),
-  );
-  $form['boinc_app_list_url'] = array(
+    );
+    $form['boinc_app_list_url'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC applications page URL (optional)'),
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
-      array(
+        array(
         '%full_url' => $base_url . '/apps.php',
         '%relative_url' => 'apps.php',
-      )
+        )
     ),
-  );
-  $form['boinc_host_sched_logs_dir'] = array(
+    );
+    $form['boinc_host_sched_logs_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC host scheduler log directory (optional)'),
     '#default_value' => $default['boinc_host_sched_logs_dir'],
     '#description' => t('The filesystem directory that contains host scheduler logs'),
-  );
-  $form['boinc_admin_mailing_list'] = array(
+    );
+    $form['boinc_admin_mailing_list'] = array(
     '#type' => 'textfield',
     '#title' => t('Admin mailing list'),
     '#default_value' => $default['boinc_admin_mailing_list'],
     '#description' => t('Enter an email-address which will be used to contact admisistrators. If empty, the site email configured in Settings -> Site Information will be used.'),
-  );
-  $form['boinc_admin_mailing_list_subject_tag'] = array(
+    );
+    $form['boinc_admin_mailing_list_subject_tag'] = array(
     '#type' => 'textfield',
     '#title' => t('Admin mailing list - subject tag'),
     '#default_value' => $default['boinc_admin_mailing_list_subject_tag'],
     '#description' => t('Text which will appear at the beginning of the subject for any admin notification emails. If empty, no tag will be included. Examples: [drupal-error].'),
-  );
-  $form['boinc_debug_mode'] = array(
+    );
+    $form['boinc_debug_mode'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show debug messages in system log'),
     '#default_value' => $default['boinc_debug_mode']
-  );
-  $form['boinc_project_config_keywords'] = array(
+    );
+    $form['boinc_project_config_keywords'] = array(
     '#type' => 'textarea',
     '#title' => t('Project/Job Keywords for get_project_config RPC'),
     '#default_value' => $default['boinc_project_config_keywords'],
     '#description' => t('XML from this text box will be appended to the XML output from the get_project_config RPC. There is no check for XML validity! See !link for more details. It is okay to leave this blank.',
     array(
-      '!link' => l('BOINC wiki page', 'https://boinc.berkeley.edu/trac/wiki/JobKeywords')
+        '!link' => l('BOINC wiki page', 'https://boinc.berkeley.edu/trac/wiki/JobKeywords')
     )),
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC environment form.
-  */
+ * Validate the BOINC environment form.
+ */
 function boincuser_admin_environment_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_root_dir']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_root_dir']) {
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
       defined!'));
-  }
-  elseif (!is_dir($values['boinc_root_dir'])) {
+    }
+    elseif (!is_dir($values['boinc_root_dir'])) {
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
-      array('%directory' => $values['boinc_root_dir'])
+        array('%directory' => $values['boinc_root_dir'])
     ));
-  }
-  else {
+    }
+    else {
     // By default, try to automatically set specific directories from the root
     if (!$values['boinc_config_xml_dir']) {
-      $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
-      form_set_value($form['overrides']['boinc_config_xml_dir'], $values['boinc_config_xml_dir'], $form_state);
+        $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
+        form_set_value($form['overrides']['boinc_config_xml_dir'], $values['boinc_config_xml_dir'], $form_state);
     }
     if (!$values['boinc_html_inc_dir']) {
-      $values['boinc_html_inc_dir'] = "{$values['boinc_root_dir']}/html/inc";
-      form_set_value($form['overrides']['boinc_html_inc_dir'], $values['boinc_html_inc_dir'], $form_state);
+        $values['boinc_html_inc_dir'] = "{$values['boinc_root_dir']}/html/inc";
+        form_set_value($form['overrides']['boinc_html_inc_dir'], $values['boinc_html_inc_dir'], $form_state);
     }
     if (!$values['boinc_project_config_dir']) {
-      $values['boinc_project_config_dir'] = "{$values['boinc_root_dir']}/html/project";
-      form_set_value($form['overrides']['boinc_project_config_dir'], $values['boinc_project_config_dir'], $form_state);
+        $values['boinc_project_config_dir'] = "{$values['boinc_root_dir']}/html/project";
+        form_set_value($form['overrides']['boinc_project_config_dir'], $values['boinc_project_config_dir'], $form_state);
     }
     if (!$values['boinc_user_image_dir']) {
-      $values['boinc_user_image_dir'] = "{$values['boinc_root_dir']}/html/user_profile/images";
-      form_set_value($form['overrides']['boinc_user_image_dir'], $values['boinc_user_image_dir'], $form_state);
+        $values['boinc_user_image_dir'] = "{$values['boinc_root_dir']}/html/user_profile/images";
+        form_set_value($form['overrides']['boinc_user_image_dir'], $values['boinc_user_image_dir'], $form_state);
     }
     // Validate that required BOINC content is found
     if (!is_readable("{$values['boinc_config_xml_dir']}/config.xml")) {
-      form_set_error('boinc_config_xml_dir', t('@file not found in %directory',
+        form_set_error('boinc_config_xml_dir', t('@file not found in %directory',
         array(
-          '@file' => 'config.xml',
-          '%directory' => "{$values['boinc_config_xml_dir']}/"
+            '@file' => 'config.xml',
+            '%directory' => "{$values['boinc_config_xml_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_readable("{$values['boinc_html_inc_dir']}/util.inc")) {
-      form_set_error('boinc_html_inc_dir', t('@file not found in %directory',
+        form_set_error('boinc_html_inc_dir', t('@file not found in %directory',
         array(
-          '@file' => 'util.inc',
-          '%directory' => "{$values['boinc_html_inc_dir']}/"
+            '@file' => 'util.inc',
+            '%directory' => "{$values['boinc_html_inc_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_readable("{$values['boinc_project_config_dir']}/project.inc")) {
-      form_set_error('boinc_project_config_dir', t('@file not found in %directory',
+        form_set_error('boinc_project_config_dir', t('@file not found in %directory',
         array(
-          '@file' => 'project.inc',
-          '%directory' => "{$values['boinc_project_config_dir']}/"
+            '@file' => 'project.inc',
+            '%directory' => "{$values['boinc_project_config_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_dir($values['boinc_user_image_dir'])) {
-      form_set_error('boinc_user_image_dir', t('Profile image directory not found
+        form_set_error('boinc_user_image_dir', t('Profile image directory not found
         at %directory', array('%directory' => $values['boinc_user_image_dir'])
-      ));
+        ));
     }
     if ($values['boinc_host_sched_logs_dir']
         AND !is_dir($values['boinc_host_sched_logs_dir'])
-      ) {
-      form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
+        ) {
+        form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
         directory not found at %directory',
         array('%directory' => $values['boinc_host_sched_logs_dir'])
-      ));
+        ));
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of BOINC environment form.
-  */
+ * Handle post-validation submission of BOINC environment form.
+ */
 function boincuser_admin_environment_submit($form, &$form_state) {
-  unset($_SESSION['boinc_env']);
-  drupal_set_message(t('BOINC environment settings have been updated.'));
+    unset($_SESSION['boinc_env']);
+    drupal_set_message(t('BOINC environment settings have been updated.'));
 }
 
 /**
-  * The BOINC scheduler form provides options for how scheduler tags are
-  * inserted into the front page
-  */
+ * The BOINC scheduler form provides options for how scheduler tags are
+ * inserted into the front page
+ */
 function boincuser_admin_scheduler(&$form_state) {
-  $form = array();
-  $config_cgi_url = '';
-  if ($config_xml_dir = variable_get('boinc_config_xml_dir', '')) {
+    $form = array();
+    $config_cgi_url = '';
+    if ($config_xml_dir = variable_get('boinc_config_xml_dir', '')) {
     // Get the cgi_url option from the config file as the default scheduler URL
     $xml = new DOMDocument();
     if ($xml->load("{$config_xml_dir}/config.xml")) {
-      $config = xml_to_array($xml);
-      if (isset($config['boinc']['config']['cgi_url']['@value'])) {
+        $config = xml_to_array($xml);
+        if (isset($config['boinc']['config']['cgi_url']['@value'])) {
         $config_cgi_url = rtrim(trim($config['boinc']['config']['cgi_url']['@value']), '/');
         $config_cgi_url .= '/cgi';
-      }
+        }
     }
-  }
-  $default = array(
+    }
+    $default = array(
     'boinc_scheduler_urls' => variable_get('boinc_scheduler_urls', $config_cgi_url),
     'boinc_scheduler_tag_format_old' => variable_get('boinc_scheduler_tag_format_old', 1),
     'boinc_scheduler_tag_format_new' => variable_get('boinc_scheduler_tag_format_new', 1)
-  );
+    );
   
-  // Define the form
-  $form['boinc_scheduler_urls'] = array(
+    // Define the form
+    $form['boinc_scheduler_urls'] = array(
     '#type' => 'textarea',
     '#title' => t('Scheduling server URLs'),
     '#default_value' => $default['boinc_scheduler_urls'],
     '#cols' => 60,
     '#rows' => 5,
     '#description' => t('If there are multiple URLs, please enter one per line.'),
-  );
-  $form['boinc_scheduler_tag_format_old'] = array(
+    );
+    $form['boinc_scheduler_tag_format_old'] = array(
     '#type' => 'checkbox',
     '#title' => t('Old format (@scheduler tag)', array('@scheduler' => '<scheduler>')),
     '#default_value' => $default['boinc_scheduler_tag_format_old']
-  );
-  $form['boinc_scheduler_tag_format_new'] = array(
+    );
+    $form['boinc_scheduler_tag_format_new'] = array(
     '#type' => 'checkbox',
     '#title' => t('New format (@link tag)', array('@link' => '<link>')),
     '#default_value' => $default['boinc_scheduler_tag_format_new']
-  );
+    );
   
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC scheduler form.
-  */
+ * Validate the BOINC scheduler form.
+ */
 function boincuser_admin_scheduler_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_scheduler_urls']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_scheduler_urls']) {
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
       URL must be specified.'));
-  }
-  else {
+    }
+    else {
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
     foreach ($urls as $key => $url) {
-      if (!$url) {
+        if (!$url) {
         unset($urls[$key]);
         continue;
-      }
-      if (!filter_var($url, FILTER_VALIDATE_URL)) {
+        }
+        if (!filter_var($url, FILTER_VALIDATE_URL)) {
         form_set_error('boinc_scheduler_urls', t('@url is not a valid URL
           format.', array('@url' => $url)));
         break;
-      }
+        }
     }
     $form_state['values']['boinc_scheduler_urls'] = implode("\r\n", $urls);
-  }
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC scheduler form.
-  */
+ * Handle post-validation submission of BOINC scheduler form.
+ */
 function boincuser_admin_scheduler_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC scheduling server settings have been updated.'));
+    drupal_set_message(t('BOINC scheduling server settings have been updated.'));
 }
 
 
 /**
-  * Drupal-BOINC Web site related options.
-  */
+ * Drupal-BOINC Web site related options.
+ */
 function boincuser_admin_weboptions(&$form_state) {
-  global $base_url;
-  $form = array();
+    global $base_url;
+    $form = array();
 
-  //form defaults
-  $default = array(
+    //form defaults
+    $default = array(
     'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE),
     'boinc_weboptions_registrationtitle' => variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'),
     'boinc_weboptions_termsofuse' => variable_get('boinc_weboptions_termsofuse', ''),
@@ -357,65 +357,65 @@ 
     'boinc_weboptions_rulespolicies' => variable_get('boinc_weboptions_rulespolicies', ''),
     'boinc_other_frontpage' => variable_get('boinc_other_frontpage', ''),
     'boinc_weboptions_blacklisted_usernames' => variable_get('boinc_weboptions_blacklisted_usernames', "admin\nadministrator\nmoderator"),
-  );
+    );
 
-  // Define the form
-  $form['registrationtitle'] = array(
+    // Define the form
+    $form['registrationtitle'] = array(
     '#value' => '<h3>BOINC Registration</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_enableaccountcreateRPC'] = array(
+    $form['boinc_weboptions_enableaccountcreateRPC'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
     '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
-  );
+    );
 
-  $form['boinc_weboptions_registrationtitle'] = array(
+    $form['boinc_weboptions_registrationtitle'] = array(
     '#type' => 'textfield',
     '#title' => t('Title of regsistration page'),
     '#description' => t('Title text presented above the terms of use text.'),
     '#default_value' => $default['boinc_weboptions_registrationtitle'],
-  );
+    );
 
-  $form['boinc_weboptions_termsofuse'] = array(
+    $form['boinc_weboptions_termsofuse'] = array(
     '#type' => 'textarea',
     '#title' => t('Terms of Use Message for User Registration Page'),
     '#default_value' => $default['boinc_weboptions_termsofuse'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => t('Text to be displayed on site\'s user registration page. Privacy policy and other data retention information goes here. If empty, there will be no terms of use message, and the title above and checkbox below will not be shown.'),
-  );
+    );
 
-  $form['boinc_weboptions_overrideboinctou'] = array(
+    $form['boinc_weboptions_overrideboinctou'] = array(
     '#type' => 'checkbox',
     '#title' => t('Override BOINC terms of use.'),
     '#default_value' => $default['boinc_weboptions_overrideboinctou'],
     '#description' => t('Override the BOINC terms_of_use.txt file for get_profject_config.php RPC. If TRUE, the get_project_config.php RPC will use the above terms of use text entered above. Otherwise, the original terms_of_use.txt text file in the project directory is used. And you will need to be responsible for keeping both the text file and the above terms of use text up-to-date and in sync with each other.'),
-  );
+    );
 
-  $form['boinc_weboptions_agreequestion'] = array(
+    $form['boinc_weboptions_agreequestion'] = array(
     '#type' => 'textfield',
     '#title' => t('Terms of use agreement question'),
     '#description' => t('This text is presented to the user as the question next to the \'I agree\' checkbox.'),
     '#default_value' => $default['boinc_weboptions_agreequestion'],
-  );
+    );
 
-  $form['boinc_weboptions_registrationtitle2'] = array(
+    $form['boinc_weboptions_registrationtitle2'] = array(
     '#type' => 'textfield',
     '#title' => t('Instructions for username/email/password questions'),
     '#description' => t('Title text presented below terms of use and above username/email/password textfields.'),
     '#default_value' => $default['boinc_weboptions_registrationtitle2'],
-  );
+    );
 
-  $form['boinc_weboptions_existinguser_tou'] = array(
+    $form['boinc_weboptions_existinguser_tou'] = array(
     '#type' => 'checkbox',
     '#title' => t('Are existing users forced to agree to the Terms of Use?'),
     '#default_value' => $default['boinc_weboptions_existinguser_tou'],
     '#description' => t('If TRUE, existing users are forced to agree to a terms of use (if present) when the login and the system has detected they have not agreed. Otherwise they may login as normal. This option has no affect on whether or not new users must agree to the terms of use.'),
-  );
+    );
 
-  $form['boinc_weboptions_pathstoignore'] = array(
+    $form['boinc_weboptions_pathstoignore'] = array(
     '#type' => 'textarea',
     '#title' => t('Paths to ignore the Terms of Use page'),
     '#default_value' => $default['boinc_weboptions_pathstoignore'],
@@ -424,80 +424,80 @@ 
     '#description' => t('A list of Drupal URLs/paths to ignore for Terms of Use (ToU). If the option above \'Are existing users forced to agree to the Terms of Use?\' is activated, then some paths need to be ignored when checking if a user has agreed to the ToU. A good example is the logout path, "logout", or else users will not be able to logout!
 <p>There is a default list of paths that must be ignored or else the site will not function. They are not included in this box. Here you may provide additional paths to be ignored, for example the privacy policy page may be accessible so that users may read it before agreeing to the site\'s ToU.
 <p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url . '/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with ' . $base_url . '/account/.'),
-  );
+    );
 
-  $form['pathtitle'] = array(
+    $form['pathtitle'] = array(
     '#value' => '<h3>Path Options</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+    $form['boinc_weboptions_accountfinish'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
-  );
-  $form['boinc_weboptions_moderationpage'] = array (
+    );
+    $form['boinc_weboptions_moderationpage'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
-  );
-  $form['boinc_weboptions_rulespolicies'] = array (
+    );
+    $form['boinc_weboptions_rulespolicies'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
-  );
-  $form['boinc_other_frontpage'] = array (
+    );
+    $form['boinc_other_frontpage'] = array (
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), NULL, 'boinc:admin-boinc-other-options'),
-  );
+    );
 
-  $form['Othertitle'] = array(
+    $form['Othertitle'] = array(
     '#value' => '<h3>Other Options</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_blacklisted_usernames'] = array (
+    $form['boinc_weboptions_blacklisted_usernames'] = array (
     '#type' => 'textarea',
     '#title' => t('BOINC username blacklist'),
     '#default_value' => $default['boinc_weboptions_blacklisted_usernames'],
     '#cols' => 60,
     '#rows' => 7,
     '#description' => t('Username blacklist: List of names that users will not be able to choose as their BOINC username. This will only affect Web registration and when a user changes their name using the Web site. Names should be entered one per line.<p>All names should be <em>lower-case</em>. The comparison made is case-insensitive.<p>If you wish to <em>disable</em> this feature, remove all names from this textbox; the blacklist will be empty.'),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate BOINC other form
-  */
+ * Validate BOINC other form
+ */
 function boincuser_admin_weboptions_validate($form, &$form_state) {
-  $values = $form_state['values'];
+    $values = $form_state['values'];
 
-  $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+    $accountfinish = $values['boinc_weboptions_accountfinish'];
+    if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 
-  $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+    $moderationpage = $values['boinc_weboptions_moderationpage'];
+    if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 
-  $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+    $rulespolicies = $values['boinc_weboptions_rulespolicies'];
+    if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 }
 
 /**
-  * Submit BOINC other form
-  */
+ * Submit BOINC other form
+ */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+    drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
 }

drupal/sites/default/boinc/themes/boinc/theme-settings.php

Indentation +19 added lines, -19 removed lines

@@ -15,42 +15,42 @@
  */
 function boinc_settings($saved_settings) {
 
-  // Get the default values from the .info file.
-  $defaults = zen_theme_get_default_settings('boinc');
+    // Get the default values from the .info file.
+    $defaults = zen_theme_get_default_settings('boinc');
 
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
+    // Merge the saved variables and their default values.
+    $settings = array_merge($defaults, $saved_settings);
 
-  /*
+    /*
    * Create the form using Forms API: http://api.drupal.org/api/6
    */
-  $form = array();
-  $form['boinc_stats_charts'] = array(
+    $form = array();
+    $form['boinc_stats_charts'] = array(
     '#type' => 'fieldset',
     '#title' => t('Chart settings'),
     '#attributes' => array(
-      'class' => 'zen-settings',
+        'class' => 'zen-settings',
     ),
-  );
-  $form['boinc_stats_charts']['boinc_stats_chart_color'] = array(
+    );
+    $form['boinc_stats_charts']['boinc_stats_chart_color'] = array(
     '#type'          => 'textfield',
     '#title'         => t('Chart color'),
     '#default_value' => $settings['boinc_stats_chart_color'],
     '#description'   => t('The primary color of the stats chart in hex format (e.g. #FAA341).'),
-  );
-  $form['boinc_stats_charts']['boinc_stats_chart_bcolor'] = array(
+    );
+    $form['boinc_stats_charts']['boinc_stats_chart_bcolor'] = array(
     '#type'          => 'textfield',
     '#title'         => t('Chart background color'),
     '#default_value' => $settings['boinc_stats_chart_bcolor'],
     '#description'   => t('The background color of the stats chart in hex format (e.g. #FFFFFF).'),
-  );
+    );
 
-  // Add the base theme's settings.
-  $form += zen_settings($saved_settings, $defaults);
+    // Add the base theme's settings.
+    $form += zen_settings($saved_settings, $defaults);
 
-  // Remove some of the base theme's settings.
-  unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
+    // Remove some of the base theme's settings.
+    unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
 
-  // Return the form
-  return $form;
+    // Return the form
+    return $form;
 }

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: theme-settings.php,v 1.7 2008/09/11 09:36:50 johnalbin Exp $
 
 // Include the definition of zen_settings() and zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'zen') . '/theme-settings.php';
+include_once './'.drupal_get_path('theme', 'zen').'/theme-settings.php';
 
 
 /**

drupal/sites/all/features/internationalization/internationalization.strongarm.inc

Indentation +22 added lines, -22 removed lines

@@ -4,34 +4,34 @@
  * Implementation of hook_strongarm().
  */
 function internationalization_strongarm() {
-  $export = array();
+    $export = array();
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'i18nstrings_allowed_formats';
-  $strongarm->value = array(
+    $strongarm = new stdClass;
+    $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+    $strongarm->api_version = 1;
+    $strongarm->name = 'i18nstrings_allowed_formats';
+    $strongarm->value = array(
     0 => 4,
     1 => 5,
-  );
-  $export['i18nstrings_allowed_formats'] = $strongarm;
+    );
+    $export['i18nstrings_allowed_formats'] = $strongarm;
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'i18ntaxonomy_vocabulary';
-  $strongarm->value = array(
+    $strongarm = new stdClass;
+    $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+    $strongarm->api_version = 1;
+    $strongarm->name = 'i18ntaxonomy_vocabulary';
+    $strongarm->value = array(
     2 => '1',
     1 => '0',
-  );
-  $export['i18ntaxonomy_vocabulary'] = $strongarm;
+    );
+    $export['i18ntaxonomy_vocabulary'] = $strongarm;
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'language_negotiation';
-  $strongarm->value = '2';
-  $export['language_negotiation'] = $strongarm;
+    $strongarm = new stdClass;
+    $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+    $strongarm->api_version = 1;
+    $strongarm->name = 'language_negotiation';
+    $strongarm->value = '2';
+    $export['language_negotiation'] = $strongarm;
 
-  return $export;
+    return $export;
 }

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

@@ -7,7 +7,7 @@ 
   $export = array();
 
   $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->disabled = false; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'i18nstrings_allowed_formats';
   $strongarm->value = array(
@@ -17,7 +17,7 @@ 
   $export['i18nstrings_allowed_formats'] = $strongarm;
 
   $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->disabled = false; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'i18ntaxonomy_vocabulary';
   $strongarm->value = array(
@@ -27,7 +27,7 @@ 
   $export['i18ntaxonomy_vocabulary'] = $strongarm;
 
   $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->disabled = false; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'language_negotiation';
   $strongarm->value = '2';