BOINC / boinc

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

Indentation +571 added lines, -571 removed lines

@@ -26,82 +26,82 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_menu() {
-  $items = array();
-  $items['community/teams/%/assume-foundership'] = array(
+    $items = array();
+    $items['community/teams/%/assume-foundership'] = array(
     'page callback' => 'boincteam_assume_foundership',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_member',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/join'] = array(
+    );
+    $items['community/teams/%/join'] = array(
     'page callback' => 'boincteam_join',
     'page arguments' => array(2),
     'access arguments' => array('join boincteam'),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/leave'] = array(
+    );
+    $items['community/teams/%/leave'] = array(
     'page callback' => 'boincteam_leave',
     'page arguments' => array(2),
     'access arguments' => array('join boincteam'),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/delete'] = array(
+    );
+    $items['community/teams/%/delete'] = array(
     'page callback' => 'boincteam_delete',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/deny-foundership-request'] = array(
+    );
+    $items['community/teams/%/deny-foundership-request'] = array(
     'page callback' => 'boincteam_deny_foundership_request',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/admins/remove/%'] = array(
+    );
+    $items['community/teams/%/edit/admins/remove/%'] = array(
     'page callback' => 'boincteam_remove_admin',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/founder/set/%'] = array(
+    );
+    $items['community/teams/%/edit/founder/set/%'] = array(
     'page callback' => 'boincteam_set_founder',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/members/remove/%'] = array(
+    );
+    $items['community/teams/%/edit/members/remove/%'] = array(
     'page callback' => 'boincteam_remove_member',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/history/xml'] = array(
+    );
+    $items['community/teams/%/history/xml'] = array(
     'page callback' => 'boincteam_history_xml',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_admin',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/request-foundership'] = array(
+    );
+    $items['community/teams/%/request-foundership'] = array(
     'page callback' => 'boincteam_request_foundership',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_member',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/user-name-autocomplete'] = array(
+    );
+    $items['community/teams/%/user-name-autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK,
-  );
-  $items['community/teams/%/message-all-members'] = array(
+    );
+    $items['community/teams/%/message-all-members'] = array(
     'title' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
     'description' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
     'page callback' => 'drupal_get_form',
@@ -109,8 +109,8 @@ 
     'access callback' => 'boincteam_is_admin',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/utility-team-delete'] = array(
+    );
+    $items['admin/boinc/utility-team-delete'] = array(
     'title' => 'Utility: Delete SPAM Teams',
     'description' => 'Utililities to help delete BOINC teams created by SPAMMERs.',
     'page callback' => 'drupal_get_form',
@@ -118,9 +118,9 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincteam.admin.inc',
-  );
+    );
    
-  return $items;
+    return $items;
 }
 
 /**
@@ -137,41 +137,41 @@ 
 
   See https://www.drupal.org/node/945102
 */
-  return array(
+    return array(
     'boincteam_utility_team_table' => array(
-      'arguments' => array('form' => NULL),
-      'file' => 'boincteam.admin.inc',
+        'arguments' => array('form' => NULL),
+        'file' => 'boincteam.admin.inc',
     ),
-  );
+    );
 }
 
 /**
 * Implementation of hook_views_api().
 */
 function boincteam_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_perm() {
-  return array('join boincteam', 'create boincteam', 'manage boincteam');
+    return array('join boincteam', 'create boincteam', 'manage boincteam');
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincteam_cron() {
-  // Sync teams from BOINC DB every day to catch BOINC-wide team updates
-  $last_sync = variable_get('boincteam_last_sync', 0);
-  if ($last_sync < time() - 24*60*60) {
+    // Sync teams from BOINC DB every day to catch BOINC-wide team updates
+    $last_sync = variable_get('boincteam_last_sync', 0);
+    if ($last_sync < time() - 24*60*60) {
     boincteam_sync();
     variable_set('boincteam_last_sync', time());
-  }
+    }
 }
 
 /**
@@ -185,41 +185,41 @@ 
 * Implementation of hook_views_pre_execute().
 */
 function boincteam_views_pre_execute(&$view) {
-  /* Specific boinc_teams sub-views use the boinc readonly replica
+    /* Specific boinc_teams sub-views use the boinc readonly replica
    * DB. These sub-views defined below by their title. If additional
    * sub-views need to be added, add their title to the list of cases
    * below. If a sub-view needs to be reverted to use the master DB,
    * then remove it from the list of cases.
    */
-  if ($view->name == 'boinc_teams') {
+    if ($view->name == 'boinc_teams') {
     switch ($view->display[$view->current_display]->display_title) {
     case 'Top teams overview pane':
     case 'Top teams pane':
     case 'Page':
       $view->base_database = 'boinc_ro';
     }
-  }
+    }
 }
 
 /**
  * Implementation of hook_cron_queue_info()
  */
 function boincteam_cron_queue_info() {
-  $queues = array();
-  $queues['queue_teamdelete'] = array(
+    $queues = array();
+    $queues['queue_teamdelete'] = array(
     'worker callback' => 'boincteam_delete',
     'time' => 60,
-  );
+    );
 }
 
 /**
  * Implementation of hook_mail_alter()
  */
 function boincteam_mail_alter(&$message) {
-  if (isset($message['params']['boincteam_headers'])) {
+    if (isset($message['params']['boincteam_headers'])) {
     $message['headers']['Bcc'] = $message['params']['boincteam_headers']['Bcc'];
     $message['to'] = '';
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -231,49 +231,49 @@ 
  * assume the role of founder
  */
 function boincteam_assume_foundership($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_foundership_transfer_ok($boincteam)) {
+    if (boincteam_foundership_transfer_ok($boincteam)) {
     if ($boincuser_id == $boincteam->ping_user) {
-      db_set_active('boinc_rw');
-      db_query("
+        db_set_active('boinc_rw');
+        db_query("
         UPDATE {team}
         SET userid = '%d', ping_user = '0', ping_time = '0'
         WHERE id = '%d'",
         $boincuser_id, $boincteam_id
-      );
-      db_set_active('default');
-      drupal_set_message(t('You are now the founder of @team', array(
+        );
+        db_set_active('default');
+        drupal_set_message(t('You are now the founder of @team', array(
         '@team' => $team->title
-      )));
-      watchdog('boincteam', 'User @user assumed foundership of team @nid',
+        )));
+        watchdog('boincteam', 'User @user assumed foundership of team @nid',
         array(
-          '@current_user' => $account->uid,
-          '@nid' => $team_id
+            '@current_user' => $account->uid,
+            '@nid' => $team_id
         ), WATCHDOG_NOTICE
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Delete the team, if empty
  */
 function boincteam_delete($team_id) {
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
-  if ($boincteam->nusers == 1) {
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+    if ($boincteam->nusers == 1) {
     require_boinc('team');
     $boincuser = boincuser_load();
     user_quit_team($boincuser);
@@ -282,35 +282,35 @@ 
     $team->uid = 0;
     node_save($team);
     drupal_set_message(t('@team has been removed.',
-      array('@team' => $boincteam->name)));
+        array('@team' => $boincteam->name)));
     drupal_goto('community/teams');
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
     drupal_goto(strstr($_GET['q'], '/delete', TRUE));
-  }
+    }
 }
 
 /**
  * Deny a foundership transfer request
  */
 function boincteam_deny_foundership_request($team_id) {
-  $boincteam_id = boincteam_lookup_id($team_id);
-  // Remove the request from the BOINC database
-  db_set_active('boinc_rw');
-  db_query("
+    $boincteam_id = boincteam_lookup_id($team_id);
+    // Remove the request from the BOINC database
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team}
     SET ping_user=0
     WHERE id = '%d'",
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  drupal_set_message(t('The transfer request has been denied. No additional
+    drupal_set_message(t('The transfer request has been denied. No additional
     requests will be allowed until 90 days have passed since this request was
     made.'));
-  drupal_goto("community/teams/{$team_id}/edit/founder");
+    drupal_goto("community/teams/{$team_id}/edit/founder");
 }
   
 
@@ -318,62 +318,62 @@ 
  * Get the join date of a user
  */
 function boincteam_get_member_join_date($boincteam_id, $boincuser_id = NULL) {
-  if (!$boincuser_id) {
+    if (!$boincuser_id) {
     global $user;
     $account = user_load($user->uid);
     $boincuser_id = $account->boincuser_id;
-  }
-  db_set_active('boinc_rw');
-  $timestamp = db_result(db_query("
+    }
+    db_set_active('boinc_rw');
+    $timestamp = db_result(db_query("
     SELECT timestamp FROM {team_delta} WHERE
     userid = %d AND teamid = %d AND joining = 1
     ORDER BY timestamp DESC LIMIT 1",
     $boincuser_id, $boincteam_id
-  ));
-  db_set_active('default');
-  return $timestamp;
+    ));
+    db_set_active('default');
+    return $timestamp;
 }
 
 /**
  * Get the team type for display
  */
 function boincteam_get_type($team_id) {
-  //$vid = boincteam_get_vocabulary_by_name('Teams'); $team->vid = $vid;
-  $team = node_load($team_id);
-  $terms = taxonomy_node_get_terms($team);
-  if ($terms) {
+    //$vid = boincteam_get_vocabulary_by_name('Teams'); $team->vid = $vid;
+    $team = node_load($team_id);
+    $terms = taxonomy_node_get_terms($team);
+    if ($terms) {
     $term = reset($terms);
     return $term->name;
-  } else {
+    } else {
     return null;
-  }
+    }
 }
 
 /**
  * Access a vocabulary of terms by name
  */ 
 function boincteam_get_vocabulary_by_name($name) {
-  $vocabs = taxonomy_get_vocabularies('team');
-  foreach ($vocabs as $vocab) {
+    $vocabs = taxonomy_get_vocabularies('team');
+    foreach ($vocabs as $vocab) {
     if ($vocab->name == $name) return $vocab->vid;
-  }
-  return null;
+    }
+    return null;
 }
 
 /**
  * Output the XML of the team history
  */
 function boincteam_history_xml($team_id) {
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $team_history = array(
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $team_history = array(
     'actions' => array(
-      'action' => array(),
+        'action' => array(),
     ),
-  );
+    );
   
-  db_set_active('boinc_rw');
-  $result = db_query("
+    db_set_active('boinc_rw');
+    $result = db_query("
     SELECT 
       td.userid AS id,
       u.name,
@@ -385,40 +385,40 @@ 
     WHERE td.teamid = %d
     ORDER BY timestamp ASC",
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  while ($record = db_fetch_array($result)) {
+    while ($record = db_fetch_array($result)) {
     $team_history['actions']['action'][] = $record;
-  }
+    }
   
-  header('Content-type: text/xml');
-  echo xml_to_text(array_to_xml($team_history));
+    header('Content-type: text/xml');
+    echo xml_to_text(array_to_xml($team_history));
 }
 
 /**
  * Convert a BOINC team ID to a Drupal team ID
  */
 function boincteam_lookup_nid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT nid FROM {boincteam} WHERE team_id='%d'", $boinc_id));
-  return $drupal_id;
+    $drupal_id = db_result(db_query("SELECT nid FROM {boincteam} WHERE team_id='%d'", $boinc_id));
+    return $drupal_id;
 }
 
 /**
  * Convert a Drupal team ID to a BOINC team ID
  */
 function boincteam_lookup_id($nid) {
-  $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = '%d'", $nid));
-  return $boinc_id;
+    $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = '%d'", $nid));
+    return $boinc_id;
 }
 
 /**
  * Get a BOINC team object
  */
 function boincteam_load($boincteam_id, $full_object = FALSE) {
-  require_boinc(array('team'));
-  $team = BoincTeam::lookup_id($boincteam_id);
-  if ($team AND $full_object) {
+    require_boinc(array('team'));
+    $team = BoincTeam::lookup_id($boincteam_id);
+    if ($team AND $full_object) {
     $team->nusers = BoincUser::count("teamid={$team->id}");
     $team->nusers_worked = BoincUser::count("teamid={$team->id} and total_credit>0");
     $team->nusers_active = BoincUser::count("teamid={$team->id} and expavg_credit>0.1");
@@ -426,313 +426,313 @@ 
     $team->new_members = new_member_list($boincteam_id);
     $team->admins = admin_list($boincteam_id);
     $team->founder = BoincUser::lookup_id($team->userid);
-  }
-  return $team;
+    }
+    return $team;
 }
 
 /**
  * Check if a user is the team founder
  */
 function boincteam_is_founder($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  if (!boincteam_is_member($nid, $uid)) {
+    }
+    if (!boincteam_is_member($nid, $uid)) {
     return FALSE;
-  }
-  $team_id = boincteam_lookup_id($nid);
-  require_boinc('team');
-  return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
+    }
+    $team_id = boincteam_lookup_id($nid);
+    require_boinc('team');
+    return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team admin
  */
 function boincteam_is_admin($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  if (!boincteam_is_member($nid, $uid)) {
+    }
+    if (!boincteam_is_member($nid, $uid)) {
     return FALSE;
-  }
-  $team_id = boincteam_lookup_id($nid);
-  require_boinc('team');
-  return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
+    }
+    $team_id = boincteam_lookup_id($nid);
+    require_boinc('team');
+    return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team member
  */
 function boincteam_is_member($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  $account = user_load($uid);
-  return ($account->team == $nid);
+    }
+    $account = user_load($uid);
+    return ($account->team == $nid);
 }
 
 /**
  * Display any persistent team messages
  */
 function boincteam_show_messages() {
-  global $user;
-  $uid = $user->uid;
-  $account = user_load($uid);
-  if ($account->team) {
+    global $user;
+    $uid = $user->uid;
+    $account = user_load($uid);
+    if ($account->team) {
     if (boincteam_is_founder($account->team, $account->uid)) {
-      // Set a notice of any pending foundership requests
-      $boincteam_id = boincteam_lookup_id($account->team);
-      $boincteam = boincteam_load($boincteam_id);
-      if ($boincteam->ping_user > 0) {
+        // Set a notice of any pending foundership requests
+        $boincteam_id = boincteam_lookup_id($account->team);
+        $boincteam = boincteam_load($boincteam_id);
+        if ($boincteam->ping_user > 0) {
         $foundership_url = "community/teams/{$account->team}/edit/founder";
         if (substr($_GET['q'], 0, strlen($foundership_url)) != $foundership_url) {
-          drupal_set_message(
+            drupal_set_message(
             bts(
-              'A foundership transfer request has been made for your team. Please !respond.',
-              array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
-              NULL, 'boinc:team-founder-change'),
+                'A foundership transfer request has been made for your team. Please !respond.',
+                array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
+                NULL, 'boinc:team-founder-change'),
             'warning', FALSE
-          );
+            );
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
  * Add a user to a team
  */
 function boincteam_join($team_id) {
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($boincteam->joinable AND $account->team != $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($boincteam->joinable AND $account->team != $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     if (user_join_team($boincteam, $boincuser)) {
-      drupal_set_message(t('You are now a member of @team!',
+        drupal_set_message(t('You are now a member of @team!',
         array('@team' => $boincteam->name)));
-      watchdog('boincteam', 'added user @uid to team @nid',
+        watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
     }
     else {
-      drupal_set_message(t('There was a problem joining @team, please try again
+        drupal_set_message(t('There was a problem joining @team, please try again
         later', array('@team' => $boincteam->name)));
-      watchdog('boincteam', 'error adding user @uid to team @nid',
+        watchdog('boincteam', 'error adding user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_ERROR);
     }
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Leave a team
  */
 function boincteam_leave($team_id) {
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($account->team == $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($account->team == $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     user_quit_team($boincuser);
     drupal_set_message(t('You are no longer a member of @team.',
-      array('@team' => $boincteam->name)));
+        array('@team' => $boincteam->name)));
     watchdog('boincteam', 'removed user @uid from team @nid',
-      array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-  }
-  else {
-      drupal_set_message(t('You are not a member of @team, so you cannot revoke
+        array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
+    }
+    else {
+        drupal_set_message(t('You are not a member of @team, so you cannot revoke
         your membership to it.', array('@team' => $boincteam->name)));
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Remove team admin status from a user
  */
 function boincteam_remove_admin($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_is_admin($team_id, $account->uid)) {
+    if (boincteam_is_admin($team_id, $account->uid)) {
     // Update the team in the BOINC db
     db_set_active('boinc_rw');
     db_query("
       DELETE FROM {team_admin} WHERE
         teamid = '%d' AND userid = '%d'",
-      $boincteam_id,
-      $boincuser_id
+        $boincteam_id,
+        $boincuser_id
     );
     db_set_active('default');
     drupal_set_message(t('@user is no longer an admin of @team.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user removed admin status for user
       @uid from team @nid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid, 
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}/edit/admins");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}/edit/admins");
 }
 
 /**
  * Remove a user from a team
  */
 function boincteam_remove_member($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
+    global $user;
+    $account = user_load($user_id);
   
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($account->team == $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($account->team == $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load($user_id, TRUE);
     user_quit_team($boincuser);
     drupal_set_message(t('@user has been removed from @team.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $boincteam->name
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user removed user @uid from team @nid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid, 
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  else {
-      drupal_set_message(t('@user is not a member of @team, so you cannot
+        ), WATCHDOG_NOTICE);
+    }
+    else {
+        drupal_set_message(t('@user is not a member of @team, so you cannot
         revoke the membership.', array(
-          '@user' => $account->boincuser_name,
-          '@team' => $boincteam->name
+            '@user' => $account->boincuser_name,
+            '@team' => $boincteam->name
         )
-      ));
-  }
-  drupal_goto("community/teams/{$team_id}/edit/members");
+        ));
+    }
+    drupal_goto("community/teams/{$team_id}/edit/members");
 }
 
 /**
  * Request a foundership transfer
  */
 function boincteam_request_foundership($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_is_founder($team_id, $account->uid)) {
+    if (boincteam_is_founder($team_id, $account->uid)) {
     // Shouldn't even be here...
     drupal_set_message(t('@user is already the team founder.',
-      array(
+        array(
         '@user' => $account->boincuser_name
-      )
+        )
     ), 'warning');
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+    }
+    elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // It hasn't been long enough since the last transfer request
     drupal_set_message(t('A foundership change was requested during the last 90
       days, so new requests are not allowed. Please try again later.'
     ), 'warning');
-  }
-  elseif (boincteam_is_member($team_id, $account->uid)) {
+    }
+    elseif (boincteam_is_member($team_id, $account->uid)) {
     // Log the transfer request
     db_set_active('boinc_rw');
     db_query("
       UPDATE {team}
       SET ping_user = '%d', ping_time='%d'
       WHERE id = '%d'",
-      $boincuser_id, time(), $boincteam_id
+        $boincuser_id, time(), $boincteam_id
     );
     db_set_active('default');
     drupal_set_message(t('You have requested foundership of @team. The current
       founder has 60 days to respond to this request.',
-      array(
+        array(
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @user requested foundership of team @nid',
-      array(
+        array(
         '@current_user' => $account->uid,
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Transfer foundership to another team member
  */
 function boincteam_set_founder($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_is_member($team_id, $account->uid)) {
+    if (boincteam_is_member($team_id, $account->uid)) {
     // Update the team in the BOINC db
     db_set_active('boinc_rw');
     db_query("
       UPDATE {team}
       SET userid = '%d', ping_user=0
       WHERE id = '%d'",
-      $boincuser_id, $boincteam_id
+        $boincuser_id, $boincteam_id
     );
     db_set_active('default');
     drupal_set_message(t('Foundership of @team has been transfered to @user.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user transferred foundership of team
       @nid to user @uid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid, 
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * See if a new foundership transfer request is allowed
  */
 function boincteam_new_foundership_transfer_request_ok($team_id) {
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $now = time();
-  if ($boincteam->ping_user <= 0) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $now = time();
+    if ($boincteam->ping_user <= 0) {
     if ($boincteam->ping_time < $now - 60 * (24*60*60)) {
-      return TRUE;
+        return TRUE;
     }
     return FALSE;
-  }
-  if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
+    }
+    if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /** 
@@ -754,18 +754,18 @@ 
  * Check if a user has an active foundership request with a team
  */
 function boincteam_user_requested_foundership($team_id, $user_id = NULL) {
-  if (!$user_id) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
-  }
-  $account = user_load($user_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
+    }
+    $account = user_load($user_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
   
-  if ($boincteam->ping_user == $account->boincuser_id) {
+    if ($boincteam->ping_user == $account->boincuser_id) {
     // Be sure the request is still active
     return !boincteam_new_foundership_transfer_request_ok($team_id);
-  }
+    }
 }
 
 
@@ -777,125 +777,125 @@ 
  * General info about team admins
  */                                         
 function boincteam_about_admins_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
     . ' team admin. We recommend only selecting people you know and trust', array(), NULL, 'boinc:team-admins-panel')
     . '</p>';
-  return $output;
+    return $output;
 }
 
 /**
  * General info about changing the team founder
  */                                         
 function boincteam_about_founder_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
     . '</h2>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '<div>';
+    $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
     . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
+    $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
     . ' request', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
  * Link to create a new team
  */
 function boincteam_create_team_link_panel() {
-  global $user;
-  $account = user_load($user->uid);
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
+    global $user;
+    $account = user_load($user->uid);
+    $unrestricted_role = array_search('verified contributor', user_roles(true));
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+    $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
     . ' can create a team.', array(), NULL, 'boinc:create-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">';
-  if (isset($account->roles[$unrestricted_role])) {
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">';
+    if (isset($account->roles[$unrestricted_role])) {
     $output .= l(bts('Create new team', array(), NULL, 'boinc:create-team-panel'), 'community/teams/add');
-  } elseif ($account->uid <= 0) {
+    } elseif ($account->uid <= 0) {
     $output .= l(
-      bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
-      'user/login',
-      array('query' => drupal_get_destination())
+        bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
+        'user/login',
+        array('query' => drupal_get_destination())
     );
-  } else {
+    } else {
     $min_credit_needed = variable_get('boinc_comment_min_credit', 0);
     $credit_needed = $min_credit_needed - $account->boincuser_total_credit;
     $output .= '[';
     if ($credit_needed == 1) {
-      $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
+        $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
     }
     else {
-      $output .= bts('You must earn @count more credits!',
+        $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
-	NULL, 'boinc:create-team-panel'
-      );
+    NULL, 'boinc:create-team-panel'
+        );
     }
     $output .= ']';
-  }
-  $output .= '  </li>';
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '  </li>';
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Create team form
  */
 function boincteam_create_team_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= drupal_get_form('boincteam_create_form');
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+    $output .= drupal_get_form('boincteam_create_form');
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to user's team
  */
 function boincteam_dashboard_panel($uid = NULL) {
-  global $user;
-  if (!$uid) {
+    global $user;
+    if (!$uid) {
     $uid = $user->uid;
-  }
-  $output = '';
-  $account = user_load($uid);
-  if ($account->team) {
+    }
+    $output = '';
+    $account = user_load($uid);
+    if ($account->team) {
     $team = boincteam_load(boincteam_lookup_id($account->team));
     $output .= '<h2 class="pane-title">' . bts('Team', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<div class="stats">';
@@ -914,254 +914,254 @@ 
     $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
-  }
-  else if ($user->uid == $account->uid) {
+    }
+    else if ($user->uid == $account->uid) {
     $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
     $output .= l(bts('Join a Team', array(), NULL, 'boinc:team-dashboard'), 'community/teams');
     $output .= '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Edit team form
  */
 function boincteam_edit_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
-  $output .= drupal_get_form('boincteam_edit_form', $team_id);
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
+    $output .= drupal_get_form('boincteam_edit_form', $team_id);
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to join a team
  */
 function boincteam_join_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to become a member of @this_team',
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
+    $output .= '<p>' . bts('Click here to become a member of @this_team',
     array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' . 
     l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Link to leave a team
  */
 function boincteam_leave_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to revoke your membership with'
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
+    $output .= '<p>' . bts('Click here to revoke your membership with'
     . ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' . 
     l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team admins
  */                                         
 function boincteam_manage_admins_panel_header($team_id) {
-  $output = '';
-  $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
-  $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
-  $output .= '<div class="clearfix"></div>';
-  $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+    $output = '';
+    $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+    $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
+    $output .= '<div class="clearfix"></div>';
+    $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
   
-  return $output;
+    return $output;
 }
 
 /**
  * Team management tools
  */
 function boincteam_management_panel($team_id) {
-  $is_founder = boincteam_is_founder($team_id);
-  $team = node_load($team_id);
+    $is_founder = boincteam_is_founder($team_id);
+    $team = node_load($team_id);
 
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
   
-  // PM all members
-  if (module_exists('privatemsg')) {
+    // PM all members
+    if (module_exists('privatemsg')) {
     $output .= '<div class="form-item">';
     $output .= '  <ul class="tab-list action-list">';
     $output .= '    <li class="first tab primary">' .
-      l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
+        l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
     $output .= '  </ul>';
     $output .= '  <div class="description">';
     $output .=   bts('Contact all team members using e-mail.', array(), NULL, 'boinc:team-manage');
     $output .= '  </div>';
     $output .= '</div>';
-  }
+    }
 
-  // Team forum
-  if (module_exists('boincteam_forum')) {
+    // Team forum
+    if (module_exists('boincteam_forum')) {
     if ($is_founder) {
-      // Determine whether to create a forum or edit the existing forum
-      // (multiple forums per team could be supported in the future)
-      $team_forum_link_path = 'add';
-      $team_forums = boincteam_forum_list();
-      if ($team_forums) {
+        // Determine whether to create a forum or edit the existing forum
+        // (multiple forums per team could be supported in the future)
+        $team_forum_link_path = 'add';
+        $team_forums = boincteam_forum_list();
+        if ($team_forums) {
         $team_forum = reset($team_forums);
         $team_forum_link_path = "{$team_forum->tfid}/edit";
-      }
-      $output .= '<div class="form-item">';
-      $output .= '  <ul class="tab-list action-list">';
-      $output .= '    <li class="first tab primary">' .   
+        }
+        $output .= '<div class="form-item">';
+        $output .= '  <ul class="tab-list action-list">';
+        $output .= '    <li class="first tab primary">' .   
         l(bts('Manage team message board', array(), NULL, 'boinc:team-manage'),
-          "community/teams/{$team_id}/forum/{$team_forum_link_path}"
+            "community/teams/{$team_id}/forum/{$team_forum_link_path}"
         );
-      $output .= '    </li>';
-      $output .= '  <div class="description">';
-      $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '    </li>';
+        $output .= '  <div class="description">';
+        $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
+        $output .= '  </div>';
+        $output .= '</div>';
+    }
     }
-  }
   
-  // Team history
-  $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
-  $output .= '  <ul class="tab-list">';
-  $output .= '    <li class="first tab primary">' . 
+    // Team history
+    $output .= '<div class="form-item">';
+    $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
+    $output .= '  <ul class="tab-list">';
+    $output .= '    <li class="first tab primary">' . 
     l('HTML', "community/teams/{$team_id}/history") . '</li>';
-  $output .= '    <li class="last tab primary">' .
+    $output .= '    <li class="last tab primary">' .
     l('XML', "community/teams/{$team_id}/history/xml") . '</li>';
-  $output .= '  </ul>';
-  $output .= '  <div class="description">';
-  $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
-  $output .= '  </div>';
-  $output .= '</div>';
+    $output .= '  </ul>';
+    $output .= '  <div class="description">';
+    $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
+    $output .= '  </div>';
+    $output .= '</div>';
   
-  $output .= '<div class="form-item">';
-  $output .= '  <ul class="tab-list action-list">';
+    $output .= '<div class="form-item">';
+    $output .= '  <ul class="tab-list action-list">';
   
-  // Edit team information
-  $output .= '    <li class="first tab primary">' . 
+    // Edit team information
+    $output .= '    <li class="first tab primary">' . 
     l(bts('Edit team info', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info") . '</li>';
     
-  // Member list
-  $output .= '    <li class="tab primary">' . 
+    // Member list
+    $output .= '    <li class="tab primary">' . 
     l(bts('View member list', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/members") . '</li>';
 
-  // Remove members
-  $output .= '    <li class="tab primary">' . 
+    // Remove members
+    $output .= '    <li class="tab primary">' . 
     l(bts('Remove members', array(), NULL, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members") . '</li>';
   
-  if ($is_founder) {
+    if ($is_founder) {
     
     // Change founder
     $output .= '    <li class="tab primary">' . 
-      l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
+        l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
       
-      // Manage admins
+        // Manage admins
     $output .= '    <li class="tab primary">' . 
-      l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
+        l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
     
     // Delete the team
     $output .= '    <li class="last tab primary">' . 
-      l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
-  }
+        l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
+    }
   
-  $output .= '  </ul>';
-  $output .= '</div>';
+    $output .= '  </ul>';
+    $output .= '</div>';
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to user's team
  */
 function boincteam_member_link_panel() {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($account->team);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
-  $output .= '<p>' . bts('You are a member of @team.', 
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($account->team);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
+    $output .= '<p>' . bts('You are a member of @team.', 
     array('@team' => $team->title), NULL, 'boinc:account-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' . 
     l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Link to request foundership transfer of a team
  */
 function boincteam_request_foundership_panel($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
   
-  if (boincteam_user_requested_foundership($team_id)) {
+    if (boincteam_user_requested_foundership($team_id)) {
     $deadline = boincteam_foundership_transfer_ok_time($boincteam);
     $days_to_deadline = ceil(($deadline - time()) / (24*60*60));
     $request_age = 60 - $days_to_deadline;
     $days_to_respond = 30 + $days_to_deadline;
     if (time() > $deadline) {
-      $output .= '<p>';
-      if ($request_age == 1) {
+        $output .= '<p>';
+        if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
-          . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('@count days have elapsed since your request and'
-          . ' the founder has not responded.',
-          array('@count' => $request_age),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= ' ';
-      if ($days_to_respond == 1) {
+            . ' the founder has not responded.',
+            array('@count' => $request_age),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= ' ';
+        if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
-          . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('You now have @count days to assume foundership before'
-          . ' another team member may submit a request.',
-          array('@count' => $days_to_respond),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= '</p>';
-      $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
+            . ' another team member may submit a request.',
+            array('@count' => $days_to_respond),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= '</p>';
+        $output .= '<ul class="tab-list">';
+        $output .= '  <li class="first last tab">' . 
         l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
-      $output .= '</ul>';
+        $output .= '</ul>';
     }
     else {
-      $output .= '<p>';
-      if ($days_to_deadline == 1) {
+        $output .= '<p>';
+        if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
-          . ' transfer request.',
-          NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' transfer request.',
+            NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('The team founder has @count days to respond to your'
-          . ' transfer request.', array('@count' => $days_to_deadline),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= '</p>';
+            . ' transfer request.', array('@count' => $days_to_deadline),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= '</p>';
     }
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+    }
+    elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // If this user does not have a transfer request pending, but new requests
     // are not allowed, set the deadline to 90 days instead of 60 (as the user
     // who made the request has 30 additional days to assume foundership if 
@@ -1170,131 +1170,131 @@ 
     $days_to_deadline = ceil(($deadline - time()) / (24*60*60)) + 30;
     $output .= '<p>';
     $output .= bts('A team foundership change was already requested recently.'
-      . ' Only one request is allowed within a period of 90 days.',
-      NULL, 'boinc:team-request-foundership');
+        . ' Only one request is allowed within a period of 90 days.',
+        NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
-      $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
+        $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
     }
     else {
-      $output .= ' (' . bts('@count days remaining',
+        $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
         NULL, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
-  }
-  else {
+    }
+    else {
     $output .= '<p>' . bts('If the team founder is not active and you want to'
-      . ' assume the role of founder, click below to request foundership of'
-      . ' @this_team.',
-      array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
+        . ' assume the role of founder, click below to request foundership of'
+        . ' @this_team.',
+        array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
     $output .= '<ul class="tab-list">';
     $output .= '  <li class="first last tab">' . 
-      l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
+        l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Respond to foundership transfer requests for a team
  */
 function boincteam_request_foundership_response_panel($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-  $output = '';
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+    $output = '';
   
-  if ($boincteam->ping_user) {
+    if ($boincteam->ping_user) {
     if ($boincteam->ping_user < 0) {
-      $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+        $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
+        $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name requested team foundership on'
+        $output .= '<p>' . bts('Team member @name requested team foundership on'
         . ' @date, but then left the team. This request is now canceled.',
         array(
-          '@name' => $member->boincuser_name,
-          '@date' => date('j M Y', $boincteam->ping_time),
+            '@name' => $member->boincuser_name,
+            '@date' => date('j M Y', $boincteam->ping_time),
         ),
         NULL, 'boinc:team-request-foundership-response') . '</p>';
-      // Automatically cancel the request
-      db_set_active('boinc_rw');
-      db_query("
+        // Automatically cancel the request
+        db_set_active('boinc_rw');
+        db_query("
         UPDATE {team}
         SET ping_user=0
         WHERE id = '%d'",
         $boincteam_id
-      );
-      db_set_active('default');
+        );
+        db_set_active('default');
     }
     else {
-      $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+        $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
+        $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name has requested team foundership.'
+        $output .= '<p>' . bts('Team member @name has requested team foundership.'
         . ' This may be because you left the team or have not had contact with'
         . ' the team for a long time.', array(
-          '@name' => $member->boincuser_name,
+            '@name' => $member->boincuser_name,
         )
-      , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<p>' . bts("If you don't decline the request by @date, @name"
+        , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
+        $output .= '<p>' . bts("If you don't decline the request by @date, @name"
         . ' will have the option of assuming team foundership. (note: To'
         . ' accept the request, assign foundership to @name using the form'
         . ' below)',
         array(
-          '@name' => $member->boincuser_name,
-          '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
+            '@name' => $member->boincuser_name,
+            '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
         ),
         NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
+        $output .= '<ul class="tab-list">';
+        $output .= '  <li class="first last tab">' . 
         l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
-      $output .= '</ul>';
+        $output .= '</ul>';
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 function boincteam_search_panel() {
-  $output = '';
-  if (module_exists('global_search_teams_solr')) {
+    $output = '';
+    if (module_exists('global_search_teams_solr')) {
     $output .= '<h2 class="pane-title">' . bts('Search teams', array(), NULL, 'boinc:search-team') . '</h2>';
     //$output .= '<p>' . bts('Render a search form here.', array(), NULL, 'boinc:search-team') . '</p>';
     $output .= '<p>' . boincteam_search_view() . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 function boincteam_search_view($type = 'team') {
-  // Get the team search form
-  $search_page = apachesolr_search_page_load('team_search');
-  module_load_include('inc', 'apachesolr_search', 'apachesolr_search.pages');
-  return drupal_get_form('apachesolr_search_custom_page_search_form', $search_page);
+    // Get the team search form
+    $search_page = apachesolr_search_page_load('team_search');
+    module_load_include('inc', 'apachesolr_search', 'apachesolr_search.pages');
+    return drupal_get_form('apachesolr_search_custom_page_search_form', $search_page);
 }
 
 /**
  * General info about the concept of teams
  */                                         
 function boincteam_topic_overview_panel() {
-  $site_name =  variable_get('site_name', 'Drupal-BOINC');
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
-  $output .= '<div class="">';
-  $output .= '<p>' . bts('@project participants may form teams. You may belong'
+    $site_name =  variable_get('site_name', 'Drupal-BOINC');
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
+    $output .= '<div class="">';
+    $output .= '<p>' . bts('@project participants may form teams. You may belong'
     . ' to only one team. You can join or quit a team at any time. To join a'
     . ' team, visit its team page and click "Join this team". Each team has a'
     . ' founder who may:', array('@project' => $site_name), NULL, 'boinc:team-general-info') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -1322,50 +1322,50 @@ 
  * Link to view a team
  */
 function boincteam_view_team_panel($team_id) {
-  $team = node_load($team_id);
-  if ($team->type != "team") {
+    $team = node_load($team_id);
+    if ($team->type != "team") {
     return;
-  }
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
-  $founder = user_load(get_drupal_id($boincteam->userid));
-  $new_members = array();
-  if ($boincteam->new_members) {
+    }
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+    $founder = user_load(get_drupal_id($boincteam->userid));
+    $new_members = array();
+    if ($boincteam->new_members) {
     foreach ($boincteam->new_members as $member) {
-      $account = user_load(get_drupal_id($member->id));
-      $new_members[] = l($account->boincuser_name, "account/{$account->uid}");
+        $account = user_load(get_drupal_id($member->id));
+        $new_members[] = l($account->boincuser_name, "account/{$account->uid}");
     }
-  }
-  $output = '';
-  $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
-  $output .= '<div>';
-  $output .= '<div class="left-column">';
-  $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
-  $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
-  $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div class="right-column">';
-  $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
-  $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
-  $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
-  $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
-  $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '</div>';
-  $output .= '<div class="clearfix"></div>';
-  if ($boincteam->url) {
+    }
+    $output = '';
+    $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
+    $output .= '<div>';
+    $output .= '<div class="left-column">';
+    $output .= '<ul class="stats">';
+    $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
+    $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
+    $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
+    $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div class="right-column">';
+    $output .= '<ul class="stats">';
+    $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
+    $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
+    $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
+    $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
+    $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '</div>';
+    $output .= '<div class="clearfix"></div>';
+    if ($boincteam->url) {
     $output .= '<div class="stats">';
     $output .= bts('Website', array(), NULL, 'boinc:website-of-user-or-team') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
     $output .= '</div>';
-  }
-  if ($team->body) {
+    }
+    if ($team->body) {
     $output .= '<h3>' . bts('Description', array(), NULL, 'boinc:team-description') . '</h3>';
     $output .= check_markup($team->body, $team->format);
     $output .= '</div>';
-  }
-  return $output;
+    }
+    return $output;
 }

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

Indentation +73 added lines, -73 removed lines

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

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

Indentation +331 added lines, -331 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
   
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name), NULL, 'boinc:team-create/edit'));
     }
-  }
+    }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
   
-  // Create the team node in Drupal
+    // Create the team node in Drupal
   
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
   
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
   
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // 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']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
   
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
   
-  // Save the team node
-  node_save($node);
+    // 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)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
   
-  drupal_set_message(t('Team "@name" has been created.', 
+    drupal_set_message(t('Team "@name" has been created.', 
     array('@name' => $values['name'])));
   
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
   
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
   
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
     
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         )),
         NULL, 'boinc:team-edit-warning-message'),
-      'warning');
-  }
+        'warning');
+    }
   
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name), NULL, 'boinc:team-create/edit'));
         }
-      }
+        }
     }
   
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Update the team node in Drupal
+    // Update the team node in Drupal
   
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
   
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
   
-  drupal_set_message(t('Details for "@team" have been updated.', 
+    drupal_set_message(t('Details for "@team" have been updated.', 
     array('@team' => $values['name'])));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,44 +508,44 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
   
-  $default = array(
+    $default = array(
     'username' => '',
-  );
+    );
   
-  // Form elements
-  $form['username'] = array(
+    // Form elements
+    $form['username'] = array(
     '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
     '#size' => 34,
     '#autocomplete_path' => "community/teams/${team_id}/user-name-autocomplete",
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
   
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -553,45 +553,45 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
-  $team = node_load($team_id);
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
+    $team = node_load($team_id);
   
-  if (!$values['username']) {
+    if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+    }
+    else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('username', bts('There is no user on your team with name @username.',
+        form_set_error('username', bts('There is no user on your team with name @username.',
         array(
-          '@username' => $account->boincuser_name
+            '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+        NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
+        form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is already an admin of @team.',
+        form_set_error('username', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -599,17 +599,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -617,17 +617,17 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
   
   
-  drupal_set_message(t('@user has been added as an admin.', 
+    drupal_set_message(t('@user has been added as an admin.', 
     array('@user' => $user_name)));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -639,80 +639,80 @@ 
  * Send all team members an email message function
  */
 function boincteam_sendmessagetoteam(&$form_state, $team_id) {
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  if (isset($form_state['values'])) {
+    if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+    }
+    else {
     $subject   = '';
     $body      = '';
-  }
+    }
 
-  // Title
-  $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
-  drupal_set_title($mytitle);
+    // Title
+    $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
+    drupal_set_title($mytitle);
 
-  $form['emailteam']['header'] = array(
+    $form['emailteam']['header'] = array(
     '#value'              => '<h1>' . $mytitle . '</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  $form['emailteam']['instructions'] = array(
+    $form['emailteam']['instructions'] = array(
     '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), NULL, 'boinc:team-message-form'),
     '#weight'             => '-8',
     '#prefix'             => "<div id='sendmessageteammembers-instructions'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  // Subject
-  $form['emailteam']['subject'] = array(
+    // Subject
+    $form['emailteam']['subject'] = array(
     '#type'               => 'textfield',
     '#title'              => bts('Subject', array(), NULL, 'boinc:team-message-form'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
     '#weight'             => -5,
-  );
+    );
 
-  // Body
-  $form['emailteam']['body'] = array(
+    // Body
+    $form['emailteam']['body'] = array(
     '#type'               => 'textarea',
     '#title'              => bts('Message', array(), NULL, 'boinc:team-message-form'),
     '#rows'               => 8,
     '#weight'             => 0,
     '#default_value'      => $body,
     '#resizable'          => TRUE,
-  );
+    );
 
-  // checkbox for 'sent to self'
-  $form['emailteam']['selfsend'] = array(
+    // checkbox for 'sent to self'
+    $form['emailteam']['selfsend'] = array(
     '#type'    => 'checkbox',
     '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), NULL, 'boinc:team-message-form'),
     '#weight'  => 10,
     '#prefix'  => '<div class="clearfix" id="confirm-checkbox">',
     '#suffix'  => '</div>',
-  );
+    );
 
-  // Add a captcha to form
-  if (module_exists('captcha')) {
+    // Add a captcha to form
+    if (module_exists('captcha')) {
     $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
     );
-  }
+    }
 
-  // form buttons
-  $form['emailteam']['form control tabs prefix'] = array(
+    // form buttons
+    $form['emailteam']['form control tabs prefix'] = array(
     '#value'  => '<ul class="form-control tab-list">',
     '#weight' => 1000,
-  );
+    );
 
-  $form['emailteam']['submit'] = array(
+    $form['emailteam']['submit'] = array(
     '#type'               => 'submit',
     '#value'              => bts('Send message', array(), NULL, 'boinc:form-submit'),
     '#submit'             => array('boincteam_sendmessagetoteam_submit'),
@@ -720,130 +720,130 @@ 
     '#weight'             => 1001,
     '#prefix'             => '<li class="first tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
-  $url = "community/teams/{$team_id}";
-  $form['emailteam']['cancel'] = array(
+    $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
+    $url = "community/teams/{$team_id}";
+    $form['emailteam']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
     '#weight'             => 1005,
     '#prefix'             => '<li class="tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $form['emailteam']['form control tabs suffix'] = array(
+    $form['emailteam']['form control tabs suffix'] = array(
     '#value'  => '</ul>',
     '#weight' => 1010,
-  );
+    );
 
-  // Add team id information to form_state
-  $form['_team_id'] = array(
+    // Add team id information to form_state
+    $form['_team_id'] = array(
     '#type'  => 'value',
     '#value' => $team_id,
-  );
+    );
 
-  // Add sender user object to form_state
-  $form['_senderuid'] = array(
+    // Add sender user object to form_state
+    $form['_senderuid'] = array(
     '#type'  => 'value',
     '#value' => $user->uid,
-  );
+    );
 
-  // redirect after sending message
-  $form['#redirect'] = "community/teams/{$team_id}";
+    // redirect after sending message
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
  * Send all team members validation handler
  */
 function boincteam_sendmessagetoteam_validate($form, &$form_state) {
-  $message = $form_state['values'];
-  $message['timestamp'] = time();
-  // Avoid subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
+    $message = $form_state['values'];
+    $message['timestamp'] = time();
+    // Avoid subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
-  if (empty($message['subject']) && !empty($trimed_body)) {
+    $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+    if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
     $form_state['values']['subject'] = $message['subject'];
-  }
+    }
 
-  // Check subject line
-  $message['subject'] = trim($message['subject']);
-  if (empty($message['subject'])) {
+    // Check subject line
+    $message['subject'] = trim($message['subject']);
+    if (empty($message['subject'])) {
     form_set_error('subject',
-      bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+    // Check body
+    if ( ($message['body'] === NULL || $message['body'] === '') ) {
     form_set_error('body',
-      bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check team id
-  if (empty($message['_team_id'])) {
+    // Check team id
+    if (empty($message['_team_id'])) {
     form_set_error('team_id',
-      bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
+        bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  $form_state['validated_built_message'] = $message;
+    $form_state['validated_built_message'] = $message;
 }
 
 /**
  * Send all team members submit handler
  */
 function boincteam_sendmessagetoteam_submit($form, &$form_state) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  global $base_url;
-  global $base_path;
-
-  $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "/messages/new/" . $suid;
-
-  // Form is validated, now send to all team members. Lookup boinc
-  // id of all team members, and then use user_load() to load user
-  // object. Send message using email.
-  //
-  $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
-  // Email addresses, with those who have opt-ed out of notification
-  // emails removed.
-  $member_emails = _boincteam_emails($boinc_id);
-  // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    global $base_url;
+    global $base_path;
+
+    $suid = $form_state['values']['_senderuid'];
+    $account = user_load(array('uid' => $suid ));
+    $site_url = $base_url . $base_path . "/messages/new/" . $suid;
+
+    // Form is validated, now send to all team members. Lookup boinc
+    // id of all team members, and then use user_load() to load user
+    // object. Send message using email.
+    //
+    $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
+    // Email addresses, with those who have opt-ed out of notification
+    // emails removed.
+    $member_emails = _boincteam_emails($boinc_id);
+    // Remove sender's email address, unless selfsend is true.
+    if ( !$form_state['values']['selfsend'] ) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
-  }
+    }
 
-  // Add link at bottom of body
-  $mybody = $form_state['validated_built_message']['body'];
-  $mybody .= "\n\n"
-      . "To reply to the sender using a Direct Message (DM), please use this link:\n"
-      . "${site_url}";
+    // Add link at bottom of body
+    $mybody = $form_state['validated_built_message']['body'];
+    $mybody .= "\n\n"
+        . "To reply to the sender using a Direct Message (DM), please use this link:\n"
+        . "${site_url}";
 
-  $emailsettings = array(
+    $emailsettings = array(
     'from'    => '',
     'to'      => "webmaster@{$base_url}",
     'boincteam_headers' => array(
-      'Bcc'     => implode(',', $member_emails),
+        'Bcc'     => implode(',', $member_emails),
     ),
     'subject' => $form_state['validated_built_message']['subject'],
     'message' => $mybody,
-  );
-  rules_action_mail($emailsettings);
+    );
+    rules_action_mail($emailsettings);
 
-  $om = bts(
+    $om = bts(
     'Sent your email message to !number team members.',
     array( '!number' => count($member_emails) ),
     'NULL',
     'boinc:team-message-sent'
-  );
-  drupal_set_message($om, 'info');
+    );
+    drupal_set_message($om, 'info');
 
-  $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
+    $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
 }