BOINC / boinc

html/inc/util.inc

Indentation +6 added lines, -6 removed lines

@@ -556,14 +556,14 @@
     $tnow = get_str('tnow', true);
     $ttok = get_str('ttok', true);
     if (!$tnow) {
-      if (isset($_POST['tnow'])) {
-          $tnow = $_POST['tnow'];
-      }
+        if (isset($_POST['tnow'])) {
+            $tnow = $_POST['tnow'];
+        }
     }
     if (!$ttok) {
-      if (isset($_POST['ttok'])) {
-          $ttok = $_POST['ttok'];
-      }
+        if (isset($_POST['ttok'])) {
+            $ttok = $_POST['ttok'];
+        }
     }
     if (!$tnow) return false;
     if (!$ttok) return false;

html/user/get_project_config.php

Indentation +4 added lines, -4 removed lines

@@ -86,11 +86,11 @@ 
 }
 
 if ($disable_account_creation || defined('INVITE_CODES')) {
-	echo "    <account_creation_disabled/>\n";
+    echo "    <account_creation_disabled/>\n";
 }
 
 if (defined('INVITE_CODES')) {
-	echo "    <invite_code_required/>\n";
+    echo "    <invite_code_required/>\n";
 }
 
 echo "    <min_passwd_length>$min_passwd_length</min_passwd_length>\n";
@@ -113,9 +113,9 @@ 
 // the terms_of_use.txt file in the project base directory.
 //
 if (defined('TERMSOFUSE_FILE')) {
-  $tou_file = TERMSOFUSE_FILE;
+    $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+    $tou_file =  "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

drupal/sites/all/features/teams/teams.features.inc

Indentation +63 added lines, -63 removed lines

@@ -4,152 +4,152 @@
  * Implementation of hook_ctools_plugin_api().
  */
 function teams_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "page_manager" && $api == "pages_default") {
+    list($module, $api) = func_get_args();
+    if ($module == "page_manager" && $api == "pages_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "strongarm" && $api == "strongarm") {
+    }
+    elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
+    }
 }
 
 /**
  * Implementation of hook_node_info().
  */
 function teams_node_info() {
-  $items = array(
+    $items = array(
     'team' => array(
-      'name' => t('Team'),
-      'module' => 'features',
-      'description' => t('A grouping of users, centered on a common interest.'),
-      'has_title' => '1',
-      'title_label' => t('Name'),
-      'has_body' => '1',
-      'body_label' => t('Description'),
-      'min_word_count' => '0',
-      'help' => '',
+        'name' => t('Team'),
+        'module' => 'features',
+        'description' => t('A grouping of users, centered on a common interest.'),
+        'has_title' => '1',
+        'title_label' => t('Name'),
+        'has_body' => '1',
+        'body_label' => t('Description'),
+        'min_word_count' => '0',
+        'help' => '',
     ),
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_rules_defaults().
  */
 function teams_rules_defaults() {
-  return array(
+    return array(
     'rules' => array(
-      'rules_notify_admins_about_error_creating_a_boinc_team' => array(
+        'rules_notify_admins_about_error_creating_a_boinc_team' => array(
         '#type' => 'rule',
         '#set' => 'event_boincteam_create_team_error',
         '#label' => 'Notify admins about error creating a BOINC team',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_team',
-          'teams' => 'teams',
+            '0' => 'boinc_team',
+            'teams' => 'teams',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error creating new team',
-              'message' => '[user:display-name] attempted to create team [team_name:string], but an error was returned. See function \'boincteam_create_form_submit\'. BOINC function \'make_team\' did not return a valid boinc_team object.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] Error creating new team',
+                'message' => '[user:display-name] attempted to create team [team_name:string], but an error was returned. See function \'boincteam_create_form_submit\'. BOINC function \'make_team\' did not return a valid boinc_team object.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'team_name',
                     '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_about_error_creating_a_boinc_team_no_pathauto' => array(
+        ),
+        'rules_notify_admins_about_error_creating_a_boinc_team_no_pathauto' => array(
         '#type' => 'rule',
         '#set' => 'event_boincteam_create_team_nopathauto_error',
         '#label' => 'Notify admins about error creating a BOINC team no pathauto',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_team',
-          'teams' => 'teams',
+            '0' => 'boinc_team',
+            'teams' => 'teams',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error creating BOINC team - no pathauo module',
-              'message' => '[user:display-name] attempted to create team [team_name:string], but no pathauto module detected. See function \'boincteam_create_form_submit\'.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] Error creating BOINC team - no pathauo module',
+                'message' => '[user:display-name] attempted to create team [team_name:string], but no pathauto module detected. See function \'boincteam_create_form_submit\'.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'team_name',
                     '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,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function teams_views_api() {
-  return array(
+    return array(
     'api' => '2',
-  );
+    );
 }

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

Indentation +18 added lines, -18 removed lines

@@ -16,39 +16,39 @@
  */
 
 function boincteam_rules_event_info() {
-  return array(
+    return array(
     'boincteam_create_team_error' => array(
-      'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincteam',
-      'arguments' => rules_events_hook_boincteam_arguments(),
+        'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincteam',
+        'arguments' => rules_events_hook_boincteam_arguments(),
     ),
     'boincteam_create_team_nopathauto_error' => array(
-      'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincteam',
-      'arguments' => rules_events_hook_boincteam_arguments(),
+        'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincteam',
+        'arguments' => rules_events_hook_boincteam_arguments(),
     ),
-  );
+    );
 }
 
 /**
  * Arguments suitable for boincteam
  **/
 function rules_events_hook_boincteam_arguments() {
-  return array(
+    return array(
     'team_name' => array(
-      'type' => 'string',
-      'label' => 'team name',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'team name',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincteam_adminnotify_argument();
+    ) + rules_events_hook_boincteam_adminnotify_argument();
 }
 
 function rules_events_hook_boincteam_adminnotify_argument() {
-  return array(
+    return array(
     'subject_tag' => array(
-      'type' => 'string',
-      'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Subject tag for email filtering',
+        'required' => TRUE,
     ),
-  ) + rules_events_global_user_argument();
+    ) + rules_events_global_user_argument();
 }
\ No newline at end of file

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

Indentation +29 added lines, -29 removed lines

@@ -16,59 +16,59 @@
  */
 
 function boincuser_rules_event_info() {
-  return array(
+    return array(
     'boincuser_change_email_error' => array(
-      'label' => bts('Error from user changing e-mail address.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_chemail_arguments(),
+        'label' => bts('Error from user changing e-mail address.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_chemail_arguments(),
     ),
     'boincuser_revert_email_error' => array(
-      'label' => bts('Error from user reverting to previous e-mail address.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_chemail_arguments(),
+        'label' => bts('Error from user reverting to previous e-mail address.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_chemail_arguments(),
     ),
     'boincuser_general_consent_error' => array(
-      'label' => bts('Error from user consenting to terms-of-use.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
+        'label' => bts('Error from user consenting to terms-of-use.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
     ),
     'boincuser_general_consent_type_error' => array(
-      'label' => bts('Error dealing with missing consent type.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_consenttype_argument(),
+        'label' => bts('Error dealing with missing consent type.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_consenttype_argument(),
     ),
-  );
+    );
 }
 
 /**
  * Arguments suitable for boincuser
  **/
 function rules_events_hook_boincuser_chemail_arguments() {
-  return array(
+    return array(
     'new_email_addr' => array(
-      'type' => 'string',
-      'label' => 'New email address',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'New email address',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincuser_adminnotify_argument();
+    ) + rules_events_hook_boincuser_adminnotify_argument();
 }
 
 function rules_events_hook_boincuser_consenttype_argument() {
-  return array(
+    return array(
     'consent_type' => array(
-      'type' => 'string',
-      'label' => 'Consent type id that caused the error',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Consent type id that caused the error',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincuser_adminnotify_argument();
+    ) + rules_events_hook_boincuser_adminnotify_argument();
 }
 
 function rules_events_hook_boincuser_adminnotify_argument() {
-  return array(
+    return array(
     'subject_tag' => array(
-      'type' => 'string',
-      'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Subject tag for email filtering',
+        'required' => TRUE,
     ),
-  ) + rules_events_global_user_argument();
+    ) + rules_events_global_user_argument();
 }
\ No newline at end of file

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

Indentation +270 added lines, -270 removed lines

@@ -20,15 +20,15 @@ 
  * Implementation of hook_perm().
  */
 function boincuser_delete_perm() {
-  return array('delete own account');
+    return array('delete own account');
 }
 
 /**
  * Implementation of hook_menu().
  */
 function boincuser_delete_menu() {
-  $items = array();
-  $items['admin/boinc/user_delete'] = array(
+    $items = array();
+    $items['admin/boinc/user_delete'] = array(
     'title' => t('Preferences: BOINC user delete'),
     'description' => t('Configure the BOINC user delete action.'),
     'page callback' => 'drupal_get_form',
@@ -36,9 +36,9 @@ 
     'access arguments' => array('administer users'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser_delete.admin.inc',
-  );
+    );
 
-  $items['admin/boinc/user_delete/%'] = array(
+    $items['admin/boinc/user_delete/%'] = array(
     'title' => t('Admin delete user'),
     'description' => t('Deletes a user as an admin'),
     'page callback' => 'drupal_get_form',
@@ -46,9 +46,9 @@ 
     'access arguments' => array('administer users'),
     'type' => MENU_CALLBACK,
     'file' => 'boincuser_delete.admin.inc',
-  );
+    );
 
-  $items['user/%user/deleteconfirm/%'] = array(
+    $items['user/%user/deleteconfirm/%'] = array(
     'title' => t('Final confirmation for account deletion'),
     'description' => t('Final confirmation for account deletion'),
     'page callback' => 'drupal_get_form',
@@ -56,9 +56,9 @@ 
     'access callback' => 'boincuser_delete_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  $items['user/%user/odeleteconfirm/%'] = array(
+    $items['user/%user/odeleteconfirm/%'] = array(
     'title' => t('Final confirmation for account deletion'),
     'description' => t('Final confirmation for account deletion'),
     'page callback' => 'drupal_get_form',
@@ -66,204 +66,204 @@ 
     'access callback' => 'boincuser_delete_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Checks whether a user can delete an account.
  */
 function boincuser_delete_access($account) {
-  global $user;
-  return ((user_access('administer users') || (user_access('delete own account') && $account->uid == $user->uid)) && $account->uid > 0);
+    global $user;
+    return ((user_access('administer users') || (user_access('delete own account') && $account->uid == $user->uid)) && $account->uid > 0);
 }
 
 /**
  * Implementation of hook_menu_alter().
  */
 function boincuser_delete_menu_alter(&$callbacks) {
-  $callbacks['user/%user/delete']['access callback'] = 'boincuser_delete_access';
-  $callbacks['user/%user/delete']['access arguments'] = array(1);
-  $callbacks['user/%user/delete']['type'] = MENU_CALLBACK;
+    $callbacks['user/%user/delete']['access callback'] = 'boincuser_delete_access';
+    $callbacks['user/%user/delete']['access arguments'] = array(1);
+    $callbacks['user/%user/delete']['type'] = MENU_CALLBACK;
 }
 
 /**
  * Implementation of hook_form_alter().
  */
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
-  global $user;
+    global $user;
 
-  switch($form_id) {
+    switch($form_id) {
     case 'user_profile_form':
       if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
         $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('user_edit_delete_submit'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
+            '#type' => 'submit',
+            '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+            '#weight' => 1009,
+            '#submit' => array('user_edit_delete_submit'),
+            '#prefix' => '<li class="tab">',
+            '#suffix' => '</li>',
         );
-      }
-      else if ( user_access('administer users') ) {
+        }
+        else if ( user_access('administer users') ) {
         $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('_boincuser_delete_goto_admindelete'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
+            '#type' => 'submit',
+            '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+            '#weight' => 1009,
+            '#submit' => array('_boincuser_delete_goto_admindelete'),
+            '#prefix' => '<li class="tab">',
+            '#suffix' => '</li>',
         );
-      }
-      else {
+        }
+        else {
         unset($form['delete']);
-      }
-      break;
+        }
+        break;
     case 'user_confirm_delete':
 
       $disable_delete = FALSE;
-      // If email address was changed less than 7 days (7 * 86400 s)
-      // ago, it cannot be changed again.
-      $duration = TOKEN_DURATION_ONE_WEEK;
-      if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
+        // If email address was changed less than 7 days (7 * 86400 s)
+        // ago, it cannot be changed again.
+        $duration = TOKEN_DURATION_ONE_WEEK;
+        if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
         drupal_set_message(
-          bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
+            bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
             array(
-              '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
+                '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
             ), NULL, 'boinc:account-credentials-change')
         , 'info');
         $disable_delete = TRUE;
-      }
+        }
 
-      // Configure radio options
-      $common_acts = bts("All your posts and comments will be attributed to the Anonymous User. Your user profile will be deleted. Your host information will be deleted. And you will be removed from any team you are a member of.", array(), NULL, 'boinc:delete-user-account');
+        // Configure radio options
+        $common_acts = bts("All your posts and comments will be attributed to the Anonymous User. Your user profile will be deleted. Your host information will be deleted. And you will be removed from any team you are a member of.", array(), NULL, 'boinc:delete-user-account');
 
-      $deleteoptions = array(
+        $deleteoptions = array(
         'boincuser_delete_softdelete' => bts('<b>Soft delete</b> your account. Your account will be disabled. ', array(), NULL, 'boinc:delete-user-account'),
         'boincuser_delete_delete' => bts('<b>Delete</b> your account. ', array(), NULL, 'boinc:delete-user-account'),
-      );
+        );
 
-      $dtypes = variable_get('boincuser_delete_type', 'user_decides');
-      // Unset the other option if dtype is set. i.e., if dtype is set
-      // to soft delete, unset the hard delete option.  Likewise, add
-      // the 'common_acts' sentences to the option that remains.
-      switch ($dtypes) {
+        $dtypes = variable_get('boincuser_delete_type', 'user_decides');
+        // Unset the other option if dtype is set. i.e., if dtype is set
+        // to soft delete, unset the hard delete option.  Likewise, add
+        // the 'common_acts' sentences to the option that remains.
+        switch ($dtypes) {
         case 'soft_obfuscate':
           unset($deleteoptions['boincuser_delete_delete']);
-          $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
-          break;
+            $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
+            break;
         case 'hard_wipe':
           unset($deleteoptions['boincuser_delete_softdelete']);
-          $deleteoptions['boincuser_delete_delete'] .= $common_acts;
-          break;
-      }
+            $deleteoptions['boincuser_delete_delete'] .= $common_acts;
+            break;
+        }
 
-      $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
-      drupal_set_title($question);
+        $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+        drupal_set_title($question);
 
-      unset($form['description']);
+        unset($form['description']);
 
-      $form['main'] = array(
+        $form['main'] = array(
         '#type' => 'fieldset',
         '#weight' => 1,
-      );
+        );
 
-      $form['main']['fs1'] = array(
+        $form['main']['fs1'] = array(
         '#type' => 'fieldset',
         '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
         '#weight' => 10,
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-      );
-      $form['main']['fs1']['help'] = array(
+        );
+        $form['main']['fs1']['help'] = array(
         '#value' => bts(
-          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
-          "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
-          array(
+            "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
+            "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
+            array(
             '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
-          ), NULL, 'boinc:delete-user-account'),
+            ), NULL, 'boinc:delete-user-account'),
         '#weight' => 11,
         '#prefix' => "<div id='delete-instructions'>",
         '#suffix' => "</div>",
-      );
+        );
 
-      if ($dtypes == 'user_decides') {
+        if ($dtypes == 'user_decides') {
         $form['main']['common'] = array(
-          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
-          '#prefix' => "<div id='delete-instructions'>",
-          '#suffix' => "</div>",
-          '#weight' => 20,
+            '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
+            '#prefix' => "<div id='delete-instructions'>",
+            '#suffix' => "</div>",
+            '#weight' => 20,
         );
-      }
+        }
 
-      $form['main']['user_delete_action'] = array(
+        $form['main']['user_delete_action'] = array(
         '#type' => 'radios',
         '#options' => $deleteoptions,
         '#weight' => 21,
-      );
-      if ($disable_delete) {
+        );
+        if ($disable_delete) {
         $form['main']['user_delete_action']['#disabled'] = TRUE;
-      }
+        }
 
-      // Password field
-      if (!$disable_delete) {
+        // Password field
+        if (!$disable_delete) {
         $form['main']['current_pass'] = array(
-          '#type' => 'password',
-          '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
-          '#size' => 17,
-          '#attributes' => array(
+            '#type' => 'password',
+            '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+            '#size' => 17,
+            '#attributes' => array(
             'autocomplete' => 'off',
-          ),
-          '#prefix' => "<div id='delete-password-field'>",
-          '#suffix' => "</div>",
-          '#weight' => 25,
+            ),
+            '#prefix' => "<div id='delete-password-field'>",
+            '#suffix' => "</div>",
+            '#weight' => 25,
         );
-      }
+        }
 
-      $form['separator_bottom'] = array(
+        $form['separator_bottom'] = array(
         '#value' => '<div class="separator buttons"></div>',
         '#weight' => 999,
-      );
+        );
 
-      // Configure the action buttons
-      $uid = $form['_account']['#value']->uid;
-      $form['actions']['#weight'] = 1000;
-      $form['actions']['form control tabs prefix'] = array(
+        // Configure the action buttons
+        $uid = $form['_account']['#value']->uid;
+        $form['actions']['#weight'] = 1000;
+        $form['actions']['form control tabs prefix'] = array(
         '#value' => '<ul class="form-control tab-list">',
         '#weight' => 1001,
-      );
-
-      unset($form['actions']['#prefix']);
-      unset($form['actions']['#suffix']);
-      $form['actions']['submit']['#prefix'] = '<li class="first tab">';
-      $form['actions']['submit']['#suffix'] = '</li>';
-      $form['actions']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
-      $form['actions']['submit']['#weight'] = 1002;
-      if ($disable_delete) {
+        );
+
+        unset($form['actions']['#prefix']);
+        unset($form['actions']['#suffix']);
+        $form['actions']['submit']['#prefix'] = '<li class="first tab">';
+        $form['actions']['submit']['#suffix'] = '</li>';
+        $form['actions']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+        $form['actions']['submit']['#weight'] = 1002;
+        if ($disable_delete) {
         $form['actions']['submit']['#disabled'] = TRUE;
         $form['actions']['submit']['#value'] = '';
-      }
+        }
 
-      $form['actions']['cancel']['#prefix'] = '<li class="tab">';
-      $form['actions']['cancel']['#suffix'] = '</li>';
-      $form['actions']['cancel']['#weight'] = 1003;
-      $form['actions']['cancel']['#value'] = l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'account/info/edit');
-      if ($disable_delete) {
+        $form['actions']['cancel']['#prefix'] = '<li class="tab">';
+        $form['actions']['cancel']['#suffix'] = '</li>';
+        $form['actions']['cancel']['#weight'] = 1003;
+        $form['actions']['cancel']['#value'] = l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'account/info/edit');
+        if ($disable_delete) {
         $form['actions']['cancel']['#prefix'] = '<li class="first tab">';
-      }
+        }
 
-      $form['actions']['form control tabs suffix'] = array(
+        $form['actions']['form control tabs suffix'] = array(
         '#value' => '</ul>',
         '#weight' => 1010,
-      );
+        );
 
-      $form['#redirect'] = 'account/' . $uid;
-      $form['#validate'] = array('boincuser_delete_validate');
-      $form['#submit'] = array('boincuser_delete_submit');
-      break;
+        $form['#redirect'] = 'account/' . $uid;
+        $form['#validate'] = array('boincuser_delete_validate');
+        $form['#submit'] = array('boincuser_delete_submit');
+        break;
 
-  } // switch
+    } // switch
 }
 
 
@@ -274,29 +274,29 @@ 
  * password.
  */
 function boincuser_delete_validate($form, &$form_state) {
-  require_boinc('boinc_db');
+    require_boinc('boinc_db');
 
-  if ($form_state['values']['user_delete_action'] == '') {
+    if ($form_state['values']['user_delete_action'] == '') {
     form_set_error('user_delete_action', bts('Please select an action to perform using the radio buttons.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  // check BOINC user exists
-  $account = $form_state['values']['_account'];
-  $boinc_user = boincuser_load($account->uid, TRUE);
-  if (!$boinc_user) {
+    // check BOINC user exists
+    $account = $form_state['values']['_account'];
+    $boinc_user = boincuser_load($account->uid, TRUE);
+    if (!$boinc_user) {
     rules_invoke_event('boincuser_delete_general_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     return form_set_error('current_pass',
-      bts('There was a problem deleting your account. The @project administrators have been contacted.',
-      array(
+        bts('There was a problem deleting your account. The @project administrators have been contacted.',
+        array(
         '@project' => variable_get('site_name', 'Drupal-BOINC'),
-      )
-      , NULL, 'boinc:delete-user-account')
+        )
+        , NULL, 'boinc:delete-user-account')
     );
-  }
+    }
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+    if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
     return true;
-  }
+    }
 }
 
 /**
@@ -307,46 +307,46 @@ 
  * to delete the account.
  */
 function boincuser_delete_submit($form, &$form_state) {
-  require_boinc('token');
-  global $user;
+    require_boinc('token');
+    global $user;
 
-  $uid = $form_state['values']['_account']->uid;
-  $account = user_load(array('uid' => $uid));
+    $uid = $form_state['values']['_account']->uid;
+    $account = user_load(array('uid' => $uid));
 
-  if (!$account) {
+    if (!$account) {
     rules_invoke_event('boincuser_delete_uid_invalid_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     drupal_set_message(
-      bts('ERROR: The user account @uid does not exist. The @project administrators have been notified.',
+        bts('ERROR: The user account @uid does not exist. The @project administrators have been notified.',
         array(
-          '@uid' => $uid,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'),
+            '@uid' => $uid,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'delete-user-account'),
-      'error');
+        'error');
     watchdog('user', 'Attempted to cancel non-existing user account UID: %uid.', array('%uid' => $uid), WATCHDOG_ERROR);
     return;
-  }
-
-  global $base_url;
-  global $base_path;
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $site_url = $base_url . $base_path . "user/login";
-
-  // Perform the requested operation
-  $op = $form_state['values']['user_delete_action'];
-  // create token with 1 day/24 hour expiration
-  $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
-  switch ($op) {
+    }
+
+    global $base_url;
+    global $base_path;
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $site_url = $base_url . $base_path . "user/login";
+
+    // Perform the requested operation
+    $op = $form_state['values']['user_delete_action'];
+    // create token with 1 day/24 hour expiration
+    $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
+    switch ($op) {
     case 'boincuser_delete_softdelete':
       $myurl = "${base_url}/user/{$account->uid}/odeleteconfirm/$mytoken";
-      break;
+        break;
     case 'boincuser_delete_delete':
       $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
-      break;
-  }
+        break;
+    }
 
-  $mysubject = "Instructions for account deletion at {$site_name}";
-  $mymessage = ''
+    $mysubject = "Instructions for account deletion at {$site_name}";
+    $mymessage = ''
     . "{$account->boincuser_name},\n"
     . "\n"
     . "We have received a request to DELETE your user account at "
@@ -368,25 +368,25 @@ 
     . "\n"
     . "{$site_name} support team";
 
-  // Create array for sending email to user to notify account is being
-  // disabled/deleted. Then send email.
-  $settings = array(
+    // Create array for sending email to user to notify account is being
+    // disabled/deleted. Then send email.
+    $settings = array(
     'from' => '',
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
+    );
+    rules_action_mail_to_user($account, $settings);
 
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+    drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
+    $redirect = variable_get('boincuser_delete_redirect', '<front>');
+    // Redirect
+    if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+    }
+    else {
     drupal_goto();
-  }
+    }
 }
 
 
@@ -398,88 +398,88 @@ 
  * The final confirmation form for the user to delete their account.
  */
 function boincuser_delete_finalconfirmation(&$form_state, $token) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'D')) {
+    // check BOINC user exists
+    $account = user_load(array('uid' => $user->uid));
+    $uid = $user->uid;
+    $boincid = $account->boincuser_id;
+    // check $token is valid
+    if (!is_valid_token($boincid, $token, 'D')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
     array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+        '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
     ),
     NULL, 'boinc:delete-user-account'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
+    // Attach account to this form.
+    $form['_account'] = array('#type' => 'value', '#value' => $account);
 
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
+    // This form is for hard/wipe delete
+    $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
 
-  // Instructions
-  $form['main']['fs1'] = array(
+    // Instructions
+    $form['main']['fs1'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
     '#weight' => 10,
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['main']['fs1']['instructions1'] = array(
+    );
+    $form['main']['fs1']['instructions1'] = array(
     '#value' => '<p>'.
     bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  $form['main']['fs1']['instructions2'] = array(
+    $form['main']['fs1']['instructions2'] = array(
     '#value' => '<p>'.
     bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  // Password field
-  $form['main']['current_pass'] = array(
+    // Password field
+    $form['main']['current_pass'] = array(
     '#type' => 'password',
     '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
     '#size' => 17,
     '#attributes' => array(
-      'autocomplete' => 'off',
+        'autocomplete' => 'off',
     ),
     '#weight' => 25,
-  );
+    );
 
-  // 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('Submit', array(), NULL, 'boinc:form-submit'),
     '#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'), "account/") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -487,133 +487,133 @@ 
  * the soft/obfuscate method.
  */
 function boincuser_delete_softdelconfirmation(&$form_state, $token) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
+    // check BOINC user exists
+    $account = user_load(array('uid' => $user->uid));
+    $uid = $user->uid;
+    $boincid = $account->boincuser_id;
 
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'D')) {
+    // check $token is valid
+    if (!is_valid_token($boincid, $token, 'D')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
     array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+        '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
     ),
     NULL, 'boinc:delete-user-account'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
+    // Attach account to this form.
+    $form['_account'] = array('#type' => 'value', '#value' => $account);
 
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
+    // This form is for hard/wipe delete
+    $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
 
-  // Instructions
-  $form['main']['fs1'] = array(
+    // Instructions
+    $form['main']['fs1'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
     '#weight' => 10,
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['main']['fs1']['instructions1'] = array(
+    );
+    $form['main']['fs1']['instructions1'] = array(
     '#value' => '<p>'.
     bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  $form['main']['fs1']['instructions2'] = array(
+    $form['main']['fs1']['instructions2'] = array(
     '#value' => '<p>'.
     bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  // Password field
-  $form['main']['current_pass'] = array(
+    // Password field
+    $form['main']['current_pass'] = array(
     '#type' => 'password',
     '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
     '#size' => 17,
     '#attributes' => array(
-      'autocomplete' => 'off',
+        'autocomplete' => 'off',
     ),
     '#weight' => 25,
-  );
+    );
 
-  // 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('Submit', array(), NULL, 'boinc:form-submit'),
     '#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'), "account/") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
+    );
 
-  //set validation and submit to the functions below
-  $form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
-  $form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
-  return $form;
+    //set validation and submit to the functions below
+    $form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
+    $form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
+    return $form;
 }
 
 /**
  * Validation for final confirmation
  */
 function boincuser_delete_finalconfirmation_validate($form, &$form_state) {
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $account = $form_state['values']['_account'];
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+    if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
     return true;
-  }
+    }
 }
 
 /**
  * Submit for final confirmation
  */
 function boincuser_delete_finalconfirmation_submit($form, &$form_state) {
-  global $user;
+    global $user;
 
-  // Delete the user
-  $account = $form_state['values']['_account'];
-  $action = $form_state['values']['_action'];
-  _boincuser_delete_deleteuser($account, $action);
+    // Delete the user
+    $account = $form_state['values']['_account'];
+    $action = $form_state['values']['_action'];
+    _boincuser_delete_deleteuser($account, $action);
 
-  // Destroy the current session:
-  session_destroy();
-  // Only variables can be passed by reference workaround.
-  $null = NULL;
-  user_module_invoke('logout', $null, $user);
+    // Destroy the current session:
+    session_destroy();
+    // Only variables can be passed by reference workaround.
+    $null = NULL;
+    user_module_invoke('logout', $null, $user);
 
-  // Load the anonymous user
-  $user = drupal_anonymous_user();
+    // Load the anonymous user
+    $user = drupal_anonymous_user();
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
+    $redirect = variable_get('boincuser_delete_redirect', '<front>');
+    // Redirect
+    if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+    }
+    else {
     drupal_goto();
-  }
+    }
 
 }

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

Indentation +8 added lines, -8 removed lines

@@ -16,18 +16,18 @@
  */
 
 function boincuser_delete_rules_event_info() {
-  return array(
+    return array(
     'boincuser_delete_general_error' => array(
-      'label' => bts('Error from user deleting own account.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser_Delete',
-      'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
+        'label' => bts('Error from user deleting own account.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser_Delete',
+        'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
     ),
     'boincuser_delete_uid_invalid_error' => array(
-      'label' => bts('Error from user deleting own account. User ID is invalid', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser_Delete',
-      'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
+        'label' => bts('Error from user deleting own account. User ID is invalid', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser_Delete',
+        'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
     ),
-  );
+    );
 }
 
 // function rules_events_hook_boincuser_adminnotify_argument is located in boincuser_rules.inc
\ No newline at end of file

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

Indentation +21 added lines, -21 removed lines

@@ -16,44 +16,44 @@
  */
 
 function boincwork_rules_event_info() {
-  return array(
+    return array(
     'boincwork_circular_merge_error' => array(
-      'label' => bts('A circular merge of hosts was attempted with error.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'BOINCwork',
-      'arguments' => rules_events_hook_boincwork_arguments(),
+        'label' => bts('A circular merge of hosts was attempted with error.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'BOINCwork',
+        'arguments' => rules_events_hook_boincwork_arguments(),
     ),
     'boincwork_zombie_merge_error' => array(
-      'label' => bts('A host merge into a zombie host was attempted with error.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'BOINCwork',
-      'arguments' => rules_events_hook_boincwork_arguments(),
+        'label' => bts('A host merge into a zombie host was attempted with error.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'BOINCwork',
+        'arguments' => rules_events_hook_boincwork_arguments(),
     ),
-  );
+    );
 }
 
 /**
  * Arguments suitable for boincwork
  **/
 function rules_events_hook_boincwork_arguments() {
-  return array(
+    return array(
     'oldhost_id' => array(
-      'type' => 'number',
-      'label' => 'old host id',
-      'required' => TRUE,
+        'type' => 'number',
+        'label' => 'old host id',
+        'required' => TRUE,
     ),
     'targethost_id' => array(
-      'type' => 'number',
-      'label' => 'target host id',
-      'required' => TRUE,
+        'type' => 'number',
+        'label' => 'target host id',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincwork_adminnotify_argument();
+    ) + rules_events_hook_boincwork_adminnotify_argument();
 }
 
 function rules_events_hook_boincwork_adminnotify_argument() {
-  return array(
+    return array(
     'subject_tag' => array(
-      'type' => 'string',
-      'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Subject tag for email filtering',
+        'required' => TRUE,
     ),
-  ) + rules_events_global_user_argument();
+    ) + rules_events_global_user_argument();
 }
\ No newline at end of file

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>"
+            );
         }
 
     }