BOINC / boinc

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

Indentation +124 added lines, -124 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'
-  );
+    $data['user']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC user'),
+        'help' => t('BOINC account data for a user'),
+        'database' => 'boinc'
+    );
 
-  // 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'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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(
+    );
+    $data['user']['email_addr'] = array(
     'title' => bts('Email Address'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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'),
     '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'
-      ),
+        ),
     )
-  );
+    );
 }

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 +19 added lines, -19 removed lines

@@ -38,12 +38,12 @@ 
     '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(
@@ -58,12 +58,12 @@ 
     '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(
@@ -81,7 +81,7 @@ 
     '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'
@@ -95,7 +95,7 @@ 
     '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'
@@ -109,7 +109,7 @@ 
     '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'
@@ -123,7 +123,7 @@ 
     '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'
@@ -137,7 +137,7 @@ 
     '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'
@@ -151,8 +151,8 @@ 
     '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'
@@ -166,7 +166,7 @@ 
     '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'
@@ -180,7 +180,7 @@ 
     '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'
@@ -194,7 +194,7 @@ 
     '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'
@@ -208,7 +208,7 @@ 
     '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'
@@ -222,7 +222,7 @@ 
     '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'
@@ -236,8 +236,8 @@ 
     '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'
@@ -251,7 +251,7 @@ 
     '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'

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

Indentation +288 added lines, -288 removed lines

@@ -15,54 +15,54 @@ 
  * Form validation handler for login
  */
 function boincuser_login_validate($form, &$form_state) {
-  /* // SAMPLE: To try validation with Drupal first...
+    /* // SAMPLE: To try validation with Drupal first...
   global $user;
   if (!empty($user->uid)) {
     // Authentication with Drupal was successful
     return;
   }*/
   
-  // Set name for logging purposes
-  $form_state['values']['name'] = $form_state['values']['email'];
+    // Set name for logging purposes
+    $form_state['values']['name'] = $form_state['values']['email'];
   
-  // Bypass BOINC validation if passed the name of user 1
-  $user_1 = user_load(1);
-  if ($form_state['values']['email'] == $user_1->name) {
+    // Bypass BOINC validation if passed the name of user 1
+    $user_1 = user_load(1);
+    if ($form_state['values']['email'] == $user_1->name) {
     user_authenticate($form_state['values']);
     return;
-  }
+    }
   
-  // Call our custom authentication function to check for an existing BOINC user
-  if (!boincuser_login_authenticate($form_state['values'])) {
+    // Call our custom authentication function to check for an existing BOINC user
+    if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
     form_set_error('name', bts('Sorry, unrecognized email address or password.') . ' ' . l(bts('Have you forgotten your password?'), 'user/password'));
-  }
+    }
 }
 
 /**
  * Custom authentication function to check BOINC account information
  */
 function boincuser_login_authenticate($form_values) {
-  global $boincuser_authenticated;
-  $email_addr = strtolower($form_values['email']);
-  $passwd = $form_values['pass'];
-  $passwd_hash = md5($passwd.$email_addr);
-  
-  // Include BOINC user library
-  require_boinc('boinc_db');
-  
-  // Get the BOINC user and check credentials
-  $boinc_user = BoincUser::lookup_email_addr($email_addr);
-  if (!$boinc_user) return false;
-  if ($passwd_hash != $boinc_user->passwd_hash) return false;
-  
-  // BOINC authentication successful; log in and synchronize accounts
-  boincuser_login_register($boinc_user);
-  // Write session, update timestamp, run user 'login' hook.
-  user_authenticate_finalize($form_values);
-  // Use a global variable to save the fact that we did authentication.
-  $boincuser_authenticated = true;
-  return true;
+    global $boincuser_authenticated;
+    $email_addr = strtolower($form_values['email']);
+    $passwd = $form_values['pass'];
+    $passwd_hash = md5($passwd.$email_addr);
+  
+    // Include BOINC user library
+    require_boinc('boinc_db');
+  
+    // Get the BOINC user and check credentials
+    $boinc_user = BoincUser::lookup_email_addr($email_addr);
+    if (!$boinc_user) return false;
+    if ($passwd_hash != $boinc_user->passwd_hash) return false;
+  
+    // BOINC authentication successful; log in and synchronize accounts
+    boincuser_login_register($boinc_user);
+    // Write session, update timestamp, run user 'login' hook.
+    user_authenticate_finalize($form_values);
+    // Use a global variable to save the fact that we did authentication.
+    $boincuser_authenticated = true;
+    return true;
 }
 
 /**
@@ -70,18 +70,18 @@ 
  * Drupal accounts
  */
 function boincuser_login_register($boinc_user) {
-  global $user;
-  require_boinc('boinc_db');
-  // If a Drupal account already exists, log in
-  $existing_user = user_load(array('mail' => $boinc_user->email_addr));
-  if (!empty($existing_user->uid)) {
+    global $user;
+    require_boinc('boinc_db');
+    // If a Drupal account already exists, log in
+    $existing_user = user_load(array('mail' => $boinc_user->email_addr));
+    if (!empty($existing_user->uid)) {
     $user = $existing_user;
-  } else {
+    } else {
     // Create a Drupal user from the BOINC user
     if ($user = boincuser_register_make_drupal_user($boinc_user)) {
-      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+        watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+    }
     }
-  }
 }
 
 
@@ -93,75 +93,75 @@ 
  * New user registration validation handler.
  */
 function boincuser_register_validate($form_values) {            
-  // Include BOINC database objects library
-  require_boinc('boinc_db');
-  // Check for an existing BOINC user
-  $boinc_user = BoincUser::lookup_email_addr($form_values['mail']);
-  if ($boinc_user) return false;
-  return true;
+    // Include BOINC database objects library
+    require_boinc('boinc_db');
+    // Check for an existing BOINC user
+    $boinc_user = BoincUser::lookup_email_addr($form_values['mail']);
+    if ($boinc_user) return false;
+    return true;
 }
 
 /**
  * Create BOINC account
  */
 function boincuser_register_make_user($params) {    
-  // Include BOINC user library
-  require_boinc('user');
-  // Create the BOINC user
-  $boinc_user = make_user($params['email_addr'], $params['name'], $params['passwd_hash'], $params['country'], $params['postal_code']);
-  return $boinc_user;
+    // Include BOINC user library
+    require_boinc('user');
+    // Create the BOINC user
+    $boinc_user = make_user($params['email_addr'], $params['name'], $params['passwd_hash'], $params['country'], $params['postal_code']);
+    return $boinc_user;
 }
 
 /**
  * Create Drupal account from existing BOINC account
  */
 function boincuser_register_make_drupal_user($boinc_user) {
-  $account = null;
-  if (is_numeric($boinc_user)) {
+    $account = null;
+    if (is_numeric($boinc_user)) {
     $boinc_user = boincuser_load($boinc_user);
-  }
-  if ($boinc_user) {
+    }
+    if ($boinc_user) {
     $account = boincuser_create_drupal_user($boinc_user);
     if ($account) {
-      boincuser_create_drupal_profile($account, $boinc_user);
+        boincuser_create_drupal_profile($account, $boinc_user);
+    }
     }
-  }
-  return $account;
+    return $account;
 }
 
 function boincuser_create_drupal_user($boinc_user) {
-  require_boinc('forum_db');
-  BoincForumPrefs::lookup($boinc_user);
-  $account = NULL;
-  $module = 'boincuser';
+    require_boinc('forum_db');
+    BoincForumPrefs::lookup($boinc_user);
+    $account = NULL;
+    $module = 'boincuser';
   
-  // Verify that this account has not already been imported
-  $already_imported = db_result(db_query('
+    // Verify that this account has not already been imported
+    $already_imported = db_result(db_query('
     SELECT COUNT(*) FROM {boincuser} WHERE boinc_id = %d',
     $boinc_user->id)
-  );
-  if ($already_imported) {
+    );
+    if ($already_imported) {
     return NULL;
-  }
+    }
   
-  // Email is limited to 64 characters...
-  $boinc_email = substr($boinc_user->email_addr, 0, 64);
+    // Email is limited to 64 characters...
+    $boinc_email = substr($boinc_user->email_addr, 0, 64);
   
-  // Email should be unique
-  $already_imported = db_result(db_query("
+    // Email should be unique
+    $already_imported = db_result(db_query("
     SELECT COUNT(*) FROM {users} WHERE mail = '%s'",
     $boinc_email)
-  );
-  if ($already_imported) {
+    );
+    if ($already_imported) {
     drupal_set_message(t('An account for @email already exists', array('@email' => $boinc_email)), 'warning');
     watchdog('boincimport', 'An account for @email already exists', array('@email' => $boinc_email), WATCHDOG_WARNING); 
     return NULL;
-  }
+    }
   
-  // Make sure name is unique
-  $unique_name = find_unique_name($boinc_user->name);
+    // Make sure name is unique
+    $unique_name = find_unique_name($boinc_user->name);
   
-  $userinfo = array(
+    $userinfo = array(
     'name' => $unique_name,
     'pass' => $boinc_user->passwd_hash,
     'mail' => $boinc_email,
@@ -171,126 +171,126 @@ 
     'status' => 1,
     "authname_{$module}" => $boinc_email,
     'access' => time()
-  );
+    );
   
-  $in_penalty = ($boinc_user->prefs->banished_until > time());
+    $in_penalty = ($boinc_user->prefs->banished_until > time());
   
-  // Add user to community member role (if no current penalty)
-  if (!$in_penalty) {
+    // Add user to community member role (if no current penalty)
+    if (!$in_penalty) {
     $community_role = array_search('community member', user_roles(true)); 
     $userinfo['roles'] = array(
-      $community_role => ''
+        $community_role => ''
     );
-  }
+    }
   
-  // Mark account as imported so a BOINC account is not created on Insert (i.e. user_save)
-  $_SESSION['importedUser'] = true;
-  $account = user_save('', $userinfo);
+    // Mark account as imported so a BOINC account is not created on Insert (i.e. user_save)
+    $_SESSION['importedUser'] = true;
+    $account = user_save('', $userinfo);
   
-  // Drupal overrides the original registration date, so update to the correct date
-  $account = user_save($account, array('created' => $userinfo['created']));
+    // Drupal overrides the original registration date, so update to the correct date
+    $account = user_save($account, array('created' => $userinfo['created']));
   
-  // Terminate if an error occured during user_save().
-  if (!$account) {
+    // Terminate if an error occured during user_save().
+    if (!$account) {
     drupal_set_message(t("Error saving user account."), 'error');
     return NULL;
-  }
+    }
   
-  // Cross reference the Drupal and BOINC accounts
-  boincuser_account_cross_reference($account->uid, $boinc_user->id);
+    // Cross reference the Drupal and BOINC accounts
+    boincuser_account_cross_reference($account->uid, $boinc_user->id);
   
-  if ($in_penalty) {
+    if ($in_penalty) {
     // Import the timestamp of when the penalty period will be over
     $boincuser_record = array(
-      'uid' => $account->uid,
-      'penalty_expiration' => $boinc_user->prefs->banished_until,
+        'uid' => $account->uid,
+        'penalty_expiration' => $boinc_user->prefs->banished_until,
     );
     drupal_write_record('boincuser', $boincuser_record, 'uid');
-  }
+    }
   
-  return $account;
+    return $account;
 }
 
 function boincuser_create_drupal_profile($account, $boinc_user) {
   
-  require_boinc('forum_db');
-  BoincForumPrefs::lookup($boinc_user);
+    require_boinc('forum_db');
+    BoincForumPrefs::lookup($boinc_user);
   
-  $image_dir = boinc_get_path('user_image');
+    $image_dir = boinc_get_path('user_image');
   
-  // Automatically create a content profile
-  $now = time();
-  $profile_background = null;
-  $profile_opinions = null;
-  $profile_image = null;
-  $avatar_image = null;
-  $profile_approved = NULL;
+    // Automatically create a content profile
+    $now = time();
+    $profile_background = null;
+    $profile_opinions = null;
+    $profile_image = null;
+    $avatar_image = null;
+    $profile_approved = NULL;
   
-  // Load the BOINC profile, if available
-  if ($boinc_user->has_profile) {
+    // Load the BOINC profile, if available
+    if ($boinc_user->has_profile) {
     $boinc_profile = BoincProfile::lookup("userid={$boinc_user->id}");
     $profile_background = $boinc_profile->response1;
     $profile_opinions = $boinc_profile->response2;
     if ($boinc_profile->has_picture) {
-      // Load picture; load validators; determine where to store it in Drupal
-      $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
-      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
-      // If the user does not have a different image as an avatar, use this one
-      if (!$boinc_user->prefs->avatar) {
+        // Load picture; load validators; determine where to store it in Drupal
+        $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
+        $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
+        // If the user does not have a different image as an avatar, use this one
+        if (!$boinc_user->prefs->avatar) {
         $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
-      }
+        }
     }
     if ($boinc_user->prefs->avatar) {
-      $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
-      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+        $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
+        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
     }
     $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
-  }
-  $default_input_format = db_result(db_query("
+    }
+    $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
-  if (!$default_input_format) $default_input_format = 1;
-  
-  // Populate the profile object
-  $profile_node = new stdClass();
-  $profile_node->title = $boinc_user->name;
-  $profile_node->uid = $account->uid;
-  $profile_node->body = '';
-  $profile_node->type = 'profile'; 
-  $profile_node->created = $now;
-  $profile_node->changed = $now;
-  $profile_node->status = 1;
-  $profile_node->promote = 0;
-  $profile_node->sticky = 0;
-  $profile_node->format = $default_input_format;
-  $profile_node->name = $account->name; // Set to link profile to account uid!
-  $profile_node->field_country[]['value'] = $boinc_user->country;
-  $profile_node->field_zip[]['value'] = $boinc_user->postal_code;
-  $profile_node->field_url[]['value'] = $boinc_user->url;
-  $profile_node->field_background[]['value'] = $profile_background;
-  $profile_node->field_opinions[]['value'] = $profile_opinions;
-  $profile_node->field_image[] = $avatar_image;
-  $profile_node->field_profile_image[] = $profile_image;
-  
-  // Save the profile object to the database
-  // This will automatically set the author uid if node->name has been set
-  $profile_node = node_submit($profile_node);
-  node_save($profile_node);
-  
-  // Mark profile as approved if it has already been vetted somehow
-  if ($profile_approved OR !$boinc_user->has_profile) {
+    if (!$default_input_format) $default_input_format = 1;
+  
+    // Populate the profile object
+    $profile_node = new stdClass();
+    $profile_node->title = $boinc_user->name;
+    $profile_node->uid = $account->uid;
+    $profile_node->body = '';
+    $profile_node->type = 'profile'; 
+    $profile_node->created = $now;
+    $profile_node->changed = $now;
+    $profile_node->status = 1;
+    $profile_node->promote = 0;
+    $profile_node->sticky = 0;
+    $profile_node->format = $default_input_format;
+    $profile_node->name = $account->name; // Set to link profile to account uid!
+    $profile_node->field_country[]['value'] = $boinc_user->country;
+    $profile_node->field_zip[]['value'] = $boinc_user->postal_code;
+    $profile_node->field_url[]['value'] = $boinc_user->url;
+    $profile_node->field_background[]['value'] = $profile_background;
+    $profile_node->field_opinions[]['value'] = $profile_opinions;
+    $profile_node->field_image[] = $avatar_image;
+    $profile_node->field_profile_image[] = $profile_image;
+  
+    // Save the profile object to the database
+    // This will automatically set the author uid if node->name has been set
+    $profile_node = node_submit($profile_node);
+    node_save($profile_node);
+  
+    // Mark profile as approved if it has already been vetted somehow
+    if ($profile_approved OR !$boinc_user->has_profile) {
     $profile_node->moderate = 0;
     node_save($profile_node);
-  }
+    }
   
-  return;
+    return;
 }
 
 function boincuser_account_cross_reference($uid, $boinc_id) {
     // Cross reference Drupal account with BOINC
     $reference = db_query("INSERT INTO {boincuser} SET uid=%d, boinc_id=%d", $uid, $boinc_id);
     if (!$reference) {
-      drupal_set_message(t("Error connecting BOINC account."), 'error');
-      return false;
+        drupal_set_message(t("Error connecting BOINC account."), 'error');
+        return false;
     }
     return true;
 }
@@ -299,35 +299,35 @@ 
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
 function boincuser_pull_subscriptions($account = NULL) {
-  if (!$account) {
+    if (!$account) {
     global $user;
     $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
+    }
+    elseif (is_numeric($account)) {
     $account = user_load($account);
-  }
+    }
   
-  // Get any subscriptions for this user
-  db_set_active('boinc');
-  $subscriptions = db_query('
+    // Get any subscriptions for this user
+    db_set_active('boinc');
+    $subscriptions = db_query('
     SELECT threadid FROM {subscriptions}
     WHERE userid = %d', $account->boincuser_id);
-  db_set_active('default');
+    db_set_active('default');
   
-  $flag = flag_get_flag('subscriptions') or die('no "subscriptions" flag defined');
-  $count = 0;
-  while ($thread_id = db_result($subscriptions)) {
+    $flag = flag_get_flag('subscriptions') or die('no "subscriptions" flag defined');
+    $count = 0;
+    while ($thread_id = db_result($subscriptions)) {
     // For each BOINC thread ID subscribed, look up the corresponding node ID
     $nid = db_result(db_query('
       SELECT nid FROM {boincimport_temp_topic}
       WHERE topic_id = %d', $thread_id));
     // Flag this node for the user
     if ($nid > 0) {
-      $flag->flag('flag', $nid, $account);
-      $count++;
+        $flag->flag('flag', $nid, $account);
+        $count++;
     }
-  }
-  return $count;
+    }
+    return $count;
 }
 
 
@@ -339,45 +339,45 @@ 
  * User account update validation handler.
  */
 function boincuser_account_validate($edit, $account) {
-  // Include BOINC database objects library, load BOINC account data
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup_email_addr($account->mail);
-  $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
-  $changing_pass = ($edit['pass']) ? true : false;
-  if ($changing_email) {
+    // Include BOINC database objects library, load BOINC account data
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup_email_addr($account->mail);
+    $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
+    $changing_pass = ($edit['pass']) ? true : false;
+    if ($changing_email) {
     // E-mail address is set to change; check for an existing BOINC user
     $boinc_user_already_exists = BoincUser::lookup_email_addr($edit['mail']);
     if ($boinc_user_already_exists) {
-      form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail'])));
+        form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail'])));
+    }
     }
-  }
 
-  // If user is changing email or password, require that the current
-  // password has been given as well.
-  if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
+    // If user is changing email or password, require that the current
+    // password has been given as well.
+    if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
     // If changing email or password, require current password
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
-      unset($_SESSION['reset_pass']);
+        unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . $account->mail);
-      if (!$edit['current_pass']) {
+        $given_hash = md5($edit['current_pass'] . $account->mail);
+        if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.'));
-      }
-      elseif ($given_hash != $boinc_user->passwd_hash) {
+        }
+        elseif ($given_hash != $boinc_user->passwd_hash) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.'));
-      }
+        }
+    }
     }
-  }
 
-  // If an admin tries to change the email and NOT the password, show
-  // error message. BOINC requires both to be changed together.
-  if ($changing_email AND !$changing_pass AND user_access('administer users')) {
+    // If an admin tries to change the email and NOT the password, show
+    // error message. BOINC requires both to be changed together.
+    if ($changing_email AND !$changing_pass AND user_access('administer users')) {
     form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.'));
-  }
+    }
   
-  // Expansion required to allow account key in place of passwd...?
+    // Expansion required to allow account key in place of passwd...?
   
 }
 
@@ -390,118 +390,118 @@ 
  * Password request validation handler.
  */
 function boincuser_request_pass_validate($form, &$form_state) {
-  $edit = $form_state['values'];
-  // The Drupal submit function expects a "name" field, even though
-  // it contains an email address and we will not allow a user name
-  if (!$edit['name']) form_set_error('name', bts('Please enter your email address'));
-  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name'])));
-  else {
+    $edit = $form_state['values'];
+    // The Drupal submit function expects a "name" field, even though
+    // it contains an email address and we will not allow a user name
+    if (!$edit['name']) form_set_error('name', bts('Please enter your email address'));
+    elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name'])));
+    else {
     // First look for an existing Drupal account
     if ($account = user_load_by_mail($edit['name'])) return;
     // Otherwise, check the BOINC db for this email address
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup_email_addr($edit['name']);
     if ($boinc_user) {
-      // If the user is in BOINC but not Drupal, bring them over...
-      boincuser_register_make_drupal_user($boinc_user);
+        // If the user is in BOINC but not Drupal, bring them over...
+        boincuser_register_make_drupal_user($boinc_user);
     } else {
-      // If there is no existing BOINC user either, show an error
-      form_set_error('name', bts('No account exists for @email -- select "Create new account" to register', array('@email' => $edit['name'])));
+        // If there is no existing BOINC user either, show an error
+        form_set_error('name', bts('No account exists for @email -- select "Create new account" to register', array('@email' => $edit['name'])));
+    }
     }
-  }
 }
 
 /**
  * The definition of the authenticator login form.
  */
 function boincuser_authloginform() {
-  $headers = apache_request_headers();
-  $project_name = variable_get('site_name', 'einsteinathome.org');
-  $project_domain = $headers['Host'];
-  $form['heading'] = array(
+    $headers = apache_request_headers();
+    $project_name = variable_get('site_name', 'einsteinathome.org');
+    $project_domain = $headers['Host'];
+    $form['heading'] = array(
     '#type' => 'markup',
     '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:") . '</h3>'
-  );
-  $form['instructions'] = array(
+    );
+    $form['instructions'] = array(
     '#type' => 'markup',
     '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:") .
-      '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory'))) . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}")) . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:") .
-      '      <pre>' .
-      '&lt;account&gt;' . "\n" .
-      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
-      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
-      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
-      '  ...' . "\n" .
-      '&lt;/account&gt;' .
-      '      </pre>' .
-      '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b')) . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.') . '</li>' .
-      '  </ul>' .
-      '</p>'
-  );
-  $form['authenticator'] = array(
+        '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:") .
+        '  <ul>' .
+        '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory'))) . '</li>' .
+        '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}")) . '</li>' .
+        '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:") .
+        '      <pre>' .
+        '&lt;account&gt;' . "\n" .
+        "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
+        '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
+        "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
+        '  ...' . "\n" .
+        '&lt;/account&gt;' .
+        '      </pre>' .
+        '    </li>' .
+        '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b')) . '</li>' .
+        '    <li>' . bts('Paste the string into the field below, and click OK.') . '</li>' .
+        '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.') . '</li>' .
+        '  </ul>' .
+        '</p>'
+    );
+    $form['authenticator'] = array(
     '#title' => bts('Log in with authenticator'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 32,
     '#required' => TRUE,
     '#description' => null
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('OK'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), 'user/password') . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The authenticator login validation handler
  */
 function boincuser_authloginform_validate($form, &$form_state) {
-  $authenticator = $form_state['values']['authenticator'];
-  if (strlen($authenticator) != 32) {
+    $authenticator = $form_state['values']['authenticator'];
+    if (strlen($authenticator) != 32) {
     // We notify the form API that this field has failed validation.
     form_set_error('authenticator', bts('That authenticator is not valid.'));
-  } else {
+    } else {
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
     if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.'));
-  }
+    }
 }
 
 /**
  * The authenticator login submit handler
  */
 function boincuser_authloginform_submit($form, &$form_state) {
-  global $user;
-  $authenticator = $form_state['values']['authenticator'];
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
-  if (!$user = user_load(get_drupal_id($boinc_user->id))) drupal_set_message(t('An unresolved error occurred while logging into this account.'));
-  else $form_state['redirect'] = 'account/info/edit';
+    global $user;
+    $authenticator = $form_state['values']['authenticator'];
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
+    if (!$user = user_load(get_drupal_id($boinc_user->id))) drupal_set_message(t('An unresolved error occurred while logging into this account.'));
+    else $form_state['redirect'] = 'account/info/edit';
 }
 
 
@@ -509,44 +509,44 @@ 
  * The definition of the moderator reject user profile form.
  */
 function boincuser_moderate_profile_reject_form(&$form_state, $uid) {
-  $form_state['storage']['reject_profile_uid'] = $uid;
-  $form['reason'] = array(
+    $form_state['storage']['reject_profile_uid'] = $uid;
+    $form['reason'] = array(
     '#title' => bts('Reason for rejecting this profile'),
     '#type' => 'textarea',
     '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.'),
     '#default_value' => '',
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The moderator reject user profile submit handler
  */
 function boincuser_moderate_profile_reject_form_submit($form, &$form_state) {
-  $uid = $form_state['storage']['reject_profile_uid'];
-  $reason = $form_state['values']['reason'];
-  boincuser_moderate_profile_reject($uid, $reason);
+    $uid = $form_state['storage']['reject_profile_uid'];
+    $reason = $form_state['values']['reason'];
+    boincuser_moderate_profile_reject($uid, $reason);
 }
 
 
@@ -554,52 +554,52 @@ 
  * The definition of the ban user form.
  */
 function boincuser_moderate_user_ban_form(&$form_state, $uid) {
-  $form_state['storage']['ban_user_uid'] = $uid;
-  $form['reason'] = array(
+    $form_state['storage']['ban_user_uid'] = $uid;
+    $form['reason'] = array(
     '#title' => bts('Reason for banning this user'),
     '#type' => 'textarea',
     '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.'),
     '#default_value' => '',
-  );
-  $form['duration'] = array(
+    );
+    $form['duration'] = array(
     '#title' => bts('Duration of the ban'),
     '#type' => 'textfield',
     '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.'),
     '#default_value' => '',
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The ban user submit handler
  */
 function boincuser_moderate_user_ban_form_submit($form, &$form_state) {
-  $uid = $form_state['storage']['ban_user_uid'];
-  $reason = $form_state['values']['reason'];
-  $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
-  boincuser_moderate_user_ban($uid, $reason, $duration);
+    $uid = $form_state['storage']['ban_user_uid'];
+    $reason = $form_state['values']['reason'];
+    $duration = $form_state['values']['duration'];
+    if ($duration) $duration = $duration * 24*60*60;
+    boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 
 
@@ -607,8 +607,8 @@ 
  * Hack to fix submission of the flag friend unfriend form
  */
 function boincuser_fix_unfriend_form_submit($form, &$form_state) {
-  // Leaving action as "unfriend" causes problems
-  if ($form_state['values']['action'] == 'unfriend') {
+    // Leaving action as "unfriend" causes problems
+    if ($form_state['values']['action'] == 'unfriend') {
     $form_state['values']['action'] = 'unflag';
-  }
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -35,7 +35,7 @@ 
   // Call our custom authentication function to check for an existing BOINC user
   if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
-    form_set_error('name', bts('Sorry, unrecognized email address or password.') . ' ' . l(bts('Have you forgotten your password?'), 'user/password'));
+    form_set_error('name', bts('Sorry, unrecognized email address or password.').' '.l(bts('Have you forgotten your password?'), 'user/password'));
   }
 }
 
@@ -79,7 +79,7 @@ 
   } else {
     // Create a Drupal user from the BOINC user
     if ($user = boincuser_register_make_drupal_user($boinc_user)) {
-      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'.$user->uid.'/edit'));
     }
   }
 }
@@ -361,7 +361,7 @@ 
       unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . $account->mail);
+      $given_hash = md5($edit['current_pass'].$account->mail);
       if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.'));
       }
@@ -420,29 +420,29 @@ 
   $project_domain = $headers['Host'];
   $form['heading'] = array(
     '#type' => 'markup',
-    '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:") . '</h3>'
+    '#value' => '<h3>'.bts("If you forgot your account's email address, or you can't receive email there:").'</h3>'
   );
   $form['instructions'] = array(
     '#type' => 'markup',
-    '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:") .
-      '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory'))) . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}")) . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:") .
-      '      <pre>' .
-      '&lt;account&gt;' . "\n" .
-      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
-      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
-      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
-      '  ...' . "\n" .
-      '&lt;/account&gt;' .
-      '      </pre>' .
-      '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b')) . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.') . '</li>' .
-      '  </ul>' .
+    '#value' => ''.
+      '<p>'.bts("If you have run BOINC under the account, you can still access it. Here's how:").
+      '  <ul>'.
+      '    <li>'.bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory'))).'</li>'.
+      '    <li>'.bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}")).'</li>'.
+      '    <li>'.bts("Open the file in a text editor like Notepad. You'll see something like:").
+      '      <pre>'.
+      '&lt;account&gt;'."\n".
+      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;"."\n".
+      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;'."\n".
+      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;"."\n".
+      '  ...'."\n".
+      '&lt;/account&gt;'.
+      '      </pre>'.
+      '    </li>'.
+      '    <li>'.bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b')).'</li>'.
+      '    <li>'.bts('Paste the string into the field below, and click OK.').'</li>'.
+      '    <li>'.bts('You will now be logged in to your account; update the email and password of your account.').'</li>'.
+      '  </ul>'.
       '</p>'
   );
   $form['authenticator'] = array(
@@ -467,7 +467,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), 'user/password') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel'), 'user/password').'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -530,7 +530,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -581,7 +581,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -598,7 +598,7 @@ 
   $uid = $form_state['storage']['ban_user_uid'];
   $reason = $form_state['values']['reason'];
   $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
+  if ($duration) $duration = $duration*24*60*60;
   boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 

Braces +5 added lines, -8 removed lines

@@ -92,7 +92,7 @@ 
 /**
  * New user registration validation handler.
  */
-function boincuser_register_validate($form_values) {            
+function boincuser_register_validate($form_values) {
   // Include BOINC database objects library
   require_boinc('boinc_db');
   // Check for an existing BOINC user
@@ -104,7 +104,7 @@ 
 /**
  * Create BOINC account
  */
-function boincuser_register_make_user($params) {    
+function boincuser_register_make_user($params) {
   // Include BOINC user library
   require_boinc('user');
   // Create the BOINC user
@@ -302,8 +302,7 @@ 
   if (!$account) {
     global $user;
     $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
+  } elseif (is_numeric($account)) {
     $account = user_load($account);
   }
   
@@ -359,13 +358,11 @@ 
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
       unset($_SESSION['reset_pass']);
-    }
-    else {
+    } else {
       $given_hash = md5($edit['current_pass'] . $account->mail);
       if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.'));
-      }
-      elseif ($given_hash != $boinc_user->passwd_hash) {
+      } elseif ($given_hash != $boinc_user->passwd_hash) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.'));
       }
     }

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

@@ -132,7 +132,7 @@ 
 function boincuser_create_drupal_user($boinc_user) {
   require_boinc('forum_db');
   BoincForumPrefs::lookup($boinc_user);
-  $account = NULL;
+  $account = null;
   $module = 'boincuser';
   
   // Verify that this account has not already been imported
@@ -141,7 +141,7 @@ 
     $boinc_user->id)
   );
   if ($already_imported) {
-    return NULL;
+    return null;
   }
   
   // Email is limited to 64 characters...
@@ -155,7 +155,7 @@ 
   if ($already_imported) {
     drupal_set_message(t('An account for @email already exists', array('@email' => $boinc_email)), 'warning');
     watchdog('boincimport', 'An account for @email already exists', array('@email' => $boinc_email), WATCHDOG_WARNING); 
-    return NULL;
+    return null;
   }
   
   // Make sure name is unique
@@ -193,7 +193,7 @@ 
   // Terminate if an error occured during user_save().
   if (!$account) {
     drupal_set_message(t("Error saving user account."), 'error');
-    return NULL;
+    return null;
   }
   
   // Cross reference the Drupal and BOINC accounts
@@ -224,7 +224,7 @@ 
   $profile_opinions = null;
   $profile_image = null;
   $avatar_image = null;
-  $profile_approved = NULL;
+  $profile_approved = null;
   
   // Load the BOINC profile, if available
   if ($boinc_user->has_profile) {
@@ -234,17 +234,17 @@ 
     if ($boinc_profile->has_picture) {
       // Load picture; load validators; determine where to store it in Drupal
       $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
-      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
+      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', true);
       // If the user does not have a different image as an avatar, use this one
       if (!$boinc_user->prefs->avatar) {
-        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', true);
       }
     }
     if ($boinc_user->prefs->avatar) {
       $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
-      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', true);
     }
-    $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
+    $profile_approved = $boinc_profile->verification ? true : false;
   }
   $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
@@ -277,7 +277,7 @@ 
   node_save($profile_node);
   
   // Mark profile as approved if it has already been vetted somehow
-  if ($profile_approved OR !$boinc_user->has_profile) {
+  if ($profile_approved or !$boinc_user->has_profile) {
     $profile_node->moderate = 0;
     node_save($profile_node);
   }
@@ -298,7 +298,7 @@ 
 /**
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
-function boincuser_pull_subscriptions($account = NULL) {
+function boincuser_pull_subscriptions($account = null) {
   if (!$account) {
     global $user;
     $account = user_load($user->id);
@@ -342,7 +342,7 @@ 
   // Include BOINC database objects library, load BOINC account data
   require_boinc('boinc_db');
   $boinc_user = BoincUser::lookup_email_addr($account->mail);
-  $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
+  $changing_email = ($edit['mail'] and $edit['mail'] != $account->mail) ? true : false;
   $changing_pass = ($edit['pass']) ? true : false;
   if ($changing_email) {
     // E-mail address is set to change; check for an existing BOINC user
@@ -354,7 +354,7 @@ 
 
   // If user is changing email or password, require that the current
   // password has been given as well.
-  if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
+  if (($changing_email or $changing_pass) and !user_access('administer users')) {
     // If changing email or password, require current password
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
@@ -373,7 +373,7 @@ 
 
   // If an admin tries to change the email and NOT the password, show
   // error message. BOINC requires both to be changed together.
-  if ($changing_email AND !$changing_pass AND user_access('administer users')) {
+  if ($changing_email and !$changing_pass and user_access('administer users')) {
     form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.'));
   }
   
@@ -450,7 +450,7 @@ 
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 32,
-    '#required' => TRUE,
+    '#required' => true,
     '#description' => null
   );
   

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

Indentation +136 added lines, -136 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', ''),
@@ -44,306 +44,306 @@ 
     'boinc_server_status_url' => variable_get('boinc_server_status_url', ''),
     'boinc_app_list_url' => variable_get('boinc_app_list_url', ''),
     'boinc_debug_mode' => variable_get('boinc_debug_mode', 0),
-  );
-  //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_debug_mode'] = array(
+    );
+    $form['boinc_debug_mode'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show debug messages in system log'),
     '#default_value' => $default['boinc_debug_mode']
-  );
-  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.'));
 }
 
 
 /**
-  * Other BOINC options that don't fit elsewhere
-  */
+ * Other BOINC options that don't fit elsewhere
+ */
 function boincuser_admin_other(&$form_state) {
-  $form = array();
+    $form = array();
 
-  //form defaults
-  $default = array(
-      'boinc_other_frontpage' => variable_get('boinc_other_frontpage', ''),
-  );
+    //form defaults
+    $default = array(
+        'boinc_other_frontpage' => variable_get('boinc_other_frontpage', ''),
+    );
   
-  // Define the form
-  $form['boinc_other_frontpage'] = array (
+    // Define the form
+    $form['boinc_other_frontpage'] = array (
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page'),
     '#default_value' => $default['boinc_other_frontpage'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => bts('Text to be displayed on the site\'s Home landing page.'),
-  );
+    );
     
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate BOINC other form
-  */
+ * Validate BOINC other form
+ */
 function boincuser_admin_other_validate($form, &$form_state) {
 }
 
 /**
-  * Submit BOINC other form
-  */
+ * Submit BOINC other form
+ */
 function boincuser_admin_other_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: BOINC other settings have been updated") );
+    drupal_set_message( bts("Status: BOINC other settings have been updated") );
 }

Spacing +4 added lines, -4 removed lines

@@ -119,7 +119,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',
       )
     ),
@@ -130,7 +130,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',
       )
     ),
@@ -323,7 +323,7 @@ 
   );
   
   // Define the form
-  $form['boinc_other_frontpage'] = array (
+  $form['boinc_other_frontpage'] = array(
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page'),
     '#default_value' => $default['boinc_other_frontpage'],
@@ -345,5 +345,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_other_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: BOINC other settings have been updated") );
+  drupal_set_message(bts("Status: BOINC other settings have been updated"));
 }

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) {

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

@@ -48,7 +48,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) {
@@ -59,7 +59,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;
@@ -83,7 +83,7 @@ 
     '#title' => t('Overrides'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => !$show_overrides,
     '#attributes' => array('class' => 'advanced-settings')
   );
@@ -212,7 +212,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',

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

Switch Indentation +23 added lines, -23 removed lines

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

Indentation +237 added lines, -237 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -81,7 +81,7 @@ 
  * Adjust the rendering of the menu
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+  $html .= '<ul id="'.$menu['id'].'" class="'.$menu['class'].'">'."\n";
   $item_count = count($links);
   $i = 1;
   foreach ($links as $key => $link) {
@@ -89,7 +89,7 @@ 
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
-    $html .= '<li class="' . implode(' ', $classes) .'">';
+    $html .= '<li class="'.implode(' ', $classes).'">';
     if ($link['title'] == 'Home') {
       $link['title'] = bts('Home');
     }
@@ -98,7 +98,7 @@ 
       if ($link['href'] == 'dashboard') {
         $item_count = privatemsg_unread_count();
         if ($item_count) {
-          $link['title'] .= '</a> <a href="/messages" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+          $link['title'] .= '</a> <a href="/messages" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
           $link['html'] = TRUE;
           $link['attributes']['class'] = 'compound';
         }
@@ -108,7 +108,7 @@ 
     if ($link['href'] == 'moderate') {
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
-        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
         $link['html'] = TRUE;
       }
     }
@@ -116,7 +116,7 @@ 
     $html .= '</li>';
     $i++;
   }
-  $html .= '</ul>' . "\n";
+  $html .= '</ul>'."\n";
   return $html;
 }
 
@@ -131,7 +131,7 @@ 
     return '';
   }
   else {
-    return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
+    return '<li '.($active ? 'class="active" ' : '').'>'.$link."</li>\n";
   }
 }
 
@@ -192,7 +192,7 @@ 
       $locality = $lang_code[0];
     }
   }
-  $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
+  $vars['flag_path'] = base_path().path_to_theme()."/images/flags/{$locality}.png";
 
   $server_status_url = variable_get('boinc_server_status_url', '');
   if (!$server_status_url) {
@@ -223,7 +223,7 @@ 
               $tab = str_replace('li class="', 'li class="first ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+              $tab = str_replace('li class="', 'li class="last ', $tab).'</ul>';
           }
       }
       elseif (strpos($tab, 'li ')) {
@@ -231,7 +231,7 @@ 
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+              $tab = str_replace('li ', 'li class="last" ', $tab).'</ul>';
           }
       }
   }
@@ -268,7 +268,7 @@ 
 
   // Optionally, run node-type-specific preprocess functions, like
   // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
+  $function = __FUNCTION__.'_'.$vars['node']->type;
   if (function_exists($function)) {
     $function($vars, $hook);
   }
@@ -315,7 +315,7 @@ 
   $vars['node']->comment = 0;
   
   $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
-  $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
+  $page_count = max(ceil($vars['comment_count']/$comments_per_page), 1);
   $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
@@ -422,8 +422,8 @@ 
     $view->execute();
     $result = reset($view->result);
     // Display the stderr output in the footer
-    $vars['footer'] = '<h3>' . bts('Stderr output') .'</h3>';
-    $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
+    $vars['footer'] = '<h3>'.bts('Stderr output').'</h3>';
+    $vars['footer'] .= '<pre>'.htmlspecialchars($result->result_stderr_out).'</pre>';
     break;
   case 'boinc_teams':
     if ($vars['display_id'] == 'panel_pane_3') {
@@ -435,7 +435,7 @@ 
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
-    require_boinc(array('util','boinc_db'));
+    require_boinc(array('util', 'boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     project_workunit($wu);
     // Output of project_workunit() gets caught in the buffer
@@ -460,7 +460,7 @@ 
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
-      $author_picture .= '<img src="' . $user_image . '"/>';
+      $author_picture .= '<img src="'.$user_image.'"/>';
     }
   }
   $author_picture .= '</div>';
@@ -489,7 +489,7 @@ 
   case 'team':
     global $base_url;
     $node = $variables['result']['node'];
-    $variables['url'] = $base_url .'/community/teams/' . $node->entity_id;
+    $variables['url'] = $base_url.'/community/teams/'.$node->entity_id;
     break;
   default:
   }
@@ -502,7 +502,7 @@ 
   if (!arg(2)) {
     $message = '';
   }
-  return '<p>' . $message . '</p>';
+  return '<p>'.$message.'</p>';
 }
 
 /**
@@ -518,11 +518,11 @@ 
     
     // Shorten the name when it is too long or it will break many tables.
     if (drupal_strlen($name) > 20) {
-      $name = drupal_substr($name, 0, 15) . '...';
+      $name = drupal_substr($name, 0, 15).'...';
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.'))));
+      $output = l($name, 'account/'.$object->uid, array('attributes' => array('title' => bts('View user profile.'))));
     }
     else {
       $output = check_plain($name);
@@ -540,7 +540,7 @@ 
       $output = check_plain($object->name);
     }
 
-    $output .= ' (' . bts('not verified') . ')';
+    $output .= ' ('.bts('not verified').')';
   }
   else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous')));
@@ -553,7 +553,7 @@ 
  * Remove the link under text areas that reads:
  * "More information about formatting options"
  */
-function boinc_filter_tips_more_info () {
+function boinc_filter_tips_more_info() {
   return '';
 }
 
@@ -595,8 +595,8 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', ''),
-        '!message' => $flag->friend_message ? bts('Message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+        '!message' => $flag->friend_message ? bts('Message').': '.$flag->friend_message : '',
+        '!link' => url('account/'.$sender->uid, array('absolute' => TRUE)),
         ));
       break;
 
@@ -614,7 +614,7 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', ''),
-        '!message' => $flag->friend_message ? bts('Message') . ': ' . $flag->friend_message : '',
+        '!message' => $flag->friend_message ? bts('Message').': '.$flag->friend_message : '',
         '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
         ));
       break;
@@ -626,13 +626,13 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
     }
     // Reorder the links however you need them.
-    $links = reorder_links($links, array('comment_edit','quote','comment_add','comment_reply','flag-abuse_comment','flag-abuse_node'), array('comment_delete'));
+    $links = reorder_links($links, array('comment_edit', 'quote', 'comment_add', 'comment_reply', 'flag-abuse_comment', 'flag-abuse_node'), array('comment_delete'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
   }
@@ -715,7 +715,7 @@ 
   // are the class attribute for the <li> tags.
   $dom = new DOMDocument;
   $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
-  foreach($dom->getElementsByTagName('li') as $node) {
+  foreach ($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
   }
@@ -728,7 +728,7 @@ 
     "hide", "unhide",
     "comment_delete",
   );
-  foreach(array_keys($alllinks) as $key1) {
+  foreach (array_keys($alllinks) as $key1) {
     // Select string up to first space, if present.
     $class1 = strtok($key1, ' ');
     if (in_array($class1, $selected_classes)) {
@@ -757,7 +757,7 @@ 
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
-    if ($myli->length>0) {
+    if ($myli->length > 0) {
       $newclasses = trim(($myli[0]->getAttribute("class"))." first");
       $myli[0]->setAttribute("class", $newclasses);
       $alink = $dom->saveHTML($myli[0]);
@@ -774,13 +774,13 @@ 
 
   $output = '<ul class="menu"><li class="first">';
   if ($user->uid) {
-    $output .= '<a href="' . $base_path . 'logout">' . bts('Logout') . '</a>';
+    $output .= '<a href="'.$base_path.'logout">'.bts('Logout').'</a>';
   } else {
-    $output .= '<a href="' . $base_path . 'user/login?' . drupal_get_destination() . '">' . bts('Login') . '</a>';
+    $output .= '<a href="'.$base_path.'user/login?'.drupal_get_destination().'">'.bts('Login').'</a>';
   }
   $output .= '</li>';
   if (module_exists('global_search') OR module_exists('global_search_solr')) {
-    $output .= '<li class="last"> <a class="search" href="' . $base_path . 'search/site">' . bts('search') . '</a> </li>';
+    $output .= '<li class="last"> <a class="search" href="'.$base_path.'search/site">'.bts('search').'</a> </li>';
   }
   $output .= '</ul>';
   return $output;

Braces +10 added lines, -19 removed lines

@@ -129,8 +129,7 @@ 
   AND strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
-  }
-  else {
+  } else {
     return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
   }
 }
@@ -225,8 +224,7 @@ 
           if ($key == $last_key) {
               $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
           }
-      }
-      elseif (strpos($tab, 'li ')) {
+      } elseif (strpos($tab, 'li ')) {
           if ($key == 0) {
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
@@ -364,8 +362,7 @@ 
         $cid = boincuser_get_first_unread_comment_id($topic->nid);
         if ($cid) {
           $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
-        }
-        else {
+        } else {
           // User hasn't visited this topic before, so all replies are new...
           $topic->new_replies = NULL;
         }
@@ -411,8 +408,7 @@ 
   case 'boinc_host_list':
     if ($vars['display_id'] == 'page_2') {
      $vars['empty'] = boincwork_views_host_list_empty_text();
-    }
-    elseif ($vars['display_id'] == 'page_1') {
+    } elseif ($vars['display_id'] == 'page_1') {
       $vars['empty'] = boincwork_views_host_list_empty_text('active');
     }
     break;
@@ -458,8 +454,7 @@ 
   if ($user_image) {
     if (is_array($user_image) AND $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-    }
-    elseif (is_string($user_image)) {
+    } elseif (is_string($user_image)) {
       $author_picture .= '<img src="' . $user_image . '"/>';
     }
   }
@@ -523,26 +518,22 @@ 
 
     if (user_access('access user profiles')) {
       $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.'))));
-    }
-    else {
+    } else {
       $output = check_plain($name);
     }
-  }
-  else if ($object->name) {
+  } else if ($object->name) {
     // Sometimes modules display content composed by people who are
     // not registered members of the site (e.g. mailing list or news
     // aggregator modules). This clause enables modules to display
     // the true author of the content.
     if (!empty($object->homepage)) {
       $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
-    }
-    else {
+    } else {
       $output = check_plain($object->name);
     }
 
     $output .= ' (' . bts('not verified') . ')';
-  }
-  else {
+  } else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous')));
   }
 
@@ -626,7 +617,7 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);

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

@@ -99,7 +99,7 @@ 
         $item_count = privatemsg_unread_count();
         if ($item_count) {
           $link['title'] .= '</a> <a href="/messages" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
-          $link['html'] = TRUE;
+          $link['html'] = true;
           $link['attributes']['class'] = 'compound';
         }
       }
@@ -109,7 +109,7 @@ 
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
         $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
-        $link['html'] = TRUE;
+        $link['html'] = true;
       }
     }
     $html .= l($link['title'], $link['href'], $link);
@@ -124,9 +124,9 @@ 
 /**
  * Remove undesired local task tabs
  */
-function boinc_menu_local_task($link, $active = FALSE) {
-  if (strpos($link, 'admin/build/pages') !== FALSE
-  AND strpos($link, 'Edit Panel')) {
+function boinc_menu_local_task($link, $active = false) {
+  if (strpos($link, 'admin/build/pages') !== false
+  and strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
   }
@@ -306,17 +306,17 @@ 
   $vars['signature'] = check_markup($account->signature, $vars['node']->format);
   
   // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+  $vars['show_signatures'] = ($user->hide_signatures) ? false : true;
   
   // Expose comment sort order so that the template can put the topic node
   // content (i.e. initial post) at the very end if "Newest post first" is the
   // preference used by this user
-  $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
+  $vars['oldest_post_first'] = ($user->sort != 1) ? true : false;
   $vars['node']->comment = 0;
   
-  $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
+  $vars['first_page'] = (!isset($_GET['page']) or ($_GET['page'] < 1));
   $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
-  $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
+  $vars['last_page'] = ($page_count == 1 or ($page_count > 1 and $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
   $moderator_links = array();
@@ -345,7 +345,7 @@ 
 function boinc_preprocess_comment(&$vars, $hook) {
     // Show signatures based on user preference
     global $user;
-    $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+    $vars['show_signatures'] = ($user->hide_signatures) ? false : true;
 
     $links = $vars['links'];
     $moderator_links = array();
@@ -367,7 +367,7 @@ 
         }
         else {
           // User hasn't visited this topic before, so all replies are new...
-          $topic->new_replies = NULL;
+          $topic->new_replies = null;
         }
       }
     }
@@ -456,7 +456,7 @@ 
   $author_picture = '<div class="picture">';
   $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
   if ($user_image) {
-    if (is_array($user_image) AND $user_image['image']['filepath']) {
+    if (is_array($user_image) and $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
@@ -596,7 +596,7 @@ 
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', ''),
         '!message' => $flag->friend_message ? bts('Message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+        '!link' => url('account/'. $sender->uid, array('absolute' => true)),
         ));
       break;
 
@@ -615,7 +615,7 @@ 
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', ''),
         '!message' => $flag->friend_message ? bts('Message') . ': ' . $flag->friend_message : '',
-        '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
+        '!link' => url('goto/friend-requests', array('absolute' => true)),
         ));
       break;
   }
@@ -779,7 +779,7 @@ 
     $output .= '<a href="' . $base_path . 'user/login?' . drupal_get_destination() . '">' . bts('Login') . '</a>';
   }
   $output .= '</li>';
-  if (module_exists('global_search') OR module_exists('global_search_solr')) {
+  if (module_exists('global_search') or module_exists('global_search_solr')) {
     $output .= '<li class="last"> <a class="search" href="' . $base_path . 'search/site">' . bts('search') . '</a> </li>';
   }
   $output .= '</ul>';

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

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

Indentation +22 added lines, -22 removed lines

@@ -4,47 +4,47 @@
  * Implementation of hook_user_default_permissions().
  */
 function internationalization_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: administer all languages
-  $permissions['administer all languages'] = array(
+    // Exported permission: administer all languages
+    $permissions['administer all languages'] = array(
     'name' => 'administer all languages',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer languages
-  $permissions['administer languages'] = array(
+    // Exported permission: administer languages
+    $permissions['administer languages'] = array(
     'name' => 'administer languages',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer translations
-  $permissions['administer translations'] = array(
+    // Exported permission: administer translations
+    $permissions['administer translations'] = array(
     'name' => 'administer translations',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: translate content
-  $permissions['translate content'] = array(
+    // Exported permission: translate content
+    $permissions['translate content'] = array(
     'name' => 'translate content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: translate interface
-  $permissions['translate interface'] = array(
+    // Exported permission: translate interface
+    $permissions['translate interface'] = array(
     'name' => 'translate interface',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

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

Indentation +3 added lines, -3 removed lines

@@ -4,8 +4,8 @@
  * Implementation of hook_ctools_plugin_api().
  */
 function internationalization_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "strongarm" && $api == "strongarm") {
+    list($module, $api) = func_get_args();
+    if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
+    }
 }

drupal/sites/all/features/global_search_teams_solr/global_search_teams_solr.features.inc

Indentation +3 added lines, -3 removed lines

@@ -4,8 +4,8 @@
  * Implementation of hook_ctools_plugin_api().
  */
 function global_search_teams_solr_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
+    list($module, $api) = func_get_args();
+    if ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
     return array("version" => 3);
-  }
+    }
 }