BOINC / boinc

html/inc/user.inc

Indentation +5 added lines, -5 removed lines

@@ -286,11 +286,11 @@
 
         require_once("../inc/account_ownership.inc");
         if (file_exists($account_ownership_private_key_file_path)) {
-          // If the server has keys configured show the account ownership form
-          row2(
-              tra("Account Ownership"),
-              "<a href=\"account_ownership.php?$url_tokens\">Generate ownership proof</a>"
-          );
+            // If the server has keys configured show the account ownership form
+            row2(
+                tra("Account Ownership"),
+                "<a href=\"account_ownership.php?$url_tokens\">Generate ownership proof</a>"
+            );
         }
 
     }

html/ops/check_account_ownership_keys.php

Indentation +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@
 admin_page_head("Account Ownership Keys");
 
 if (!file_exists($account_ownership_private_key_file_path)) {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+    echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
+    echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
 }
 
 if (!file_exists($account_ownership_public_key_file_path)) {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+    echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
+    echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
 }
 
 echo "<p>For more info see the related wiki page: <a href=\"https://boinc.berkeley.edu/trac/wiki/ProofOfOwnership\">ProofOfOwnership</a></p>";

html/user/account_ownership.php

Indentation +121 added lines, -121 removed lines

@@ -28,140 +28,140 @@
 check_tokens($user->authenticator);
 
 function account_ownership_action($user) {
-  // POST request - the user has submitted the form.
-  page_head(tra("Proof of account ownership results"), null, null, null, boinc_recaptcha_get_head_extra());
-
-  global $recaptcha_private_key;
-  if ($recaptcha_private_key) {
-      // Recaptcha is enabled on the BOINC server
-      if (!boinc_recaptcha_isValidated($recaptcha_private_key)) {
-          // The user failed to solve the recaptcha prompt - redirect them to an error message!
-          error_page(
-              tra("Your reCAPTCHA response was not correct. Please try again.")
-          );
-      }
-  }
-
-  // Input is passed in from the openssl_sign_form
-  $user_data = htmlentities(post_str("user_data", true), ENT_QUOTES, "UTF-8"); // Convert special characters to html equivelant
-
-  if ((strlen($user_data) > 0) && (strlen($user_data) <= 4096)) {
-      require_once("../inc/account_ownership.inc");
-      // Check that the private key file exists where specified. If not, redirect to error page.
-      if (!file_exists($account_ownership_private_key_file_path)) {
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      // Check that the public key file exists where specified. If not, redirect to error page.
-      if (!file_exists($account_ownership_public_key_file_path)) {
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      $privkey = fopen($account_ownership_private_key_file_path, "r"); // Opening private key file
-      if (!isset($privkey) || empty($privkey)) {
+    // POST request - the user has submitted the form.
+    page_head(tra("Proof of account ownership results"), null, null, null, boinc_recaptcha_get_head_extra());
+
+    global $recaptcha_private_key;
+    if ($recaptcha_private_key) {
+        // Recaptcha is enabled on the BOINC server
+        if (!boinc_recaptcha_isValidated($recaptcha_private_key)) {
+            // The user failed to solve the recaptcha prompt - redirect them to an error message!
+            error_page(
+                tra("Your reCAPTCHA response was not correct. Please try again.")
+            );
+        }
+    }
+
+    // Input is passed in from the openssl_sign_form
+    $user_data = htmlentities(post_str("user_data", true), ENT_QUOTES, "UTF-8"); // Convert special characters to html equivelant
+
+    if ((strlen($user_data) > 0) && (strlen($user_data) <= 4096)) {
+        require_once("../inc/account_ownership.inc");
+        // Check that the private key file exists where specified. If not, redirect to error page.
+        if (!file_exists($account_ownership_private_key_file_path)) {
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        // Check that the public key file exists where specified. If not, redirect to error page.
+        if (!file_exists($account_ownership_public_key_file_path)) {
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        $privkey = fopen($account_ownership_private_key_file_path, "r"); // Opening private key file
+        if (!isset($privkey) || empty($privkey)) {
         error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-      $privkey_contents = fread($privkey, 8192); // Reading contents of private key into var
-      fclose($privkey); // Closing private key file
+        }
+        $privkey_contents = fread($privkey, 8192); // Reading contents of private key into var
+        fclose($privkey); // Closing private key file
 
-      $userid = $user->id; // Retrieving the user's UserId
-      $message_data = "$userid $user_data"; // Create the message which will be signed.
+        $userid = $user->id; // Retrieving the user's UserId
+        $message_data = "$userid $user_data"; // Create the message which will be signed.
 
-      $private_key_pem = openssl_pkey_get_private($privkey_contents); // Loading the private key into memory
-      openssl_sign($message_data, $signature, $private_key_pem, OPENSSL_ALGO_SHA512); // Compute signature using SHA512
-      openssl_free_key($private_key_pem); // Free the private key from memory for additional security
+        $private_key_pem = openssl_pkey_get_private($privkey_contents); // Loading the private key into memory
+        openssl_sign($message_data, $signature, $private_key_pem, OPENSSL_ALGO_SHA512); // Compute signature using SHA512
+        openssl_free_key($private_key_pem); // Free the private key from memory for additional security
 
-      $pubkey = fopen($account_ownership_public_key_file_path, "r"); // Open public key file
-      if ((!isset($pubkey)) || empty($pubkey)) {
+        $pubkey = fopen($account_ownership_public_key_file_path, "r"); // Open public key file
+        if ((!isset($pubkey)) || empty($pubkey)) {
         error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-      $pubkey_contents = fread($pubkey, 8192); // Read contents to var
-      fclose($pubkey); // Close pub key file
-
-      $base64_sig = base64_encode($signature); // Base64 encode the generated signature to enable safe output to text file.
-      $decoded_sig = base64_decode($base64_sig); // Decode base64 sig for use in sig_verification
-      $pubkeyid = openssl_pkey_get_public($pubkey_contents); // fetch public key into memory
-      $sig_verification = openssl_verify($message_data, $decoded_sig, $pubkeyid, OPENSSL_ALGO_SHA512); // Verify that the generated signature against the original data, using the public key.
-      openssl_free_key($pubkeyid); // Free the public key from memory
-
-      // Check if signature was successfully validated
-      if ($sig_verification == 1) {
-          $url_tokens = url_tokens($user->authenticator);
-          // The generated signature has been successfully verified using the public key.
-          global $master_url; // Define global master_url variable for use in output
-          echo "<p>Do not share this information with anyone other than the external system which has requested this proof of account ownership.</p>";
-          echo "<textarea rows='13' cols='50' id='result_textbox'><account_ownership_verification>\n<master_url>$master_url</master_url>\n<msg>$message_data</msg>\n<signature>$base64_sig</signature>\n</account_ownership_verification></textarea>";
-          echo "<br/><br/><button class='btn btn-success' onclick='copy_result_textbox()'>Copy text</button>";
-          echo "<a href='account_ownership.php?$url_tokens'><button class='btn btn-default'>Go back</button></a>";
-          echo '<script type="text/javascript">';
-          echo 'function copy_result_textbox() {
+        }
+        $pubkey_contents = fread($pubkey, 8192); // Read contents to var
+        fclose($pubkey); // Close pub key file
+
+        $base64_sig = base64_encode($signature); // Base64 encode the generated signature to enable safe output to text file.
+        $decoded_sig = base64_decode($base64_sig); // Decode base64 sig for use in sig_verification
+        $pubkeyid = openssl_pkey_get_public($pubkey_contents); // fetch public key into memory
+        $sig_verification = openssl_verify($message_data, $decoded_sig, $pubkeyid, OPENSSL_ALGO_SHA512); // Verify that the generated signature against the original data, using the public key.
+        openssl_free_key($pubkeyid); // Free the public key from memory
+
+        // Check if signature was successfully validated
+        if ($sig_verification == 1) {
+            $url_tokens = url_tokens($user->authenticator);
+            // The generated signature has been successfully verified using the public key.
+            global $master_url; // Define global master_url variable for use in output
+            echo "<p>Do not share this information with anyone other than the external system which has requested this proof of account ownership.</p>";
+            echo "<textarea rows='13' cols='50' id='result_textbox'><account_ownership_verification>\n<master_url>$master_url</master_url>\n<msg>$message_data</msg>\n<signature>$base64_sig</signature>\n</account_ownership_verification></textarea>";
+            echo "<br/><br/><button class='btn btn-success' onclick='copy_result_textbox()'>Copy text</button>";
+            echo "<a href='account_ownership.php?$url_tokens'><button class='btn btn-default'>Go back</button></a>";
+            echo '<script type="text/javascript">';
+            echo 'function copy_result_textbox() {
                 var target_textbox = document.getElementById("result_textbox");
                 target_textbox.select();
                 document.execCommand("copy");
                 alert("Copied to clipboard");
               }';
-          echo '</script>';
-          page_tail();
-
-      } elseif ($sig_verification == 0) {
-          // The generated signature has not been verified. The private/public keys do not match.
-          error_page(tra("Signature verification failed. Contact the project administrator to resolve the issue."));
-      } else {
-          // Something has gone wrong & an error has occurred.
-          error_page(tra("An error occurred during the signature verification. Contact the project administrator to resolve the issue."));
-      }
-  } else {
-      // User data input invalid
-      error_page(tra("Invalid input. User input must have a length > 0 and < 4096. <form><input type='button' value='Go back!'' onclick='history.back()'></form>"));
-  }
+            echo '</script>';
+            page_tail();
+
+        } elseif ($sig_verification == 0) {
+            // The generated signature has not been verified. The private/public keys do not match.
+            error_page(tra("Signature verification failed. Contact the project administrator to resolve the issue."));
+        } else {
+            // Something has gone wrong & an error has occurred.
+            error_page(tra("An error occurred during the signature verification. Contact the project administrator to resolve the issue."));
+        }
+    } else {
+        // User data input invalid
+        error_page(tra("Invalid input. User input must have a length > 0 and < 4096. <form><input type='button' value='Go back!'' onclick='history.back()'></form>"));
+    }
 }
 
 function account_ownership_form($user) {
-  // GET request - the user has navigated to the page.
-  page_head(tra("Generate proof of account ownership"), null, null, null, boinc_recaptcha_get_head_extra());
-
-  if ($user) { // Verify the user is logged in
-      require_once("../inc/account_ownership.inc");
-
-      if (!file_exists($account_ownership_private_key_file_path)) {
-          // Check that the private key file exists where specified. If not, redirect to error page.
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      if (!file_exists($account_ownership_public_key_file_path)) {
-          // Check that the public key file exists where specified. If not, redirect to error page.
-          error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
-      }
-
-      echo "<p>This tool is designed to create a proof of account ownership for external systems.</p>";
-
-      global $recaptcha_public_key;
-      if ($recaptcha_public_key) {
-          // Recaptcha configured
-          echo "<p>Enter a message with length less than 4096 characters into the input textbox below, solve the captcha then click the 'Generate' button.</p>";
-      } else {
-          // Recaptcha not configured
-          echo "<p>Enter a message with length less than 4096 characters into the input textbox below then click the 'Generate' button.</p>";
-      }
-      echo "<p>A textbox will then appear which contains your proof of account ownership.";
-      echo "<form method=post action=account_ownership.php>";
-
-      echo form_tokens($user->authenticator);
-      echo "<textarea rows='4' cols='50' name=user_data type=text size=20 placeholder='Enter text'></textarea><br/><br/>";
-
-      if ($recaptcha_public_key) {
-          // Trigger recaptcha!
-          form_general("", boinc_recaptcha_get_html($recaptcha_public_key));
-      }
-
-      echo "<input class=\"btn btn-success\" type=submit value='".tra("Generate")."'>";
-      echo "</form><br/><hr/>";
-  } else {
-      // The user is not logged in!
-      echo "<p>You need to be logged in to use this functionality.</p>";
-  }
-
-  page_tail();
+    // GET request - the user has navigated to the page.
+    page_head(tra("Generate proof of account ownership"), null, null, null, boinc_recaptcha_get_head_extra());
+
+    if ($user) { // Verify the user is logged in
+        require_once("../inc/account_ownership.inc");
+
+        if (!file_exists($account_ownership_private_key_file_path)) {
+            // Check that the private key file exists where specified. If not, redirect to error page.
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        if (!file_exists($account_ownership_public_key_file_path)) {
+            // Check that the public key file exists where specified. If not, redirect to error page.
+            error_page(tra("The proof of account ownership feature is not set up properly. Contact the project administrator to resolve the issue."));
+        }
+
+        echo "<p>This tool is designed to create a proof of account ownership for external systems.</p>";
+
+        global $recaptcha_public_key;
+        if ($recaptcha_public_key) {
+            // Recaptcha configured
+            echo "<p>Enter a message with length less than 4096 characters into the input textbox below, solve the captcha then click the 'Generate' button.</p>";
+        } else {
+            // Recaptcha not configured
+            echo "<p>Enter a message with length less than 4096 characters into the input textbox below then click the 'Generate' button.</p>";
+        }
+        echo "<p>A textbox will then appear which contains your proof of account ownership.";
+        echo "<form method=post action=account_ownership.php>";
+
+        echo form_tokens($user->authenticator);
+        echo "<textarea rows='4' cols='50' name=user_data type=text size=20 placeholder='Enter text'></textarea><br/><br/>";
+
+        if ($recaptcha_public_key) {
+            // Trigger recaptcha!
+            form_general("", boinc_recaptcha_get_html($recaptcha_public_key));
+        }
+
+        echo "<input class=\"btn btn-success\" type=submit value='".tra("Generate")."'>";
+        echo "</form><br/><hr/>";
+    } else {
+        // The user is not logged in!
+        echo "<p>You need to be logged in to use this functionality.</p>";
+    }
+
+    page_tail();
 }
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {

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

Indentation +67 added lines, -67 removed lines

@@ -16,29 +16,29 @@ 
  */
 
 function flag_abuse_reason_flag_default_flags() {
-  $flags = array();
-  module_load_include('inc', 'flag_abuse_reason', 'includes/flag_abuse_reason.flag_default');
-  _flag_abuse_reason_abuse_node_flags($flags);
-  _flag_abuse_reason_abuse_comment_flags($flags);
-  _flag_abuse_reason_abuse_user_flags($flags);
-  return $flags;
+    $flags = array();
+    module_load_include('inc', 'flag_abuse_reason', 'includes/flag_abuse_reason.flag_default');
+    _flag_abuse_reason_abuse_node_flags($flags);
+    _flag_abuse_reason_abuse_comment_flags($flags);
+    _flag_abuse_reason_abuse_user_flags($flags);
+    return $flags;
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function flag_abuse_reason_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'flag_abuse_reason') . '/includes',
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm().
  */
 function flag_abuse_reason_perm() {
-  return array('reset abuse flags');
+    return array('reset abuse flags');
 }
 
 /**
@@ -47,14 +47,14 @@ 
  * Here we change our flag event/action to 'reset'.
  */
 function flag_abuse_reason_preprocess_flag(&$vars) {
-  drupal_add_js(drupal_get_path('module', 'flag_abuse_reason') . "/includes/flag_abuse_reason.js");
-  drupal_add_css(drupal_get_path('module', 'flag_abuse_reason') . "/css/flag_abuse_reason.css");
-  $myuser = $vars['user'];
-  $metaflags = array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta');
+    drupal_add_js(drupal_get_path('module', 'flag_abuse_reason') . "/includes/flag_abuse_reason.js");
+    drupal_add_css(drupal_get_path('module', 'flag_abuse_reason') . "/css/flag_abuse_reason.css");
+    $myuser = $vars['user'];
+    $metaflags = array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta');
 
-   // permmission check instead of a role
-  // Is this one of our abuse flags?
-  if (in_array($vars['flag']->name, $metaflags)) {
+    // permmission check instead of a role
+    // Is this one of our abuse flags?
+    if (in_array($vars['flag']->name, $metaflags)) {
 
     // count the number of flags on this content
     $count = db_result(db_query("SELECT COUNT(*) FROM {flag_content} WHERE content_id=%d AND fid=%d", $vars['content_id'], $vars['flag']->fid));
@@ -62,41 +62,41 @@ 
     // If the variable <flagname>-<contentid> is set, then Reset
     // completely.
     if (variable_get($vars['flag']->name.'-'.$vars['content_id'], FALSE)) {
-      if (user_access('reset abuse flags', $myuser)) {
+        if (user_access('reset abuse flags', $myuser)) {
         $vars['action'] = 'none';
         $vars['link_text'] = t('Reset Completely');
         $vars['link_title'] = t('Reset everying, allows users to re-flag content.');
-      }
-      else {
+        }
+        else {
         $vars['action'] = 'none';
         $vars['link_text'] = t('Locked');
         $vars['link_title'] = t('Reporting locked by moderator.');
         $vars['link'] = array();
         $vars['link_href'] = '';
         $vars['flag_classes'] = 'flag style-like-link';
-      }
+        }
     }
     else {
-      // If there are flags on this content, clear the flags and
-      // lock the content.
-      if (user_access('reset abuse flags', $myuser)) {
+        // If there are flags on this content, clear the flags and
+        // lock the content.
+        if (user_access('reset abuse flags', $myuser)) {
         if ($count>0) {
-          $vars['action'] = 'reset';
-          $vars['link_text'] = t('Clear Reports and Lock');
-          $vars['link_title'] = t('Remove all flags on this content and prevent any new flagging.');
+            $vars['action'] = 'reset';
+            $vars['link_text'] = t('Clear Reports and Lock');
+            $vars['link_title'] = t('Remove all flags on this content and prevent any new flagging.');
         }
         // Otherwise the link is shown but has no effect.
         else {
-          $vars['action'] = 'none';
-          $vars['link_text'] = t('No abuse reports');
-          $vars['link_title'] = t('This content has no abuse reports. Link does nothing.');
+            $vars['action'] = 'none';
+            $vars['link_text'] = t('No abuse reports');
+            $vars['link_title'] = t('This content has no abuse reports. Link does nothing.');
         $vars['link'] = array();
         $vars['link_href'] = '';
         $vars['flag_classes'] = 'flag style-like-link';
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -106,72 +106,72 @@ 
  * we want to remove all flags. http://drupal.org/node/327901#comment-1085685
  */
 function flag_abuse_reason_flag($event, $flag, $content_id, $account) {
-  $metaflags = array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta');
+    $metaflags = array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta');
 
-  // For privileged users, check permissions and reset flags
-  // permission check instead of a role.
-  if (user_access('reset abuse flags', $account)) {
+    // For privileged users, check permissions and reset flags
+    // permission check instead of a role.
+    if (user_access('reset abuse flags', $account)) {
     // Is this one of our abuse flags?
     if (in_array($flag->name, $metaflags)) {
 
-      // Reset the flags completely.
-      if (variable_get($flag->name.'-'.$content_id, FALSE)) {
+        // Reset the flags completely.
+        if (variable_get($flag->name.'-'.$content_id, FALSE)) {
         // Since the user flags the content again, we need to unflag it.
         flag_reset_flag($flag, $content_id);
         drupal_set_message(bts('INFO: Reset everything. Users may reflag this content.', array(), NULL, 'boinc:flag-abuse-reset'), 'info');
         // unlock flag; effectively resets flags for this content
         variable_del($flag->name.'-'.$content_id);
-      }
-      else {
+        }
+        else {
         // Clear and Lock all flags on this content.
         $dbresult = db_query("SELECT DISTINCT fid FROM {flag_content} WHERE content_id = %d", $content_id);
         $rows = 0;
         while ($myfid = db_fetch_array($dbresult)) {
-          $myflag = flag_get_flag(NULL, array_pop($myfid));
-          $rows += flag_reset_flag($myflag, $content_id);
+            $myflag = flag_get_flag(NULL, array_pop($myfid));
+            $rows += flag_reset_flag($myflag, $content_id);
         }
         if ($rows) {
-          // This user actually flags the content as well, so it may
-          // confuse the user if they reset what they thought was one
-          // flag and we report two.
-          $rows--;
-          drupal_set_message(bts('INFO: Cleared !rows flags. Content is now locked and may not be reflagged.', array('!rows' => $rows), NULL, 'boinc:flag-abuse-reset'), 'info');
-
-          // This is the line which sets a Drupal variable which
-          // prevents the flag link from showing again for all
-          // users. Effectively preventing the content from being
-          // flagged again.
-          variable_set($flag->name.'-'.$content_id, TRUE);
+            // This user actually flags the content as well, so it may
+            // confuse the user if they reset what they thought was one
+            // flag and we report two.
+            $rows--;
+            drupal_set_message(bts('INFO: Cleared !rows flags. Content is now locked and may not be reflagged.', array('!rows' => $rows), NULL, 'boinc:flag-abuse-reset'), 'info');
+
+            // This is the line which sets a Drupal variable which
+            // prevents the flag link from showing again for all
+            // users. Effectively preventing the content from being
+            // flagged again.
+            variable_set($flag->name.'-'.$content_id, TRUE);
+        }
         }
-      }
 
     }
-  }
-  // Normal users may cancel their all their reported flags on this
-  // content.
-  else {
+    }
+    // Normal users may cancel their all their reported flags on this
+    // content.
+    else {
     if ( ($event=='unflag') && (in_array($flag->name, $metaflags)) ) {
-      $allflags = flag_get_user_flags($flag->content_type, $content_id, $account->uid);
-      foreach ($allflags as $subflag) {
+        $allflags = flag_get_user_flags($flag->content_type, $content_id, $account->uid);
+        foreach ($allflags as $subflag) {
         $myflag = flag_get_flag(NULL, $subflag->fid);
         $rc = $myflag->flag('unflag', $content_id, $account);
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_form_FORM_ID_alter().
  */
 function flag_abuse_reason_form_flag_confirm_alter(&$form, &$form_state) {
-  // Permmission check instead of a role.
-  if (user_access('reset abuse flags', $account)) {
+    // Permmission check instead of a role.
+    if (user_access('reset abuse flags', $account)) {
     $flag_name = $form['flag_name']['#value'];
     // Is this one of our abuse flags?
     if (in_array($flag_name, array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta'))) {
-      drupal_set_title(t('Flag reset'));
-      $form['description']['#value'] = t('Are you sure you want to reset all offensive flag on this content? Once doing so, users will not be able to flag this content again.');
-      $form['actions']['submit']['#value'] = t('Reset flags');
+        drupal_set_title(t('Flag reset'));
+        $form['description']['#value'] = t('Are you sure you want to reset all offensive flag on this content? Once doing so, users will not be able to flag this content again.');
+        $form['actions']['submit']['#value'] = t('Reset flags');
+    }
     }
-  }
 }

drupal/sites/default/boinc/modules/flag_abuse_reason/includes/flag_abuse_reason.flag_default.inc

Indentation +175 added lines, -175 removed lines

@@ -23,15 +23,15 @@ 
  * Node Flags
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 function _flag_abuse_reason_abuse_node_flags(&$flags) {
-  // Exported flag: "Node Abuse 1 SPAM".
-  $flags['abuse_node_1'] = array(
+    // Exported flag: "Node Abuse 1 SPAM".
+    $flags['abuse_node_1'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 1 SPAM',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as SPAM',
     'flag_long' => 'Flag this content SPAM.',
@@ -42,12 +42,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -57,19 +57,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 2 Link".
-  $flags['abuse_node_2'] = array(
+    );
+    // Exported flag: "Node Abuse 2 Link".
+    $flags['abuse_node_2'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 2 Link',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report as abusive link',
     'flag_long' => 'Flag this content as abusive link.',
@@ -80,12 +80,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -95,19 +95,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 3 Hostile".
-  $flags['abuse_node_3'] = array(
+    );
+    // Exported flag: "Node Abuse 3 Hostile".
+    $flags['abuse_node_3'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 3 Hostile',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as hostile',
     'flag_long' => 'Flag this content as hostile.',
@@ -118,12 +118,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -133,19 +133,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 4 Not Kid Friendly".
-  $flags['abuse_node_4'] = array(
+    );
+    // Exported flag: "Node Abuse 4 Not Kid Friendly".
+    $flags['abuse_node_4'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 4 Not Kid Friendly',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as not kid-friendly',
     'flag_long' => 'Flag this content as not kid-friendly.',
@@ -156,12 +156,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -171,19 +171,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 5 Other".
-  $flags['abuse_node_5'] = array(
+    );
+    // Exported flag: "Node Abuse 5 Other".
+    $flags['abuse_node_5'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 5 Other',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as other',
     'flag_long' => 'Flag this content - other reason.',
@@ -194,12 +194,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -209,19 +209,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse meta".
-  $flags['abuse_node_meta'] = array(
+    );
+    // Exported flag: "Node Abuse meta".
+    $flags['abuse_node_meta'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse meta',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report',
     'flag_long' => 'Report content',
@@ -232,12 +232,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 1,
@@ -247,27 +247,27 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
+    );
 
-  return $flags;
+    return $flags;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  * *
  * Comment Flags
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 function _flag_abuse_reason_abuse_comment_flags(&$flags) {
-  // Exported flag: "Comment Abuse 1 SPAM".
-  $flags['abuse_comment_1'] = array(
+    // Exported flag: "Comment Abuse 1 SPAM".
+    $flags['abuse_comment_1'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 1 SPAM',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as SPAM',
     'flag_long' => 'Flag this comment as SPAM.',
@@ -278,31 +278,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 2 LINK".
-  $flags['abuse_comment_2'] = array(
+    );
+    // Exported flag: "Comment Abuse 2 LINK".
+    $flags['abuse_comment_2'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 2 LINK',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as abusive link',
     'flag_long' => 'Flag this comment with abusive link.',
@@ -313,31 +313,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 3 Hostile".
-  $flags['abuse_comment_3'] = array(
+    );
+    // Exported flag: "Comment Abuse 3 Hostile".
+    $flags['abuse_comment_3'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 3 Hostile',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as hostile',
     'flag_long' => 'Flag this comment as hostile.',
@@ -348,31 +348,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 4 Not Kid Friendly".
-  $flags['abuse_comment_4'] = array(
+    );
+    // Exported flag: "Comment Abuse 4 Not Kid Friendly".
+    $flags['abuse_comment_4'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 4 Not Kid Friendly',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as not kid-friendly',
     'flag_long' => 'Flag this comment as not kid-friendly.',
@@ -383,31 +383,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 5 Other".
-  $flags['abuse_comment_5'] = array(
+    );
+    // Exported flag: "Comment Abuse 5 Other".
+    $flags['abuse_comment_5'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 5 Other',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as other',
     'flag_long' => 'Flag this comment - other reason',
@@ -418,31 +418,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse meta".
-  $flags['abuse_comment_meta'] = array(
+    );
+    // Exported flag: "Comment Abuse meta".
+    $flags['abuse_comment_meta'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse meta',
     'global' => '0',
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report',
     'flag_long' => 'Report comment.',
@@ -453,32 +453,32 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 1,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
+    );
 
-  return $flags;
+    return $flags;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  * *
  * User Flags
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 function _flag_abuse_reason_abuse_user_flags(&$flags) {
-  // Exported flag: "User Abuse 1 SPAM".
-  $flags['abuse_user_1'] = array(
+    // Exported flag: "User Abuse 1 SPAM".
+    $flags['abuse_user_1'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 1 SPAM',
     'global' => FALSE,
@@ -492,24 +492,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 2 Link".
-  $flags['abuse_user_2'] = array(
+    );
+    // Exported flag: "User Abuse 2 Link".
+    $flags['abuse_user_2'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 2 Link',
     'global' => FALSE,
@@ -523,24 +523,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 3 Not Kid Friendly".
-  $flags['abuse_user_3'] = array(
+    );
+    // Exported flag: "User Abuse 3 Not Kid Friendly".
+    $flags['abuse_user_3'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 3 Not Kid Friendly',
     'global' => FALSE,
@@ -554,24 +554,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 4 Other".
-  $flags['abuse_user_4'] = array(
+    );
+    // Exported flag: "User Abuse 4 Other".
+    $flags['abuse_user_4'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 4 Other',
     'global' => FALSE,
@@ -585,24 +585,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse Meta".
-  $flags['abuse_user_meta'] = array(
+    );
+    // Exported flag: "User Abuse Meta".
+    $flags['abuse_user_meta'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse Meta',
     'global' => FALSE,
@@ -616,22 +616,22 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 1,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
+    );
 
-  return $flags;
+    return $flags;
 }

html/user/create_account.php

Indentation +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
         }
         if (!$checkct) {
             error_log("Project configuration error! " .
-              "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
+                "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
             );
         }
 

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

Indentation +964 added lines, -964 removed lines

@@ -15,16 +15,16 @@ 
  * The structure of the general preferences form
  */
 function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null, $advanced = FALSE) {
-  $form = array();
-  $prefs = null;
-  $established = TRUE;
+    $form = array();
+    $prefs = null;
+    $established = TRUE;
   
-  // Enable AHAH form support for dynamically updating content based on preset
-  ahah_helper_register($form, $form_state);
+    // Enable AHAH form support for dynamically updating content based on preset
+    ahah_helper_register($form, $form_state);
   
-  if (!$prefs_preset) {
+    if (!$prefs_preset) {
     if (isset($form_state['storage']['prefs']['preset'])) {
-      $prefs_preset = $form_state['storage']['prefs']['preset'];
+        $prefs_preset = $form_state['storage']['prefs']['preset'];
     }
     
     // Load preferences from BOINC account
@@ -32,7 +32,7 @@ 
     
     // Take note if this is not an established preference set on the account
     if (isset($prefs['@attributes']['cleared'])) {
-      $established = FALSE;
+        $established = FALSE;
     }
     
     // Determine if a preset is selected or if these are custom settings
@@ -47,45 +47,45 @@ 
             $prefs_preset = $prefs['preset']['@value'];
         }
     }// if !$prefs_preset
-  }
-  // Extract mod_time tag if present, because it will be erased with
-  // boincwork_get_preset_prefs() below.
-  $mod_time = null;
-  if (isset($prefs['mod_time']['@value'])) {
-      $mod_time = $prefs['mod_time']['@value'];
-  }
-
-  if (isset($form_state['storage']['wip'])) {
-      switch ($prefs_preset) {
-      case 'standard':
+    }
+    // Extract mod_time tag if present, because it will be erased with
+    // boincwork_get_preset_prefs() below.
+    $mod_time = null;
+    if (isset($prefs['mod_time']['@value'])) {
+        $mod_time = $prefs['mod_time']['@value'];
+    }
+
+    if (isset($form_state['storage']['wip'])) {
+        switch ($prefs_preset) {
+        case 'standard':
       case 'maximum':
       case 'green':
       case 'minimum':
           $prefs = boincwork_get_preset_prefs($prefs_preset);
-          break;
-      case 'custom':
+            break;
+        case 'custom':
       default:
           // Just keeps prefs as they are
           unset($prefs['preset']);
-          break;
-      }// switch
-  } else {
-      $form_state['storage']['wip'] = TRUE;
-      if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
-          if ($established) {
-              $prefs_preset = 'custom';
-          } else {
-              $prefs_preset = 'standard';
-              $prefs = boincwork_get_preset_prefs($prefs_preset);
-          }// if $established
-      }// if $prefs_preset
-  }// if WIP
-  
-  // This set of preferences is used in the form if no preferences
-  // have been set above, in variable $prefs.
-  require_boinc(array('db', 'prefs'));
-  $disk_space_config = get_disk_space_config();
-  $default = array(
+            break;
+        }// switch
+    } else {
+        $form_state['storage']['wip'] = TRUE;
+        if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
+            if ($established) {
+                $prefs_preset = 'custom';
+            } else {
+                $prefs_preset = 'standard';
+                $prefs = boincwork_get_preset_prefs($prefs_preset);
+            }// if $established
+        }// if $prefs_preset
+    }// if WIP
+  
+    // This set of preferences is used in the form if no preferences
+    // have been set above, in variable $prefs.
+    require_boinc(array('db', 'prefs'));
+    $disk_space_config = get_disk_space_config();
+    $default = array(
     'preset' => $prefs_preset,
     // Processing...
     'run_on_batteries' => 0,
@@ -120,385 +120,385 @@ 
     'daily_xfer_limit_mb' => 0,
     'daily_xfer_period_days' => 0,
     'dont_verify_images' => 0
-  );
-  foreach ($default as $name => $value) {
+    );
+    foreach ($default as $name => $value) {
     if (isset($prefs[$name])) {
-      if (is_array($prefs[$name])) {
+        if (is_array($prefs[$name])) {
         if (isset($prefs[$name]['@value'])) {
-          $default[$name] = $prefs[$name]['@value'];
+            $default[$name] = $prefs[$name]['@value'];
+        }
         }
-      }
-      else {
+        else {
         $default[$name] = $prefs[$name];
-      }
+        }
+    }
     }
-  }
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
-  $form['hour_options'] = array(
+    );
+    $form['hour_options'] = array(
     '#type' => 'value',
     '#value' => array('0:00','1:00','2:00','3:00','4:00', 
-     '5:00','6:00','7:00','8:00','9:00','10:00','11:00', 
-     '12:00','13:00','14:00','15:00','16:00','17:00',
-     '18:00','19:00','20:00','21:00','22:00','23:00')
-  );
-  
-  // Identify preference sets that are established to distinguish what has been
-  // saved to the database from what is just showing default values
-  $form['#established'] = $established;
+        '5:00','6:00','7:00','8:00','9:00','10:00','11:00', 
+        '12:00','13:00','14:00','15:00','16:00','17:00',
+        '18:00','19:00','20:00','21:00','22:00','23:00')
+    );
+  
+    // Identify preference sets that are established to distinguish what has been
+    // saved to the database from what is just showing default values
+    $form['#established'] = $established;
    
-  // Set up the preference container for AHAH
-  $form['prefs'] = array(
+    // Set up the preference container for AHAH
+    $form['prefs'] = array(
     '#title' => '',
     '#type' => 'fieldset',
     '#prefix' => '<div id="prefs-wrapper">', // This is our wrapper div.
     '#attributes' => array('class' => 'ahah-container'),
     '#suffix' => '</div>',
     '#tree'   => TRUE
-  );
-  //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
+    );
+    //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
   
-  // Hidden elements
-  $form['prefs']['modified'] = array(
+    // Hidden elements
+    $form['prefs']['modified'] = array(
     '#type' => 'hidden',
     '#value' => $mod_time
-  );
-  $form['prefs']['venue'] = array(
+    );
+    $form['prefs']['venue'] = array(
     '#type' => 'hidden',
     '#value' => $venue
-  );
+    );
   
-  $form['prefs']['separator_top'] = array(
+    $form['prefs']['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
   
-  // Simplified selectors
-  $form['prefs']['preset'] = array(
-      '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
+    // Simplified selectors
+    $form['prefs']['preset'] = array(
+        '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
     '#type' => 'radios',
     '#description' => ' ',
     '#options' => array(
-      'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
-      'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
-      'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
-      'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
-      'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
+        'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
+        'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
+        'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
+        'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
+        'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
     ),
     '#prefix' => '<div class="simple-form-controls">',
     '#suffix' => '</div>',
     '#default_value' => $default['preset'],
     '#ahah' => array(
-      'event' => 'change',
-      'path' => ahah_helper_path(array('prefs')),
-      'wrapper' => 'prefs-wrapper'
+        'event' => 'change',
+        'path' => ahah_helper_path(array('prefs')),
+        'wrapper' => 'prefs-wrapper'
     )
-  );
-  $form['prefs']['select preset'] = array(
+    );
+    $form['prefs']['select preset'] = array(
     '#type'  => 'submit',
     '#value' => bts('Update preset', array(), NULL, 'boinc:account-preferences-preset'),
     '#submit' => array('ahah_helper_generic_submit'),
     // The 'no-js' class only displays this button if javascript is disabled
     '#attributes' => array('class' => 'no-js'),
-  );
+    );
   
-  // Advanced preferences
-  $form['prefs']['advanced'] = array(
+    // Advanced preferences
+    $form['prefs']['advanced'] = array(
     '#title' => bts('Advanced settings', array(), NULL, 'boinc:account-preferences-option'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => !$advanced,
     '#attributes' => array('class' => 'advanced-settings'),
-  );
+    );
   
-  // Processing preferences
+    // Processing preferences
   
-  $form['prefs']['advanced']['anchor'] = array(
+    $form['prefs']['advanced']['anchor'] = array(
     '#value' => '<a name="advanced"></a>'
-  );
+    );
   
-  $form['prefs']['advanced']['separator_top'] = array(
+    $form['prefs']['advanced']['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
   
-  $form['prefs']['advanced']['processor'] = array(
+    $form['prefs']['advanced']['processor'] = array(
     '#title' => bts('Processor usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
     '#title' => bts('Suspend when computer is on battery?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts('Suspends computing on portables when running on battery power.', array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_on_batteries']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
     '#title' => bts('Suspend when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts("Suspends computing and file transfers when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_if_user_active']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
     '#title' => bts('Suspend GPU computing when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts("Suspends GPU computing when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_gpu_if_user_active']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
-      '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
+    );
+    $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
+        '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['idle_time_to_run'],
     '#size' => 1,
     '#description' => bts('This determines when the computer is considered "in use".', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
+    );
+    $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
     '#title' => bts('Suspend when no mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['suspend_if_no_recent_input'],
     '#size' => 1,
     '#description' => bts('This allows some computers to enter low-power mode when not in use.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
+    );
+    $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
     '#title' => bts('Suspend when non-BOINC CPU usage is above', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => '%',
     '#default_value' => $default['suspend_cpu_usage'],
     '#size' => 1,
     '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['processor']['hour_label'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_label'] = array(
     '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
-  );
-  $form['prefs']['advanced']['processor']['start_hour'] = array(
+    );
+    $form['prefs']['advanced']['processor']['start_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['start_hour']
-  );
-  $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
     '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
-  );
-  $form['prefs']['advanced']['processor']['end_hour'] = array(
+    );
+    $form['prefs']['advanced']['processor']['end_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['end_hour']
-  );
-  $form['prefs']['advanced']['processor']['hour_description'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_description'] = array(
     '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
-  );
-  $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
+    );
+    $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
     '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['leave_apps_in_memory'],
     '#description' => bts('If "Yes", suspended tasks stay in memory, and resume with no work lost. If "No", suspended tasks are removed from memory, and resume from their last checkpoint.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
+    );
+    $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
     '#title' => bts('Switch between tasks every', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['cpu_scheduling_period_minutes'],
     '#size' => 1,
     '#description' => bts('If you run several projects, BOINC may switch between them this often.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
+    );
+    $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
     '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of the processors', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['max_ncpus_pct'],
     '#size' => 1,
     '#description' => bts('Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
+    );
+    $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
     '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of the CPU time', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['cpu_usage_limit'],
     '#size' => 1,
     '#description' => bts('Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat.', array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
   
-  // Disk and memory preferences
-  $form['prefs']['advanced']['storage'] = array(
+    // Disk and memory preferences
+    $form['prefs']['advanced']['storage'] = array(
     '#title' => bts('Disk and memory usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
     '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB',
     '#default_value' => $default['disk_max_used_gb'],
     '#size' => 1,
     '#description' => bts('Limit the total amount of disk space used by BOINC.', array(), NULL, 'boinc:account-preferences-computing'),
-  ); 
-  $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
+    ); 
+    $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
     '#title' => bts('Disk: leave at least', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB free',
     '#default_value' => $default['disk_min_free_gb'],
     '#size' => 1,
     '#description' => bts('Limit disk usage to leave this much free space on the volume where BOINC stores data.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
     '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['disk_max_used_pct'],
     '#size' => 1,
     '#description' => bts('Limit the percentage of disk space used by BOINC on the volume where it stores data.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['storage']['disk_interval'] = array(
+    ); 
+    $form['prefs']['advanced']['storage']['disk_interval'] = array(
     '#title' => bts('Request tasks to checkpoint at most every', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['disk_interval'],
     '#size' => 1,
     '#description' => bts('This controls how often tasks save their state to disk, so that later they can be continued from that point.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
     '#title' => bts('Page/swap file: use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['vm_max_used_pct'],
     '#size' => 1,
     '#description' => bts('Limit the swap space (page file) used by BOINC.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
     '#title' => bts('Memory: when computer is in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_busy_pct'],
     '#size' => 1,
     '#description' => bts("Limit the memory used by BOINC when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
     '#title' => bts('Memory: when computer is not in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_idle_pct'],
     '#size' => 1,
     '#description' => bts("Limit the memory used by BOINC when you're not using the computer.", array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
   
-  // Network preferences
-  $form['prefs']['advanced']['network'] = array(
+    // Network preferences
+    $form['prefs']['advanced']['network'] = array(
     '#title' => bts('Network usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
+    );
+    $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
     '#title' => bts('Store at least', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('days of work', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['work_buf_min_days'],
     '#size' => 1,
     '#description' => bts('Store at least enough tasks to keep the computer busy for this long.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
     '#title' => bts('Store up to an additional', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['work_buf_additional_days'],
     '#size' => 1,
     '#description' => bts('Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
     '#title' => bts('Confirm before connecting to Internet?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['confirm_before_connecting'],
     '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
     '#title' => bts('Disconnect when done?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['hangup_if_dialed'],
     '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
+    );
+    $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
     '#title' => bts('Limit download rate to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_down']/1000,
     '#size' => 1,
     '#description' => bts('Limit the download rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
     '#title' => bts('Limit upload rate to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_up']/1000,
     '#size' => 1,
     '#description' => bts('Limit the upload rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['hour_label'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_label'] = array(
     '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
-  );
-  $form['prefs']['advanced']['network']['net_start_hour'] = array(
+    );
+    $form['prefs']['advanced']['network']['net_start_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['net_start_hour']
-  );
-  $form['prefs']['advanced']['network']['hour_delimiter'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_delimiter'] = array(
     '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
-  );
-  $form['prefs']['advanced']['network']['net_end_hour'] = array(
+    );
+    $form['prefs']['advanced']['network']['net_end_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['net_end_hour']
-  );
-  $form['prefs']['advanced']['network']['hour_description'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_description'] = array(
     '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
-  ); 
-  $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
     '#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Mbytes',
     '#default_value' => $default['daily_xfer_limit_mb'],
     '#size' => 1
-  ); 
-  $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
     '#field_prefix' => 'every',
     '#type' => 'textfield',
     '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['daily_xfer_period_days'],
     '#size' => 1,
     '#description' => bts('Example: BOINC should transfer at most 2000 MB of data every 30 days.', array(), NULL, 'boinc:account-preferences-computing'),
-  ); 
-  $form['prefs']['advanced']['network']['dont_verify_images'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['dont_verify_images'] = array(
     '#title' => bts('Skip data verification for image files?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['dont_verify_images'],
     '#description' => bts('Only select "Yes" if your Internet provider modifies image files. Skipping verification reduces the security of BOINC.', array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
   
-  // The "fancy radios" are made via javascript on document load. In order for
-  // these to work with AHAH, we need this crazy setTimeout() call.
-  $form['prefs']['fancy-radios'] = array(
+    // The "fancy radios" are made via javascript on document load. In order for
+    // these to work with AHAH, we need this crazy setTimeout() call.
+    $form['prefs']['fancy-radios'] = array(
     '#value' => '
       <script>
         setTimeout(
@@ -509,177 +509,177 @@ 
           300
         )
       </script>'
-  );
-  $form['prefs']['view advanced'] = array(
+    );
+    $form['prefs']['view advanced'] = array(
     '#type' => 'hidden',
     '#value' => 1
-  );
+    );
   
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
-  );
-  if ($venue AND $venue != 'generic') {
+    );
+    if ($venue AND $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' . 
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
+        l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
-          'attributes' => array(
+            'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
-          )
+                array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            )
         )
-      ) . '</li>';
-  }
-  $form['prefs']['view control'] = array(
+        ) . '</li>';
+    }
+    $form['prefs']['view control'] = array(
     '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
-  $form['#submit'][] = 'boincwork_generalprefs_form_submit';
+    );
+    $form['#submit'][] = 'boincwork_generalprefs_form_submit';
   
-  return $form;
+    return $form;
 }
 
 /**
-  * Validate the general preferences form.
-  */
+ * Validate the general preferences form.
+ */
 function boincwork_generalprefs_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values']['prefs']['advanced'];
-  
-  //drupal_set_message('<pre>' . print_r($form_state['values'], true) . '</pre>');
-  // Verify all non-boolean user input values and notify form API of failures
-  
-  // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    require_boinc('util');
+    $values = $form_state['values']['prefs']['advanced'];
+  
+    //drupal_set_message('<pre>' . print_r($form_state['values'], true) . '</pre>');
+    // Verify all non-boolean user input values and notify form API of failures
+  
+    // Processing preferences
+    if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
 }
 
 /**
-  * Handle post-validation submission of general preferences form.
-  */
+ * Handle post-validation submission of general preferences form.
+ */
 function boincwork_generalprefs_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  
-  $values = $form_state['values']['prefs']['advanced'];
-  $venue = $form_state['values']['prefs']['venue'];
-  $preset = $form_state['values']['prefs']['preset'];
-  
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('general', $venue);
-  
-  // Processing preferences
-  $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
-  $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
-  $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
-  $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
-  $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
-  $prefs['start_hour'] = $values['processor']['start_hour'];
-  $prefs['end_hour'] = $values['processor']['end_hour'];
-  $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
-  $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
-  $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
-  $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
-  
-  // Storage preferences
-  $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
-  $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
-  $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
-  $prefs['disk_interval'] = $values['storage']['disk_interval'];
-  $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
-  $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
-  $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
-  
-  // Network preferences
-  $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
-  $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
-  $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
-  $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
-  $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
-  $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
-  $prefs['net_start_hour'] = $values['network']['net_start_hour'];
-  $prefs['net_end_hour'] = $values['network']['net_end_hour'];
-  $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
-  $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
-  $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
-
-  // transform old way to store the preset into new way
-  // ideally this should already have happened in boincwork_generalprefs_form()
-  if (isset($prefs['@attributes']['preset'])) {
+    global $user;
+    $account = user_load($user->uid);
+  
+    $values = $form_state['values']['prefs']['advanced'];
+    $venue = $form_state['values']['prefs']['venue'];
+    $preset = $form_state['values']['prefs']['preset'];
+  
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('general', $venue);
+  
+    // Processing preferences
+    $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
+    $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
+    $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
+    $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
+    $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
+    $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
+    $prefs['start_hour'] = $values['processor']['start_hour'];
+    $prefs['end_hour'] = $values['processor']['end_hour'];
+    $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
+    $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
+    $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
+    $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
+  
+    // Storage preferences
+    $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
+    $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
+    $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
+    $prefs['disk_interval'] = $values['storage']['disk_interval'];
+    $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
+    $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
+    $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
+  
+    // Network preferences
+    $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
+    $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
+    $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
+    $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
+    $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
+    $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
+    $prefs['net_start_hour'] = $values['network']['net_start_hour'];
+    $prefs['net_end_hour'] = $values['network']['net_end_hour'];
+    $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
+    $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
+    $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
+
+    // transform old way to store the preset into new way
+    // ideally this should already have happened in boincwork_generalprefs_form()
+    if (isset($prefs['@attributes']['preset'])) {
     $prefs['preset'] = $prefs['@attributes']['preset'];
     unset($prefs['@attributes']['preset']);
-  }
-  // Save the preset selection (or lack thereof)
-  if (!$preset OR $preset == 'custom') {
+    }
+    // Save the preset selection (or lack thereof)
+    if (!$preset OR $preset == 'custom') {
     $prefs['preset'] = 'custom';
-  }
-  else {
+    }
+    else {
     $prefs['preset'] = $preset;
-  }
+    }
   
-  // If this is a new preference set, be sure to unset the "cleared" attribute
-  if (isset($prefs['@attributes']['cleared'])) {
+    // If this is a new preference set, be sure to unset the "cleared" attribute
+    if (isset($prefs['@attributes']['cleared'])) {
     unset($prefs['@attributes']['cleared']);
-  }
+    }
   
-  // Update database
-  $result = boincwork_save_prefs($prefs, 'general', $venue);
+    // Update database
+    $result = boincwork_save_prefs($prefs, 'general', $venue);
   
-  if (!$result) {
+    if (!$result) {
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+    }
+    elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that) {
     drupal_set_message(t('Your preferences have been updated.
       Client-related preferences will take effect when your computer 
       communicates with @project or you issue the "Update"
       command from the BOINC client.', array('@project' => PROJECT)));
-  }
+    }
 }
 
 
@@ -691,116 +691,116 @@ 
  * Find compatible hosts for merging
  */
 function boincwork_host_get_compatible_hosts($host_id) {
-  require_boinc('host');
-  global $user;
-  $account = user_load($user->uid);
-  $compatible_hosts = array();
-  $host_count = 0;
-  db_set_active('boinc_ro');
-  $current_host = db_fetch_object(db_query("
+    require_boinc('host');
+    global $user;
+    $account = user_load($user->uid);
+    $compatible_hosts = array();
+    $host_count = 0;
+    db_set_active('boinc_ro');
+    $current_host = db_fetch_object(db_query("
     SELECT id, domain_name, create_time, total_credit, rpc_time, os_name,
       p_vendor, p_model
     FROM {host}
     WHERE userid = '%d' AND id = '%d'",
     $account->boincuser_id, $host_id
-  ));
-  db_set_active('default');
-  $current_host->task_count = boincwork_host_get_task_count($current_host->id);
-  $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
-  // Get the list of all other hosts owned by this user for comparison
-  db_set_active('boinc_ro');
-  $all_other_hosts = db_query("
+    ));
+    db_set_active('default');
+    $current_host->task_count = boincwork_host_get_task_count($current_host->id);
+    $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
+    // Get the list of all other hosts owned by this user for comparison
+    db_set_active('boinc_ro');
+    $all_other_hosts = db_query("
     SELECT id, domain_name, create_time, total_credit, rpc_time, os_name,
       p_vendor, p_model
     FROM {host}
     WHERE userid = '%d' AND id <> '%d'",
     $account->boincuser_id, $host_id
-  );
-  db_set_active('default');
-  // Compare all hosts to see if any are plausible duplicates
-  while ($other_host = db_fetch_object($all_other_hosts)) {
+    );
+    db_set_active('default');
+    // Compare all hosts to see if any are plausible duplicates
+    while ($other_host = db_fetch_object($all_other_hosts)) {
     // First, disqualify if hosts were active at the same time
     if (!$current_host->is_new) {
-      $other_host->task_count = boincwork_host_get_task_count($other_host->id);
-      $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
-      if (!$other_host->is_new) {
+        $other_host->task_count = boincwork_host_get_task_count($other_host->id);
+        $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
+        if (!$other_host->is_new) {
         // If both hosts being compared are not new, see if times overlap
         if (!times_disjoint($current_host, $other_host)) {
-          // Hosts were active at the same time; can't be a duplicate
-          continue;
+            // Hosts were active at the same time; can't be a duplicate
+            continue;
+        }
         }
-      }
     }
     // Next, disqualify if hosts have different OS platforms
     if (!os_compatible($current_host, $other_host)) {
-      // Hosts have different OS platforms; not really a duplicate
-      continue;
+        // Hosts have different OS platforms; not really a duplicate
+        continue;
     }
     // Finally, disqualify if hosts have different CPUs
     if (!cpus_compatible($current_host, $other_host)) {
-      // CPUs don't match; not a duplicate
-      continue;
+        // CPUs don't match; not a duplicate
+        continue;
     }
     // If not disqualified, this host is available for merging
     $hosts[] = $other_host;
     $host_count++;
     if ($host_count == 500) {
-      // This is enough!
-      break;
+        // This is enough!
+        break;
+    }
     }
-  }
-  return $hosts;
+    return $hosts;
 }
 
 /**
  * Perform the database updates to merge the old host into the new host
  */
 function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
-  // Decay the average credit of the two hosts
-  require_boinc('credit');
-  $now = time();
-  update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
-  update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
+    // Decay the average credit of the two hosts
+    require_boinc('credit');
+    $now = time();
+    update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
+    update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
   
-  // Update the database:
-  // - add credit from old host to new host
-  // - change results to refer to the new host
-  // - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
+    // Update the database:
+    // - add credit from old host to new host
+    // - change results to refer to the new host
+    // - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
   
-  $total_credit = $old_host->total_credit + $new_host->total_credit;
-  $recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
+    $total_credit = $old_host->total_credit + $new_host->total_credit;
+    $recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
 
-  if ($new_host->rpc_seqno == $old_host->id) {
+    if ($new_host->rpc_seqno == $old_host->id) {
     rules_invoke_event('boincwork_circular_merge_error', $old_host->id, $new_host->id, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('boincwork',
-      'Circular merge attempted, target host rpc_seqno is equal to old host\'s id: old host id=%old_host, target host id=%new_host',
-      array(
+        'Circular merge attempted, target host rpc_seqno is equal to old host\'s id: old host id=%old_host, target host id=%new_host',
+        array(
         '%old_host' => $old_host->id,
         '%new_host' => $new_host->id,
-      ),
-      WATCHDOG_WARNING
+        ),
+        WATCHDOG_WARNING
     );
     $message = 'Could not merge due to a circular merge error. The site administrators have been contacted about this issue, and will investigate further.';
     return FALSE;
-  }
+    }
 
-  if ($new_host->userid==0) {
+    if ($new_host->userid==0) {
     rules_invoke_event('boincwork_zombie_merge_error', $old_host->id, $new_host->id, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('boincwork',
-      'Zombie merge attempted, target host has userid=0: old host id=%old_host, target host id=%new_host',
-      array(
+        'Zombie merge attempted, target host has userid=0: old host id=%old_host, target host id=%new_host',
+        array(
         '%old_host' => $old_host->id,
         '%new_host' => $new_host->id,
-      ),
-      WATCHDOG_WARNING
+        ),
+        WATCHDOG_WARNING
     );
     $message = 'Could not merge because the target host has userid=0. The site administrators have been contacted about this issue, and will investigate further.';
     return FALSE;
-  }
+    }
   
-  // Move credit from the old host to the new host
-  db_set_active('boinc_rw');
-  $credit_updated = db_query("
+    // Move credit from the old host to the new host
+    db_set_active('boinc_rw');
+    $credit_updated = db_query("
     UPDATE {host}
     SET
       total_credit = '%d',
@@ -808,34 +808,34 @@ 
       expavg_time = '%d'
     WHERE id = '%d'",
     $total_credit, $recent_credit, $now, $new_host->id
-  );
-  db_set_active('default');
-  if (!$credit_updated) {
+    );
+    db_set_active('default');
+    if (!$credit_updated) {
     if ($message !== NULL) {
-      $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
   
-  // Move results from the old host to the new host
-  db_set_active('boinc_rw');
-  $results_updated = db_query("
+    // Move results from the old host to the new host
+    db_set_active('boinc_rw');
+    $results_updated = db_query("
     UPDATE {result}
     SET hostid = '%d'
     WHERE hostid = '%d'",
     $new_host->id, $old_host->id
-  );
-  db_set_active('default');
-  if (!$results_updated) {
+    );
+    db_set_active('default');
+    if (!$results_updated) {
     if ($message !== NULL) {
-      $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
   
-  // Retire the old host
-  db_set_active('boinc_rw');
-  $old_host_retired = db_query("
+    // Retire the old host
+    db_set_active('boinc_rw');
+    $old_host_retired = db_query("
     UPDATE {host}
     SET
       total_credit = '0',
@@ -844,16 +844,16 @@ 
       rpc_seqno = '%d'
     WHERE id = '%d'",
     $new_host->id, $old_host->id
-  );
-  db_set_active('default');
-  if (!$old_host_retired) {
+    );
+    db_set_active('default');
+    if (!$old_host_retired) {
     if ($message !== NULL) {
-      $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
   
-  return TRUE;
+    return TRUE;
 }
 
 /**
@@ -861,75 +861,75 @@ 
  */
 function boincwork_host_merge_form(&$form_state, $host_id) {
 
-  if (!boincwork_host_user_is_owner($host_id)) {
+    if (!boincwork_host_user_is_owner($host_id)) {
     drupal_goto("host/{$host_id}");
-  }
+    }
   
-  $form = array();
-  $form_state['storage']['current_host_id'] = $host_id;
-  $current_host = boincwork_host_get_info($host_id);
+    $form = array();
+    $form_state['storage']['current_host_id'] = $host_id;
+    $current_host = boincwork_host_get_info($host_id);
   
-  // Get hosts that could be merged with this one
-  $hosts = boincwork_host_get_compatible_hosts($host_id);
+    // Get hosts that could be merged with this one
+    $hosts = boincwork_host_get_compatible_hosts($host_id);
   
-  if (!$hosts) {
+    if (!$hosts) {
     drupal_set_message(t('There are no computers eligible for merging with this
       one'), 'warning'
     );
     drupal_goto("host/{$host_id}");
-  }
+    }
   
-  $form['overview'] = array(
+    $form['overview'] = array(
     '#value' => '<p>' . bts('Sometimes BOINC assigns separate identities to'
-      . ' the same computer by mistake. You can correct this by merging old'
-      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
-      . '<p>'
-      . bts('Check the computers that are the same as @name'
-      . ' (created on @date at @time with computer ID @id)',
+        . ' the same computer by mistake. You can correct this by merging old'
+        . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
+        . '<p>'
+        . bts('Check the computers that are the same as @name'
+        . ' (created on @date at @time with computer ID @id)',
         array(
-          '@name' => $current_host->domain_name,
-          '@date' => date('j M Y', $current_host->create_time),
-          '@time' => date('G:i:s T', $current_host->create_time),
-          '@id' => $current_host->id,
+            '@name' => $current_host->domain_name,
+            '@date' => date('j M Y', $current_host->create_time),
+            '@time' => date('G:i:s T', $current_host->create_time),
+            '@id' => $current_host->id,
         ),
         NULL, 'boinc:account-host-merge') . '</p>',
-  );
+    );
   
-  $options = array();
-  foreach ($hosts as $host) {
+    $options = array();
+    foreach ($hosts as $host) {
     $options[$host->id] = array(
-      $host->domain_name,
-      date('j M Y G:i:s T', $host->create_time),
-      $host->id,
+        $host->domain_name,
+        date('j M Y G:i:s T', $host->create_time),
+        $host->id,
     );
-  }
+    }
   
-  $form['merge'] = array(
+    $form['merge'] = array(
     '#title' => '',
     '#type' => 'tableselect',
     '#header' => array(bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'), bts('Created', array(), NULL, 'boinc:host-details'), bts('Computer ID', array(), NULL, 'boinc:host-list')),
     '#options' => $options,
-  );
+    );
   
-  $form['prefs']['separator_bottom'] = array(
-  //  '#value' => '<div class="separator buttons"></div>'
-  );
+    $form['prefs']['separator_bottom'] = array(
+    //  '#value' => '<div class="separator buttons"></div>'
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Merge', array(), NULL, 'boinc:form-merge'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -942,76 +942,76 @@ 
  * Handle submission of the merge host form
  */
 function boincwork_host_merge_form_submit($form, &$form_state) {
-  $merged = array();
-  $errors = array();
-  $current_host_id = $form_state['storage']['current_host_id'];
-  $current_host = boincwork_host_get_info($current_host_id);
-  $selected_hosts = array_filter($form_state['values']['merge']);
+    $merged = array();
+    $errors = array();
+    $current_host_id = $form_state['storage']['current_host_id'];
+    $current_host = boincwork_host_get_info($current_host_id);
+    $selected_hosts = array_filter($form_state['values']['merge']);
   
-  foreach ($selected_hosts as $host_id) {
+    foreach ($selected_hosts as $host_id) {
     // Attempt to merge each host, noting the results
     $message = '';
     $old_host = boincwork_host_get_info($host_id);
     if (boincwork_host_merge($old_host, $current_host, $message)) {
-      $merged[$old_host->id] = $old_host->id;
-      $current_host = boincwork_host_get_info($current_host_id);
+        $merged[$old_host->id] = $old_host->id;
+        $current_host = boincwork_host_get_info($current_host_id);
     }
     else {
-      $errors[$old_host->id] = $message;
+        $errors[$old_host->id] = $message;
+    }
     }
-  }
   
-  if ($merged) {
+    if ($merged) {
     // Generate a natural language list of IDs that were merged
     $oxford_comma = ',';
     $conjunction = bts('and', array(), NULL, 'boinc:account-preference');
     $list = array_keys($merged);
     $last = array_pop($list);
     if ($list) {
-      if (count($merged) == 2) {
+        if (count($merged) == 2) {
         $oxford_comma = '';
-      }
-      $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
+        }
+        $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
     }
     else {
-      $list = $last;
+        $list = $last;
     }
     if (count($merged) == 1) {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'Computer @old_id has been merged successfully into @id.',
         array(
-          '@old_id' => $list,
-          '@id' => $current_host_id
+            '@old_id' => $list,
+            '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
     }
     else {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'Computers @old_ids have been merged successfully into @id.',
         array(
-          '@old_ids' => $list,
-          '@id' => $current_host_id
+            '@old_ids' => $list,
+            '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
     }
-  }
+    }
   
-  if ($errors) {
+    if ($errors) {
     // Report any hosts that failed to merge
     foreach ($errors as $id => $error) {
-      drupal_set_message(
+        drupal_set_message(
         bts('Computer @old_id failed to merge: @message',
-          array(
+            array(
             '@old_id' => $id,
             '@message' => $error,
-          ),
-          NULL, 'boinc:account-host-merge'),
+            ),
+            NULL, 'boinc:account-host-merge'),
         'warning'
-      );
+        );
+    }
     }
-  }
   
-  drupal_goto("host/{$current_host_id}");
+    drupal_goto("host/{$current_host_id}");
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1023,44 +1023,44 @@ 
  */
 function boincwork_projectprefs_form(&$form_state, $venue) {
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $established = TRUE;
+    $established = TRUE;
   
-  // Get availability of special BOINC preferences
-  require_boinc(array('util'));
-  $app_types = get_app_types();
+    // Get availability of special BOINC preferences
+    require_boinc(array('util'));
+    $app_types = get_app_types();
   
-  // Load any existing preferences from BOINC account
-  $prefs = boincwork_load_prefs('project', $venue);
+    // Load any existing preferences from BOINC account
+    $prefs = boincwork_load_prefs('project', $venue);
   
-  // Take note if this is not an established preference set on the account
-  if (isset($prefs['@attributes']['cleared'])) {
+    // Take note if this is not an established preference set on the account
+    if (isset($prefs['@attributes']['cleared'])) {
     $established = FALSE;
-  }
+    }
 
-  // Extract modified tag if present
-  $modified = NULL;
-  if (isset($prefs['modified']['@value'])) {
+    // Extract modified tag if present
+    $modified = NULL;
+    if (isset($prefs['modified']['@value'])) {
     $modified = $prefs['modified']['@value'];
-  }
+    }
 
-  $venue_is_default = FALSE;
-  if ($account->boincuser_default_pref_set) {
+    $venue_is_default = FALSE;
+    if ($account->boincuser_default_pref_set) {
     if ($account->boincuser_default_pref_set == $venue) {
-      $venue_is_default = TRUE;
+        $venue_is_default = TRUE;
+    }
     }
-  }
-  elseif (!$venue OR $venue == 'generic') {
+    elseif (!$venue OR $venue == 'generic') {
     $venue_is_default = TRUE;
-  }
-  else {
+    }
+    else {
     $venue_is_default = FALSE;
-  }
+    }
   
-  // Define form defaults
-  $default = array(
+    // Define form defaults
+    $default = array(
     'resource_share' => 100,
     'no_cpu' => 0,
     'no_cuda' => 0,
@@ -1068,333 +1068,333 @@ 
     'no_intel_gpu' => 0,
     'default_venue' => $venue_is_default,
     'allow_beta_work' => $prefs['allow_beta_work'],
-  );
-  foreach ($default as $name => $value) {
+    );
+    foreach ($default as $name => $value) {
     if (isset($prefs[$name])) {
-      if (is_array($prefs[$name])) {
+        if (is_array($prefs[$name])) {
         if (isset($prefs[$name]['@value'])) {
-          $default[$name] = $prefs[$name]['@value'];
+            $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+        }
+        else {
         $default[$name] = $prefs[$name];
-      }
+        }
+    }
     }
-  }
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
+    );
   
-  // Identify preference sets that are established to distinguish what has been
-  // saved to the database from what is just showing default values
-  $form['#established'] = $established;
+    // Identify preference sets that are established to distinguish what has been
+    // saved to the database from what is just showing default values
+    $form['#established'] = $established;
   
-  // Top level form options
-  $form['#tree'] = TRUE;
+    // Top level form options
+    $form['#tree'] = TRUE;
   
-  // Hidden elements
-  $form['modified'] = array(
+    // Hidden elements
+    $form['modified'] = array(
     '#type' => 'hidden',
     '#value' => $modified,
-  );
-  $form['venue'] = array(
+    );
+    $form['venue'] = array(
     '#type' => 'hidden',
     '#value' => $venue,
-  );
+    );
   
-  $form['separator_top'] = array(
+    $form['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
   
-  // Common project preferences  
-  $form['resource'] = array(
+    // Common project preferences  
+    $form['resource'] = array(
     '#title' => bts('Resource settings', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['resource']['resource_share'] = array(
+    );
+    $form['resource']['resource_share'] = array(
     '#title' => bts('Resource share', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'textfield',
     '#default_value' => $default['resource_share'],
     '#size' => 5,
     '#description' => bts("Determines the proportion of your computer's resources allocated to this project. Example: if you participate in two BOINC projects with resource shares of 100 and 200, the first will get 1/3 of your resources and the second will get 2/3.", array(), NULL, 'boinc:account-preferences-project')
-  );
-  if ($app_types->count > 1) {
+    );
+    if ($app_types->count > 1) {
     if ($app_types->cpu) {
-      $form['resource']['no_cpu'] = array(
+        $form['resource']['no_cpu'] = array(
         '#title' => bts('Use CPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cpu'] ? 0 : 1,
         '#description' => bts('Request CPU-only tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->cuda) {
-      $form['resource']['no_cuda'] = array(
+        $form['resource']['no_cuda'] = array(
         '#title' => bts('Use NVIDIA GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cuda'] ? 0 : 1,
         '#description' => bts('Request NVIDIA GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->ati) {
-      $form['resource']['no_ati'] = array(
+        $form['resource']['no_ati'] = array(
         '#title' => bts('Use AMD GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_ati'] ? 0 : 1,
         '#description' => bts('Request AMD GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->intel_gpu) {
-      $form['resource']['no_intel_gpu'] = array(
+        $form['resource']['no_intel_gpu'] = array(
         '#title' => bts('Use INTEL GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_intel_gpu'] ? 0 : 1,
         '#description' => bts('Request Intel GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
+    }
     }
-  }
   
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+    if (variable_get('boinc_prefs_options_beta', FALSE)) {
     $form['beta'] = array(
-      '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
-      '#type' => 'fieldset',
-      '#description' => null,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
+        '#type' => 'fieldset',
+        '#description' => null,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
     $form['beta']['allow_beta_work'] = array(
-      '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
-      '#type' => 'radios',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
-      '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
+        '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
+        '#type' => 'radios',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
+        '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
     );
-  }
+    }
   
-  // Add project specific prefs to the form
-  boincwork_add_project_specific_prefs($form, $prefs);
+    // Add project specific prefs to the form
+    boincwork_add_project_specific_prefs($form, $prefs);
   
-  // Set whether to use this preference set by default for new computers
-  $form['default_set'] = array(
+    // Set whether to use this preference set by default for new computers
+    $form['default_set'] = array(
     '#title' => bts('Default set', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['default_set']['default_venue'] = array(
+    );
+    $form['default_set']['default_venue'] = array(
     '#title' => bts('Set used for new computers', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['default_venue'] ? 1 : 0,
     '#description' => ''
-  );
+    );
   
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
-  if ($venue AND $venue != 'generic') {
+    );
+    if ($venue AND $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' . 
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
+        l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
-          'attributes' => array(
+            'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
-          )
+                array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            )
         )
-      ) . '</li>';
-  }
-  $form['prefs']['view control'] = array(
-      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+        ) . '</li>';
+    }
+    $form['prefs']['view control'] = array(
+        '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
  * Add project specific preferences to the project preferences form
  */
 function boincwork_add_project_specific_prefs(&$form, $prefs) {
-  // Load project specific preferences from XML config
-  $xml = boincwork_get_project_specific_config();
+    // Load project specific preferences from XML config
+    $xml = boincwork_get_project_specific_config();
   
-  // Respect the order of the top level elements
-  $ordered_array = array();
-  $unordered_array = array();
-  foreach ($xml['project_specific_preferences'] as $type => $element) {
+    // Respect the order of the top level elements
+    $ordered_array = array();
+    $unordered_array = array();
+    foreach ($xml['project_specific_preferences'] as $type => $element) {
     if (is_array($element) AND is_numeric(key($element))) {
-      foreach ($element as $ordered_element) {
+        foreach ($element as $ordered_element) {
         if (isset($ordered_element['@position'])) {
-          $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
+            $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
         }
         else {
-          $unordered_array[] = array($type => $ordered_element);
+            $unordered_array[] = array($type => $ordered_element);
+        }
         }
-      }
     }
     elseif (isset($element['@position'])) {
-      $ordered_array[$element['@position']] = array($type => $element);
+        $ordered_array[$element['@position']] = array($type => $element);
     }
     else {
-      $unordered_array[] = array($type => $element);
+        $unordered_array[] = array($type => $element);
     }
-  }
-  ksort($ordered_array);
-  $primed_array = array_merge($ordered_array, $unordered_array);
-  $xml = array('project_specific_preferences' => $primed_array);
+    }
+    ksort($ordered_array);
+    $primed_array = array_merge($ordered_array, $unordered_array);
+    $xml = array('project_specific_preferences' => $primed_array);
     
-  foreach ($xml['project_specific_preferences'] as $wrapped_element) {
+    foreach ($xml['project_specific_preferences'] as $wrapped_element) {
     $type = key($wrapped_element);
     $element= reset($wrapped_element);
     boincwork_generate_prefs_element($form, $type, $element, $prefs['project_specific']);
-  }
+    }
 }
 
 /**
-  * Validate the project preferences form.
-  */
+ * Validate the project preferences form.
+ */
 function boincwork_projectprefs_form_validate($form, &$form_state) {
   
-  // Verify all text user input values and notify form API of failures
-  $validation_rules = array(
+    // Verify all text user input values and notify form API of failures
+    $validation_rules = array(
     'resource' => array(
-      'resource_share' => array(
+        'resource_share' => array(
         'datatype' => 'integer',
         'min' => 0
-      ),
+        ),
     ),
-  );
+    );
   
-  // Add validation rules for project specific settings
-  $validation_rules += boincwork_get_project_specific_config_validation_rules();
+    // Add validation rules for project specific settings
+    $validation_rules += boincwork_get_project_specific_config_validation_rules();
   
-  // Perform validation
-  boincwork_validate_form($validation_rules, $form_state['values']);
+    // Perform validation
+    boincwork_validate_form($validation_rules, $form_state['values']);
   
-  // Check for app validation
-  if (isset($validation_rules['apps'])) {
+    // Check for app validation
+    if (isset($validation_rules['apps'])) {
     if (isset($validation_rules['apps']['minimum selected'])
         AND $validation_rules['apps']['minimum selected'] > 0) {
-      $apps_selected = 0;
-      foreach ($validation_rules['apps']['list'] as $app) {
+        $apps_selected = 0;
+        foreach ($validation_rules['apps']['list'] as $app) {
         if ($form_state['values']['applications'][$app]) $apps_selected++;
-      }
-      if ($apps_selected < $validation_rules['apps']['minimum selected']) {
+        }
+        if ($apps_selected < $validation_rules['apps']['minimum selected']) {
         form_set_error(
-          'applications',
-          bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
+            'applications',
+            bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
         );
-      }
-      if ($apps_selected == count($validation_rules['apps']['list'])) {
+        }
+        if ($apps_selected == count($validation_rules['apps']['list'])) {
         foreach ($validation_rules['apps']['list'] as $app) {
-          unset($form_state['values']['applications'][$app]);
+            unset($form_state['values']['applications'][$app]);
         }
         $form_state['storage']['all apps selected'] = TRUE;
-      }
+        }
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of project preferences form.
-  */
+ * Handle post-validation submission of project preferences form.
+ */
 function boincwork_projectprefs_form_submit($form, &$form_state) {
-  global $user;
-  global $site_name;
+    global $user;
+    global $site_name;
   
-  require_boinc(array('util'));
-  $app_types = get_app_types();
+    require_boinc(array('util'));
+    $app_types = get_app_types();
   
-  $account = user_load($user->uid);
-  $edit = $form_state['values'];
-  $venue = $edit['venue'];
+    $account = user_load($user->uid);
+    $edit = $form_state['values'];
+    $venue = $edit['venue'];
   
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('project', $venue);
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('project', $venue);
   
-  // Resource preferences
-  $prefs['resource_share'] = $edit['resource']['resource_share'];
-  if ($app_types->count > 1) {
+    // Resource preferences
+    $prefs['resource_share'] = $edit['resource']['resource_share'];
+    if ($app_types->count > 1) {
     if ($app_types->cpu) $prefs['no_cpu'] = ($edit['resource']['no_cpu']) ? 0 : 1;
     if ($app_types->cuda) $prefs['no_cuda'] = ($edit['resource']['no_cuda']) ? 0 : 1;
     if ($app_types->ati) $prefs['no_ati'] = ($edit['resource']['no_ati']) ? 0 : 1;
     if ($app_types->intel_gpu) $prefs['no_intel_gpu'] = ($edit['resource']['no_intel_gpu']) ? 0 : 1;
-  }
+    }
   
-  // Beta preferences
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+    // Beta preferences
+    if (variable_get('boinc_prefs_options_beta', FALSE)) {
     $prefs['allow_beta_work'] = ($edit['beta']['allow_beta_work']) ? 1 : 0;
-  }
+    }
   
-  // Load project specific preferences from XML config
-  $xml = boincwork_get_project_specific_config();
-  $updated_prefs = array(
+    // Load project specific preferences from XML config
+    $xml = boincwork_get_project_specific_config();
+    $updated_prefs = array(
     'project_specific' => boincwork_format_project_specific_prefs_data($edit)
-  );
-  $prefs = $updated_prefs + $prefs;
+    );
+    $prefs = $updated_prefs + $prefs;
   
-  // Don't specify apps if all are selected
-  if (isset($form_state['storage']['all apps selected'])) {
+    // Don't specify apps if all are selected
+    if (isset($form_state['storage']['all apps selected'])) {
     unset($prefs['project_specific']['app_id']);
     unset($form_state['storage']['all apps selected']);
-  }
+    }
   
-  // If this is a new preference set, be sure to unset the "cleared" attribute
-  if (isset($prefs['@attributes']['cleared'])) {
+    // If this is a new preference set, be sure to unset the "cleared" attribute
+    if (isset($prefs['@attributes']['cleared'])) {
     unset($prefs['@attributes']['cleared']);
-  }
+    }
   
-  // Save preferences back to the BOINC account
-  $result = boincwork_save_prefs($prefs, 'project', $venue);
+    // Save preferences back to the BOINC account
+    $result = boincwork_save_prefs($prefs, 'project', $venue);
   
-  // Update the user's default preference set
-  if ($edit['default_set']['default_venue']) {
+    // Update the user's default preference set
+    if ($edit['default_set']['default_venue']) {
     boincwork_set_default_venue($venue);
-  }
-  elseif ($venue == $account->boincuser_default_pref_set) {
+    }
+    elseif ($venue == $account->boincuser_default_pref_set) {
     // User has cleared out the default venue setting
     boincwork_set_default_venue();
-  }
+    }
   
-  if (!$result) {
+    if (!$result) {
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+    }
+    elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that)
     drupal_set_message(t('Your preferences have been updated.
@@ -1402,53 +1402,53 @@ 
         communicates with @project or you issue the "Update"
         command from the BOINC client.', 
         array('@project' => $site_name)));
-  }
+    }
 }
 
 /**
  * The structure of the community preferences form
  */
 function communityprefs_form(&$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $form = array();
-  
-  // Pull in some elements from the profile form
-  $profile_form_state = array();
-  $profile = new stdClass();
-  $profile->type = 'profile';
-  $profile->language = '';
-  if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
+    global $user;
+    $account = user_load($user->uid);
+    $form = array();
+  
+    // Pull in some elements from the profile form
+    $profile_form_state = array();
+    $profile = new stdClass();
+    $profile->type = 'profile';
+    $profile->language = '';
+    if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
     $profile_node = node_load($profile_nid);
     $form_state['storage']['profile_node'] = $profile_node;
     module_load_include('inc', 'node', 'node.pages');    
     $profile_form = drupal_retrieve_form('profile_node_form', $profile_form_state, $profile_node);
     drupal_prepare_form('profile_node_form', $profile_form, $profile_form_state);
-  }
+    }
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
+    );
   
-  $default = array(
+    $default = array(
     'pm_send_notification' => '', // This is set already in pm_email_notify_user
     'friend_notification' => isset($account->friend_notification) ? $account->friend_notification : 0,
     'comments_per_page' => (isset($account->comments_per_page) AND $account->comments_per_page) ? $account->comments_per_page : variable_get('comment_default_per_page_forum', 50),
     'comments_order' => (isset($account->sort) AND $account->sort) ? $account->sort : variable_get('comment_default_order_forum', COMMENT_ORDER_OLDEST_FIRST),
-  );
+    );
   
-  // General options
-  $form['general'] = array(
+    // General options
+    $form['general'] = array(
     '#type' => 'fieldset',
     '#title' => bts('General settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 0,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  // Add the BOINC user name (non-unique, user editable)
-  $form['general']['boincuser_name'] = array(
+    );
+    // Add the BOINC user name (non-unique, user editable)
+    $form['general']['boincuser_name'] = array(
     '#type' => 'textfield',
     '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     '#default_value' => $account->boincuser_name,
@@ -1456,252 +1456,252 @@ 
     '#required' => TRUE,
     '#description' => '',
     '#size' => 40
-  );
-  // Time zone
-  if (variable_get('configurable_timezones', 1)) {
+    );
+    // Time zone
+    if (variable_get('configurable_timezones', 1)) {
     $zones = _system_zonelist();
     $form['general']['timezone'] = array(
-      '#type' => 'select',
-      '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
-      '#options' => $zones,
-      '#description' => '',
+        '#type' => 'select',
+        '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
+        '#options' => $zones,
+        '#description' => '',
     );
-  }
+    }
   
-  // Notification options
-  $form['notifications'] = array(
+    // Notification options
+    $form['notifications'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Notification settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 5,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  // Pull in private message notification handling and tweak the form
-  $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
-  $form['notifications']['pm_send_notifications'] = array_replace(
+    );
+    // Pull in private message notification handling and tweak the form
+    $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
+    $form['notifications']['pm_send_notifications'] = array_replace(
     $pm_notify['enable_pm_mail']['pm_send_notifications'],
     array(
-      '#type' => 'radios',
-      '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => ' ',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy')
+        '#type' => 'radios',
+        '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => ' ',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy')
     )
-  );
-  $form['notifications']['friend_notification'] = array(
+    );
+    $form['notifications']['friend_notification'] = array(
     '#type' => 'radios',
     '#title' => bts('Receive email notification for friend requests?', array(), NULL, 'boinc:account-preferences-community'),
     '#description' => ' ',
     '#options' => array(0 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), -1 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['friend_notification']
-  );
+    );
   
-  // Internationalization options
-  if (module_exists('internationalization')) {
+    // Internationalization options
+    if (module_exists('internationalization')) {
     $languages = language_list('enabled');
     $languages = $languages[1];
     $names = array();
     foreach ($languages as $langcode => $item) {
-      $name = t($item->name);
-      $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
+        $name = t($item->name);
+        $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
     }
     $form['locale'] = array(
-      '#type' => 'fieldset',
-      '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
-      '#weight' => 10,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
+        '#type' => 'fieldset',
+        '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
+        '#weight' => 10,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE,
     );
 
     // Get language negotiation settings.
     $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
     $user_preferred_language = user_preferred_language($account);
     $form['locale']['language'] = array(
-      '#type' => 'select',
-      '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => check_plain($user_preferred_language->language),
-      '#options' => $names,
-      '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
+        '#type' => 'select',
+        '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => check_plain($user_preferred_language->language),
+        '#options' => $names,
+        '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
     );
-  }
+    }
   
-  // Avatar options
-  $form['gravatar'] = array(
+    // Avatar options
+    $form['gravatar'] = array(
     '#type' => 'item',
     '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
     '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), NULL, 'boinc:account-preferences-community'),
-  );
-  if (user_access('disable own gravatar', $account)) {
+    );
+    if (user_access('disable own gravatar', $account)) {
     $form['gravatar'] = array(
-      '#type' => 'checkbox',
-      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
-      '#disabled' => !empty($account->picture),
-    );
-  }
-  $form['gravatar']['#weight'] = 15;
-  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
-  // Upload an avatar (pulled from profile_node_form):
-  if (!empty($profile_form['field_image'])) {
+        '#type' => 'checkbox',
+        '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+        '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
+        '#disabled' => !empty($account->picture),
+    );
+    }
+    $form['gravatar']['#weight'] = 15;
+    $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
+    // Upload an avatar (pulled from profile_node_form):
+    if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
-  }
-  else {
+    }
+    else {
     $form['field_image'] = array(
-      '#value' => '<div class="form-item">'
+        '#value' => '<div class="form-item">'
         . '<label class="placeholder">'
         . bts('This is not available until your profile is set up.', array(), NULL, 'boinc:account-preferences-community')
         . '</label>'
         . l(bts('Create a profile', array(), NULL, 'boinc:account-preferences-community'), 'account/profile/edit', array('attributes' => array('class' => 'form-link')))
         . '</div>',
     );
-  }
-  $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
-  $form['field_image']['#weight'] = 20;
-  $form['field_image']['#suffix'] = '</fieldset>';
+    }
+    $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
+    $form['field_image']['#weight'] = 20;
+    $form['field_image']['#suffix'] = '</fieldset>';
   
-  // Forum options
-  $form['forums'] = array(
+    // Forum options
+    $form['forums'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Forum settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 25,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['forums']['comments_per_page'] = array(
+    );
+    $form['forums']['comments_per_page'] = array(
     '#type' => 'select',
     '#title' => bts('In discussion topics, show at most @comments_per_page', array('@comments_per_page' => ''), NULL, 'boinc:account-preferences-community'),
     '#options' => array(10 => 10, 20 => 20, 30 => 30, 50 => 50, 100 => 100),
     '#default_value' => $default['comments_per_page']
-  );
-  // Can't have a typical Drupal form suffix on a select box?
-  $form['forums']['comments_per_page_suffix'] = array(
+    );
+    // Can't have a typical Drupal form suffix on a select box?
+    $form['forums']['comments_per_page_suffix'] = array(
     '#value' => '<span>' . bts('comments per page', array(), NULL, 'boinc:account-preferences-community') . '</span>'
-  );
-  $form['forums']['comments_order'] = array(
+    );
+    $form['forums']['comments_order'] = array(
     '#type' => 'select',
     '#title' => bts('Sort comments in discussions', array(), NULL, 'boinc:account-preferences-community'),
     '#options' => array(1 => bts('Newest post first', array(), NULL, 'boinc:account-preferences-community'), 2 => bts('Oldest post first', array(), NULL, 'boinc:account-preferences-community')),
     '#default_value' => $default['comments_order']
-  );
-  // Signature (pulled from user_edit_form):
-  if (variable_get('user_signatures', 0) && module_exists('comment')) {
+    );
+    // Signature (pulled from user_edit_form):
+    if (variable_get('user_signatures', 0) && module_exists('comment')) {
     $form['forums']['signature'] = array(
-      '#type' => 'textarea',
-      '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => $account->signature
-      );
+        '#type' => 'textarea',
+        '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => $account->signature
+        );
     // Prevent a "validation error" message when the user attempts to save with a default value they
     // do not have access to.
     if (!filter_access($account->signature_format) && empty($_POST)) {
-      drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
-      $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
+        drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
+        $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
     }
     $form['forums']['signature_format'] = filter_form($account->signature_format, NULL, array('signature_format'));
     // Optionally hide signatures from comments
     $form['forums']['hide_signatures'] = array(
-      '#type' => 'radios',
-      '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => ' ',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => isset($account->hide_signatures) ? $account->hide_signatures : 0,
+        '#type' => 'radios',
+        '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => ' ',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => isset($account->hide_signatures) ? $account->hide_signatures : 0,
     );
-  }
+    }
 
-  //Bottom separator
-  $form['separator_bottom'] = array(
+    //Bottom separator
+    $form['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>',
     '#weight' => 999,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
-  * Handle validation submission of community preferences form.
-  */
+ * Handle validation submission of community preferences form.
+ */
 function communityprefs_form_validate($form, &$form_state) {
-  // require_boinc();
-  global $user;
-  $account = user_load($user->uid);
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-  $edit = $form_state['values'];
+    // require_boinc();
+    global $user;
+    $account = user_load($user->uid);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $edit = $form_state['values'];
 
-  if ($edit['boincuser_name'] != $boinc_user->name) {
+    if ($edit['boincuser_name'] != $boinc_user->name) {
     $blacklist1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_blacklisted_usernames', "admin\nadministrator\nmoderator"));
     $blacklist2 = array();
     if (is_array($blacklist1)) {
-      $blacklist2 = array_map('strtolower', $blacklist1);
+        $blacklist2 = array_map('strtolower', $blacklist1);
     }
     if (in_array(strtolower($edit['boincuser_name']), $blacklist2)) {
-      form_set_error('boincuser_name',
+        form_set_error('boincuser_name',
         bts('You may not use username @blname, as that name is not allowed. Please choose another name.',
             array('@blname' => $edit['boincuser_name']),
             NULL, 'boinc:account-preferences-community'));
-      return false;
+        return false;
+    }
     }
-  }
 
-  return true;
+    return true;
 }
 
 /**
-  * Handle post-validation submission of community preferences form.
-  */
+ * Handle post-validation submission of community preferences form.
+ */
 function communityprefs_form_submit($form, &$form_state) {
-  require_boinc('boinc_db');
-  global $user;
-  $account = user_load($user->uid);
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-  $edit = $form_state['values'];
-  $profile_node = $form_state['storage']['profile_node'];
-  
-  // Display name
-  if ($edit['boincuser_name'] != $boinc_user->name) {
+    require_boinc('boinc_db');
+    global $user;
+    $account = user_load($user->uid);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $edit = $form_state['values'];
+    $profile_node = $form_state['storage']['profile_node'];
+  
+    // Display name
+    if ($edit['boincuser_name'] != $boinc_user->name) {
     $boincuser_name = $edit['boincuser_name'];
     $result = $boinc_user->update(
         "name='{$boincuser_name}'"
     );
-  }
+    }
   
-  // Private message settings
-  pm_email_notify_user('submit', $edit, $user);
+    // Private message settings
+    pm_email_notify_user('submit', $edit, $user);
   
-  // Avatar settings - only set if profile_node exists.
-  if ($profile_node) {
+    // Avatar settings - only set if profile_node exists.
+    if ($profile_node) {
     if (!$edit['field_image']) $edit['field_image'] = array();
     $profile_node->field_image = $edit['field_image'];
     node_save($profile_node);
     // Flush this from the node cache or changes won't show up immediately!
     $profile_node = node_load($profile_node->nid, NULL, TRUE);
-  }
+    }
 
-  // All other settings
-  $settings = array(
+    // All other settings
+    $settings = array(
     'signature' => $edit['signature'],
     'signature_format' => $edit['signature_format'],
     'timezone' => $edit['timezone'],
@@ -1710,197 +1710,197 @@ 
     'hide_signatures' => $edit['hide_signatures'],
     'sort' => $edit['comments_order'],
     'gravatar' => $edit['gravatar'],
-  );
-  if (module_exists('internationalization')) {
+    );
+    if (module_exists('internationalization')) {
     $settings['language'] = $edit['language'];
     global $language;
     if ($user->language != $edit['language']) {
-      global $base_url;
-      if ($edit['language'] != language_default('language')) {
+        global $base_url;
+        if ($edit['language'] != language_default('language')) {
         $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
-      }
-      else {
+        }
+        else {
         $form_state['redirect'] = $base_url . '/' . $_GET['q'];
-      }
+        }
+    }
     }
-  }
-  user_save($user, $settings);
+    user_save($user, $settings);
   
-  drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
+    drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
 
-  // Form will not redirect if storage is set; not good if language changes
-  unset($form_state['storage']);
+    // Form will not redirect if storage is set; not good if language changes
+    unset($form_state['storage']);
 }
 
 /**
  * The structure of the privacy preferences form
  */
 function boincwork_privacyprefs_form(&$form_state) {
-  require_boinc(array('user', 'prefs', 'util', 'consent'));
+    require_boinc(array('user', 'prefs', 'util', 'consent'));
   
-  global $user;
-  $account = user_load($user->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    global $user;
+    $account = user_load($user->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('project');
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('project');
   
-  //if (!$prefs AND !$initialize_if_empty) return null;
+    //if (!$prefs AND !$initialize_if_empty) return null;
 
-  $privacy_consent_types = boincwork_load_privacyconsenttypes();
+    $privacy_consent_types = boincwork_load_privacyconsenttypes();
   
-  // Define form defaults
-  $default = array(
+    // Define form defaults
+    $default = array(
     'privacy' => array(
-      'send_email' => ($boincuser->send_email) ? 1 : 0,
-      'show_hosts' => ($boincuser->show_hosts) ? 1 : 0
+        'send_email' => ($boincuser->send_email) ? 1 : 0,
+        'show_hosts' => ($boincuser->show_hosts) ? 1 : 0
     )
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
+    );
   
-  $form['privacy'] = array(
+    $form['privacy'] = array(
     '#title' => bts('Privacy settings', array(), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['privacy']['send_email'] = array(
+    );
+    $form['privacy']['send_email'] = array(
     '#title' => bts('Is it OK for @project and your team (if any) to email you?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['send_email']
-  );
-  $form['privacy']['show_hosts'] = array(
+    );
+    $form['privacy']['show_hosts'] = array(
     '#title' => bts('Should @project show your computers on its website?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
     '#description' => bts('At times, you may be asked to enable this option in order to receive help from the forums. Advanced users may need to be able to inspect your computers\' information in order to help diagnose any problems.', array(), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['show_hosts']
-  );
+    );
 
-  // Loop over privacy consent types and create form question for each
-  // option that deals with privacy.
-  foreach ($privacy_consent_types as $ct) {
+    // Loop over privacy consent types and create form question for each
+    // option that deals with privacy.
+    foreach ($privacy_consent_types as $ct) {
 
     $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0 ;
     // Set name to 'privacyconsent_SHORTNAME', which can be parsed
     // later in the submit function.
     $form['privacy']['privacyconsent_'.$ct['shortname']] = array(
-      '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
-      '#type' => 'radios',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => $currstate,
+        '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
+        '#type' => 'radios',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => $currstate,
     );
 
     // Add a description with link to the question 'Do you consent to
     // exporting your data...'.
     $mypatt = '/Do you consent to exporting your data/';
     if (preg_match($mypatt, $ct['description']) ) {
-      $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
-      array(
+        $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
+        array(
         '!privacy_policy_link' => l(
-          bts('privacy policy', array(), NULL, 'boinc:account-preferences-privacy'),
-          '/privacy'
+            bts('privacy policy', array(), NULL, 'boinc:account-preferences-privacy'),
+            '/privacy'
         )
-      ),
-      NULL, 'boinc:account-preferences-privacy');
+        ),
+        NULL, 'boinc:account-preferences-privacy');
+    }
     }
-  }
 
-  // Ignore and block users
-  if (module_exists('ignore_user')) {
+    // Ignore and block users
+    if (module_exists('ignore_user')) {
     $form['ignoreblock'] = array(
-      '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
-      '#type' => 'fieldset',
-      '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
+        '#type' => 'fieldset',
+        '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
 
     // Table for ignored users
     $form['ignoreblock']['current_ignore_section'] = array(
-      '#type' => 'item',
-      '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
-      '#prefix' => '<h4>',
-      '#suffix' => '</h4>',
-      '#weight' => -20,
+        '#type' => 'item',
+        '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
+        '#prefix' => '<h4>',
+        '#suffix' => '</h4>',
+        '#weight' => -20,
     );
 
     $ignored_users = _ignore_user_ignored_users();
     foreach ($ignored_users as $ignored_user) {
-      $form['ignoreblock']['username'][$ignored_user['iuid']] = array(
+        $form['ignoreblock']['username'][$ignored_user['iuid']] = array(
         '#value' => $ignored_user['username'],
-      );
-      $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
+        );
+        $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
         '#value' => l(
-          bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
-          'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
-          array()
+            bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
+            'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
+            array()
         ),
-      );
+        );
     }
     $form['ignoreblock']['pager'] = array('#value' => theme('pager', NULL, 10, 0));
 
     // Sub-form to add user to ignore list
     $form['ignoreblock']['add_ignore_user_section'] = array(
-      '#type' => 'item',
-      '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
-      '#prefix' => '<h4>',
-      '#suffix' => '</h4>',
-      '#weight' => 10,
+        '#type' => 'item',
+        '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
+        '#prefix' => '<h4>',
+        '#suffix' => '</h4>',
+        '#weight' => 10,
     );
 
     $form['ignoreblock']['addusername_toignorelist'] = array(
-      '#type' => 'textfield',
-      '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
-      '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
-      '#weight' => 11,
-      '#size' => 50,
-      '#autocomplete_path' => 'boincuser/autocomplete',
+        '#type' => 'textfield',
+        '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
+        '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
+        '#weight' => 11,
+        '#size' => 50,
+        '#autocomplete_path' => 'boincuser/autocomplete',
     );
 
     $form['ignoreblock']['addusername_submit'] = array(
-      '#type' => 'submit',
-      '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-      '#submit' => array('_boincwork_ignore_list_form_submit'),
-      '#weight' => 12,
-      '#attributes' => array('class' => 'add_ignore_user'),
+        '#type' => 'submit',
+        '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        '#submit' => array('_boincwork_ignore_list_form_submit'),
+        '#weight' => 12,
+        '#attributes' => array('class' => 'add_ignore_user'),
     );
-  }// endif module_exists
+    }// endif module_exists
 
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#validate' => array('boincwork_privacyprefs_form_validate'),
     '#submit' => array('boincwork_privacyprefs_form_submit'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -1908,93 +1908,93 @@ 
  */
 function theme_boincwork_privacyprefs_form($form) {
 
-  $output = '';
-  $output .= drupal_render($form['privacy']);
+    $output = '';
+    $output .= drupal_render($form['privacy']);
 
-  $header = array(
+    $header = array(
     bts('Username', array(), NULL, 'boinc:ignore-user-list'),
     bts('Operations', array(), NULL, 'boinc:ignore-user-list')
-  );
+    );
 
-  $rows = array();
-  if (isset($form['ignoreblock']['username']) && is_array($form['ignoreblock']['username'])) {
+    $rows = array();
+    if (isset($form['ignoreblock']['username']) && is_array($form['ignoreblock']['username'])) {
     foreach (element_children($form['ignoreblock']['username']) as $key) {
-      $row = array();
-      $row[] = drupal_render($form['ignoreblock']['username'][$key]);
-      $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
-      $rows[] = $row;
+        $row = array();
+        $row[] = drupal_render($form['ignoreblock']['username'][$key]);
+        $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
+        $rows[] = $row;
     }
-  }
-  else {
+    }
+    else {
     $rows[] = array(
-      array(
+        array(
         'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),
         'colspan' => '2',
-      )
+        )
     );
-  }
+    }
 
-  $attr = array('class' => 'ignore_user');
-  $form['ignoreblock']['current_list']['ignored_users']['#value'] = theme('table', $header, $rows, $attr);
-  $output .= drupal_render($form['current_list']);
+    $attr = array('class' => 'ignore_user');
+    $form['ignoreblock']['current_list']['ignored_users']['#value'] = theme('table', $header, $rows, $attr);
+    $output .= drupal_render($form['current_list']);
 
-  if ($form['pager']['#value']) {
+    if ($form['pager']['#value']) {
     $output .= drupal_render($form['pager']);
-  }
+    }
 
-  $output .= drupal_render($form);
+    $output .= drupal_render($form);
 
-  return $output;
+    return $output;
 }
 
 /**
-  * Validate the privacy preferences form.
-  */
+ * Validate the privacy preferences form.
+ */
 function boincwork_privacyprefs_form_validate($form, &$form_state) {
-  require_boinc('util');
+    require_boinc('util');
   
-  // Verify all non-boolean user input values and notify form API of failures
-  // ... currently there are no non-boolean values!
+    // Verify all non-boolean user input values and notify form API of failures
+    // ... currently there are no non-boolean values!
 }
 
 /**
-  * Handle post-validation submission of privacy preferences form.
-  */
+ * Handle post-validation submission of privacy preferences form.
+ */
 function boincwork_privacyprefs_form_submit($form, &$form_state) {
-  require_boinc(array('user', 'prefs', 'consent'));
+    require_boinc(array('user', 'prefs', 'consent'));
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  // Load BOINC account
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    // Load BOINC account
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Privacy preferences
-  $boincuser->send_email = ($form_state['values']['send_email']) ? true : false;
-  $boincuser->show_hosts = ($form_state['values']['show_hosts']) ? true : false;
+    // Privacy preferences
+    $boincuser->send_email = ($form_state['values']['send_email']) ? true : false;
+    $boincuser->show_hosts = ($form_state['values']['show_hosts']) ? true : false;
 
-  // Privacy consent options, extract the 'privacyconsent_SHORTNAME'
-  // from values array, and loop over them; each is checked with
-  // check_consent_type(). Also check the current state of the option
-  // in the database. If the form value is a new state, then set it.
-  $result = preg_grep("/^privacyconsent/", array_keys($form_state['values']));
-  $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
-  foreach ($privacyconsent_prefs as $name => $newstate) {
+    // Privacy consent options, extract the 'privacyconsent_SHORTNAME'
+    // from values array, and loop over them; each is checked with
+    // check_consent_type(). Also check the current state of the option
+    // in the database. If the form value is a new state, then set it.
+    $result = preg_grep("/^privacyconsent/", array_keys($form_state['values']));
+    $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
+    foreach ($privacyconsent_prefs as $name => $newstate) {
     $subname = explode('_', $name)[1];
     $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0 ;
     list($checkct, $ctid) = check_consent_type($subname);
     if ($checkct && ($currstate != $newstate)) {
-      consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
+        consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
+    }
     }
-  }
 
-  //project_prefs_update($boincuser, $main_prefs);
+    //project_prefs_update($boincuser, $main_prefs);
   
-  db_set_active('boinc_rw');
-  db_query("UPDATE user SET send_email = '{$boincuser->send_email}', show_hosts = '{$boincuser->show_hosts}' WHERE id = '{$boincuser->id}'");
-  db_set_active('default');
+    db_set_active('boinc_rw');
+    db_query("UPDATE user SET send_email = '{$boincuser->send_email}', show_hosts = '{$boincuser->show_hosts}' WHERE id = '{$boincuser->id}'");
+    db_set_active('default');
   
-  drupal_set_message(t('Your privacy preferences have been updated.'));
+    drupal_set_message(t('Your privacy preferences have been updated.'));
 }
 
 /**
@@ -2002,14 +2002,14 @@ 
  * ignore list.
  */
 function _boincwork_ignore_list_form_submit($form, $form_state) {
-  boincwork_ignore_user_add_user_username($form_state['values']['addusername_toignorelist']);
-  drupal_set_message(
+    boincwork_ignore_user_add_user_username($form_state['values']['addusername_toignorelist']);
+    drupal_set_message(
     bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
-      array(
+        array(
         '@username' => $form_state['values']['addusername_toignorelist'],
         '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
-      ),
-      NULL, 'boinc:ignore-user-add'),
+        ),
+        NULL, 'boinc:ignore-user-add'),
     'status');
 }
 
@@ -2018,37 +2018,37 @@ 
  */
 function boincwork_selectapp_form(&$form_state, $apps, $current_app) {
 
-  $form['selectapp'] = array(
+    $form['selectapp'] = array(
     '#type' => 'select',
     '#attributes' => array(
-      'class' => 'task-app-filter',
-      'onchange' => 'this.form.submit();',
+        'class' => 'task-app-filter',
+        'onchange' => 'this.form.submit();',
     ),
     '#default_value' => $current_app,
     '#options' => $apps,
     '#post_render' => array('_boincwork_selectapp_form_callback'),
-  );
+    );
 
-  // Class task-app-filter-submit for this form is used in
-  // theming. CSS sets 'display:none' if javascript is present. Thus
-  // only non-js users/browsers will see the Apply Filter button.
-  $form['submit'] = array(
+    // Class task-app-filter-submit for this form is used in
+    // theming. CSS sets 'display:none' if javascript is present. Thus
+    // only non-js users/browsers will see the Apply Filter button.
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => bts('Apply Filter', array(), NULL, 'boinc:form-save'),
     '#attributes' => array('class' => 'js-hide',),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
  * Submit function for select appliacation form.
  */
 function boincwork_selectapp_form_submit($form, &$form_state) {
-  $myargs = arg();
-  array_pop($myargs);
-  $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
-  $form_state['redirect'] = $newpath;
+    $myargs = arg();
+    array_pop($myargs);
+    $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
+    $form_state['redirect'] = $newpath;
 }
 
 /**
@@ -2058,7 +2058,7 @@ 
  * 'title' for the Application drop down box.
  */
 function _boincwork_selectapp_form_callback($theContent, $theElement) {
-  $disabled = '<option value="-1" disabled hidden';
-  $newContent = preg_replace('/<option value="-1"/', $disabled, $theContent);
-  return $newContent;
+    $disabled = '<option value="-1" disabled hidden';
+    $newContent = preg_replace('/<option value="-1"/', $disabled, $theContent);
+    return $newContent;
 }

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

Indentation +318 added lines, -318 removed lines

@@ -4,621 +4,621 @@
  * Implementation of hook_user_default_permissions().
  */
 function boinc_standard_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: Use PHP input for field settings (dangerous - grant with care)
-  $permissions['Use PHP input for field settings (dangerous - grant with care)'] = array(
+    // Exported permission: Use PHP input for field settings (dangerous - grant with care)
+    $permissions['Use PHP input for field settings (dangerous - grant with care)'] = array(
     'name' => 'Use PHP input for field settings (dangerous - grant with care)',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: access administration pages
-  $permissions['access administration pages'] = array(
+    // Exported permission: access administration pages
+    $permissions['access administration pages'] = array(
     'name' => 'access administration pages',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: access all views
-  $permissions['access all views'] = array(
+    // Exported permission: access all views
+    $permissions['access all views'] = array(
     'name' => 'access all views',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: access ckeditor
-  $permissions['access ckeditor'] = array(
+    // Exported permission: access ckeditor
+    $permissions['access ckeditor'] = array(
     'name' => 'access ckeditor',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'anonymous user',
-      '2' => 'authenticated user',
-      '3' => 'community member',
-      '4' => 'content editor',
-      '5' => 'moderator',
-      '6' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'anonymous user',
+        '2' => 'authenticated user',
+        '3' => 'community member',
+        '4' => 'content editor',
+        '5' => 'moderator',
+        '6' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: access content
-  $permissions['access content'] = array(
+    // Exported permission: access content
+    $permissions['access content'] = array(
     'name' => 'access content',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'anonymous user',
-      '2' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'anonymous user',
+        '2' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: access site reports
-  $permissions['access site reports'] = array(
+    // Exported permission: access site reports
+    $permissions['access site reports'] = array(
     'name' => 'access site reports',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer actions
-  $permissions['administer actions'] = array(
+    // Exported permission: administer actions
+    $permissions['administer actions'] = array(
     'name' => 'administer actions',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer advanced pane settings
-  $permissions['administer advanced pane settings'] = array(
+    // Exported permission: administer advanced pane settings
+    $permissions['administer advanced pane settings'] = array(
     'name' => 'administer advanced pane settings',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer blocks
-  $permissions['administer blocks'] = array(
+    // Exported permission: administer blocks
+    $permissions['administer blocks'] = array(
     'name' => 'administer blocks',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer ckeditor
-  $permissions['administer ckeditor'] = array(
+    // Exported permission: administer ckeditor
+    $permissions['administer ckeditor'] = array(
     'name' => 'administer ckeditor',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer content types
-  $permissions['administer content types'] = array(
+    // Exported permission: administer content types
+    $permissions['administer content types'] = array(
     'name' => 'administer content types',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer elysia_cron
-  $permissions['administer elysia_cron'] = array(
+    // Exported permission: administer elysia_cron
+    $permissions['administer elysia_cron'] = array(
     'name' => 'administer elysia_cron',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer features
-  $permissions['administer features'] = array(
+    // Exported permission: administer features
+    $permissions['administer features'] = array(
     'name' => 'administer features',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer files
-  $permissions['administer files'] = array(
+    // Exported permission: administer files
+    $permissions['administer files'] = array(
     'name' => 'administer files',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer filters
-  $permissions['administer filters'] = array(
+    // Exported permission: administer filters
+    $permissions['administer filters'] = array(
     'name' => 'administer filters',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer flags
-  $permissions['administer flags'] = array(
+    // Exported permission: administer flags
+    $permissions['administer flags'] = array(
     'name' => 'administer flags',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer imce(execute PHP)
-  $permissions['administer imce(execute PHP)'] = array(
+    // Exported permission: administer imce(execute PHP)
+    $permissions['administer imce(execute PHP)'] = array(
     'name' => 'administer imce(execute PHP)',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer menu
-  $permissions['administer menu'] = array(
+    // Exported permission: administer menu
+    $permissions['administer menu'] = array(
     'name' => 'administer menu',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: administer mini panels
-  $permissions['administer mini panels'] = array(
+    // Exported permission: administer mini panels
+    $permissions['administer mini panels'] = array(
     'name' => 'administer mini panels',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer nodes
-  $permissions['administer nodes'] = array(
+    // Exported permission: administer nodes
+    $permissions['administer nodes'] = array(
     'name' => 'administer nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer page manager
-  $permissions['administer page manager'] = array(
+    // Exported permission: administer page manager
+    $permissions['administer page manager'] = array(
     'name' => 'administer page manager',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer pane access
-  $permissions['administer pane access'] = array(
+    // Exported permission: administer pane access
+    $permissions['administer pane access'] = array(
     'name' => 'administer pane access',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer pane visibility
-  $permissions['administer pane visibility'] = array(
+    // Exported permission: administer pane visibility
+    $permissions['administer pane visibility'] = array(
     'name' => 'administer pane visibility',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer panel-nodes
-  $permissions['administer panel-nodes'] = array(
+    // Exported permission: administer panel-nodes
+    $permissions['administer panel-nodes'] = array(
     'name' => 'administer panel-nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer panels layouts
-  $permissions['administer panels layouts'] = array(
+    // Exported permission: administer panels layouts
+    $permissions['administer panels layouts'] = array(
     'name' => 'administer panels layouts',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer pathauto
-  $permissions['administer pathauto'] = array(
+    // Exported permission: administer pathauto
+    $permissions['administer pathauto'] = array(
     'name' => 'administer pathauto',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer permissions
-  $permissions['administer permissions'] = array(
+    // Exported permission: administer permissions
+    $permissions['administer permissions'] = array(
     'name' => 'administer permissions',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer rules
-  $permissions['administer rules'] = array(
+    // Exported permission: administer rules
+    $permissions['administer rules'] = array(
     'name' => 'administer rules',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer site configuration
-  $permissions['administer site configuration'] = array(
+    // Exported permission: administer site configuration
+    $permissions['administer site configuration'] = array(
     'name' => 'administer site configuration',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer smtp module
-  $permissions['administer smtp module'] = array(
+    // Exported permission: administer smtp module
+    $permissions['administer smtp module'] = array(
     'name' => 'administer smtp module',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer tabtamer
-  $permissions['administer tabtamer'] = array(
+    // Exported permission: administer tabtamer
+    $permissions['administer tabtamer'] = array(
     'name' => 'administer tabtamer',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer taxonomy
-  $permissions['administer taxonomy'] = array(
+    // Exported permission: administer taxonomy
+    $permissions['administer taxonomy'] = array(
     'name' => 'administer taxonomy',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer url aliases
-  $permissions['administer url aliases'] = array(
+    // Exported permission: administer url aliases
+    $permissions['administer url aliases'] = array(
     'name' => 'administer url aliases',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer users
-  $permissions['administer users'] = array(
+    // Exported permission: administer users
+    $permissions['administer users'] = array(
     'name' => 'administer users',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer views
-  $permissions['administer views'] = array(
+    // Exported permission: administer views
+    $permissions['administer views'] = array(
     'name' => 'administer views',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: assign all roles
-  $permissions['assign all roles'] = array(
+    // Exported permission: assign all roles
+    $permissions['assign all roles'] = array(
     'name' => 'assign all roles',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: change own username
-  $permissions['change own username'] = array(
+    // Exported permission: change own username
+    $permissions['change own username'] = array(
     'name' => 'change own username',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: create mini panels
-  $permissions['create mini panels'] = array(
+    // Exported permission: create mini panels
+    $permissions['create mini panels'] = array(
     'name' => 'create mini panels',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: create page content
-  $permissions['create page content'] = array(
+    // Exported permission: create page content
+    $permissions['create page content'] = array(
     'name' => 'create page content',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: create panel-nodes
-  $permissions['create panel-nodes'] = array(
+    // Exported permission: create panel-nodes
+    $permissions['create panel-nodes'] = array(
     'name' => 'create panel-nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: create story content
-  $permissions['create story content'] = array(
+    // Exported permission: create story content
+    $permissions['create story content'] = array(
     'name' => 'create story content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: create url aliases
-  $permissions['create url aliases'] = array(
+    // Exported permission: create url aliases
+    $permissions['create url aliases'] = array(
     'name' => 'create url aliases',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete any page content
-  $permissions['delete any page content'] = array(
+    // Exported permission: delete any page content
+    $permissions['delete any page content'] = array(
     'name' => 'delete any page content',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: delete any panel-nodes
-  $permissions['delete any panel-nodes'] = array(
+    // Exported permission: delete any panel-nodes
+    $permissions['delete any panel-nodes'] = array(
     'name' => 'delete any panel-nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete any story content
-  $permissions['delete any story content'] = array(
+    // Exported permission: delete any story content
+    $permissions['delete any story content'] = array(
     'name' => 'delete any story content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete own account
-  $permissions['delete own account'] = array(
+    // Exported permission: delete own account
+    $permissions['delete own account'] = array(
     'name' => 'delete own account',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: delete own page content
-  $permissions['delete own page content'] = array(
+    // Exported permission: delete own page content
+    $permissions['delete own page content'] = array(
     'name' => 'delete own page content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete own panel-nodes
-  $permissions['delete own panel-nodes'] = array(
+    // Exported permission: delete own panel-nodes
+    $permissions['delete own panel-nodes'] = array(
     'name' => 'delete own panel-nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete own story content
-  $permissions['delete own story content'] = array(
+    // Exported permission: delete own story content
+    $permissions['delete own story content'] = array(
     'name' => 'delete own story content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete revisions
-  $permissions['delete revisions'] = array(
+    // Exported permission: delete revisions
+    $permissions['delete revisions'] = array(
     'name' => 'delete revisions',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: edit any page content
-  $permissions['edit any page content'] = array(
+    // Exported permission: edit any page content
+    $permissions['edit any page content'] = array(
     'name' => 'edit any page content',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: edit any panel-nodes
-  $permissions['edit any panel-nodes'] = array(
+    // Exported permission: edit any panel-nodes
+    $permissions['edit any panel-nodes'] = array(
     'name' => 'edit any panel-nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit any story content
-  $permissions['edit any story content'] = array(
+    // Exported permission: edit any story content
+    $permissions['edit any story content'] = array(
     'name' => 'edit any story content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit own page content
-  $permissions['edit own page content'] = array(
+    // Exported permission: edit own page content
+    $permissions['edit own page content'] = array(
     'name' => 'edit own page content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit own panel-nodes
-  $permissions['edit own panel-nodes'] = array(
+    // Exported permission: edit own panel-nodes
+    $permissions['edit own panel-nodes'] = array(
     'name' => 'edit own panel-nodes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit own story content
-  $permissions['edit own story content'] = array(
+    // Exported permission: edit own story content
+    $permissions['edit own story content'] = array(
     'name' => 'edit own story content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: ignore user
-  $permissions['ignore user'] = array(
+    // Exported permission: ignore user
+    $permissions['ignore user'] = array(
     'name' => 'ignore user',
     'roles' => array(
-      '0' => 'authenticated user',
+        '0' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: import input formats
-  $permissions['import input formats'] = array(
+    // Exported permission: import input formats
+    $permissions['import input formats'] = array(
     'name' => 'import input formats',
     'roles' => array(),
-  );
+    );
 
-  // Exported permission: manage features
-  $permissions['manage features'] = array(
+    // Exported permission: manage features
+    $permissions['manage features'] = array(
     'name' => 'manage features',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: notify of path changes
-  $permissions['notify of path changes'] = array(
+    // Exported permission: notify of path changes
+    $permissions['notify of path changes'] = array(
     'name' => 'notify of path changes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: reset abuse flags
-  $permissions['reset abuse flags'] = array(
+    // Exported permission: reset abuse flags
+    $permissions['reset abuse flags'] = array(
     'name' => 'reset abuse flags',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: revert revisions
-  $permissions['revert revisions'] = array(
+    // Exported permission: revert revisions
+    $permissions['revert revisions'] = array(
     'name' => 'revert revisions',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: select different theme
-  $permissions['select different theme'] = array(
+    // Exported permission: select different theme
+    $permissions['select different theme'] = array(
     'name' => 'select different theme',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: upload files
-  $permissions['upload files'] = array(
+    // Exported permission: upload files
+    $permissions['upload files'] = array(
     'name' => 'upload files',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  // Exported permission: view uploaded files
-  $permissions['view uploaded files'] = array(
+    // Exported permission: view uploaded files
+    $permissions['view uploaded files'] = array(
     'name' => 'view uploaded files',
     'roles' => array(),
-  );
+    );
 
-  // Exported permission: use PHP for block visibility
-  $permissions['use PHP for block visibility'] = array(
+    // Exported permission: use PHP for block visibility
+    $permissions['use PHP for block visibility'] = array(
     'name' => 'use PHP for block visibility',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: use PHP for me alias paths
-  $permissions['use PHP for me alias paths'] = array(
+    // Exported permission: use PHP for me alias paths
+    $permissions['use PHP for me alias paths'] = array(
     'name' => 'use PHP for me alias paths',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: use flag import
-  $permissions['use flag import'] = array(
+    // Exported permission: use flag import
+    $permissions['use flag import'] = array(
     'name' => 'use flag import',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: use page manager
-  $permissions['use page manager'] = array(
+    // Exported permission: use page manager
+    $permissions['use page manager'] = array(
     'name' => 'use page manager',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: use panels caching features
-  $permissions['use panels caching features'] = array(
+    // Exported permission: use panels caching features
+    $permissions['use panels caching features'] = array(
     'name' => 'use panels caching features',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: use panels dashboard
-  $permissions['use panels dashboard'] = array(
+    // Exported permission: use panels dashboard
+    $permissions['use panels dashboard'] = array(
     'name' => 'use panels dashboard',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: use panels in place editing
-  $permissions['use panels in place editing'] = array(
+    // Exported permission: use panels in place editing
+    $permissions['use panels in place editing'] = array(
     'name' => 'use panels in place editing',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: view all panes
-  $permissions['view all panes'] = array(
+    // Exported permission: view all panes
+    $permissions['view all panes'] = array(
     'name' => 'view all panes',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: view pane admin links
-  $permissions['view pane admin links'] = array(
+    // Exported permission: view pane admin links
+    $permissions['view pane admin links'] = array(
     'name' => 'view pane admin links',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: view revisions
-  $permissions['view revisions'] = array(
+    // Exported permission: view revisions
+    $permissions['view revisions'] = array(
     'name' => 'view revisions',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'content editor',
+        '0' => 'administrator',
+        '1' => 'content editor',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

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

Indentation +1672 added lines, -1672 removed lines

@@ -4,35 +4,35 @@ 
  * Implementation of hook_ctools_plugin_api().
  */
 function boinc_standard_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "input_formats" && $api == "input_formats") {
+    list($module, $api) = func_get_args();
+    if ($module == "input_formats" && $api == "input_formats") {
     return array("version" => 1);
-  }
-  elseif ($module == "page_manager" && $api == "pages_default") {
+    }
+    elseif ($module == "page_manager" && $api == "pages_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "panels_mini" && $api == "panels_default") {
+    }
+    elseif ($module == "panels_mini" && $api == "panels_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "strongarm" && $api == "strongarm") {
+    }
+    elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
+    }
 }
 
 /**
  * Implementation of hook_flag_default_flags().
  */
 function boinc_standard_flag_default_flags() {
-  $flags = array();
-  // Exported flag: "Comment Abuse 1 SPAM".
-  $flags['abuse_comment_1'] = array(
+    $flags = array();
+    // Exported flag: "Comment Abuse 1 SPAM".
+    $flags['abuse_comment_1'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 1 SPAM',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as SPAM',
     'flag_long' => 'Flag this comment as SPAM.',
@@ -43,31 +43,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 2 LINK".
-  $flags['abuse_comment_2'] = array(
+    );
+    // Exported flag: "Comment Abuse 2 LINK".
+    $flags['abuse_comment_2'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 2 LINK',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as abusive link',
     'flag_long' => 'Flag this comment with abusive link.',
@@ -78,31 +78,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 3 Hostile".
-  $flags['abuse_comment_3'] = array(
+    );
+    // Exported flag: "Comment Abuse 3 Hostile".
+    $flags['abuse_comment_3'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 3 Hostile',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as hostile',
     'flag_long' => 'Flag this comment as hostile.',
@@ -113,31 +113,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 4 Not Kid Friendly".
-  $flags['abuse_comment_4'] = array(
+    );
+    // Exported flag: "Comment Abuse 4 Not Kid Friendly".
+    $flags['abuse_comment_4'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 4 Not Kid Friendly',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as not kid-friendly',
     'flag_long' => 'Flag this comment as not kid-friendly.',
@@ -148,31 +148,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse 5 Other".
-  $flags['abuse_comment_5'] = array(
+    );
+    // Exported flag: "Comment Abuse 5 Other".
+    $flags['abuse_comment_5'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse 5 Other',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as other',
     'flag_long' => 'Flag this comment - other reason',
@@ -183,31 +183,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 0,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Comment Abuse meta".
-  $flags['abuse_comment_meta'] = array(
+    );
+    // Exported flag: "Comment Abuse meta".
+    $flags['abuse_comment_meta'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse meta',
     'global' => '0',
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report',
     'flag_long' => 'Report comment.',
@@ -218,31 +218,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 1,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 1 SPAM".
-  $flags['abuse_node_1'] = array(
+    );
+    // Exported flag: "Node Abuse 1 SPAM".
+    $flags['abuse_node_1'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 1 SPAM',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as SPAM',
     'flag_long' => 'Flag this content SPAM.',
@@ -253,12 +253,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -268,19 +268,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 2 Link".
-  $flags['abuse_node_2'] = array(
+    );
+    // Exported flag: "Node Abuse 2 Link".
+    $flags['abuse_node_2'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 2 Link',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report as abusive link',
     'flag_long' => 'Flag this content as abusive link.',
@@ -291,12 +291,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -306,19 +306,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 3 Hostile".
-  $flags['abuse_node_3'] = array(
+    );
+    // Exported flag: "Node Abuse 3 Hostile".
+    $flags['abuse_node_3'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 3 Hostile',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as hostile',
     'flag_long' => 'Flag this content as hostile.',
@@ -329,12 +329,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -344,19 +344,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 4 Not Kid Friendly".
-  $flags['abuse_node_4'] = array(
+    );
+    // Exported flag: "Node Abuse 4 Not Kid Friendly".
+    $flags['abuse_node_4'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 4 Not Kid Friendly',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as not kid-friendly',
     'flag_long' => 'Flag this content as not kid-friendly.',
@@ -367,12 +367,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -382,19 +382,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse 5 Other".
-  $flags['abuse_node_5'] = array(
+    );
+    // Exported flag: "Node Abuse 5 Other".
+    $flags['abuse_node_5'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse 5 Other',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Flag as other',
     'flag_long' => 'Flag this content - other reason.',
@@ -405,12 +405,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 0,
@@ -420,19 +420,19 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse meta".
-  $flags['abuse_node_meta'] = array(
+    );
+    // Exported flag: "Node Abuse meta".
+    $flags['abuse_node_meta'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse meta',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report',
     'flag_long' => 'Report content',
@@ -443,12 +443,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 1,
@@ -458,12 +458,12 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 1 SPAM".
-  $flags['abuse_user_1'] = array(
+    );
+    // Exported flag: "User Abuse 1 SPAM".
+    $flags['abuse_user_1'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 1 SPAM',
     'global' => FALSE,
@@ -477,24 +477,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 2 Link".
-  $flags['abuse_user_2'] = array(
+    );
+    // Exported flag: "User Abuse 2 Link".
+    $flags['abuse_user_2'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 2 Link',
     'global' => FALSE,
@@ -508,24 +508,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 3 Not Kid Friendly".
-  $flags['abuse_user_3'] = array(
+    );
+    // Exported flag: "User Abuse 3 Not Kid Friendly".
+    $flags['abuse_user_3'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 3 Not Kid Friendly',
     'global' => FALSE,
@@ -539,24 +539,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse 4 Other".
-  $flags['abuse_user_4'] = array(
+    );
+    // Exported flag: "User Abuse 4 Other".
+    $flags['abuse_user_4'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse 4 Other',
     'global' => FALSE,
@@ -570,24 +570,24 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 0,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse Meta".
-  $flags['abuse_user_meta'] = array(
+    );
+    // Exported flag: "User Abuse Meta".
+    $flags['abuse_user_meta'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse Meta',
     'global' => FALSE,
@@ -601,31 +601,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => 1,
     'access_uid' => '',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Subscriptions".
-  $flags['subscriptions'] = array(
+    );
+    // Exported flag: "Subscriptions".
+    $flags['subscriptions'] = array(
     'content_type' => 'node',
     'title' => 'Subscriptions',
     'global' => '0',
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'subscribe',
     'flag_long' => 'Subscribe to this topic',
@@ -636,12 +636,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 1,
@@ -651,11 +651,11 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  return $flags;
+    );
+    return $flags;
 
 }
 
@@ -663,47 +663,47 @@ 
  * Implementation of hook_node_info().
  */
 function boinc_standard_node_info() {
-  $items = array(
+    $items = array(
     'page' => array(
-      'name' => t('Page'),
-      'module' => 'features',
-      'description' => t('A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an "About us" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site\'s initial home page.'),
-      'has_title' => '1',
-      'title_label' => t('Title'),
-      'has_body' => '1',
-      'body_label' => t('Body'),
-      'min_word_count' => '0',
-      'help' => '',
+        'name' => t('Page'),
+        'module' => 'features',
+        'description' => t('A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an "About us" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site\'s initial home page.'),
+        'has_title' => '1',
+        'title_label' => t('Title'),
+        'has_body' => '1',
+        'body_label' => t('Body'),
+        'min_word_count' => '0',
+        'help' => '',
     ),
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_rules_defaults().
  */
 function boinc_standard_rules_defaults() {
-  return array(
+    return array(
     'rules' => array(
-      'rules_notify_admins_about_circular_merge_error' => array(
+        'rules_notify_admins_about_circular_merge_error' => array(
         '#type' => 'rule',
         '#set' => 'event_boincwork_circular_merge_error',
         '#label' => 'Notify admins about circular merge error',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Circular host merging error',
-              'message' => 'User tried to merge a host (old_host) into a target host where the target host\'s rpc_seqno is equal to the old_host\'s id. 
+                'from' => '',
+                'subject' => '[subject_tag:string] Circular host merging error',
+                'message' => 'User tried to merge a host (old_host) into a target host where the target host\'s rpc_seqno is equal to the old_host\'s id. 
 
 Information about this host merge attempt:
 <?php
@@ -714,62 +714,62 @@ 
 print "BOINC id: " . $account->boincuser_id . "\\n";
 print "Drupal UID: " . $user->uid . "\\n";
 ?>',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'oldhost_id',
                     '1' => 'targethost_id',
                     '2' => 'user',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_about_zombie_merge_attempt' => array(
+        ),
+        'rules_notify_admins_about_zombie_merge_attempt' => array(
         '#type' => 'rule',
         '#set' => 'event_boincwork_zombie_merge_error',
         '#label' => 'Notify admins about zombie merge attempt',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Zombie host merging error',
-              'message' => 'User tried to merge a host (old_host) into a target host where the target host\'s userid is equal to 0, a zombie host. 
+                'from' => '',
+                'subject' => '[subject_tag:string] Zombie host merging error',
+                'message' => 'User tried to merge a host (old_host) into a target host where the target host\'s userid is equal to 0, a zombie host. 
 I.e., $target_host->userid == 0
 
 Information about this host merge attempt:
@@ -781,3303 +781,3303 @@ 
 print "BOINC id: " . $account->boincuser_id . "\\n";
 print "Drupal UID: " . $user->uid . "\\n";
 ?>',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'oldhost_id',
                     '1' => 'targethost_id',
                     '2' => 'user',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_error_when_user_consenting_with_missing_consent_type' => array(
+        ),
+        'rules_notify_admins_error_when_user_consenting_with_missing_consent_type' => array(
         '#type' => 'rule',
         '#set' => 'event_boincuser_general_consent_type_error',
         '#label' => 'Notify admins error when user consenting with missing consent type',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error from user consenting to terms of use, missing consent type',
-              'message' => '[user:display-name], [user:mail], attempted to consent to terms-of-use form and the function \'check_consent_type\' returned an error. Consent type [consent_type:string] seems to be generating an error.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] Error from user consenting to terms of use, missing consent type',
+                'message' => '[user:display-name], [user:mail], attempted to consent to terms-of-use form and the function \'check_consent_type\' returned an error. Consent type [consent_type:string] seems to be generating an error.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'consent_type',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_user_changing_email_address_to_existing_user' => array(
+        ),
+        'rules_notify_admins_user_changing_email_address_to_existing_user' => array(
         '#type' => 'rule',
         '#set' => 'event_boincuser_change_email_error',
         '#label' => 'Notify admins user changing email address to existing user',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] User attempted to change email address to one used by existing user.',
-              'message' => '[user:display-name]	with email [user:mail] attempted to change their email to [new_email_addr:string], which is already in use by another user.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] User attempted to change email address to one used by existing user.',
+                'message' => '[user:display-name]	with email [user:mail] attempted to change their email to [new_email_addr:string], which is already in use by another user.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'new_email_addr',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_user_reverting_to_previous_email_address_that_is_now_used_by_another_user' => array(
+        ),
+        'rules_notify_admins_user_reverting_to_previous_email_address_that_is_now_used_by_another_user' => array(
         '#type' => 'rule',
         '#set' => 'event_boincuser_revert_email_error',
         '#label' => 'Notify admins user reverting to previous email address that is now used by another user',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] User attempted to revert to previous email address to one used by existing user.',
-              'message' => '[user:display-name]	with email [user:mail] attempted to revert their email to their previous email address, [new_email_addr:string], which is already in use by another user.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] User attempted to revert to previous email address to one used by existing user.',
+                'message' => '[user:display-name]	with email [user:mail] attempted to revert their email to their previous email address, [new_email_addr:string], which is already in use by another user.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'new_email_addr',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_when_user_fails_to_delete_their_own_account' => array(
+        ),
+        'rules_notify_admins_when_user_fails_to_delete_their_own_account' => array(
         '#type' => 'rule',
         '#set' => 'event_boincuser_delete_general_error',
         '#label' => 'Notify admins when user fails to delete their own account',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error when user trying to delete their account',
-              'message' => 'User [user:display-name], [user:mail], attempted to delete their account. Error from \'boincuser_load\'.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] Error when user trying to delete their account',
+                'message' => 'User [user:display-name], [user:mail], attempted to delete their account. Error from \'boincuser_load\'.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'user',
                     '1' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_when_user_tries_to_delete_account_with_invalid_uid' => array(
+        ),
+        'rules_notify_admins_when_user_tries_to_delete_account_with_invalid_uid' => array(
         '#type' => 'rule',
         '#set' => 'event_boincuser_delete_uid_invalid_error',
         '#label' => 'Notify admins when user tries to delete account with invalid uid',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] invalid uid when user trying to delete their account',
-              'message' => 'User [user:display-name], [user:mail], attempted to delete their account. Error is Drupal UID=[user:uid] cannot be located.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] invalid uid when user trying to delete their account',
+                'message' => 'User [user:display-name], [user:mail], attempted to delete their account. Error is Drupal UID=[user:uid] cannot be located.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'user',
                     '1' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admin_error_when_user_consenting_to_terms_of_use' => array(
+        ),
+        'rules_notify_admin_error_when_user_consenting_to_terms_of_use' => array(
         '#type' => 'rule',
         '#set' => 'event_boincuser_general_consent_error',
         '#label' => 'Notify admins error when user consenting to terms of use',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'admin notification',
+            '0' => 'boinc_standard',
+            '1' => 'admin notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error when user attempted to consent to terms of use',
-              'message' => '[user:display-name], [user:mail], attempted to consent to terms-of-use form and an error was generated from function \'consent_to_a_policy\'.
+                'from' => '',
+                'subject' => '[subject_tag:string] Error when user attempted to consent to terms of use',
+                'message' => '[user:display-name], [user:mail], attempted to consent to terms-of-use form and an error was generated from function \'consent_to_a_policy\'.
 
 asdf jkl;',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'user',
                     '1' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported_hostile' => array(
+        ),
+        'rules_offensive_comment_reported_hostile' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment_3',
         '#label' => 'Offensive comment reported - Hostile',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of hostile language in [node:type] comment at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
+                'from' => '',
+                'subject' => 'Report of hostile language in [node:type] comment at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
 containing hostile language for the [:global:site-name] site:
 
 <?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/goto/comment/[comment:comment-cid]
 
 Total reports of this comment: [comment:flag-abuse-comment-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported_link' => array(
+        ),
+        'rules_offensive_comment_reported_link' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment_2',
         '#label' => 'Offensive comment reported - Link',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of inappropriate link in  [node:type] comment at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
+                'from' => '',
+                'subject' => 'Report of inappropriate link in  [node:type] comment at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
 containing an offensive or inappropriate link for the [:global:site-name] site:
 
 <?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/goto/comment/[comment:comment-cid]
 
 Total reports of this comment: [comment:flag-abuse-comment-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported_not_kid_friendly' => array(
+        ),
+        'rules_offensive_comment_reported_not_kid_friendly' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment_4',
         '#label' => 'Offensive comment reported - Not Kid Friendly',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of non Kid-friendly language in [node:type] comment at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
+                'from' => '',
+                'subject' => 'Report of non Kid-friendly language in [node:type] comment at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
 containing non Kid-friendly language for the [:global:site-name] site:
 
 <?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/goto/comment/[comment:comment-cid]
 
 Total reports of this comment: [comment:flag-abuse-comment-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported_other' => array(
+        ),
+        'rules_offensive_comment_reported_other' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment_5',
         '#label' => 'Offensive comment reported - Other',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive [node:type] comment at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
+                'from' => '',
+                'subject' => 'Report of offensive [node:type] comment at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content as 
 being offensive or inappropriate for the [:global:site-name] site, with reason \'Other\':
 
 <?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/goto/comment/[comment:comment-cid]
 
 Total reports of this comment: [comment:flag-abuse-comment-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported_spam' => array(
+        ),
+        'rules_offensive_comment_reported_spam' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment_1',
         '#label' => 'Offensive comment reported - SPAM',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of SPAM [node:type] comment at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content 
+                'from' => '',
+                'subject' => 'Report of SPAM [node:type] comment at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following comment on [node:type] content 
 as being SPAM for the [:global:site-name] site:
 
 <?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/goto/comment/[comment:comment-cid]
 
 Total reports of this comment: [comment:flag-abuse-comment-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported_hostile' => array(
+        ),
+        'rules_offensive_content_reported_hostile' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node_3',
         '#label' => 'Offensive content reported - Hostile',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of hostile language in [node:type] content at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following [node:type] content 
+                'from' => '',
+                'subject' => 'Report of hostile language in [node:type] content at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following [node:type] content 
 as hostile language for the [:global:site-name] site:
 
 <?php print url(\'node/\' . \\$node->nid, array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>
 
 Total reports of this content: [node:flag-abuse-node-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported_link' => array(
+        ),
+        'rules_offensive_content_reported_link' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node_2',
         '#label' => 'Offensive content reported - Link',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of inappropriate link in [node:type] content at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following [node:type] content 
+                'from' => '',
+                'subject' => 'Report of inappropriate link in [node:type] content at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following [node:type] content 
 as containing an offensive or inappropriate link for the [:global:site-name] site:
 
 <?php print url(\'node/\' . \\$node->nid, array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>
 
 Total reports of this content: [node:flag-abuse-node-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported_not_kid_friendly' => array(
+        ),
+        'rules_offensive_content_reported_not_kid_friendly' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node_4',
         '#label' => 'Offensive content reported - Not Kid Friendly',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of non Kid-friendly language in [node:type] content at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following [node:type] content 
+                'from' => '',
+                'subject' => 'Report of non Kid-friendly language in [node:type] content at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following [node:type] content 
 as containing non Kid-friendly language for the [:global:site-name] site:
 
 <?php print url(\'node/\' . \\$node->nid, array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>
 
 Total reports of this content: [node:flag-abuse-node-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported_other' => array(
+        ),
+        'rules_offensive_content_reported_other' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node_4',
         '#label' => 'Offensive content reported - Other',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive [node:type] content at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following [node:type] content 
+                'from' => '',
+                'subject' => 'Report of offensive [node:type] content at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following [node:type] content 
 as being offensive or inappropriate for the [:global:site-name] site:
 
 <?php print url(\'node/\' . \\$node->nid, array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>
 
 Total reports of this content: [node:flag-abuse-node-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported_spam' => array(
+        ),
+        'rules_offensive_content_reported_spam' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node_1',
         '#label' => 'Offensive content reported - SPAM',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of SPAM [node:type] content at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported the following [node:type] content 
+                'from' => '',
+                'subject' => 'Report of SPAM [node:type] content at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported the following [node:type] content 
 as being SPAM for the [:global:site-name] site:
 
 <?php print url(\'node/\' . \\$node->nid, array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>
 
 Total reports of this content: [node:flag-abuse-node-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_user_reported_link' => array(
+        ),
+        'rules_offensive_user_reported_link' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_user_2',
         '#label' => 'Offensive user reported - Link',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of inappropriate link in user profile at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported [account:display-name] for 
+                'from' => '',
+                'subject' => 'Report of inappropriate link in user profile at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported [account:display-name] for 
 inappropriate link in a user profile:
 
 <?php print url(\\\'<front>\\\', array(\\\'absolute\\\' => TRUE, \\\'language\\\' => \\\'en\\\')); ?>/account/[account:uid]
 
 Total current reports of this user: [account:flag-abuse-user-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'account',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_user_reported_not_kid_friendly' => array(
+        ),
+        'rules_offensive_user_reported_not_kid_friendly' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_user_3',
         '#label' => 'Offensive user reported - Not Kid Friendly',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of hostile language in user profile at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported [account:display-name] for 
+                'from' => '',
+                'subject' => 'Report of hostile language in user profile at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported [account:display-name] for 
 hostile language in a user profile:
 
 <?php print url(\\\'<front>\\\', array(\\\'absolute\\\' => TRUE, \\\'language\\\' => \\\'en\\\')); ?>/account/[account:uid]
 
 Total current reports of this user: [account:flag-abuse-user-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'account',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_user_reported_other' => array(
+        ),
+        'rules_offensive_user_reported_other' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_user_4',
         '#label' => 'Offensive user reported - Other',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive user at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported [account:display-name] for 
+                'from' => '',
+                'subject' => 'Report of offensive user at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported [account:display-name] for 
 inappropriate behavior:
 
 <?php print url(\\\'<front>\\\', array(\\\'absolute\\\' => TRUE, \\\'language\\\' => \\\'en\\\')); ?>/account/[account:uid]
 
 Total current reports of this user: [account:flag-abuse-user-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'account',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_user_reported_spam' => array(
+        ),
+        'rules_offensive_user_reported_spam' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_user_1',
         '#label' => 'Offensive user reported - SPAM',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of SPAM user at [:global:site-name]',
-              'message' => '[flagging_user:display-name] has reported [account:display-name] for 
+                'from' => '',
+                'subject' => 'Report of SPAM user at [:global:site-name]',
+                'message' => '[flagging_user:display-name] has reported [account:display-name] for 
 a SPAM user profile:
 
 <?php print url(\\\'<front>\\\', array(\\\'absolute\\\' => TRUE, \\\'language\\\' => \\\'en\\\')); ?>/account/[account:uid]
 
 Total current reports of this user: [account:flag-abuse-user-meta-count]',
-              '#eval input' => array(
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'account',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_converted_to_new_forum_topic_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_converted_to_new_forum_topic_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_boinccore_comment_convert',
         '#label' => 'Comment is converted to new forum topic by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment at [:global:site-name] converted to new forum topic',
-              'message' => "Comment has been converted to new forum topic by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment at [:global:site-name] converted to new forum topic',
+                'message' => "Comment has been converted to new forum topic by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'user',
                     '1' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_deleted_by_admin' => array(
+        ),
+        'rules_comment_deleted_by_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_comment_delete',
         '#label' => 'Comment deleted by admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          '1' => 'boinc_standard',
+            '0' => 'moderator notification',
+            '1' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment deleted at [:global:site-name] by admin',
-              'message' => "Comment to [node:type] topic '[node:title]' deleted by admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment deleted at [:global:site-name] by admin',
+                'message' => "Comment to [node:type] topic '[node:title]' deleted by admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_edited_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_edited_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_comment_update',
         '#label' => 'Comment is edited by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#negate' => 1,
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'Compare two users: acting user (who edited the comment) is NOT the comment author',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'Compare two users: acting user (who edited the comment) is NOT the comment author',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user1' => array(
-                  'type' => 'user',
-                  'label' => 'User account 1',
+                    'type' => 'user',
+                    'label' => 'User account 1',
                 ),
                 'user2' => array(
-                  'type' => 'user',
-                  'label' => 'User account 2',
+                    'type' => 'user',
+                    'label' => 'User account 2',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#name' => 'rules_condition_user_comparison',
             '#settings' => array(
-              '#argument map' => array(
+                '#argument map' => array(
                 'user1' => 'user',
                 'user2' => 'comment_author',
-              ),
+                ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment edited at [:global:site-name] by moderator or admin',
-              'message' => "Comment has been edited by moderator/admin [user:display-name]\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment edited at [:global:site-name] by moderator or admin',
+                'message' => "Comment has been edited by moderator/admin [user:display-name]\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'comment',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_is_published_unhidden_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_is_published_unhidden_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_boinccore_comment_unhidden',
         '#label' => 'Comment is unhidden by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              '#argument map' => array(
+                '#argument map' => array(
                 'user1' => 'user',
                 'user2' => 'comment_author',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_comparison',
             '#info' => array(
-              'label' => 'Compare two users: acting user (who unhid the comment) is NOT the comment author',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'Compare two users: acting user (who unhid the comment) is NOT the comment author',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user1' => array(
-                  'type' => 'user',
-                  'label' => 'User account 1',
+                    'type' => 'user',
+                    'label' => 'User account 1',
                 ),
                 'user2' => array(
-                  'type' => 'user',
-                  'label' => 'User account 2',
+                    'type' => 'user',
+                    'label' => 'User account 2',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
             ),
             '#negate' => 1,
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment at [:global:site-name] unhidden by moderator or admin',
-              'message' => "Comment has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment at [:global:site-name] unhidden by moderator or admin',
+                'message' => "Comment has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'comment',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_is_unpublished_hidden_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_is_unpublished_hidden_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_comment_unpublish',
         '#label' => 'Comment is hidden by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#negate' => 1,
             '#info' => array(
-              'label' => 'Compare two users: acting user (who hid the comment) is NOT the comment author',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'Compare two users: acting user (who hid the comment) is NOT the comment author',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user1' => array(
-                  'type' => 'user',
-                  'label' => 'User account 1',
+                    'type' => 'user',
+                    'label' => 'User account 1',
                 ),
                 'user2' => array(
-                  'type' => 'user',
-                  'label' => 'User account 2',
+                    'type' => 'user',
+                    'label' => 'User account 2',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#name' => 'rules_condition_user_comparison',
             '#type' => 'condition',
             '#settings' => array(
-              '#argument map' => array(
+                '#argument map' => array(
                 'user1' => 'user',
                 'user2' => 'comment_author',
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment at [:global:site-name] hidden by moderator or admin',
-              'message' => "Comment has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment at [:global:site-name] hidden by moderator or admin',
+                'message' => "Comment has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'comment',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_edited_by_moderator_or_admin' => array(
+        ),
+        'rules_forum_topic_is_edited_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is edited by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
+            ),
             ),
-          ),
-          '1' => array(
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
+                '#type' => 'condition',
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '2' => array(
+            '2' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: content changed',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: content changed',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return ($node->body != $node_unchanged->body);',
-              'vars' => array(
+                'code' => 'return ($node->body != $node_unchanged->body);',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] edited by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been edited by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] edited by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been edited by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_hidden_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_is_hidden_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is hidden by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '3' => array(
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node status changed to hidden',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node status changed to hidden',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->status == 1 && $node->status == 0;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->status == 1 && $node->status == 0;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] hidden by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] hidden by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_moved_to_a_different_forum_by_moderator_or_admin' => array(
+        ),
+        'rules_forum_topic_is_moved_to_a_different_forum_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is moved to a different forum by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
+            ),
             ),
-          ),
-          '1' => array(
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
+                '#type' => 'condition',
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '2' => array(
+            ),
+            '2' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node moved to new forum parent',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node moved to new forum parent',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return ($node->tid != $node_unchanged->tid);',
-              'vars' => array(
+                'code' => 'return ($node->tid != $node_unchanged->tid);',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] moved by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been moved by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] moved by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been moved by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_unhidden_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_is_unhidden_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is unhidden by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#type' => 'OR',
             '0' => array(
-              '#info' => array(
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
-              '#weight' => 0.0,
+                '#type' => 'condition',
+                '#weight' => 0.0,
             ),
             '#weight' => 0.0,
             '1' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
+                '#type' => 'condition',
             ),
-          ),
-          '3' => array(
+            ),
+            '3' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#info' => array(
-              'label' => 'PHP code: node content is unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content is unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->status == 0 && $node->status == 1;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->status == 0 && $node->status == 1;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#info' => array(
-              'label' => 'PHP code: node status changed to unhidden',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node status changed to unhidden',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] unhidden by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] unhidden by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_locked_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_locked_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic locked by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '3' => array(
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node locked',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node locked',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->comment == 2 && $node->comment == 1;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->comment == 2 && $node->comment == 1;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] locked by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been locked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] locked by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been locked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_marked_sticky_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_marked_sticky_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic marked sticky by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '3' => array(
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node made sticky',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node made sticky',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->sticky == 0 && $node->sticky == 1;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->sticky == 0 && $node->sticky == 1;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] marked sticky by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been marked sticky by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] marked sticky by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been marked sticky by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_marked_unsticky_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_marked_unsticky_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic marked unsticky by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '3' => array(
+            ),
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node made sticky',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node made sticky',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->sticky == 1 && $node->sticky == 0;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->sticky == 1 && $node->sticky == 0;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] marked unsticky by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been marked unsticky by moderator/admin [user:display-name].\r\n\\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] marked unsticky by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been marked unsticky by moderator/admin [user:display-name].\r\n\\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_nenamed_title_by_moderator_or_admin' => array(
+        ),
+        'rules_forum_topic_nenamed_title_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic renamed title by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
+            ),
             ),
-          ),
-          '1' => array(
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
+                '#type' => 'condition',
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '2' => array(
+            ),
+            '2' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: title changed',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: title changed',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return ($node->title != $node_unchanged->title);',
-              'vars' => array(
+                'code' => 'return ($node->title != $node_unchanged->title);',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] renamed by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has its title renamed by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] renamed by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has its title renamed by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_unlocked_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_unlocked_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic unlocked by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '3' => array(
+            ),
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node unlocked',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node unlocked',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->comment == 1 && $node->comment == 2;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->comment == 1 && $node->comment == 2;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] unlocked by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been unlocked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] unlocked by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been unlocked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported' => array(
+        ),
+        'rules_offensive_comment_reported' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment',
         '#label' => 'Offensive comment reported',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          '1' => 'boinc_standard',
+            '0' => 'moderator notification',
+            '1' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '1' => array(
+            '1' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive [node:type] comment at [:global:site-name]',
-              'message' => "[flagging_user:display-name] has reported the following comment on [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]\r\n\r\nTotal reports of this comment: [comment:flag-abuse-comment-count]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Report of offensive [node:type] comment at [:global:site-name]',
+                'message' => "[flagging_user:display-name] has reported the following comment on [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]\r\n\r\nTotal reports of this comment: [comment:flag-abuse-comment-count]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported' => array(
+        ),
+        'rules_offensive_content_reported' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node',
         '#label' => 'Offensive content reported',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          'boinc_standard' => 'boinc_standard',
+            '0' => 'moderator notification',
+            'boinc_standard' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '1' => array(
+            '1' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive [node:type] content at [:global:site-name]',
-              'message' => "[flagging_user:display-name] has reported the following [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>\r\n\r\nTotal reports of this content: [node:flag-abuse-node-count]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Report of offensive [node:type] content at [:global:site-name]',
+                'message' => "[flagging_user:display-name] has reported the following [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>\r\n\r\nTotal reports of this content: [node:flag-abuse-node-count]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_user_reported' => array(
+        ),
+        'rules_offensive_user_reported' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_user',
         '#label' => 'Offensive user reported',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          'boinc_standard' => 'boinc_standard',
+            '0' => 'moderator notification',
+            'boinc_standard' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '1' => array(
+            '1' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive user at [:global:site-name]',
-              'message' => "[flagging_user:display-name] has reported [account:display-name] for inappropriate behavior:\r\n\r\n<?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/account/[account:uid]\r\n\r\nTotal current reports of this user: [account:flag-abuse-user-count]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Report of offensive user at [:global:site-name]',
+                'message' => "[flagging_user:display-name] has reported [account:display-name] for inappropriate behavior:\r\n\r\n<?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/account/[account:uid]\r\n\r\nTotal current reports of this user: [account:flag-abuse-user-count]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'account',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function boinc_standard_views_api() {
-  return array(
+    return array(
     'api' => '2',
-  );
+    );
 }