BOINC / boinc

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

Indentation +99 added lines, -99 removed lines

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

html/user/recover_email.php

Indentation +2 added lines, -2 removed lines

@@ -56,9 +56,9 @@
                 "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0"
             );
             $result = delete_token($userid, $token, TOKEN_TYPE_CHANGE_EMAIL);
-	}
+    }
     } else {
-	echo tra("Invalid token.");
+    echo tra("Invalid token.");
     }
 } else {
     echo tra("Invalid token.");

html/user/delete_account_confirm.php

Indentation +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
     page_head(tra("Delete Account"));
     
     echo "<p>".tra("Thank you for verifying ownership of your account.")."</p>"
-         ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
-         ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
-         ."<br/>";
+            ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
+            ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
+            ."<br/>";
     
     form_start(secure_url_base()."delete_account_confirm.php", "post");
     form_input_hidden("token", $token);

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

Indentation +61 added lines, -61 removed lines

@@ -4,110 +4,110 @@
  * Implementation of hook_user_default_permissions().
  */
 function discussion_forums_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: access comments
-  $permissions['access comments'] = array(
+    // Exported permission: access comments
+    $permissions['access comments'] = array(
     'name' => 'access comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'anonymous user',
-      '2' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'anonymous user',
+        '2' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: administer comments
-  $permissions['administer comments'] = array(
+    // Exported permission: administer comments
+    $permissions['administer comments'] = array(
     'name' => 'administer comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: administer forums
-  $permissions['administer forums'] = array(
+    // Exported permission: administer forums
+    $permissions['administer forums'] = array(
     'name' => 'administer forums',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: assign community member role
-  $permissions['assign community member role'] = array(
+    // Exported permission: assign community member role
+    $permissions['assign community member role'] = array(
     'name' => 'assign community member role',
     'roles' => array(
-      '0' => 'moderator',
+        '0' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: create forum topics
-  $permissions['create forum topics'] = array(
+    // Exported permission: create forum topics
+    $permissions['create forum topics'] = array(
     'name' => 'create forum topics',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: delete any forum topic
-  $permissions['delete any forum topic'] = array(
+    // Exported permission: delete any forum topic
+    $permissions['delete any forum topic'] = array(
     'name' => 'delete any forum topic',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete own forum topics
-  $permissions['delete own forum topics'] = array(
+    // Exported permission: delete own forum topics
+    $permissions['delete own forum topics'] = array(
     'name' => 'delete own forum topics',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: edit any forum topic
-  $permissions['edit any forum topic'] = array(
+    // Exported permission: edit any forum topic
+    $permissions['edit any forum topic'] = array(
     'name' => 'edit any forum topic',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'moderator',
+        '0' => 'administrator',
+        '1' => 'moderator',
     ),
-  );
+    );
 
-  // Exported permission: edit own forum topics
-  $permissions['edit own forum topics'] = array(
+    // Exported permission: edit own forum topics
+    $permissions['edit own forum topics'] = array(
     'name' => 'edit own forum topics',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: post comments
-  $permissions['post comments'] = array(
+    // Exported permission: post comments
+    $permissions['post comments'] = array(
     'name' => 'post comments',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  // Exported permission: post comments without approval
-  $permissions['post comments without approval'] = array(
+    // Exported permission: post comments without approval
+    $permissions['post comments without approval'] = array(
     'name' => 'post comments without approval',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
-      '2' => 'moderator',
-      '3' => 'verified contributor',
+        '0' => 'administrator',
+        '1' => 'community member',
+        '2' => 'moderator',
+        '3' => 'verified contributor',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/boincuser_delete.admin.inc

Indentation +72 added lines, -72 removed lines

@@ -13,45 +13,45 @@ 
  *   a form array
  */
 function boincuser_delete_settings() {
-  $form = array();
+    $form = array();
 
-  $default = array(
+    $default = array(
     'boincuser_delete_type' => variable_get('boincuser_delete_type', ''),
     'boincuser_delete_redirect' => variable_get('boincuser_delete_redirect', '<front>'),
-  );
+    );
 
-  $form['options'] = array(
+    $form['options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Options'),
-  );
-  $form['options']['help'] = array(
+    );
+    $form['options']['help'] = array(
     '#value' => t('When a user deletes their account, which option is shown to the user? A soft/obfusate delete, a hard/wipe delete, or let the user chose between the two.'),
     '#weight' => 11,
-  );
-  $form['options']['boincuser_delete_type'] = array(
+    );
+    $form['options']['boincuser_delete_type'] = array(
     '#type' => 'radios',
     '#title' => t('Type of delete'),
     '#default_value' => $default['boincuser_delete_type'],
     '#options' => array(
-       'soft_obfuscate' => t('A soft/obfuscate delete. User\'s account is disabled, but some data is deleted.'),
-       'hard_wipe' => t('A hard/wipe delete. User\'s account is deleted along with many data.'),
-       'user_decides' => t('User is presented with radio buttons where they choose between the two options above.'),
+        'soft_obfuscate' => t('A soft/obfuscate delete. User\'s account is disabled, but some data is deleted.'),
+        'hard_wipe' => t('A hard/wipe delete. User\'s account is deleted along with many data.'),
+        'user_decides' => t('User is presented with radio buttons where they choose between the two options above.'),
     ),
     '#weight' => 21,
-  );
+    );
 
-  $form['redirect'] = array(
+    $form['redirect'] = array(
     '#type' => 'fieldset',
     '#title' => t('Redirect'),
-  );
-  $form['redirect']['boincuser_delete_redirect'] = array(
+    );
+    $form['redirect']['boincuser_delete_redirect'] = array(
     '#type' => 'textfield',
     '#title' => t('Redirection page'),
     '#default_value' => $default['boincuser_delete_redirect'],
     '#description' => t('Choose where to redirect your users after account deletion. Any valid Drupal path will do, e.g. %front or %node', array('%front' => '<front>', '%node' => 'node/1')),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 
@@ -60,124 +60,124 @@ 
  * password checks.
  */
 function boincuser_delete_admindelete(&$form_state, $uid) {
-  $form = array();
+    $form = array();
 
-  $form['#uid'] = $uid;
+    $form['#uid'] = $uid;
 
-  $form['account']['help'] = array(
+    $form['account']['help'] = array(
     '#value' => "<p>" . t("This form will delete this user <strong>without any email notification</strong> sent to the user. Be very careful in deleting users using this form. Once you select the delete type, check the checkbox, enter your password, and click submit, the user's account will be deleted. This will occur <strong>immediately</strong>. There is no 'undo'!") . "</p><p>" . t("You are deleting the following user, link opens in new window:") . "</p>",
     '#weight' => -1,
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  $account = user_load($uid);
-  if ($account) {
+    $account = user_load($uid);
+    if ($account) {
     drupal_set_title($account->boincuser_name);
 
     $form['account']['boincuser_name'] = array(
-      '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
+        '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
     );
     $form['account']['boincuser_id'] = array(
-      '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
+        '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
     );
     $form['account']['drupal_name'] = array(
-      '#value' => t('<li>Drupal username (internal): ') . $account->name,
+        '#value' => t('<li>Drupal username (internal): ') . $account->name,
     );
     $form['account']['user_id'] = array(
-      '#value' => t('<li>Drupal user ID: ') . $account->uid,
+        '#value' => t('<li>Drupal user ID: ') . $account->uid,
     );
 
     $form['account']['user_delete_action'] = array(
         '#type' => 'radios',
         '#options' => array(
-          'soft_obfuscate' => bts('<b>Soft delete</b> the account. The account will be disabled, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted, the host information deleted, and the user will be removed from any team.', array(), NULL, 'boinc:delete-user-account'),
-          'hard_wipe' => bts('<b>Delete</b> the account. The account will be deleted, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted.', array(), NULL, 'boinc:delete-user-account'),),
-      );
+            'soft_obfuscate' => bts('<b>Soft delete</b> the account. The account will be disabled, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted, the host information deleted, and the user will be removed from any team.', array(), NULL, 'boinc:delete-user-account'),
+            'hard_wipe' => bts('<b>Delete</b> the account. The account will be deleted, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted.', array(), NULL, 'boinc:delete-user-account'),),
+        );
 
     $form['account']['surecheckbox'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('I am <strong>sure</strong> I know what I am doing. I am <u><strong>deleting user</strong></u> %name.',
+        '#type' => 'checkbox',
+        '#title' => t('I am <strong>sure</strong> I know what I am doing. I am <u><strong>deleting user</strong></u> %name.',
         array('%name' => $account->boincuser_name)
-      ),
-      '#default_value' => FALSE,
+        ),
+        '#default_value' => FALSE,
     );
 
     $form['account']['current_pass'] = array(
-      '#type' => 'password',
-      '#title' => bts('Enter your password before clicking Submit, or click Cancel to return to the user\'s edit page', array(), NULL, 'boinc:delete-user-account'),
-      '#size' => 17,
-      '#attributes' => array(
+        '#type' => 'password',
+        '#title' => bts('Enter your password before clicking Submit, or click Cancel to return to the user\'s edit page', array(), NULL, 'boinc:delete-user-account'),
+        '#size' => 17,
+        '#attributes' => array(
         'autocomplete' => 'off',
-      ),
-      '#weight' => 25,
+        ),
+        '#weight' => 25,
     );
 
     // Action buttons
     $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Submit'),
+        '#type' => 'submit',
+        '#value' => t('Submit'),
     );
     $form['actions']['cancel'] = array(
-      '#type' => 'button',
-      '#value' => t('Cancel'),
-      '#executes_submit_callback' => TRUE,
-      '#validate' => array(),
-      '#submit' => array('_boincuser_delete_cancel'),
+        '#type' => 'button',
+        '#value' => t('Cancel'),
+        '#executes_submit_callback' => TRUE,
+        '#validate' => array(),
+        '#submit' => array('_boincuser_delete_cancel'),
     );
 
     $form['#redirect'] = 'account';
-  }
-  else {
+    }
+    else {
     $form['noaccount'] = array(
-      '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
+        '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
     );
-  }
+    }
 
-  return $form;
+    return $form;
 }
 
 /**
  * Validation function for admin delete user.
  */
 function boincuser_delete_admindelete_validate($form, &$form_state) {
-  global $user;
-  $boinc_user = boincuser_load($user->uid, TRUE);
+    global $user;
+    $boinc_user = boincuser_load($user->uid, TRUE);
 
-  if ($form_state['values']['user_delete_action'] == '') {
+    if ($form_state['values']['user_delete_action'] == '') {
     form_set_error('user_delete_action', t('Please select an action to perform using the radio buttons.'));
-  }
+    }
 
-  if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
+    if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
     form_set_error('user_delete_action', t('User Delete action not a predefined value, unknown error in radio buttons.'));
-  }
+    }
 
-  if (!($form_state['values']['surecheckbox'])) {
+    if (!($form_state['values']['surecheckbox'])) {
     return form_set_error('surecheckbox', t('Please confirm you are sure you want to delete this 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;
-  }
+    }
 }
 
 /**
  * Submit function for admin delete user.
  */
 function boincuser_delete_admindelete_submit($form, &$form_state) {
-  // This is the account to be deleted, and not the administrator's
-  // account.
-  $account = user_load(array('uid' => $form['#uid']));
-  $action = $form_state['values']['user_delete_action'];
+    // This is the account to be deleted, and not the administrator's
+    // account.
+    $account = user_load(array('uid' => $form['#uid']));
+    $action = $form_state['values']['user_delete_action'];
 
-  drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
+    drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
     array(
-      '@uid' => $form['#uid'],
-      '@displayname' => $account->boincuser_name,
+        '@uid' => $form['#uid'],
+        '@displayname' => $account->boincuser_name,
     )), 'warning');
 
-  // Delete the user
-  _boincuser_delete_deleteuser($account, $action);
+    // Delete the user
+    _boincuser_delete_deleteuser($account, $action);
 
-  drupal_goto('/admin/boinc/user_delete');
+    drupal_goto('/admin/boinc/user_delete');
 }

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

Indentation +56 added lines, -56 removed lines

@@ -9,28 +9,28 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+    drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+    drupal_goto('/user/' . $form['#uid'] . '/edit');
 }
 
 /**
  * Validation user password function.
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
-  if (!$current_pass) {
+    if (!$current_pass) {
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+    $given_hash = md5($current_pass . $boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+    if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  return true;
+    return true;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -41,56 +41,56 @@ 
  * Delete the user function.
  */
 function _boincuser_delete_deleteuser($account, $action=NULL) {
-  require_boinc('user_util');
-  require_boinc('delete_account');
+    require_boinc('user_util');
+    require_boinc('delete_account');
 
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  // watchdog message
-  watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
-  array(
+    // watchdog message
+    watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
+    array(
     '%uid' =>  $account->uid,
     '%boincuser_id' => $account->boincuser_id,
     '%displayname' => $account->boincuser_name,
-  ), WATCHDOG_NOTICE);
+    ), WATCHDOG_NOTICE);
 
-  // delete the account - This will delete the boinc user from the
-  // boinc project database, and then delete the Drupal user using the
-  // hook_user() functions.
+    // delete the account - This will delete the boinc user from the
+    // boinc project database, and then delete the Drupal user using the
+    // hook_user() functions.
 
-  switch ($action) {
+    switch ($action) {
     case 'soft_obfuscate':
       obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
+        _boincuser_delete_comment_reassign($account);
+        _boincuser_delete_node_reassign($account);
+        _boincuser_delete_privatemsg_delete($account);
+        _boincuser_delete_friends($account);
+        // delete the user's profile
+        $profile = content_profile_load('profile', $account->uid);
+        node_delete($profile->nid);
+        // Drupal account -
+        //  * 'block'/disable the account
+        //  * set name, mail, pass, and init to deleted
+        //  * erase signature
+        $myarray = array(
         'status'    => 0,
         'name'      => 'deleted_' . time() . '_' . random_string(),
         'mail'      => 'deleted_' . time() . '_' . random_string(),
         'pass'      => 'deleted_' . time() . '_' . random_string(),
         'signature' => '',
         'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
+        );
+        user_save($account, $myarray);
+        break;
     case 'hard_wipe':
       wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
+        user_delete(array(), $account->uid);
+        break;
     default:
       watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
         '%action' => $action,
-      ), WATCHDOG_ERROR);
-  }
+        ), WATCHDOG_ERROR);
+    }
 }
 
 /**
@@ -99,8 +99,8 @@ 
  * Copied from node.module, node_user()
  */
 function _boincuser_delete_node_reassign($account) {
-  db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
-  db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
 }
 
 /**
@@ -109,11 +109,11 @@ 
  * Copied from comment.module, comment_user()
  */
 function _boincuser_delete_comment_reassign($account) {
-  // bug in comment module, remove user name from comments.
-  db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
+    // bug in comment module, remove user name from comments.
+    db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
 
-  db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
-  db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
+    db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
 }
 
 /**
@@ -122,23 +122,23 @@ 
  * Copied from privatemsg module, case 'delete' in privatemsg_user().
  */
 function _boincuser_delete_privatemsg_delete($account) {
-  // Load all mids of the messages the user wrote.
-  $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
-  $mids = array();
-  while ($row = db_fetch_array($result)) {
+    // Load all mids of the messages the user wrote.
+    $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
+    $mids = array();
+    while ($row = db_fetch_array($result)) {
     $mids[] = $row['mid'];
-  }
+    }
 
-  // Delete messages the user wrote.
-  db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
+    // Delete messages the user wrote.
+    db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
 
-  if (!empty($mids)) {
+    if (!empty($mids)) {
     // Delete recipient entries in {pm_index} of the messages the user wrote.
     db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
-  }
+    }
 
-  // Delete recipient entries of that user.
-  db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
+    // Delete recipient entries of that user.
+    db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
 }
 
 /**
@@ -147,6 +147,6 @@ 
  * Copied from flag_friend, flag_friend_user()
  */
 function _boincuser_delete_friends($account) {
-  // remove any friend relationships if an account is removed
+    // remove any friend relationships if an account is removed
     db_query("DELETE FROM {flag_friend} WHERE uid = %d OR friend_uid = %d", $account->uid, $account->uid);
 }
\ No newline at end of file

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

Indentation +14 added lines, -14 removed lines

@@ -31,43 +31,43 @@
  */
 
 function boincuser_quote_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Comment form
-  case 'comment_form':
+    switch ($form_id) {
+    // Comment form
+    case 'comment_form':
     // If there is a quote as part of the comment body, replace the
     // first instance of quote=author with quote=boincusername. This
     // is done with regexp.
     // Modify for quotes only
     if ((isset($_POST['quote']) || isset($_GET['quote']) && $_GET['quote'])) {
-      // If default_value is already set, then modify it
-      if (isset($form['comment_filter']['comment']['#default_value'])) {
+        // If default_value is already set, then modify it
+        if (isset($form['comment_filter']['comment']['#default_value'])) {
         $nid = arg(2);
         $cid = arg(3);
 
         $replace = FALSE;
         if ($cid) {
-          $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
-          if ($comment->uid) {
+            $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
+            if ($comment->uid) {
             $account = user_load($comment->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
-          }
+            }
         }
         elseif ($nid && _quote_variable_get('node_link_display')) {
-          $node = node_load(array('nid' => $nid));
-          if (in_array($node->type, _quote_variable_get('node_types'))) {
+            $node = node_load(array('nid' => $nid));
+            if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
-          }
+            }
         }
 
         // Replace the quoted author name (drupal name) with BOINC username.
         if ($replace) {
-          $form['comment_filter']['comment']['#default_value'] = preg_replace("/\[quote=(.*?)\]/", "[quote=${boincusername}]", $form['comment_filter']['comment']['#default_value'], 1);
+            $form['comment_filter']['comment']['#default_value'] = preg_replace("/\[quote=(.*?)\]/", "[quote=${boincusername}]", $form['comment_filter']['comment']['#default_value'], 1);
+        }
         }
-      }
     }
     break;
-  }
+    }
 }

drupal/sites/all/features/user_profiles/user_profiles.views_default.inc

Indentation +403 added lines, -403 removed lines

@@ -4,22 +4,22 @@ 
  * Implementation of hook_views_default_views().
  */
 function user_profiles_views_default_views() {
-  $views = array();
+    $views = array();
 
-  // Exported view: moderation_queue
-  $view = new view;
-  $view->name = 'moderation_queue';
-  $view->description = '';
-  $view->tag = '';
-  $view->base_table = 'node';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: moderation_queue
+    $view = new view;
+    $view->name = 'moderation_queue';
+    $view->description = '';
+    $view->tag = '';
+    $view->base_table = 'node';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'title' => array(
-      'label' => 'Title',
-      'alter' => array(
+        'label' => 'Title',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -38,21 +38,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 1,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 1,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
     'changed' => array(
-      'label' => 'Updated date',
-      'alter' => array(
+        'label' => 'Updated date',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -71,22 +71,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'time ago',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'time ago',
+        'custom_date_format' => '',
+        'exclude' => 0,
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
     'uid' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -105,21 +105,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 1,
-      'exclude' => 1,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 1,
+        'exclude' => 1,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Author',
-      'alter' => array(
+        'label' => 'Author',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -138,81 +138,81 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'link_to_user' => 0,
-      'overwrite_anonymous' => 1,
-      'anonymous_text' => 'Anonymous',
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'link_to_user' => 0,
+        'overwrite_anonymous' => 1,
+        'anonymous_text' => 'Anonymous',
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'users',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'moderate' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'moderate',
-      'table' => 'node',
-      'field' => 'moderate',
-      'relationship' => 'none',
+        ),
+        'id' => 'moderate',
+        'table' => 'node',
+        'field' => 'moderate',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'role',
     'role' => array(
-      1271379760 => 1271379760,
+        1271379760 => 1271379760,
     ),
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('empty', bts('No content is in the queue for moderation.', array(), NULL, 'boinc:moderate-user-page'));
-  $handler->override_option('empty_format', '4');
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('empty', bts('No content is in the queue for moderation.', array(), NULL, 'boinc:moderate-user-page'));
+    $handler->override_option('empty_format', '4');
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 0,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'view_node' => 'view_node',
-      'title' => 'title',
-      'changed' => 'changed',
+        'view_node' => 'view_node',
+        'title' => 'title',
+        'changed' => 'changed',
     ),
     'info' => array(
-      'view_node' => array(
+        'view_node' => array(
         'separator' => '',
-      ),
-      'title' => array(
+        ),
+        'title' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'changed' => array(
+        ),
+        'changed' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'changed',
-  ));
-  $handler = $view->new_display('page', 'User profiles', 'page_1');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('page', 'User profiles', 'page_1');
+    $handler->override_option('fields', array(
     'uid' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -231,24 +231,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 1,
-      'exclude' => 1,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 1,
+        'exclude' => 1,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'User',
-      'alter' => array(
+        'label' => 'User',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -267,26 +267,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 1,
-      'overwrite_anonymous' => 0,
-      'anonymous_text' => '',
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 1,
+        'overwrite_anonymous' => 0,
+        'anonymous_text' => '',
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'users',
+        'field' => 'name',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'changed' => array(
-      'label' => 'Updated date',
-      'alter' => array(
+        'label' => 'Updated date',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -305,22 +305,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'time ago',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'time ago',
+        'custom_date_format' => '',
+        'exclude' => 0,
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Edit Profile',
-      'alter' => array(
+        'label' => 'Edit Profile',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -339,108 +339,108 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 $uid = $data->users_uid;
 return l(
 bts(\'edit\', array(), NULL, \'boinc:edit-profile\'),
 "/moderate/profile/$uid/edit");
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'moderate' => array(
-      'operator' => '=',
-      'value' => '1',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '1',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'moderate',
-      'table' => 'node',
-      'field' => 'moderate',
-      'override' => array(
+        ),
+        'id' => 'moderate',
+        'table' => 'node',
+        'field' => 'moderate',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'type' => array(
-      'operator' => 'in',
-      'value' => array(
+        'operator' => 'in',
+        'value' => array(
         'profile' => 'profile',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'override' => array(
+        ),
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('title', bts('User profile moderation queue', array(), NULL, 'boinc:moderate-user-page'));
-  $handler->override_option('path', 'moderate/profiles');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('title', bts('User profile moderation queue', array(), NULL, 'boinc:moderate-user-page'));
+    $handler->override_option('path', 'moderate/profiles');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'Queue',
     'description' => '',
     'weight' => '-50',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'normal',
     'title' => 'Moderation',
     'description' => '',
     'weight' => '0',
     'name' => 'primary-links',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: user_activity
-  $view = new view;
-  $view->name = 'user_activity';
-  $view->description = 'A feed of a user\'s activity on the site';
-  $view->tag = '';
-  $view->base_table = 'node_revisions';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
+    // Exported view: user_activity
+    $view = new view;
+    $view->name = 'user_activity';
+    $view->description = 'A feed of a user\'s activity on the site';
+    $view->tag = '';
+    $view->base_table = 'node_revisions';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('relationships', array(
     'uid' => array(
-      'label' => 'user',
-      'required' => 1,
-      'id' => 'uid',
-      'table' => 'node_revisions',
-      'field' => 'uid',
-      'relationship' => 'none',
+        'label' => 'user',
+        'required' => 1,
+        'id' => 'uid',
+        'table' => 'node_revisions',
+        'field' => 'uid',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('fields', array(
     'nid' => array(
-      'label' => 'Nid',
-      'alter' => array(
+        'label' => 'Nid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -459,21 +459,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'nid',
-      'table' => 'node',
-      'field' => 'nid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'nid',
+        'table' => 'node',
+        'field' => 'nid',
+        'relationship' => 'none',
     ),
     'title' => array(
-      'label' => 'Title',
-      'alter' => array(
+        'label' => 'Title',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -492,21 +492,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
     'type' => array(
-      'label' => 'Type',
-      'alter' => array(
+        'label' => 'Type',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -525,22 +525,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_node' => 0,
-      'machine_name' => 0,
-      'exclude' => 1,
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_node' => 0,
+        'machine_name' => 0,
+        'exclude' => 1,
+        'id' => 'type',
+        'table' => 'node',
+        'field' => 'type',
+        'relationship' => 'none',
     ),
     'uid' => array(
-      'label' => 'Uid',
-      'alter' => array(
+        'label' => 'Uid',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -559,21 +559,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'link_to_user' => 0,
-      'exclude' => 1,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'relationship' => 'uid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'link_to_user' => 0,
+        'exclude' => 1,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'relationship' => 'uid',
     ),
     'nothing' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'text' => '<div class="gray-divider"></div>',
         'make_link' => 0,
         'path' => '',
@@ -591,20 +591,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'nothing',
-      'table' => 'views',
-      'field' => 'nothing',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'nothing',
+        'table' => 'views',
+        'field' => 'nothing',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -623,12 +623,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 
 switch($data->node_type) {
 case \'forum\':
@@ -657,18 +657,18 @@ 
 $account = user_load($uid);
 echo l($account->boincuser_name, "account/{$uid}") . " {$action} " . l($data->node_title, $url, array(\'fragment\' => $fragment));
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Override',
-      ),
+        ),
     ),
     'body' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -687,20 +687,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 1,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'body',
-      'table' => 'node_revisions',
-      'field' => 'body',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'body',
+        'table' => 'node_revisions',
+        'field' => 'body',
+        'relationship' => 'none',
     ),
     'timestamp' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -719,40 +719,40 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'jS F Y',
-      'exclude' => 0,
-      'id' => 'timestamp',
-      'table' => 'node_revisions',
-      'field' => 'timestamp',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'jS F Y',
+        'exclude' => 0,
+        'id' => 'timestamp',
+        'table' => 'node_revisions',
+        'field' => 'timestamp',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'uid' => array(
-      'default_action' => 'default',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'user',
-      'default_argument' => '',
-      'validate_type' => 'user',
-      'validate_fail' => 'empty',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'uid',
-      'table' => 'users',
-      'field' => 'uid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'default',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'user',
+        'default_argument' => '',
+        'validate_type' => 'user',
+        'validate_fail' => 'empty',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -761,20 +761,20 @@ 
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'relationship' => 'uid',
-      'default_options_div_prefix' => '',
-      'default_taxonomy_tid_term_page' => 0,
-      'default_taxonomy_tid_node' => 0,
-      'default_taxonomy_tid_limit' => 0,
-      'default_taxonomy_tid_vids' => array(
+        ),
+        'relationship' => 'uid',
+        'default_options_div_prefix' => '',
+        'default_taxonomy_tid_term_page' => 0,
+        'default_taxonomy_tid_node' => 0,
+        'default_taxonomy_tid_limit' => 0,
+        'default_taxonomy_tid_vids' => array(
         1 => 0,
         2 => 0,
-      ),
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'team' => 0,
@@ -783,20 +783,20 @@ 
         'forum' => 0,
         'panel' => 0,
         'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
         2 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-      'me_redirect' => 0,
-      'me_validate_user_argument_type' => 'uid',
-      'me_validate_user_roles' => array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+        'me_redirect' => 0,
+        'me_validate_user_argument_type' => 'uid',
+        'me_validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -805,67 +805,67 @@ 
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'validate_argument_node_flag_name' => '*relationship*',
-      'validate_argument_node_flag_test' => 'flaggable',
-      'validate_argument_node_flag_id_type' => 'id',
-      'validate_argument_user_flag_name' => '*relationship*',
-      'validate_argument_user_flag_test' => 'flaggable',
-      'validate_argument_user_flag_id_type' => 'id',
-      'me_validate_user_restrict_roles' => 0,
+        ),
+        'validate_argument_node_flag_name' => '*relationship*',
+        'validate_argument_node_flag_test' => 'flaggable',
+        'validate_argument_node_flag_id_type' => 'id',
+        'validate_argument_user_flag_name' => '*relationship*',
+        'validate_argument_user_flag_test' => 'flaggable',
+        'validate_argument_user_flag_id_type' => 'id',
+        'me_validate_user_restrict_roles' => 0,
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('items_per_page', 5);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('items_per_page', 5);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('row_options', array(
     'inline' => array(
-      'value' => 'value',
-      'phpcode_1' => 'phpcode_1',
+        'value' => 'value',
+        'phpcode_1' => 'phpcode_1',
     ),
     'separator' => ' ',
     'hide_empty' => 0,
-  ));
-  $handler = $view->new_display('block', 'Block', 'block_1');
-  $handler->override_option('block_description', '');
-  $handler->override_option('block_caching', -1);
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('title', 'Recent posts');
-  $handler->override_option('style_plugin', 'grid');
-  $handler->override_option('style_options', array(
+    ));
+    $handler = $view->new_display('block', 'Block', 'block_1');
+    $handler->override_option('block_description', '');
+    $handler->override_option('block_caching', -1);
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('title', 'Recent posts');
+    $handler->override_option('style_plugin', 'grid');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'columns' => '1',
     'alignment' => 'vertical',
     'fill_single_line' => 1,
     'summary' => '',
-  ));
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('row_options', array(
     'inline' => array(),
     'separator' => '',
     'hide_empty' => 0,
-  ));
-  $handler->override_option('path', 'account/%/posts');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/%/posts');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => '0',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  return $views;
+    return $views;
 }

html/inc/util.inc

Indentation +6 added lines, -6 removed lines

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