BOINC / boinc

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

Switch Indentation +15 added lines, -15 removed lines

@@ -25,30 +25,30 @@
  * Implementation of hook_menu()
  */
 function boincteam_forum_menu() {
-  $items = array();
+$items = array();
 
-  return $items;
+return $items;
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Team forum node edit form
-  case 'team_forum_node_form':
+switch ($form_id) {
+// Team forum node edit form
+case 'team_forum_node_form':
     
-    // Internal fields to indicate where these changes are taking place
-    array_unshift($form, array(
-      'tfid' => array(
-        '#type' => 'hidden',
-        '#value' => arg(3),
-      ),
-    ));
-    break;
+// Internal fields to indicate where these changes are taking place
+array_unshift($form, array(
+'tfid' => array(
+'#type' => 'hidden',
+'#value' => arg(3),
+),
+));
+break;
   
-  default:
-  }
+default:
+}
 }
 
 /**

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

@@ -50,47 +50,47 @@ 
             }
             $resultLength = 0;
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = PASSWORD_BCRYPT_DEFAULT_COST;
-                    if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
-                        if ($cost < 4 || $cost > 31) {
-                            trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
-                            return null;
-                        }
+            case PASSWORD_BCRYPT:
+                $cost = PASSWORD_BCRYPT_DEFAULT_COST;
+                if (isset($options['cost'])) {
+                    $cost = (int) $options['cost'];
+                    if ($cost < 4 || $cost > 31) {
+                        trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
+                        return null;
                     }
-                    // The length of salt to generate
-                    $raw_salt_len = 16;
-                    // The length required in the final serialization
-                    $required_salt_len = 22;
-                    $hash_format = sprintf("$2y$%02d$", $cost);
-                    // The expected length of the final crypt() output
-                    $resultLength = 60;
-                    break;
-                default:
-                    trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
-                    return null;
+                }
+                // The length of salt to generate
+                $raw_salt_len = 16;
+                // The length required in the final serialization
+                $required_salt_len = 22;
+                $hash_format = sprintf("$2y$%02d$", $cost);
+                // The expected length of the final crypt() output
+                $resultLength = 60;
+                break;
+            default:
+                trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
+                return null;
             }
             $salt_req_encoding = false;
             if (isset($options['salt'])) {
                 switch (gettype($options['salt'])) {
-                    case 'NULL':
-                    case 'boolean':
-                    case 'integer':
-                    case 'double':
-                    case 'string':
+                case 'NULL':
+                case 'boolean':
+                case 'integer':
+                case 'double':
+                case 'string':
+                    $salt = (string) $options['salt'];
+                    break;
+                case 'object':
+                    if (method_exists($options['salt'], '__tostring')) {
                         $salt = (string) $options['salt'];
                         break;
-                    case 'object':
-                        if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
-                            break;
-                        }
-                    case 'array':
-                    case 'resource':
-                    default:
-                        trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
-                        return null;
+                    }
+                case 'array':
+                case 'resource':
+                default:
+                    trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
+                    return null;
                 }
                 if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
                     trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
@@ -212,12 +212,12 @@ 
                 return true;
             }
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
-                    if ($cost !== $info['options']['cost']) {
-                        return true;
-                    }
-                    break;
+            case PASSWORD_BCRYPT:
+                $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                if ($cost !== $info['options']['cost']) {
+                    return true;
+                }
+                break;
             }
             return false;
         }

drupal/sites/default/boinc/modules/contrib/filefield/filefield_meta/includes/filefield_meta_handler_field_samplerate.inc

Switch Indentation +5 added lines, -5 removed lines

@@ -50,11 +50,11 @@
     }
 
     switch ($this->options['format']) {
-      case 'raw':
-        $output = $value;
-        break;
-      default:
-        $output = theme('filefield_meta_samplerate', $value);
+    case 'raw':
+      $output = $value;
+      break;
+    default:
+      $output = theme('filefield_meta_samplerate', $value);
     }
 
     return check_plain($this->options['prefix']) . $output . check_plain($this->options['suffix']);

drupal/sites/default/boinc/modules/contrib/filefield/filefield_meta/includes/filefield_meta_handler_field_duration.inc

Switch Indentation +14 added lines, -14 removed lines

@@ -48,20 +48,20 @@
     $value = $values->{$this->field_alias};
 
     switch ($this->options['format']) {
-      case 'hours':
-        $output = date('g', (int) $value);
-        break;
-      case 'minutes':
-        $output = date('i', (int) $value);
-        break;
-      case 'seconds':
-        $output = date('s', (int) $value);
-        break;
-      case 'total':
-        $output = check_plain($value);
-        break;
-      default:
-        $output = theme('filefield_meta_duration', $value);
+    case 'hours':
+      $output = date('g', (int) $value);
+      break;
+    case 'minutes':
+      $output = date('i', (int) $value);
+      break;
+    case 'seconds':
+      $output = date('s', (int) $value);
+      break;
+    case 'total':
+      $output = check_plain($value);
+      break;
+    default:
+      $output = theme('filefield_meta_duration', $value);
     }
 
     // Check to see if hiding should happen before adding prefix and suffix.

drupal/sites/default/boinc/modules/contrib/filefield/filefield_meta/includes/filefield_meta_handler_field_bitrate.inc

Switch Indentation +5 added lines, -5 removed lines

@@ -50,11 +50,11 @@
     }
 
     switch ($this->options['format']) {
-      case 'raw':
-        $output = $value;
-        break;
-      default:
-        $output = theme('filefield_meta_bitrate', $value);
+    case 'raw':
+      $output = $value;
+      break;
+    default:
+      $output = theme('filefield_meta_bitrate', $value);
     }
 
     return check_plain($this->options['prefix']) . $output . check_plain($this->options['suffix']);

drupal/sites/default/boinc/modules/contrib/filefield/views/filefield.views_convert.inc

Switch Indentation +43 added lines, -43 removed lines

@@ -22,19 +22,19 @@ 
             unset($fields['table']);
             foreach ($fields as $filefield_field => $definition) {
               switch ($filefield_field) {
-                case $content_field['field_name'] .'_fid':
-                  $filefield_fields[$filefield_field] = array(
-                    'table' => $table,
-                    'field' => $filefield_field,
-                  );
-                  $filefield_arguments['content: '. $content_field['field_name']] = &$filefield_fields[$filefield_field];
-                  break;
-                case $content_field['field_name'] .'_list':
-                  $filefield_filters[$content_field['field_name'] .'_fid_not null'] = array(
-                    'table' => $table,
-                    'field' => $filefield_field,
-                  );
-                  break;
+              case $content_field['field_name'] .'_fid':
+                $filefield_fields[$filefield_field] = array(
+                  'table' => $table,
+                  'field' => $filefield_field,
+                );
+                $filefield_arguments['content: '. $content_field['field_name']] = &$filefield_fields[$filefield_field];
+                break;
+              case $content_field['field_name'] .'_list':
+                $filefield_filters[$content_field['field_name'] .'_fid_not null'] = array(
+                  'table' => $table,
+                  'field' => $filefield_field,
+                );
+                break;
               }
             }
           }
@@ -43,39 +43,39 @@ 
     }
   }
   switch ($type) {
-    case 'field':
-      if (isset($filefield_fields[$field['field']])) {
-        $multiple = array();
-        switch ($field['handler']) {
-          case 'content_views_field_handler_ungroup':
-            $view->set_item_option($display, 'field', $id, 'multiple', array('group' => FALSE));
-            break;
-          case 'content_views_field_handler_last':
-            $multiple['multiple_reversed'] = TRUE;
-          case 'content_views_field_handler_first':
-            $multiple['multiple_number'] = 1;
-            $view->set_item_option($display, 'field', $id, 'multiple', $multiple);
-            break;
-        }
-        $view->set_item_option($display, 'field', $id, 'format', $field['options']);
-      }
+  case 'field':
+    if (isset($filefield_fields[$field['field']])) {
+      $multiple = array();
+      switch ($field['handler']) {
+      case 'content_views_field_handler_ungroup':
+      $view->set_item_option($display, 'field', $id, 'multiple', array('group' => FALSE));
       break;
-    case 'filter':
-      if (isset($filefield_filters[$field['field']])) {
-        $filter = $filefield_filters[$field['field']];
-        $item = $view->get_item($display, 'filter', $id);
-        $item['value'] = $field['value'];
-        $item['table'] = $filter['table'];
-        $item['field'] = $filter['field'];
-        $view->set_item($display, 'filter', $id, $item);
-      }
+      case 'content_views_field_handler_last':
+      $multiple['multiple_reversed'] = TRUE;
+      case 'content_views_field_handler_first':
+      $multiple['multiple_number'] = 1;
+      $view->set_item_option($display, 'field', $id, 'multiple', $multiple);
       break;
-    case 'argument':
-      if (isset($filefield_arguments[$field['type']])) {
-        $argument = $filefield_arguments[$field['type']];
-        $options = $field['argoptions'];
-        $view->add_item($display, 'argument', $argument['table'], $argument['field'], $options, $field['id']);
+      }
+        $view->set_item_option($display, 'field', $id, 'format', $field['options']);
       }
       break;
+  case 'filter':
+    if (isset($filefield_filters[$field['field']])) {
+      $filter = $filefield_filters[$field['field']];
+      $item = $view->get_item($display, 'filter', $id);
+      $item['value'] = $field['value'];
+      $item['table'] = $filter['table'];
+      $item['field'] = $filter['field'];
+      $view->set_item($display, 'filter', $id, $item);
+    }
+    break;
+  case 'argument':
+    if (isset($filefield_arguments[$field['type']])) {
+      $argument = $filefield_arguments[$field['type']];
+      $options = $field['argoptions'];
+      $view->add_item($display, 'argument', $argument['table'], $argument['field'], $options, $field['id']);
+    }
+    break;
   }
 }

drupal/sites/default/boinc/modules/contrib/filefield/filefield.theme.inc

Switch Indentation +121 added lines, -121 removed lines

@@ -123,126 +123,126 @@
 function _filefield_generic_icon_map($file) {
   switch ($file['filemime']) {
     // Word document types.
-    case 'application/msword':
-    case 'application/vnd.ms-word.document.macroEnabled.12':
-    case 'application/vnd.oasis.opendocument.text':
-    case 'application/vnd.oasis.opendocument.text-template':
-    case 'application/vnd.oasis.opendocument.text-master':
-    case 'application/vnd.oasis.opendocument.text-web':
-    case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-    case 'application/vnd.stardivision.writer':
-    case 'application/vnd.sun.xml.writer':
-    case 'application/vnd.sun.xml.writer.template':
-    case 'application/vnd.sun.xml.writer.global':
-    case 'application/vnd.wordperfect':
-    case 'application/x-abiword':
-    case 'application/x-applix-word':
-    case 'application/x-kword':
-    case 'application/x-kword-crypt':
-      return 'x-office-document';
-
-    // Spreadsheet document types.
-    case 'application/vnd.ms-excel':
-    case 'application/vnd.ms-excel.sheet.macroEnabled.12':
-    case 'application/vnd.oasis.opendocument.spreadsheet':
-    case 'application/vnd.oasis.opendocument.spreadsheet-template':
-    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-    case 'application/vnd.stardivision.calc':
-    case 'application/vnd.sun.xml.calc':
-    case 'application/vnd.sun.xml.calc.template':
-    case 'application/vnd.lotus-1-2-3':
-    case 'application/x-applix-spreadsheet':
-    case 'application/x-gnumeric':
-    case 'application/x-kspread':
-    case 'application/x-kspread-crypt':
-      return 'x-office-spreadsheet';
-
-    // Presentation document types.
-    case 'application/vnd.ms-powerpoint':
-    case 'application/vnd.ms-powerpoint.presentation.macroEnabled.12':
-    case 'application/vnd.oasis.opendocument.presentation':
-    case 'application/vnd.oasis.opendocument.presentation-template':
-    case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
-    case 'application/vnd.openxmlformats-officedocument.presentationml.slideshow':
-    case 'application/vnd.stardivision.impress':
-    case 'application/vnd.sun.xml.impress':
-    case 'application/vnd.sun.xml.impress.template':
-    case 'application/x-kpresenter':
-      return 'x-office-presentation';
-
-    // Compressed archive types.
-    case 'application/zip':
-    case 'application/x-zip':
-    case 'application/stuffit':
-    case 'application/x-stuffit':
-    case 'application/x-7z-compressed':
-    case 'application/x-ace':
-    case 'application/x-arj':
-    case 'application/x-bzip':
-    case 'application/x-bzip-compressed-tar':
-    case 'application/x-compress':
-    case 'application/x-compressed-tar':
-    case 'application/x-cpio-compressed':
-    case 'application/x-deb':
-    case 'application/x-gzip':
-    case 'application/x-java-archive':
-    case 'application/x-lha':
-    case 'application/x-lhz':
-    case 'application/x-lzop':
-    case 'application/x-rar':
-    case 'application/x-rpm':
-    case 'application/x-tzo':
-    case 'application/x-tar':
-    case 'application/x-tarz':
-    case 'application/x-tgz':
-      return 'package-x-generic';
-
-    // Script file types.
-    case 'application/ecmascript':
-    case 'application/javascript':
-    case 'application/mathematica':
-    case 'application/vnd.mozilla.xul+xml':
-    case 'application/x-asp':
-    case 'application/x-awk':
-    case 'application/x-cgi':
-    case 'application/x-csh':
-    case 'application/x-m4':
-    case 'application/x-perl':
-    case 'application/x-php':
-    case 'application/x-ruby':
-    case 'application/x-shellscript':
-    case 'text/vnd.wap.wmlscript':
-    case 'text/x-emacs-lisp':
-    case 'text/x-haskell':
-    case 'text/x-literate-haskell':
-    case 'text/x-lua':
-    case 'text/x-makefile':
-    case 'text/x-matlab':
-    case 'text/x-python':
-    case 'text/x-sql':
-    case 'text/x-tcl':
-      return 'text-x-script';
-
-    // HTML aliases.
-    case 'application/xhtml+xml':
-      return 'text-html';
-
-    // RTF files.
-    case 'application/rtf':
-      return 'text-rtf';
-
-    // Google earth files.
-    case 'application/vnd.google-earth.kml+xml':
-    case 'application/vnd.google-earth.kmz':
-      return 'application-google-earth';
-
-    // Executable types.
-    case 'application/x-macbinary':
-    case 'application/x-ms-dos-executable':
-    case 'application/x-pef-executable':
-      return 'application-x-executable';
-
-    default:
-      return FALSE;
+  case 'application/msword':
+  case 'application/vnd.ms-word.document.macroEnabled.12':
+  case 'application/vnd.oasis.opendocument.text':
+  case 'application/vnd.oasis.opendocument.text-template':
+  case 'application/vnd.oasis.opendocument.text-master':
+  case 'application/vnd.oasis.opendocument.text-web':
+  case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+  case 'application/vnd.stardivision.writer':
+  case 'application/vnd.sun.xml.writer':
+  case 'application/vnd.sun.xml.writer.template':
+  case 'application/vnd.sun.xml.writer.global':
+  case 'application/vnd.wordperfect':
+  case 'application/x-abiword':
+  case 'application/x-applix-word':
+  case 'application/x-kword':
+  case 'application/x-kword-crypt':
+    return 'x-office-document';
+
+  // Spreadsheet document types.
+  case 'application/vnd.ms-excel':
+  case 'application/vnd.ms-excel.sheet.macroEnabled.12':
+  case 'application/vnd.oasis.opendocument.spreadsheet':
+  case 'application/vnd.oasis.opendocument.spreadsheet-template':
+  case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+  case 'application/vnd.stardivision.calc':
+  case 'application/vnd.sun.xml.calc':
+  case 'application/vnd.sun.xml.calc.template':
+  case 'application/vnd.lotus-1-2-3':
+  case 'application/x-applix-spreadsheet':
+  case 'application/x-gnumeric':
+  case 'application/x-kspread':
+  case 'application/x-kspread-crypt':
+    return 'x-office-spreadsheet';
+
+  // Presentation document types.
+  case 'application/vnd.ms-powerpoint':
+  case 'application/vnd.ms-powerpoint.presentation.macroEnabled.12':
+  case 'application/vnd.oasis.opendocument.presentation':
+  case 'application/vnd.oasis.opendocument.presentation-template':
+  case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+  case 'application/vnd.openxmlformats-officedocument.presentationml.slideshow':
+  case 'application/vnd.stardivision.impress':
+  case 'application/vnd.sun.xml.impress':
+  case 'application/vnd.sun.xml.impress.template':
+  case 'application/x-kpresenter':
+    return 'x-office-presentation';
+
+  // Compressed archive types.
+  case 'application/zip':
+  case 'application/x-zip':
+  case 'application/stuffit':
+  case 'application/x-stuffit':
+  case 'application/x-7z-compressed':
+  case 'application/x-ace':
+  case 'application/x-arj':
+  case 'application/x-bzip':
+  case 'application/x-bzip-compressed-tar':
+  case 'application/x-compress':
+  case 'application/x-compressed-tar':
+  case 'application/x-cpio-compressed':
+  case 'application/x-deb':
+  case 'application/x-gzip':
+  case 'application/x-java-archive':
+  case 'application/x-lha':
+  case 'application/x-lhz':
+  case 'application/x-lzop':
+  case 'application/x-rar':
+  case 'application/x-rpm':
+  case 'application/x-tzo':
+  case 'application/x-tar':
+  case 'application/x-tarz':
+  case 'application/x-tgz':
+    return 'package-x-generic';
+
+  // Script file types.
+  case 'application/ecmascript':
+  case 'application/javascript':
+  case 'application/mathematica':
+  case 'application/vnd.mozilla.xul+xml':
+  case 'application/x-asp':
+  case 'application/x-awk':
+  case 'application/x-cgi':
+  case 'application/x-csh':
+  case 'application/x-m4':
+  case 'application/x-perl':
+  case 'application/x-php':
+  case 'application/x-ruby':
+  case 'application/x-shellscript':
+  case 'text/vnd.wap.wmlscript':
+  case 'text/x-emacs-lisp':
+  case 'text/x-haskell':
+  case 'text/x-literate-haskell':
+  case 'text/x-lua':
+  case 'text/x-makefile':
+  case 'text/x-matlab':
+  case 'text/x-python':
+  case 'text/x-sql':
+  case 'text/x-tcl':
+    return 'text-x-script';
+
+  // HTML aliases.
+  case 'application/xhtml+xml':
+    return 'text-html';
+
+  // RTF files.
+  case 'application/rtf':
+    return 'text-rtf';
+
+  // Google earth files.
+  case 'application/vnd.google-earth.kml+xml':
+  case 'application/vnd.google-earth.kmz':
+    return 'application-google-earth';
+
+  // Executable types.
+  case 'application/x-macbinary':
+  case 'application/x-ms-dos-executable':
+  case 'application/x-pef-executable':
+    return 'application-x-executable';
+
+  default:
+    return FALSE;
   }
 }

drupal/sites/default/boinc/modules/contrib/filefield/filefield.module

Switch Indentation +4 added lines, -4 removed lines

@@ -313,10 +313,10 @@
  */
 function filefield_widget_settings($op, $widget) {
   switch ($op) {
-    case 'form':
-      return filefield_widget_settings_form($widget);
-    case 'save':
-      return filefield_widget_settings_save($widget);
+  case 'form':
+    return filefield_widget_settings_form($widget);
+  case 'save':
+    return filefield_widget_settings_save($widget);
   }
 }
 

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

Switch Indentation +168 added lines, -168 removed lines

@@ -17,17 +17,17 @@ 
  * Utility Form to delete teams suspected of being spammers.
  */
 function boincteam_utility_delete(&$form_state) {
-  $form = array();
+$form = array();
 
-  $form['help'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Help'),
-    '#collapsible' => TRUE,
-  );
+$form['help'] = array(
+'#type' => 'fieldset',
+'#title' => t('Help'),
+'#collapsible' => TRUE,
+);
 
-  $form['help']['text'] = array(
-    '#type' => 'item',
-    '#description' => t('This utility page will help in identifying BOINC teams created by SPAMMERs which can be deleted. The search will find BOINC teams that meet the following criteria.
+$form['help']['text'] = array(
+'#type' => 'item',
+'#description' => t('This utility page will help in identifying BOINC teams created by SPAMMERs which can be deleted. The search will find BOINC teams that meet the following criteria.
 <ul>
 <li>Team has zero or one members.</li>
 <li>The team has zero (0) total credits.</li>
@@ -38,121 +38,121 @@ 
 <p> <i>How teams are deleted</i>: Select the teams to be deleted from the table below. Click "Delete Selected Teams" button to begin a batch operation to delete the teams. If you select teams, and then page through to another page of the table, your selections will be lost. I.e., only the teams select on the current page will be deleted.
 <p> The site must be offline/in maintenance mode before searching for and deleting teams. If not, the delete button below is disabled.
 '),
-  );
+);
 
-  // This variable name has been changed for Drupal 7/8.
-  $maintenance_mode = variable_get('site_offline');
-  if (!$maintenance_mode) {
-    drupal_set_message(t('WARNING: Site is online (not in maintenance mode)! Deleting teams is only allowed when site is offline. Change this setting in ') . l(t('Site maintenance'), '/admin/settings/site-maintenance'), 'warning');
+// This variable name has been changed for Drupal 7/8.
+$maintenance_mode = variable_get('site_offline');
+if (!$maintenance_mode) {
+drupal_set_message(t('WARNING: Site is online (not in maintenance mode)! Deleting teams is only allowed when site is offline. Change this setting in ') . l(t('Site maintenance'), '/admin/settings/site-maintenance'), 'warning');
+}
+
+$form['teamdelete'] = array(
+'#type' => 'fieldset',
+'#title' => t('Teams to delete'),
+);
+$form['teamdelete']['deleteall'] = array(
+'#type' => 'submit',
+'#disabled' => !($maintenance_mode),
+'#value' => t('Delete Selected Teams'),
+'#submit' => array('boincteam_utility_delete_team'),
+'#attributes' => array(
+    'onclick' => 'return confirm(\'' . t('You are about to delete the selected teams suspected of being SPAM. Do you want to continue?') . '\')',
+),
+);
+$form['teamdelete']['results_table'] = array(
+'#value' => drupal_get_form('boincteam_utility_team_table'),
+);
+
+return $form;
+}
+
+function boincteam_utility_team_table() {
+
+$limit=50;
+$sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
+
+// @todo - add bts() or t()
+$resultheader = array(
+array(
+  'data' => 'Team ID',
+  'field' => 'id',
+  'sort' => 'asc',
+),
+array(
+  'data' => 'Team Name',
+  'field' => 'name',
+),
+array(
+  'data' => 'Num Users',
+  'field' => 'nusers',
+),
+array(
+  'data' => 'Link to Team',
+  'field' => 'link',
+),
+);
+
+$tablesort = tablesort_sql($resultheader);
+db_set_active('boinc_rw');
+$db_res = pager_query($sql . $tablesort, $limit);
+db_set_active('default');
+
+$form = array();
+$form['options'] = array();
+$checkboxes = array();
+if ($db_res) {
+while ($result = db_fetch_object($db_res)) {
+  $drupalnid = boincteam_lookup_nid($result->id);
+  if ($drupalnid) {
+    $tlink = l($result->name, '/community/teams/' . $drupalnid);
+  }
+  else {
+    $tlink = '';
   }
+  // only keys no values
+  $checkboxes[$result->id] = '';
 
-  $form['teamdelete'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Teams to delete'),
+  $form['id'][$result->id] = array(
+    '#value' => $result->id,
   );
-  $form['teamdelete']['deleteall'] = array(
-    '#type' => 'submit',
-    '#disabled' => !($maintenance_mode),
-    '#value' => t('Delete Selected Teams'),
-    '#submit' => array('boincteam_utility_delete_team'),
-    '#attributes' => array(
-        'onclick' => 'return confirm(\'' . t('You are about to delete the selected teams suspected of being SPAM. Do you want to continue?') . '\')',
-    ),
+  $form['name'][$result->id] = array(
+    '#value' => $result->name,
   );
-  $form['teamdelete']['results_table'] = array(
-    '#value' => drupal_get_form('boincteam_utility_team_table'),
+  $form['nusers'][$result->id] = array(
+    '#value' => $result->nusers,
+  );
+  $form['link'][$result->id] = array(
+    '#value' => $tlink,
   );
-
-  return $form;
 }
 
-function boincteam_utility_team_table() {
+$form['checkboxes'] = array('#type' => 'checkboxes', '#options' => $checkboxes);
+$form['pager'] = array('#value' => theme('pager', NULL, $limit, 0));
 
-  $limit=50;
-  $sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
-
-  // @todo - add bts() or t()
-  $resultheader = array(
-    array(
-      'data' => 'Team ID',
-      'field' => 'id',
-      'sort' => 'asc',
-    ),
-    array(
-      'data' => 'Team Name',
-      'field' => 'name',
-    ),
-    array(
-      'data' => 'Num Users',
-      'field' => 'nusers',
-    ),
-    array(
-      'data' => 'Link to Team',
-      'field' => 'link',
-    ),
-  );
-
-  $tablesort = tablesort_sql($resultheader);
-  db_set_active('boinc_rw');
-  $db_res = pager_query($sql . $tablesort, $limit);
-  db_set_active('default');
-
-  $form = array();
-  $form['options'] = array();
-  $checkboxes = array();
-  if ($db_res) {
-    while ($result = db_fetch_object($db_res)) {
-      $drupalnid = boincteam_lookup_nid($result->id);
-      if ($drupalnid) {
-        $tlink = l($result->name, '/community/teams/' . $drupalnid);
-      }
-      else {
-        $tlink = '';
-      }
-      // only keys no values
-      $checkboxes[$result->id] = '';
-
-      $form['id'][$result->id] = array(
-        '#value' => $result->id,
-      );
-      $form['name'][$result->id] = array(
-        '#value' => $result->name,
-      );
-      $form['nusers'][$result->id] = array(
-        '#value' => $result->nusers,
-      );
-      $form['link'][$result->id] = array(
-        '#value' => $tlink,
-      );
-    }
-
-    $form['checkboxes'] = array('#type' => 'checkboxes', '#options' => $checkboxes);
-    $form['pager'] = array('#value' => theme('pager', NULL, $limit, 0));
-
-    return $form;
-  }
-  return "<p>No teams matched the criteria for a SPAM team.</p>";
+return $form;
+}
+return "<p>No teams matched the criteria for a SPAM team.</p>";
 }
 
 /**
  * Submit handler - also creates the batch job to delete the teams.
  */
 function boincteam_utility_delete_team($form, &$form_state) {
-  $checkedteamids = $form_state['clicked_button']['#post']['checkboxes'];
-  // Use batch to delete teams
-  $operations = array();
-  foreach ($checkedteamids as $id) {
-    $operations[] = array('boincteam_utility_batch_process', array($id));
-  }
-  $batch = array(
-    'title' => t('Processing BOINC Teams'),
-    'operations' => $operations,
-    'init_message' => t('Starting team deletion'),
-    'finished' => 'boincteam_utility_batch_finished',
-    'file' => drupal_get_path('module', 'boincteam') . '/boincteam.admin.inc',
-  );
-  batch_set($batch);
-  //batch_process('/admin/boinc/utility-team-delete');
+$checkedteamids = $form_state['clicked_button']['#post']['checkboxes'];
+// Use batch to delete teams
+$operations = array();
+foreach ($checkedteamids as $id) {
+$operations[] = array('boincteam_utility_batch_process', array($id));
+}
+$batch = array(
+'title' => t('Processing BOINC Teams'),
+'operations' => $operations,
+'init_message' => t('Starting team deletion'),
+'finished' => 'boincteam_utility_batch_finished',
+'file' => drupal_get_path('module', 'boincteam') . '/boincteam.admin.inc',
+);
+batch_set($batch);
+//batch_process('/admin/boinc/utility-team-delete');
 }
 
 /*
@@ -163,37 +163,37 @@ 
  *     Input form (table)
  */
 function theme_boincteam_utility_team_table($form) {
-  //define table header
-  $header = array(
-    theme('table_select_header_cell'), //using that previously empty field
-    array('data' => t('Team ID'), 'field' => 'id', 'sort' => 'asc'),
-    array('data' => t('Name'), 'field' => 'name'),
-    array('data' => t('Num Users'), 'field' => 'nusers'),
-    array('data' => t('Link to Team'), 'field' => 'link'),
+//define table header
+$header = array(
+theme('table_select_header_cell'), //using that previously empty field
+array('data' => t('Team ID'), 'field' => 'id', 'sort' => 'asc'),
+array('data' => t('Name'), 'field' => 'name'),
+array('data' => t('Num Users'), 'field' => 'nusers'),
+array('data' => t('Link to Team'), 'field' => 'link'),
+);
+$rows = array();
+$output = "";
+if(!empty($form['checkboxes']['#options'])) {
+foreach (element_children($form['id']) as $key) {
+  $rows[] = array(
+    drupal_render($form['checkboxes'][$key]),
+    drupal_render($form['id'][$key]),
+    drupal_render($form['name'][$key]),
+    drupal_render($form['nusers'][$key]),
+    drupal_render($form['link'][$key]),
   );
-  $rows = array();
-  $output = "";
-  if(!empty($form['checkboxes']['#options'])) {
-    foreach (element_children($form['id']) as $key) {
-      $rows[] = array(
-        drupal_render($form['checkboxes'][$key]),
-        drupal_render($form['id'][$key]),
-        drupal_render($form['name'][$key]),
-        drupal_render($form['nusers'][$key]),
-        drupal_render($form['link'][$key]),
-      );
-    }
-  }
-  else {
-    $rows[] = array(array('data' => '<div class="error">No teams found</div>', 'colspan' => 5));
-  }
-  $output .= theme('table', $header, $rows);
-  if ($form['pager']['#value']) {
-    $output .= drupal_render($form['pager']);
-  }
+}
+}
+else {
+$rows[] = array(array('data' => '<div class="error">No teams found</div>', 'colspan' => 5));
+}
+$output .= theme('table', $header, $rows);
+if ($form['pager']['#value']) {
+$output .= drupal_render($form['pager']);
+}
 
-  $output .= drupal_render($form);
-  return $output;
+$output .= drupal_render($form);
+return $output;
 }
 
 /**
@@ -202,26 +202,26 @@ 
  * table. It also removes the team's drupal page (node) if found.
  */
 function boincteam_utility_batch_process($id, &$context) {
-  $boincteam = boincteam_load($id);
-  $drupalid = boincteam_lookup_nid($id);
-
-  // Delete entry in team table
-  db_set_active('boinc_rw');
-  $sql1='DELETE FROM {team} WHERE id=%d';
-  $db_res = db_query($sql1, $id);
-  db_set_active('default');
-
-  // Delete entry in boincteam table
-  $sql2='DELETE FROM {boincteam} WHERE id=%d';
-  $db_res = db_query($sql2, $id);
-
-  // Delete the drupal node (if present)
-  if ($drupalid) {
-    node_delete($drupalid);
-  }
+$boincteam = boincteam_load($id);
+$drupalid = boincteam_lookup_nid($id);
+
+// Delete entry in team table
+db_set_active('boinc_rw');
+$sql1='DELETE FROM {team} WHERE id=%d';
+$db_res = db_query($sql1, $id);
+db_set_active('default');
+
+// Delete entry in boincteam table
+$sql2='DELETE FROM {boincteam} WHERE id=%d';
+$db_res = db_query($sql2, $id);
+
+// Delete the drupal node (if present)
+if ($drupalid) {
+node_delete($drupalid);
+}
 
-  $context['results'][] = $id . ' : ' . check_plain($boincteam->name);
-  $context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
+$context['results'][] = $id . ' : ' . check_plain($boincteam->name);
+$context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
 }
 
 /**
@@ -229,15 +229,15 @@ 
  * or failure.
  */
 function boincteam_utility_batch_finished($success, $results, $operations) {
-  if ($success) {
-    $message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
-    drupal_set_message($message, 'info');
-  }
-  else {
-    // An error occurred.
-    // $operations contains the operations that remained unprocessed.
-    $error_operation = reset($operations);
-    $message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-    drupal_set_message($message, 'error');
-  }
+if ($success) {
+$message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
+drupal_set_message($message, 'info');
+}
+else {
+// An error occurred.
+// $operations contains the operations that remained unprocessed.
+$error_operation = reset($operations);
+$message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+drupal_set_message($message, 'error');
+}
 }
\ No newline at end of file