? .DS_Store
? head.db
? updates-395474-40.patch
? updates-395474-49.patch
? updates-395474-53.patch
? modules/.DS_Store
? sites/all/modules/dhtml_menu
? sites/all/modules/permission_select
? sites/default/files
? sites/default/settings.php
Index: modules/update/update-confirm.tpl.php
===================================================================
RCS file: modules/update/update-confirm.tpl.php
diff -N modules/update/update-confirm.tpl.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/update-confirm.tpl.php 5 Jul 2009 05:59:57 -0000
@@ -0,0 +1,12 @@
+
+
+Learn more about how to take a
+backup.', array ('@backup_url' => url('http://drupal.org/node/22281')));
+?>
+
+
+
+
+
\ No newline at end of file
Index: modules/update/update.admin.inc
===================================================================
RCS file: modules/update/update.admin.inc
diff -N modules/update/update.admin.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/update/update.admin.inc 5 Jul 2009 05:59:57 -0000
@@ -0,0 +1,294 @@
+ 'item',
+ '#title' => t('Update log'),
+ '#markup' => theme('item_list', $results['messages']),
+ );
+ }
+
+ if (!isset($form_state['values'])) {
+ // First step.
+ $form['#theme'] = 'update_available_updates_form';
+ if ($available = update_get_available(TRUE)) {
+ module_load_include('inc', 'update', 'update.compare');
+ $project_data = update_calculate_project_data($available);
+ foreach ($project_data as $name => $project) {
+ // Filter out projects which are dev versions, updated or core
+ if (($project['install_type'] == 'dev') || ($project['status'] == UPDATE_CURRENT) || ($project['project_type'] == 'core')) {
+ unset($project_data[$name]);
+ }
+ }
+ }
+ else {
+ $form['message'] = array(
+ '#type' => 'item',
+ '#markup' => t('There was a problem getting update information. Please try again later.'),
+ );
+ return $form;
+ }
+
+ if (!$project_data) {
+ $form['message'] = array(
+ '#type' => 'item',
+ '#markup' => t('All of your projects are up to date.'),
+ );
+ return $form;
+ }
+
+ $form['projects']['#tree'] = TRUE;
+ foreach ($project_data as $name => $project) {
+ $form['projects'][$name] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Include this update'),
+ '#project' => $project,
+ '#default_value' => TRUE,
+ );
+ }
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Continue'),
+ '#weight' => 100,
+ );
+ }
+ else if (is_array($form_state['values']) && array_filter($form_state['values']['projects'])) {
+ $form['#attached_js'][] = drupal_get_path('module', 'update') . '/update.js';
+ $form['#action'] = url('admin/update');
+ // Get all the available ways to transfer files.
+ $available_backends = module_invoke_all('filetransfer_backends');
+ if (!count($available_backends)) {
+ // @TODO: Clean up this error handling
+ drupal_set_message(t('Unable to continue, not available methods of file transfer'), 'error');
+ return array();
+ }
+
+ $form['information']['#weight'] = -100;
+ $form['information']['backup_header'] = array(
+ '#prefix' => '',
+ '#value' => t('Step 1: Backup your site'),
+ '#suffix' => '
',
+ );
+
+ $form['information']['backup_message'] = array(
+ '#prefix' => '',
+ '#value' => t('We do not currently have a web based backup tool. Learn more about how to take a backup.', array('@backup_url' => url('http://drupal.org/node/22281'))),
+ '#suffix' => '
',
+ );
+
+ $form['information']['main_header'] = array(
+ '#prefix' => '',
+ '#value' => t('Step 2: Provide your server connection details'),
+ '#suffix' => '
',
+ );
+
+ $form['projects'] = array (
+ '#type' => 'value',
+ '#value' => array_filter($form_state['values']['projects']),
+ );
+
+ uasort($available_backends, 'drupal_sort_weight');
+
+ // Decide on a default backend.
+ if (isset($form_state['values']['connection_settings']['update_filetransfer_default'])) {
+ $update_filetransfer_default = $form_state['values']['connection_settings']['update_filetransfer_default'];
+ }
+ elseif ($update_filetransfer_default = variable_get('update_filetransfer_default', NULL));
+ else {
+ $update_filetransfer_default = key($available_backends);
+ }
+
+ $form['connection_settings']['#tree'] = TRUE;
+ $form['connection_settings']['update_filetransfer_default'] = array(
+ '#type' => 'select',
+ '#title' => t('Connection method'),
+ '#default_value' => array($update_filetransfer_default),
+ );
+
+ // Build a hidden fieldset for each one.
+ foreach ($available_backends as $name => $backend) {
+ $form['connection_settings']['update_filetransfer_default']['#options'][$name] = $backend['title'];
+ $form['connection_settings'][$name] = array (
+ '#type' => 'fieldset',
+ '#attributes' => array('class' => "filetransfer-$name filetransfer"),
+ '#title' => t('@backend connection settings', array('@backend' => $backend['title'])),
+ );
+ $current_settings = update_get_filetransfer_settings($name);
+ $form['connection_settings'][$name] += system_get_filetransfer_settings_form($name, $current_settings);
+ }
+
+ $form['submit'] = array(
+ '#name' => 'process_updates',
+ '#type' => 'submit',
+ '#value' => (variable_get('site_offline', FALSE) == FALSE) ? t('Put site into maintenance mode and install updates') : t('Install updates'),
+ '#weight' => 100,
+ );
+ }
+
+ return $form;
+}
+
+function update_update_form_validate($form, &$form_state) {
+ if (isset($form_state['values']['connection_settings'])) {
+ $filetransfer_backend_to_test = $form_state['values']['connection_settings']['update_filetransfer_default'];
+ $connection_settings = $form_state['values']['connection_settings'][$filetransfer_backend_to_test];
+ $available_backends = module_invoke_all('filetransfer_backends');
+ $filetransfer_class = $available_backends[$filetransfer_backend_to_test]['class'];
+ $filetransfer = call_user_func_array(array($filetransfer_class, 'factory'), array(DRUPAL_ROOT, $connection_settings));
+ try {
+ $filetransfer->connect();
+ }
+ catch(Exception $e) {
+ form_set_error('connection_settings', $e->getMessage());
+ }
+ }
+}
+
+function update_update_form_submit($form, &$form_state) {
+ //We always want to rebuild unless we are done.
+ $form_state['rebuild'] = TRUE;
+
+ if ($form_state['clicked_button']['#name'] == 'process_updates') {
+ // Save the connection settings to the DB.
+ $filetransfer_backend_to_use = $form_state['values']['connection_settings']['update_filetransfer_default'];
+ $connection_settings = $form_state['values']['connection_settings'][$filetransfer_backend_to_use];
+
+ // This is a hack, perhaps we should add an attribute to non-stored fields?
+ // For SSH keys we wouldn't want to use a password field for instance.
+ $connection_settings_to_save = array();
+ foreach ($connection_settings as $key => $value) {
+ if ($form['connection_settings'][$filetransfer_backend_to_use][$key]['#type'] != 'password') {
+ $connection_settings_to_save[$key] = $value;
+ }
+ }
+ //Set this one as the preferred update method.
+ variable_set('update_filetransfer_default', $filetransfer_backend_to_use);
+ //Save the connection settings minus the password
+ update_set_filetransfer_settings($filetransfer_backend_to_use, $connection_settings_to_save);
+
+ $operations = array();
+ foreach ($form_state['values']['projects'] as $project) {
+ // HACK: Bad workflow here... don't know how to determine what type of project this is.
+ $project_type = UPDATE_project_TYPE_MODULE;
+ // put this in the begining (download everything first)
+ $operations['1_get_' . $project] = array('update_get_project', array($project));
+ // put these on the end
+ $operations['2_put_' . $project] = array(
+ 'update_copy_project',
+ array(
+ $project,
+ $project_type,
+ update_get_default_filetransfer($connection_settings)
+ ),
+ );
+ $operations['3_install_' . $project] = array('update_install_project', array($project));
+ }
+ ksort($operations);
+
+ $batch = array(
+ 'title' => t('Installing updates'),
+ 'init_message' => t('Preparing update operation'),
+ 'operations' => $operations,
+ 'finished' => 'update_batch_finished',
+ );
+ batch_set($batch);
+ //theme('update_report', )
+ }
+}
+
+/**
+ * Theme project status report.
+ *
+ * @ingroup themeable
+ */
+function theme_update_available_updates_form($form) {
+ $last = variable_get('update_last_check', 0);
+ $output = '' . ($last ? t('Last checked: @time ago', array('@time' => format_interval(REQUEST_TIME - $last))) : t('Last checked: never'));
+ $output .= ' (' . l(t('Check manually'), 'admin/reports/updates/check') . ')';
+ $output .= "
\n";
+ if (isset($form['message'])) {
+ $output .= drupal_render($form['message']);
+ return $output;
+ }
+
+ $header = array();
+ $rows = array();
+ $output .= '';
+ $notification_level = variable_get('update_notification_threshold', 'all');
+ foreach (element_children($form['projects']) as $key) {
+ $project = $form['projects'][$key]['#project'];
+ $row = '
';
+ switch ($project['status']) {
+ case UPDATE_NOT_SECURE:
+ case UPDATE_REVOKED:
+ case UPDATE_NOT_SUPPORTED:
+ $class = 'error';
+ break;
+ case UPDATE_NOT_CURRENT:
+ $class = 'warning';
+ break;
+ }
+ $row .= "
\n";
+
+ $row .= '
';
+ if (isset($project['title'])) {
+ $row .= check_plain($project['title']);
+ }
+ else {
+ $row .= check_plain($project['name']);
+ }
+ $row .= ' ' . check_plain($project['existing_version']);
+ $row .= "
\n";
+
+ $row .= "
\n";
+ $row .= t("Version %version is available", array('%version' => $project['recommended']));
+ $row .= "
\n";
+ $row .= '
';
+ $row .= drupal_render($form['projects'][$key]);
+ $row .= "
\n";
+
+ $row .= '
';
+ sort($project['includes']);
+ $row .= t('Includes: %includes', array('%includes' => implode(', ', $project['includes'])));
+ $row .= "
\n";
+
+ if (!isset($rows[$project['project_type']])) {
+ $rows[$project['project_type']] = array();
+ }
+ $rows[$project['project_type']][] = array(
+ 'class' => $class,
+ 'data' => array($row),
+ );
+ }
+ unset($form['projects']);
+ $project_types = array(
+ 'core' => t('Drupal core'),
+ 'module' => t('Modules'),
+ 'theme' => t('Themes'),
+ 'disabled-module' => t('Disabled modules'),
+ 'disabled-theme' => t('Disabled themes'),
+ );
+ foreach ($project_types as $type_name => $type_label) {
+ if (!empty($rows[$type_name])) {
+ $output .= "\n
" . $type_label . "
\n";
+ $output .= theme('table', $header, $rows[$type_name], array('class' => 'update'));
+ }
+ }
+ unset($form['#theme']);
+ $output .= drupal_render($form);
+ $output .= '
' . t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '
';
- $output .= '' . t('To extend the functionality or to change the look of your site, a number of contributed modules and themes are available.', array('@modules' => 'http://drupal.org/project/modules', '@themes' => 'http://drupal.org/project/themes')) . '
';
- $output .= '' . t('Each time Drupal core or a contributed module or theme is updated, it is important that update.php is run.', array('@update-php' => url($base_url . '/update.php', array('external' => TRUE)))) . '
';
+
return $output;
case 'admin/build/themes':
case 'admin/build/modules':
@@ -87,6 +96,12 @@ function update_help($path, $arg) {
}
}
}
+
+ case 'admin/settings/updates/server-settings':
+ $output = '' . t('In order to update / extend your site from the browser you need to configure how to connect to your server.');
+ $output .= t(' If you do not know what to enter on this form, please contact your hosting provider for help.') .'
';
+ return $output;
+ break;
case 'admin/reports/updates/settings':
case 'admin/reports/status':
@@ -125,13 +140,22 @@ function update_help($path, $arg) {
*/
function update_menu() {
$items = array();
-
+
$items['admin/reports/updates'] = array(
'title' => 'Available updates',
'description' => 'Get a status report about available updates for your installed modules and themes.',
- 'page callback' => 'update_status',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('update_update_form'),
+ 'access arguments' => array('administer site configuration'),
+ 'weight' => 10,
+ );
+ $items['admin/update'] = array(
+ 'title' => 'Updating modules and themes',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('update_update_form'),
'access arguments' => array('administer site configuration'),
'weight' => 10,
+ 'type' => MENU_CALLBACK,
);
$items['admin/settings/updates'] = array(
'title' => 'Updates',
@@ -140,6 +164,19 @@ function update_menu() {
'page arguments' => array('update_settings'),
'access arguments' => array('administer site configuration'),
);
+ $items['admin/settings/updates/updates'] = array(
+ 'title' => 'Updates',
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'weight' => -10,
+ );
+ $items['admin/settings/updates/server-settings'] = array(
+ 'title' => 'Server Settings',
+ 'page title' => 'Server Settings',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('update_settings_filetransfer'),
+ 'access arguments' => array('administer site configuration'),
+ 'type' => MENU_LOCAL_TASK,
+ );
$items['admin/reports/updates/check'] = array(
'title' => 'Manual update check',
'page callback' => 'update_manual_status',
@@ -158,9 +195,19 @@ function update_theme() {
'update_settings' => array(
'arguments' => array('form' => NULL),
),
- 'update_report' => array(
+ 'update_confirm' => array(
+ 'template' => 'theme/update-confirm',
+ 'arguments' => array('form' => NULL),
+ ),
+ 'update_available_updates_form' => array(
'arguments' => array('data' => NULL),
),
+ 'update_report_form' => array(
+ 'arguments' => array('form' => NULL),
+ ),
+ 'update_status_project_status' => array(
+ 'arguments' => array('status' => NULL),
+ ),
'update_version' => array(
'arguments' => array('version' => NULL, 'tag' => NULL, 'class' => NULL),
),
@@ -632,3 +679,144 @@ function update_flush_caches() {
/**
* @} End of "defgroup update_status_cache".
*/
+
+function _update_get_latest_version($name) {
+ if ($available = update_get_available(FALSE)) {
+ module_load_include('inc', 'update', 'update.compare');
+ $extension_data = update_calculate_project_data($available);
+ $project = $extension_data[$name];
+ return $project['releases'][$project['latest_version']];
+ }
+}
+
+
+function update_get_file($url) {
+ // Get each of the specified files.
+ $parsed_url = parse_url($url);
+ $local = file_directory_temp() . '/update-cache/' . basename($parsed_url['path']);
+ if (!file_exists(file_directory_temp() . '/update-cache/')) {
+ mkdir(file_directory_temp() . '/update-cache/');
+ }
+ // Check the cache and download the file if needed.
+ if (!file_exists($local)) {
+ // $result->data is the actual contents of the downloaded file. This saves
+ // it into a local file, whose path is stored in $local. $local is stored
+ // relative to the Drupal installation.
+ return system_retrieve_file($url, $local);
+ } else {
+ return $local;
+ }
+}
+
+function update_untar($file) {
+ $extraction_dir = file_directory_temp() . '/update-extraction';
+ if (!file_exists($extraction_dir)) {
+ mkdir($extraction_dir);
+ }
+ $archive_tar = new Archive_Tar($file);
+ return $archive_tar->extract($extraction_dir);
+}
+
+/**
+ * Helper function to determine if it is a module or a theme
+ */
+function _update_get_extension_type($directory) {
+ if (count(file_scan_directory($directory, "/\.module$/")) > 0) {
+ return UPDATE_EXTENSION_TYPE_MODULE;
+ }
+ else {
+ return UPDATE_EXTENSION_TYPE_THEME;
+ }
+}
+
+/**
+ * Batch operations
+ */
+
+function update_get_extension($extension_name, &$context) {
+ if (!isset($context['sandbox']['starting'])) {
+ $context['sandbox']['starting'] = 1;
+ $context['message'] = t('Downloading %extension', array('%extension' => $extension_name));
+ $context['finished'] = 1 / 2;
+ return;
+ }
+ $latest_version = _update_get_latest_version($extension_name);
+ if ($local_cache = update_get_file($latest_version['download_link'])) {
+ watchdog('update', t('Downloaded %extension to %local_cache', array('%extension' => $extension_name, '%local_cache' => $local_cache)));
+ } else {
+ $context['success'] = FALSE;
+ $content['results'][] = t('Failed to download %extension', array('%extension' => $extension_name));
+ }
+
+ $context['finished'] = 1;
+}
+
+function update_copy_extension($extension_name, $extension_type, $filetransfer, &$context) {
+ if (!isset($context['sandbox']['starting'])) {
+ $context['sandbox']['starting'] = 1;
+ $context['message'] = t('Copying %extension to server', array('%extension' => $extension_name));
+ $context['finished'] = .5;
+ return;
+ }
+
+ $latest_version = _update_get_latest_version($extension_name);
+ $local_cache = update_get_file($latest_version['download_link']);
+ $extension_destination_dir = ($extension_type == UPDATE_EXTENSION_TYPE_MODULE) ? DRUPAL_ROOT . '/sites/all/modules/' . $extension_name : DRUPAL_ROOT . '/sites/all/themes/' . $extension_name;
+ if (update_untar($local_cache)) {
+ $extension_source_dir = file_directory_temp() . '/update-extraction/' . $extension_name;
+ }
+ try {
+ $filetransfer->removeDirectory($extension_destination_dir);
+ dd('Removed the dir ' . $extension_destination_dir);
+ $filetransfer->copyDirectory($extension_source_dir, $extension_destination_dir);
+ dd('Coppied the dir ' . $extension_source_dir . 'to' . $extension_destination_dir);
+ } catch(Exception $e) {
+ drupal_set_message(t($e->getMessage(), $e->arguments), 'error');
+ //Some better error handling is needed, but batch API doesn't seem to support any.
+ throw $e;
+ }
+
+ $context['finished'] = 1;
+
+}
+
+function update_install_extension($extension_name, &$context) {
+ if (!isset($context['sandbox']['done'])) {
+ $context['sandbox']['done'] = 0;
+ }
+ if (!$context['results']) {
+ $context['results'][] = t('Installed %extension', array('%extension' => $extension_name));
+ }
+
+ $context['message'] = t('Installing %extension', array('%extension' => $extension_name));
+ sleep(1);
+ $context['sandbox']['done'] += 1;
+ $context['finished'] = $context['sandbox']['done'] / 4;
+}
+
+function update_batch_finished($success, $results) {
+ if ($success) {
+ variable_set('site_offline', FALSE);
+ }
+ $_SESSION['update_batch_results']['success'] = $success;
+ $_SESSION['update_batch_results']['messages'] = $results;
+}
+
+function update_get_default_filetransfer($overrides = array()) {
+ //Fire up the connection class
+ $update_filetransfer_preferred = variable_get('update_filetransfer_preferred', NULL);
+ $settings = variable_get("update_filetransfer_connection_settings::{$update_filetransfer_preferred}", array());
+ $settings = array_merge($settings, $overrides);
+ $available_backends = module_invoke_all('filetransfer_backends');
+ $filetransfer = call_user_func_array("{$available_backends[$update_filetransfer_preferred]['class']}::factory", array(DRUPAL_ROOT, $settings));
+ return $filetransfer;
+}
+
+function update_get_filetransfer_settings($filetransfer_backend_name) {
+ return variable_get("update_filetransfer_connection_settings::{$filetransfer_backend_name}", array());
+}
+
+function update_set_filetransfer_settings($filetransfer_backend_name, $settings) {
+ variable_set("update_filetransfer_connection_settings::{$filetransfer_backend_name}", $settings);
+}
+