BOINC / boinc

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/contrib/forum_access/forum_access.node.inc

Switch Indentation +34 added lines, -34 removed lines

@@ -79,27 +79,27 @@ 
     $allowed_options = variable_get('forum_access_allowed_node_edit_options', array('status', 'sticky', 'subscriptions_notify'));
     foreach (element_children($form) as $key) {
       switch ($key) {
-        case 'options':
-          foreach (element_children($form[$key]) as $key2) {
-            if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
-            }
-          }
-          break;
-        case 'buttons':
-          $tid = $form['taxonomy'][$vid]['#default_value'][0];
-          if (!forum_access_access($tid, 'update')) {
-            $form['buttons']['submit']['#access'] = FALSE;
-            $form['buttons']['preview']['#access'] = FALSE;
-          }
-          if (!forum_access_access($tid, 'delete')) {
-            $form['buttons']['delete']['#access'] = FALSE;
-          }
-          break;
-        default:
-          if (array_search($key, $allowed_elements) === FALSE) {
-            $form[$key]['#access'] = FALSE;
+      case 'options':
+        foreach (element_children($form[$key]) as $key2) {
+          if (array_search($key2, $allowed_options) === FALSE) {
+            $form[$key][$key2]['#access'] = FALSE;
           }
+        }
+        break;
+      case 'buttons':
+        $tid = $form['taxonomy'][$vid]['#default_value'][0];
+        if (!forum_access_access($tid, 'update')) {
+          $form['buttons']['submit']['#access'] = FALSE;
+          $form['buttons']['preview']['#access'] = FALSE;
+        }
+        if (!forum_access_access($tid, 'delete')) {
+          $form['buttons']['delete']['#access'] = FALSE;
+        }
+        break;
+      default:
+        if (array_search($key, $allowed_elements) === FALSE) {
+          $form[$key]['#access'] = FALSE;
+        }
       }
     }
   }
@@ -120,20 +120,20 @@ 
     if ($tid = _forum_access_get_tid($node)) {
       if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
         switch (arg(0)) {
-          case 'node':
-              // Remove the in-line comment form, replace with text message to user.
-              $form = NULL;
-              $form['from'] = array(
-                  '#type'  => 'item',
-                  '#value' => 'You do not have permission to post comments in this forum.',);
-            break;
-            case 'comment':
-                if (arg(1)=='reply') {
-                    drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
-                    drupal_goto("node/$node->nid");
-                    exit;
-                }
-            break;
+        case 'node':
+            // Remove the in-line comment form, replace with text message to user.
+            $form = NULL;
+            $form['from'] = array(
+                '#type'  => 'item',
+                '#value' => 'You do not have permission to post comments in this forum.',);
+          break;
+        case 'comment':
+            if (arg(1)=='reply') {
+                drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
+                drupal_goto("node/$node->nid");
+                exit;
+            }
+        break;
         }//switch arg(0)
       }
       else {

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/includes/boincuser_delete.helpers.inc

Switch Indentation +31 added lines, -31 removed lines

@@ -59,37 +59,37 @@
   // hook_user() functions.
 
   switch ($action) {
-    case 'soft_obfuscate':
-      obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
-        'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
-        'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
-    case 'hard_wipe':
-      wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
-    default:
-      watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
-        '%action' => $action,
-      ), WATCHDOG_ERROR);
+  case 'soft_obfuscate':
+    obfuscate_account($boinc_user);
+    _boincuser_delete_comment_reassign($account);
+    _boincuser_delete_node_reassign($account);
+    _boincuser_delete_privatemsg_delete($account);
+    _boincuser_delete_friends($account);
+    // delete the user's profile
+    $profile = content_profile_load('profile', $account->uid);
+    node_delete($profile->nid);
+    // Drupal account -
+    //  * 'block'/disable the account
+    //  * set name, mail, pass, and init to deleted
+    //  * erase signature
+    $myarray = array(
+      'status'    => 0,
+      'name'      => 'deleted_' . time() . '_' . random_string(),
+      'mail'      => 'deleted_' . time() . '_' . random_string(),
+      'pass'      => 'deleted_' . time() . '_' . random_string(),
+      'signature' => '',
+      'init'      => 'deleted_' . time() . '_' . random_string(),
+    );
+    user_save($account, $myarray);
+    break;
+  case 'hard_wipe':
+    wipe_account($boinc_user);
+    user_delete(array(), $account->uid);
+    break;
+  default:
+    watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
+      '%action' => $action,
+    ), WATCHDOG_ERROR);
   }
 }
 

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

Switch Indentation +356 added lines, -356 removed lines

@@ -11,12 +11,12 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 if (!function_exists('user_load_by_mail')) {
-  /**
+/**
    * user_load_by_mail will be broken out of user_load
    */
-  function user_load_by_mail($mail) {
-    return user_load(array('mail' => $mail));
-  }
+function user_load_by_mail($mail) {
+return user_load(array('mail' => $mail));
+}
 }
  
 
@@ -28,14 +28,14 @@ 
  * Get an image object from a given file and cck field
  */ 
 function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = FALSE) {
-  $field = content_fields($field_name, $content_type); 
-  $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
-  if ($ignore_resolution) {
-    unset($validators['filefield_validate_image_resolution']);
-  }
-  $target_path = filefield_widget_file_path($field);
-  // Create the image object
-  return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
+$field = content_fields($field_name, $content_type); 
+$validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
+if ($ignore_resolution) {
+unset($validators['filefield_validate_image_resolution']);
+}
+$target_path = filefield_widget_file_path($field);
+// Create the image object
+return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
 }
 
 
@@ -47,73 +47,73 @@ 
  * 
  */
 function boincuser_check_credit_requirements() {
-  global $user;
-  if (!$user->uid) {
-    return FALSE;
-  }
-  $account = user_load($user->uid);
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $community_role = array_search('community member', user_roles(true));
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
+global $user;
+if (!$user->uid) {
+return FALSE;
+}
+$account = user_load($user->uid);
+$min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+$community_role = array_search('community member', user_roles(true));
+$unrestricted_role = array_search('verified contributor', user_roles(true));
   
-  // Set user roles based on current penalty status...
-  if ($account->boincuser_penalty_expiration > time()) {
-    drupal_set_message(bts(
-      'You are banned from community participation until @date',
-      array('@date' => format_date($account->boincuser_penalty_expiration))
-    ), 'warning', FALSE);
-    if (isset($account->roles[$community_role])) {
-      // Remove from the community role, if not already
-      unset($account->roles[$community_role]);
-    }
-    if (isset($account->roles[$unrestricted_role])) {
-      // Likewise, revoke extra privileges
-      unset($account->roles[$unrestricted_role]);
-    }
+// Set user roles based on current penalty status...
+if ($account->boincuser_penalty_expiration > time()) {
+drupal_set_message(bts(
+  'You are banned from community participation until @date',
+  array('@date' => format_date($account->boincuser_penalty_expiration))
+), 'warning', FALSE);
+if (isset($account->roles[$community_role])) {
+  // Remove from the community role, if not already
+  unset($account->roles[$community_role]);
+}
+if (isset($account->roles[$unrestricted_role])) {
+  // Likewise, revoke extra privileges
+  unset($account->roles[$unrestricted_role]);
+}
+user_save($account, array('roles' => $account->roles));
+}
+else {
+if (!isset($account->roles[$community_role])) {
+  // The user should be a 'community member' role. If the user was
+  // previously banned, this will restore that role.
+  $account->roles[$community_role] = 'community member';
+  user_save($account, array('roles' => $account->roles));
+}
+
+// ... and total credit.
+if ($account->boincuser_total_credit >= $min_credit_to_post) {
+  if (!isset($account->roles[$unrestricted_role])) {
+    // This user is now above the credit threshold and is allowed full
+    // privileges
+    $account->roles[$unrestricted_role] = 'verified contributor';
     user_save($account, array('roles' => $account->roles));
   }
-  else {
-    if (!isset($account->roles[$community_role])) {
-      // The user should be a 'community member' role. If the user was
-      // previously banned, this will restore that role.
-      $account->roles[$community_role] = 'community member';
-      user_save($account, array('roles' => $account->roles));
-    }
-
-    // ... and total credit.
-    if ($account->boincuser_total_credit >= $min_credit_to_post) {
-      if (!isset($account->roles[$unrestricted_role])) {
-        // This user is now above the credit threshold and is allowed full
-        // privileges
-        $account->roles[$unrestricted_role] = 'verified contributor';
-        user_save($account, array('roles' => $account->roles));
-      }
-    }
-    else {
-      drupal_set_message(bts(
-        'You must earn @count more credits to be able to post comments on this site.',
-        array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
-      ), 'warning', FALSE);
-      if (isset($account->roles[$unrestricted_role])) {
-        // Either the threshold has been raised or credits have been revoked;
-        // this user no longer qualifies for full privileges
-        unset($account->roles[$unrestricted_role]);
-        user_save($account, array('roles' => $account->roles));
-      }
-    }
-
+}
+else {
+  drupal_set_message(bts(
+    'You must earn @count more credits to be able to post comments on this site.',
+    array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
+  ), 'warning', FALSE);
+  if (isset($account->roles[$unrestricted_role])) {
+    // Either the threshold has been raised or credits have been revoked;
+    // this user no longer qualifies for full privileges
+    unset($account->roles[$unrestricted_role]);
+    user_save($account, array('roles' => $account->roles));
   }
 }
 
+}
+}
+
 /**
  * Get the cid of the first comment the user has not seen on a given node
  */
 function boincuser_get_first_unread_comment_id($nid, $uid = NULL) {
-  if (!$uid) {
-    global $user;
-    $uid = $user->uid;
-  }
-  return db_result(db_query("
+if (!$uid) {
+global $user;
+$uid = $user->uid;
+}
+return db_result(db_query("
     SELECT c.cid
     FROM {node} n
     INNER JOIN {comments} c ON c.nid = n.nid
@@ -123,41 +123,41 @@ 
     AND c.timestamp > h.timestamp
     ORDER BY c.timestamp ASC
     LIMIT 1",
-    $uid, $nid
-  ));
+$uid, $nid
+));
 }
 
 /**
  * Choose and set the user of the day
  */
 function boincuser_select_user_of_the_day() {
-  // First get a list of users with recent credit
-  db_set_active('boinc_rw');
-  $users_with_credit = db_query("
+// First get a list of users with recent credit
+db_set_active('boinc_rw');
+$users_with_credit = db_query("
     SELECT
       id
     FROM {user} u
     JOIN {profile} p ON p.userid = u.id
     WHERE expavg_credit > 1
     ORDER BY uotd_time ASC, RAND()"
-  );
-  db_set_active('default');
-  $active_users = array();
-  while ($user_with_credit = db_fetch_object($users_with_credit)) {
-    $active_users[] = $user_with_credit->id;
-  }
-  $active_users = implode(',', $active_users);
-  // Limit to users who have never been user of the day, if there are any
-  $never_been_picked = db_result(db_query("
+);
+db_set_active('default');
+$active_users = array();
+while ($user_with_credit = db_fetch_object($users_with_credit)) {
+$active_users[] = $user_with_credit->id;
+}
+$active_users = implode(',', $active_users);
+// Limit to users who have never been user of the day, if there are any
+$never_been_picked = db_result(db_query("
     SELECT COUNT(*)
     FROM {boincuser} bu
     WHERE bu.uotd_time = 0
     " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')
-  ));
-  $new_uotd_uid = 0;
-  while (!$new_uotd_uid) {
-    // Select a user of the day randomly from the pool
-      $new_uotd_uid = db_result(db_query("
+));
+$new_uotd_uid = 0;
+while (!$new_uotd_uid) {
+// Select a user of the day randomly from the pool
+  $new_uotd_uid = db_result(db_query("
       SELECT
         n.uid
       FROM {node} n
@@ -169,33 +169,33 @@ 
       " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
       ORDER BY RAND()
       LIMIT 1"
-    ));
-    if (!$new_uotd_uid) {
-      // Can't find a user with a profile; remove constraints on the pool
-      if ($never_been_picked) {
-        // Allow users who have been previously selected
-        $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
-        // Allow users who are not even active (getting desperate)
-        $active_users = FALSE;
-      }
-      else {
-        // Process failed...
-        return FALSE;
-      }
-    }
+));
+if (!$new_uotd_uid) {
+  // Can't find a user with a profile; remove constraints on the pool
+  if ($never_been_picked) {
+    // Allow users who have been previously selected
+    $never_been_picked = FALSE;
+  }
+  elseif ($active_users) {
+    // Allow users who are not even active (getting desperate)
+    $active_users = FALSE;
+  }
+  else {
+    // Process failed...
+    return FALSE;
   }
-  $uotd = user_load($new_uotd_uid);
-  if ($uotd->uid) {
-    db_query("
+}
+}
+$uotd = user_load($new_uotd_uid);
+if ($uotd->uid) {
+db_query("
       UPDATE {boincuser}
       SET uotd_time = '%d'
       WHERE uid = '%d'",
-      time(), $uotd->uid
-    );
-  }
-  return $uotd;
+  time(), $uotd->uid
+);
+}
+return $uotd;
 }
 
 
@@ -213,71 +213,71 @@ 
  * new and prev email.
  */
 function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
-  require_boinc('token');
-  module_load_include('inc', 'rules', 'modules/system.rules');
+require_boinc('token');
+module_load_include('inc', 'rules', 'modules/system.rules');
 
-  global $base_url;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-
-  if (is_null($new_email)) {
-    $new_email = $account->mail;
-  }
-  if (is_null($prev_email)) {
-    $prev_email = $account->boincuser_previous_email_addr;
-  }
+global $base_url;
+$site_name = variable_get('site_name', 'Drupal-BOINC');
 
-  // @todo - set constant in drupal, or use BOINC contsants
-  $duration = TOKEN_DURATION_ONE_WEEK;
-  $changedate = date('F j, Y \a\t G:i T', time());
-  $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
-  $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
-  if ($adminuser) {
-    $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
-    $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. You will not be able to change your email address "
-      . "until {$newdate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
+if (is_null($new_email)) {
+$new_email = $account->mail;
+}
+if (is_null($prev_email)) {
+$prev_email = $account->boincuser_previous_email_addr;
+}
 
-  // Send email #1 to current address
-  $mysubject = "Notification of email change at {$site_name}";
-  $mymessage = ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . $graf1
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
-    'from' => '',
-    'to' => $new_email,
-    'subject' => $mysubject,
-    'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  // Send email #2 to previous address.
-  $mymessage = ''
-      . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
-      . "\n"
-      . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
-    'from' => '',
-    'to' => $prev_email,
-    'subject' => $mysubject,
-    'message' => $mymessage,
-  );
+// @todo - set constant in drupal, or use BOINC contsants
+$duration = TOKEN_DURATION_ONE_WEEK;
+$changedate = date('F j, Y \a\t G:i T', time());
+$newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
+$token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
+if ($adminuser) {
+$graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
+  . "on {$changedate}. If you need to reverse this change, please look for "
+  . "an email send to the email address: {$prev_email}.\n";
+}
+else {
+$graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
+  . "on {$changedate}. You will not be able to change your email address "
+  . "until {$newdate}. If you need to reverse this change, please look for "
+  . "an email send to the email address: {$prev_email}.\n";
+}
 
-  rules_action_mail($settings);
+// Send email #1 to current address
+$mysubject = "Notification of email change at {$site_name}";
+$mymessage = ''
+  . "{$account->boincuser_name},\n"
+  . "\n"
+  . $graf1
+  . "\n"
+  . "Thanks, \n"
+  . "{$site_name} support team\n";
+
+$settings = array(
+'from' => '',
+'to' => $new_email,
+'subject' => $mysubject,
+'message' => $mymessage,
+);
+rules_action_mail_to_user($account, $settings);
+
+// Send email #2 to previous address.
+$mymessage = ''
+  . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
+  . "\n"
+  . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
+  . "\n"
+  . "Thanks, \n"
+  . "{$site_name} support team\n";
+
+$settings = array(
+'from' => '',
+'to' => $prev_email,
+'subject' => $mysubject,
+'message' => $mymessage,
+);
+
+rules_action_mail($settings);
 }
 
 /**
@@ -287,32 +287,32 @@ 
  *
  */
 function create_proper_drupalname($requested_name) {
-  if (!$requested_name) {
-    // If the name is empty, set it
-    $requested_name = 'anonymous';
-  }
-  $same_name_tally = 1;
-
-  // Remove extra spaces
-  $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
-  // Remove any non-valid characters
-  $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
-  // Truncate name
-  $name_length = strlen($cleaned_name);
-  if ($name_length > 56) {
-    // Name is limited to 60 characters, but we want to leave space to add a
-    // tally if needed (for users with duplicate names); Limit to 56 chars and
-    // replace the middle of the string with "..." if too long
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
-  }
+if (!$requested_name) {
+// If the name is empty, set it
+$requested_name = 'anonymous';
+}
+$same_name_tally = 1;
+
+// Remove extra spaces
+$name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
+// Remove any non-valid characters
+$cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
+// Truncate name
+$name_length = strlen($cleaned_name);
+if ($name_length > 56) {
+// Name is limited to 60 characters, but we want to leave space to add a
+// tally if needed (for users with duplicate names); Limit to 56 chars and
+// replace the middle of the string with "..." if too long
+$cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
+}
 
-  // Determine if there are duplicate names, if so append a number to end.
-  $unique_name = $cleaned_name;
-  while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
-    $same_name_tally++;
-    $unique_name = "{$cleaned_name}_{$same_name_tally}";
-  }
-  return $unique_name;
+// Determine if there are duplicate names, if so append a number to end.
+$unique_name = $cleaned_name;
+while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
+$same_name_tally++;
+$unique_name = "{$cleaned_name}_{$same_name_tally}";
+}
+return $unique_name;
 }
 
 
@@ -326,17 +326,17 @@ 
  *
  */
 function boincuser_check_termsofuse($user) {
-  // @todo - the condition for the terms of use needs to be saved in the
-  // project's user table, which does not exist, but may be added
-  // upstream. If/when that occurs, check it here.
-  $qres = db_query('SELECT bu.privacy_consent_dt FROM {boincuser} AS bu WHERE uid=%d', $user->uid);
-  $consent_dt = db_result($qres);
-  // Check datetime of consent, it should not be zero.
-  if ($consent_dt > 1 ) {
-    return true;
-  }
+// @todo - the condition for the terms of use needs to be saved in the
+// project's user table, which does not exist, but may be added
+// upstream. If/when that occurs, check it here.
+$qres = db_query('SELECT bu.privacy_consent_dt FROM {boincuser} AS bu WHERE uid=%d', $user->uid);
+$consent_dt = db_result($qres);
+// Check datetime of consent, it should not be zero.
+if ($consent_dt > 1 ) {
+return true;
+}
 
-  return false;
+return false;
 }
 
 /**
@@ -347,12 +347,12 @@ 
  *
  */
 function boincuser_consentto_termsofuse($user) {
-  $uid = $user->uid;
+$uid = $user->uid;
 
-  // @todo - Modify BOINC project database to record consent.
-  $sql = 'UPDATE {boincuser} set privacy_consent_dt = %d WHERE uid=%d';
-  $qrc = db_query($sql, time(), $uid);
-  return $qrc;
+// @todo - Modify BOINC project database to record consent.
+$sql = 'UPDATE {boincuser} set privacy_consent_dt = %d WHERE uid=%d';
+$qrc = db_query($sql, time(), $uid);
+return $qrc;
 }
 
 /**
@@ -361,16 +361,16 @@ 
  */
 function _boincuser_ignore_paths($path, $paths_to_ignore) {
 
-  foreach ($paths_to_ignore as $pi) {
-    // @todo Currently this function uses {} as PHP regexp
-    // delimiters. Curly brace is not really allowed un URLs, but a
-    // more robust function would first check for these curly braces
-    // in the path_to_ignore patterms, just in case.
-    if (preg_match('{' . $pi . '}', $path)) {
-      return TRUE;
-    }
-  }
-  return FALSE;
+foreach ($paths_to_ignore as $pi) {
+// @todo Currently this function uses {} as PHP regexp
+// delimiters. Curly brace is not really allowed un URLs, but a
+// more robust function would first check for these curly braces
+// in the path_to_ignore patterms, just in case.
+if (preg_match('{' . $pi . '}', $path)) {
+  return TRUE;
+}
+}
+return FALSE;
 }
 
 /**
@@ -378,20 +378,20 @@ 
  * Drupal's recover email path.
  */
 function _boincuser_redirect_recover_email() {
-  $params = array(
-    'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
-    'token' => isset($_GET['token']) ? $_GET['token'] : ''
-  );
-
-  // If boincid or token is not present, then go to the home page.
-  if (empty($params['boincid']) or empty($params['token'])) {
-    $redirect = '';
-  }
-  else {
-    $uid = boincuser_lookup_uid($params['boincid']);
-    $redirect = "/user/${uid}/recoveremail/${params['token']}";
-  }
-  drupal_goto($redirect);
+$params = array(
+'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
+'token' => isset($_GET['token']) ? $_GET['token'] : ''
+);
+
+// If boincid or token is not present, then go to the home page.
+if (empty($params['boincid']) or empty($params['token'])) {
+$redirect = '';
+}
+else {
+$uid = boincuser_lookup_uid($params['boincid']);
+$redirect = "/user/${uid}/recoveremail/${params['token']}";
+}
+drupal_goto($redirect);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -402,17 +402,17 @@ 
  * Require BOINC library
  */
 function require_boinc($libraries) {
-  if ($include_dir = boinc_get_path('html_inc')) {
-    $working_dir = getcwd();
-    chdir($include_dir);
-    if (!is_array($libraries)) {
-      $libraries = array($libraries);
-    }
-    foreach ($libraries as $library) {
-      require_once("{$library}.inc");
-    }
-    chdir($working_dir);
-  }
+if ($include_dir = boinc_get_path('html_inc')) {
+$working_dir = getcwd();
+chdir($include_dir);
+if (!is_array($libraries)) {
+  $libraries = array($libraries);
+}
+foreach ($libraries as $library) {
+  require_once("{$library}.inc");
+}
+chdir($working_dir);
+}
 }
 
 /**
@@ -420,92 +420,92 @@ 
  * The path from the BOINC html root must be included (e.g. user/file.php)
  */
 function include_boinc($file) {
-  if ($include_dir = boinc_get_path()) {
-    $include_dir .= '/html';
-    $workingDir = getcwd();
-    $path = dirname($file);
-    $file = basename($file);
-    chdir("{$include_dir}/{$path}");
-    include($file);
-    chdir($workingDir);
-  }
+if ($include_dir = boinc_get_path()) {
+$include_dir .= '/html';
+$workingDir = getcwd();
+$path = dirname($file);
+$file = basename($file);
+chdir("{$include_dir}/{$path}");
+include($file);
+chdir($workingDir);
+}
 }
 
 /**
  * Get the BOINC include path
  */
 function boinc_get_path($type = 'root') {
-  $dir = "boinc_{$type}_dir";
-  if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
-    return $include_dir;
-  }
-  else {
-    // Don't show errors on blacklisted pages
-    $page_blacklist = array(
-      'admin/boinc/environment'
-    );
-    if (!in_array($_GET['q'], $page_blacklist)) {
-      watchdog('boincuser', 'The BOINC environment is not configured. Please
+$dir = "boinc_{$type}_dir";
+if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
+return $include_dir;
+}
+else {
+// Don't show errors on blacklisted pages
+$page_blacklist = array(
+  'admin/boinc/environment'
+);
+if (!in_array($_GET['q'], $page_blacklist)) {
+  watchdog('boincuser', 'The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
-            'admin/boinc/environment')), WATCHDOG_WARNING);
-      if (user_access('administer site configuration')) {
-        drupal_set_message(t('The BOINC environment is not configured. Please
+        'admin/boinc/environment')), WATCHDOG_WARNING);
+  if (user_access('administer site configuration')) {
+    drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
-            'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
-        drupal_set_message(t('There is a problem with the site. Please contact
+        'admin/boinc/environment'))), 'warning', FALSE);
+  }
+  else {
+    drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
-      }
-      // Redirect home to display the error message and avoid fatal errors
-      // (unless on a blacklisted page)
-      $redirect_blacklist = array(
-        'admin/settings/performance',
-        'admin/boinc/environment',
-        'home',
-        ''
-      );
-      if (!in_array($_GET['q'], $redirect_blacklist)) {
-        drupal_goto('');
-      }
-    }
-    else {
-      // Clear the messages on the environment config page
-      drupal_get_messages();
-    }
   }
-  return FALSE;
+  // Redirect home to display the error message and avoid fatal errors
+  // (unless on a blacklisted page)
+  $redirect_blacklist = array(
+    'admin/settings/performance',
+    'admin/boinc/environment',
+    'home',
+    ''
+  );
+  if (!in_array($_GET['q'], $redirect_blacklist)) {
+    drupal_goto('');
+  }
+}
+else {
+  // Clear the messages on the environment config page
+  drupal_get_messages();
+}
+}
+return FALSE;
 }
 
 /**
  * Get the configured scheduler tags
  */
 function boinc_get_scheduler_tags() {
-  // Don't generate messages for blacklisted pages
-  $page_blacklist = array(
-    'admin/boinc/environment',
-    'admin/boinc/scheduler'
-  );
-  if ($url_config = variable_get('boinc_scheduler_urls', '')) {
-    return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
-    watchdog('boincuser', 'The BOINC scheduling server settings are not yet
+// Don't generate messages for blacklisted pages
+$page_blacklist = array(
+'admin/boinc/environment',
+'admin/boinc/scheduler'
+);
+if ($url_config = variable_get('boinc_scheduler_urls', '')) {
+return explode("\r\n", $url_config);
+}
+elseif (!in_array($_GET['q'], $page_blacklist)) {
+watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
-            t('and') . '</strong> ' . t('save the configuration'),
-            'admin/boinc/scheduler', array('html' => TRUE))
-          ), WATCHDOG_WARNING);
-    if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC scheduling server settings are not yet
+      array('!verify' => l(t('verify the default values') . ' <strong>' . 
+        t('and') . '</strong> ' . t('save the configuration'),
+        'admin/boinc/scheduler', array('html' => TRUE))
+      ), WATCHDOG_WARNING);
+if (user_access('administer site configuration')) {
+  drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
-            array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
-              'admin/boinc/scheduler', array('html' => TRUE))
-            )), 'warning', FALSE);
-    }
-  }
-  return array();
+        array('!verify' => l(t('verify the default values') . ' <strong>' . 
+          t('and') . '</strong> ' . t('save the configuration'),
+          'admin/boinc/scheduler', array('html' => TRUE))
+        )), 'warning', FALSE);
+}
+}
+return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -517,41 +517,41 @@ 
  * Determine if a BOINC ID matches the logged in user
  */
 function is_current_boinc_user($boinc_id) {
-  global $user;
-  if (!$user->uid) {
-    return FALSE;
-  }
-  // boincuser_id is not stored in the global user, so load a new instance
-  $drupuser = user_load($user->uid);
-  return ($boinc_id == $drupuser->boincuser_id);
+global $user;
+if (!$user->uid) {
+return FALSE;
+}
+// boincuser_id is not stored in the global user, so load a new instance
+$drupuser = user_load($user->uid);
+return ($boinc_id == $drupuser->boincuser_id);
 }
 
 /**
  * Convert a BOINC ID to a Drupal ID
  */
 function boincuser_lookup_uid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
-  return $drupal_id;
+$drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
+return $drupal_id;
 }
 function get_drupal_id($boinc_id) {
-  return boincuser_lookup_uid($boinc_id);
+return boincuser_lookup_uid($boinc_id);
 }
 
 /**
  * Get a BOINC user object
  */
 function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
-  if (!$user_id) {
-    global $user;
-    $user_id = $user->uid;
-    $is_drupal_id = TRUE;
-  }
-  if ($is_drupal_id) {
-    $account = user_load($user_id);
-    $user_id = $account->boincuser_id;
-  }
-  require_boinc('boinc_db');
-  return BoincUser::lookup_id($user_id);
+if (!$user_id) {
+global $user;
+$user_id = $user->uid;
+$is_drupal_id = TRUE;
+}
+if ($is_drupal_id) {
+$account = user_load($user_id);
+$user_id = $account->boincuser_id;
+}
+require_boinc('boinc_db');
+return BoincUser::lookup_id($user_id);
 }
 
 /**
@@ -561,10 +561,10 @@ 
  * page, delete button.
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
-  $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
-  $afterq = 'destination=account';
-  drupal_goto($deleteurl, $afterq);
+$node = $form['#node'];
+$deleteurl = 'node/'. $node->nid .'/delete';
+$afterq = 'destination=account';
+drupal_goto($deleteurl, $afterq);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -575,8 +575,8 @@ 
  * Wrapper for boinc_version() function
  */
 function get_boinc_version($x) {
-  require_boinc('host');
-  return function_exists('boinc_version') ? boinc_version($x) : 'err!';
+require_boinc('host');
+return function_exists('boinc_version') ? boinc_version($x) : 'err!';
 }
   
 
@@ -588,12 +588,12 @@ 
   * Generate the friend block header
   */
 function boincuser_views_friends_block_header($context = null) {
-  // Get the friend count for the user being viewed
-  $view = views_get_current_view();
-  $account_id = $view->args[0];
-  $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
-    array('@count' => $friend_count)) . '</h2>';
+// Get the friend count for the user being viewed
+$view = views_get_current_view();
+$account_id = $view->args[0];
+$friend_count = flag_friend_get_friend_count($account_id);
+return '<h2 class="pane-title">' . bts('Friends (@count)', 
+array('@count' => $friend_count)) . '</h2>';
 }
 
 /**
@@ -601,13 +601,13 @@ 
  * database.
  */
 function _boincuser_user_name_autocomplete($string) {
-  $matches = array();
-  db_set_active('boinc_ro');
-  $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
-  db_set_active('default');
-  while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
-  }
+$matches = array();
+db_set_active('boinc_ro');
+$result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
+db_set_active('default');
+while ($user = db_fetch_object($result)) {
+  $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+}
 
-  drupal_json((object)$matches);
+drupal_json((object)$matches);
 }

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/boincuser_delete.module

Switch Indentation +277 added lines, -277 removed lines

@@ -94,64 +94,64 @@ 
   global $user;
 
   switch($form_id) {
-    case 'user_profile_form':
-      if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
-        $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('user_edit_delete_submit'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
-        );
-      }
-      else if ( user_access('administer users') ) {
-        $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('_boincuser_delete_goto_admindelete'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
-        );
-      }
-      else {
-        unset($form['delete']);
-      }
-      break;
-    case 'user_confirm_delete':
-
-      $disable_delete = FALSE;
-      // If email address was changed less than 7 days (7 * 86400 s)
-      // ago, it cannot be changed again.
-      $duration = TOKEN_DURATION_ONE_WEEK;
-      if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
-        drupal_set_message(
-          bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
-            array(
-              '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
-            ), NULL, 'boinc:account-credentials-change')
-        , 'info');
-        $disable_delete = TRUE;
-      }
-
-      // Configure radio options
-      $deleteoptions = array(
-        'boincuser_delete_softdelete' => bts('<b>Soft delete</b> the account. Afterwards your account will be disabled, and all posts/comments will be attributed to the Anonymous User. However, your user profile will be deleted, your host information will be deleted, and you will be removed from any team you are a member of.', array(), NULL, 'boinc:delete-user-account'),
-        'boincuser_delete_delete' => bts('<b>Delete</b> the account. Afterwards your account will be deleted, and all posts/comments will be attributed to the Anonymous User. Your user profile will be deleted, and your host information will be deleted.', array(), NULL, 'boinc:delete-user-account'),
+  case 'user_profile_form':
+    if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
+      $form['delete'] = array(
+        '#type' => 'submit',
+        '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+        '#weight' => 1009,
+        '#submit' => array('user_edit_delete_submit'),
+        '#prefix' => '<li class="tab">',
+        '#suffix' => '</li>',
       );
+    }
+    else if ( user_access('administer users') ) {
+      $form['delete'] = array(
+        '#type' => 'submit',
+        '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+        '#weight' => 1009,
+        '#submit' => array('_boincuser_delete_goto_admindelete'),
+        '#prefix' => '<li class="tab">',
+        '#suffix' => '</li>',
+      );
+    }
+    else {
+      unset($form['delete']);
+    }
+    break;
+  case 'user_confirm_delete':
+
+    $disable_delete = FALSE;
+    // If email address was changed less than 7 days (7 * 86400 s)
+    // ago, it cannot be changed again.
+    $duration = TOKEN_DURATION_ONE_WEEK;
+    if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
+      drupal_set_message(
+        bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
+          array(
+            '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
+          ), NULL, 'boinc:account-credentials-change')
+      , 'info');
+      $disable_delete = TRUE;
+    }
+
+    // Configure radio options
+    $deleteoptions = array(
+      'boincuser_delete_softdelete' => bts('<b>Soft delete</b> the account. Afterwards your account will be disabled, and all posts/comments will be attributed to the Anonymous User. However, your user profile will be deleted, your host information will be deleted, and you will be removed from any team you are a member of.', array(), NULL, 'boinc:delete-user-account'),
+      'boincuser_delete_delete' => bts('<b>Delete</b> the account. Afterwards your account will be deleted, and all posts/comments will be attributed to the Anonymous User. Your user profile will be deleted, and your host information will be deleted.', array(), NULL, 'boinc:delete-user-account'),
+    );
 
-      $dtypes = variable_get('boincuser_delete_type', 'user_decides');
-      // unset the other option if dtype is set. i.e., if dtype is set
-      // to soft delete, unset the hard delete option.
-      switch ($dtypes) {
-        case 'soft_obfuscate':
-          unset($deleteoptions['boincuser_delete_delete']);
-          break;
-        case 'hard_wipe':
-          unset($deleteoptions['boincuser_delete_softdelete']);
-          break;
-      }
+    $dtypes = variable_get('boincuser_delete_type', 'user_decides');
+    // unset the other option if dtype is set. i.e., if dtype is set
+    // to soft delete, unset the hard delete option.
+    switch ($dtypes) {
+    case 'soft_obfuscate':
+    unset($deleteoptions['boincuser_delete_delete']);
+    break;
+    case 'hard_wipe':
+    unset($deleteoptions['boincuser_delete_softdelete']);
+    break;
+    }
 
       $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
       drupal_set_title($question);
@@ -301,56 +301,56 @@ 
   // create token with 1 day/24 hour expiration
   $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
   switch ($op) {
-    case 'boincuser_delete_softdelete':
-      $myurl = "${base_url}/user/{$account->uid}/odeleteconfirm/$mytoken";
-      break;
-    case 'boincuser_delete_delete':
-      $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
+  case 'boincuser_delete_softdelete':
+    $myurl = "${base_url}/user/{$account->uid}/odeleteconfirm/$mytoken";
       break;
-  }
-
-  $mysubject = "Instructions for account deletion at {$site_name}";
-  $mymessage = ''
-    . "{$account->boincuser_name},\n"
-    . "\n"
-    . "We have received a request to DELETE your user account at "
-    . "${site_name}. Below in this email is a one-time token you must "
-    . "use. Either click on the link or copy-and-paste the URL into your "
-    . "browser address bar. Then you will be required to enter your password "
-    . "again to confirm your identity.\n"
-    . "\n"
-    . "${myurl}\n"
-    . "\n"
-    . "This one-time token will expire in 24 hours. Afterwards you must "
-    . "re-request deletion of your account in order to generate a new token.\n"
-    . "\n"
-    . "If you did not initiate this request, please login to the "
-    . "${site_name} Web site (${site_url}) and "
-    . "then contact the administrators.\n"
-    . "\n"
-    . "Thanks, \n"
-    . "\n"
-    . "{$site_name} support team";
-
-  // Create array for sending email to user to notify account is being
-  // disabled/deleted. Then send email.
-  $settings = array(
-    'from' => '',
-    'subject' => $mysubject,
-    'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+case 'boincuser_delete_delete':
+  $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
+  break;
+}
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
-    drupal_goto($redirect);
-  }
-  else {
-    drupal_goto();
-  }
+$mysubject = "Instructions for account deletion at {$site_name}";
+$mymessage = ''
+. "{$account->boincuser_name},\n"
+. "\n"
+. "We have received a request to DELETE your user account at "
+. "${site_name}. Below in this email is a one-time token you must "
+. "use. Either click on the link or copy-and-paste the URL into your "
+. "browser address bar. Then you will be required to enter your password "
+. "again to confirm your identity.\n"
+. "\n"
+. "${myurl}\n"
+. "\n"
+. "This one-time token will expire in 24 hours. Afterwards you must "
+. "re-request deletion of your account in order to generate a new token.\n"
+. "\n"
+. "If you did not initiate this request, please login to the "
+. "${site_name} Web site (${site_url}) and "
+. "then contact the administrators.\n"
+. "\n"
+. "Thanks, \n"
+. "\n"
+. "{$site_name} support team";
+
+// Create array for sending email to user to notify account is being
+// disabled/deleted. Then send email.
+$settings = array(
+'from' => '',
+'subject' => $mysubject,
+'message' => $mymessage,
+);
+rules_action_mail_to_user($account, $settings);
+
+drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+
+$redirect = variable_get('boincuser_delete_redirect', '<front>');
+// Redirect
+if (!empty($redirect)) {
+drupal_goto($redirect);
+}
+else {
+drupal_goto();
+}
 }
 
 
@@ -362,77 +362,77 @@ 
  * The final confirmation form for the user to delete their account.
  */
 function boincuser_delete_finalconfirmation(&$form_state, $token) {
-  require_boinc('token');
-
-  global $user;
-  $form = array();
-
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'D')) {
-    drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
-    array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
-    ),
-    NULL, 'boinc:delete-user-account'), 'error');
-    drupal_goto();
-  }
-
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
-
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
-
-  // Instructions
-  $form['main']['instructions1'] = array(
-    '#value' => '<p>'.
-    bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-  );
-
-  $form['main']['instructions2'] = array(
-    '#value' => '<p>'.
-    bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-  );
-
-  // Password field
-  $form['main']['current_pass'] = array(
-    '#type' => 'password',
-    '#title' => bts('Enter your password before clicking Submit', array(), NULL, 'boinc:delete-user-account'),
-    '#size' => 17,
-    '#attributes' => array(
-      'autocomplete' => 'off',
-    ),
-    '#weight' => 25,
-  );
-
-  // Form control
-  $form['form control tabs prefix'] = array(
-    '#value' => '<ul class="form-control tab-list">',
-    '#weight' => 1001,
-  );
-  $form['submit'] = array(
-    '#prefix' => '<li class="first tab">',
-    '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
-    '#suffix' => '</li>',
-    '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
+require_boinc('token');
+
+global $user;
+$form = array();
+
+// check BOINC user exists
+$account = user_load(array('uid' => $user->uid));
+$uid = $user->uid;
+$boincid = $account->boincuser_id;
+// check $token is valid
+if (!is_valid_token($boincid, $token, 'D')) {
+drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
+array(
+  '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+),
+NULL, 'boinc:delete-user-account'), 'error');
+drupal_goto();
+}
 
-  return $form;
+// Attach account to this form.
+$form['_account'] = array('#type' => 'value', '#value' => $account);
+
+// This form is for hard/wipe delete
+$form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
+
+// Instructions
+$form['main']['instructions1'] = array(
+'#value' => '<p>'.
+bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+);
+
+$form['main']['instructions2'] = array(
+'#value' => '<p>'.
+bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+);
+
+// Password field
+$form['main']['current_pass'] = array(
+'#type' => 'password',
+'#title' => bts('Enter your password before clicking Submit', array(), NULL, 'boinc:delete-user-account'),
+'#size' => 17,
+'#attributes' => array(
+  'autocomplete' => 'off',
+),
+'#weight' => 25,
+);
+
+// Form control
+$form['form control tabs prefix'] = array(
+'#value' => '<ul class="form-control tab-list">',
+'#weight' => 1001,
+);
+$form['submit'] = array(
+'#prefix' => '<li class="first tab">',
+'#type' => 'submit',
+'#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+'#suffix' => '</li>',
+'#weight' => 1002,
+);
+$form['form control tabs'] = array(
+'#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+
+return $form;
 }
 
 /**
@@ -440,122 +440,122 @@ 
  * the soft/obfuscate method.
  */
 function boincuser_delete_softdelconfirmation(&$form_state, $token) {
-  require_boinc('token');
-
-  global $user;
-  $form = array();
-
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
-
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'D')) {
-    drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
-    array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
-    ),
-    NULL, 'boinc:delete-user-account'), 'error');
-    drupal_goto();
-  }
-
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
-
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
-
-  // Instructions
-  $form['main']['instructions1'] = array(
-    '#value' => '<p>'.
-    bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-  );
-
-  $form['main']['instructions2'] = array(
-    '#value' => '<p>'.
-    bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-  );
-
-  // Password field
-  $form['main']['current_pass'] = array(
-    '#type' => 'password',
-    '#title' => bts('Enter your password before clicking Submit', array(), NULL, 'boinc:delete-user-account'),
-    '#size' => 17,
-    '#attributes' => array(
-      'autocomplete' => 'off',
-    ),
-    '#weight' => 25,
-  );
-
-  // Form control
-  $form['form control tabs prefix'] = array(
-    '#value' => '<ul class="form-control tab-list">',
-    '#weight' => 1001,
-  );
-  $form['submit'] = array(
-    '#prefix' => '<li class="first tab">',
-    '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
-    '#suffix' => '</li>',
-    '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
+require_boinc('token');
+
+global $user;
+$form = array();
+
+// check BOINC user exists
+$account = user_load(array('uid' => $user->uid));
+$uid = $user->uid;
+$boincid = $account->boincuser_id;
+
+// check $token is valid
+if (!is_valid_token($boincid, $token, 'D')) {
+drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
+array(
+  '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+),
+NULL, 'boinc:delete-user-account'), 'error');
+drupal_goto();
+}
 
-  //set validation and submit to the functions below
-  $form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
-  $form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
-  return $form;
+// Attach account to this form.
+$form['_account'] = array('#type' => 'value', '#value' => $account);
+
+// This form is for hard/wipe delete
+$form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
+
+// Instructions
+$form['main']['instructions1'] = array(
+'#value' => '<p>'.
+bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+);
+
+$form['main']['instructions2'] = array(
+'#value' => '<p>'.
+bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+);
+
+// Password field
+$form['main']['current_pass'] = array(
+'#type' => 'password',
+'#title' => bts('Enter your password before clicking Submit', array(), NULL, 'boinc:delete-user-account'),
+'#size' => 17,
+'#attributes' => array(
+  'autocomplete' => 'off',
+),
+'#weight' => 25,
+);
+
+// Form control
+$form['form control tabs prefix'] = array(
+'#value' => '<ul class="form-control tab-list">',
+'#weight' => 1001,
+);
+$form['submit'] = array(
+'#prefix' => '<li class="first tab">',
+'#type' => 'submit',
+'#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+'#suffix' => '</li>',
+'#weight' => 1002,
+);
+$form['form control tabs'] = array(
+'#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+
+//set validation and submit to the functions below
+$form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
+$form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
+return $form;
 }
 
 /**
  * Validation for final confirmation
  */
 function boincuser_delete_finalconfirmation_validate($form, &$form_state) {
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+$account = $form_state['values']['_account'];
+$boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
-    return true;
-  }
+if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+return true;
+}
 }
 
 /**
  * Submit for final confirmation
  */
 function boincuser_delete_finalconfirmation_submit($form, &$form_state) {
-  global $user;
-
-  // Delete the user
-  $account = $form_state['values']['_account'];
-  $action = $form_state['values']['_action'];
-  _boincuser_delete_deleteuser($account, $action);
-
-  // Destroy the current session:
-  session_destroy();
-  // Only variables can be passed by reference workaround.
-  $null = NULL;
-  user_module_invoke('logout', $null, $user);
-
-  // Load the anonymous user
-  $user = drupal_anonymous_user();
-
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
-    drupal_goto($redirect);
-  }
-  else {
-    drupal_goto();
-  }
+global $user;
+
+// Delete the user
+$account = $form_state['values']['_account'];
+$action = $form_state['values']['_action'];
+_boincuser_delete_deleteuser($account, $action);
+
+// Destroy the current session:
+session_destroy();
+// Only variables can be passed by reference workaround.
+$null = NULL;
+user_module_invoke('logout', $null, $user);
+
+// Load the anonymous user
+$user = drupal_anonymous_user();
+
+$redirect = variable_get('boincuser_delete_redirect', '<front>');
+// Redirect
+if (!empty($redirect)) {
+drupal_goto($redirect);
+}
+else {
+drupal_goto();
+}
 
 }