Index: upgrade_status.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/upgrade_status/upgrade_status.admin.inc,v retrieving revision 1.7 diff -u -r1.7 upgrade_status.admin.inc --- upgrade_status.admin.inc 11 Sep 2008 03:00:57 -0000 1.7 +++ upgrade_status.admin.inc 17 Oct 2008 20:26:39 -0000 @@ -41,14 +41,14 @@ /** * Menu callback. Generate a page about the upgrade status of projects. */ -function _upgrade_status_status() { +function upgrade_status_status() { if ($available = upgrade_status_get_available()) { $data = upgrade_status_calculate_project_data($available); return theme('upgrade_status_report', $data); } else { return theme('upgrade_status_report', t('No information is available about potential new releases for currently installed modules. To check for updates, you can check manually. Please note that checking for available updates can take a long time, so please be patient.', array( - '@check_manually' => url('admin/logs/updates/check', $destination), + '@check_manually' => url('admin/logs/updates/check', array('query' => $destination)), ))); } } @@ -56,7 +56,7 @@ /** * Menu callback to manually check the upgrade status. */ -function _upgrade_status_manual_status() { +function upgrade_status_manual_status() { if (upgrade_status_refresh()) { drupal_set_message(t('Fetched information about all available upgrades.')); } @@ -94,8 +94,9 @@ return $projects; } - $projects = update_status_get_projects(); - update_status_process_project_info($projects); + module_load_include('inc', 'update', 'update.compare'); + $projects = update_get_projects(); + update_process_project_info($projects); $settings = variable_get('upgrade_status_settings', array()); foreach ($projects as $project => $project_info) { if (isset($available[$project])) { @@ -259,7 +260,7 @@ $projects[$project]['reason'] = t('Not ported yet'); } } - cache_set('upgrade_status_data', 'cache', serialize($projects), time() + (60 * 60)); + cache_set('upgrade_status_data', 'cache', $projects, time() + (60 * 60)); return $projects; } @@ -585,7 +586,8 @@ $data = array(); $version = variable_get('upgrade_status_core_version', UPGRADE_STATUS_CORE_VERSION); - $projects = update_status_get_projects(); + module_load_include('inc', 'update', 'update.compare'); + $projects = update_get_projects(); foreach ($projects as $key => $project) { // No site key to avoid hi-jacking module usage statistics. $url = _upgrade_status_build_fetch_url($project, $version); @@ -596,14 +598,15 @@ } if ($data) { - $parser = new update_status_xml_parser; + module_load_include('inc', 'update', 'update.fetch'); + $parser = new update_xml_parser; $available = $parser->parse($data); - cache_set('upgrade_status_info', 'cache', serialize($available)); + cache_set('upgrade_status_info', 'cache', $available); variable_set('upgrade_status_last', time()); - watchdog('upgrade_status', t('Fetched information about all available new releases and updates.'), WATCHDOG_NOTICE, l('view', 'admin/logs/updates')); + watchdog('upgrade_status', 'Fetched information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l('view', 'admin/logs/updates')); } else { - watchdog('upgrade_status', 'Unable to fetch any information on available new releases and updates.', WATCHDOG_ERROR, l('view', 'admin/logs/updates')); + watchdog('upgrade_status', 'Unable to fetch any information on available new releases and updates.', array(), WATCHDOG_ERROR, l('view', 'admin/logs/updates')); } return $available; } @@ -645,7 +648,7 @@ function upgrade_status_get_available($refresh = FALSE) { $available = array(); if (!$refresh && $cache = cache_get('upgrade_status_info', 'cache')) { - $available = unserialize($cache->data); + $available = $cache->data; } else { $available = upgrade_status_refresh(); @@ -685,7 +688,7 @@ $projects = array(); if ($cache = cache_get($cid, 'cache')) { if (!empty($cache->data) && $cache->expire > time()) { - $projects = unserialize($cache->data); + $projects = $cache->data; } } return $projects; Index: upgrade_status.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/upgrade_status/upgrade_status.module,v retrieving revision 1.9 diff -u -r1.9 upgrade_status.module --- upgrade_status.module 16 Aug 2008 21:10:05 -0000 1.9 +++ upgrade_status.module 17 Oct 2008 20:26:39 -0000 @@ -24,45 +24,23 @@ /** * Implementation of hook_menu(). */ -function upgrade_status_menu($may_cache) { +function upgrade_status_menu() { $items = array(); - if ($may_cache) { - $admin_access = user_access('administer site configuration'); - $items[] = array( - 'path' => 'admin/logs/updates/upgrade', - 'title' => t('Upgrade status'), - 'callback' => 'upgrade_status_status', - 'access' => $admin_access, - 'type' => MENU_LOCAL_TASK, - 'weight' => 10, - ); - $items[] = array( - 'path' => 'admin/logs/updates/upgrade/check', - 'callback' => 'upgrade_status_manual_status', - 'access' => $admin_access, - 'type' => MENU_CALLBACK, - ); - } + $items['admin/reports/updates/upgrade'] = array( + 'title' => 'Upgrade status', + 'page callback' => 'upgrade_status_status', + 'access callback' => 'user_access', + 'access arguments' => array('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 10, + 'file' => 'upgrade_status.admin.inc' + ); + $items['admin/reports/updates/upgrade/check'] = array( + 'page callback' => 'upgrade_status_manual_status', + 'access callback' => 'user_access', + 'access arguments' => array('administer site configuration'), + 'type' => MENU_CALLBACK, + 'file' => 'upgrade_status.admin.inc' + ); return $items; } - -/** - * Menu callback. Generate a page about the upgrade status of projects. - * - * Stub function for Drupal 5.x. - */ -function upgrade_status_status() { - require_once drupal_get_path('module', 'upgrade_status') .'/upgrade_status.admin.inc'; - return _upgrade_status_status(); -} - -/** - * Menu callback to manually check the upgrade status. - * - * Stub function for Drupal 5.x. - */ -function upgrade_status_manual_status() { - require_once drupal_get_path('module', 'upgrade_status') .'/upgrade_status.admin.inc'; - return _upgrade_status_manual_status(); -} - Index: upgrade_status.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/upgrade_status/upgrade_status.info,v retrieving revision 1.1 diff -u -r1.1 upgrade_status.info --- upgrade_status.info 31 May 2008 03:36:02 -0000 1.1 +++ upgrade_status.info 17 Oct 2008 20:26:39 -0000 @@ -1,4 +1,5 @@ ; $Id: upgrade_status.info,v 1.1 2008/05/31 03:36:02 sun Exp $ name = Upgrade Status description = Checks to see if your installed modules are available for the next major release of Drupal. -dependencies = update_status +dependencies[] = update +core = 6.x \ No newline at end of file