BOINC / boinc

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

Indentation +322 added lines, -322 removed lines

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

html/user/recover_email.php

Indentation +2 added lines, -2 removed lines

@@ -56,9 +56,9 @@
                 "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0"
             );
             $result = delete_token($userid, $token, TOKEN_TYPE_CHANGE_EMAIL);
-	}
+    }
     } else {
-	echo tra("Invalid token.");
+    echo tra("Invalid token.");
     }
 } else {
     echo tra("Invalid token.");

html/user/delete_account_confirm.php

Indentation +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
     page_head(tra("Delete Account"));
     
     echo "<p>".tra("Thank you for verifying ownership of your account.")."</p>"
-         ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
-         ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
-         ."<br/>";
+            ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
+            ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
+            ."<br/>";
     
     form_start(secure_url_base()."delete_account_confirm.php", "post");
     form_input_hidden("token", $token);

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

Indentation +381 added lines, -381 removed lines

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

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

Indentation +567 added lines, -567 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['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',
@@ -109,9 +109,9 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincteam.admin.inc',
-  );
+    );
    
-  return $items;
+    return $items;
 }
 
 /**
@@ -128,41 +128,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());
-  }
+    }
 }
 
 /**
@@ -176,31 +176,31 @@ 
 * 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,
-  );
+    );
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -212,49 +212,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);
@@ -263,35 +263,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");
 }
   
 
@@ -299,62 +299,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,
@@ -366,40 +366,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");
@@ -407,313 +407,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;
 }
 
 /** 
@@ -735,18 +735,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);
-  }
+    }
 }
 
 
@@ -758,125 +758,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">';
@@ -895,87 +895,87 @@ 
     $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')) {
     // Obtain all Drupal uids of team members and construct URL to send
     // a private message to all.
     $boinc_id = boincteam_lookup_id($team_id);
@@ -986,170 +986,170 @@ 
     $output .= '<div class="form-item">';
     $output .= '  <ul class="tab-list action-list">';
     $output .= '    <li class="first tab primary">' .
-      l('Send message to team', $team_pm_link) . '</li>';
+        l('Send message to team', $team_pm_link) . '</li>';
     $output .= '  </ul>';
     $output .= '  <div class="description">';
     $output .=   bts('Private message all team members.', 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 
@@ -1158,131 +1158,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;
 }
 
 /**
@@ -1310,50 +1310,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;
 }

html/user/get_project_config.php

Indentation +4 added lines, -4 removed lines

@@ -81,11 +81,11 @@ 
 }
 
 if ($disable_account_creation || defined('INVITE_CODES')) {
-	echo "    <account_creation_disabled/>\n";
+    echo "    <account_creation_disabled/>\n";
 }
 
 if (defined('INVITE_CODES')) {
-	echo "    <invite_code_required/>\n";
+    echo "    <invite_code_required/>\n";
 }
 
 echo "    <min_passwd_length>$min_passwd_length</min_passwd_length>\n";
@@ -107,10 +107,10 @@ 
 // project has not defined the constant TERMSOFUSE_FILE, then look for
 // the terms_of_use.txt file in the project base directory.
 if (defined('TERMSOFUSE_FILE')) {
-  $tou_file = TERMSOFUSE_FILE;
+    $tou_file = TERMSOFUSE_FILE;
 }
 else {
-  $tou_file =  "../../terms_of_use.txt";
+    $tou_file =  "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

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

Indentation +61 added lines, -61 removed lines

@@ -4,110 +4,110 @@
  * Implementation of hook_user_default_permissions().
  */
 function discussion_forums_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: access comments
-  $permissions['access comments'] = array(
+    // Exported permission: access comments
+    $permissions['access comments'] = array(
     'name' => 'access comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'anonymous user',
-      '2' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'anonymous user',
+        '2' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: administer comments
-  $permissions['administer comments'] = array(
+    // Exported permission: administer comments
+    $permissions['administer comments'] = array(
     'name' => 'administer comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: administer forums
-  $permissions['administer forums'] = array(
+    // Exported permission: administer forums
+    $permissions['administer forums'] = array(
     'name' => 'administer forums',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: assign community member role
-  $permissions['assign community member role'] = array(
+    // Exported permission: assign community member role
+    $permissions['assign community member role'] = array(
     'name' => 'assign community member role',
     'roles' => array(
-      '0' => 'moderator',
+        '0' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: create forum topics
-  $permissions['create forum topics'] = array(
+    // Exported permission: create forum topics
+    $permissions['create forum topics'] = array(
     'name' => 'create forum topics',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: delete any forum topic
-  $permissions['delete any forum topic'] = array(
+    // Exported permission: delete any forum topic
+    $permissions['delete any forum topic'] = array(
     'name' => 'delete any forum topic',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete own forum topics
-  $permissions['delete own forum topics'] = array(
+    // Exported permission: delete own forum topics
+    $permissions['delete own forum topics'] = array(
     'name' => 'delete own forum topics',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit any forum topic
-  $permissions['edit any forum topic'] = array(
+    // Exported permission: edit any forum topic
+    $permissions['edit any forum topic'] = array(
     'name' => 'edit any forum topic',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: edit own forum topics
-  $permissions['edit own forum topics'] = array(
+    // Exported permission: edit own forum topics
+    $permissions['edit own forum topics'] = array(
     'name' => 'edit own forum topics',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: post comments
-  $permissions['post comments'] = array(
+    // Exported permission: post comments
+    $permissions['post comments'] = array(
     'name' => 'post comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: post comments without approval
-  $permissions['post comments without approval'] = array(
+    // Exported permission: post comments without approval
+    $permissions['post comments without approval'] = array(
     'name' => 'post comments without approval',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

drupal/sites/all/features/boinc_standard/boinc_standard.pages_default.inc

Indentation +327 added lines, -327 removed lines

@@ -4,113 +4,113 @@ 
  * Implementation of hook_default_page_manager_pages().
  */
 function boinc_standard_default_page_manager_pages() {
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'about_us';
-  $page->task = 'page';
-  $page->admin_title = 'About Us';
-  $page->admin_description = '';
-  $page->path = 'about.fail';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'about_us';
+    $page->task = 'page';
+    $page->admin_title = 'About Us';
+    $page->admin_description = '';
+    $page->path = 'about.fail';
+    $page->access = array(
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array();
-  $page->arguments = array();
-  $page->conf = array();
-  $page->default_handlers = array();
-  $pages['about_us'] = $page;
+    );
+    $page->menu = array();
+    $page->arguments = array();
+    $page->conf = array();
+    $page->default_handlers = array();
+    $pages['about_us'] = $page;
 
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'account_dashboard';
-  $page->task = 'page';
-  $page->admin_title = 'Dashboard';
-  $page->admin_description = '';
-  $page->path = 'dashboard';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'account_dashboard';
+    $page->task = 'page';
+    $page->admin_title = 'Dashboard';
+    $page->admin_description = '';
+    $page->path = 'dashboard';
+    $page->access = array(
     'plugins' => array(
-      1 => array(
+        1 => array(
         'name' => 'role',
         'settings' => array(
-          'rids' => array(
+            'rids' => array(
             0 => 2,
-          ),
+            ),
         ),
         'context' => 'logged-in-user',
         'not' => FALSE,
-      ),
+        ),
     ),
     'logic' => 'and',
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array(
+    );
+    $page->menu = array(
     'type' => 'none',
     'title' => 'Dashboard',
     'name' => 'navigation',
     'weight' => '0',
     'parent' => array(
-      'type' => 'normal',
-      'title' => 'Account',
-      'name' => 'navigation',
-      'weight' => '0',
+        'type' => 'normal',
+        'title' => 'Account',
+        'name' => 'navigation',
+        'weight' => '0',
     ),
-  );
-  $page->arguments = array();
-  $page->conf = array();
-  $page->default_handlers = array();
-  $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'page_account_dashboard_panel_context';
-  $handler->task = 'page';
-  $handler->subtask = 'account_dashboard';
-  $handler->handler = 'panel_context';
-  $handler->weight = 0;
-  $handler->conf = array(
+    );
+    $page->arguments = array();
+    $page->conf = array();
+    $page->default_handlers = array();
+    $handler = new stdClass;
+    $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+    $handler->api_version = 1;
+    $handler->name = 'page_account_dashboard_panel_context';
+    $handler->task = 'page';
+    $handler->subtask = 'account_dashboard';
+    $handler->handler = 'panel_context';
+    $handler->weight = 0;
+    $handler->conf = array(
     'title' => 'Landing page',
     'no_blocks' => FALSE,
     'pipeline' => 'ipe',
     'css_id' => '',
     'css' => '',
     'contexts' => array(
-      0 => array(
+        0 => array(
         'name' => 'user',
         'id' => 1,
         'identifier' => 'User',
         'keyword' => 'user',
         'context_settings' => array(
-          'type' => 'current',
-          'user' => '',
-          'uid' => '',
+            'type' => 'current',
+            'user' => '',
+            'uid' => '',
+        ),
         ),
-      ),
     ),
     'relationships' => array(),
     'access' => array(
-      'plugins' => array(),
-      'logic' => 'and',
+        'plugins' => array(),
+        'logic' => 'and',
     ),
-  );
-  $display = new panels_display;
-  $display->layout = 'one_sidebar_second';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    );
+    $display = new panels_display;
+    $display->layout = 'one_sidebar_second';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+        'default' => NULL,
+        'content' => NULL,
+        'sidebar_first' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = 'Dashboard';
-  $display->storage_type = 'page_manager';
-  $display->storage_id = 'page_account_dashboard_panel_context';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = 'Dashboard';
+    $display->storage_type = 'page_manager';
+    $display->storage_id = 'page_account_dashboard_panel_context';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'content';
@@ -119,16 +119,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 1,
-      'override_title_text' => 'My stats',
+        'override_title' => 1,
+        'override_title_text' => 'My stats',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -144,11 +144,11 @@ 
     $pane->configuration = array();
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 1;
@@ -161,31 +161,31 @@ 
     $pane->subtype = 'custom';
     $pane->shown = TRUE;
     $pane->access = array(
-      'plugins' => array(
+        'plugins' => array(
         1 => array(
-          'name' => 'perm',
-          'settings' => array(
+            'name' => 'perm',
+            'settings' => array(
             'perm' => 'edit any profile content',
-          ),
-          'context' => 'context_user_1',
-          'not' => FALSE,
+            ),
+            'context' => 'context_user_1',
+            'not' => FALSE,
+        ),
         ),
-      ),
     );
     $pane->configuration = array(
-      'admin_title' => 'Moderation overview',
-      'title' => '',
-      'body' => '<?php print boinccore_moderation_overview_panel(); ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'admin_title' => 'Moderation overview',
+        'title' => '',
+        'body' => '<?php print boinccore_moderation_overview_panel(); ?>',
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -199,16 +199,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 1;
@@ -222,23 +222,23 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Team summary',
-      'title' => '',
-      'body' => '<?php 
+        'admin_title' => 'Team summary',
+        'title' => '',
+        'body' => '<?php 
 if (module_exists(\'boincteam\')) {
   echo boincteam_dashboard_panel();
 }
 ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => 'team-dashboard-pane',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => 'team-dashboard-pane',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 2;
@@ -252,9 +252,9 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'User activity summary',
-      'title' => '',
-      'body' => '<?php
+        'admin_title' => 'User activity summary',
+        'title' => '',
+        'body' => '<?php
 
 global $user;
 $uid = $user->uid;
@@ -263,16 +263,16 @@ 
 echo \'<div class="item-count-wrapper"><div class="item-count">\' . $account->post_count . \'</div></div>\';
 
 ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 3;
@@ -286,74 +286,74 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 0,
-      'nodes_per_page' => '6',
-      'pager_id' => '',
-      'offset' => '0',
-      'more_link' => 1,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'block_1',
-      'context' => array(
+        'override_pager_settings' => 0,
+        'use_pager' => 0,
+        'nodes_per_page' => '6',
+        'pager_id' => '',
+        'offset' => '0',
+        'more_link' => 1,
+        'feed_icons' => 0,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'block_1',
+        'context' => array(
         0 => 'context_user_1.uid',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
+        ),
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 4;
     $display->content['new-7'] = $pane;
     $display->panels['sidebar_first'][4] = 'new-7';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = 'new-1';
-  $handler->conf['display'] = $display;
-  $page->default_handlers[$handler->name] = $handler;
-  $pages['account_dashboard'] = $page;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = 'new-1';
+    $handler->conf['display'] = $display;
+    $page->default_handlers[$handler->name] = $handler;
+    $pages['account_dashboard'] = $page;
 
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'boinc_user';
-  $page->task = 'page';
-  $page->admin_title = 'User profile template (boinc)';
-  $page->admin_description = '';
-  $page->path = 'account/%user';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'boinc_user';
+    $page->task = 'page';
+    $page->admin_title = 'User profile template (boinc)';
+    $page->admin_description = '';
+    $page->path = 'account/%user';
+    $page->access = array(
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array();
-  $page->arguments = array(
+    );
+    $page->menu = array();
+    $page->arguments = array(
     'user' => array(
-      'id' => 1,
-      'identifier' => 'User: ID',
-      'name' => 'uid',
-      'settings' => array(),
+        'id' => 1,
+        'identifier' => 'User: ID',
+        'name' => 'uid',
+        'settings' => array(),
     ),
-  );
-  $page->conf = array();
-  $page->default_handlers = array();
-  $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'page_boinc_user_panel_context_2';
-  $handler->task = 'page';
-  $handler->subtask = 'boinc_user';
-  $handler->handler = 'panel_context';
-  $handler->weight = 1;
-  $handler->conf = array(
+    );
+    $page->conf = array();
+    $page->default_handlers = array();
+    $handler = new stdClass;
+    $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+    $handler->api_version = 1;
+    $handler->name = 'page_boinc_user_panel_context_2';
+    $handler->task = 'page';
+    $handler->subtask = 'boinc_user';
+    $handler->handler = 'panel_context';
+    $handler->weight = 1;
+    $handler->conf = array(
     'title' => 'Panel',
     'no_blocks' => 0,
     'pipeline' => 'standard',
@@ -362,37 +362,37 @@ 
     'contexts' => array(),
     'relationships' => array(),
     'access' => array(
-      'plugins' => array(
+        'plugins' => array(
         0 => array(
-          'name' => 'php',
-          'settings' => array(
+            'name' => 'php',
+            'settings' => array(
             'description' => 'if user status then show profile',
             'php' => '$account = $contexts[\'argument_uid_1\']->data;
 return ($account->status);
 ',
-          ),
-          'not' => FALSE,
+            ),
+            'not' => FALSE,
+        ),
         ),
-      ),
-      'logic' => 'and',
+        'logic' => 'and',
     ),
-  );
-  $display = new panels_display;
-  $display->layout = 'one_sidebar_second';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    );
+    $display = new panels_display;
+    $display->layout = 'one_sidebar_second';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+        'default' => NULL,
+        'content' => NULL,
+        'sidebar_first' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = 'Account';
-  $display->storage_type = 'page_manager';
-  $display->storage_id = 'page_boinc_user_panel_context_2';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = 'Account';
+    $display->storage_type = 'page_manager';
+    $display->storage_id = 'page_boinc_user_panel_context_2';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'content';
@@ -401,19 +401,19 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'context' => array(
+        'context' => array(
         0 => 'argument_uid_1',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
+        ),
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -427,16 +427,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -450,23 +450,23 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Team summary',
-      'title' => '',
-      'body' => '<?php 
+        'admin_title' => 'Team summary',
+        'title' => '',
+        'body' => '<?php 
 if (module_exists(\'boincteam\')) {
   echo boincteam_dashboard_panel(%user:uid);
 }
 ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => 'team-dashboard-pane',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => 'team-dashboard-pane',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 1;
@@ -480,9 +480,9 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'User activity summary',
-      'title' => '',
-      'body' => '<?php
+        'admin_title' => 'User activity summary',
+        'title' => '',
+        'body' => '<?php
 
 $uid = arg(1);
 $account = user_load($uid);
@@ -490,16 +490,16 @@ 
 echo \'<div class="item-count-wrapper"><div class="item-count">\' . $account->post_count . \'</div></div>\';
 
 ?>',
-      'format' => '3',
-      'substitute' => 0,
+        'format' => '3',
+        'substitute' => 0,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 2;
@@ -513,31 +513,31 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 0,
-      'nodes_per_page' => '6',
-      'pager_id' => '',
-      'offset' => '0',
-      'more_link' => 0,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'block_1',
-      'context' => array(
+        'override_pager_settings' => 0,
+        'use_pager' => 0,
+        'nodes_per_page' => '6',
+        'pager_id' => '',
+        'offset' => '0',
+        'more_link' => 0,
+        'feed_icons' => 0,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'block_1',
+        'context' => array(
         0 => 'argument_uid_1.uid',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
+        ),
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 3;
@@ -551,66 +551,66 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Project list',
-      'title' => 'Projects',
-      'body' => '<?php echo boincuser_get_projects_table(%user:uid); ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'admin_title' => 'Project list',
+        'title' => 'Projects',
+        'body' => '<?php echo boincuser_get_projects_table(%user:uid); ?>',
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 4;
     $display->content['new-6'] = $pane;
     $display->panels['sidebar_first'][4] = 'new-6';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = '0';
-  $handler->conf['display'] = $display;
-  $page->default_handlers[$handler->name] = $handler;
-  $pages['boinc_user'] = $page;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = '0';
+    $handler->conf['display'] = $display;
+    $page->default_handlers[$handler->name] = $handler;
+    $pages['boinc_user'] = $page;
 
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'home';
-  $page->task = 'page';
-  $page->admin_title = 'Home page';
-  $page->admin_description = '';
-  $page->path = 'home';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'home';
+    $page->task = 'page';
+    $page->admin_title = 'Home page';
+    $page->admin_description = '';
+    $page->path = 'home';
+    $page->access = array(
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array(
+    );
+    $page->menu = array(
     'type' => 'normal',
     'title' => 'Home',
     'name' => 'navigation',
     'weight' => '0',
     'parent' => array(
-      'type' => 'none',
-      'title' => '',
-      'name' => 'navigation',
-      'weight' => '0',
+        'type' => 'none',
+        'title' => '',
+        'name' => 'navigation',
+        'weight' => '0',
     ),
-  );
-  $page->arguments = array();
-  $page->conf = array();
-  $page->default_handlers = array();
-  $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'page_home_panel_context';
-  $handler->task = 'page';
-  $handler->subtask = 'home';
-  $handler->handler = 'panel_context';
-  $handler->weight = 0;
-  $handler->conf = array(
+    );
+    $page->arguments = array();
+    $page->conf = array();
+    $page->default_handlers = array();
+    $handler = new stdClass;
+    $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+    $handler->api_version = 1;
+    $handler->name = 'page_home_panel_context';
+    $handler->task = 'page';
+    $handler->subtask = 'home';
+    $handler->handler = 'panel_context';
+    $handler->weight = 0;
+    $handler->conf = array(
     'title' => 'Landing page',
     'no_blocks' => FALSE,
     'pipeline' => 'ipe',
@@ -618,23 +618,23 @@ 
     'css' => '',
     'contexts' => array(),
     'relationships' => array(),
-  );
-  $display = new panels_display;
-  $display->layout = 'one_sidebar_second';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    );
+    $display = new panels_display;
+    $display->layout = 'one_sidebar_second';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+        'default' => NULL,
+        'content' => NULL,
+        'sidebar_first' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = '';
-  $display->storage_type = 'page_manager';
-  $display->storage_id = 'page_home_panel_context';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = '';
+    $display->storage_type = 'page_manager';
+    $display->storage_id = 'page_home_panel_context';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'content';
@@ -642,22 +642,22 @@ 
     $pane->subtype = 'custom';
     $pane->shown = TRUE;
     $pane->access = array(
-      'plugins' => array(),
+        'plugins' => array(),
     );
     $pane->configuration = array(
-      'admin_title' => 'BOINC overview',
-      'title' => '',
-      'body' => '<?php print boincuser_home_page(); ?>',
-      'format' => '3',
-      'substitute' => TRUE,
+        'admin_title' => 'BOINC overview',
+        'title' => '',
+        'body' => '<?php print boincuser_home_page(); ?>',
+        'format' => '3',
+        'substitute' => TRUE,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -671,16 +671,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow balance-height-front no-resize',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow balance-height-front no-resize',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -694,39 +694,39 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_pager_settings' => 1,
-      'use_pager' => 0,
-      'nodes_per_page' => '2',
-      'pager_id' => '',
-      'offset' => '0',
-      'more_link' => 1,
-      'feed_icons' => 1,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'page_2',
-      'override_title' => 1,
-      'override_title_text' => '',
+        'override_pager_settings' => 1,
+        'use_pager' => 0,
+        'nodes_per_page' => '2',
+        'pager_id' => '',
+        'offset' => '0',
+        'more_link' => 1,
+        'feed_icons' => 1,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'page_2',
+        'override_title' => 1,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow balance-height-front',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow balance-height-front',
     );
     $pane->extras = array();
     $pane->position = 1;
     $display->content['new-3'] = $pane;
     $display->panels['sidebar_first'][1] = 'new-3';
-  $display->hide_title = PANELS_TITLE_NONE;
-  $display->title_pane = '0';
-  $handler->conf['display'] = $display;
-  $page->default_handlers[$handler->name] = $handler;
-  $pages['home'] = $page;
+    $display->hide_title = PANELS_TITLE_NONE;
+    $display->title_pane = '0';
+    $handler->conf['display'] = $display;
+    $page->default_handlers[$handler->name] = $handler;
+    $pages['home'] = $page;
 
- return $pages;
+    return $pages;
 
 }

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

Indentation +72 added lines, -72 removed lines

@@ -13,45 +13,45 @@ 
  *   a form array
  */
 function boincuser_delete_settings() {
-  $form = array();
+    $form = array();
 
-  $default = array(
+    $default = array(
     'boincuser_delete_type' => variable_get('boincuser_delete_type', ''),
     'boincuser_delete_redirect' => variable_get('boincuser_delete_redirect', '<front>'),
-  );
+    );
 
-  $form['options'] = array(
+    $form['options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Options'),
-  );
-  $form['options']['help'] = array(
+    );
+    $form['options']['help'] = array(
     '#value' => t('When a user deletes their account, which option is shown to the user? A soft/obfusate delete, a hard/wipe delete, or let the user chose between the two.'),
     '#weight' => 11,
-  );
-  $form['options']['boincuser_delete_type'] = array(
+    );
+    $form['options']['boincuser_delete_type'] = array(
     '#type' => 'radios',
     '#title' => t('Type of delete'),
     '#default_value' => $default['boincuser_delete_type'],
     '#options' => array(
-       'soft_obfuscate' => t('A soft/obfuscate delete. User\'s account is disabled, but some data is deleted.'),
-       'hard_wipe' => t('A hard/wipe delete. User\'s account is deleted along with many data.'),
-       'user_decides' => t('User is presented with radio buttons where they choose between the two options above.'),
+        'soft_obfuscate' => t('A soft/obfuscate delete. User\'s account is disabled, but some data is deleted.'),
+        'hard_wipe' => t('A hard/wipe delete. User\'s account is deleted along with many data.'),
+        'user_decides' => t('User is presented with radio buttons where they choose between the two options above.'),
     ),
     '#weight' => 21,
-  );
+    );
 
-  $form['redirect'] = array(
+    $form['redirect'] = array(
     '#type' => 'fieldset',
     '#title' => t('Redirect'),
-  );
-  $form['redirect']['boincuser_delete_redirect'] = array(
+    );
+    $form['redirect']['boincuser_delete_redirect'] = array(
     '#type' => 'textfield',
     '#title' => t('Redirection page'),
     '#default_value' => $default['boincuser_delete_redirect'],
     '#description' => t('Choose where to redirect your users after account deletion. Any valid Drupal path will do, e.g. %front or %node', array('%front' => '<front>', '%node' => 'node/1')),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 
@@ -60,124 +60,124 @@ 
  * password checks.
  */
 function boincuser_delete_admindelete(&$form_state, $uid) {
-  $form = array();
+    $form = array();
 
-  $form['#uid'] = $uid;
+    $form['#uid'] = $uid;
 
-  $form['account']['help'] = array(
+    $form['account']['help'] = array(
     '#value' => "<p>" . t("This form will delete this user <strong>without any email notification</strong> sent to the user. Be very careful in deleting users using this form. Once you select the delete type, check the checkbox, enter your password, and click submit, the user's account will be deleted. This will occur <strong>immediately</strong>. There is no 'undo'!") . "</p><p>" . t("You are deleting the following user, link opens in new window:") . "</p>",
     '#weight' => -1,
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  $account = user_load($uid);
-  if ($account) {
+    $account = user_load($uid);
+    if ($account) {
     drupal_set_title($account->boincuser_name);
 
     $form['account']['boincuser_name'] = array(
-      '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
+        '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
     );
     $form['account']['boincuser_id'] = array(
-      '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
+        '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
     );
     $form['account']['drupal_name'] = array(
-      '#value' => t('<li>Drupal username (internal): ') . $account->name,
+        '#value' => t('<li>Drupal username (internal): ') . $account->name,
     );
     $form['account']['user_id'] = array(
-      '#value' => t('<li>Drupal user ID: ') . $account->uid,
+        '#value' => t('<li>Drupal user ID: ') . $account->uid,
     );
 
     $form['account']['user_delete_action'] = array(
         '#type' => 'radios',
         '#options' => array(
-          'soft_obfuscate' => bts('<b>Soft delete</b> the account. The account will be disabled, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted, the host information deleted, and the user will be removed from any team.', array(), NULL, 'boinc:delete-user-account'),
-          'hard_wipe' => bts('<b>Delete</b> the account. The account will be deleted, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted.', array(), NULL, 'boinc:delete-user-account'),),
-      );
+            'soft_obfuscate' => bts('<b>Soft delete</b> the account. The account will be disabled, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted, the host information deleted, and the user will be removed from any team.', array(), NULL, 'boinc:delete-user-account'),
+            'hard_wipe' => bts('<b>Delete</b> the account. The account will be deleted, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted.', array(), NULL, 'boinc:delete-user-account'),),
+        );
 
     $form['account']['surecheckbox'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('I am <strong>sure</strong> I know what I am doing. I am <u><strong>deleting user</strong></u> %name.',
+        '#type' => 'checkbox',
+        '#title' => t('I am <strong>sure</strong> I know what I am doing. I am <u><strong>deleting user</strong></u> %name.',
         array('%name' => $account->boincuser_name)
-      ),
-      '#default_value' => FALSE,
+        ),
+        '#default_value' => FALSE,
     );
 
     $form['account']['current_pass'] = array(
-      '#type' => 'password',
-      '#title' => bts('Enter your password before clicking Submit, or click Cancel to return to the user\'s edit page', array(), NULL, 'boinc:delete-user-account'),
-      '#size' => 17,
-      '#attributes' => array(
+        '#type' => 'password',
+        '#title' => bts('Enter your password before clicking Submit, or click Cancel to return to the user\'s edit page', array(), NULL, 'boinc:delete-user-account'),
+        '#size' => 17,
+        '#attributes' => array(
         'autocomplete' => 'off',
-      ),
-      '#weight' => 25,
+        ),
+        '#weight' => 25,
     );
 
     // Action buttons
     $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Submit'),
+        '#type' => 'submit',
+        '#value' => t('Submit'),
     );
     $form['actions']['cancel'] = array(
-      '#type' => 'button',
-      '#value' => t('Cancel'),
-      '#executes_submit_callback' => TRUE,
-      '#validate' => array(),
-      '#submit' => array('_boincuser_delete_cancel'),
+        '#type' => 'button',
+        '#value' => t('Cancel'),
+        '#executes_submit_callback' => TRUE,
+        '#validate' => array(),
+        '#submit' => array('_boincuser_delete_cancel'),
     );
 
     $form['#redirect'] = 'account';
-  }
-  else {
+    }
+    else {
     $form['noaccount'] = array(
-      '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
+        '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
     );
-  }
+    }
 
-  return $form;
+    return $form;
 }
 
 /**
  * Validation function for admin delete user.
  */
 function boincuser_delete_admindelete_validate($form, &$form_state) {
-  global $user;
-  $boinc_user = boincuser_load($user->uid, TRUE);
+    global $user;
+    $boinc_user = boincuser_load($user->uid, TRUE);
 
-  if ($form_state['values']['user_delete_action'] == '') {
+    if ($form_state['values']['user_delete_action'] == '') {
     form_set_error('user_delete_action', t('Please select an action to perform using the radio buttons.'));
-  }
+    }
 
-  if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
+    if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
     form_set_error('user_delete_action', t('User Delete action not a predefined value, unknown error in radio buttons.'));
-  }
+    }
 
-  if (!($form_state['values']['surecheckbox'])) {
+    if (!($form_state['values']['surecheckbox'])) {
     return form_set_error('surecheckbox', t('Please confirm you are sure you want to delete this account.'));
-  }
+    }
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+    if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
     return true;
-  }
+    }
 }
 
 /**
  * Submit function for admin delete user.
  */
 function boincuser_delete_admindelete_submit($form, &$form_state) {
-  // This is the account to be deleted, and not the administrator's
-  // account.
-  $account = user_load(array('uid' => $form['#uid']));
-  $action = $form_state['values']['user_delete_action'];
+    // This is the account to be deleted, and not the administrator's
+    // account.
+    $account = user_load(array('uid' => $form['#uid']));
+    $action = $form_state['values']['user_delete_action'];
 
-  drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
+    drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
     array(
-      '@uid' => $form['#uid'],
-      '@displayname' => $account->boincuser_name,
+        '@uid' => $form['#uid'],
+        '@displayname' => $account->boincuser_name,
     )), 'warning');
 
-  // Delete the user
-  _boincuser_delete_deleteuser($account, $action);
+    // Delete the user
+    _boincuser_delete_deleteuser($account, $action);
 
-  drupal_goto('/admin/boinc/user_delete');
+    drupal_goto('/admin/boinc/user_delete');
 }