BOINC / boinc

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

Indentation +622 added lines, -622 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);
+    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) {
+    // 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);
+        // 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);
+        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;
+        // 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,28 +1100,28 @@ 
  * 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'];
-  $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
-  $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'];
+    $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
+    $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);
     }
     $members = array();
     db_set_active('boinc');
@@ -1131,18 +1131,18 @@ 
       FROM {user} u
       WHERE u.teamid = %d
       ORDER BY u.email_addr ASC",
-      $boincteam_id
+        $boincteam_id
     );
     db_set_active('default');
     
     while ($member = db_fetch_object($result)) {
-      $members[] = user_load(array('mail' => $member->email_addr));
+        $members[] = user_load(array('mail' => $member->email_addr));
     }
     
     $xml = array('users' => array());
     foreach ($members as $member) {
-      $content_profile = content_profile_load('profile', $member->uid);
-      $team_member = array(
+        $content_profile = content_profile_load('profile', $member->uid);
+        $team_member = array(
         'id' => $member->boincuser_id,
         'cpid' => $member->boincuser_cpid,
         'create_time' => $member->created,
@@ -1153,22 +1153,22 @@ 
         '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) {
+        );
+        if ($admin_request) {
         $team_member['email_addr'] = $member->mail;
-      }
-      $xml['users']['user'][] = $team_member;
+        }
+        $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);
 }
 
 /**
@@ -1176,114 +1176,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);
 }
 
 /**
@@ -1291,14 +1291,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;
@@ -1306,7 +1306,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,
@@ -1320,26 +1320,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("
@@ -1363,45 +1363,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);
 }
 
 /**
@@ -1409,9 +1409,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');
 }
 
 /**
@@ -1421,141 +1421,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',
@@ -1789,7 +1789,7 @@ 
     'Yemen' => 'Yemen',
     'Zambia' => 'Zambia',
     'Zimbabwe' => 'Zimbabwe',
-  );
+    );
 }
 
 
@@ -1797,79 +1797,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);
-  }
+    }
 }
 
 
@@ -1881,9 +1881,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
@@ -1895,7 +1895,7 @@ 
     $output .= '<span class="item-count">' . $profile_count . '</span>';
     $output .= '</div>';
     $output .= '</li>';
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }

Switch Indentation +17 added lines, -17 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;
   }
 }
 
@@ -1853,19 +1853,19 @@ 
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {
-        case '@':
-          // Escaped only.
-          $args [$key] = check_plain($value);
-          break;
+      case '@':
+        // Escaped only.
+        $args [$key] = check_plain($value);
+        break;
 
-        case '%':
-        default:
-          // Escaped and placeholder.
-          $args [$key] = theme('placeholder', $value);
-          break;
+      case '%':
+      default:
+        // Escaped and placeholder.
+        $args [$key] = theme('placeholder', $value);
+        break;
 
-        case '!':
-          // Pass-through.
+      case '!':
+        // Pass-through.
       }
     }
     return strtr($string, $args);

Spacing +28 added lines, -28 removed lines

@@ -262,8 +262,8 @@ 
         // RFC2616 mandates that the decimal part is no more than three digits,
         // so we multiply the qvalue by 1000 to avoid floating point comparisons.
         $langcode = strtolower($match[1]);
-        $qvalue = isset($match[2]) ? (float) $match[2] : 1;
-        $browser_langcodes[$langcode] = (int) ($qvalue * 1000);
+        $qvalue = isset($match[2]) ? (float)$match[2] : 1;
+        $browser_langcodes[$langcode] = (int)($qvalue*1000);
       }
     }
 
@@ -328,7 +328,7 @@ 
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', bts('project'));
-    $site_url = $base_url . $base_path;
+    $site_url = $base_url.$base_path;
     $settings = array(
       'from' => '',
       'subject' => "Content at {$site_name} is awaiting moderation",
@@ -380,11 +380,11 @@ 
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
-        $user_info .= '<img src="' . $user_image . '"/>';
+        $user_info .= '<img src="'.$user_image.'"/>';
       }
       $user_info .= '  </div>';
     }
-    $user_info .= '  <div class="name">' . theme('username', $account) . '</div>';
+    $user_info .= '  <div class="name">'.theme('username', $account).'</div>';
     if ($account->uid) {
       //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
       //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
@@ -448,7 +448,7 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel'), $cancel_url) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel'), $cancel_url).'</li>',
       '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -486,7 +486,7 @@ 
     $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>',
+      '#value' => '<li class="tab">'.l(bts('Cancel'), "community/forum/{$forum_id}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -567,8 +567,8 @@ 
 function boinccore_link($type, $object, $teaser = FALSE) {
   // Add custom links with this hook
 
-  if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+  if ($type == 'node') {
+    if (($object->type == 'forum') OR ($object->type == 'team_forum')) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
@@ -629,7 +629,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;
@@ -651,7 +651,7 @@ 
     if (user_access('administer comments')) {
       $comment_control = "comment_control/{$cid}";
       // Add link to convert comment into a new topic
-      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
+      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid));
       if ($reply_count == 0) {
         $links['convert'] = array(
             'title' => bts('Convert'),
@@ -766,8 +766,8 @@ 
     $node->created = $comment->timestamp;
     $node->changed = $node->created;
     $node->promote = 0; // Display on front page?
-    $node->sticky = 0;  // Display top of page?
-    $node->status = 1;   // Published?
+    $node->sticky = 0; // Display top of page?
+    $node->status = 1; // Published?
     $node->comment = 2;
     //$node->language = 'en';
     $node->uid = $comment->uid;
@@ -850,16 +850,16 @@ 
     $xml->loadXML($global_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $global_prefs);
-      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
-      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   if (!$errors) {
@@ -902,8 +902,8 @@ 
     $xml = array(
       'error' => array(
         'error_num' => -112,
-        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1])
+        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1])
       ),
     );
   }
@@ -1011,10 +1011,10 @@ 
           'teaser' => $teaser,
           'uid' => $team_owner_uid,
           'path' => null,
-          'status' => 1,  // published or not - always publish
+          'status' => 1, // published or not - always publish
           'promote' => 0,
           'created' => $created_time,
-          'comment' => 0,  // comments disabled
+          'comment' => 0, // comments disabled
           'moderate' => 0,
           'sticky' => 0,
           'format' => $input_format
@@ -1025,7 +1025,7 @@ 
           module_load_include('inc', 'pathauto', 'pathauto');
           $node['path'] = pathauto_cleanstring($values['name']);
         
-          $node = (object) $node; // node_save requires an object form
+          $node = (object)$node; // node_save requires an object form
           $team_categories = taxonomy_get_term_by_name($values['type']);
           $node->taxonomy[] = $team_categories[0];
           
@@ -1205,7 +1205,7 @@ 
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path().'/'.$image_path, 'field_image', 'profile', TRUE);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1319,7 +1319,7 @@ 
         WHERE (n.status = 1) AND (c.uid = '%d')
         ORDER BY timestamp DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1362,7 +1362,7 @@ 
         WHERE (n.status = 1) AND (n.uid = '%d')
         ORDER BY changed DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1525,7 +1525,7 @@ 
           );
         }
         // Determine which page to display in order to show the given comment
-        $page = floor($comment_offset / $comments_per_page);
+        $page = floor($comment_offset/$comments_per_page);
         if ($page) {
           $params = array('page' => $page);
         }
@@ -1881,7 +1881,7 @@ 
  * Overview of moderation queues
  */               
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation') . '</h2>';
+  $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("
@@ -1892,7 +1892,7 @@ 
     $output .= '<li class="tab primary">';
     $output .= l(bts('Unvetted profiles'), 'moderate/profiles');
     $output .= '<div class="item-count-wrapper">';
-    $output .= '<span class="item-count">' . $profile_count . '</span>';
+    $output .= '<span class="item-count">'.$profile_count.'</span>';
     $output .= '</div>';
     $output .= '</li>';
   }

Braces +27 added lines, -54 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,
@@ -1159,8 +1146,7 @@ 
       }
       $xml['users']['user'][] = $team_member;
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1209,24 +1195,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';
         }
       }
@@ -1253,8 +1234,7 @@ 
             'success' => NULL,
           ),
         );
-      }
-      else {
+      } else {
         // Failure
         $xml = array(
           'error' => array(
@@ -1263,8 +1243,7 @@ 
           ),
         );
       }
-    }
-    else {
+    } else {
       // Drupal user not found
       $xml = array(
         'error' => array(
@@ -1273,8 +1252,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     // BOINC user not found
     $xml = array(
       'error' => array(
@@ -1392,8 +1370,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1517,8 +1494,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
@@ -1539,8 +1515,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'
       ));
@@ -1816,8 +1791,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!',
@@ -1848,8 +1822,7 @@ 
   }
   if (empty($args)) {
     return $string;
-  }
-  else {
+  } else {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {

Upper-Lower-Casing +71 added lines, -71 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) {
@@ -1104,7 +1104,7 @@ 
   $boincteam_id = !empty($_POST['teamid']) ? $_POST['teamid'] : $_GET['teamid'];
   $account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : $_GET['account_key'];
   $show_xml = !empty($_POST['xml']) ? $_POST['xml'] : $_GET['xml'];
-  $admin_request = FALSE;
+  $admin_request = false;
   if ($boincteam_id && is_numeric($boincteam_id)) {
     if ($account_key) {
       // See if this is a team admin
@@ -1119,9 +1119,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);
     }
     $members = array();
     db_set_active('boinc');
@@ -1152,7 +1152,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;
@@ -1168,7 +1168,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1179,18 +1179,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);
@@ -1201,11 +1201,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);
@@ -1230,10 +1230,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));
       }
@@ -1250,7 +1250,7 @@ 
         // Success
         $xml = array(
           'edit_forum_preferences' => array(
-            'success' => NULL,
+            'success' => null,
           ),
         );
       }
@@ -1283,7 +1283,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1295,17 +1295,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,
@@ -1401,7 +1401,7 @@ 
       ),
     );
   }
-  print xml_to_text(array_to_xml($xml), TRUE, TRUE);
+  print xml_to_text(array_to_xml($xml), true, true);
 }
 
 /**
@@ -1420,9 +1420,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':
@@ -1809,11 +1809,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);
     }
@@ -1842,7 +1842,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);
   }

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

Indentation +84 added lines, -84 removed lines

@@ -7,185 +7,185 @@ 
 */
 
 /**
-  * The BOINC community form allows the setting of requirements for interaction
-  * in the community sections of the site.
-  */
+ * The BOINC community form allows the setting of requirements for interaction
+ * in the community sections of the site.
+ */
 function boinccore_admin_community(&$form_state) {
-  $form = array();
-  $default = array(
+    $form = array();
+    $default = array(
     'min_credit_to_post' => variable_get('boinc_comment_min_credit', 0),
     'penalty_period' => variable_get('boinc_penalty_period', 7*24*60*60),
     'moderator_mailing_list' => variable_get('boinc_moderator_mailing_list', ''),
     'moderator_force_individual_notifications' => variable_get('boinc_moderator_force_individual_notifications', 0),
-  );
+    );
   
-  // Define the form
-  $form['boinc_comment_min_credit'] = array(
+    // Define the form
+    $form['boinc_comment_min_credit'] = array(
     '#type' => 'textfield',
     '#title' => t('Credit required for community participation'),
     '#default_value' => $default['min_credit_to_post'],
     '#description' => t('Set a minimum threshold of credit a user must have
       earned before being allowed to create a profile, post comments or participate in forums.'),
-  );
-  $form['boinc_penalty_period'] = array(
+    );
+    $form['boinc_penalty_period'] = array(
     '#type' => 'textfield',
     '#title' => t('Penalty period'),
     '#default_value' => $default['penalty_period'],
     '#description' => t('The amount of time (in seconds) that user privileges
       are revoked when a user is banned from community participation.'),
-  );
-  $form['boinc_moderator_mailing_list'] = array(
+    );
+    $form['boinc_moderator_mailing_list'] = array(
     '#type' => 'textfield',
     '#title' => t('Moderator mailing list'),
     '#default_value' => $default['moderator_mailing_list'],
     '#description' => t('As an alternative to sending moderator notifications
       to individual users with the moderator role, enter a mailing list address
       here to be the only target of the notification emails.'),
-  );
-  $form['boinc_moderator_force_individual_notifications'] = array(
+    );
+    $form['boinc_moderator_force_individual_notifications'] = array(
     '#type' => 'checkbox',
     '#title' => t('Always send individual notifications'),
     '#default_value' => $default['moderator_force_individual_notifications'],
     '#description' => t('Continue to send individual moderator notification
       emails even when a mailing list is provided.'),
-  );
+    );
   
-  $form['tools'] = array(
+    $form['tools'] = array(
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#attributes' => array('class' => '')
-  );
-  $form['tools']['reset_uotd'] = array(
+    );
+    $form['tools']['reset_uotd'] = array(
     '#type' => 'submit',
     '#value' => t('Force new UOTD'),
     '#submit' => array('boinccore_reset_user_of_the_day'),
-  );
+    );
   
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC community form.
-  */
+ * Validate the BOINC community form.
+ */
 function boinccore_admin_community_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!is_numeric($values['boinc_comment_min_credit'])) {
+    $values = $form_state['values'];
+    if (!is_numeric($values['boinc_comment_min_credit'])) {
     form_set_error('boinc_comment_min_credit', t('The minimum credit value must be a number.'));
-  }
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC community form.
-  */
+ * Handle post-validation submission of BOINC community form.
+ */
 function boinccore_admin_community_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC community settings have been updated.'));
+    drupal_set_message(t('BOINC community settings have been updated.'));
 }
 
 /**
  * Force a reset of the user of the day
  */
 function boinccore_reset_user_of_the_day() {
-  if (boincuser_select_user_of_the_day()) {
+    if (boincuser_select_user_of_the_day()) {
     drupal_set_message(t('The user of the day has been reset.'));
-  }
+    }
 }
 
 /**
-  * The standard page generator form provides an interface to create standard
-  * pages, such as a Help or About page.
-  */
+ * The standard page generator form provides an interface to create standard
+ * pages, such as a Help or About page.
+ */
 function boinccore_admin_default_content(&$form_state) {
-  $form = array();
+    $form = array();
   
-  // Define the form
-  $form['page'] = array(
+    // Define the form
+    $form['page'] = array(
     '#type' => 'select',
     '#title' => t('Generate default content for'),
     '#options' => array(
-      0 => t('all standard pages'),
+        0 => t('all standard pages'),
 //      'about' => t('About page'),
-      'help' => t('Help page'),
+        'help' => t('Help page'),
     ),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => 'Generate content',
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
-  * Generate content based on the selection made on the form
-  */
+ * Generate content based on the selection made on the form
+ */
 function boinccore_admin_default_content_submit($form, &$form_state) {
-  $option = $form_state['values']['page'];
-  $page_list = boinccore_admin_default_content_generate($option);
-  $pages_generated = count($page_list);
-  if ($pages_generated > 0) {
+    $option = $form_state['values']['page'];
+    $page_list = boinccore_admin_default_content_generate($option);
+    $pages_generated = count($page_list);
+    if ($pages_generated > 0) {
     switch ($pages_generated) {
     case 1:
       $page_list = reset($page_list);
-      break;
+        break;
     case 2:
       $page_list = implode(' and ', $page_list);
-      break;
+        break;
     default:
       end($page_list);
-      $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
-      $page_list = implode(', ', $page_list);
+        $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
+        $page_list = implode(', ', $page_list);
     }
     drupal_set_message(t('Default content has been generated for the @listed
       @pages.', array(
         '@listed' => $page_list, 
         '@pages' => format_plural($pages_generated, 'page', 'pages'),
-      )
+        )
     ));
-  }
-  else {
+    }
+    else {
     if ($option) {
-      drupal_set_message(t('The @specified page already exists.',
+        drupal_set_message(t('The @specified page already exists.',
         array('@specified' => $option)), 'warning');
     }
     else {
-      drupal_set_message(t('All pages already exist, so none can be recreated
+        drupal_set_message(t('All pages already exist, so none can be recreated
         automatically.'), 'warning');
     }
     drupal_set_message(t('To recreate a page, first delete the existing page (or
       remove its URL alias), then try this function again.'), 'warning');
-  }
+    }
 }
 
 /**
-  * 
-  */
+ * 
+ */
 function boinccore_admin_default_content_generate($pages = array()) {
-  if (!$pages) {
+    if (!$pages) {
     // If not specified, attempt to generate all pages by default
     $pages = array(
-      'help',
+        'help',
 //      'about',
     );
-  }
-  elseif (!is_array($pages)) {
+    }
+    elseif (!is_array($pages)) {
     $pages = array($pages);
-  }
-  $pages_generated = array();
-  if (in_array('about', $pages)) {
+    }
+    $pages_generated = array();
+    if (in_array('about', $pages)) {
     // Create the default About page, if it doesn't exist
     // TODO: what is the default About page...?
     if (!drupal_lookup_path('source', 'about')) {
-      drupal_set_message('The about page doesn\'t yet have a definition...', 'warning');
-      //$pages_generated[] = 'about';
+        drupal_set_message('The about page doesn\'t yet have a definition...', 'warning');
+        //$pages_generated[] = 'about';
+    }
     }
-  }
-  if (in_array('help', $pages)) {
+    if (in_array('help', $pages)) {
     // Create the default Help page, if it doesn't exist
     if (!drupal_lookup_path('source', 'help')) {
-      $node = array(
+        $node = array(
         'type' => 'page',
         'title' => t('Help'),
         'uid' => 1,
@@ -198,7 +198,7 @@ 
         'comment' => 0, // disable comments
         'moderate' => 0,
         'body' => preg_replace('/>\s+</', '><',
-          '<p>Use this page to provide help and support for your site\'s
+            '<p>Use this page to provide help and support for your site\'s
           visitors:</p>
           <ul>
             <li>Add a link to your primary forum for getting help</li>
@@ -209,21 +209,21 @@ 
         'sticky' => 0,
         'format' => 4,
         //'teaser' => $teaser,
-      );
-      $node = (object) $node; // node_save requires an object
-      node_save($node);
+        );
+        $node = (object) $node; // node_save requires an object
+        node_save($node);
       
-      $item = array(
+        $item = array(
         'link_path' => drupal_get_normal_path('help'),
         'link_title' => t('Help'),
         'menu_name' => 'primary-links',
         'weight' => 50,
-      );
-      menu_link_save($item);
-      $pages_generated[] = 'help';
+        );
+        menu_link_save($item);
+        $pages_generated[] = 'help';
+    }
     }
-  }
-  // Refresh the cache with these changes
-  menu_cache_clear_all();
-  return $pages_generated;
+    // Refresh the cache with these changes
+    menu_cache_clear_all();
+    return $pages_generated;
 }

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
       break;
     default:
       end($page_list);
-      $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
+      $page_list[key($page_list)] = 'and '.$page_list[key($page_list)];
       $page_list = implode(', ', $page_list);
     }
     drupal_set_message(t('Default content has been generated for the @listed
@@ -189,7 +189,7 @@ 
         'type' => 'page',
         'title' => t('Help'),
         'uid' => 1,
-        'status' => 1,  // published
+        'status' => 1, // published
         'promote' => 0, // not promoted to front page
         'path' => 'help',
         'pathauto_perform_alias' => FALSE,
@@ -210,7 +210,7 @@ 
         'format' => 4,
         //'teaser' => $teaser,
       );
-      $node = (object) $node; // node_save requires an object
+      $node = (object)$node; // node_save requires an object
       node_save($node);
       
       $item = array(

Braces +3 added lines, -6 removed lines

@@ -144,13 +144,11 @@ 
         '@pages' => format_plural($pages_generated, 'page', 'pages'),
       )
     ));
-  }
-  else {
+  } else {
     if ($option) {
       drupal_set_message(t('The @specified page already exists.',
         array('@specified' => $option)), 'warning');
-    }
-    else {
+    } else {
       drupal_set_message(t('All pages already exist, so none can be recreated
         automatically.'), 'warning');
     }
@@ -169,8 +167,7 @@ 
       'help',
 //      'about',
     );
-  }
-  elseif (!is_array($pages)) {
+  } elseif (!is_array($pages)) {
     $pages = array($pages);
   }
   $pages_generated = array();

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

@@ -54,8 +54,8 @@ 
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
     '#attributes' => array('class' => '')
   );
   $form['tools']['reset_uotd'] = array(
@@ -192,7 +192,7 @@ 
         'status' => 1,  // published
         'promote' => 0, // not promoted to front page
         'path' => 'help',
-        'pathauto_perform_alias' => FALSE,
+        'pathauto_perform_alias' => false,
         'created' => time(),
         'changed' => time(),
         'comment' => 0, // disable comments

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

Indentation +17 added lines, -17 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

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

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

Indentation +32 added lines, -32 removed lines

@@ -26,16 +26,16 @@ 
  * Implementation of hook_comment(); 
  */
 function flag_comment_notify_comment(&$a1, $op) {
-  switch ($op) {
-  case 'insert':
+    switch ($op) {
+    case 'insert':
     module_load_include('inc', 'drupal_queue', 'drupal_queue');
     $queue = DrupalQueue::get('flag_comment_notify');
     $subscribed_users = array_keys((array) flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
     foreach ($subscribed_users as $uid) {
-      $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
+        $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -43,12 +43,12 @@ 
  * Implementation of hook_cron_queue_info()
  */
 function flag_comment_notify_cron_queue_info() {
-  $queues = array();
-  $queues['flag_comment_notify'] = array(
+    $queues = array();
+    $queues['flag_comment_notify'] = array(
     'worker callback' => 'flag_comment_notify_send_notification',
     'time' => 60,
-  );
-  return $queues;
+    );
+    return $queues;
 }
 
 
@@ -57,44 +57,44 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function flag_comment_notify_send_notification($data) {
-  $account = user_load($data['uid']);
-  $comment = _comment_load($data['cid']);
-  $node = node_load($comment->nid);
-  $author = user_load($comment->uid);
-  if ($account->mail AND $node->nid) {
+    $account = user_load($data['uid']);
+    $comment = _comment_load($data['cid']);
+    $node = node_load($comment->nid);
+    $author = user_load($comment->uid);
+    if ($account->mail AND $node->nid) {
     // Don't send notifications to the author of the comment
     if ($account->uid != $author->uid) {
-      $params['account'] = $account;
-      $params['comment'] = $comment;
-      $params['node'] = $node;
-      $params['author'] = $author;
-      drupal_mail('flag_comment_notify', 'comment_posted', $account->mail,
+        $params['account'] = $account;
+        $params['comment'] = $comment;
+        $params['node'] = $node;
+        $params['author'] = $author;
+        drupal_mail('flag_comment_notify', 'comment_posted', $account->mail,
         user_preferred_language($account), $params);
     }
-  }
+    }
 }
 
 
 function flag_comment_notify_mail($key, &$message, $params) {
-  $language = $message['language'];
-  $variables = user_mail_tokens($params['account'], $language);
-  $variables['!comment_url'] = url(
+    $language = $message['language'];
+    $variables = user_mail_tokens($params['account'], $language);
+    $variables['!comment_url'] = url(
     "goto/comment/{$params['comment']->cid}",
     array(
-      'absolute' => TRUE,
+        'absolute' => TRUE,
     )
-  );
-  $variables['!topic_name'] = $params['node']->title;
-  $variables['!author'] = $params['author']->name;
-  switch($key) {
-  case 'comment_posted':
+    );
+    $variables['!topic_name'] = $params['node']->title;
+    $variables['!author'] = $params['author']->name;
+    switch($key) {
+    case 'comment_posted':
     $message['subject'] = bts('!site: comment posted to "!topic_name"', $variables,
-      $language->language);
+        $language->language);
     $message['body'][] = bts('!author has posted a reply to "!topic_name".',
-      $variables, $language->language);
+        $variables, $language->language);
     $message['body'][] = bts("To view this topic at !site, click here: \n!comment_url",
-      $variables, $language->language);
+        $variables, $language->language);
     break;
-  default:
+    default:
   }
 }

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
   case 'insert':
     module_load_include('inc', 'drupal_queue', 'drupal_queue');
     $queue = DrupalQueue::get('flag_comment_notify');
-    $subscribed_users = array_keys((array) flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
+    $subscribed_users = array_keys((array)flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
     foreach ($subscribed_users as $uid) {
-      $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
+      $queue->createItem(array('uid' => $uid, 'cid' => (int)$a1['cid']));
     }
     break;
   default:
@@ -86,7 +86,7 @@ 
   );
   $variables['!topic_name'] = $params['node']->title;
   $variables['!author'] = $params['author']->name;
-  switch($key) {
+  switch ($key) {
   case 'comment_posted':
     $message['subject'] = bts('!site: comment posted to "!topic_name"', $variables,
       $language->language);

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

@@ -61,7 +61,7 @@ 
   $comment = _comment_load($data['cid']);
   $node = node_load($comment->nid);
   $author = user_load($comment->uid);
-  if ($account->mail AND $node->nid) {
+  if ($account->mail and $node->nid) {
     // Don't send notifications to the author of the comment
     if ($account->uid != $author->uid) {
       $params['account'] = $account;
@@ -81,7 +81,7 @@ 
   $variables['!comment_url'] = url(
     "goto/comment/{$params['comment']->cid}",
     array(
-      'absolute' => TRUE,
+      'absolute' => true,
     )
   );
   $variables['!topic_name'] = $params['node']->title;

drupal/sites/default/boinc/modules/boincimport/includes/import_team.php

Indentation +46 added lines, -46 removed lines

@@ -11,56 +11,56 @@ 
  * at a time and avoid exhausting memory.
  */
 
-  require_once('./includes/bootstrap.inc');
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  require_boinc('db');
+    require_once('./includes/bootstrap.inc');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    require_boinc('db');
   
-  // Parse arguments
-  $team_id = isset($argv[1]) ? $argv[1] : null;
-  $team_type_tid = isset($argv[2]) ? $argv[2] : null;
-  $input_format = isset($argv[3]) ? $argv[3] : null;
+    // Parse arguments
+    $team_id = isset($argv[1]) ? $argv[1] : null;
+    $team_type_tid = isset($argv[2]) ? $argv[2] : null;
+    $input_format = isset($argv[3]) ? $argv[3] : null;
   
-  $count = 0;
+    $count = 0;
   
-  // Get teams from BOINC
-  db_set_active('boinc');
-  $boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
-  $boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
-  $boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
-  db_set_active('default');
+    // Get teams from BOINC
+    db_set_active('boinc');
+    $boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
+    $boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
+    $boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
+    db_set_active('default');
   
-  $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
-  // FIXME: $team_exists==FALSE should be handled as an error and return an error code!
+    $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
+    // FIXME: $team_exists==FALSE should be handled as an error and return an error code!
 
-  if ($team_exists != FALSE && db_fetch_object($team_exists) == FALSE) {
+    if ($team_exists != FALSE && db_fetch_object($team_exists) == FALSE) {
     $boincteam->description = _boincimport_text_sanitize($boincteam->description);
     $teaser = node_teaser($boincteam->description);
     
     // Construct the team as an organic group node
     $node = array(
-      'type' => 'team',
-      'title' => $boincteam->name,
-      'body' => $boincteam->description,
-      'teaser' => $teaser,
-      'uid' => boincuser_lookup_uid($boincteam->userid),
-      'path' => null,
-      'status' => 1,  // published or not - always publish
-      'promote' => 0,
-      'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
-      'moderate' => 0,
-      'sticky' => 0,
-      'format' => $input_format
+        'type' => 'team',
+        'title' => $boincteam->name,
+        'body' => $boincteam->description,
+        'teaser' => $teaser,
+        'uid' => boincuser_lookup_uid($boincteam->userid),
+        'path' => null,
+        'status' => 1,  // published or not - always publish
+        'promote' => 0,
+        'created' => $boincteam->create_time,
+        'comment' => 0,  // comments disabled
+        'moderate' => 0,
+        'sticky' => 0,
+        'format' => $input_format
     );
     
     // Use pathauto function, if available, to clean up the path
     if (module_exists('pathauto')) {
-      module_load_include('inc', 'pathauto', 'pathauto');
-      $node['path'] = pathauto_cleanstring($boincteam->name);
+        module_load_include('inc', 'pathauto', 'pathauto');
+        $node['path'] = pathauto_cleanstring($boincteam->name);
     }
     else {
-      echo 'Pathauto module is required!';
-      exit;
+        echo 'Pathauto module is required!';
+        exit;
     }
     
     $node = (object) $node; // node_save requires an object form
@@ -72,22 +72,22 @@ 
     
     // 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);
-  }
+    }
   
-  // Determine team membership
-  db_set_active('boinc');
-  $boincteam_member_ids = array();
-  while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
-  db_set_active('default');
-  if ($boincteam_member_ids) {
+    // Determine team membership
+    db_set_active('boinc');
+    $boincteam_member_ids = array();
+    while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
+    db_set_active('default');
+    if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));
     $team_admin = (int) db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
     
     while ($drupal_user = db_fetch_object($team_members)) {
-      // Add action to take on member accounts?
-      $count++;
+        // Add action to take on member accounts?
+        $count++;
+    }
     }
-  }
   
-  echo $count;
-  
\ No newline at end of file
+    echo $count;
+    
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
   db_set_active('boinc');
   $boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
   $boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
-  $boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
+  $boincteam_admin = (int)db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
   db_set_active('default');
   
   $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
@@ -44,10 +44,10 @@ 
       'teaser' => $teaser,
       'uid' => boincuser_lookup_uid($boincteam->userid),
       'path' => null,
-      'status' => 1,  // published or not - always publish
+      'status' => 1, // published or not - always publish
       'promote' => 0,
       'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
+      'comment' => 0, // comments disabled
       'moderate' => 0,
       'sticky' => 0,
       'format' => $input_format
@@ -63,7 +63,7 @@ 
       exit;
     }
     
-    $node = (object) $node; // node_save requires an object form
+    $node = (object)$node; // node_save requires an object form
     
     $node->taxonomy[] = taxonomy_get_term($team_type_tid);
     
@@ -81,7 +81,7 @@ 
   db_set_active('default');
   if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));
-    $team_admin = (int) db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
+    $team_admin = (int)db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
     
     while ($drupal_user = db_fetch_object($team_members)) {
       // Add action to take on member accounts?

Braces +4 added lines, -3 removed lines

@@ -57,8 +57,7 @@ 
     if (module_exists('pathauto')) {
       module_load_include('inc', 'pathauto', 'pathauto');
       $node['path'] = pathauto_cleanstring($boincteam->name);
-    }
-    else {
+    } else {
       echo 'Pathauto module is required!';
       exit;
     }
@@ -77,7 +76,9 @@ 
   // Determine team membership
   db_set_active('boinc');
   $boincteam_member_ids = array();
-  while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
+  while ($boincuser = db_fetch_object($boincteam_members)) {
+      $boincteam_member_ids[] = $boincuser->id;
+  }
   db_set_active('default');
   if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));

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

@@ -32,7 +32,7 @@
   $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
   // FIXME: $team_exists==FALSE should be handled as an error and return an error code!
 
-  if ($team_exists != FALSE && db_fetch_object($team_exists) == FALSE) {
+  if ($team_exists != false && db_fetch_object($team_exists) == false) {
     $boincteam->description = _boincimport_text_sanitize($boincteam->description);
     $teaser = node_teaser($boincteam->description);
     

drupal/sites/default/boinc/modules/boincimport/includes/import_subscriptions.php

Indentation +19 added lines, -19 removed lines

@@ -12,33 +12,33 @@
  */
 
 
-  require_once('./includes/bootstrap.inc');
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  require_boinc('db');
+    require_once('./includes/bootstrap.inc');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    require_boinc('db');
   
-  // Parse arguments
-  $record_offset = isset($argv[1]) ? $argv[1] : 0;
-  $chunk_size = isset($argv[2]) ? $argv[2] : 100;
+    // Parse arguments
+    $record_offset = isset($argv[1]) ? $argv[1] : 0;
+    $chunk_size = isset($argv[2]) ? $argv[2] : 100;
   
-  // Construct sql conditions
-  $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
+    // Construct sql conditions
+    $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
   
-  $total_count = 0;
+    $total_count = 0;
   
-  // Get the users with subscriptions to import
-  db_set_active('boinc');
-  $subscribed_boinc_users = db_query("
+    // Get the users with subscriptions to import
+    db_set_active('boinc');
+    $subscribed_boinc_users = db_query("
     SELECT DISTINCT userid FROM {subscriptions}
     ORDER BY userid ASC %s", $limit
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Import subscriptions
-  while ($boinc_subscription = db_fetch_object($subscribed_boinc_users)) {
+    // Import subscriptions
+    while ($boinc_subscription = db_fetch_object($subscribed_boinc_users)) {
     $uid = get_drupal_id($boinc_subscription->userid);
     $count = boincuser_pull_subscriptions($uid);
     $total_count += $count;
     echo "\nuser: {$uid}; boinc_id: {$boinc_subscription->userid}; {$count} subscriptions";
-  }
-  echo "\n";
-  echo $total_count;
\ No newline at end of file
+    }
+    echo "\n";
+    echo $total_count;
\ No newline at end of file

drupal/sites/default/boinc/modules/boincimport/includes/import_users.php

Indentation +22 added lines, -22 removed lines

@@ -12,26 +12,26 @@ 
  */
 
 
-  require_once('./includes/bootstrap.inc');
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  require_boinc('db');
+    require_once('./includes/bootstrap.inc');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    require_boinc('db');
   
-  // Parse arguments
-  $import_lurkers = isset($argv[1]) ? $argv[1] : false;
-  $record_offset = isset($argv[2]) ? $argv[2] : 0;
-  $chunk_size = isset($argv[3]) ? $argv[3] : 100;
+    // Parse arguments
+    $import_lurkers = isset($argv[1]) ? $argv[1] : false;
+    $record_offset = isset($argv[2]) ? $argv[2] : 0;
+    $chunk_size = isset($argv[3]) ? $argv[3] : 100;
   
-  // Construct sql conditions
-  $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
+    // Construct sql conditions
+    $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
   
-  $count = 0;
+    $count = 0;
   
-  db_set_active('boinc');
-  if ($import_lurkers) {
+    db_set_active('boinc');
+    if ($import_lurkers) {
     $boinc_accounts = db_query('SELECT id FROM user ORDER BY id %s', $limit);
-  }
-  //else $boinc_accounts = db_query('SELECT DISTINCT user AS boinc_id FROM post ORDER BY boinc_id %s', $limit);
-  else {
+    }
+    //else $boinc_accounts = db_query('SELECT DISTINCT user AS boinc_id FROM post ORDER BY boinc_id %s', $limit);
+    else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array();
@@ -42,7 +42,7 @@ 
       ORDER BY userid ASC"
     );
     while ($ignoring_user = db_fetch_object($ignoring_users)) {
-      $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
+        $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
     }
     $ignored_user_list = array_keys($ignored_user_list);
     $boinc_accounts = db_query("
@@ -58,14 +58,14 @@ 
         (SELECT DISTINCT senderid FROM {private_messages})
       ) AS usersToImport ORDER BY id ASC %s", implode(',', $ignored_user_list), $limit
     );
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
   
-  while ($boinc_account = db_fetch_object($boinc_accounts)) {
+    while ($boinc_account = db_fetch_object($boinc_accounts)) {
     // Grab the BOINC user object and create a Drupal user from it
     if (boincuser_register_make_drupal_user($boinc_account->id)) {
-      $count++;
+        $count++;
+    }
     }
-  }
   
-  echo $count;
\ No newline at end of file
+    echo $count;
\ No newline at end of file

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

Indentation +185 added lines, -185 removed lines

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

Spacing +66 added lines, -66 removed lines

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

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

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

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

Indentation +132 added lines, -132 removed lines

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

Spacing +1 added lines, -1 removed lines

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

Braces +4 added lines, -8 removed lines

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

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

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