BOINC / boinc

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

Indentation +656 added lines, -656 removed lines

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

Switch Indentation +19 added lines, -19 removed lines

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

Braces +28 added lines, -56 removed lines

@@ -378,8 +378,7 @@ 
       $user_info .= '  <div class="picture">';
       if (is_array($user_image) AND $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-      }
-      elseif (is_string($user_image)) {
+      } elseif (is_string($user_image)) {
         $user_info .= '<img src="' . $user_image . '"/>';
       }
       $user_info .= '  </div>';
@@ -421,8 +420,7 @@ 
     // If a specific comment is being referenced, go back to it on cancel
     if ($comment_ref = $form['pid']['#value']) {
       $cancel_url = "goto/comment/{$comment_ref}";
-    }
-    else {
+    } else {
       $cancel_url = "node/{$form['nid']['#value']}";
     }
     
@@ -525,8 +523,7 @@ 
           'title' => bts('Reply to this topic with a quote')
       );
     }
-  }
-  else {
+  } else {
     // Standard EDIT, DELETE, and REPLY links are created by Drupal, but we want to alter them
     if (isset($links['comment_delete'])) {
       $links['comment_delete']['attributes'] = array(
@@ -580,8 +577,7 @@ 
                   'title' => bts('Remove sticky status from this topic')
               )
           );
-        }
-        else {
+        } else {
           $links['make_sticky'] = array(
               'title' => bts('Make sticky'),
               'href' => "{$node_control}/sticky",
@@ -598,8 +594,7 @@ 
                   'title' => bts('Lock this thread for comments')
               )
           );
-        }
-        else {
+        } else {
           $links['unlock'] = array(
               'title' => bts('Unlock'),
               'href' => "{$node_control}/unlock",
@@ -616,8 +611,7 @@ 
                   'title' => bts('Hide this topic')
               )
           );
-        }
-        else {
+        } else {
           $links['unhide'] = array(
               'title' => bts('Unhide'),
               'href' => "{$node_control}/unhide",
@@ -628,8 +622,7 @@ 
         }
       }// if user_access('edit any forum topic')
     }
-  }
-  else if ($type=='comment') {
+  } else if ($type=='comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -670,8 +663,7 @@ 
                 'title' => bts('Hide this comment')
             )
         );
-      }
-      else {
+      } else {
         $links['unhide'] = array(
             'title' => bts('Unhide'),
             'href' => "{$comment_control}/unhide",
@@ -853,8 +845,7 @@ 
       watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
-  }
-  elseif ($project_prefs) {
+  } elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
@@ -897,8 +888,7 @@ 
         node_save($content_profile);
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -112,
@@ -1033,8 +1023,7 @@ 
           node_save($node);
           // Save the team IDs to a BOINC <--> Drupal reference table.
           db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam_id, $node->nid);
-        }
-        else {
+        } else {
           $xml['create_team_reply']['warning'] = t(
             'There was a problem integrating this team into Drupal. Please
             contact @project administrators!', array('@project' => PROJECT)
@@ -1049,8 +1038,7 @@ 
           // Delete from the BOINC DB if we can't sync with Drupal
           $boincteam::delete();
         }
-      }
-      else {
+      } else {
         $xml['create_team_reply']['warning'] = t(
           'There was a problem integrating this team into Drupal. Please
           contact @project administrators!', array('@project' => PROJECT)
@@ -1064,8 +1052,7 @@ 
         );
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -1,
@@ -1152,8 +1139,7 @@ 
         );
         $xml['users']['user'][] = $team_member;
       }
-    }
-    else {
+    } else {
       $members = array();
       db_set_active('boinc');
       $result = db_query("
@@ -1191,8 +1177,7 @@ 
         $xml['users']['user'][] = $team_member;
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1241,24 +1226,19 @@ 
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
-                }
-                else {
+                } else {
                   $error = 'Error saving avatar to profile';
                 }
-              }
-              else {
+              } else {
                 $error = 'Unable to load user profile';
               }
-            }
-            else {
+            } else {
               $error = 'User has no profile, so avatar could not be added';
             }
-          }
-          else {
+          } else {
             $error = 'Unable to save remote image';
           }
-        }
-        else {
+        } else {
           $error = 'Could not find avatar image at URL';
         }
       }
@@ -1285,8 +1265,7 @@ 
             'success' => NULL,
           ),
         );
-      }
-      else {
+      } else {
         // Failure
         $xml = array(
           'error' => array(
@@ -1295,8 +1274,7 @@ 
           ),
         );
       }
-    }
-    else {
+    } else {
       // Drupal user not found
       $xml = array(
         'error' => array(
@@ -1305,8 +1283,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     // BOINC user not found
     $xml = array(
       'error' => array(
@@ -1424,8 +1401,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1549,8 +1525,7 @@ 
         // Get the number of comments per page
         if ($user->comments_per_page) {
           $comments_per_page = $user->comments_per_page;
-        }
-        else {
+        } else {
           $node = node_load($object->nid);
           $comments_per_page = variable_get(
             "comment_default_per_page_{$node->type}", 50
@@ -1571,8 +1546,7 @@ 
     // Check for a login, then redirect to the user's friend requests page
     if ($user->uid) {
       drupal_goto("account/{$user->uid}/friends/pending");
-    }
-    else {
+    } else {
       drupal_goto('user/login', array(
         'destination' => 'goto/friend-requests'
       ));
@@ -1848,8 +1822,7 @@ 
     if ($moderator_rid !== FALSE) {
       $settings['recipients'] = array($moderator_rid);
       rules_action_mail_to_users_of_role($settings);
-    }
-    else {
+    } else {
       watchdog(
         'boinccore',
         'Unable to identify members of the moderator role to send moderator notifications!',
@@ -1880,8 +1853,7 @@ 
   }
   if (empty($args)) {
     return $string;
-  }
-  else {
+  } else {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {

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

@@ -68,84 +68,84 @@ 
     'title' => 'Look up account RPC',
     'description' => 'RPC for getting the authenticator for a user account.',
     'page callback' => 'boinccore_lookup_account',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['am_get_info.php'] = array(
     'title' => 'Account manager get info RPC',
     'description' => 'RPC for getting assorted details of a user account.',
     'page callback' => 'boinccore_am_get_info',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['am_set_info.php'] = array(
     'title' => 'Account manager set info RPC',
     'description' => 'RPC for updating assorted details of a user account.',
     'page callback' => 'boinccore_am_set_info',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['am_set_host_info.php'] = array(
     'title' => 'Account manager set host info RPC',
     'description' => 'RPC for updating the venue for a given host.',
     'page callback' => 'boinccore_am_set_host_info',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['show_user.php'] = array(
     'title' => 'Show user RPC',
     'description' => 'RPC for getting assorted details of a user account.',
     'page callback' => 'boinccore_show_user',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['pending.php'] = array(
     'title' => 'Pending credit RPC',
     'description' => 'RPC for getting pending credit for a given account.',
     'page callback' => 'boinccore_pending_credit',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['create_team.php'] = array(
     'title' => 'Create team RPC',
     'description' => 'RPC for creating a new team.',
     'page callback' => 'boinccore_create_team',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['team_lookup.php'] = array(
     'title' => 'Team lookup RPC',
     'description' => 'RPC for getting info on a team or matching teams.',
     'page callback' => 'boinccore_team_lookup',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['team_email_list.php'] = array(
     'title' => 'Get team member list RPC',
     'description' => 'RPC for getting a list of members of a given team.',
     'page callback' => 'boinccore_team_email_list',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['edit_forum_preferences_action.php'] = array(
     'title' => 'Forum preferences RPC',
     'description' => 'RPC for setting forum preferences for a given user.',
     'page callback' => 'boinccore_edit_forum_preferences',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['forum_get_data.php'] = array(
     'title' => 'Forum get data RPC',
     'description' => 'RPC for getting recent forum activity for a given user.',
     'page callback' => 'boinccore_forum_get_data',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['apps.php'] = array(
     'title' => 'Apps RPC',
     'description' => 'RPC for getting the applications in the system.',
     'page callback' => 'boinccore_apps',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   
@@ -157,7 +157,7 @@ 
  */
 function boinccore_menu_alter(&$items) {
   // If using Solr search and not core Drupal search, disable core search!
-  if (module_exists('global_search_solr') AND !module_exists('global_search')) {
+  if (module_exists('global_search_solr') and !module_exists('global_search')) {
     // Add permission to user search.
     $check = array(
       'search/node/%menu_tail',
@@ -166,7 +166,7 @@ 
     );
     foreach ($check as $path) {
       if (isset($items[$path])) {
-        $items[$path]['access callback'] = FALSE;
+        $items[$path]['access callback'] = false;
       }
     }
   }
@@ -224,7 +224,7 @@ 
       // Since we are in a hook_boot() implementation cache mode is normal, so
       // we can safely call hook_exit().
       bootstrap_invoke_all('exit');
-      header("Location: $url", TRUE, $code);
+      header("Location: $url", true, $code);
       exit;
     }
   }
@@ -242,7 +242,7 @@ 
  */
   function locale_language_from_browser() {
     if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-      return FALSE;
+      return false;
     }
     
     $languages = language_list('enabled');
@@ -285,7 +285,7 @@ 
     // Find the enabled language with the greatest qvalue, following the rules
     // of RFC 2616 (section 14.4). If several languages have the same qvalue,
     // prefer the one with the greatest weight.
-    $best_match_language = FALSE;
+    $best_match_language = false;
     $max_qvalue = 0;
     foreach ($languages as $langcode => $language) {
       // Language tags are case insensitive (RFC2616, sec 3.10).
@@ -324,7 +324,7 @@ 
   // Notify moderators if there is site content that requires moderator action
   $items_in_queue = boincuser_moderation_queue_count('cron');
   $last_notification = variable_get('boinccore_last_content_moderation_reminder', 0);
-  if ($items_in_queue AND $last_notification < time() - 24*60*60) {
+  if ($items_in_queue and $last_notification < time() - 24*60*60) {
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', bts('project'));
@@ -376,7 +376,7 @@ 
     $user_info = '<div class="user">';
     if ($user_image) {
       $user_info .= '  <div class="picture">';
-      if (is_array($user_image) AND $user_image['image']['filepath']) {
+      if (is_array($user_image) and $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
@@ -411,8 +411,8 @@ 
       '#attributes' => array(
         'class' => 'bbcode_help',
       ),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
       'content' => array(
         '#value' => _bbcode_filter_tip(),
       ),
@@ -502,7 +502,7 @@ 
 /**
  * Implementation of hook_link_alter()
  */
-function boinccore_link_alter(&$links, $node, $comment = NULL) {
+function boinccore_link_alter(&$links, $node, $comment = null) {
   //echo '<pre>' . print_r($links, true) . '</pre>';
   foreach ($links as $module => $link) {
     // Remove the ignore user link
@@ -549,13 +549,13 @@ 
 /**
  * Implementation of hook_locale().
  */
-function boinccore_locale($op = 'groups', $group = NULL) {
+function boinccore_locale($op = 'groups', $group = null) {
   switch ($op) {
     case 'groups':
       return array('boinc' => bts('BOINC'));
     case 'info':
       //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
-      $info['boinc']['format'] = FALSE;
+      $info['boinc']['format'] = false;
       return $info;
   }
 }
@@ -564,11 +564,11 @@ 
 /**
  * Implementation of hook_link()
  */
-function boinccore_link($type, $object, $teaser = FALSE) {
+function boinccore_link($type, $object, $teaser = false) {
   // Add custom links with this hook
 
   if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+    if ( ($object->type=='forum') or ($object->type=='team_forum') ) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
@@ -696,12 +696,12 @@ 
  * Allow published, sticky, and comment status to be set on nodes by direct
  * link rather than through the node form.
  */
-function boinccore_node_control($nid = NULL, $action = NULL) {
-  if ((!$nid OR !$node = node_load($nid)) OR
-      ($node->type == 'forum' AND !user_access('edit any forum topic')) OR
-      ($node->type != 'forum' AND !user_access('administer nodes'))) {
+function boinccore_node_control($nid = null, $action = null) {
+  if ((!$nid or !$node = node_load($nid)) or
+      ($node->type == 'forum' and !user_access('edit any forum topic')) or
+      ($node->type != 'forum' and !user_access('administer nodes'))) {
     // What are you even doing here...
-    return FALSE;
+    return false;
   }
   switch ($action) {
   case 'unhide':
@@ -737,10 +737,10 @@ 
  * Allow published status to be set on comments by direct link rather than
  * through the comment edit form.
  */
-function boinccore_comment_control($cid = NULL, $action = NULL) {
-  if (!$cid OR !$comment = _comment_load($cid)) {
+function boinccore_comment_control($cid = null, $action = null) {
+  if (!$cid or !$comment = _comment_load($cid)) {
     // What are you even doing here...
-    return FALSE;
+    return false;
   }
   $return_path = "node/{$comment->nid}";
   $return_anchor = "comment-{$cid}";
@@ -789,11 +789,11 @@ 
     _comment_delete_thread($comment);
     
     $return_path = "node/{$node->nid}";
-    $return_anchor = NULL;
+    $return_anchor = null;
     break;
   default:
   }
-  drupal_goto($return_path, NULL, $return_anchor);
+  drupal_goto($return_path, null, $return_anchor);
 }
 
 /**
@@ -820,7 +820,7 @@ 
   $uid = !empty($xml['am_get_info_reply']['id']) ? boincuser_lookup_uid($xml['am_get_info_reply']['id']) : 0;
   if ($uid) {
     $content_profile = content_profile_load('profile', $uid);
-    $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
+    $profile_is_approved = ($content_profile->status and !$content_profile->moderate);
     $country = check_plain($content_profile->field_country[0]['value']);
     $website = '';
     if ($profile_is_approved) {
@@ -842,8 +842,8 @@ 
   // Remove q from the GET request or BOINC will panic
   unset($_GET['q']);
   // Validate the XML prefs (in case BOINC does not)
-  $global_prefs = !empty($_POST['global_prefs']) ? $_POST['global_prefs'] : (!empty($_GET['global_prefs']) ? $_GET['global_prefs'] : NULL);
-  $project_prefs = !empty($_POST['project_prefs']) ? $_POST['project_prefs'] : (!empty($_GET['project_prefs']) ? $_GET['project_prefs'] : NULL);
+  $global_prefs = !empty($_POST['global_prefs']) ? $_POST['global_prefs'] : (!empty($_GET['global_prefs']) ? $_GET['global_prefs'] : null);
+  $project_prefs = !empty($_POST['project_prefs']) ? $_POST['project_prefs'] : (!empty($_GET['project_prefs']) ? $_GET['project_prefs'] : null);
   libxml_use_internal_errors(true);
   $xml = new DomDocument();
   if ($global_prefs) {
@@ -882,15 +882,15 @@ 
       $uid = boincuser_lookup_uid($boinc_id);
       
       // Apply any relevant updates to the Drupal account, also
-      $country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : NULL);
-      $url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : NULL);
-      $email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : NULL);
+      $country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : null);
+      $url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : null);
+      $email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : null);
       
       if ($email_addr) {
         $account = user_load($uid);
         user_save($account, array('mail' => $email_addr));
       }
-      if ($country OR $url) {
+      if ($country or $url) {
         $content_profile = content_profile_load('profile', $uid);
         if ($country) $content_profile->field_country[0]['value'] = $country;
         if ($url) $content_profile->field_url[0]['value'] = $url;
@@ -944,7 +944,7 @@ 
   $uid = !empty($xml['user']['id']) ? boincuser_lookup_uid($xml['user']['id']) : 0;
   if ($uid) {
     $content_profile = content_profile_load('profile', $uid);
-    $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
+    $profile_is_approved = ($content_profile->status and !$content_profile->moderate);
     $country = check_plain($content_profile->field_country[0]['value']);
     $website = '';
     if ($profile_is_approved) {
@@ -1107,9 +1107,9 @@ 
   $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
   if (!$show_xml) {
       // creditonly does not affect non xml output in BOINC
-      $credit_only = FALSE;
+      $credit_only = false;
   }
-  $admin_request = FALSE;
+  $admin_request = false;
   if ($boincteam_id && is_numeric($boincteam_id)) {
     if ($account_key) {
       // See if this is a team admin
@@ -1124,9 +1124,9 @@ 
       ));
       db_set_active('default');
       require_boinc('team');
-      $boincuser = boincuser_load(boincuser_lookup_uid($boincuser_id), TRUE);
+      $boincuser = boincuser_load(boincuser_lookup_uid($boincuser_id), true);
       $boincteam = boincteam_load($boincteam_id);
-      $admin_request = is_team_admin($boincuser, $boincteam) OR is_team_founder($boincuser, $boincteam);
+      $admin_request = is_team_admin($boincuser, $boincteam) or is_team_founder($boincuser, $boincteam);
     }
 
     if ($credit_only) {
@@ -1183,7 +1183,7 @@ 
           'expavg_credit' => $member->boincuser_expavg_credit,
           'expavg_time' => $member->boincuser_expavg_time,
           'url' => $content_profile->field_url[0]['value'],
-          'has_profile' => ($content_profile->status AND !$content_profile->moderate) ? 1 : 0,
+          'has_profile' => ($content_profile->status and !$content_profile->moderate) ? 1 : 0,
         );
         if ($admin_request) {
           $team_member['email_addr'] = $member->mail;
@@ -1200,7 +1200,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1211,18 +1211,18 @@ 
   // Do not pass through to BOINC in this case as BOINC forums are no longer
   // relevant -- use Drupal data only
   
-  $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : NULL);
+  $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : null);
   
   require_boinc('boinc_db');
   $boincuser = BoincUser::lookup_auth($account_key);
   if ($boincuser) {
     $uid = boincuser_lookup_uid($boincuser->id);
-    if ($uid AND $account = user_load($uid)) {
+    if ($uid and $account = user_load($uid)) {
       // Currently supported preferences
-      $avatar_url = isset($_POST['avatar_url']) ? $_POST['avatar_url'] : (isset($_GET['avatar_url']) ? $_GET['avatar_url'] : NULL);
-      $hide_signatures = isset($_POST['forum_hide_signatures']) ? $_POST['forum_hide_signatures'] : (isset($_GET['forum_hide_signatures']) ? $_GET['forum_hide_signatures'] : NULL);
-      $signature = isset($_POST['signature']) ? $_POST['signature'] : (isset($_GET['signature']) ? $_GET['signature'] : NULL);
-      $post_order = isset($_POST['thread_sort']) ? $_POST['thread_sort'] : (isset($_GET['thread_sort']) ? $_GET['thread_sort'] : NULL);
+      $avatar_url = isset($_POST['avatar_url']) ? $_POST['avatar_url'] : (isset($_GET['avatar_url']) ? $_GET['avatar_url'] : null);
+      $hide_signatures = isset($_POST['forum_hide_signatures']) ? $_POST['forum_hide_signatures'] : (isset($_GET['forum_hide_signatures']) ? $_GET['forum_hide_signatures'] : null);
+      $signature = isset($_POST['signature']) ? $_POST['signature'] : (isset($_GET['signature']) ? $_GET['signature'] : null);
+      $post_order = isset($_POST['thread_sort']) ? $_POST['thread_sort'] : (isset($_GET['thread_sort']) ? $_GET['thread_sort'] : null);
       // Update preferences as needed
       if ($avatar_url) {
         $avatar_image = file_get_contents($avatar_url);
@@ -1233,11 +1233,11 @@ 
           if ($file) {
             $profile = new stdClass();
             $profile->type = 'profile';
-            $profile->language = NULL;
+            $profile->language = null;
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', true);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1262,10 +1262,10 @@ 
           $error = 'Could not find avatar image at URL';
         }
       }
-      if ($hide_signatures !== NULL) {
+      if ($hide_signatures !== null) {
         user_save($account, array('hide_signatures' => ($hide_signatures ? 1 : 0)));
       }
-      if ($signature !== NULL) {
+      if ($signature !== null) {
         $signature = check_markup($signature);
         user_save($account, array('signature' => $signature));
       }
@@ -1282,7 +1282,7 @@ 
         // Success
         $xml = array(
           'edit_forum_preferences' => array(
-            'success' => NULL,
+            'success' => null,
           ),
         );
       }
@@ -1315,7 +1315,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1327,17 +1327,17 @@ 
   // relevant -- use Drupal data only
   
   $xml = array();
-  $boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : NULL);
+  $boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : null);
   $uid = boincuser_lookup_uid($boinc_id);
   
   if ($uid) {
-    $method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : NULL);
-    $count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : NULL);
+    $method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : null);
+    $count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : null);
     if (!$count) $count = 10;
     
     switch ($method) {
     case 'user_posts':
-      $content_length = !empty($_POST['content_length']) ? $_POST['content_length'] : (!empty($_GET['content_length']) ? $_GET['content_length'] : NULL);
+      $content_length = !empty($_POST['content_length']) ? $_POST['content_length'] : (!empty($_GET['content_length']) ? $_GET['content_length'] : null);
       $posts = db_query("
         SELECT
           c.cid,
@@ -1433,7 +1433,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1452,9 +1452,9 @@ 
  * in advance on which page a given comment will appear. Link instead to this
  * controller function, which can compute the page based on the user's settings
  */
-function boinccore_url_pagination_handler($type, $object_id = NULL) {
+function boinccore_url_pagination_handler($type, $object_id = null) {
   global $user;
-  $path = NULL;
+  $path = null;
   $params = array();
   switch ($type) {
   case 'boinc-forum':
@@ -1841,11 +1841,11 @@ 
   $mailing_list = variable_get('boinc_moderator_mailing_list', '');
   $force_individual_notifications = variable_get('boinc_moderator_force_individual_notifications', 0);
   
-  if (!$mailing_list OR $force_individual_notifications) {
+  if (!$mailing_list or $force_individual_notifications) {
     // Send individual emails to all moderators
     $roles = user_roles();
     $moderator_rid = array_search('moderator', $roles);
-    if ($moderator_rid !== FALSE) {
+    if ($moderator_rid !== false) {
       $settings['recipients'] = array($moderator_rid);
       rules_action_mail_to_users_of_role($settings);
     }
@@ -1874,7 +1874,7 @@ 
 /*
  * BOINC wrapper for string translation
  */
-function bts($string, $args = array(), $langcode = NULL, $context = 'boinc: ', $update = TRUE) {
+function bts($string, $args = array(), $langcode = null, $context = 'boinc: ', $update = true) {
   if (function_exists('i18nstrings_ts')) {
     $string = i18nstrings_ts($context, $string, $langcode, $update);
   }