BOINC / boinc

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

Indentation +73 added lines, -73 removed lines

@@ -15,41 +15,41 @@ 
  */
 function boincteam_sync() {
 
-  // Get the list of teams to import
-  db_set_active('boinc_rw');
-  $boinc_teams = db_query('
+    // Get the list of teams to import
+    db_set_active('boinc_rw');
+    $boinc_teams = db_query('
     SELECT id, name, description, userid, create_time, seti_id
     FROM team
     WHERE mod_time > FROM_UNIXTIME(%d)',
     variable_get('boincteam_last_sync', 0)
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  $existing_teams = array();
+    $existing_teams = array();
 
-  // Get the list of teams already in Drupal to be sure we're not importing
-  // any twice
-  $result = db_query('
+    // Get the list of teams already in Drupal to be sure we're not importing
+    // any twice
+    $result = db_query('
     SELECT nid, team_id FROM {boincteam}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_teams[$row->team_id] = $row->nid;
-  }
+    }
 
-  while ($boinc_team = db_fetch_object($boinc_teams)) {
+    while ($boinc_team = db_fetch_object($boinc_teams)) {
     $success = NULL;
     if (isset($existing_teams[$boinc_team->id])) {
-      if ($boinc_team->seti_id > 0) {
+        if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
-      }
+        }
     }
     else {
-      // Import new teams created by RPC or ops/team_import.php
-      $success = boincteam_import($boinc_team);
+        // Import new teams created by RPC or ops/team_import.php
+        $success = boincteam_import($boinc_team);
+    }
     }
-  }
 }
 
 
@@ -58,58 +58,58 @@ 
  */
 function boincteam_import($boincteam, $nid = NULL) {
 
-  $input_format = variable_get('boincimport_input_format', 0);
-  $team_type_map = variable_get('boincimport_team_types', array());
+    $input_format = variable_get('boincimport_input_format', 0);
+    $team_type_map = variable_get('boincimport_team_types', array());
 
-  // Save the team type affiliation
-  $team_type_tid = $team_type_map[$boincteam->type];
+    // Save the team type affiliation
+    $team_type_tid = $team_type_map[$boincteam->type];
 
-  $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
-  // Be sure the text is filtered for the default input format
-  $boincteam->description = check_markup($boincteam->description, $input_format);
+    $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
+    // Be sure the text is filtered for the default input format
+    $boincteam->description = check_markup($boincteam->description, $input_format);
 
-  $teaser = node_teaser($boincteam->description);
+    $teaser = node_teaser($boincteam->description);
 
-  if ($nid) {
+    if ($nid) {
     // Update an existing node
     $node = node_load($nid);
     $node->title = $boincteam->name;
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+    }
+    else {
     // Construct the team as a new node
     $node = array(
-      'type' => 'team',
-      'title' => $boincteam->name,
-      'body' => $boincteam->description,
-      'teaser' => $teaser,
-      'uid' => boincuser_lookup_uid($boincteam->userid),
-      'path' => null,
-      'status' => 1,  // published or not - always publish
-      'promote' => 0,
-      'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
-      'moderate' => 0,
-      'sticky' => 0,
-      'format' => $input_format
+        'type' => 'team',
+        'title' => $boincteam->name,
+        'body' => $boincteam->description,
+        'teaser' => $teaser,
+        'uid' => boincuser_lookup_uid($boincteam->userid),
+        'path' => null,
+        'status' => 1,  // published or not - always publish
+        'promote' => 0,
+        'created' => $boincteam->create_time,
+        'comment' => 0,  // comments disabled
+        'moderate' => 0,
+        'sticky' => 0,
+        'format' => $input_format
     );
     $node = (object) $node; // node_save requires an object form
-  }
+    }
 
-  $node->taxonomy[] = taxonomy_get_term($team_type_tid);
+    $node->taxonomy[] = taxonomy_get_term($team_type_tid);
 
-  // Save the team node
-  node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+    // Save the team node
+    node_save($node);
+    $success = ($node->nid) ? TRUE : FALSE;
 
-  if (!$nid) {
+    if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed
     db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam->id, $node->nid);
-  }
+    }
 
-  return $success;
+    return $success;
 }
 
 /**
@@ -126,25 +126,25 @@ 
  *   respected. This is useful the list of users are to be contacted.
  */
 function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
-  $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
-  if ($respectprivacy) {
+    $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
+    if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
-  }
+    }
 
-  db_set_active('boinc_ro');
-  $dbres = db_query($sql, $boincteamid);
-  db_set_active('default');
+    db_set_active('boinc_ro');
+    $dbres = db_query($sql, $boincteamid);
+    db_set_active('default');
 
-  $ids = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+    $ids = array();
+    while (($result = db_fetch_object($dbres)) != FALSE) {
     $ids[] = $result->id;
-  }
-  if ($boincid) {
+    }
+    if ($boincid) {
     return $ids;
-  }
-  else {
+    }
+    else {
     return array_map('boincuser_lookup_uid', $ids);
-  }
+    }
 }
 
 /**
@@ -158,18 +158,18 @@ 
  *   respected. This is useful the list of users are to be contacted.
  */
 function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
-  $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
-  if ($respectprivacy) {
+    $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
+    if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
-  }
+    }
 
-  db_set_active('boinc_ro');
-  $dbres = db_query($sql, $boincteamid);
-  db_set_active('default');
+    db_set_active('boinc_ro');
+    $dbres = db_query($sql, $boincteamid);
+    db_set_active('default');
 
-  $emails = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+    $emails = array();
+    while (($result = db_fetch_object($dbres)) != FALSE) {
     $emails[] = $result->email_addr;
-  }
-  return $emails;
+    }
+    return $emails;
 }

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

Indentation +333 added lines, -333 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
 
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
 
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name), NULL, 'boinc:team-create/edit'));
     }
-  }
+    }
 
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
 
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
 
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
 
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
 
-  // Create the team node in Drupal
+    // Create the team node in Drupal
 
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
 
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
 
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // Use pathauto function, if available, to clean up the path
+    if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
 
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
 
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
 
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
 
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
 
-  // Save the team node
-  node_save($node);
+    // Save the team node
+    node_save($node);
 
-  // Save the team IDs to a BOINC <--> Drupal reference table.
-  db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
 
-  drupal_set_message(t('Team "@name" has been created.',
+    drupal_set_message(t('Team "@name" has been created.',
     array('@name' => $values['name'])));
 
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
 
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
 
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
 
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
 
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
 
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
 
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         )),
         NULL, 'boinc:team-edit-warning-message'),
-      'warning');
-  }
+        'warning');
+    }
 
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
 
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name), NULL, 'boinc:team-create/edit'));
         }
-      }
+        }
     }
 
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
 
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
 
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
 
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  // Update the team node in Drupal
+    // Update the team node in Drupal
 
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
 
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
 
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
 
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
 
-  drupal_set_message(t('Details for "@team" have been updated.',
+    drupal_set_message(t('Details for "@team" have been updated.',
     array('@team' => $values['name'])));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,44 +508,44 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
 
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
 
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
 
-  $default = array(
+    $default = array(
     'username' => '',
-  );
+    );
 
-  // Form elements
-  $form['username'] = array(
+    // Form elements
+    $form['username'] = array(
     '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
     '#size' => 34,
     '#autocomplete_path' => "community/teams/${team_id}/user-name-autocomplete",
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
 
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -553,45 +553,45 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
-  $team = node_load($team_id);
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
+    $team = node_load($team_id);
 
-  if (!$values['username']) {
+    if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+    }
+    else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('username', bts('There is no user on your team with name @username.',
+        form_set_error('username', bts('There is no user on your team with name @username.',
         array(
-          '@username' => $account->boincuser_name
+            '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+        NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
+        form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is already an admin of @team.',
+        form_set_error('username', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -599,17 +599,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
 
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
 
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -617,17 +617,17 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
 
 
-  drupal_set_message(t('@user has been added as an admin.',
+    drupal_set_message(t('@user has been added as an admin.',
     array('@user' => $user_name)));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -639,80 +639,80 @@ 
  * Send all team members an email message function
  */
 function boincteam_sendmessagetoteam(&$form_state, $team_id) {
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  if (isset($form_state['values'])) {
+    if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+    }
+    else {
     $subject   = '';
     $body      = '';
-  }
+    }
 
-  // Title
-  $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
-  drupal_set_title($mytitle);
+    // Title
+    $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
+    drupal_set_title($mytitle);
 
-  $form['emailteam']['header'] = array(
+    $form['emailteam']['header'] = array(
     '#value'              => '<h1>' . $mytitle . '</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  $form['emailteam']['instructions'] = array(
+    $form['emailteam']['instructions'] = array(
     '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), NULL, 'boinc:team-message-form'),
     '#weight'             => '-8',
     '#prefix'             => "<div id='sendmessageteammembers-instructions'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  // Subject
-  $form['emailteam']['subject'] = array(
+    // Subject
+    $form['emailteam']['subject'] = array(
     '#type'               => 'textfield',
     '#title'              => bts('Subject', array(), NULL, 'boinc:team-message-form'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
     '#weight'             => -5,
-  );
+    );
 
-  // Body
-  $form['emailteam']['body'] = array(
+    // Body
+    $form['emailteam']['body'] = array(
     '#type'               => 'textarea',
     '#title'              => bts('Message', array(), NULL, 'boinc:team-message-form'),
     '#rows'               => 8,
     '#weight'             => 0,
     '#default_value'      => $body,
     '#resizable'          => TRUE,
-  );
+    );
 
-  // checkbox for 'sent to self'
-  $form['emailteam']['selfsend'] = array(
+    // checkbox for 'sent to self'
+    $form['emailteam']['selfsend'] = array(
     '#type'    => 'checkbox',
     '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), NULL, 'boinc:team-message-form'),
     '#weight'  => 10,
     '#prefix'  => '<div class="clearfix" id="confirm-checkbox">',
     '#suffix'  => '</div>',
-  );
+    );
 
-  // Add a captcha to form
-  if (module_exists('captcha')) {
+    // Add a captcha to form
+    if (module_exists('captcha')) {
     $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
     );
-  }
+    }
 
-  // form buttons
-  $form['emailteam']['form control tabs prefix'] = array(
+    // form buttons
+    $form['emailteam']['form control tabs prefix'] = array(
     '#value'  => '<ul class="form-control tab-list">',
     '#weight' => 1000,
-  );
+    );
 
-  $form['emailteam']['submit'] = array(
+    $form['emailteam']['submit'] = array(
     '#type'               => 'submit',
     '#value'              => bts('Send message', array(), NULL, 'boinc:form-submit'),
     '#submit'             => array('boincteam_sendmessagetoteam_submit'),
@@ -720,133 +720,133 @@ 
     '#weight'             => 1001,
     '#prefix'             => '<li class="first tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
-  $url = "community/teams/{$team_id}";
-  $form['emailteam']['cancel'] = array(
+    $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
+    $url = "community/teams/{$team_id}";
+    $form['emailteam']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
     '#weight'             => 1005,
     '#prefix'             => '<li class="tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $form['emailteam']['form control tabs suffix'] = array(
+    $form['emailteam']['form control tabs suffix'] = array(
     '#value'  => '</ul>',
     '#weight' => 1010,
-  );
+    );
 
-  // Add team id information to form_state
-  $form['_team_id'] = array(
+    // Add team id information to form_state
+    $form['_team_id'] = array(
     '#type'  => 'value',
     '#value' => $team_id,
-  );
+    );
 
-  // Add sender user object to form_state
-  $form['_senderuid'] = array(
+    // Add sender user object to form_state
+    $form['_senderuid'] = array(
     '#type'  => 'value',
     '#value' => $user->uid,
-  );
+    );
 
-  // redirect after sending message
-  $form['#redirect'] = "community/teams/{$team_id}";
+    // redirect after sending message
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
  * Send all team members validation handler
  */
 function boincteam_sendmessagetoteam_validate($form, &$form_state) {
-  $message = $form_state['values'];
-  $message['timestamp'] = time();
-  // Avoid subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
+    $message = $form_state['values'];
+    $message['timestamp'] = time();
+    // Avoid subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
-  if (empty($message['subject']) && !empty($trimed_body)) {
+    $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+    if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
     $form_state['values']['subject'] = $message['subject'];
-  }
+    }
 
-  // Check subject line
-  $message['subject'] = trim($message['subject']);
-  if (empty($message['subject'])) {
+    // Check subject line
+    $message['subject'] = trim($message['subject']);
+    if (empty($message['subject'])) {
     form_set_error('subject',
-      bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+    // Check body
+    if ( ($message['body'] === NULL || $message['body'] === '') ) {
     form_set_error('body',
-      bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check team id
-  if (empty($message['_team_id'])) {
+    // Check team id
+    if (empty($message['_team_id'])) {
     form_set_error('team_id',
-      bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
+        bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  $form_state['validated_built_message'] = $message;
+    $form_state['validated_built_message'] = $message;
 }
 
 /**
  * Send all team members submit handler
  */
 function boincteam_sendmessagetoteam_submit($form, &$form_state) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  global $base_url;
-  global $base_path;
-
-  $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "messages/new/" . $suid;
-
-  // Form is validated, now send to all team members. Lookup boinc
-  // id of all team members, and then use user_load() to load user
-  // object. Send message using email.
-  //
-  $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
-  // Email addresses, with those who have opt-ed out of notification
-  // emails removed.
-  $member_emails = _boincteam_emails($boinc_id);
-  // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    global $base_url;
+    global $base_path;
+
+    $suid = $form_state['values']['_senderuid'];
+    $account = user_load(array('uid' => $suid ));
+    $site_url = $base_url . $base_path . "messages/new/" . $suid;
+
+    // Form is validated, now send to all team members. Lookup boinc
+    // id of all team members, and then use user_load() to load user
+    // object. Send message using email.
+    //
+    $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
+    // Email addresses, with those who have opt-ed out of notification
+    // emails removed.
+    $member_emails = _boincteam_emails($boinc_id);
+    // Remove sender's email address, unless selfsend is true.
+    if ( !$form_state['values']['selfsend'] ) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
-  }
+    }
 
-  // Add link at bottom of body
-  $mybody = $form_state['validated_built_message']['body'];
-  $mybody .= "\n\n"
-      . "To reply to the sender using a Direct Message (DM), please use this link:\n"
-      . "${site_url}";
+    // Add link at bottom of body
+    $mybody = $form_state['validated_built_message']['body'];
+    $mybody .= "\n\n"
+        . "To reply to the sender using a Direct Message (DM), please use this link:\n"
+        . "${site_url}";
 
-  // Transform HTML body into plain text
-  $mybody = drupal_html_to_text($mybody);
+    // Transform HTML body into plain text
+    $mybody = drupal_html_to_text($mybody);
 
-  $emailsettings = array(
+    $emailsettings = array(
     'from'    => '',
     'to'      => "webmaster@{$base_url}",
     'boincteam_headers' => array(
-      'Bcc'     => implode(', ', $member_emails),
+        'Bcc'     => implode(', ', $member_emails),
     ),
     'subject' => $form_state['validated_built_message']['subject'],
     'message' => $mybody,
-  );
-  rules_action_mail($emailsettings);
+    );
+    rules_action_mail($emailsettings);
 
-  $om = bts(
+    $om = bts(
     'Sent your email message to !number team members.',
     array( '!number' => count($member_emails) ),
     'NULL',
     'boinc:team-message-sent'
-  );
-  drupal_set_message($om, 'info');
+    );
+    drupal_set_message($om, 'info');
 
-  $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
+    $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
 }

drupal/sites/default/boinc/modules/boincteam/boincteam_forum.views.inc

Indentation +42 added lines, -42 removed lines

@@ -13,80 +13,80 @@
  */
 function boincteam_forum_views_data() {
 
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['boincteam_forum_node']['table']['group'] = t('BOINC');
+    $data['boincteam_forum_node']['table']['group'] = t('BOINC');
 
-  $data['boincteam_forum_node']['table']['base'] = array(
-      'field' => 'nid',
-      'title' => t('BOINC team forum topic'),
-      'help' => t('Forum topics for a team'),
-  );
+    $data['boincteam_forum_node']['table']['base'] = array(
+        'field' => 'nid',
+        'title' => t('BOINC team forum topic'),
+        'help' => t('Forum topics for a team'),
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
 
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['boincteam_forum_node']['tfid'] = array(
+    $data['boincteam_forum_node']['tfid'] = array(
     'title' => t('Team forum ID'),
     'help' => t('The ID of the team forum containing this topic.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'boincteam_forum',
-      'field' => 'tfid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team Forum')
+        'base' => 'boincteam_forum',
+        'field' => 'tfid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team Forum')
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Foreign key fields
+    // Foreign key fields
 
-  $data['boincteam_forum_node']['nid'] = array(
+    $data['boincteam_forum_node']['nid'] = array(
     'title' => t('Team forum node'),
     'help' => t('The node containing the content of this team forum topic.'),
     // This is a foreign key to the {node} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // available.
     'relationship' => array(
-      'base' => 'node',
-      'field' => 'nid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team Forum Topic Node')
+        'base' => 'node',
+        'field' => 'nid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team Forum Topic Node')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Descriptions of general fields (alphabetized)
-  // ...
+    // Descriptions of general fields (alphabetized)
+    // ...
 
-  return $data;
+    return $data;
 }

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

Indentation +206 added lines, -206 removed lines

@@ -13,103 +13,103 @@ 
  */
 function boincteam_views_data() {
 
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['team']['table']['group'] = t('BOINC');
+    $data['team']['table']['group'] = t('BOINC');
 
-  $data['team']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC team'),
-      'help' => t('BOINC data for a team'),
-      'database' => 'boinc_rw'
-  );
+    $data['team']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC team'),
+        'help' => t('BOINC data for a team'),
+        'database' => 'boinc_rw'
+    );
 
-  // This table references the {user} table.
-  // This join creates an 'implicit' relationship to the user table, so that when
-  // "User" is the base table, the fields are automatically available.
+    // This table references the {user} table.
+    // This join creates an 'implicit' relationship to the user table, so that when
+    // "User" is the base table, the fields are automatically available.
 
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
 
-  $data['team']['table']['join'] = array(
+    $data['team']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid',
+        'left_field' => 'id',
+        'field' => 'userid',
     ),
-  );
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
 
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['team']['id'] = array(
+    $data['team']['id'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'team_delta',
-      'field' => 'id',
-      'base field' => 'teamid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team History')
+        'base' => 'team_delta',
+        'field' => 'id',
+        'base field' => 'teamid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team History')
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Foreign key fields
+    // Foreign key fields
 
-  $data['team']['userid'] = array(
+    $data['team']['userid'] = array(
     'title' => bts('Founder', array(), NULL, 'boinc:view-team-info'),
     'help' => t('The founder of this team.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Descriptions of general fields (alphabetized)
-  /*
+    // Descriptions of general fields (alphabetized)
+    /*
   $data['team']['create_time'] = array(
     'title' => bts('Team established', array(), NULL, 'boinc:date-team-established'),
     'help' => t('When the BOINC team was created.'),
@@ -140,298 +140,298 @@ 
   );
   */
 
-  $data['team']['country'] = array(
+    $data['team']['country'] = array(
     'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     'help' => t('The country of a team.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['team']['expavg_credit'] = array(
+    );
+    $data['team']['expavg_credit'] = array(
     'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of team credit per day.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['team']['name'] = array(
+    );
+    $data['team']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     'help' => t('The name of the team.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['team']['nusers'] = array(
+    );
+    $data['team']['nusers'] = array(
     'title' => bts('Members', array(), NULL, 'boinc:team-members'),
     'help' => t('Count of team members.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['team']['total_credit'] = array(
+    );
+    $data['team']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total team accumulated BOINC credit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team_admin table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team_admin table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['team_admin']['table']['group'] = t('BOINC');
+    $data['team_admin']['table']['group'] = t('BOINC');
 
-  $data['team_admin']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC team admins'),
-      'help' => t('BOINC admins for a team'),
-      'database' => 'boinc_rw'
-  );
+    $data['team_admin']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC team admins'),
+        'help' => t('BOINC admins for a team'),
+        'database' => 'boinc_rw'
+    );
 
-  // This table references the {team} table.
-  // This join creates an 'implicit' relationship to the team table, so that when
-  // "Team" is the base table, the fields are automatically available.
+    // This table references the {team} table.
+    // This join creates an 'implicit' relationship to the team table, so that when
+    // "Team" is the base table, the fields are automatically available.
 
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
 
-  $data['team_admin']['table']['join'] = array(
+    $data['team_admin']['table']['join'] = array(
     'team' => array(
-      'left_field' => 'id',
-      'field' => 'teamid',
+        'left_field' => 'id',
+        'field' => 'teamid',
     ),
-  );
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
 
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['team_admin']['teamid'] = array(
+    $data['team_admin']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team on which this user is an admin.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'team',
-      'field' => 'teamid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team')
+        'base' => 'team',
+        'field' => 'teamid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team')
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Foreign key fields
+    // Foreign key fields
 
-  $data['team_admin']['userid'] = array(
+    $data['team_admin']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The user that is a team admin.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => bts('User', array(), NULL, 'boinc:user-on-team')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => bts('User', array(), NULL, 'boinc:user-on-team')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Descriptions of general fields (alphabetized)
+    // Descriptions of general fields (alphabetized)
 
-  $data['team_admin']['create_time'] = array(
+    $data['team_admin']['create_time'] = array(
     'title' => bts('Admin since', array(), NULL, 'boinc:team-when-user-became-an-admin'),
     'help' => t('When the BOINC user became a team admin.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
+    );
 
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team_delta table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team_delta table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['team_delta']['table']['group'] = t('BOINC');
+    $data['team_delta']['table']['group'] = t('BOINC');
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
 
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['team_delta']['teamid'] = array(
+    $data['team_delta']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The team ID for this team history event.'),
     // This is a foreign key to the {team} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Foreign key fields
+    // Foreign key fields
 
-  $data['team_delta']['userid'] = array(
+    $data['team_delta']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The user for this team history event.'),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  // Descriptions of general fields (alphabetized)
+    // Descriptions of general fields (alphabetized)
 
-  $data['team_delta']['joining'] = array(
+    $data['team_delta']['joining'] = array(
     'title' => bts('User joined', array(), NULL, 'boinc:user-joined-or-leaving-team'),
     'help' => t('Whether the event is the user joining the team or leaving.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['team_delta']['timestamp'] = array(
+    );
+    $data['team_delta']['timestamp'] = array(
     'title' => bts('Timestamp', array(), NULL, 'boinc:team-history-timestamp'),
     'help' => t('When the BOINC team history event took place.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['team_delta']['total_credit'] = array(
+    );
+    $data['team_delta']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit of the user when the
       history event took place.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
-  return $data;
+    return $data;
 }
 
 /*
@@ -442,14 +442,14 @@ 
  */
 
 function boincteam_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincteam') . '/views',
+        'path' => drupal_get_path('module', 'boincteam') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincteam_id' => array(
+        'views_handler_argument_boincteam_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      )
+        )
     )
-  );
+    );
 }

drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module

Indentation +121 added lines, -121 removed lines

@@ -25,29 +25,29 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_forum_menu() {
-  $items = array();
+    $items = array();
 
-  return $items;
+    return $items;
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Team forum node edit form
-  case 'team_forum_node_form':
+    switch ($form_id) {
+    // Team forum node edit form
+    case 'team_forum_node_form':
 
     // Internal fields to indicate where these changes are taking place
     array_unshift($form, array(
-      'tfid' => array(
+        'tfid' => array(
         '#type' => 'hidden',
         '#value' => arg(3),
-      ),
+        ),
     ));
     break;
 
-  default:
+    default:
   }
 }
 
@@ -56,26 +56,26 @@ 
  * Obsolete in Drupal 7...
  */
 function boincteam_forum_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // In Drupal 7, these operation cases will all exist as their own hooks,
-  // so let's approximate that here so that this function can simply be removed
-  // upon migration to 7
-  switch($op) {
-  case 'insert':
+    // In Drupal 7, these operation cases will all exist as their own hooks,
+    // so let's approximate that here so that this function can simply be removed
+    // upon migration to 7
+    switch($op) {
+    case 'insert':
     boincteam_forum_node_insert($node);
     break;
-  case 'load':
+    case 'load':
     boincteam_forum_node_load($node);
     break;
-  case 'update':
+    case 'update':
     boincteam_forum_node_update($node);
     break;
-  case 'validate':
+    case 'validate':
     boincteam_forum_node_validate($node);
     break;
-  case 'view':
+    case 'view':
     boincteam_forum_node_view($node);
     break;
-  default:
+    default:
   }
 }
 
@@ -84,21 +84,21 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     if ($account->team == $team_id) {
-      db_query("
+        db_query("
         INSERT INTO {boincteam_forum_node} SET
           nid = %d,
           tfid = %d",
         $node->nid, $node->tfid
-      );
+        );
     }
     unset($node->tfid);
     break;
-  default:
+    default:
   }
 }
 
@@ -107,15 +107,15 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
       WHERE nid = %d", $node->nid
     ));
     break;
 
-  default:
+    default:
 
   }
 }
@@ -125,12 +125,12 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
 
     break;
 
-  default:
+    default:
 
   }
 }
@@ -140,8 +140,8 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
     if (!($node->tfid)) {
@@ -154,11 +154,11 @@ 
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
     if (!$account->team OR $account->team != $team_id) {
-      drupal_set_message(t('Failed to add team forum topic.'), 'error');
-      drupal_goto('community/forum');
+        drupal_set_message(t('Failed to add team forum topic.'), 'error');
+        drupal_goto('community/forum');
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -167,19 +167,19 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
     if (!$public_forum AND !$is_member AND !$is_global_moderator) {
-      drupal_not_found();
-      module_invoke_all('exit');
-      exit();
+        drupal_not_found();
+        module_invoke_all('exit');
+        exit();
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -187,17 +187,17 @@ 
 * Implementation of hook_views_api().
 */
 function boincteam_forum_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam_forum')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_forum_perm() {
-  return array('manage boincteam forum');
+    return array('manage boincteam forum');
 }
 
 
@@ -209,43 +209,43 @@ 
  * Check if the user has global access to moderate team forums
  */
 function boincteam_forum_is_global_moderator() {
-  global $user;
-  return user_access('manage boincteam forum');
+    global $user;
+    return user_access('manage boincteam forum');
 }
 
 /*
  * Check if any forums for a team are public
  */
 function boincteam_forum_is_any_public($team_id) {
-  $forums = boincteam_forum_list($team_id);
-  foreach ($forums as $forum) {
+    $forums = boincteam_forum_list($team_id);
+    foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /*
  * Check if a team forum should be visible to everyone
  */
 function boincteam_forum_is_public($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT public FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 /*
  * Load the forums for a team, if any exist
  */
 function boincteam_forum_list($team_id = NULL) {
-  if (!$team_id) {
+    if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
     $team_id = $account->team;
-  }
-  $team_forums = array();
-  if ($team_id) {
+    }
+    $team_forums = array();
+    if ($team_id) {
     // Load any team forum objects for the user's team
     $result = db_query("
       SELECT tfid, nid, title, description, created, updated, public,
@@ -255,26 +255,26 @@ 
     $row = 0;
     while ($team_forum = db_fetch_object($result)) {
 
-      $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
-      $team_forum->new_topics = 0; // TODO: Track user views of team topics
-      $team_forum->new_text = '';
-      $team_forum->new_url = '';
-      $team_forum->num_topics = db_result(db_query("
+        $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
+        $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+        $team_forum->new_topics = 0; // TODO: Track user views of team topics
+        $team_forum->new_text = '';
+        $team_forum->new_url = '';
+        $team_forum->num_topics = db_result(db_query("
         SELECT COUNT(nid) FROM {boincteam_forum_node}
         WHERE tfid = %d",
         $team_forum->tfid
-      ));
-      $team_forum->num_posts = db_result(db_query("
+        ));
+        $team_forum->num_posts = db_result(db_query("
         SELECT COALESCE(SUM(ncs.comment_count),0) + COUNT(ncs.nid)
         FROM {boincteam_forum_node} bfn
         JOIN {node_comment_statistics} ncs ON ncs.nid = bfn.nid
         JOIN {node} n ON n.nid = ncs.nid
         WHERE bfn.tfid = %d AND n.status = 1",
         $team_forum->tfid
-      ));
-      $last_post = new stdClass();
-      $last_post->timestamp = db_result(db_query("
+        ));
+        $last_post = new stdClass();
+        $last_post->timestamp = db_result(db_query("
         SELECT ncs.last_comment_timestamp FROM {node} n
         INNER JOIN {boincteam_forum_node} bfn
         INNER JOIN {node_comment_statistics} ncs ON n.nid = bfn.nid AND n.nid = ncs.nid
@@ -282,36 +282,36 @@ 
         ORDER BY ncs.last_comment_timestamp DESC
         LIMIT 1",
         $team_forum->tfid
-      ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
-      $team_forums[$team_forum->tfid] = $team_forum;
-      $row++;
+        ));
+        $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+        $team_forums[$team_forum->tfid] = $team_forum;
+        $row++;
     }
-  }
-  return $team_forums;
+    }
+    return $team_forums;
 }
 
 /*
  * Load a team forum by ID
  */
 function boincteam_forum_load($tfid) {
-  // Load any team forum objects for the user's team
-  $result = db_query("
+    // Load any team forum objects for the user's team
+    $result = db_query("
     SELECT tfid, nid, title, description, created, updated, public,
       min_time_between_posts, min_total_credit_to_post, min_avg_credit_to_post
     FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  );
-  return db_fetch_object($result);
+    );
+    return db_fetch_object($result);
 }
 
 /*
  * Look up the team ID for a given team forum
  */
 function boincteam_forum_lookup_nid($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT nid FROM {boincteam_forum}
     WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 
@@ -323,80 +323,80 @@ 
  * Create team forum form
  */
 function boincteam_forum_create_form_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
     . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_create_form');
+    $output .= drupal_get_form('boincteam_forum_create_form');
 
-  return $output;
+    return $output;
 }
 
 /**
  * Edit team forum form
  */
 function boincteam_forum_edit_form_panel($tfid) {
-  $team_forum = boincteam_forum_load($tfid);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
+    $team_forum = boincteam_forum_load($tfid);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
     $team_forum->title . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
+    $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
 
-  return $output;
+    return $output;
 }
 
 /**
  * Link to team forums
  */
 function boincteam_forum_link_panel($team_id) {
-  $show_public_only = (
+    $show_public_only = (
     !boincteam_is_member($team_id) AND
     !boincteam_forum_is_global_moderator()
-  );
-  $forums = boincteam_forum_list($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
-  $output .= '<p>'
+    );
+    $forums = boincteam_forum_list($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
+    $output .= '<p>'
     . bts('A discussion forum has been set up for team members.', array(), NULL, 'boinc:team-forum')
     . '</p>';
-  $output .= '<ul class="tab-list action-list">';
-  foreach ($forums as $forum) {
+    $output .= '<ul class="tab-list action-list">';
+    foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' .
+        $output .= '  <li class="tab primary">' .
         l(
-          //$forum->title,
-          bts('Enter forum', array(), NULL, 'boinc:team-forum'),
-          "community/teams/{$team_id}/forum/{$forum->tfid}"
+            //$forum->title,
+            bts('Enter forum', array(), NULL, 'boinc:team-forum'),
+            "community/teams/{$team_id}/forum/{$forum->tfid}"
         ) . '</li>';
-      // Since we're only supporting one team forum for now, we've labeled the
-      // link in a generic way above and will now just break out of the loop
-      break;
+        // Since we're only supporting one team forum for now, we've labeled the
+        // link in a generic way above and will now just break out of the loop
+        break;
     }
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team forums
  */
 function boincteam_forum_topic_overview_panel($nid = NULL) {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
-  $output .= '<div>';
-  if ($nid) {
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
+    $output .= '<div>';
+    if ($nid) {
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
-  }
-  else {
+        array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
+    }
+    else {
     $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
-  }
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
+    }
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
+    $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
+    $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
     '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }

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

Indentation +32 added lines, -32 removed lines

@@ -26,16 +26,16 @@ 
  * Implementation of hook_comment();
  */
 function flag_comment_notify_comment(&$a1, $op) {
-  switch ($op) {
-  case 'insert':
+    switch ($op) {
+    case 'insert':
     module_load_include('inc', 'drupal_queue', 'drupal_queue');
     $queue = DrupalQueue::get('flag_comment_notify');
     $subscribed_users = array_keys((array) flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
     foreach ($subscribed_users as $uid) {
-      $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
+        $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -43,12 +43,12 @@ 
  * Implementation of hook_cron_queue_info()
  */
 function flag_comment_notify_cron_queue_info() {
-  $queues = array();
-  $queues['flag_comment_notify'] = array(
+    $queues = array();
+    $queues['flag_comment_notify'] = array(
     'worker callback' => 'flag_comment_notify_send_notification',
     'time' => 60,
-  );
-  return $queues;
+    );
+    return $queues;
 }
 
 
@@ -57,44 +57,44 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function flag_comment_notify_send_notification($data) {
-  $account = user_load($data['uid']);
-  $comment = _comment_load($data['cid']);
-  $node = node_load($comment->nid);
-  $author = user_load($comment->uid);
-  if ($account->mail AND $node->nid) {
+    $account = user_load($data['uid']);
+    $comment = _comment_load($data['cid']);
+    $node = node_load($comment->nid);
+    $author = user_load($comment->uid);
+    if ($account->mail AND $node->nid) {
     // Don't send notifications to the author of the comment
     if ($account->uid != $author->uid) {
-      $params['account'] = $account;
-      $params['comment'] = $comment;
-      $params['node'] = $node;
-      $params['author'] = $author;
-      drupal_mail('flag_comment_notify', 'comment_posted', $account->mail,
+        $params['account'] = $account;
+        $params['comment'] = $comment;
+        $params['node'] = $node;
+        $params['author'] = $author;
+        drupal_mail('flag_comment_notify', 'comment_posted', $account->mail,
         user_preferred_language($account), $params);
     }
-  }
+    }
 }
 
 
 function flag_comment_notify_mail($key, &$message, $params) {
-  $language = $message['language'];
-  $variables = user_mail_tokens($params['account'], $language);
-  $variables['!comment_url'] = url(
+    $language = $message['language'];
+    $variables = user_mail_tokens($params['account'], $language);
+    $variables['!comment_url'] = url(
     "goto/comment/{$params['comment']->cid}",
     array(
-      'absolute' => TRUE,
+        'absolute' => TRUE,
     )
-  );
-  $variables['!topic_name'] = $params['node']->title;
-  $variables['!author'] = $params['author']->name;
-  switch($key) {
-  case 'comment_posted':
+    );
+    $variables['!topic_name'] = $params['node']->title;
+    $variables['!author'] = $params['author']->name;
+    switch($key) {
+    case 'comment_posted':
     $message['subject'] = bts('!site: comment posted to "!topic_name"', $variables,
-      $language->language, 'boinc:forum-topic-subscription-email-notification');
+        $language->language, 'boinc:forum-topic-subscription-email-notification');
     $message['body'][] = bts('!author has posted a reply to "!topic_name".',
-      $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
+        $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
     $message['body'][] = bts("To view this topic at !site, click here: \n!comment_url",
-      $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
+        $variables, $language->language, 'boinc:forum-topic-subscription-email-notification');
     break;
-  default:
+    default:
   }
 }

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

Indentation +17 added lines, -17 removed lines

@@ -9,40 +9,40 @@ 
  * Implements hook_block() for Drupal 6 compatibility
  */
 function comment_form_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
+    switch ($op) {
+    case 'view':
     //$block = node_comment_block_block_view($delta);
     $block = array();
     if ($delta == 'comment_form') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+        if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         global $user;
         $node = node_load($nid);
         if ($node->comment !== 0 AND user_access('post comments', $user)) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
-          $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
+            $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+            $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+            $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
+        }
         }
-      }
     }
     break;
-  case 'list':
+    case 'list':
     $blocks = comment_form_block_block_info();
     return $blocks;
     break;
-  default:
+    default:
   }
-  return $block;
+    return $block;
 }
 
 /**
  * Implements hook_block_info().
  */
 function comment_form_block_block_info() {
-  $blocks['comment_form'] = array(
+    $blocks['comment_form'] = array(
     'info' => bts('Comment form', array(), NULL, 'boinc:forum-comment-form'),
-  );
+    );
 
-  return $blocks;
+    return $blocks;
 }
 
 /**
@@ -81,10 +81,10 @@ 
  * Implements hook_form_FORM_ID_alter() for block_admin_configure.
  */
 function comment_form_block_form_block_admin_configure_alter(&$form, &$form_state) {
-  if (isset($form['delta'])) {
+    if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'comment_form') {
-      $form['settings']['title']['#disabled'] = TRUE;
-      $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+        $form['settings']['title']['#disabled'] = TRUE;
+        $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+    }
     }
-  }
 }

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

Indentation +183 added lines, -183 removed lines

@@ -2,9 +2,9 @@ 
 // $Id$
 
 /**
-  * @file
-  * Enable BOINC charting features for statistics
-  */
+ * @file
+ * Enable BOINC charting features for statistics
+ */
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -18,10 +18,10 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Implementation of hook_menu().
-  */
+ * Implementation of hook_menu().
+ */
 function boincstats_menu() {
-  $items['admin/boinc/stats'] = array(
+    $items['admin/boinc/stats'] = array(
     'title' => 'Environment: Statistics setup',
     'description' => 'Configure the stats system for generating charts and
       providing cross project data.',
@@ -30,18 +30,18 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincstats.admin.inc'
-  );
-  $items['charts/user'] = array(
+    );
+    $items['charts/user'] = array(
     'page callback' => 'boincstats_get_user_stats_chart',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['charts/project'] = array(
+    );
+    $items['charts/project'] = array(
     'page callback' => 'boincstats_get_project_stats_chart',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 
@@ -50,31 +50,31 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * User stats chart menu callback
-  * Called to generate the daily credit status chart for a user (dashboard)
-  */
+ * User stats chart menu callback
+ * Called to generate the daily credit status chart for a user (dashboard)
+ */
 function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
 
-  // pChart library inclusions
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
+    // pChart library inclusions
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
 
-  init_theme();
-  global $theme_key;
-  $cache_name = "{$theme_key}_";
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_";
 
-  $dataset_size = 0;
-  $chart_height = 0;
-  $chart_width = 0;
-  $draw_x_lines = FALSE;
-  $label_x_axis = FALSE;
+    $dataset_size = 0;
+    $chart_height = 0;
+    $chart_width = 0;
+    $draw_x_lines = FALSE;
+    $label_x_axis = FALSE;
 
-  $stats_xml = NULL;
+    $stats_xml = NULL;
 
-  switch($chart_size) {
-  case 'small':
+    switch($chart_size) {
+    case 'small':
     $cache_name .= "{$cpid}_small";
     $dataset_size = 30;
     $chart_height = 80;
@@ -83,7 +83,7 @@ 
     $draw_x_lines = FALSE;
     $label_x_axis = FALSE;
     break;
-  case 'medium':
+    case 'medium':
   default:
     $cache_name .= $cpid;
     $dataset_size = 60;
@@ -91,32 +91,32 @@ 
     $chart_width = 589;
     $draw_x_lines = TRUE;
     $label_x_axis = TRUE;
-  }
+    }
 
-  // Sanity check for cache directory
-  if (!boincstats_check_cache_dir()) {
+    // Sanity check for cache directory
+    if (!boincstats_check_cache_dir()) {
     return;
-  }
+    }
 
-  // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
-  $myCache->removeOlderThan(60*60*24);
+    // Initialize the cache object and flush stale images
+    $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+    $myCache->removeOlderThan(60*60*24);
 
-  if ($myCache->isInCache($cache_name)) {
+    if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+    }
+    else {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily', $cpid);
     if ($stats_xml) {
-      // Get the last 60 days of stats for the chart
-      for ($j = 30; $j < 90; $j++) {
+        // Get the last 60 days of stats for the chart
+        for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
     }
 
     // Get color configuration
@@ -145,39 +145,39 @@ 
     // Define the chart area
     $myPicture->setGraphArea(0, 3, $chart_width, $chart_height);
     if ($backdrop_color) {
-      $myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
+        $myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
     }
 
     // Draw the scale
     $scaleSettings = array(
-      'Mode' => SCALE_MODE_START0,
-      'DrawYLines' => false,
-      'DrawXLines' => $draw_x_lines,
-      'GridTicks' => 2,
-      'LabelSkip' => 9,
-      'SkippedAxisAlpha' => 0,
-      'SkippedInnerTickWidth' => 0,
-      'SkippedOuterTickWidth' => 0,
-      'AxisAlpha' => 0,
-      'InnerTickWidth' => 0,
-      'OuterTickWidth' => 0,
-      'XMargin' => 1,
-      'YMargin' => 0,
-      'Floating' => TRUE,
-      'GridR' => 200,
-      'GridG' => 200,
-      'GridB' => 200,
-      'DrawSubTicks' => false,
-      'CycleBackground' => false
+        'Mode' => SCALE_MODE_START0,
+        'DrawYLines' => false,
+        'DrawXLines' => $draw_x_lines,
+        'GridTicks' => 2,
+        'LabelSkip' => 9,
+        'SkippedAxisAlpha' => 0,
+        'SkippedInnerTickWidth' => 0,
+        'SkippedOuterTickWidth' => 0,
+        'AxisAlpha' => 0,
+        'InnerTickWidth' => 0,
+        'OuterTickWidth' => 0,
+        'XMargin' => 1,
+        'YMargin' => 0,
+        'Floating' => TRUE,
+        'GridR' => 200,
+        'GridG' => 200,
+        'GridB' => 200,
+        'DrawSubTicks' => false,
+        'CycleBackground' => false
     );
     $myPicture->setFontProperties(array('FontSize' => 10));
     $myPicture->drawScale($scaleSettings);
 
     if ($label_x_axis) {
-      for ($i = 5; $i >= 0; $i--) {
+        for ($i = 5; $i >= 0; $i--) {
         $label = ($i) ? -10*$i : 'Today';
         $myPicture->drawText(589-587*($i/6)-5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
-      }
+        }
     }
 
     // Draw the area chart
@@ -189,7 +189,7 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /**
@@ -197,48 +197,48 @@ 
  * Called to generate the daily credit status chart for the whole project
  */
 function boincstats_get_project_stats_chart() {
-  // pChart library inclusions
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
-
-  init_theme();
-  global $theme_key;
-  $cache_name = "{$theme_key}_project_chart";
-
-  $color_keys = array('R', 'G', 'B');
-
-  // Get color configuration
-  $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
-  $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
-  $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
-  $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
-
-  // Sanity check for cache directory
-  if (!boincstats_check_cache_dir()) {
+    // pChart library inclusions
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
+
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_project_chart";
+
+    $color_keys = array('R', 'G', 'B');
+
+    // Get color configuration
+    $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
+    $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
+    $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
+    $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
+
+    // Sanity check for cache directory
+    if (!boincstats_check_cache_dir()) {
     return;
-  }
+    }
 
-  // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
-  $myCache->removeOlderThan(60*60*24);
+    // Initialize the cache object and flush stale images
+    $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+    $myCache->removeOlderThan(60*60*24);
 
-  if ($myCache->isInCache($cache_name)) {
+    if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+    }
+    else {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily');
     if ($stats_xml) {
-      // Get the last 60 days of stats for the chart
-      for ($j = 30; $j < 90; $j++) {
+        // Get the last 60 days of stats for the chart
+        for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
     }
 
     // Create and populate the pData object
@@ -263,25 +263,25 @@ 
 
     // Draw the scale
     $scaleSettings = array(
-      'Mode' => SCALE_MODE_START0,
-      'DrawYLines' => false,
-      'DrawXLines' => false,
-      'GridTicks' => 2,
-      'LabelSkip' => 9,
-      'SkippedAxisAlpha' => 0,
-      'SkippedInnerTickWidth' => 0,
-      'SkippedOuterTickWidth' => 0,
-      'AxisAlpha' => 0,
-      'InnerTickWidth' => 0,
-      'OuterTickWidth' => 0,
-      'XMargin' => 1,
-      'YMargin' => 0,
-      'Floating' => TRUE,
-      'GridR' => 200,
-      'GridG' => 200,
-      'GridB' => 200,
-      'DrawSubTicks' => false,
-      'CycleBackground' => false
+        'Mode' => SCALE_MODE_START0,
+        'DrawYLines' => false,
+        'DrawXLines' => false,
+        'GridTicks' => 2,
+        'LabelSkip' => 9,
+        'SkippedAxisAlpha' => 0,
+        'SkippedInnerTickWidth' => 0,
+        'SkippedOuterTickWidth' => 0,
+        'AxisAlpha' => 0,
+        'InnerTickWidth' => 0,
+        'OuterTickWidth' => 0,
+        'XMargin' => 1,
+        'YMargin' => 0,
+        'Floating' => TRUE,
+        'GridR' => 200,
+        'GridG' => 200,
+        'GridB' => 200,
+        'DrawSubTicks' => false,
+        'CycleBackground' => false
     );
     $myPicture->setFontProperties(array('FontSize' => 10));
     $myPicture->drawScale($scaleSettings);
@@ -300,41 +300,41 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /*
  *
  */
 function boincstats_check_cache_dir($cache_path = 'files/cache') {
-  $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
-  if (!is_writeable($cache_dir)) {
+    $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
+    if (!is_writeable($cache_dir)) {
     if (!is_dir($cache_dir)) {
-      if (!is_writeable(dirname($cache_dir))) {
+        if (!is_writeable(dirname($cache_dir))) {
         // If the parent "files" dir isn't even writeable...
         watchdog('boincstats', '@parent_dir directory is not writeable. This
           directory must be writeable by the web server.',
-          array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
+            array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
         return FALSE;
-      }
-      else {
+        }
+        else {
         // Create the cache dir
         if (!mkdir($cache_dir, 0775)) {
-          watchdog('boincstats', 'Failed to create @cache_dir directory. Check
+            watchdog('boincstats', 'Failed to create @cache_dir directory. Check
             filesystem permissions...?',
             array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-          return FALSE;
+            return FALSE;
+        }
         }
-      }
     }
     else {
-      watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
+        watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
         Please allow webserver write access.',
         array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-      return FALSE;
+        return FALSE;
     }
-  }
-  return TRUE;
+    }
+    return TRUE;
 }
 
 /*
@@ -342,87 +342,87 @@ 
  */
 function boincstats_get_project_stats($type = 'total', $cpid = NULL) {
 
-  // Determine the stats environment
-  boincstats_check_configuration();
-  $stats_server = variable_get('boinc_stats_server', '');
-  $stats_rpc = variable_get('boinc_stats_project_credit_history_rpc', '');
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
+    // Determine the stats environment
+    boincstats_check_configuration();
+    $stats_server = variable_get('boinc_stats_server', '');
+    $stats_rpc = variable_get('boinc_stats_project_credit_history_rpc', '');
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
 
-  $get = array(
+    $get = array(
     'id' => $project_id
-  );
-  switch ($type) {
-  case 'daily':
+    );
+    switch ($type) {
+    case 'daily':
     $get['daily'] = NULL;
     break;
-  case 'total':
+    case 'total':
   default:
   }
 
-  if ($cpid) {
+    if ($cpid) {
     // If a user CPID has been provided, limit scope to that user
     $stats_rpc = variable_get('boinc_stats_user_credit_history_rpc', '');
     $get['cpid'] = $cpid;
-  }
+    }
 
-  // Construct query string
-  $args = array();
-  foreach ($get as $arg => $value) {
+    // Construct query string
+    $args = array();
+    foreach ($get as $arg => $value) {
     if ($value !== NULL) {
-      $args[] = "{$arg}=" . rawurlencode($value);
+        $args[] = "{$arg}=" . rawurlencode($value);
     }
     else {
-      $args[] = $arg;
+        $args[] = $arg;
     }
-  }
-  $query = '?' . implode('&', $args);
+    }
+    $query = '?' . implode('&', $args);
 
-  // Load XML from RPC
-  $stats_xml = NULL;
-  $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
-  $result = drupal_http_request($target_url);
-  if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
+    // Load XML from RPC
+    $stats_xml = NULL;
+    $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
+    $result = drupal_http_request($target_url);
+    if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
     $stats_xml = simplexml_load_string($result->data);
-  }
-  watchdog('boincstats', $target_url);
-  return $stats_xml;
+    }
+    watchdog('boincstats', $target_url);
+    return $stats_xml;
 }
 
 /*
  *
  */
 function boincstats_get_project_total_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  $last_record = end($stats_xml->records->record);
-  return ($last_record) ? (int) $last_record : 0;
+    $stats_xml = boincstats_get_project_stats();
+    $last_record = end($stats_xml->records->record);
+    return ($last_record) ? (int) $last_record : 0;
 }
 
 /*
  *
  */
 function boincstats_get_project_avg_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  return (isset($stats_xml->recent_avg)) ? $stats_xml->recent_avg : 0;
+    $stats_xml = boincstats_get_project_stats();
+    return (isset($stats_xml->recent_avg)) ? $stats_xml->recent_avg : 0;
 }
 
 /*
  *
  */
 function boincstats_credit_to_ghours($credit) {
-  return $credit / (100 * 365);
+    return $credit / (100 * 365);
 }
 
 /*
  *
  */
 function boincstats_credit_to_flops($credit, $prefix = 0) {
-  $factor = array(
+    $factor = array(
     '0' => 0,
     'g' => 3,
     't' => 6,
     'p' => 9
-  );
-  return $credit / (pow(10, (int) $factor[$prefix]) / 10);
+    );
+    return $credit / (pow(10, (int) $factor[$prefix]) / 10);
 }
 
 
@@ -431,22 +431,22 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function boincstats_get_project_stats_overview($type = 'basic') {
-  global $base_path;
-  $output = '';
-  switch ($type) {
-  case 'basic':
+    global $base_path;
+    $output = '';
+    switch ($type) {
+    case 'basic':
     $output .= '<div class="overlay"><span>(' . bts('Credits per day', array(), NULL, 'boinc:front-page') . ')</span></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  case 'detailed':
+    case 'detailed':
     $output .= '<div class="stats"><label>' . bts('Total G-hours', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
     $output .= '<div class="stats"><label>' . bts('Avg TFlops', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
     //$output .= '<div class="stats"><a href="#">' . bts('Pending credits', array(), NULL, 'boinc:front-page') . '</a></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  default:
+    default:
   }
-  return $output;
+    return $output;
 }
 
 
@@ -458,19 +458,19 @@ 
  * Check that the stats system is configured, report if it isn't
  */
 function boincstats_check_configuration() {
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
-  if (!$project_id) {
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
+    if (!$project_id) {
     watchdog('boincstats', 'The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats')), WATCHDOG_ERROR);
+            'admin/boinc/stats')), WATCHDOG_ERROR);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC stats system is not configured. Please
+        drupal_set_message(t('The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats'))), 'error', FALSE);
+            'admin/boinc/stats'))), 'error', FALSE);
     }
     else {
-      drupal_set_message(t('There is a problem with the site. Please contact
+        drupal_set_message(t('There is a problem with the site. Please contact
         the system administrator.'), 'error', FALSE);
     }
-  }
+    }
 }

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

Indentation +28 added lines, -28 removed lines

@@ -8,38 +8,38 @@ 
 
 
 /**
-  * The BOINC stats configuration determines where statistics are sourced
-  */
+ * The BOINC stats configuration determines where statistics are sourced
+ */
 function boincstats_admin_stats_system(&$form_state) {
-  $form = array();
-  $default = array(
+    $form = array();
+    $default = array(
     'boinc_stats_server' => variable_get('boinc_stats_server', 'stats.gridrepublic.org'),
     'boinc_stats_project_list_rpc' => variable_get('boinc_stats_project_list_rpc', 'rpc/get_projects.php'),
     'boinc_stats_project_credit_history_rpc' => variable_get('boinc_stats_project_credit_history_rpc', 'rpc2/get_project_tc_history.php'),
     'boinc_stats_user_credit_history_rpc' => variable_get('boinc_stats_user_credit_history_rpc', 'rpc2/get_user_credit_history.php'),
     'boinc_stats_remote_project_id' => variable_get('boinc_stats_remote_project_id', ''),
-  );
-  // Define the form
-  $form['boinc_stats_server'] = array(
+    );
+    // Define the form
+    $form['boinc_stats_server'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_server']
-  );
-  $form['boinc_stats_project_list_rpc'] = array(
+    );
+    $form['boinc_stats_project_list_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_project_list_rpc']
-  );
-  $form['boinc_stats_project_credit_history_rpc'] = array(
+    );
+    $form['boinc_stats_project_credit_history_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_project_credit_history_rpc']
-  );
-  $form['boinc_stats_user_credit_history_rpc'] = array(
+    );
+    $form['boinc_stats_user_credit_history_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_user_credit_history_rpc']
-  );
-  $form['boinc_stats_remote_project_id'] = array(
+    );
+    $form['boinc_stats_remote_project_id'] = array(
     '#type' => 'textfield',
     '#title' => t('Stats ID for @project', array(
-      '@project' => variable_get('site_name', 'Drupal-BOINC'))),
+        '@project' => variable_get('site_name', 'Drupal-BOINC'))),
     '#default_value' => $default['boinc_stats_remote_project_id'],
     '#description' => t('This project must be registered with a stats system in
       order for some statistics to be available. Currently only one system is
@@ -47,26 +47,26 @@ 
         '!find_project_id' => l(t('Find your project ID'),
         "http://{$default['boinc_stats_server']}/{$default['boinc_stats_project_list_rpc']}",
         array('attributes' => array('target' => 'external')))
-      )
+        )
     )
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC stats form.
-  */
+ * Validate the BOINC stats form.
+ */
 function boincstats_admin_stats_system_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_stats_remote_project_id']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_stats_remote_project_id']) {
     form_set_error('boinc_stats_remote_project_id',
-      t('Stats may not work without a valid stats ID configured!'));
-  }
+        t('Stats may not work without a valid stats ID configured!'));
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC stats form.
-  */
+ * Handle post-validation submission of BOINC stats form.
+ */
 function boincstats_admin_stats_system_submit($form, &$form_state) {
-  drupal_set_message(t('Stats system configuration has been updated.'));
+    drupal_set_message(t('Stats system configuration has been updated.'));
 }