### Eclipse Workspace Patch 1.0
#P Test Drupal 6
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.632
diff -u -r1.632 common.inc
--- includes/common.inc 18 Apr 2007 20:35:45 -0000 1.632
+++ includes/common.inc 19 Apr 2007 00:16:25 -0000
@@ -1880,6 +1880,7 @@
require_once './includes/unicode.inc';
require_once './includes/image.inc';
require_once './includes/form.inc';
+ require_once './includes/batch.inc';
// Set the Drupal custom error handler.
set_error_handler('drupal_error_handler');
// Emit the correct charset HTTP header.
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.350
diff -u -r1.350 theme.inc
--- includes/theme.inc 17 Apr 2007 07:19:38 -0000 1.350
+++ includes/theme.inc 19 Apr 2007 00:16:27 -0000
@@ -735,7 +735,7 @@
'logo' => base_path() .'themes/garland/minnelli/logo.png',
'site_title' => t('Drupal'),
'title' => drupal_get_title(),
- 'messages' => theme('status_messages'),
+ 'messages' => $messages ? theme('status_messages') : '',
'content' => $content,
);
@@ -1396,9 +1396,9 @@
function theme_progress_bar($percent, $message) {
$output = '';
- $output .= '
'. $percent .'%
';
- $output .= '
'. $message .'
';
$output .= '
';
+ $output .= '
'. $percent .'%
';
+ $output .= '
'. $message .'
';
$output .= '
'+
- '');
+ $(this.element).html(''+
+ ''+
+ '
');
}
/**
Index: misc/drupal.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/drupal.js,v
retrieving revision 1.30
diff -u -r1.30 drupal.js
--- misc/drupal.js 9 Apr 2007 13:58:02 -0000 1.30
+++ misc/drupal.js 19 Apr 2007 00:16:27 -0000
@@ -222,5 +222,8 @@
// Global Killswitch on the element
if (Drupal.jsEnabled) {
+ // Global Killswitch on the element
document.documentElement.className = 'js';
+ // 'js enabled' cookie
+ document.cookie = 'has_js=1';
}
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.469
diff -u -r1.469 system.module
--- modules/system/system.module 18 Apr 2007 20:42:23 -0000 1.469
+++ modules/system/system.module 19 Apr 2007 00:16:33 -0000
@@ -327,6 +327,12 @@
'page callback' => 'system_sql',
'type' => MENU_CALLBACK,
);
+ // Default page for batch operations
+ $items['batch'] = array(
+ 'page callback' => 'system_batch_page',
+ 'access callback' => TRUE,
+ 'type' => MENU_CALLBACK,
+ );
return $items;
}
@@ -2457,5 +2463,20 @@
function system_cron() {
// Cleanup the flood
db_query('DELETE FROM {flood} WHERE timestamp < %d', time() - 3600);
+ // Cleanup the batch table
+ db_query('DELETE FROM {batch} WHERE timestamp < %d', time()-864000);
}
+/**
+ * Default page callback for batches.
+ */
+function system_batch_page() {
+ $output = _batch_page();
+ if ($output === FALSE) {
+ drupal_access_denied();
+ }
+ else {
+ // Force a page without blocks
+ print theme('page', $output, FALSE);
+ }
+}
\ No newline at end of file
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.94
diff -u -r1.94 system.install
--- modules/system/system.install 17 Apr 2007 08:13:11 -0000 1.94
+++ modules/system/system.install 19 Apr 2007 00:16:31 -0000
@@ -190,6 +190,13 @@
UNIQUE KEY authname (authname)
) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+ db_query("CREATE TABLE {batch} (
+ bid int(11) NOT NULL,
+ timestamp int(11) NOT NULL,
+ batch longtext,
+ PRIMARY KEY (bid)
+ ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
db_query("CREATE TABLE {blocks} (
module varchar(64) DEFAULT '' NOT NULL,
delta varchar(32) NOT NULL default '0',
@@ -662,6 +669,13 @@
UNIQUE (authname)
)");
+ db_query("CREATE TABLE {batch} (
+ bid int NOT NULL default '0',
+ timestamp int NOT NULL default '0',
+ batch text,
+ PRIMARY KEY (bid)
+ )");
+
db_query("CREATE TABLE {blocks} (
module varchar(64) DEFAULT '' NOT NULL,
delta varchar(32) NOT NULL default '0',
Index: includes/batch.inc
===================================================================
RCS file: includes/batch.inc
diff -N includes/batch.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ includes/batch.inc 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,475 @@
+ t('batch_title'),
+ * 'init_message' => t('batch_init_message'),
+ * 'error_message' => t('batch_message_error'),
+ * 'finished' => 'my_finished_callback',
+ * 'operations' => array(
+ * array('callback' => 'my_func_1', 'arguments' => array('foo', 'bar')),
+ * array('callback' => 'my_func_2', 'arguments' => array('foo2', 'bar2', 'baz2')),
+ * ...
+ * );
+ * );
+ * batch_open($batch);
+ *
+ * return 'whatever/redirect/path';
+ * }
+ *
+ * OR (short form) :
+ *
+ * function my_form_submit($form_id, $form_values) {
+ * batch_open();
+ * batch_add('my_func_1', array($arg1));
+ * batch_add('my_func_2', array($arg1, $arg2, $arg3));
+ *
+ * return 'whatever/redirect/path';
+ * }
+ *
+ */
+
+/**
+ * Open a new batch (or a new batch set if a batch has already
+ * been opened in the current execution)
+ *
+ * @param $batch
+ * An array decribing the batch.
+ * Example :
+ * @code
+ * $batch = array(
+ * 'title' => t('Descriptive batch title'),
+ * 'init_message' => t('Initial message'),
+ * // @current, @remaining, @total and @percent can be used in progress_message
+ * 'progress_message' => t('Remaining @remaining of @total.'),
+ * 'error_message' => t('Error message'),
+ * 'finished' => 'my_finished_callback',
+ * 'operations' => array(
+ * array('callback' => 'my_func_1', 'arguments' => array('foo', 'bar'), 'task' => 'performing task 1'),
+ * array('callback' => 'my_func_2', 'arguments' => array('foo2', 'bar2', 'baz2'), 'task => 'performing task 2'),
+ * ...
+ * );
+ * );
+ * @endcode
+ *
+ */
+function batch_open($batch, $url = 'batch', $redirect = NULL) {
+ global $_batch;
+
+ if (!isset($_batch)) {
+ // new batch
+ $_batch = array(
+ 'id' => db_next_id('{batch}_bid'),
+ 'running' => FALSE,
+ 'sets' => array(),
+ 'current_set' => 0,
+ 'url' => $url,
+ 'redirect' => $redirect,
+ 'source_page' => $_GET['q'],
+ );
+ }
+
+ $error_message = (isset($_batch['error_message']) ? $_batch['error_message'] : t('An error has occurred.'));
+ $error_message .= '
'. t('Please continue to !link', array('!link' => 'the error page'));
+ $init = array(
+ 'total' => 0,
+ 'operations' => array(),
+ 'error_message' => $error_message,
+ 'sandbox' => array(),
+ 'results' => array(),
+ 'success' => FALSE,
+ );
+ $defaults = array(
+ 'title' => t('Processing'),
+ 'init_message' => t('Initializing...'),
+ );
+
+ // We crush the 'submit' key that might be there already - not needed anymore.
+ $_batch['sets'][$_batch['current_set']] = $init + (array) $batch + $defaults;
+ // TODO : currently, only the first set sets the title of the page (which does not get reloaded)
+
+ if (isset($batch['operations'])) {
+ batch_add_operations($batch['operations']);
+ }
+}
+
+function _batch_new_set($form_submit_callback = NULL, $args = array()) {
+ global $_batch;
+ $_batch['current_set']++;
+ $_batch['sets'][$_batch['current_set']] = array(
+ 'submit' => array('callback' => $form_submit_callback, 'arguments' => $args),
+ );
+}
+
+/**
+ * Add a single operation to the current batch set.
+ * Takes its argument in the in the same form as call_user_func_array.
+ *
+ * @param $function
+ * The name of the function.
+ * @param $args
+ * The array of arguments.
+ */
+function batch_add($function, $args = array()) {
+ $op = array('callback' => $function, 'arguments' => $args);
+ batch_add_operations(array($op));
+}
+
+/**
+ * Add an array of operations to the current batch set.
+ */
+function batch_add_operations($operations) {
+ global $_batch;
+ if (isset($_batch)) {
+ $curr_set =& _batch_current_set();
+ $curr_set['operations'] = array_merge($curr_set['operations'], $operations);
+ $curr_set['total'] += count($operations);
+ }
+}
+
+function _batch_set_form_info($form_id, $form, $form_values) {
+ global $_batch;
+ if (isset($_batch)) {
+ $_batch['form_id'] = $form_id;
+ $_batch['form'] = $form;
+ $_batch['form_values'] = $form_values;
+// $_batch['_POST'] = $_POST;
+ }
+}
+
+// TODO : could be removed by using direct references to global $_batch in form.inc ?
+function batch_get() {
+ global $_batch;
+ if (isset($_batch)) {
+ return $_batch;
+ }
+}
+
+function batch_execute($progressive = TRUE) {
+ global $_batch;
+ if (isset($_batch)) {
+ $_batch['current_set'] = 0;
+ $_batch['progressive'] = $progressive;
+ if ($progressive) {
+ // Save and unset the destination if any
+ if (isset($_REQUEST['destination'])) {
+ $_batch['destination'] = $_REQUEST['destination'];
+ unset($_REQUEST['destination']);
+ }
+ elseif (isset($_REQUEST['edit']['destination'])) {
+ $_batch['destination'] = $_REQUEST['edit']['destination'];
+ unset($_REQUEST['edit']['destination']);
+ }
+ db_query("INSERT INTO {batch} (bid, timestamp, batch) VALUES (%d, %d, '%s')", $_batch['id'], time(), serialize($_batch));
+ drupal_goto($_batch['url'], 'op=start&id='.$_batch['id']);
+ }
+ else {
+ // Non-progressive execution : bypass the whole progressbar workflow
+ // and execute the batch in one pass
+ _batch_process();
+ }
+ }
+}
+
+/**
+ * State based dispatcher for batches.
+ */
+function _batch_page() {
+ global $_batch;
+
+ if (isset($_REQUEST['id']) && $data = db_result(db_query("SELECT batch FROM {batch} WHERE bid = %d", $_REQUEST['id']))) {
+ $_batch = unserialize($data);
+ }
+ else {
+ return FALSE;
+ }
+
+ // Register database update for end of processing
+ register_shutdown_function('_batch_shutdown');
+
+ $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : '';
+ switch ($op) {
+ case 'finished':
+ // Finish with success.
+ $output = _batch_finished(TRUE);
+ break;
+
+ case 'error':
+ // Finish with error.
+ // TODO : is this still needed ?
+ $output = _batch_finished(FALSE);
+ break;
+
+ case 'do':
+ $output = _batch_do();
+ break;
+
+ case 'do_nojs':
+ $output = _batch_progress_page_nojs();
+ break;
+
+ case 'start':
+ $output = _batch_start();
+ break;
+ }
+
+ return $output;
+}
+
+/**
+ * Perform initial preparation for running a batch, choose between the
+ * JS and non-JS version.
+ */
+function _batch_start() {
+ global $_batch;
+
+ // drupal.js remembers js enabled users via the has_js cookie.
+ // NOTE : nojs if the user did not visit any js enabled page during his browser session
+ if (isset($_COOKIE['has_js']) && $_COOKIE['has_js']) {
+ return _batch_progress_page_js();
+ }
+ else {
+ return _batch_progress_page_nojs();
+ }
+}
+
+/**
+ * Batch processing page with JavaScript support.
+ */
+function _batch_progress_page_js() {
+ // TODO : ideally, the js progress would be in a popup, so that the page
+ // does not appear in the browser's history (plus that would be definitely neat !)
+ global $_batch;
+ $curr_set = &$_batch['sets'][$_batch['current_set']];
+
+ $_batch['running'] = TRUE;
+ drupal_set_title($curr_set['title']);
+ // Prevent browser from using cached drupal.js or update.js
+ drupal_add_js('misc/progress.js', 'core', 'header', FALSE, TRUE);
+
+ $url = url($_batch['url'], array('query' => array('id' => $_batch['id'])));
+ $js_setting = array(
+ 'batch' => array(
+ 'errorMessage' => $curr_set['error_message'],
+ 'initMessage' => $curr_set['init_message'],
+ 'uri' => $url,
+ ),
+ );
+ drupal_add_js($js_setting, 'setting');
+ drupal_add_js('misc/batch.js', 'core', 'header', FALSE, TRUE);
+
+ $output = '';
+ return $output;
+}
+
+/**
+ * Do one pass of execution and inform back the browser about progression
+ */
+function _batch_do() {
+ // HTTP Post required
+ if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+ drupal_set_message(t('HTTP Post is required.'), 'error');
+ drupal_set_title(t('Error'));
+ return '';
+ }
+
+ list($percentage, $message) = _batch_process();
+
+ drupal_set_header('Content-Type: text/plain; charset=utf-8');
+ print drupal_to_js(array('status' => TRUE, 'percentage' => $percentage, 'message' => $message));
+ exit();
+}
+
+/**
+ * Batch processing page without JavaScript support.
+ */
+function _batch_progress_page_nojs() {
+ global $_batch;
+ $curr_set = &$_batch['sets'][$_batch['current_set']];
+
+ drupal_set_title($curr_set['title']);
+
+ $new_op = 'do_nojs';
+
+ if (!$_batch['running']) {
+ // This is the first page so return some output immediately.
+ $percentage = 0;
+ $message = $curr_set['init_message'];
+ $_batch['running'] = TRUE;
+ }
+ else {
+ // This is one of the later requests: do some updates first.
+
+ // Error handling: if PHP dies due to a fatal error (e.g. non-existant
+ // function), it will output whatever is in the output buffer,
+ // followed by the error message.
+ ob_start();
+ $fallback = $curr_set['error_message_no_js'];
+ $fallback = theme('maintenance_page', $fallback, FALSE);
+
+ // We strip the end of the page using a marker in the template, so any
+ // additional HTML output by PHP shows up inside the page rather than
+ // below it. While this causes invalid HTML, the same would be true if
+ // we didn't, as content is not allowed to appear after anyway.
+ list($fallback) = explode('', $fallback);
+ print $fallback;
+
+ list($percentage, $message) = _batch_process($_batch);
+ if ($percentage == 100) {
+ $new_op = 'finished';
+ }
+
+ // Updates successful; remove fallback
+ ob_end_clean();
+ }
+
+ $url = url($_batch['url'], array('query' => array('id' => $_batch['id'], 'op' => $new_op)));
+ drupal_set_html_head('');
+ $output = theme('progress_bar', $percentage, $message);
+ return $output;
+
+ // TODO : update.php has the following lines :
+ // Note: do not output drupal_set_message()s until the summary page.
+ //print theme('maintenance_page', $output, FALSE);
+ //return NULL;
+}
+
+/**
+ * Process the batch for 1 second
+ */
+function _batch_process() {
+ global $_batch;
+
+ $curr_set =& _batch_current_set();
+ while ($op = reset($curr_set['operations'])) {
+ $finished = 1;
+ if (function_exists($op['callback'])) {
+ $batch_args = array('sandbox' => &$curr_set['sandbox'], 'results' => &$curr_set['results'], 'finished' => &$finished, 'message' => '');
+ call_user_func_array($op['callback'], array_merge($op['arguments'], array(&$batch_args)));
+ $task_message = $batch_args['message'];
+ }
+ if ($finished == 1) {
+ // Make sure this step isn't counted double
+ $finished = 0;
+ // Remove the operation, and clear the sandbox to reduce the stored data.
+ array_shift($curr_set['operations']);
+ $curr_set['sandbox'] = array();
+
+ // If the batch set is completed, execute the remaining form_submit callbacks
+ // until we find one that acually has batch operations.
+ while (empty($curr_set['operations']) && ($curr_set['success'] = TRUE) && _batch_next_set()) {
+ // TODO : call 'finished' callbacks here ?
+ $curr_set =& _batch_current_set();
+ }
+ }
+ if ($_batch['progressive'] && timer_read('page') > 1000) {
+ break;
+ }
+ }
+
+ if (!$_batch['progressive']) {
+ return _batch_finished();
+ }
+
+ $remaining = count($curr_set['operations']);
+ $total = $curr_set['total'];
+ $current = $total - $remaining + $finished;
+ $percentage = floor($current / $total * 100);
+ $values = array(
+ '@remaining' => $remaining,
+ '@total' => $total,
+ '@current' => floor($current),
+ '@percentage' => $percentage,
+ );
+ $progress_message = strtr('Remaining @remaining of @total.', $values);
+
+ $message = $progress_message .'
';
+ $message.= $task_message ? $task_message : ' ';
+
+ return array($percentage, $message);
+}
+
+function &_batch_current_set() {
+ global $_batch;
+ return $_batch['sets'][$_batch['current_set']];
+}
+
+/**
+ * If the batch has another set coming, execute the form_submit callback
+ * to populate possible batched operations
+ */
+function _batch_next_set() {
+ global $_batch;
+ if (isset($_batch['sets'][$_batch['current_set']+1])) {
+ $_batch['current_set']++;
+ $curr_set =& _batch_current_set();
+ if (isset($curr_set['submit']) && function_exists($curr_set['submit']['callback'])) {
+ $curr_set['submit']['arguments'][1] = &$_batch['form_values'];
+ $redirect = call_user_func_array($curr_set['submit']['callback'], $curr_set['submit']['arguments']);
+ if (isset($redirect)) {
+ $_batch['redirect'] = $redirect;
+ }
+ }
+ return TRUE;
+ }
+}
+
+/**
+ * End the batch : allow for results massaging and redirect to the right page
+ */
+function _batch_finished() {
+ global $_batch;
+
+ // TODO : one of those is probably redundant
+ $_batch['running'] = FALSE;
+ $_batch['finished'] = TRUE;
+
+ // Call the 'finished' callbacks
+ foreach($_batch['sets'] as $key => $batch_set) {
+ if (isset($batch_set['finished']) && function_exists($batch_set['finished'])) {
+ $batch_set['finished']($batch_set['success'], $batch_set['results']);
+ }
+ }
+
+ // Redirect if needed
+ if ($_batch['progressive']) {
+ if (isset($_batch['destination'])) {
+ $_REQUEST['destination'] = $_batch['destination'];
+ }
+ $redirect = isset($_batch['redirect']) ? $_batch['redirect'] : $_batch['source_page'];
+ if (isset($_batch['form'])) {
+ drupal_redirect_form($_batch['form'], $redirect);
+ }
+ else {
+ drupal_goto($redirect);
+ }
+
+ // We were not redirected ($form['redirect'] was FALSE) : multistep form ?
+ // TODO : not working right now - modify form.inc to account for this case
+ // $_POST = $_batch['_POST'];
+ // $args = $_SESSION['form'][$form['#build_id']]['args'];
+ // $form = call_user_func_array('drupal_retrieve_form', $args);
+ // return drupal_get_form($_batch['form_id']);
+ drupal_goto($_batch['source_page']);
+ }
+}
+
+/**
+ * Store tha batch data for next request, or clear the table if the batch is finished
+ */
+function _batch_shutdown() {
+ global $_batch;
+ if ($_batch['running']) {
+ db_query("UPDATE {batch} SET batch = '%s' WHERE bid = %d", serialize($_batch), $_batch['id']);
+ }
+ else {
+ db_query("DELETE FROM {batch} WHERE bid = %d", $_batch['id']);
+ }
+}
Index: misc/batch.js
===================================================================
RCS file: misc/batch.js
diff -N misc/batch.js
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/batch.js 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,31 @@
+if (Drupal.jsEnabled) {
+ $(document).ready(function() {
+ $('#progress').each(function () {
+ var holder = this;
+ var uri = Drupal.settings.batch.uri;
+ var initMessage = Drupal.settings.batch.initMessage;
+ var errorMessage = Drupal.settings.batch.errorMessage;
+
+ // Success: redirect to the summary.
+ var updateCallback = function (progress, status, pb) {
+ if (progress == 100) {
+ pb.stopMonitoring();
+ window.location = uri+'&op=finished';
+ }
+ }
+
+ var errorCallback = function (pb) {
+ var div = document.createElement('p');
+ div.className = 'error';
+ $(div).html(errorMessage);
+ $(holder).prepend(div);
+ $('#wait').hide();
+ }
+
+ var progress = new Drupal.progressBar('updateprogress', updateCallback, "POST", errorCallback);
+ progress.setProgress(-1, initMessage);
+ $(holder).append(progress.element);
+ progress.startMonitoring(uri+'&op=do', 10);
+ });
+ });
+}