BOINC / boinc

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

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/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;
 }