',
@@ -900,23 +900,23 @@ function boinccore_comment_control($cid = NULL, $action = NULL) {
$node->comment = 2;
//$node->language = 'en';
$node->uid = $comment->uid;
-
+
// Preselect the parent's taxonomy ID
$parent_node = node_load($comment->nid);
$node->tid = $parent_node->tid;
-
+
if (filter_access($comment->format)) {
$node->format = $comment->format;
}
-
+
// Save the new node
node_save($node);
taxonomy_node_save($node, array($node->tid));
-
+
// Delete the comment
module_load_include('inc', 'comment', 'comment.admin');
_comment_delete_thread($comment);
-
+
rules_invoke_event('boinccore_comment_convert', $comment);
$return_path = "node/{$node->nid}";
@@ -1011,12 +1011,12 @@ function boinccore_am_set_info() {
));
db_set_active('default');
$uid = boincuser_lookup_uid($boinc_id);
-
+
// Apply any relevant updates to the Drupal account, also
$country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : NULL);
$url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : NULL);
$email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : NULL);
-
+
if ($email_addr) {
$account = user_load($uid);
user_save($account, array('mail' => $email_addr));
@@ -1104,29 +1104,29 @@ function boinccore_pending_credit() {
* Create a team with the provided details
*/
function boinccore_create_team() {
-
+
if (module_exists('boincteam')) {
module_load_include('module', 'boincteam', 'boincteam');
-
+
$input_format = !empty($values['format']) ? $values['format'] : 4;
if (!empty($_GET['description'])) $_GET['description'] = check_markup($_GET['description'], $input_format);
-
+
// Try to add the team to BOINC and capture the XML output of the RPC
ob_start();
include_boinc('user/create_team.php');
$xml = ob_get_clean();
$xml = load_configuration($xml);
-
+
if (isset($xml['create_team_reply']['success'])) {
$boincteam_id = isset($xml['create_team_reply']['team_id']['@value']) ? $xml['create_team_reply']['team_id']['@value'] : 0;
-
+
if ($boincteam_id) {
-
+
$boincteam = boincteam_load($boincteam_id);
$team_owner_uid = boincuser_lookup_uid($boincteam->userid);
-
+
// Create the team node in Drupal
-
+
$values = array(
'name' => isset($_GET['name']) ? $_GET['name'] : '',
'description' => isset($_GET['description']) ? $_GET['description'] : '',
@@ -1134,7 +1134,7 @@ function boinccore_create_team() {
);
$teaser = node_teaser($values['description']);
$created_time = time();
-
+
$node = array(
'type' => 'team',
'title' => $values['name'],
@@ -1150,16 +1150,16 @@ function boinccore_create_team() {
'sticky' => 0,
'format' => $input_format
);
-
+
// 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']);
-
+
$node = (object) $node; // node_save requires an object form
$team_categories = taxonomy_get_term_by_name($values['type']);
$node->taxonomy[] = $team_categories[0];
-
+
// Save the team node
node_save($node);
// Save the team IDs to a BOINC <--> Drupal reference table.
@@ -1338,9 +1338,9 @@ function boinccore_team_email_list() {
function boinccore_edit_forum_preferences() {
// Do not pass through to BOINC in this case as BOINC forums are no longer
// relevant -- use Drupal data only
-
+
$account_key = !empty($_POST['account_key']) ? $_POST['account_key'] : (!empty($_GET['account_key']) ? $_GET['account_key'] : NULL);
-
+
require_boinc('boinc_db');
$boincuser = BoincUser::lookup_auth($account_key);
if ($boincuser) {
@@ -1453,16 +1453,16 @@ function boinccore_edit_forum_preferences() {
function boinccore_forum_get_data() {
// Do not pass through to BOINC in this case as BOINC forums are no longer
// relevant -- use Drupal data only
-
+
$xml = array();
$boinc_id = !empty($_POST['userid']) ? $_POST['userid'] : (!empty($_GET['userid']) ? $_GET['userid'] : NULL);
$uid = boincuser_lookup_uid($boinc_id);
-
+
if ($uid) {
$method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : NULL);
$count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : NULL);
if (!$count) $count = 10;
-
+
switch ($method) {
case 'user_posts':
$content_length = !empty($_POST['content_length']) ? $_POST['content_length'] : (!empty($_GET['content_length']) ? $_GET['content_length'] : NULL);
@@ -1500,7 +1500,7 @@ function boinccore_forum_get_data() {
}
$xml['rpc_response']['count'] = $post_count;
break;
-
+
case 'user_threads':
$threads = db_query("
SELECT
@@ -1516,7 +1516,7 @@ function boinccore_forum_get_data() {
FROM {comments} c
WHERE c.nid = n.nid
) AS replies
- FROM {node} n
+ FROM {node} n
LEFT JOIN {node_counter} nc ON nc.nid = n.nid
LEFT JOIN {term_node} tn ON tn.nid = n.nid
WHERE (n.status = 1) AND (n.uid = '%d')
@@ -1718,7 +1718,7 @@ function boinccore_url_pagination_handler($type, $object_id = NULL) {
}
/*
- * Fetch an array of all countries
+ * Fetch an array of all countries
*/
function boinccore_get_country_list() {
return array(
@@ -1978,7 +1978,7 @@ function boinccore_rules_action_mail_to_moderators($settings) {
module_load_include('inc', 'rules', 'modules/system.rules');
$mailing_list = variable_get('boinc_moderator_mailing_list', '');
$force_individual_notifications = variable_get('boinc_moderator_force_individual_notifications', 0);
-
+
if (!$mailing_list OR $force_individual_notifications) {
// Send individual emails to all moderators
$roles = user_roles();
@@ -2081,7 +2081,7 @@ function bts($string, $args = array(), $langcode = NULL, $context = 'boinc: ', $
/**
* Overview of moderation queues
- */
+ */
function boinccore_moderation_overview_panel() {
$output = '' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '
';
$output .= '';
diff --git a/drupal/sites/default/boinc/modules/boincimport/boincimport.module b/drupal/sites/default/boinc/modules/boincimport/boincimport.module
index 55ed00d8d19..73ae2392c68 100644
--- a/drupal/sites/default/boinc/modules/boincimport/boincimport.module
+++ b/drupal/sites/default/boinc/modules/boincimport/boincimport.module
@@ -2,12 +2,12 @@
// ; $Id$
// Drupal forums are represented as a hierarchy of terms in a vocabulary. This
-// is accomplished through the taxonomy concept (see: http://drupal.org/node/774892).
+// is accomplished through the taxonomy concept (see: http://drupal.org/node/774892).
// The forum vocabulary has categories as terms (e.g. "Discussion", "Help Desk")
// and subsequent sub terms that belong to one of these parent terms. This allows
// an arbitrary number of layers to exist in forum organization. BOINC forums map
// to Drupal as follows:
-//
+//
// Category -> Root level term in the vocabulary
// Topic / forum -> Term in the vocabulary with parent term
// Thread -> Content node
@@ -20,7 +20,7 @@ ini_set('memory_limit', '256M');
*/
function boincimport_menu() {
$items = array();
-
+
$items['admin/boinc/import'] = array(
'title' => 'Environment: Data import',
'description' => 'Overview of the BOINC data import process.',
@@ -36,7 +36,7 @@ function boincimport_menu() {
after data importation is complete.',
'access callback' => 'user_access',
'access arguments' => array('import boinc data'),
- 'page callback' => 'boincimport_post_configuration',
+ 'page callback' => 'boincimport_post_configuration',
'file' => 'boincimport.pages.inc',
'type' => MENU_CALLBACK,
);
@@ -44,7 +44,7 @@ function boincimport_menu() {
'title' => 'Cleanup',
'access callback' => 'user_access',
'access arguments' => array('import boinc data'),
- 'page callback' => 'boincimport_cleanup',
+ 'page callback' => 'boincimport_cleanup',
'type' => MENU_CALLBACK,
);
$items['admin/boinc/import/complete/%'] = array(
@@ -59,7 +59,7 @@ function boincimport_menu() {
'title' => 'Execute migration',
'access callback' => 'user_access',
'access arguments' => array('import boinc data'),
- 'page callback' => 'boincimport_process',
+ 'page callback' => 'boincimport_process',
'type' => MENU_CALLBACK,
);
$items['admin/boinc/import/reset'] = array(
@@ -156,12 +156,12 @@ function _boincimport_db_connect($test= 0) {
}
}
return 1;
-
+
}
/**
* Check if the module is enabled.
- *
+ *
* @return array
* $out['html'] = formatted html.
* $out['result'] = boolean.
@@ -182,7 +182,7 @@ function _boincimport_check_module($module) {
/**
* Check if the sql tables are installed.
- *
+ *
* @return array
* $out['html'] = formatted html.
* $out['result'] = boolean.
@@ -195,7 +195,7 @@ function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix
foreach ($tables as $table) {
if ($prefix) {
$table = db_prefix_tables('{'. $table .'}');
- }
+ }
db_set_active($db);
if ($GLOBALS['db_type'] == 'pgsql') {
@@ -224,7 +224,7 @@ function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix
function boincimport_process() {
// Start with a quick sanity check on the BOINC environment
boinc_get_path();
-
+
if (!variable_get('boincimport_ready', 0)) {
return ''. t('You cannot import the data now. Please complete the setup first', array('@settings' => url('admin/boinc/import/settings'))) .'
';
}
@@ -249,21 +249,21 @@ function boincimport_process_form() {
// Check for a lock on the import process
if (variable_get('boincimport_process_locked', 0)) {
drupal_set_message(t('The import process is locked. If you are sure that
- it is no longer running, you may !unlock_it',
+ it is no longer running, you may !unlock_it',
array('!unlock_it' => l(t('release the lock'),
'admin/boinc/import/unlock')
)), 'warning');
watchdog('boincimport', 'The import process is locked. If you are sure that
- it is no longer running, you may !unlock_it',
+ it is no longer running, you may !unlock_it',
array('!unlock_it' => l(t('release the lock'),
'admin/boinc/import/unlock')
- ), WATCHDOG_WARNING);
+ ), WATCHDOG_WARNING);
}
else {
$boincimport_functions = array(
'users' => t('Import users'),
'teams' => t('Import teams'),
- 'friends' => t('Import friendships'),
+ 'friends' => t('Import friendships'),
'preferences' => t('Import user preferences'),
'private messages' => t('Import private messages'),
'categories' => t('Import forum containers'),
@@ -290,16 +290,16 @@ function boincimport_process_form() {
}
function boincimport_process_form_submit($form, $form_state) {
-
+
// Lock the import process
if (!variable_get('boincimport_process_locked', 0)) {
variable_set('boincimport_process_locked', 1);
}
else {
watchdog('boincimport', 'The import process is locked, but another process
- is trying to access it...', array(), WATCHDOG_WARNING);
+ is trying to access it...', array(), WATCHDOG_WARNING);
}
-
+
switch ($form_state['values']['import']) {
case 'users':
boincimport_users();
@@ -355,7 +355,7 @@ function boincimport_process_form_submit($form, $form_state) {
}
break;
- case 'topics':
+ case 'topics':
boincimport_forum_topics();
if (!variable_get('boincimport_import_topic_successful', 0)) {
$_SESSION['boincimport_stage_selected'] = 'topics';
@@ -364,7 +364,7 @@ function boincimport_process_form_submit($form, $form_state) {
$_SESSION['boincimport_stage_selected'] = 'posts';
}
break;
-
+
case 'posts':
boincimport_forum_posts();
if (!variable_get('boincimport_import_post_successful', 0)) {
@@ -385,7 +385,7 @@ function boincimport_process_form_submit($form, $form_state) {
}
break;
- case 'team topics':
+ case 'team topics':
boincimport_team_forum_topics();
if (!variable_get('boincimport_team_topic_successful', 0)) {
$_SESSION['boincimport_stage_selected'] = 'team topics';
@@ -394,7 +394,7 @@ function boincimport_process_form_submit($form, $form_state) {
$_SESSION['boincimport_stage_selected'] = 'team posts';
}
break;
-
+
case 'team posts':
boincimport_team_forum_posts();
if (!variable_get('boincimport_team_post_successful', 0)) {
@@ -413,7 +413,7 @@ function boincimport_process_form_submit($form, $form_state) {
else {
drupal_set_message('Congratulations. Import Finished');
drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
- watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO);
+ watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO);
unset($_SESSION['boincimport_stage_selected']);
}
break;
@@ -431,15 +431,15 @@ function boincimport_complete($section) {
$_SESSION['boincimport_stage_selected'] = 'teams';
break;
case 'teams':
-
+
break;
-
+
default:
}
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
-
+
drupal_goto('admin/boinc/import/process');
}
@@ -447,7 +447,7 @@ function boincimport_complete($section) {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
* Users
* * * * * * * * * * * * * * * * * * * * * * * * * */
-
+
/**
* Import users (at least those required for further data import)
*/
@@ -458,8 +458,8 @@ function boincimport_users() {
watchdog(
'boincimport', 'Note: user import has already run successfully',
array(), WATCHDOG_INFO
- );
- }
+ );
+ }
if (!variable_get('boincimport_import_user_started', 0)) {
// Could prepare database tables, if new fields are necessary, etc.
@@ -512,7 +512,7 @@ function boincimport_users() {
$user_count = mysqli_num_rows($boinc_accounts);
}
db_set_active('default');
-
+
if (!$user_count) {
drupal_set_message(
t('There were no users found: Aborting script'), 'error'
@@ -528,20 +528,20 @@ function boincimport_users() {
watchdog('boincimport',
'Found %user_count users: Beginning import',
array('%user_count' => $user_count), WATCHDOG_INFO
- );
-
+ );
+
// User import relies on Drupal and BOINC APIs to manage data being read
// from one database and saved to the other. This approach keeps things
// clean and simple, but since a sizable user base will wreak havoc on system
// resources, the job is broken into batches here and each batch is processed
- // by a separate process.
-
+ // by a separate process.
+
//$batch_size = variable_get('boincimport_user_batch_size', 50);
//$batch_count = $user_count - ($user_count % $batch_size) + $batch_size;
$operations = array();
$existing_users = array();
$duplicates = array();
-
+
// Get the list of users already in Drupal to be sure we're not importing
// any twice
$result = db_query('
@@ -550,7 +550,7 @@ function boincimport_users() {
while ($row = db_fetch_object($result)) {
$existing_users[$row->boinc_id] = $row->uid;
}
-
+
// Create batches to process
while ($boinc_account = db_fetch_object($boinc_accounts)) {
if (isset($existing_users[$boinc_account->id])) {
@@ -565,7 +565,7 @@ function boincimport_users() {
);
}
}
-
+
if ($duplicates) {
drupal_set_message(t(
'Skipped @count accounts that were already imported',
@@ -574,9 +574,9 @@ function boincimport_users() {
watchdog('boincimport',
'Skipped @count accounts that were already imported',
array('@count' => count($duplicates)), WATCHDOG_INFO
- );
+ );
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_users_finished',
@@ -585,7 +585,7 @@ function boincimport_users() {
'progress_message' => t('Processed @current out of @total users.'),
'error_message' => t('User import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -593,7 +593,7 @@ function boincimport_users() {
* Batch operation for importing users
*/
function boincimport_users_op($boinc_id, &$context) {
-
+
// Use the $context['sandbox'] to store information needed to track progress
// between successive calls.
if (!isset($context['sandbox']['progress'])) {
@@ -605,7 +605,7 @@ function boincimport_users_op($boinc_id, &$context) {
// Note about batch size: When a batch is processed, the batch update engine
// determines whether it should continue processing in the same request or
// provide progress feedback to the user and wait for the next request.
-
+
// Grab the BOINC user object and create a Drupal user from it
$account = boincuser_register_make_drupal_user($boinc_id);
$message = '';
@@ -620,9 +620,9 @@ function boincimport_users_op($boinc_id, &$context) {
watchdog('boincimport',
'Failed to import user @id!',
array('@id' => $boinc_id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_user'] = $boinc_id;
@@ -653,7 +653,7 @@ function boincimport_users_finished($success, $results, $operations) {
'Successfully imported @count users (@fail_count failures).',
array('@count' => $total_imported, '@fail_count' => $total_failures),
WATCHDOG_INFO
- );
+ );
// Set the user import successful flag in the variable table
variable_set('boincimport_import_user_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'teams';
@@ -665,7 +665,7 @@ function boincimport_users_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -680,28 +680,28 @@ function boincimport_users_finished($success, $results, $operations) {
* Create teams and assign members
*/
function boincimport_teams() {
-
+
// Check whether the team table has been successfully imported already
if (variable_get('boincimport_import_team_successful', 0)) {
drupal_set_message(t('Note: team import has already run successfully'));
watchdog(
'boincimport', 'Note: team import has already run successfully',
array(), WATCHDOG_INFO
- );
+ );
}
if (!variable_get('boincimport_import_team_started', 0)) {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_team_started', 1);
}
-
+
// Initialize the map of BOINC team types to taxonomy IDs, if needed
$team_type_map = variable_get('boincimport_team_types', array());
if (!$team_type_map) {
// Import team types from BOINC to a Drupal vocabulary
require_boinc('team_types');
global $team_types;
-
+
// Create vocabulary if it isn't set
$team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
if (!$team_vid) {
@@ -712,7 +712,7 @@ function boincimport_teams() {
taxonomy_save_vocabulary($team_vocab);
$team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
}
-
+
foreach ($team_types as $boinc_type_id => $name) {
// Check for an existing term in the vocabulary
$team_type_id = db_result(db_query("SELECT tid FROM {term_data} WHERE vid = '{$team_vid}' AND LOWER(name) = LOWER('%s')", trim($name)));
@@ -736,7 +736,7 @@ function boincimport_teams() {
}
variable_set('boincimport_team_types', $team_type_map);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get the list of teams to import
@@ -765,11 +765,11 @@ function boincimport_teams() {
'Found %team_count teams: Beginning Import',
array('%team_count' => $team_count), WATCHDOG_INFO
);
-
+
$operations = array();
$existing_teams = array();
$duplicates = array();
-
+
// Get the list of teams already in Drupal to be sure we're not importing
// any twice
$result = db_query('
@@ -778,7 +778,7 @@ function boincimport_teams() {
while ($row = db_fetch_object($result)) {
$existing_teams[$row->team_id] = $row->nid;
}
-
+
// Create batches to process
while ($boinc_team = db_fetch_object($boinc_teams)) {
if (isset($existing_teams[$boinc_team->id])) {
@@ -793,14 +793,14 @@ function boincimport_teams() {
);
}
}
-
+
if ($duplicates) {
drupal_set_message(t(
'Skipped @count teams that were already imported',
array('@count' => count($duplicates))
));
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_teams_finished',
@@ -809,7 +809,7 @@ function boincimport_teams() {
'progress_message' => t('Processed @current out of @total teams.'),
'error_message' => t('Team import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -818,9 +818,9 @@ function boincimport_teams() {
* Create a Drupal node from the given BOINC team object
*/
function boincimport_teams_op($boincteam, &$context) {
-
+
$success = boincteam_import($boincteam);
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -833,9 +833,9 @@ function boincimport_teams_op($boincteam, &$context) {
watchdog('boincimport',
'Failed to import team @id!',
array('@id' => $boincteam->id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_team'] = $boincteam->id;
@@ -864,7 +864,7 @@ function boincimport_teams_finished($success, $results, $operations) {
watchdog('boincimport',
'Successfully imported @count teams.',
array('@count' => $total_imported), WATCHDOG_INFO
- );
+ );
// Set the team import successful flag in the variable table
variable_set('boincimport_import_team_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'friends';
@@ -876,7 +876,7 @@ function boincimport_teams_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -891,21 +891,21 @@ function boincimport_teams_finished($success, $results, $operations) {
* Create friend relationships between users
*/
function boincimport_friends() {
-
+
// Check whether friendships have been successfully imported already
if (variable_get('boincimport_import_friend_successful', 0)) {
drupal_set_message(t('Note: Friends import has already run successfully'));
watchdog(
'boincimport', 'Note: Friends import has already run successfully',
array(), WATCHDOG_INFO
- );
+ );
}
if (!variable_get('boincimport_import_friend_started', 0)) {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_friend_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get stuff to import
@@ -917,7 +917,7 @@ function boincimport_friends() {
f1.create_time
FROM %sfriend f1
LEFT JOIN %sfriend f2
- ON f2.user_src = f1.user_dest
+ ON f2.user_src = f1.user_dest
AND f2.user_dest = f1.user_src
AND f2.user_src <> f2.user_dest
WHERE f1.reciprocated = 1
@@ -944,12 +944,12 @@ function boincimport_friends() {
'Found %count friend relationships: Beginning Import',
array('%count' => $friendship_count), WATCHDOG_INFO
);
-
+
$operations = array();
-
+
// It doesn't matter if a friend relationship has already been imported, just
// do it again if so
-
+
// Create batches to process
while ($friendship = db_fetch_object($friendships)) {
$operations[] = array(
@@ -958,7 +958,7 @@ function boincimport_friends() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_friends_finished',
@@ -967,7 +967,7 @@ function boincimport_friends() {
'progress_message' => t('Processed @current out of @total friendships.'),
'error_message' => t('Friend import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -976,11 +976,11 @@ function boincimport_friends() {
* Create Drupal flags from the given BOINC friend relationship
*/
function boincimport_friends_op($friendship, &$context) {
-
+
$input_format = variable_get('boincimport_input_format', 0);
$success = FALSE;
$message = '';
-
+
// Convert BOINC friends to Drupal friends
$uid = boincuser_lookup_uid($friendship->user_src);
$friend_uid = boincuser_lookup_uid($friendship->user_dest);
@@ -995,7 +995,7 @@ function boincimport_friends_op($friendship, &$context) {
$boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
$message = "No Drupal account exists for BOINC user {$boinc_id}!";
}
-
+
if ($success) {
// Store some result for post-processing in the finished callback.
$context['results']['success'][] = $uid;
@@ -1008,7 +1008,7 @@ function boincimport_friends_op($friendship, &$context) {
}
watchdog('boincimport', $message, array(), WATCHDOG_WARNING);
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_user'] = $uid;
@@ -1038,7 +1038,7 @@ function boincimport_friends_finished($success, $results, $operations) {
'@failed' => $failures,
)
);
- watchdog('boincimport', $message, array(), WATCHDOG_INFO);
+ watchdog('boincimport', $message, array(), WATCHDOG_INFO);
// Set the friend import successful flag in the variable table
variable_set('boincimport_import_friend_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'preferences';
@@ -1050,7 +1050,7 @@ function boincimport_friends_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -1065,27 +1065,27 @@ function boincimport_friends_finished($success, $results, $operations) {
* Import community preferences for users
*/
function boincimport_preferences() {
-
+
// Check whether preferences have been successfully imported already
if (variable_get('boincimport_import_preferences_successful', 0)) {
drupal_set_message(t('Note: preferences import has already run successfully'));
watchdog(
'boincimport', 'Note: preferences import has already run successfully',
array(), WATCHDOG_INFO
- );
+ );
}
if (!variable_get('boincimport_import_preferences_started', 0)) {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_preferences_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
-
+
// Currently the only preferences being imported are BOINC "filtered users"
// This concept of users blocking other users when they don't get along maps
// to the Drupal ignore users module
-
+
// Find users who are involved in quarrels
db_set_active('boinc_rw');
$quarrelers = db_query("
@@ -1113,12 +1113,12 @@ function boincimport_preferences() {
'Found %count quarreling users: Beginning Import',
array('%count' => $quarreler_count), WATCHDOG_INFO
);
-
+
$operations = array();
-
+
// It doesn't matter if a filtered user preference has already been imported,
// just do it again if so
-
+
// Create batches to process
while ($quarreler = db_fetch_object($quarrelers)) {
$operations[] = array(
@@ -1127,7 +1127,7 @@ function boincimport_preferences() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_preferences_finished',
@@ -1136,7 +1136,7 @@ function boincimport_preferences() {
'progress_message' => t('Processed @current out of @total preferences.'),
'error_message' => t('Preference import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -1145,7 +1145,7 @@ function boincimport_preferences() {
* Convert BOINC ignored users to Drupal ignored users
*/
function boincimport_quarrels_op($boinc_user, &$context) {
-
+
$success = FALSE;
$uid = boincuser_lookup_uid($boinc_user->userid);
$ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
@@ -1177,7 +1177,7 @@ function boincimport_quarrels_op($boinc_user, &$context) {
);
}
}
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -1190,9 +1190,9 @@ function boincimport_quarrels_op($boinc_user, &$context) {
watchdog('boincimport',
'Failed to import any user filter preferences for user @id!',
array('@id' => $uid), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_user'] = $uid;
@@ -1235,7 +1235,7 @@ function boincimport_preferences_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -1250,7 +1250,7 @@ function boincimport_preferences_finished($success, $results, $operations) {
* Import private messages from BOINC
*/
function boincimport_private_msgs() {
-
+
// Check whether private messages have been successfully imported already
if (variable_get('boincimport_import_private_msg_successful', 0)) {
drupal_set_message(t('Private message import has already run successfully -- repeating this process could result in duplicate messages!'), 'warning');
@@ -1265,7 +1265,7 @@ function boincimport_private_msgs() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_private_msg_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get stuff to import
@@ -1294,12 +1294,12 @@ function boincimport_private_msgs() {
'Found %count private messages: Beginning Import',
array('%count' => $private_msg_count), WATCHDOG_INFO
);
-
+
$operations = array();
-
+
// We don't know if a given private message has been imported already or not;
// if this is needed, a relation table must be added to the Drupal DB
-
+
// Create batches to process
while ($boinc_private_msg = db_fetch_object($boinc_private_msgs)) {
$operations[] = array(
@@ -1308,7 +1308,7 @@ function boincimport_private_msgs() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_private_msgs_finished',
@@ -1317,7 +1317,7 @@ function boincimport_private_msgs() {
'progress_message' => t('Processed @current out of @total private messages.'),
'error_message' => t('Private message import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -1326,15 +1326,15 @@ function boincimport_private_msgs() {
* Create a Drupal message from the given BOINC message object
*/
function boincimport_private_msgs_op($pm, &$context) {
-
+
$input_format = variable_get('boincimport_input_format', 0);
-
+
$uid = boincuser_lookup_uid($pm->userid);
$sender_uid = boincuser_lookup_uid($pm->senderid);
-
+
$pm->content = _boincimport_strip_bbcode($pm->content);
$pm->content = _boincimport_text_sanitize($pm->content);
-
+
// First save the message
$message_added = db_query("
INSERT INTO {pm_message} (subject, author, body, format, timestamp)
@@ -1342,7 +1342,7 @@ function boincimport_private_msgs_op($pm, &$context) {
$pm->subject, $sender_uid, $pm->content, $input_format, $pm->date
);
$mid = db_last_insert_id('pm_message', 'mid');
-
+
// Then attach recipients and set status (note that threads are not a BOINC
// feature, so just consider every message to be a new thread)
$recipient_added = db_query("
@@ -1356,7 +1356,7 @@ function boincimport_private_msgs_op($pm, &$context) {
VALUES (%d, %d, %d, %d, 0)",
$mid, $mid, $sender_uid, 0
);
-
+
$message = '';
if ($message_added AND $recipient_added AND $sender_added) {
// Store some result for post-processing in the finished callback.
@@ -1369,9 +1369,9 @@ function boincimport_private_msgs_op($pm, &$context) {
watchdog('boincimport',
'Failed to import private message @id!',
array('@id' => $pm->id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_pm'] = $pm->id;
@@ -1400,7 +1400,7 @@ function boincimport_private_msgs_finished($success, $results, $operations) {
watchdog('boincimport',
'Successfully imported @count private messages.',
array('@count' => $total_imported), WATCHDOG_INFO
- );
+ );
// Set the private message import successful flag in the variable table
variable_set('boincimport_import_private_msg_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'categories';
@@ -1412,7 +1412,7 @@ function boincimport_private_msgs_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -1427,21 +1427,21 @@ function boincimport_private_msgs_finished($success, $results, $operations) {
* Create forum containers and forums
*/
function boincimport_forum_categories() {
-
+
// Check whether forums have been successfully imported already
if (variable_get('boincimport_import_forum_category_successful', 0)) {
drupal_set_message(t('Note: forum container import has already run successfully'));
watchdog(
'boincimport', 'Note: forum container import has already run successfully',
array(), WATCHDOG_INFO
- );
+ );
}
if (!variable_get('boincimport_import_forum_category_started', 0)) {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_forum_category_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Retrieve the vocabulary vid named "Forums"
@@ -1463,7 +1463,7 @@ function boincimport_forum_categories() {
'Forums'
));
}
-
+
// Get both categories and forums from BOINC
db_set_active('boinc_rw');
$boinc_forum_categories = db_query('
@@ -1513,20 +1513,20 @@ function boincimport_forum_categories() {
'%category_count' => $forum_category_count,
), WATCHDOG_INFO
);
-
+
$operations = array();
$existing_categories = array();
$existing_forums = array();
$duplicate_categories = array();
$duplicate_forums = array();
$category_map = array();
-
+
// Get the list of categories already in Drupal so as not to import any twice
$category_tree = taxonomy_get_tree($forum_vid, 0, -1, 1);
foreach ($category_tree as $term) {
$existing_categories[] = $term->name;
}
-
+
// Get the list of forums already in Drupal
$result = db_query('
SELECT forum_id, tid FROM {boincimport_temp_forum}'
@@ -1534,9 +1534,9 @@ function boincimport_forum_categories() {
while ($row = db_fetch_object($result)) {
$existing_forums[$row->forum_id] = $row->tid;
}
-
+
// Create batches to process
-
+
// Set up the "hidden" category, if necessary
// This is to support automatic hiding of empty categories
$hidden_forum_tid = db_result(db_query('
@@ -1552,7 +1552,7 @@ function boincimport_forum_categories() {
)
);
}
-
+
// Import categories
while ($boinc_forum_category = db_fetch_object($boinc_forum_categories)) {
if (in_array($boinc_forum_category->name, $existing_categories)) {
@@ -1567,7 +1567,7 @@ function boincimport_forum_categories() {
);
}
}
-
+
// Import forums
while ($boinc_forum = db_fetch_object($boinc_forums)) {
if (isset($existing_forums[$boinc_forum->id])) {
@@ -1582,7 +1582,7 @@ function boincimport_forum_categories() {
);
}
}
-
+
// Report any duplicates that were skipped
$skipped_message = array();
$categories_skipped = count($duplicate_categories);
@@ -1606,7 +1606,7 @@ function boincimport_forum_categories() {
array('@forums' => implode(' and ', $skipped_message))
));
}
-
+
// Create and run the batch
$batch = array(
'operations' => $operations,
@@ -1616,7 +1616,7 @@ function boincimport_forum_categories() {
'progress_message' => t('Processed @current out of @total forums.'),
'error_message' => t('Forum import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -1625,16 +1625,16 @@ function boincimport_forum_categories() {
* Create a Drupal taxonomy term from the given BOINC category object
*/
function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hidden, &$context) {
-
+
// Set term parameters for categories
$forum_id = 0;
$parent_id = 0;
$description = '';
$weight = 0;
$hidden = FALSE;
-
+
$category_map = variable_get('boincimport_forum_category_map', array());
-
+
if (!$category AND $create_hidden) {
// Create the special "hidden" container
$category = new stdClass();
@@ -1656,7 +1656,7 @@ function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hi
$hidden = TRUE;
}
}
-
+
$forum = array(
'name' => $category->name,
'vid' => $forum_vid,
@@ -1668,18 +1668,18 @@ function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hi
taxonomy_save_term($forum);
$success = isset($forum['tid']);
-
+
// Serialize the forum containers
$containers = variable_get('forum_containers', array());
$containers[] = $forum['tid'];
variable_set('forum_containers', $containers);
-
+
// Note the taxonomy ID for mapping forums to categories
$category_map[$category->id] = $forum['tid'];
variable_set('boincimport_forum_category_map', $category_map);
-
+
boincimport_forum_set_permissions($forum, $hidden);
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -1697,9 +1697,9 @@ function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hi
watchdog('boincimport',
'Failed to import container @id!',
array('@id' => $category->id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_category'] = $category->id;
@@ -1719,11 +1719,11 @@ function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hi
* Create a Drupal taxonomy term from the given BOINC forum object
*/
function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
-
+
$hidden_forum = FALSE;
$open_forum = FALSE;
$category_map = variable_get('boincimport_forum_category_map', array());
-
+
// Set term parameters for forums
$forum_id = $boincforum->id;
$parent_id = isset($category_map[$boincforum->category]) ? $category_map[$boincforum->category] : $category_map[0];
@@ -1738,7 +1738,7 @@ function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
// Must allow users to post in this forum even if they have no credit!
$open_forum = TRUE;
}
-
+
// Try to detect a BOINC news forum and flag it so that news can be
// imported into a Drupal news content type later
if ($name == 'News') {
@@ -1757,16 +1757,16 @@ function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
);
$forum['description'] = strip_tags($forum['description']);
- taxonomy_save_term($forum);
+ taxonomy_save_term($forum);
$success = isset($forum['tid']);
-
+
// Save the forum ID to a temporary reference table - yes this is hackish.
db_query('INSERT INTO {boincimport_temp_forum} (forum_id, tid) VALUES (%d, %d)', $boincforum->id, $forum['tid']);
-
+
// Set access controls
boincimport_forum_set_permissions($forum, $hidden_forum, $open_forum);
}
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -1777,7 +1777,7 @@ function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
$context['results']['forums']['failure'][] = $forum_id;
$message = "Failed to import forum {$forum_id}!";
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_forum'] = $forum_id;
@@ -1796,7 +1796,7 @@ function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
* Helper function to set permissions on forums upon import
*/
function boincimport_forum_set_permissions($forum, $hidden = FALSE, $open = FALSE) {
-
+
// Set access controls
$forum_perms = array();
$role_map = array_flip(user_roles());
@@ -1861,7 +1861,7 @@ function boincimport_forums_finished($success, $results, $operations) {
// Let's count our successes
$categories_imported = count($results['categories']['success']);
$forums_imported = count($results['forums']['success']);
-
+
$success_message = array();
if ($categories_imported) {
$success_message[] = format_plural(
@@ -1884,7 +1884,7 @@ function boincimport_forums_finished($success, $results, $operations) {
watchdog('boincimport',
'Successfully imported @forums',
array('@forums' => implode(' and ', $success_message)), WATCHDOG_INFO
- );
+ );
// Set the forum import successful flag in the variable table
variable_set('boincimport_import_forum_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'topics';
@@ -1896,7 +1896,7 @@ function boincimport_forums_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -1910,7 +1910,7 @@ function boincimport_forums_finished($success, $results, $operations) {
* Import BOINC topics as Drupal forum nodes
*/
function boincimport_forum_topics() {
-
+
// Check whether topics have been successfully imported already
if (variable_get('boincimport_import_topic_successful', 0)) {
drupal_set_message(t('Topic import has already run successfully'), 'warning');
@@ -1927,7 +1927,7 @@ function boincimport_forum_topics() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_topic_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get the count of non-team topics to import
@@ -1958,10 +1958,10 @@ function boincimport_forum_topics() {
'Found %count topics: Beginning Import',
array('%count' => $topic_count), WATCHDOG_INFO
);
-
+
$operations = array();
$batch_size = 100;
-
+
// Create batches to process
for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
$topics_per_batch = $batch_size;
@@ -1974,7 +1974,7 @@ function boincimport_forum_topics() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_topics_finished',
@@ -1985,7 +1985,7 @@ function boincimport_forum_topics() {
)),
'error_message' => t('Topic import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -1999,10 +1999,10 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
$context['sandbox']['progress'] = 0;
$context['sandbox']['max'] = $batch_size;
}
-
+
$input_format = variable_get('boincimport_input_format', 0);
$news_forum_id = variable_get('boincimport_news_forum_id', 0);
-
+
// Get the topic to import
db_set_active('boinc_rw');
$topics = db_query('
@@ -2017,11 +2017,11 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
$pre, $pre, $pre, $offset, $batch_size
);
db_set_active('default');
-
+
while ($topic = db_fetch_object($topics)) {
-
+
$error_detail = '';
-
+
db_set_active('boinc_rw');
// Get the content of the post that started the topic
@@ -2034,17 +2034,17 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
$pre, $topic->id
));
db_set_active('default');
-
+
$duplicate = db_result(db_query('
SELECT COUNT(*) FROM {boincimport_temp_topic}
WHERE topic_id = %d',
$topic->id
));
-
+
if ($duplicate OR !$post) {
$success = FALSE;
}
-
+
else {
// Get the user and term IDs along with other data to define the topic
$uid = boincuser_lookup_uid($topic->owner);
@@ -2056,19 +2056,19 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
if (!$topic->owner) {
$uid = 0;
}
-
+
$node_type = 'forum';
$promote = 0;
$comment = ($topic->locked) ? 1 : 2;
-
+
$post->content = _boincimport_strip_bbcode($post->content);
$post->content = _boincimport_text_sanitize($post->content);
$teaser = node_teaser($post->content);
-
+
if ($topic->timestamp < $topic->create_time) {
$topic->timestamp = $topic->create_time;
}
-
+
// If dealing with a News topic, be sure it is imported as such
if ($news_forum_id AND $topic->forum == $news_forum_id) {
$node_type = 'news';
@@ -2092,7 +2092,7 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
'teaser' => $teaser,
);
$node['tid'] = $tid;
-
+
// Save the topic node
$node = (object) $node; // node_save requires an object form
node_save($node);
@@ -2118,7 +2118,7 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
$error_detail = 'failed to save topic node to database';
}
}
-
+
// See if the import worked
$message = '';
if ($success) {
@@ -2144,9 +2144,9 @@ function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
'@error' => $error_detail,
),
WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_topic'] = $topic->id;
@@ -2186,7 +2186,7 @@ function boincimport_topics_finished($success, $results, $operations) {
'@duplicates' => $duplicates,
'@abandoned' => $empty_topics,
), WATCHDOG_INFO
- );
+ );
// Set the topic import successful flag in the variable table
variable_set('boincimport_import_topic_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'posts';
@@ -2198,7 +2198,7 @@ function boincimport_topics_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -2213,7 +2213,7 @@ function boincimport_topics_finished($success, $results, $operations) {
* Import BOINC forum posts as Drupal comments
*/
function boincimport_forum_posts() {
-
+
// Check whether forum posts have been successfully imported already
if (variable_get('boincimport_import_post_successful', 0)) {
drupal_set_message(t('Forum post import has already run successfully'), 'warning');
@@ -2230,7 +2230,7 @@ function boincimport_forum_posts() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_post_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get the BOINC threads and get a count of posts to import
@@ -2266,10 +2266,10 @@ function boincimport_forum_posts() {
'Found %count posts: Beginning Import',
array('%count' => $post_count), WATCHDOG_INFO
);
-
+
$operations = array();
$batch_size = 100;
-
+
// Create batches to process
for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
$topics_per_batch = $batch_size;
@@ -2282,7 +2282,7 @@ function boincimport_forum_posts() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_posts_finished',
@@ -2297,7 +2297,7 @@ function boincimport_forum_posts() {
),
'error_message' => t('Post import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -2311,9 +2311,9 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
$context['sandbox']['progress'] = 0;
$context['sandbox']['max'] = $batch_size;
}
-
+
$input_format = variable_get('boincimport_input_format', 0);
-
+
// Get the topics with posts to import
db_set_active('boinc_rw');
$boinc_topic_ids = db_query('
@@ -2322,11 +2322,11 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
JOIN %spost p ON p.thread = t.id
WHERE f.parent_type = 0
ORDER BY t.id
- LIMIT %d,%d',
+ LIMIT %d,%d',
$pre, $pre, $pre, $offset, $batch_size
);
db_set_active('default');
-
+
while ($boinc_topic = db_fetch_object($boinc_topic_ids)) {
// Get the posts in this topic
db_set_active('boinc_rw');
@@ -2334,7 +2334,7 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
SELECT id, user, thread, timestamp, content, parent_post, hidden
FROM %spost WHERE thread = %d ORDER BY id ASC', $pre, $boinc_topic->id);
db_set_active('default');
-
+
$first_post = true;
$topic_has_responses = FALSE;
$success = FALSE;
@@ -2344,16 +2344,16 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
$duplicate_posts = 0;
while ($post = db_fetch_object($boinc_posts)) {
-
+
// Skip the first post as it has already been imported as a topic
if ($first_post) {
$first_post = false;
continue;
}
-
+
// Making it this far confirms that there are posts to import
$topic_has_responses = TRUE;
-
+
$is_duplicate = db_result(db_query('
SELECT COUNT(*) FROM {boincimport_temp_post}
WHERE post_id = %d',
@@ -2365,10 +2365,10 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
$duplicate_posts++;
continue;
}
-
+
// Make sure the post is valid
if ($post->content) {
-
+
// Get user, node, and parent IDs for the post and sanitize
$uid = boincuser_lookup_uid($post->user);
$node = db_fetch_object(db_query('
@@ -2386,10 +2386,10 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
$post->parent_post));
if (is_null($pid)) $pid = 0;
if (!$uid) $uid = 0;
-
+
$post->content = _boincimport_strip_bbcode($post->content);
$post->content = _boincimport_text_sanitize($post->content);
-
+
$topic_reply = db_result(db_query('
SELECT COUNT(*)
FROM {comments}
@@ -2397,9 +2397,9 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
$nid
));
$post_reply = $pid;
-
+
if ($post_reply OR $topic_reply) {
- // Create a subject for the post from the post content. The body may be in
+ // Create a subject for the post from the post content. The body may be in
// any format, so we:
// 1) Filter it into HTML
// 2) Strip out all HTML tags
@@ -2416,7 +2416,7 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
// This is the first post in the topic
$subject = $node->title;
}
-
+
// Construct the post as a Drupal comment
$comment = array(
'pid' => $pid,
@@ -2428,7 +2428,7 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
'status' => $post->hidden,
'format' => $input_format
);
-
+
// Save the comment
if (boincimport_forum_comment_save($comment)) {
$success = db_query('
@@ -2455,7 +2455,7 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
$empty_posts++;
}
}
-
+
$message = '';
if ($success OR !$topic_has_responses) {
// Store some result for post-processing in the finished callback.
@@ -2465,16 +2465,16 @@ function boincimport_posts_op($offset, $batch_size, &$context) {
else {
$context['results']['failure'][] = $boinc_topic->id;
$message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
- watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)',
+ watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)',
array(
'@id' => $boinc_topic->id,
'@error_posts' => $error_posts,
'@duplicate_posts' => $duplicate_posts,
'@empty_posts' => $empty_posts,
), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_topic'] = $boinc_topic->id;
@@ -2520,7 +2520,7 @@ function boincimport_posts_finished($success, $results, $operations) {
watchdog('boincimport',
$message,
array(), WATCHDOG_INFO
- );
+ );
// Set the post import successful flag in the variable table
variable_set('boincimport_import_post_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'team forums';
@@ -2532,7 +2532,7 @@ function boincimport_posts_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -2547,7 +2547,7 @@ function boincimport_posts_finished($success, $results, $operations) {
* Import team forums
*/
function boincimport_team_forums() {
-
+
// Check whether team forums have been successfully imported already
if (variable_get('boincimport_import_team_forum_successful', 0)) {
drupal_set_message(t('Team forum import has already run successfully'), 'warning');
@@ -2561,7 +2561,7 @@ function boincimport_team_forums() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_team_forum_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get team forums from BOINC database
@@ -2593,11 +2593,11 @@ function boincimport_team_forums() {
'Found %count team forums: Beginning Import',
array('%count' => $team_forum_count), WATCHDOG_INFO
);
-
+
$operations = array();
$existing_team_forums = array();
$duplicates = array();
-
+
// Get the list of team forums already in Drupal to be sure we're not
// importing any twice
$result = db_query('
@@ -2606,7 +2606,7 @@ function boincimport_team_forums() {
while ($row = db_fetch_object($result)) {
$existing_team_forums[$row->boinc_id] = $row->nid;
}
-
+
// Create batches to process
while ($boincteam_forum = db_fetch_object($boincteam_forums)) {
if (isset($existing_team_forums[$boincteam_forum->id])) {
@@ -2621,14 +2621,14 @@ function boincimport_team_forums() {
);
}
}
-
+
if ($duplicates) {
drupal_set_message(t(
'Skipped @count team forums that were already imported',
array('@count' => count($duplicates))
));
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_team_forums_finished',
@@ -2637,7 +2637,7 @@ function boincimport_team_forums() {
'progress_message' => t('Processed @current out of @total team forums.'),
'error_message' => t('Team forum import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -2647,17 +2647,17 @@ function boincimport_team_forums() {
* object
*/
function boincimport_team_forums_op($boincteam_forum, &$context) {
-
+
$input_format = variable_get('boincimport_input_format', 0);
-
+
// Set term parameters for forums
$forum_id = $boincteam_forum->id;
$team_id = boincteam_lookup_nid($boincteam_forum->category);
$name = $boincteam_forum->title;
$description = strip_tags($boincteam_forum->description);
-
+
$success = db_query("
- INSERT INTO {boincteam_forum} SET
+ INSERT INTO {boincteam_forum} SET
boinc_id = %d,
nid = %d,
title = '%s',
@@ -2668,12 +2668,12 @@ function boincimport_team_forums_op($boincteam_forum, &$context) {
min_time_between_posts = %d,
min_total_credit_to_post = %d,
min_avg_credit_to_post = %d",
- $forum_id, $team_id, $name, $description, $boincteam_forum->timestamp,
- time(), 0, $boincteam_forum->post_min_interval,
+ $forum_id, $team_id, $name, $description, $boincteam_forum->timestamp,
+ time(), 0, $boincteam_forum->post_min_interval,
$boincteam_forum->post_min_total_credit,
$boincteam_forum->post_min_expavg_credit
);
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -2686,9 +2686,9 @@ function boincimport_team_forums_op($boincteam_forum, &$context) {
watchdog('boincimport',
'Failed to import team forum @id!',
array('@id' => $forum_id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_forum'] = $forum_id;
@@ -2717,7 +2717,7 @@ function boincimport_team_forums_finished($success, $results, $operations) {
watchdog('boincimport',
'Successfully imported @count team forums.',
array('@count' => $total_imported), WATCHDOG_INFO
- );
+ );
// Set the team forum import successful flag in the variable table
variable_set('boincimport_import_team_forum_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'team topics';
@@ -2729,7 +2729,7 @@ function boincimport_team_forums_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -2744,7 +2744,7 @@ function boincimport_team_forums_finished($success, $results, $operations) {
* Import BOINC team topics to Drupal team_forum type nodes
*/
function boincimport_team_forum_topics() {
-
+
// Check whether team forum topics have been successfully imported already
if (variable_get('boincimport_import_team_topic_successful', 0)) {
drupal_set_message(t('Team topic import has already run successfully'), 'warning');
@@ -2758,7 +2758,7 @@ function boincimport_team_forum_topics() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_team_topic_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get all team topics to import from BOINC
@@ -2798,11 +2798,11 @@ function boincimport_team_forum_topics() {
'Found %count team topics: Beginning Import',
array('%count' => $boincteam_topic_count), WATCHDOG_INFO
);
-
+
$operations = array();
$existing_team_topics = array();
$duplicates = array();
-
+
// Get the list of team topics already in Drupal to be sure we're not
// importing any twice
$result = db_query('
@@ -2811,7 +2811,7 @@ function boincimport_team_forum_topics() {
while ($row = db_fetch_object($result)) {
$existing_team_topics[$row->topic_id] = $row->nid;
}
-
+
// Create batches to process
while ($boincteam_topic = db_fetch_object($boincteam_topics)) {
if (isset($existing_team_topics[$boincteam_topic->id])) {
@@ -2826,14 +2826,14 @@ function boincimport_team_forum_topics() {
);
}
}
-
+
if ($duplicates) {
drupal_set_message(t(
'Skipped @count team topics that were already imported',
array('@count' => count($duplicates))
));
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_team_topics_finished',
@@ -2842,7 +2842,7 @@ function boincimport_team_forum_topics() {
'progress_message' => t('Processed @current out of @total team topics.'),
'error_message' => t('Team topic import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -2851,12 +2851,12 @@ function boincimport_team_forum_topics() {
* Create a Drupal node from the given BOINC team topic object
*/
function boincimport_team_topics_op($topic, &$context) {
-
+
$input_format = variable_get('boincimport_input_format', 0);
$success = FALSE;
$missing_parent = array();
$empty_topics = array();
-
+
// Verify that the team forum container has been imported
$team_forum_id = db_result(db_query("
SELECT tfid FROM {boincteam_forum}
@@ -2877,7 +2877,7 @@ function boincimport_team_topics_op($topic, &$context) {
LIMIT 1',
$pre, $topic->id);
db_set_active('default');
-
+
// Skip this topic if there are no posts
if (!$post = db_fetch_object($query)) {
// Empty topics should have already been filtered out of the import, so
@@ -2890,15 +2890,15 @@ function boincimport_team_topics_op($topic, &$context) {
if (!$topic->owner) {
$uid = 0;
}
-
+
$node_type = 'team_forum';
$promote = 0;
$comment = ($topic->locked) ? 1 : 2;
-
+
$post->content = _boincimport_strip_bbcode($post->content);
$post->content = _boincimport_text_sanitize($post->content);
$teaser = node_teaser($post->content);
-
+
if ($topic->timestamp < $topic->create_time) {
$topic->timestamp = $topic->create_time;
}
@@ -2920,7 +2920,7 @@ function boincimport_team_topics_op($topic, &$context) {
'teaser' => $teaser,
'tfid' => $team_forum_id,
);
-
+
// Save the team topic node
$node = (object) $node; // node_save requires an object form
node_save($node);
@@ -2942,7 +2942,7 @@ function boincimport_team_topics_op($topic, &$context) {
}
}
}
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -2955,9 +2955,9 @@ function boincimport_team_topics_op($topic, &$context) {
watchdog('boincimport',
'Failed to import team topic @id!',
array('@id' => $topic->id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_topic'] = $topic->id;
@@ -2986,7 +2986,7 @@ function boincimport_team_topics_finished($success, $results, $operations) {
watchdog('boincimport',
'Successfully imported @count team topics.',
array('@count' => $total_imported), WATCHDOG_INFO
- );
+ );
// Set the BLAH import successful flag in the variable table
variable_set('boincimport_import_team_topic_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'team posts';
@@ -2998,7 +2998,7 @@ function boincimport_team_topics_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -3013,7 +3013,7 @@ function boincimport_team_topics_finished($success, $results, $operations) {
* Import BOINC team forum posts as Drupal comments
*/
function boincimport_team_forum_posts() {
-
+
// Check whether team forum posts have been successfully imported already
if (variable_get('boincimport_import_team_post_successful', 0)) {
drupal_set_message(t('Team forum post import has already run successfully'), 'warning');
@@ -3030,7 +3030,7 @@ function boincimport_team_forum_posts() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_team_post_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get the BOINC threads and get a count of team posts to import
@@ -3073,11 +3073,11 @@ function boincimport_team_forum_posts() {
'Found %count team posts: Beginning Import',
array('%count' => $team_post_count), WATCHDOG_INFO
);
-
+
$operations = array();
$existing_posts = array();
$duplicates = array();
-
+
// Get the list of team posts already in Drupal to be sure we're not
// importing any twice
$result = db_query('
@@ -3086,10 +3086,10 @@ function boincimport_team_forum_posts() {
while ($row = db_fetch_object($result)) {
$existing_posts[$row->post_id] = $row->cid;
}
-
+
// Create batches to process
while ($boincteam_topic = db_fetch_object($team_topic_ids)) {
-
+
db_set_active('boinc_rw');
$boincteam_posts = db_query('
SELECT id, user, thread, timestamp, content, parent_post, hidden
@@ -3099,11 +3099,11 @@ function boincimport_team_forum_posts() {
$pre, $boincteam_topic->id
);
db_set_active('default');
-
+
$first_post = true;
while ($boincteam_post = db_fetch_object($boincteam_posts)) {
-
+
// Skip the first post as it has already been imported as a topic
if ($first_post) {
$first_post = false;
@@ -3123,14 +3123,14 @@ function boincimport_team_forum_posts() {
}
}
}
-
+
if ($duplicates) {
drupal_set_message(t(
'Skipped @count team posts that were already imported',
array('@count' => count($duplicates))
));
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_team_posts_finished',
@@ -3139,7 +3139,7 @@ function boincimport_team_forum_posts() {
'progress_message' => t('Processed @current out of @total team posts.'),
'error_message' => t('Team post import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -3148,13 +3148,13 @@ function boincimport_team_forum_posts() {
* Create a Drupal comment from the given BOINC team post object
*/
function boincimport_team_posts_op($post, &$context) {
-
+
$input_format = variable_get('boincimport_input_format', 0);
$success = FALSE;
-
+
// Make sure the post is valid
if ($post->content) {
-
+
// Get user, node, and parent IDs for the post and sanitize
$uid = boincuser_lookup_uid($post->user);
$node = db_fetch_object(db_query('
@@ -3172,10 +3172,10 @@ function boincimport_team_posts_op($post, &$context) {
$post->parent_post));
if (is_null($pid)) $pid = 0;
if (!$uid) $uid = 0;
-
+
$post->content = _boincimport_strip_bbcode($post->content);
$post->content = _boincimport_text_sanitize($post->content);
-
+
$topic_reply = db_result(db_query('
SELECT COUNT(*)
FROM {comments}
@@ -3183,9 +3183,9 @@ function boincimport_team_posts_op($post, &$context) {
$nid
));
$post_reply = $pid;
-
+
if ($post_reply OR $topic_reply) {
- // Create a subject for the post from the post content. The body may be in
+ // Create a subject for the post from the post content. The body may be in
// any format, so we:
// 1) Filter it into HTML
// 2) Strip out all HTML tags
@@ -3202,7 +3202,7 @@ function boincimport_team_posts_op($post, &$context) {
// This is the first post in the topic
$subject = $node->title;
}
-
+
// Construct the post as a Drupal comment
$comment = array(
'pid' => $pid,
@@ -3214,7 +3214,7 @@ function boincimport_team_posts_op($post, &$context) {
'status' => $post->hidden,
'format' => $input_format
);
-
+
// Save the comment
if (boincimport_forum_comment_save($comment)) {
$success = db_query('
@@ -3224,7 +3224,7 @@ function boincimport_team_posts_op($post, &$context) {
);
}
}
-
+
$message = '';
if ($success) {
// Store some result for post-processing in the finished callback.
@@ -3237,9 +3237,9 @@ function boincimport_team_posts_op($post, &$context) {
watchdog('boincimport',
'Failed to import team post @id!',
array('@id' => $post->id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_post'] = $post->id;
@@ -3268,7 +3268,7 @@ function boincimport_team_posts_finished($success, $results, $operations) {
watchdog('boincimport',
'Successfully imported @count team posts.',
array('@count' => $total_imported), WATCHDOG_INFO
- );
+ );
// Set the team post import successful flag in the variable table
variable_set('boincimport_import_team_post_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'url';
@@ -3280,7 +3280,7 @@ function boincimport_team_posts_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -3295,7 +3295,7 @@ function boincimport_team_posts_finished($success, $results, $operations) {
* Import subscriptions for users
*/
function boincimport_subscriptions() {
-
+
// Check whether subscriptions have been successfully imported already
if (variable_get('boincimport_import_subscription_successful', 0)) {
drupal_set_message(t('Subscription import has already run successfully'), 'warning');
@@ -3309,7 +3309,7 @@ function boincimport_subscriptions() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_import_subscription_started', 1);
}
-
+
$pre = variable_get('boincimport_table_prefix', '');
// Get users with subscriptions to import
@@ -3339,9 +3339,9 @@ function boincimport_subscriptions() {
'Found %count users with subscriptions: Beginning import',
array('%count' => $user_count), WATCHDOG_INFO
);
-
+
$operations = array();
-
+
// Create batches to process
while ($subscribed_user = db_fetch_object($users_with_subscriptions)) {
$operations[] = array(
@@ -3350,7 +3350,7 @@ function boincimport_subscriptions() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_subscriptions_finished',
@@ -3359,7 +3359,7 @@ function boincimport_subscriptions() {
'progress_message' => t('Processed @current out of @total subscriptions.'),
'error_message' => t('Subscription import has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -3368,11 +3368,11 @@ function boincimport_subscriptions() {
* Import subscriptions for the given user
*/
function boincimport_subscriptions_op($boincuser_id, &$context) {
-
+
// Get the drupal user and pull subscriptions
$uid = get_drupal_id($boincuser_id);
$count = boincuser_pull_subscriptions($uid);
-
+
$message = '';
if ($count) {
// Store some result for post-processing in the finished callback.
@@ -3386,9 +3386,9 @@ function boincimport_subscriptions_op($boincuser_id, &$context) {
watchdog('boincimport',
'Failed to import subscriptions for user @id!',
array('@id' => $boincuser_id), WATCHDOG_WARNING
- );
+ );
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_user'] = $boincuser_id;
@@ -3419,7 +3419,7 @@ function boincimport_subscriptions_finished($success, $results, $operations) {
'Successfully imported @count subscriptions for @distinct users.',
array('@count' => $subscriptions_imported, '@distinct' => $user_count),
WATCHDOG_INFO
- );
+ );
// Set the subscription import successful flag in the variable table
variable_set('boincimport_import_subscription_successful', '1');
$_SESSION['boincimport_stage_selected'] = 'url';
@@ -3431,7 +3431,7 @@ function boincimport_subscriptions_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -3445,7 +3445,7 @@ function boincimport_subscriptions_finished($success, $results, $operations) {
* Update relative BOINC URLs to work with Drupal
*/
function boincimport_replace_urls() {
-
+
// Check whether URLs have already been fixed
if (variable_get('boincimport_replace_url_successful', 0)) {
drupal_set_message(t('URLs have already been updated'), 'warning');
@@ -3459,25 +3459,25 @@ function boincimport_replace_urls() {
// Could prepare database tables, if new fields are necessary, etc.
variable_set('boincimport_replace_url_started', 1);
}
-
+
// Get the count of nodes and comments to process for URL updates
$node_count = db_result(db_query('
SELECT COUNT(DISTINCT btt.nid)
FROM {boincimport_temp_topic} AS btt
LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid'
));
-
+
$comment_count = db_result(db_query('
SELECT COUNT(c.cid)
FROM {boincimport_temp_post} AS p
LEFT JOIN {comments} AS c ON p.cid = c.cid'
));
-
+
$pm_count = db_result(db_query('
SELECT COUNT(*)
FROM {pm_message} pm'
));
-
+
if (!$node_count AND !$comment_count AND !$pm_count) {
drupal_set_message(
t('There were no nodes, comments, or private messages found: Aborting script'), 'warning'
@@ -3489,7 +3489,7 @@ function boincimport_replace_urls() {
variable_del('boincimport_process_locked');
return t('There were no nodes, comments, or private messages found: Aborting script.');
}
-
+
watchdog('boincimport',
'Found %node_count nodes, %comment_count comments, and %pm_count private messages: Updating URLs...',
array(
@@ -3499,10 +3499,10 @@ function boincimport_replace_urls() {
),
WATCHDOG_INFO
);
-
+
$operations = array();
$batch_size = 100;
-
+
// Create node batches to process
for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
$nodes_per_batch = $batch_size;
@@ -3539,7 +3539,7 @@ function boincimport_replace_urls() {
)
);
}
-
+
$batch = array(
'operations' => $operations,
'finished' => 'boincimport_replace_urls_finished',
@@ -3550,7 +3550,7 @@ function boincimport_replace_urls() {
)),
'error_message' => t('URL update has encountered an error.'),
);
-
+
batch_set($batch);
}
@@ -3564,7 +3564,7 @@ function boincimport_replace_urls_node_op($offset, $batch_size, &$context) {
$context['sandbox']['progress'] = 0;
$context['sandbox']['max'] = $batch_size;
}
-
+
$input_format = variable_get('boincimport_input_format', 0);
// Since topics have just been imported, there should be only one vid for
@@ -3578,10 +3578,10 @@ function boincimport_replace_urls_node_op($offset, $batch_size, &$context) {
LIMIT %d,%d',
$offset, $batch_size
);
-
+
while ($node = db_fetch_object($nodes)) {
$updated = FALSE;
-
+
// Update URLs in node contents
$original_body = $node->body;
$original_teaser = $node->teaser;
@@ -3595,7 +3595,7 @@ function boincimport_replace_urls_node_op($offset, $batch_size, &$context) {
$node->body, $node->teaser, $node->nid
);
}
-
+
$message = '';
$context['results']['success'][] = $node->nid;
if ($updated) {
@@ -3606,7 +3606,7 @@ function boincimport_replace_urls_node_op($offset, $batch_size, &$context) {
else {
$message = "No changes made to node {$node->nid}!";
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_node'] = $node->nid;
@@ -3632,9 +3632,9 @@ function boincimport_replace_urls_comment_op($offset, $batch_size, &$context) {
$context['sandbox']['progress'] = 0;
$context['sandbox']['max'] = $batch_size;
}
-
+
$input_format = variable_get('boincimport_input_format', 0);
-
+
// Get comments to process
$comments = db_query('
SELECT c.cid, c.comment
@@ -3644,10 +3644,10 @@ function boincimport_replace_urls_comment_op($offset, $batch_size, &$context) {
LIMIT %d,%d',
$offset, $batch_size
);
-
+
while ($comment = db_fetch_object($comments)) {
$updated = FALSE;
-
+
// Update URLs in comment contents
$original_comment = $comment->comment;
$comment->comment = _boincimport_replace_links($comment->comment);
@@ -3659,7 +3659,7 @@ function boincimport_replace_urls_comment_op($offset, $batch_size, &$context) {
$comment->comment, $comment->cid
);
}
-
+
$message = '';
$context['results']['success'][] = $comment->cid;
if ($updated) {
@@ -3670,7 +3670,7 @@ function boincimport_replace_urls_comment_op($offset, $batch_size, &$context) {
else {
$message = "No changes made to comment {$comment->cid}!";
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_comment'] = $comment->cid;
@@ -3696,9 +3696,9 @@ function boincimport_replace_urls_pm_op($offset, $batch_size, &$context) {
$context['sandbox']['progress'] = 0;
$context['sandbox']['max'] = $batch_size;
}
-
+
$input_format = variable_get('boincimport_input_format', 0);
-
+
// Get private messages to process
$messages = db_query('
SELECT pm.mid, pm.body
@@ -3707,10 +3707,10 @@ function boincimport_replace_urls_pm_op($offset, $batch_size, &$context) {
LIMIT %d,%d',
$offset, $batch_size
);
-
+
while ($pm = db_fetch_object($messages)) {
$updated = FALSE;
-
+
// Update URLs in private message body
$original_pm_body = $pm->body;
$pm->body = _boincimport_replace_links($pm->body);
@@ -3722,7 +3722,7 @@ function boincimport_replace_urls_pm_op($offset, $batch_size, &$context) {
$pm->body, $pm->mid
);
}
-
+
$message = '';
$context['results']['success'][] = $pm->mid;
if ($updated) {
@@ -3733,7 +3733,7 @@ function boincimport_replace_urls_pm_op($offset, $batch_size, &$context) {
else {
$message = "No changes made to private message {$pm->mid}!";
}
-
+
// Update our progress information.
$context['sandbox']['progress']++;
$context['sandbox']['current_pm'] = $pm->mid;
@@ -3816,7 +3816,7 @@ function boincimport_replace_urls_finished($success, $results, $operations) {
$message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
}
drupal_set_message($message);
-
+
// Release the lock on the import process
variable_del('boincimport_process_locked');
drupal_goto('admin/boinc/import/process');
@@ -3832,7 +3832,7 @@ function boincimport_replace_urls_finished($success, $results, $operations) {
*/
function boincimport_process_cleanup() {
db_set_active('default');
-
+
variable_del('boincimport_base_url_boinc');
variable_del('boincimport_base_url_drupal');
variable_del('boincimport_import_user_successful');
@@ -3858,7 +3858,7 @@ function boincimport_process_cleanup() {
variable_del('boincimport_team_types');
variable_del('boincimport_time_limit');
variable_del('boincimport_import_lurkers');
- variable_del('boincimport_import_polls');
+ variable_del('boincimport_import_polls');
variable_del('boincimport_import_poll_started');
variable_del('boincimport_import_poll_successful');
variable_del('boincimport_import_pm_successful');
@@ -3910,7 +3910,7 @@ function boincimport_forum_comment_save(&$edit) {
$format = variable_get('boincimport_input_format', 0);
$score = 0; // 0 default value, comments get higher score depending on the author's roles
$users = serialize(array(0 => 1)); // default value for everybody!!
-
+
if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
$edit['name'] = $user->name;
}
@@ -3964,9 +3964,9 @@ function _boincimport_text_sanitize($text) {
* Replace all types of links.
*/
function _boincimport_replace_links($html) {
-
+
$transformer = new BoincImportUrlTransformer();
-
+
// Update links to posts, threads, and forums
$html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)&postid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformPostLinks'), $html);
$html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?(#(\d+)?)}i', array($transformer, 'transformOldPostLinks'), $html);
@@ -3979,10 +3979,10 @@ function _boincimport_replace_links($html) {
$html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostResultsLinks'), $html);
$html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_host_detail\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostLinks'), $html);
$html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)hosts_user\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserHostsLinks'), $html);
-
+
// Update any links to the top level index
$html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_index.php}i', array($transformer, 'transformForumIndexLinks'), $html);
-
+
return $html;
}
@@ -3990,11 +3990,11 @@ function _boincimport_replace_links($html) {
* Limit redundancy by using this class to do URL transformations
*/
class BoincImportUrlTransformer {
-
+
var $basePath;
var $boincDomain;
var $drupalDomain;
-
+
/**
* Constructor
*/
@@ -4015,7 +4015,7 @@ class BoincImportUrlTransformer {
}
if (!$this->boincDomains) {
watchdog('boincimport', 'No valid BOINC base URLs found to transform!',
- array(), WATCHDOG_WARNING);
+ array(), WATCHDOG_WARNING);
}
}
@@ -4023,7 +4023,7 @@ class BoincImportUrlTransformer {
function BoincImportUrlTransformer() {
self::__construct();
}
-
+
/**
* Get what the new base URL should be (needed for every transformation)
*/
@@ -4045,7 +4045,7 @@ class BoincImportUrlTransformer {
return $this->basePath;
}
}
-
+
/**
* Replace links to specific posts. If the given post is the first in the
* thread, it is a topic node in Drupal, not a comment.
@@ -4070,7 +4070,7 @@ class BoincImportUrlTransformer {
}
return $link;
}
-
+
/**
* Replace links that include anchors to specific posts. If the given post is
* the first in the thread, it is a topic node in Drupal, not a comment.
@@ -4095,7 +4095,7 @@ class BoincImportUrlTransformer {
}
return $link;
}
-
+
function transformTopicLinks($matches) {
$link = $matches[0];
$newBaseUrl = $this->getNewBaseUrl($matches);
@@ -4171,7 +4171,7 @@ class BoincImportUrlTransformer {
}
return $link;
}
-
+
function transformUserResultsLinks($matches) {
$link = $matches[0];
$newBaseUrl = $this->getNewBaseUrl($matches);
@@ -4180,7 +4180,7 @@ class BoincImportUrlTransformer {
}
return $link;
}
-
+
function transformHostLinks($matches) {
$link = $matches[0];
$newBaseUrl = $this->getNewBaseUrl($matches);
@@ -4190,7 +4190,7 @@ class BoincImportUrlTransformer {
}
return $link;
}
-
+
function transformUserHostsLinks($matches) {
$link = $matches[0];
$newBaseUrl = $this->getNewBaseUrl($matches);
@@ -4202,7 +4202,7 @@ class BoincImportUrlTransformer {
}
return $link;
}
-
+
function transformForumIndexLinks($matches) {
$link = $matches[0];
$newBaseUrl = $this->getNewBaseUrl($matches);
diff --git a/drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc b/drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc
index 1e40b445fc1..f399a9f7889 100644
--- a/drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc
+++ b/drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc
@@ -8,11 +8,11 @@ function boincimport_admin_settings() {
global $conf ;
global $db_url;
global $base_url;
- $stage = variable_get('boincimport_config_stage', 0);
-
+ $stage = variable_get('boincimport_config_stage', 0);
+
// Start with a quick sanity check on the BOINC environment
boinc_get_path();
-
+
//We'll be checking that the setup is complete.
//If it is not complete, the migration will not go ahead.
$ready_for_migration = 1;
@@ -24,7 +24,7 @@ function boincimport_admin_settings() {
'#collapsible' => TRUE,
'#collapsed' => TRUE,
);
-
+
$output = '';
if (!variable_get('boincimport_tested', 0)) {
$form['test']['#collapsed']= FALSE;
@@ -52,13 +52,13 @@ function boincimport_admin_settings() {
'#default_value' => variable_get('boincimport_tested', 0),
'#description' => '',
);
-
+
// Where is BOINC data?
$pre = variable_get('boincimport_table_prefix', '');
$tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
$db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
$result = _boincimport_check_tables($tables, $db, 0);
-
+
$config_path = conf_path();
$form['boinc_data'] = array(
'#type' => 'fieldset',
@@ -106,7 +106,7 @@ function boincimport_admin_settings() {
postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '';
$form['boinc_data']['note'] = array('#value' => $output);
-
+
// BOINC table prefix
$form['boinc_data']['boincimport_table_prefix'] = array(
'#type' => 'textfield',
@@ -117,7 +117,7 @@ function boincimport_admin_settings() {
'#description' => t('What prefix is used for your BOINC tables?'),
'#disabled' => ($result['result']) ? TRUE : FALSE
);
-
+
$output = $result['html'];
if ($result['result'] != 1) {
$ready_for_migration = 0;
@@ -129,7 +129,7 @@ function boincimport_admin_settings() {
}
$form['boinc_data']['result'] = array('#value' => $output);
-
+
// USERS settings
$form['users'] = array(
'#type' => 'fieldset',
@@ -171,20 +171,20 @@ function boincimport_admin_settings() {
);
$output = ''. t('Select which !input_format should be used for the imported
messages. It is highly-recommended that this value be left as it is, as the
- Full HTML and PHP code formats can be very dangerous!',
+ Full HTML and PHP code formats can be very dangerous!',
array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'
';
$form['input']['intro'] = array('#value' => $output);
-
+
$formats = db_query('SELECT format, name FROM {filter_formats}');
while ($format = db_fetch_array($formats)) {
$input_formats[$format['format']]= $format['name'];
}
-
+
// By default, use the format named "Rich text"; fall back to Filtered HTML
$default_input_format = db_result(db_query("
SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
if (!$default_input_format) $default_input_format = 1;
-
+
$input_format = variable_get('boincimport_input_format', $default_input_format);
$form['input']['boincimport_input_format'] = array(
'#type' => 'radios',
@@ -199,7 +199,7 @@ function boincimport_admin_settings() {
$output = ''. t('This setting will be applied to all posts and private
messages.') .'
';
$form['input']['result'] = array('#value' => $output);
-
+
// BBcode settings
$form['bbcode'] = array(
'#type' => 'fieldset',
@@ -207,7 +207,7 @@ function boincimport_admin_settings() {
'#collapsible' => TRUE,
'#collapsed' => TRUE,
);
-
+
$output = '' . t('BOINC posts are often formatted in BBcode. During the
import process, BBcode can be handled in two diffent ways') . ':
';
$output .= '- ' . t('Leave the BBcode as is and use the !bbcode_module
@@ -225,7 +225,7 @@ function boincimport_admin_settings() {
"Filtered HTML" input format unless they are first added to the list of
allowed tags in that format. See the !input_formats page.',
array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '';
-
+
$form['bbcode']['intro'] = array('#value' => $output);
$form['bbcode']['boincimport_bbcode'] = array(
'#type' => 'radios',
@@ -234,11 +234,11 @@ function boincimport_admin_settings() {
'#options' => array(t('Leave BBcode as is.'), t('Transform BBcode into HTML.')),
'#description' => '',
);
-
+
$module_status = _boincimport_check_module('bbcode');
$bbcode_disabled = ($module_status['result'] == 0) ? true : false;
$output = $module_status['html'];
-
+
if (variable_get('boincimport_bbcode', 0)) {
if ($bbcode_disabled) {
$ready_for_migration = 0;
@@ -259,7 +259,7 @@ function boincimport_admin_settings() {
'!enable_bbcode_input' => l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
'!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'';
}
- $output .= '
'. t('For best results, !disable_all_options',
+ $output .= '
'. t('For best results, !disable_all_options',
array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.
';
} else {
if ($bbcode_disabled) {
@@ -276,9 +276,9 @@ function boincimport_admin_settings() {
}
$output .= ''. t('This setting will be applied to all posts, private
messages and the users\' signature.') .'
';
-
+
$form['bbcode']['result'] = array('#value' => $output);
-
+
// URL transform settings
$form['url_transforms'] = array(
'#type' => 'fieldset',
@@ -310,7 +310,7 @@ function boincimport_admin_settings() {
left blank, the base_url configured in this Drupal environment will be
used (currently: %url)', array('%url' =>$base_url)),
);
-
+
// Are we ready for migration?
$form['migration'] = array(
'#type' => 'fieldset',
@@ -326,9 +326,9 @@ function boincimport_admin_settings() {
$output = ''. t('You are not ready for the migration yet.
Please check the settings above.') .'
';
}
-
+
$form['migration']['info'] = array('#value' => $output);
- return system_settings_form($form);
+ return system_settings_form($form);
}
/**
@@ -345,11 +345,11 @@ function boincimport_post_configuration() {
available.') .' ';
$output .= '
';
//User Set up
- $output .= ''. t('User settings') .'
';
+ $output .= ''. t('User settings') .'
';
$output .= ''. t('Make sure your !user_settings are correct. Specifically,
you can enable or disable signatures there. ', array(
'!user_settings' => l(t('user settings'), 'admin/user/settings')
- )) .'
';
+ )) .'';
$output .= '' . t('Note that avatar/picture support is not tied to user
settings Picture support at this time.') . '
';
/*$output .= '' . t('In order to activate avatar/picture support, you need to
@@ -364,7 +364,7 @@ function boincimport_post_configuration() {
'@files' => file_directory_path(). '/pictures'
)) .'';
$output .= '
'; */
-
+
// Forum Set up
$output .= ''. t('Forum settings') .'
';
$output .= ''. t('Check any additional changes to make on the
diff --git a/drupal/sites/default/boinc/modules/boincimport/includes/import_subscriptions.php b/drupal/sites/default/boinc/modules/boincimport/includes/import_subscriptions.php
index cc0d4137ad9..bff66acb223 100644
--- a/drupal/sites/default/boinc/modules/boincimport/includes/import_subscriptions.php
+++ b/drupal/sites/default/boinc/modules/boincimport/includes/import_subscriptions.php
@@ -15,16 +15,16 @@
require_once('./includes/bootstrap.inc');
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
require_boinc('db');
-
+
// Parse arguments
$record_offset = isset($argv[1]) ? $argv[1] : 0;
$chunk_size = isset($argv[2]) ? $argv[2] : 100;
-
+
// Construct sql conditions
$limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
-
+
$total_count = 0;
-
+
// Get the users with subscriptions to import
db_set_active('boinc_rw');
$subscribed_boinc_users = db_query("
@@ -32,7 +32,7 @@
ORDER BY userid ASC %s", $limit
);
db_set_active('default');
-
+
// Import subscriptions
while ($boinc_subscription = db_fetch_object($subscribed_boinc_users)) {
$uid = get_drupal_id($boinc_subscription->userid);
diff --git a/drupal/sites/default/boinc/modules/boincimport/includes/import_team.php b/drupal/sites/default/boinc/modules/boincimport/includes/import_team.php
index 329a1998e46..f5e30687d13 100644
--- a/drupal/sites/default/boinc/modules/boincimport/includes/import_team.php
+++ b/drupal/sites/default/boinc/modules/boincimport/includes/import_team.php
@@ -14,28 +14,28 @@
require_once('./includes/bootstrap.inc');
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
require_boinc('db');
-
+
// Parse arguments
$team_id = isset($argv[1]) ? $argv[1] : null;
$team_type_tid = isset($argv[2]) ? $argv[2] : null;
$input_format = isset($argv[3]) ? $argv[3] : null;
-
+
$count = 0;
-
+
// Get teams from BOINC
db_set_active('boinc_rw');
$boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
$boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
$boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
db_set_active('default');
-
+
$team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
// FIXME: $team_exists==FALSE should be handled as an error and return an error code!
if ($team_exists != FALSE && db_fetch_object($team_exists) == FALSE) {
$boincteam->description = _boincimport_text_sanitize($boincteam->description);
$teaser = node_teaser($boincteam->description);
-
+
// Construct the team as an organic group node
$node = array(
'type' => 'team',
@@ -52,7 +52,7 @@
'sticky' => 0,
'format' => $input_format
);
-
+
// Use pathauto function, if available, to clean up the path
if (module_exists('pathauto')) {
module_load_include('inc', 'pathauto', 'pathauto');
@@ -62,18 +62,18 @@
echo 'Pathauto module is required!';
exit;
}
-
+
$node = (object) $node; // node_save requires an object form
-
+
$node->taxonomy[] = taxonomy_get_term($team_type_tid);
-
+
// 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)', $boincteam->id, $node->nid);
}
-
+
// Determine team membership
db_set_active('boinc_rw');
$boincteam_member_ids = array();
@@ -82,12 +82,12 @@
if ($boincteam_member_ids) {
$team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));
$team_admin = (int) db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
-
+
while ($drupal_user = db_fetch_object($team_members)) {
// Add action to take on member accounts?
$count++;
}
}
-
+
echo $count;
-
+
diff --git a/drupal/sites/default/boinc/modules/boincimport/includes/import_users.php b/drupal/sites/default/boinc/modules/boincimport/includes/import_users.php
index f41236793cf..ec88c0f0021 100644
--- a/drupal/sites/default/boinc/modules/boincimport/includes/import_users.php
+++ b/drupal/sites/default/boinc/modules/boincimport/includes/import_users.php
@@ -15,17 +15,17 @@
require_once('./includes/bootstrap.inc');
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
require_boinc('db');
-
+
// Parse arguments
$import_lurkers = isset($argv[1]) ? $argv[1] : false;
$record_offset = isset($argv[2]) ? $argv[2] : 0;
$chunk_size = isset($argv[3]) ? $argv[3] : 100;
-
+
// Construct sql conditions
$limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
-
+
$count = 0;
-
+
db_set_active('boinc_rw');
if ($import_lurkers) {
$boinc_accounts = db_query('SELECT id FROM user ORDER BY id %s', $limit);
@@ -60,12 +60,12 @@
);
}
db_set_active('default');
-
+
while ($boinc_account = db_fetch_object($boinc_accounts)) {
// Grab the BOINC user object and create a Drupal user from it
if (boincuser_register_make_drupal_user($boinc_account->id)) {
$count++;
}
}
-
+
echo $count;
diff --git a/drupal/sites/default/boinc/modules/boincstats/boincstats.admin.inc b/drupal/sites/default/boinc/modules/boincstats/boincstats.admin.inc
index 4b2d141abf1..42e45f76e19 100644
--- a/drupal/sites/default/boinc/modules/boincstats/boincstats.admin.inc
+++ b/drupal/sites/default/boinc/modules/boincstats/boincstats.admin.inc
@@ -40,7 +40,7 @@ function boincstats_admin_stats_system(&$form_state) {
'#type' => 'textfield',
'#title' => t('Stats ID for @project', array(
'@project' => variable_get('site_name', 'Drupal-BOINC'))),
- '#default_value' => $default['boinc_stats_remote_project_id'],
+ '#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
supported. !find_project_id there.', array(
diff --git a/drupal/sites/default/boinc/modules/boincstats/boincstats.module b/drupal/sites/default/boinc/modules/boincstats/boincstats.module
index 4c20a62eef0..a1fe9d69119 100644
--- a/drupal/sites/default/boinc/modules/boincstats/boincstats.module
+++ b/drupal/sites/default/boinc/modules/boincstats/boincstats.module
@@ -23,7 +23,7 @@
function boincstats_menu() {
$items['admin/boinc/stats'] = array(
'title' => 'Environment: Statistics setup',
- 'description' => 'Configure the stats system for generating charts and
+ 'description' => 'Configure the stats system for generating charts and
providing cross project data.',
'page callback' => 'drupal_get_form',
'page arguments' => array('boincstats_admin_stats_system'),
@@ -48,31 +48,31 @@ function boincstats_menu() {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Page callbacks from hook_menu()
* * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
+
/**
* 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');
-
+
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;
-
+
$stats_xml = NULL;
-
+
switch($chart_size) {
case 'small':
$cache_name .= "{$cpid}_small";
@@ -92,16 +92,16 @@ function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
$draw_x_lines = TRUE;
$label_x_axis = TRUE;
}
-
+
// 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);
-
+
if ($myCache->isInCache($cache_name)) {
$myCache->strokeFromCache($cache_name);
}
@@ -118,21 +118,21 @@ function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
else {
for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
}
-
+
// Get color configuration
$color_keys = array('R', 'G', 'B');
$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"));
-
+
// Create and populate the pData object
$MyData = new pData();
-
+
$MyData->addPoints($dataset, 'series1');
$MyData->setPalette('series1', $palette_color);
$MyData->setAxisPosition(0,AXIS_POSITION_RIGHT);
-
+
// Create the pChart object
$myPicture = new pImage($chart_width, $chart_height, $MyData);
@@ -147,7 +147,7 @@ function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
if ($backdrop_color) {
$myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
}
-
+
// Draw the scale
$scaleSettings = array(
'Mode' => SCALE_MODE_START0,
@@ -172,7 +172,7 @@ function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
);
$myPicture->setFontProperties(array('FontSize' => 10));
$myPicture->drawScale($scaleSettings);
-
+
if ($label_x_axis) {
for ($i = 5; $i >= 0; $i--) {
$label = ($i) ? -10*$i : 'Today';
@@ -182,10 +182,10 @@ function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
// Draw the area chart
$myPicture->drawAreaChart(array('ForceTransparency' => 100));
-
+
// Write the chart to the cache
$myCache->writeToCache($cache_name, $myPicture);
-
+
// Render the picture (choose the best way)
//$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
$myPicture->stroke();
@@ -202,28 +202,28 @@ function boincstats_get_project_stats_chart() {
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);
-
+
if ($myCache->isInCache($cache_name)) {
$myCache->strokeFromCache($cache_name);
}
@@ -240,10 +240,10 @@ function boincstats_get_project_stats_chart() {
else {
for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
}
-
+
// Create and populate the pData object
$MyData = new pData();
-
+
$MyData->addPoints($dataset, 'series1');
$MyData->setPalette('series1', $palette_color);
$MyData->setAxisPosition(0,AXIS_POSITION_RIGHT);
@@ -285,7 +285,7 @@ function boincstats_get_project_stats_chart() {
);
$myPicture->setFontProperties(array('FontSize' => 10));
$myPicture->drawScale($scaleSettings);
-
+
/*for ($i = 5; $i >= 0; $i--) {
$label = ($i) ? -10*$i : 'Today';
$myPicture->drawText(598-596*($i/6)-5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
@@ -293,7 +293,7 @@ function boincstats_get_project_stats_chart() {
// Draw the area chart */
$myPicture->drawAreaChart(array('ForceTransparency' => 100));
-
+
// Write the chart to the cache
$myCache->writeToCache($cache_name, $myPicture);
@@ -341,13 +341,13 @@ function boincstats_check_cache_dir($cache_path = 'files/cache') {
*
*/
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', '');
-
+
$get = array(
'id' => $project_id
);
@@ -358,13 +358,13 @@ function boincstats_get_project_stats($type = 'total', $cpid = NULL) {
case 'total':
default:
}
-
+
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) {
@@ -376,7 +376,7 @@ function boincstats_get_project_stats($type = 'total', $cpid = NULL) {
}
}
$query = '?' . implode('&', $args);
-
+
// Load XML from RPC
$stats_xml = NULL;
$target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam.module b/drupal/sites/default/boinc/modules/boincteam/boincteam.module
index 053b411a5fa..f6ba8089a04 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam.module
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam.module
@@ -119,7 +119,7 @@ function boincteam_menu() {
'type' => MENU_NORMAL_ITEM,
'file' => 'boincteam.admin.inc',
);
-
+
return $items;
}
@@ -178,7 +178,7 @@ function boincteam_cron() {
* Callback ...
*/
function boincteam_top_teams() {
-
+
}
/**
@@ -237,7 +237,7 @@ function boincteam_assume_foundership($team_id) {
$boincteam_id = boincteam_lookup_id($team_id);
$boincteam = boincteam_load($boincteam_id);
$boincuser_id = $account->boincuser_id;
-
+
if (boincteam_foundership_transfer_ok($boincteam)) {
if ($boincuser_id == $boincteam->ping_user) {
db_set_active('boinc_rw');
@@ -306,13 +306,13 @@ function boincteam_deny_foundership_request($team_id) {
$boincteam_id
);
db_set_active('default');
-
+
drupal_set_message(t('The transfer request has been denied. No additional
requests will be allowed until 90 days have passed since this request was
made.'));
drupal_goto("community/teams/{$team_id}/edit/founder");
}
-
+
/**
* Get the join date of a user
@@ -351,7 +351,7 @@ function boincteam_get_type($team_id) {
/**
* Access a vocabulary of terms by name
- */
+ */
function boincteam_get_vocabulary_by_name($name) {
$vocabs = taxonomy_get_vocabularies('team');
foreach ($vocabs as $vocab) {
@@ -371,10 +371,10 @@ function boincteam_history_xml($team_id) {
'action' => array(),
),
);
-
+
db_set_active('boinc_rw');
$result = db_query("
- SELECT
+ SELECT
td.userid AS id,
u.name,
IF (td.joining, 'joined', 'left') AS action,
@@ -387,11 +387,11 @@ function boincteam_history_xml($team_id) {
$boincteam_id
);
db_set_active('default');
-
+
while ($record = db_fetch_array($result)) {
$team_history['actions']['action'][] = $record;
}
-
+
header('Content-type: text/xml');
echo xml_to_text(array_to_xml($team_history));
}
@@ -508,7 +508,7 @@ function boincteam_show_messages() {
function boincteam_join($team_id) {
global $user;
$account = user_load($user->uid);
-
+
$boincteam_id = boincteam_lookup_id($team_id);
$boincteam = boincteam_load($boincteam_id);
if ($boincteam->joinable AND $account->team != $team_id) {
@@ -537,7 +537,7 @@ function boincteam_join($team_id) {
function boincteam_leave($team_id) {
global $user;
$account = user_load($user->uid);
-
+
$boincteam_id = boincteam_lookup_id($team_id);
$boincteam = boincteam_load($boincteam_id);
if ($account->team == $team_id) {
@@ -565,7 +565,7 @@ function boincteam_remove_admin($team_id, $user_id) {
$team = node_load($team_id);
$boincteam_id = boincteam_lookup_id($team_id);
$boincuser_id = $account->boincuser_id;
-
+
if (boincteam_is_admin($team_id, $account->uid)) {
// Update the team in the BOINC db
db_set_active('boinc_rw');
@@ -586,7 +586,7 @@ function boincteam_remove_admin($team_id, $user_id) {
@uid from team @nid',
array(
'@current_user' => $user->uid,
- '@uid' => $account->uid,
+ '@uid' => $account->uid,
'@nid' => $team_id
), WATCHDOG_NOTICE);
}
@@ -599,7 +599,7 @@ function boincteam_remove_admin($team_id, $user_id) {
function boincteam_remove_member($team_id, $user_id) {
global $user;
$account = user_load($user_id);
-
+
$boincteam_id = boincteam_lookup_id($team_id);
$boincteam = boincteam_load($boincteam_id);
if ($account->team == $team_id) {
@@ -615,7 +615,7 @@ function boincteam_remove_member($team_id, $user_id) {
watchdog('boincteam', 'User @current_user removed user @uid from team @nid',
array(
'@current_user' => $user->uid,
- '@uid' => $account->uid,
+ '@uid' => $account->uid,
'@nid' => $team_id
), WATCHDOG_NOTICE);
}
@@ -640,7 +640,7 @@ function boincteam_request_foundership($team_id) {
$boincteam_id = boincteam_lookup_id($team_id);
$boincteam = boincteam_load($boincteam_id);
$boincuser_id = $account->boincuser_id;
-
+
if (boincteam_is_founder($team_id, $account->uid)) {
// Shouldn't even be here...
drupal_set_message(t('@user is already the team founder.',
@@ -689,7 +689,7 @@ function boincteam_set_founder($team_id, $user_id) {
$team = node_load($team_id);
$boincteam_id = boincteam_lookup_id($team_id);
$boincuser_id = $account->boincuser_id;
-
+
if (boincteam_is_member($team_id, $account->uid)) {
// Update the team in the BOINC db
db_set_active('boinc_rw');
@@ -710,7 +710,7 @@ function boincteam_set_founder($team_id, $user_id) {
@nid to user @uid',
array(
'@current_user' => $user->uid,
- '@uid' => $account->uid,
+ '@uid' => $account->uid,
'@nid' => $team_id
), WATCHDOG_NOTICE);
}
@@ -736,7 +736,7 @@ function boincteam_new_foundership_transfer_request_ok($team_id) {
return FALSE;
}
-/**
+/**
* The time at which foundership can be transferred if the founder has not
* responded to the request
*/
@@ -762,7 +762,7 @@ function boincteam_user_requested_foundership($team_id, $user_id = NULL) {
$account = user_load($user_id);
$boincteam_id = boincteam_lookup_id($team_id);
$boincteam = boincteam_load($boincteam_id);
-
+
if ($boincteam->ping_user == $account->boincuser_id) {
// Be sure the request is still active
return !boincteam_new_foundership_transfer_request_ok($team_id);
@@ -776,7 +776,7 @@ function boincteam_user_requested_foundership($team_id, $user_id = NULL) {
/**
* General info about team admins
- */
+ */
function boincteam_about_admins_panel() {
$output = '';
$output .= '
' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '
';
@@ -806,7 +806,7 @@ function boincteam_about_admins_panel() {
/**
* General info about changing the team founder
- */
+ */
function boincteam_about_founder_panel() {
$output = '';
$output .= '' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
@@ -882,7 +882,7 @@ function boincteam_create_team_panel() {
$output = '';
$output .= '' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '
';
$output .= drupal_get_form('boincteam_create_form');
-
+
return $output;
}
@@ -935,7 +935,7 @@ function boincteam_edit_team_panel($team_id) {
$output = '';
$output .= '' . $team->title . '
';
$output .= drupal_get_form('boincteam_edit_form', $team_id);
-
+
return $output;
}
@@ -949,7 +949,7 @@ function boincteam_join_team_panel($team_id) {
$output .= '
' . bts('Click here to become a member of @this_team',
array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel') . '
';
$output .= '';
- $output .= ' - ' .
+ $output .= '
- ' .
l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '
';
$output .= '
';
return $output;
@@ -965,7 +965,7 @@ function boincteam_leave_team_panel($team_id) {
$output .= '' . bts('Click here to revoke your membership with'
. ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel') . '
';
$output .= '';
- $output .= ' - ' .
+ $output .= '
- ' .
l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '
';
$output .= '
';
return $output;
@@ -973,14 +973,14 @@ function boincteam_leave_team_panel($team_id) {
/**
* General info about team admins
- */
+ */
function boincteam_manage_admins_panel_header($team_id) {
$output = '';
$output .= '' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '
';
$output .= drupal_get_form('boincteam_add_admin_form', $team_id);
$output .= '';
$output .= '' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '
';
-
+
return $output;
}
@@ -993,7 +993,7 @@ function boincteam_management_panel($team_id) {
$output = '';
$output .= '' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '
';
-
+
// PM all members
if (module_exists('privatemsg')) {
$output .= '';
-
+
$output .= '';
-
+
return $output;
}
@@ -1091,10 +1091,10 @@ function boincteam_member_link_panel() {
$team = node_load($account->team);
$output = '';
$output .= '' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '
';
- $output .= '' . bts('You are a member of @team.',
+ $output .= '
' . bts('You are a member of @team.',
array('@team' => $team->title), NULL, 'boinc:account-team-panel') . '
';
$output .= '';
- $output .= ' - ' .
+ $output .= '
- ' .
l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '
';
$output .= '
';
return $output;
@@ -1112,7 +1112,7 @@ function boincteam_request_foundership_panel($team_id) {
$boincuser_id = $account->boincuser_id;
$output = '';
$output .= '' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '
';
-
+
if (boincteam_user_requested_foundership($team_id)) {
$deadline = boincteam_foundership_transfer_ok_time($boincteam);
$days_to_deadline = ceil(($deadline - time()) / (24*60*60));
@@ -1143,7 +1143,7 @@ function boincteam_request_foundership_panel($team_id) {
}
$output .= '';
$output .= '';
- $output .= ' - ' .
+ $output .= '
- ' .
l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '
';
$output .= '
';
}
@@ -1165,7 +1165,7 @@ function boincteam_request_foundership_panel($team_id) {
elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
// If this user does not have a transfer request pending, but new requests
// are not allowed, set the deadline to 90 days instead of 60 (as the user
- // who made the request has 30 additional days to assume foundership if
+ // who made the request has 30 additional days to assume foundership if
// there is no response to the request)
$deadline = boincteam_foundership_transfer_ok_time($boincteam);
$days_to_deadline = ceil(($deadline - time()) / (24*60*60)) + 30;
@@ -1189,7 +1189,7 @@ function boincteam_request_foundership_panel($team_id) {
. ' @this_team.',
array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '';
$output .= '';
- $output .= ' - ' .
+ $output .= '
- ' .
l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '
';
$output .= '
';
}
@@ -1207,7 +1207,7 @@ function boincteam_request_foundership_response_panel($team_id) {
$boincteam = boincteam_load($boincteam_id);
$boincuser_id = $account->boincuser_id;
$output = '';
-
+
if ($boincteam->ping_user) {
if ($boincteam->ping_user < 0) {
$member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
@@ -1250,7 +1250,7 @@ function boincteam_request_foundership_response_panel($team_id) {
),
NULL, 'boinc:team-request-foundership-response') . '';
$output .= '';
- $output .= ' - ' .
+ $output .= '
- ' .
l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '
';
$output .= '
';
}
@@ -1277,7 +1277,7 @@ function boincteam_search_view($type = 'team') {
/**
* General info about the concept of teams
- */
+ */
function boincteam_topic_overview_panel() {
$site_name = variable_get('site_name', 'Drupal-BOINC');
$output = '';
diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc b/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc
index e52431de542..29a3a707693 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc
@@ -12,28 +12,28 @@
* relationships exist; is data text, integer, float; what sort options exist).
*/
function boincteam_views_data() {
-
+
// -----------------------------------------------------------------------------------------------
// Definition for team table
// -----------------------------------------------------------------------------------------------
-
+
$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'
);
-
+
// 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.
-
+
$data['team']['table']['join'] = array(
'user' => array(
'left_field' => 'id',
@@ -45,9 +45,9 @@ function boincteam_views_data() {
// 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
-
+
$data['team']['id'] = array(
'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
'help' => t('The BOINC ID of the team.'),
@@ -75,14 +75,14 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Foreign key fields
-
+
$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
+ // with this relationship, all the fields for the related user node will be
// available.
'argument' => array(
'handler' => 'views_handler_argument_boincuser_id',
@@ -107,7 +107,7 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Descriptions of general fields (alphabetized)
/*
$data['team']['create_time'] = array(
@@ -139,7 +139,7 @@ function boincteam_views_data() {
)
);
*/
-
+
$data['team']['country'] = array(
'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
'help' => t('The country of a team.'),
@@ -212,28 +212,28 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// -----------------------------------------------------------------------------------------------
// Definition for team_admin table
// -----------------------------------------------------------------------------------------------
-
+
$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'
);
-
+
// 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.
-
+
$data['team_admin']['table']['join'] = array(
'team' => array(
'left_field' => 'id',
@@ -245,9 +245,9 @@ function boincteam_views_data() {
// 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
-
+
$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.'),
@@ -274,14 +274,14 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Foreign key fields
-
+
$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
+ // with this relationship, all the fields for the related user node will be
// available.
'argument' => array(
'handler' => 'views_handler_argument_boincteam_id',
@@ -306,9 +306,9 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Descriptions of general fields (alphabetized)
-
+
$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.'),
@@ -323,25 +323,25 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_date'
)
);
-
+
// -----------------------------------------------------------------------------------------------
// Definition for team_delta table
// -----------------------------------------------------------------------------------------------
-
+
$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.
-
+
// Primary keys allowed as arguments
-
+
$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
+ // with this relationship, all the fields for the related user node will be
// available.
'argument' => array(
'handler' => 'views_handler_argument_boincteam_id',
@@ -360,9 +360,9 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Foreign key fields
-
+
$data['team_delta']['userid'] = array(
'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
'help' => t('The user for this team history event.'),
@@ -383,9 +383,9 @@ function boincteam_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Descriptions of general fields (alphabetized)
-
+
$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.'),
@@ -429,8 +429,8 @@ function boincteam_views_data() {
'sort' => array(
'handler' => 'views_handler_sort_numeric'
)
- );
-
+ );
+
return $data;
}
diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.install b/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.install
index 71c6dd23ba2..e759978e339 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.install
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.install
@@ -79,7 +79,7 @@ function boincteam_forum_schema() {
),
'primary key' => array('tfid')
);
-
+
$schema['boincteam_forum_node'] = array(
'description' => t('Maps topic nodes to team forums.'),
'fields' => array(
@@ -101,7 +101,7 @@ function boincteam_forum_schema() {
),
'primary key' => array('nid')
);
-
+
return $schema;
}
@@ -115,4 +115,4 @@ function boincteam_forum_uninstall() {
// Drop tables.
drupal_uninstall_schema('boincteam_forum');
drupal_uninstall_schema('boincteam_forum_topic');
-}
\ No newline at end of file
+}
diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module b/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module
index 6009bf783eb..7a0b63140ac 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module
@@ -37,7 +37,7 @@ function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
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(
@@ -46,7 +46,7 @@ function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
),
));
break;
-
+
default:
}
}
@@ -114,9 +114,9 @@ function boincteam_forum_node_load($node) {
WHERE nid = %d", $node->nid
));
break;
-
+
default:
-
+
}
}
@@ -127,11 +127,11 @@ function boincteam_forum_node_load($node) {
function boincteam_forum_node_update($node) {
switch($node->type) {
case 'team_forum':
-
+
break;
-
+
default:
-
+
}
}
@@ -254,7 +254,7 @@ function boincteam_forum_list($team_id = NULL) {
);
$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
@@ -327,7 +327,7 @@ function boincteam_forum_create_form_panel() {
$output .= '' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
. '
';
$output .= drupal_get_form('boincteam_forum_create_form');
-
+
return $output;
}
@@ -337,10 +337,10 @@ function boincteam_forum_create_form_panel() {
function boincteam_forum_edit_form_panel($tfid) {
$team_forum = boincteam_forum_load($tfid);
$output = '';
- $output .= '' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
+ $output .= '' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
$team_forum->title . '
';
$output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
-
+
return $output;
}
@@ -361,7 +361,7 @@ function boincteam_forum_link_panel($team_id) {
$output .= '';
foreach ($forums as $forum) {
if (!$show_public_only OR $forum->public) {
- $output .= ' - ' .
+ $output .= '
- ' .
l(
//$forum->title,
bts('Enter forum', array(), NULL, 'boinc:team-forum'),
@@ -378,7 +378,7 @@ function boincteam_forum_link_panel($team_id) {
/**
* General info about team forums
- */
+ */
function boincteam_forum_topic_overview_panel($nid = NULL) {
$output = '';
$output .= '
' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '
';
diff --git a/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.views.inc b/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.views.inc
index d88c99e23c0..bb9ffde49fb 100644
--- a/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.views.inc
+++ b/drupal/sites/default/boinc/modules/boincteam/boincteam_forum.views.inc
@@ -12,13 +12,13 @@
* relationships exist; is data text, integer, float; what sort options exist).
*/
function boincteam_forum_views_data() {
-
+
// -----------------------------------------------------------------------------------------------
// Definition for team table
// -----------------------------------------------------------------------------------------------
-
+
$data['boincteam_forum_node']['table']['group'] = t('BOINC');
-
+
$data['boincteam_forum_node']['table']['base'] = array(
'field' => 'nid',
'title' => t('BOINC team forum topic'),
@@ -29,9 +29,9 @@ function boincteam_forum_views_data() {
// 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
-
+
$data['boincteam_forum_node']['tfid'] = array(
'title' => t('Team forum ID'),
'help' => t('The ID of the team forum containing this topic.'),
@@ -58,14 +58,14 @@ function boincteam_forum_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Foreign key fields
-
+
$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
+ // with this relationship, all the fields for the related user node will be
// available.
'relationship' => array(
'base' => 'node',
@@ -84,9 +84,9 @@ function boincteam_forum_views_data() {
'handler' => 'views_handler_sort_numeric'
)
);
-
+
// Descriptions of general fields (alphabetized)
// ...
-
+
return $data;
}
diff --git a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc
index 94cc4731898..94d7fa781f9 100644
--- a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc
+++ b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc
@@ -15,7 +15,7 @@
*/
function boincteam_create_form(&$form_state) {
$form = array();
-
+
$default = array(
'name' => '',
'name_html' => '',
@@ -25,13 +25,13 @@ function boincteam_create_form(&$form_state) {
'joinable' => TRUE,
'description' => '',
);
-
+
// 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(
'#type' => 'value',
@@ -56,7 +56,7 @@ function boincteam_create_form(&$form_state) {
'#type' => 'value',
'#value' => boinccore_get_country_list(),
);
-
+
// Form elements
$form['name'] = array(
'#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
@@ -107,7 +107,7 @@ function boincteam_create_form(&$form_state) {
'#description' => NULL,
);
$form['format'] = filter_form();
-
+
// Form control
$form['form control tabs prefix'] = array(
'#value' => '' . print_r($values,true) . '
');
-
+
$input_format = !empty($values['format']) ? $values['format'] : 4;
$values['description'] = check_markup($values['description'], $input_format);
-
+
// Create the team in the BOINC db
-
+
require_boinc(array('user','team'));
$boinc_team = make_team(
$account->boincuser_id,
@@ -185,13 +185,13 @@ function boincteam_create_form_submit($form, &$form_state) {
reason.', 'error');
return FALSE;
}
-
+
// Create the team node in Drupal
-
+
$teaser = node_teaser($values['description']);
$created_time = time();
$input_format = variable_get('filter_default_format', 1);
-
+
$node = array(
'type' => 'team',
'title' => $values['name'],
@@ -207,7 +207,7 @@ function boincteam_create_form_submit($form, &$form_state) {
'sticky' => 0,
'format' => $input_format
);
-
+
// Use pathauto function, if available, to clean up the path
if (module_exists('pathauto')) {
module_load_include('inc', 'pathauto', 'pathauto');
@@ -219,7 +219,7 @@ function boincteam_create_form_submit($form, &$form_state) {
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);
@@ -228,26 +228,26 @@ function boincteam_create_form_submit($form, &$form_state) {
$node['og_directory'] = OG_DIRECTORY_CHOOSE_FALSE;
$node['og_private'] = 0;
*/
-
+
$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']);
-
+
// 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);
-
- 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}";
}
@@ -260,15 +260,15 @@ function boincteam_create_form_submit($form, &$form_state) {
*/
function boincteam_edit_form(&$form_state, $team_id) {
$form = array();
-
+
$team = node_load($team_id);
$boincteam = boincteam_load(boincteam_lookup_id($team_id));
-
+
$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;
-
+
$default = array(
'name' => $boincteam->name,
'name_html' => $boincteam->name_html,
@@ -278,13 +278,13 @@ function boincteam_edit_form(&$form_state, $team_id) {
'joinable' => $boincteam->joinable,
'description' => $boincteam->description,
);
-
+
// 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(
'#type' => 'value',
@@ -309,7 +309,7 @@ function boincteam_edit_form(&$form_state, $team_id) {
'#type' => 'value',
'#value' => boinccore_get_country_list(),
);
-
+
// Form elements
$form['name'] = array(
'#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
@@ -367,7 +367,7 @@ function boincteam_edit_form(&$form_state, $team_id) {
'#description' => NULL,
);
$form['format'] = filter_form();
-
+
// Form control
$form['form control tabs prefix'] = array(
'#value' => '' . print_r($form_state, true) . '
');
-
+
// Hidden elements
$form['prefs']['modified'] = array(
'#type' => 'hidden',
@@ -171,11 +171,11 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#type' => 'hidden',
'#value' => $venue
);
-
+
$form['prefs']['separator_top'] = array(
'#value' => ''
);
-
+
// Simplified selectors
$form['prefs']['preset'] = array(
'#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
@@ -204,7 +204,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
// The 'no-js' class only displays this button if javascript is disabled
'#attributes' => array('class' => 'no-js'),
);
-
+
// Advanced preferences
$form['prefs']['advanced'] = array(
'#title' => bts('Advanced settings', array(), NULL, 'boinc:account-preferences-option'),
@@ -214,17 +214,17 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#collapsed' => !$advanced,
'#attributes' => array('class' => 'advanced-settings'),
);
-
+
// Processing preferences
-
+
$form['prefs']['advanced']['anchor'] = array(
'#value' => ''
);
-
+
$form['prefs']['advanced']['separator_top'] = array(
'#value' => ''
);
-
+
$form['prefs']['advanced']['processor'] = array(
'#title' => bts('Processor usage', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'fieldset',
@@ -331,7 +331,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#size' => 1,
'#description' => bts('Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat.', array(), NULL, 'boinc:account-preferences-computing')
);
-
+
// Disk and memory preferences
$form['prefs']['advanced']['storage'] = array(
'#title' => bts('Disk and memory usage', array(), NULL, 'boinc:account-preferences-computing'),
@@ -347,7 +347,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['disk_max_used_gb'],
'#size' => 1,
'#description' => bts('Limit the total amount of disk space used by BOINC.', array(), NULL, 'boinc:account-preferences-computing'),
- );
+ );
$form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
'#title' => bts('Disk: leave at least', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'textfield',
@@ -363,7 +363,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['disk_max_used_pct'],
'#size' => 1,
'#description' => bts('Limit the percentage of disk space used by BOINC on the volume where it stores data.', array(), NULL, 'boinc:account-preferences-computing')
- );
+ );
$form['prefs']['advanced']['storage']['disk_interval'] = array(
'#title' => bts('Request tasks to checkpoint at most every', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'textfield',
@@ -396,7 +396,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#size' => 1,
'#description' => bts("Limit the memory used by BOINC when you're not using the computer.", array(), NULL, 'boinc:account-preferences-computing')
);
-
+
// Network preferences
$form['prefs']['advanced']['network'] = array(
'#title' => bts('Network usage', array(), NULL, 'boinc:account-preferences-computing'),
@@ -412,7 +412,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['work_buf_min_days'],
'#size' => 1,
'#description' => bts('Store at least enough tasks to keep the computer busy for this long.', array(), NULL, 'boinc:account-preferences-computing')
- );
+ );
$form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
'#title' => bts('Store up to an additional', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'textfield',
@@ -420,7 +420,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['work_buf_additional_days'],
'#size' => 1,
'#description' => bts('Store additional tasks above the minimum level. Determines how much work is requested when contacting a project.', array(), NULL, 'boinc:account-preferences-computing')
- );
+ );
$form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
'#title' => bts('Confirm before connecting to Internet?', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'radios',
@@ -428,7 +428,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#attributes' => array('class' => 'fancy'),
'#default_value' => $default['confirm_before_connecting'],
'#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
- );
+ );
$form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
'#title' => bts('Disconnect when done?', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'radios',
@@ -444,7 +444,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['max_bytes_sec_down']/1000,
'#size' => 1,
'#description' => bts('Limit the download rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
- );
+ );
$form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
'#title' => bts('Limit upload rate to', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'textfield',
@@ -471,14 +471,14 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
);
$form['prefs']['advanced']['network']['hour_description'] = array(
'#value' => ''
- );
+ );
$form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
'#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'textfield',
'#field_suffix' => 'Mbytes',
'#default_value' => $default['daily_xfer_limit_mb'],
'#size' => 1
- );
+ );
$form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
'#field_prefix' => 'every',
'#type' => 'textfield',
@@ -486,7 +486,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['daily_xfer_period_days'],
'#size' => 1,
'#description' => bts('Example: BOINC should transfer at most 2000 MB of data every 30 days.', array(), NULL, 'boinc:account-preferences-computing'),
- );
+ );
$form['prefs']['advanced']['network']['dont_verify_images'] = array(
'#title' => bts('Skip data verification for image files?', array(), NULL, 'boinc:account-preferences-computing'),
'#type' => 'radios',
@@ -495,7 +495,7 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#default_value' => $default['dont_verify_images'],
'#description' => bts('Only select "Yes" if your Internet provider modifies image files. Skipping verification reduces the security of BOINC.', array(), NULL, 'boinc:account-preferences-computing')
);
-
+
// The "fancy radios" are made via javascript on document load. In order for
// these to work with AHAH, we need this crazy setTimeout() call.
$form['prefs']['fancy-radios'] = array(
@@ -514,11 +514,11 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
'#type' => 'hidden',
'#value' => 1
);
-
+
$form['prefs']['separator_bottom'] = array(
'#value' => ''
);
-
+
// Form control
$form['prefs']['form control tabs prefix'] = array(
'#value' => ''
);
$form['#submit'][] = 'boincwork_generalprefs_form_submit';
-
+
return $form;
}
@@ -562,10 +562,10 @@ function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null,
function boincwork_generalprefs_form_validate($form, &$form_state) {
require_boinc('util');
$values = $form_state['values']['prefs']['advanced'];
-
+
//drupal_set_message('' . print_r($form_state['values'], true) . '
');
// Verify all non-boolean user input values and notify form API of failures
-
+
// Processing preferences
if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
@@ -602,14 +602,14 @@ function boincwork_generalprefs_form_validate($form, &$form_state) {
function boincwork_generalprefs_form_submit($form, &$form_state) {
global $user;
$account = user_load($user->uid);
-
+
$values = $form_state['values']['prefs']['advanced'];
$venue = $form_state['values']['prefs']['venue'];
$preset = $form_state['values']['prefs']['preset'];
-
+
// Load preferences from BOINC account
$prefs = boincwork_load_prefs('general', $venue);
-
+
// Processing preferences
$prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
$prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
@@ -623,7 +623,7 @@ function boincwork_generalprefs_form_submit($form, &$form_state) {
$prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
$prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
$prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
-
+
// Storage preferences
$prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
$prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
@@ -632,7 +632,7 @@ function boincwork_generalprefs_form_submit($form, &$form_state) {
$prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
$prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
$prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
-
+
// Network preferences
$prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
$prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
@@ -659,15 +659,15 @@ function boincwork_generalprefs_form_submit($form, &$form_state) {
else {
$prefs['preset'] = $preset;
}
-
+
// If this is a new preference set, be sure to unset the "cleared" attribute
if (isset($prefs['@attributes']['cleared'])) {
unset($prefs['@attributes']['cleared']);
}
-
+
// Update database
$result = boincwork_save_prefs($prefs, 'general', $venue);
-
+
if (!$result) {
watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
@@ -676,7 +676,7 @@ function boincwork_generalprefs_form_submit($form, &$form_state) {
// Show this message if the set wasn't created automatically (in which case
// there is a message tailored to that) {
drupal_set_message(t('Your preferences have been updated.
- Client-related preferences will take effect when your computer
+ Client-related preferences will take effect when your computer
communicates with @project or you issue the "Update"
command from the BOINC client.', array('@project' => PROJECT)));
}
@@ -685,7 +685,7 @@ function boincwork_generalprefs_form_submit($form, &$form_state) {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Merge host form handlers and functions
- * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Find compatible hosts for merging
@@ -761,12 +761,12 @@ function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
$now = time();
update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
-
+
// Update the database:
// - add credit from old host to new host
// - change results to refer to the new host
// - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
-
+
$total_credit = $old_host->total_credit + $new_host->total_credit;
$recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
@@ -797,7 +797,7 @@ function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
$message = 'Could not merge because the target host has userid=0. The site administrators have been contacted about this issue, and will investigate further.';
return FALSE;
}
-
+
// Move credit from the old host to the new host
db_set_active('boinc_rw');
$credit_updated = db_query("
@@ -816,7 +816,7 @@ function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
}
return FALSE;
}
-
+
// Move results from the old host to the new host
db_set_active('boinc_rw');
$results_updated = db_query("
@@ -832,7 +832,7 @@ function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
}
return FALSE;
}
-
+
// Retire the old host
db_set_active('boinc_rw');
$old_host_retired = db_query("
@@ -852,7 +852,7 @@ function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
}
return FALSE;
}
-
+
return TRUE;
}
@@ -864,21 +864,21 @@ function boincwork_host_merge_form(&$form_state, $host_id) {
if (!boincwork_host_user_is_owner($host_id)) {
drupal_goto("host/{$host_id}");
}
-
+
$form = array();
$form_state['storage']['current_host_id'] = $host_id;
$current_host = boincwork_host_get_info($host_id);
-
+
// Get hosts that could be merged with this one
$hosts = boincwork_host_get_compatible_hosts($host_id);
-
+
if (!$hosts) {
drupal_set_message(t('There are no computers eligible for merging with this
one'), 'warning'
);
drupal_goto("host/{$host_id}");
}
-
+
$form['overview'] = array(
'#value' => '' . bts('Sometimes BOINC assigns separate identities to'
. ' the same computer by mistake. You can correct this by merging old'
@@ -894,7 +894,7 @@ function boincwork_host_merge_form(&$form_state, $host_id) {
),
NULL, 'boinc:account-host-merge') . '
',
);
-
+
$options = array();
foreach ($hosts as $host) {
$options[$host->id] = array(
@@ -903,18 +903,18 @@ function boincwork_host_merge_form(&$form_state, $host_id) {
$host->id,
);
}
-
+
$form['merge'] = array(
'#title' => '',
'#type' => 'tableselect',
'#header' => array(bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'), bts('Created', array(), NULL, 'boinc:host-details'), bts('Computer ID', array(), NULL, 'boinc:host-list')),
'#options' => $options,
);
-
+
$form['prefs']['separator_bottom'] = array(
// '#value' => ''
);
-
+
// Form control
$form['prefs']['form control tabs prefix'] = array(
'#value' => '' . print_r($main_prefs, true) . '
');
$new_venue = true;
@@ -1022,16 +1022,16 @@ function boincwork_load_privacyconsenttypes() {
/**
* Set the default preference set for the user
- */
+ */
function boincwork_set_default_venue($venue = '') {
-
+
global $user;
$account = user_load($user->uid);
-
+
if ($venue == 'generic') {
$venue = '';
}
-
+
db_set_active('boinc_rw');
db_query("
UPDATE user
@@ -1044,7 +1044,7 @@ function boincwork_set_default_venue($venue = '') {
/**
* Recursively validate submitted form values against a set of rules
- */
+ */
function boincwork_validate_form($validation_rules, $values, $path = array()) {
foreach ($validation_rules as $field => $rules) {
$parents = $path;
@@ -1090,7 +1090,7 @@ function boincwork_validate_datatype($data, $datatype = NULL) {
return FALSE;
}
break;
-
+
case 'integer':
if (!is_numeric($data)) {
return FALSE;
@@ -1100,17 +1100,17 @@ function boincwork_validate_datatype($data, $datatype = NULL) {
return FALSE;
}
break;
-
+
case 'text':
default:
-
+
}
return TRUE;
}
/**
* Format a number to be displayed using a maximum number of digits
- */
+ */
function boincwork_format_stats($number, $max_digits = 4) {
$suffix = array(
0 => '',
@@ -1124,7 +1124,7 @@ function boincwork_format_stats($number, $max_digits = 4) {
8 => 'Y'
);
if (!is_numeric($number)) $number = 0;
-
+
$digits = floor(log($number, 10)) + 1;
$magnitude = 0;
$precision = 0;
@@ -1134,36 +1134,36 @@ function boincwork_format_stats($number, $max_digits = 4) {
$number = round($number / pow(1000, $magnitude), $precision);
}
$number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
-
+
return $number;
}
//------------------------------------------------------------------------------------------------
// load_configuration(): Convert structured text/xml to array
//------------------------------------------------------------------------------------------------
-
+
function load_configuration($text)
{
if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
if ($xml = text_to_xml($text)) return xml_to_array($xml);
return false;
}
-
+
//------------------------------------------------------------------------------------------------
// save_configuration(): Convert array to structured text/xml
//------------------------------------------------------------------------------------------------
-
+
function save_configuration($array)
{
if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
return false;
}
-
+
//------------------------------------------------------------------------------------------------
// array_to_xml(): Take a multidimensional array and convert it to a structured
// DOM XML object
//------------------------------------------------------------------------------------------------
-
+
function array_to_xml($array, $dom = false, $parent_node = false) {
$is_root = false;
if (!$dom) $dom = new DomDocument('1.0');
@@ -1211,10 +1211,10 @@ function boincwork_format_stats($number, $max_digits = 4) {
);
}
}
-
+
// Now append items without explicit positions at the end
$primed_array = array_merge($ordered_array, $unordered_array);
-
+
// Convert to XML...
foreach ($primed_array as $item) {
list($name, $value) = each($item);
@@ -1286,11 +1286,11 @@ function boincwork_format_stats($number, $max_digits = 4) {
}*/
return $parent_node;
}
-
+
//------------------------------------------------------------------------------------------------
// xml_to_text(): Convert an XML DOM object to string format
//------------------------------------------------------------------------------------------------
-
+
function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
{
$xml->formatOutput = true;
@@ -1303,22 +1303,22 @@ function boincwork_format_stats($number, $max_digits = 4) {
}
return trim($text);
}
-
+
//------------------------------------------------------------------------------------------------
// text_to_xml(): Convert an XML DOM object to string format
//------------------------------------------------------------------------------------------------
-
+
function text_to_xml($text) {
$xml = new DomDocument();
if ( !($xml->loadXML($text)) ) return false;
return $xml;
}
-
-
+
+
//------------------------------------------------------------------------------------------------
// xml_to_array(): Convert an XML DOM object to array format
//------------------------------------------------------------------------------------------------
-
+
function xml_to_array($xml) {
$node = $xml->firstChild; //$xml->first_child();
$result = '';
@@ -1333,14 +1333,14 @@ function boincwork_format_stats($number, $max_digits = 4) {
$node_name = $node->nodeName;
$parent = $node->parentNode;
$sibling = $node->nextSibling;
-
+
// Determine if this node forms a set with siblings (share a node name)
while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
if (!$sibling) {
$sibling = $node->previousSibling;
while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
}
-
+
if ($sibling) {
$result[$node_name][$index] = '';
if ($node->childNodes) {
@@ -1393,7 +1393,7 @@ function boincwork_format_stats($number, $max_digits = 4) {
}
return $result;
}
-
+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Functions for use in displaying special case text in views
@@ -1403,14 +1403,14 @@ function boincwork_format_stats($number, $max_digits = 4) {
* Determine output for host list views when no hosts are found.
*/
function boincwork_views_host_list_empty_text($context = NULL) {
-
- // Pull the BOINC user ID from the view arguments to get show_hosts
+
+ // Pull the BOINC user ID from the view arguments to get show_hosts
// preference for that user
require_boinc('boinc_db');
$view = views_get_current_view();
$account = user_load($view->args[0]);
$boincuser = BoincUser::lookup_id($account->boincuser_id);
-
+
// Determine if hosts are associated at all or just hidden
$output = '';
if ($boincuser->show_hosts) {
@@ -1420,13 +1420,13 @@ function boincwork_views_host_list_empty_text($context = NULL) {
$output .= '' . bts('This user has no computers that have been'
. ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '
';
break;
-
+
case 'preferences':
$output .= '' . bts('No computers', array(), NULL, 'boinc:host-list') . '
';
$output .= '' . bts('There are no computers assigned to this'
. ' preference set.', array(), NULL, 'boinc:host-list') . '
';
break;
-
+
default:
$output .= '' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '
';
$output .= '' . bts('This user does not yet have any associated'
@@ -1446,8 +1446,8 @@ function boincwork_views_host_list_empty_text($context = NULL) {
* Determine output for task list views when no tasks are found.
*/
function boincwork_views_task_list_empty_text($context = NULL) {
-
- //
+
+ //
$output = '';
switch($context) {
default:
@@ -1555,7 +1555,7 @@ function boincwork_host_last_contact($timestamp, $host_id = NULL, $context = NUL
}
/**
- *
+ *
*/
function boincwork_host_venue_selector($host_id) {
$output = '';
@@ -1737,7 +1737,7 @@ function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_
}
else {
}
-
+
// Entry for all applications.
$allcount = $application_select_count ? array_sum($application_select_count) : 0;
$applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
diff --git a/drupal/sites/default/boinc/modules/comment_form_block/comment_form_block.module b/drupal/sites/default/boinc/modules/comment_form_block/comment_form_block.module
index 8325ed3d076..d5f18ebf391 100644
--- a/drupal/sites/default/boinc/modules/comment_form_block/comment_form_block.module
+++ b/drupal/sites/default/boinc/modules/comment_form_block/comment_form_block.module
@@ -20,7 +20,7 @@ function comment_form_block_block($op = 'list', $delta = 0, $edit = array()) {
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'] = '
' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '
';
- $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
+ $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
}
}
}
diff --git a/drupal/sites/default/boinc/modules/flag_abuse_reason/includes/flag_abuse_reason.js b/drupal/sites/default/boinc/modules/flag_abuse_reason/includes/flag_abuse_reason.js
index b8c9611ebb4..efb98828366 100644
--- a/drupal/sites/default/boinc/modules/flag_abuse_reason/includes/flag_abuse_reason.js
+++ b/drupal/sites/default/boinc/modules/flag_abuse_reason/includes/flag_abuse_reason.js
@@ -1,4 +1,4 @@
-/**
+/**
* @file
*
* Javascript for flag_abuse_reason. Shows the dropdown box defined in
@@ -28,19 +28,19 @@ $(document).bind('flagGlobalBeforeLinkUpdate', function(event, data) {
*/
// User clicks on the Report link
if ( window.getComputedStyle(ddelement).display === "none" &&
- data.flagName == "abuse_node_meta" &&
+ data.flagName == "abuse_node_meta" &&
data.flagStatus == "flagged" ) {
ddelement.style.display = "block";
}
-
+
if ( window.getComputedStyle(ddelement).display === "block" ) {
// User clicks on any of the flags in the drop down
- if ( data.flagName != "abuse_node_meta" &&
+ if ( data.flagName != "abuse_node_meta" &&
data.flagStatus == "flagged" ) {
ddelement.style.display = "none";
}
// User clicks on Cancel Report
- else if ( data.flagName == "abuse_node_meta" &&
+ else if ( data.flagName == "abuse_node_meta" &&
data.flagStatus == "unflagged" ) {
ddelement.style.display = "none";
}
@@ -61,19 +61,19 @@ $(document).bind('flagGlobalBeforeLinkUpdate', function(event, data) {
*/
// User clicks on the Report link
if ( window.getComputedStyle(ddelement).display === "none" &&
- data.flagName == "abuse_comment_meta" &&
+ data.flagName == "abuse_comment_meta" &&
data.flagStatus == "flagged" ) {
ddelement.style.display = "block";
}
-
+
if ( window.getComputedStyle(ddelement).display === "block" ) {
// User clicks on any of the flags in the drop down
- if ( data.flagName != "abuse_comment_meta" &&
+ if ( data.flagName != "abuse_comment_meta" &&
data.flagStatus == "flagged" ) {
ddelement.style.display = "none";
}
// User clicks on Cancel Report
- else if ( data.flagName == "abuse_comment_meta" &&
+ else if ( data.flagName == "abuse_comment_meta" &&
data.flagStatus == "unflagged" ) {
ddelement.style.display = "none";
}
@@ -94,19 +94,19 @@ $(document).bind('flagGlobalBeforeLinkUpdate', function(event, data) {
*/
// User clicks on the Report link
if ( window.getComputedStyle(ddelement).display === "none" &&
- data.flagName == "abuse_user_meta" &&
+ data.flagName == "abuse_user_meta" &&
data.flagStatus == "flagged" ) {
ddelement.style.display = "block";
}
-
+
if ( window.getComputedStyle(ddelement).display === "block" ) {
// User clicks on any of the flags in the drop down
- if ( data.flagName != "abuse_user_meta" &&
+ if ( data.flagName != "abuse_user_meta" &&
data.flagStatus == "flagged" ) {
ddelement.style.display = "none";
}
// User clicks on Cancel Report
- else if ( data.flagName == "abuse_user_meta" &&
+ else if ( data.flagName == "abuse_user_meta" &&
data.flagStatus == "unflagged" ) {
ddelement.style.display = "none";
}
diff --git a/drupal/sites/default/boinc/modules/flag_comment_notify/flag_comment_notify.module b/drupal/sites/default/boinc/modules/flag_comment_notify/flag_comment_notify.module
index 8fb2f88cf46..a1249466421 100644
--- a/drupal/sites/default/boinc/modules/flag_comment_notify/flag_comment_notify.module
+++ b/drupal/sites/default/boinc/modules/flag_comment_notify/flag_comment_notify.module
@@ -21,9 +21,9 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Hooks into core modules
* * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
+
/**
- * Implementation of hook_comment();
+ * Implementation of hook_comment();
*/
function flag_comment_notify_comment(&$a1, $op) {
switch ($op) {
diff --git a/drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module b/drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module
index 36921c904b9..cbffdcdf221 100644
--- a/drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module
+++ b/drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module
@@ -98,7 +98,7 @@ function node_comment_block_preprocess_node(&$variables) {
if ($variables['type'] == 'news') {
$variables['node']->comment = 0;
}
-
+
/* Drupal 7...
if ($node->comment !== 0 && $variables['view_mode'] == 'full') {
if (isset($variables['content']['comments'])) {
diff --git a/drupal/sites/default/boinc/themes/boinc/css/comments.css b/drupal/sites/default/boinc/themes/boinc/css/comments.css
index 78bac8fb13e..f0250235cf8 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/comments.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/comments.css
@@ -396,7 +396,7 @@ div.preview + .comment {
.comment .vud-widget-updown .updown-score {
border: none;
float: none;
-}
+}
.comment .vud-widget-updown .updown-score .updown-current-score {
display: inline;
font-size: 10px;
diff --git a/drupal/sites/default/boinc/themes/boinc/css/forms.css b/drupal/sites/default/boinc/themes/boinc/css/forms.css
index e426059df98..fc2de1e8139 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/forms.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/forms.css
@@ -129,7 +129,7 @@ table.ignore_user {
}
.form-radios .form-item {
float: left;
-}
+}
.simple-form-controls .form-item .description,
.simple-form-controls .form-item label {
width: auto;
@@ -280,7 +280,7 @@ span.password-confirm {
* Search form and results
*/
.section-find .box{
-
+
margin-top: 2.0em;
padding-top: 1.0em;
border-top: 2px dotted #aaa;
@@ -328,7 +328,7 @@ span.password-confirm {
}
.section-find .result.user .user-stats {
font-size: 0.85em;
-
+
}
@@ -533,7 +533,7 @@ html.js fieldset.collapsible legend a,
}
#edit-prefs-advanced-processor-start-hour-wrapper,
-#edit-prefs-advanced-processor-end-hour-wrapper,
+#edit-prefs-advanced-processor-end-hour-wrapper,
#edit-prefs-advanced-network-net-start-hour-wrapper,
#edit-prefs-advanced-network-net-end-hour-wrapper,
#edit-prefs-advanced-network-daily-xfer-limit-mb-wrapper,
diff --git a/drupal/sites/default/boinc/themes/boinc/css/html-reset.css b/drupal/sites/default/boinc/themes/boinc/css/html-reset.css
index 9acc8cb65b6..fc4dbce8b24 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/html-reset.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/html-reset.css
@@ -40,7 +40,7 @@ body {
font-size: 0.75em; /* 16px x .75 = 12px */
/*line-height: 1.333em; /* 12px x 1.333 = 16px */
line-height: 16px;
-
+
/* Use a 14px base font size with a 18px line height */
/*font-size: 0.875em; /* 16px x .875 = 14px */
/*line-height: 1.286em; /* 14px x 1.286 = 18px */
diff --git a/drupal/sites/default/boinc/themes/boinc/css/layout-fixed.css b/drupal/sites/default/boinc/themes/boinc/css/layout-fixed.css
index cefe3bba21c..dbd02fddfcc 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/layout-fixed.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/layout-fixed.css
@@ -174,7 +174,7 @@ body {
#navigation li.active-trail a {
color: #000;
}
-#navigation li a,
+#navigation li a,
#navigation li a.visited,
#action-links a {
color: #222;
diff --git a/drupal/sites/default/boinc/themes/boinc/css/pages.css b/drupal/sites/default/boinc/themes/boinc/css/pages.css
index a6edeee041e..f2f914c67cd 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/pages.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/pages.css
@@ -716,7 +716,7 @@ table.user-projects {
font-size: 10px;
font-weight: bold;
text-transform: uppercase;
- letter-spacing: 1px;
+ letter-spacing: 1px;
}
.node-type-forum .item-list .pager {
border-top: 1px dotted #aaa;
@@ -900,7 +900,7 @@ table.user-projects {
font-weight: bold;
text-transform: uppercase;
color: #808080;
- letter-spacing: 1px;
+ letter-spacing: 1px;
}
.forum-links {
diff --git a/drupal/sites/default/boinc/themes/boinc/css/responsive-jswidth.css b/drupal/sites/default/boinc/themes/boinc/css/responsive-jswidth.css
index fa173645268..c0a67e8b693 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/responsive-jswidth.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/responsive-jswidth.css
@@ -5,7 +5,7 @@
* Responsive Javascript Styling
*
* Contains CSS styles to handle different screen sizes. This CSS file is used
- * for the responsive Javascript width theme.
+ * for the responsive Javascript width theme.
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -85,7 +85,7 @@
.has-js #navigation.usehamburger li.expanded ul.menu {
padding: 0 20px;
}
-
+
/* Set base mobile menu font color and size. */
.has-js #navigation.usehamburger .block .menu li a {
color: #faa341;
diff --git a/drupal/sites/default/boinc/themes/boinc/css/responsive-media.css b/drupal/sites/default/boinc/themes/boinc/css/responsive-media.css
index 4e077dec2ce..58cf42c4467 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/responsive-media.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/responsive-media.css
@@ -4,8 +4,8 @@
* @file
* Responsive Media Styling
*
- * Contains CSS styles to handle different screen sizes. This CSS file is
- * used mainly for browsers with Javascript DISABLED.
+ * Contains CSS styles to handle different screen sizes. This CSS file is
+ * used mainly for browsers with Javascript DISABLED.
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -67,7 +67,7 @@
}
}
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* CSS Style designed for mobile screens
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@media only screen and (max-width: 750px) {
@@ -118,7 +118,7 @@
#navigation li.expanded ul.menu {
padding: 0 20px;
}
-
+
/* Set base mobile menu font color and size. */
#navigation .block .menu li a {
color: #faa341;
@@ -131,7 +131,7 @@
#navigation .block .menu li a:hover {
color: black;
}
-
+
/* Add caret left/down icons to the mobile menu for items that
expand. */
#navigation li.expanded.dhtml-menu.collapsed>a:after {
diff --git a/drupal/sites/default/boinc/themes/boinc/css/tabs.css b/drupal/sites/default/boinc/themes/boinc/css/tabs.css
index 67cdafa2e40..6f282cabf63 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/tabs.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/tabs.css
@@ -170,7 +170,7 @@ ul.content-footer-menu {
position: absolute;
bottom: -40px;
right: 0;
-
+
}
ul.content-footer-menu li {
font-size: 9px;
@@ -181,4 +181,4 @@ span.task-app-name {
max-width: 160px;
word-wrap: break-word;
white-space: normal;
-}
\ No newline at end of file
+}
diff --git a/drupal/sites/default/boinc/themes/boinc/css/views-styles.css b/drupal/sites/default/boinc/themes/boinc/css/views-styles.css
index d5f9f456a02..43512cc947e 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/views-styles.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/views-styles.css
@@ -32,7 +32,7 @@
background: url(../images/arrow-desc.png) no-repeat right -3px;
}
.view-content span.field-content {
-
+
}
/**
@@ -236,4 +236,4 @@
.view-boinc-host .jump-quickly #edit-jump-goto-wrapper {
margin: 0;
padding: 0;
-}
\ No newline at end of file
+}
diff --git a/drupal/sites/default/boinc/themes/boinc/js/fancy-radios.js b/drupal/sites/default/boinc/themes/boinc/js/fancy-radios.js
index edf9373e692..9678233845f 100644
--- a/drupal/sites/default/boinc/themes/boinc/js/fancy-radios.js
+++ b/drupal/sites/default/boinc/themes/boinc/js/fancy-radios.js
@@ -1,19 +1,19 @@
function setupLabel() {
if ($('.label_check input').length) {
- $('.label_check').each(function(){
+ $('.label_check').each(function(){
$(this).removeClass('selected');
});
- $('.label_check input:checked').each(function(){
+ $('.label_check input:checked').each(function(){
$(this).parent('label').addClass('selected');
- });
+ });
};
if ($('.form-radios.fancy .form-item label input').length) {
$('.form-radios.fancy .form-item:first-child label').addClass('first');
$('.form-radios.fancy .form-item label').each(function(){
$(this).removeClass('selected');
});
- $('.form-radios.fancy .form-item label input:checked').each(function(){
+ $('.form-radios.fancy .form-item label input:checked').each(function(){
$(this).parent('.form-radios.fancy .form-item label').addClass('selected');
});
};
@@ -22,7 +22,7 @@
$('.label_check, .form-radios.fancy .form-item label').click(function(){
setupLabel();
});
- setupLabel();
+ setupLabel();
};
$(document).ready(function(){
$('body').addClass('has-js');
diff --git a/drupal/sites/default/boinc/themes/boinc/js/jquery.detectwidths.js b/drupal/sites/default/boinc/themes/boinc/js/jquery.detectwidths.js
index 55aed2c6aee..98347230b93 100644
--- a/drupal/sites/default/boinc/themes/boinc/js/jquery.detectwidths.js
+++ b/drupal/sites/default/boinc/themes/boinc/js/jquery.detectwidths.js
@@ -1,6 +1,6 @@
/**
* JQuery functions used to determine whether the theme layout should
- * use a fixed-width navigation bar or a mobile hamburger style menu.
+ * use a fixed-width navigation bar or a mobile hamburger style menu.
*
* The functions determine the width of the navigation bar text. This
* text is translated into many languages, and is not static. If the
@@ -16,13 +16,13 @@
* wide for the layout.
*/
-/*
+/*
* The mobile and desktop minimum breakpoints set here must match the
* breakpoints set in the CSS @media query. See file
* css/responsive-media.css.
*
* N.B. These breakpoints may be different if you are using a sub-theme.
- */
+ */
var padding = 30;
var mobile_bp = 750;
var desktop_min = 980;
diff --git a/drupal/sites/default/boinc/themes/boinc/js/jquery.equalheights.js b/drupal/sites/default/boinc/themes/boinc/js/jquery.equalheights.js
index c574a37e9cc..9cc3dfa2703 100644
--- a/drupal/sites/default/boinc/themes/boinc/js/jquery.equalheights.js
+++ b/drupal/sites/default/boinc/themes/boinc/js/jquery.equalheights.js
@@ -2,24 +2,24 @@
* Equal Heights Plugin
* Equalize the heights of elements. Great for columns or any elements
* that need to be the same size (floats, etc).
- *
+ *
* Version 1.0
* Updated 12/10/2008
*
- * Copyright (c) 2008 Rob Glazebrook (cssnewbie.com)
+ * Copyright (c) 2008 Rob Glazebrook (cssnewbie.com)
*
* Usage: $(object).equalHeights([minHeight], [maxHeight]);
- *
+ *
* Example 1: $(".cols").equalHeights(); Sets all columns to the same height.
* Example 2: $(".cols").equalHeights(400); Sets all cols to at least 400px tall.
* Example 3: $(".cols").equalHeights(100,300); Cols are at least 100 but no more
* than 300 pixels tall. Elements with too much content will gain a scrollbar.
- *
+ *
*/
(function($) {
$.fn.equalHeights = function(minHeight, maxHeight) {
-
+
tallest = (minHeight) ? minHeight : 0;
primaryExclude = 0;
primaryPadding = 0;
@@ -27,7 +27,7 @@
secondaryHeight = 0;
secondaryExclude = 0;
secondaryCount = 0;
-
+
// Look at each element to find the tallest of them
this.each(function() {
if ($(this).hasClass('panel-secondary')) {
@@ -95,4 +95,4 @@
}
});
}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/drupal/sites/default/boinc/themes/boinc/js/prefs.js b/drupal/sites/default/boinc/themes/boinc/js/prefs.js
index bef0b57cadc..ab2d762a327 100644
--- a/drupal/sites/default/boinc/themes/boinc/js/prefs.js
+++ b/drupal/sites/default/boinc/themes/boinc/js/prefs.js
@@ -4,7 +4,7 @@
$('#edit-prefs-preset-custom').attr('checked', true);
});
};
-
+
$(document).ready(function(){
customPrefsListener();
});
diff --git a/drupal/sites/default/boinc/themes/boinc/template.php b/drupal/sites/default/boinc/themes/boinc/template.php
index 9dfa014e40e..4e58466c13f 100644
--- a/drupal/sites/default/boinc/themes/boinc/template.php
+++ b/drupal/sites/default/boinc/themes/boinc/template.php
@@ -216,7 +216,7 @@ function boinc_preprocess_page(&$vars, $hook) {
// "head_title" which is placed in the HTML section. Most of
// these pages are defined in the Page Manager module.
// See: https://dev.gridrepublic.org/browse/DBOINC-65
- if (arg(0) == 'search') {
+ if (arg(0) == 'search') {
unset($vars['title']);
}
else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
@@ -326,19 +326,19 @@ function boinc_preprocess_node_forum(&$vars, $hook) {
// Get the author of the node
$account = user_load($vars['uid']);
$comments_per_page = ($user->comments_per_page) ? $user->comments_per_page : variable_get("comment_default_per_page_{$vars['node']->type}", 50);
-
+
// Add signature
$vars['signature'] = check_markup($account->signature, $vars['node']->format);
-
+
// Show signatures based on user preference
$vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
-
+
// Expose comment sort order so that the template can put the topic node
// content (i.e. initial post) at the very end if "Newest post first" is the
// preference used by this user
$vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
$vars['node']->comment = 0;
-
+
$vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
$page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
$vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
@@ -361,7 +361,7 @@ function boinc_preprocess_node_team_forum(&$vars, $hook) {
// Process this node in the same way as node_forum
boinc_preprocess_node_forum($vars, $hook);
}
-
+
/**
* Override or insert variables into the comment templates.
*
@@ -426,7 +426,7 @@ function boinc_preprocess_forum_topic_list(&$variables) {
///* -- Delete this line if you want to use this function
function boinc_preprocess_views_view(&$vars, $hook) {
switch ($vars['name']) {
- case 'boinc_account_computers':
+ case 'boinc_account_computers':
switch ($vars['display_id']) {
case 'page_1':
case 'panel_pane_1':
@@ -446,7 +446,7 @@ function boinc_preprocess_views_view(&$vars, $hook) {
break;
case 'boinc_friends':
if ($vars['display_id'] == 'block_1') {
- $vars['header'] = boincuser_views_friends_block_header();
+ $vars['header'] = boincuser_views_friends_block_header();
}
break;
case 'boinc_host':
@@ -538,7 +538,7 @@ function boinc_preprocess_privatemsg_view(&$vars, $hook) {
function boinc_preprocess_block(&$vars, $hook) {
$vars['sample_variable'] = t('Lorem ipsum.');
}
-// */
+// */
function boinc_preprocess_search_result(&$variables) {
global $language;
@@ -607,12 +607,12 @@ function boinc_apachesolr_search_noresults() {
* rather than the unique Drupal auth name
*/
function phptemplate_username($object) {
-
+
if ($object->uid && $object->name) {
-
+
// Show the profile name in general, not the username
$name = user_load($object->uid)->boincuser_name;
-
+
// Shorten the name when it is too long or it will break many tables.
if (drupal_strlen($name) > 20) {
$name = drupal_substr($name, 0, 15) . '...';
@@ -673,7 +673,7 @@ function boinc_flag_friend_message_email($status, $flag, $recipient, $sender) {
$email['type'] = 'flag-friend';
// Reload the sender to get a full user object
$sender = user_load($sender->uid);
-
+
switch ($status) {
case FLAG_FRIEND_FLAGGED:
// Sender accepted recipient's friend request
@@ -768,7 +768,7 @@ function reorder_links($links, $first_keys = array(), $last_keys = array()) {
}
}
$links = array_merge($links, $last_links);
-
+
return $links;
}
@@ -791,8 +791,8 @@ function boinc_tablesort_indicator($style) {
/*
* Private function to process the $links string, separate it into two
* strings for $links and $moderator_links.
- *
- * Parameters:
+ *
+ * Parameters:
* @params $links
* links is a string of links to manipulate. The function will
* return a altered string of links.
@@ -932,4 +932,4 @@ function _boinc_ignore_user_link($type, $object = NULL, $teaser = FALSE) {
}
return $links;
-}
\ No newline at end of file
+}
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
index 8ef08a68adc..c9433a3c22f 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/comment.tpl.php
@@ -80,9 +80,9 @@
),
NULL, 'boinc:coment-from-ignored-user');
print '';
- }
+ }
?>
-
+
cid;
?>
@@ -157,7 +157,7 @@