Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.90 diff -u -p -r1.90 install.php --- install.php 15 Nov 2007 23:12:38 -0000 1.90 +++ install.php 16 Nov 2007 18:16:26 -0000 @@ -99,7 +99,7 @@ function install_main() { // If any error messages are set now, it means a requirement problem. $messages = drupal_set_message(); if (!empty($messages['error'])) { - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('requirements'); drupal_set_title(st('Requirements problem')); print theme('install_page', ''); @@ -186,7 +186,7 @@ function install_change_settings($profil // We always need this because we want to run form_get_errors. include_once './includes/form.inc'; - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('database'); if ($db_url == 'mysql://username:password@localhost/databasename') { @@ -439,7 +439,7 @@ function install_select_profile() { } } - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('profile-select'); drupal_set_title(st('Select an installation profile')); @@ -502,7 +502,7 @@ function install_select_locale($profilen // the user know what he is doing. if (count($locales) == 1) { if ($profilename == 'default') { - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('locale-select'); drupal_set_title(st('Choose language')); if (!empty($_GET['localize'])) { @@ -531,7 +531,7 @@ function install_select_locale($profilen } } - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('locale-select'); drupal_set_title(st('Choose language')); @@ -568,7 +568,7 @@ function install_select_locale_form(&$fo * Show an error page when there are no profiles available. */ function install_no_profile_error() { - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('profile-select'); drupal_set_title(st('No profiles available')); print theme('install_page', '

'. st('We were unable to find any installer profiles. Installer profiles tell us what modules to enable and what schema to install in the database. A profile is necessary to continue with the installation process.') .'

'); @@ -582,7 +582,7 @@ function install_no_profile_error() { function install_already_done_error() { global $base_url; - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); drupal_set_title(st('Drupal already installed')); print theme('install_page', st('', array('@base-url' => $base_url))); exit; Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.237 diff -u -p -r1.237 update.php --- update.php 16 Nov 2007 15:35:24 -0000 1.237 +++ update.php 16 Nov 2007 18:16:27 -0000 @@ -803,7 +803,7 @@ function update_task_list($active = NULL 'finished' => 'Review log', ); - drupal_set_content('left', theme_task_list($tasks, $active)); + drupal_set_content('left', theme('task_list', $tasks, $active)); } // Some unavoidable errors happen because the database is not yet up-to-date. @@ -819,7 +819,8 @@ update_fix_system_table(); drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); $update_mode = TRUE; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -drupal_maintenance_theme(); +// Initialize theme system for updates. +drupal_maintenance_theme('update'); // This must happen *after* drupal_bootstrap(), since it calls // variable_(get|set), which only works after a full bootstrap. @@ -875,5 +876,5 @@ else { $output = update_access_denied_page(); } if (isset($output) && $output) { - print theme('maintenance_page', $output); + print theme('update_page', $output); } Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.199 diff -u -p -r1.199 bootstrap.inc --- includes/bootstrap.inc 11 Nov 2007 16:14:45 -0000 1.199 +++ includes/bootstrap.inc 16 Nov 2007 18:16:27 -0000 @@ -369,7 +369,6 @@ function conf_init() { */ function drupal_get_filename($type, $name, $filename = NULL) { static $files = array(); - global $active_db; if (!isset($files[$type])) { $files[$type] = array(); @@ -385,7 +384,7 @@ function drupal_get_filename($type, $nam // the database. This is required because this function is called both // before we have a database connection (i.e. during installation) and // when a database connection fails. - elseif ($active_db && (($file = db_result(db_query("SELECT filename FROM {system} WHERE name = '%s' AND type = '%s'", $name, $type))) && file_exists($file))) { + elseif (db_is_active() && (($file = db_result(db_query("SELECT filename FROM {system} WHERE name = '%s' AND type = '%s'", $name, $type))) && file_exists($file))) { $files[$type][$name] = $file; } else { @@ -971,35 +970,53 @@ function _drupal_bootstrap($phase) { } /** - * Enables use of the theme system without requiring database access. Since - * there is not database access no theme will be enabled and the default - * themeable functions will be called. Some themeable functions can not be used - * without the full Drupal API loaded. For example, theme_page() is - * unavailable and theme_maintenance_page() must be used in its place. + * Sets up the theming system for site installs, updates and when the database + * is unavailable. It will not apply when the site is set into off-line mode + * while the database is still active. + * + * Minnelli is always used for the initial install and update operations. When + * the database is off-line and "settings.php" has a "maintenance_theme" key + * set for the $conf variable, that theme will be used instead of Minnelli. */ -function drupal_maintenance_theme() { - global $theme; +function drupal_maintenance_theme($operation = '') { + global $conf; + require_once './includes/path.inc'; require_once './includes/theme.inc'; require_once './includes/common.inc'; require_once './includes/unicode.inc'; require_once './includes/file.inc'; + require_once './includes/module.inc'; require_once './modules/filter/filter.module'; + require_once './modules/system/system.module'; unicode_check(); + drupal_init_language(); + + $module_list['system']['filename'] = 'modules/system/system.module'; + $module_list['filter']['filename'] = 'modules/filter/filter.module'; + module_list(TRUE, FALSE, FALSE, $module_list); + + // Install and update pages are treated differently to prevent theming overrides. + if ($operation == 'install' || $operation == 'update') { + require_once './modules/user/user.module'; + require_once './includes/database.inc'; + + // Install and update pages will always use Minnelli. + $conf['theme_default'] = 'minnelli'; + } + else { + // Force the maintenance theme only when the database is not on-line and + // the settings.php file is configured for it. When the database is active, + // it will automatically use the active theme. + $conf['theme_default'] = variable_get('maintenance_theme', 'minnelli'); + } + + // These are usually added from system_init() -except maintenance.css. + // While under maintenance it's not called so we add it here. drupal_add_css(drupal_get_path('module', 'system') .'/defaults.css', 'module'); drupal_add_css(drupal_get_path('module', 'system') .'/system.css', 'module'); drupal_add_css(drupal_get_path('module', 'system') .'/system-menus.css', 'module'); - $theme = ''; - - // Special case registry of theme functions used by the installer - $themes = drupal_common_themes(); - foreach ($themes as $hook => $info) { - if (!isset($info['file']) && !isset($info['function'])) { - $themes[$hook]['function'] = 'theme_'. $hook; - $themes[$hook]['theme path'] = 'misc'; - } - } - _theme_set_registry($themes); + drupal_add_css(drupal_get_path('module', 'system') .'/maintenance.css', 'module'); } /** Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.715 diff -u -p -r1.715 common.inc --- includes/common.inc 16 Nov 2007 15:35:24 -0000 1.715 +++ includes/common.inc 16 Nov 2007 18:16:29 -0000 @@ -329,7 +329,6 @@ function drupal_goto($path = '', $query * Generates a site off-line message. */ function drupal_site_offline() { - drupal_maintenance_theme(); drupal_set_header('HTTP/1.1 503 Service unavailable'); drupal_set_title(t('Site off-line')); print theme('maintenance_page', filter_xss_admin(variable_get('site_offline_message', @@ -2845,7 +2844,7 @@ function element_children($element) { /** * Provide theme registration for themes across .inc files. */ -function drupal_common_themes() { +function drupal_common_theme() { return array( // theme.inc 'placeholder' => array( @@ -2856,6 +2855,10 @@ function drupal_common_themes() { 'template' => 'page', ), 'maintenance_page' => array( + 'arguments' => array('content' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE), + 'template' => 'maintenance-page', + ), + 'update_page' => array( 'arguments' => array('content' => NULL, 'show_messages' => TRUE), ), 'install_page' => array( Index: includes/database.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.inc,v retrieving revision 1.84 diff -u -p -r1.84 database.inc --- includes/database.inc 12 Oct 2007 14:19:44 -0000 1.84 +++ includes/database.inc 16 Nov 2007 18:16:29 -0000 @@ -164,6 +164,14 @@ function db_set_active($name = 'default' } /** + * Returns a boolean depending on the availability of the database. + */ +function db_is_active() { + global $active_db; + return !empty($active_db); +} + +/** * Helper function for db_query(). */ function _db_query_callback($match, $init = FALSE) { Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.49 diff -u -p -r1.49 install.inc --- includes/install.inc 11 Nov 2007 16:14:45 -0000 1.49 +++ includes/install.inc 16 Nov 2007 18:16:29 -0000 @@ -615,7 +615,6 @@ function st($string, $args = array()) { } require_once './includes/theme.inc'; - $GLOBALS['theme'] = 'theme'; // Transform arguments before inserting them foreach ($args as $key => $value) { switch ($key[0]) { Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.394 diff -u -p -r1.394 theme.inc --- includes/theme.inc 11 Nov 2007 22:43:44 -0000 1.394 +++ includes/theme.inc 16 Nov 2007 18:16:30 -0000 @@ -29,14 +29,18 @@ define('MARK_UPDATED', 2); * Initialize the theme system by loading the theme. */ function init_theme() { - global $theme, $user, $custom_theme, $theme_engine, $theme_key; + global $theme, $user, $custom_theme, $theme_key; // If $theme is already set, assume the others are set, too, and do nothing if (isset($theme)) { return; } - drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); + // The theme system initializes whether the database is active or not. + // Check here before bootstrapping the database. + if (db_is_active()) { + drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); + } $themes = list_themes(); // Only select the user selected theme if it is available in the @@ -174,7 +178,21 @@ function _init_theme($theme, $base_theme include_once './'. $theme->owner; } } - _theme_load_registry($theme, $base_theme, $theme_engine); + + theme_load_registry($theme, $base_theme, $theme_engine); +} + +/** + * This function redirects the handling of the registry depending on the state + * of the database. + */ +function theme_load_registry($theme, $base_theme, $theme_engine) { + if (db_is_active()) { + _theme_load_registry($theme, $base_theme, $theme_engine); + } + else { + _theme_load_registry_offline($theme, $base_theme, $theme_engine); + } } /** @@ -227,6 +245,17 @@ function _theme_load_registry($theme, $b } /** + * Processes the theme_registry when the database is inactive. + * + * @see _theme_load_registry() + * Serves the same purpose when the database is online. + */ +function _theme_load_registry_offline($theme, $base_theme = NULL, $theme_engine = NULL) { + $registry = _theme_build_registry($theme, $base_theme, $theme_engine); + _theme_set_registry($registry); +} + +/** * Write the theme_registry cache into the database. */ function _theme_save_registry($theme, $registry) { @@ -394,6 +423,9 @@ function _theme_build_registry($theme, $ /** * Provides a list of currently available themes. * + * If the database is active then it will be retrieved from the database. + * Otherwise it will retrieve a new list. + * * @param $refresh * Whether to reload the list of themes from the database. * @return @@ -408,59 +440,41 @@ function list_themes($refresh = FALSE) { if (empty($list)) { $list = array(); - $result = db_query("SELECT * FROM {system} WHERE type = '%s'", 'theme'); - while ($theme = db_fetch_object($result)) { - if (file_exists($theme->filename)) { - $theme->info = unserialize($theme->info); - foreach ($theme->info['stylesheets'] as $media => $stylesheets) { - foreach ($stylesheets as $stylesheet => $path) { - if (file_exists($path)) { - $theme->stylesheets[$media][$stylesheet] = $path; - } - } + $themes = array(); + // Extract from the database only when it is available. + if (db_is_active()) { + $result = db_query("SELECT * FROM {system} WHERE type = '%s'", 'theme'); + while ($theme = db_fetch_object($result)) { + if (file_exists($theme->filename)) { + $theme->info = unserialize($theme->info); + $themes[] = $theme; } - foreach ($theme->info['scripts'] as $script => $path) { + } + } + else { + $themes = _system_theme_data(); + } + + foreach ($themes as $theme) { + foreach ($theme->info['stylesheets'] as $media => $stylesheets) { + foreach ($stylesheets as $stylesheet => $path) { if (file_exists($path)) { - $theme->scripts[$script] = $path; + $theme->stylesheets[$media][$stylesheet] = $path; } } - if (isset($theme->info['engine'])) { - $theme->engine = $theme->info['engine']; - } - if (isset($theme->info['base theme'])) { - $theme->base_theme = $theme->info['base theme']; + } + foreach ($theme->info['scripts'] as $script => $path) { + if (file_exists($path)) { + $theme->scripts[$script] = $path; } - $list[$theme->name] = $theme; } - } - } - - return $list; -} - -/** - * Provides a list of currently available theme engines - * - * @param $refresh - * Whether to reload the list of themes from the database. - * @return - * An array of the currently available theme engines. - */ -function list_theme_engines($refresh = FALSE) { - static $list; - - if ($refresh) { - unset($list); - } - - if (!$list) { - $list = array(); - $result = db_query("SELECT * FROM {system} WHERE type = '%s' AND status = %d ORDER BY name", 'theme_engine', '1'); - while ($engine = db_fetch_object($result)) { - if (file_exists($engine->filename)) { - $engine->info = unserialize($engine->info); - $list[$engine->name] = $engine; + if (isset($theme->info['engine'])) { + $theme->engine = $theme->info['engine']; } + if (isset($theme->info['base theme'])) { + $theme->base_theme = $theme->info['base theme']; + } + $list[$theme->name] = $theme; } } @@ -1029,74 +1043,22 @@ function theme_placeholder($text) { } /** - * Generate a themed maintenance page. - * - * Note: this function is not themeable. - * - * @param $content - * The page content to show. - * @param $show_messages - * Whether to output status and error messages. - * FALSE can be useful to postpone the messages to a subsequent page. - */ -function theme_maintenance_page($content, $show_messages = TRUE) { - // Set required headers. - drupal_set_header('Content-Type: text/html; charset=utf-8'); - drupal_set_html_head(''); - drupal_set_html_head(''); - drupal_set_html_head(''); - drupal_set_html_head(''); - - // Prepare variables. - $variables = array( - 'head_title' => strip_tags(drupal_get_title()), - 'head' => drupal_get_html_head(), - 'styles' => '', - 'scripts' => drupal_get_js(), - 'left' => drupal_get_content('left'), - 'right' => drupal_get_content('right'), - 'base_path' => base_path(), - 'path_to_theme' => base_path() .'themes/garland/minnelli', - 'logo' => base_path() .'themes/garland/minnelli/logo.png', - 'site_title' => t('Drupal'), - 'title' => drupal_get_title(), - 'messages' => $show_messages ? theme('status_messages') : '', - 'content' => $content, - ); - - $output = theme_render_template('misc/maintenance.tpl.php', $variables); - - return $output; -} - -/** * Generate a themed installation page. * - * Note: this function is not themeable. + * Note: this function is not themeable and it is hard coded for Minnelli. * * @param $content * The page content to show. */ function theme_install_page($content) { drupal_set_header('Content-Type: text/html; charset=utf-8'); - drupal_add_css('misc/maintenance.css', 'module', 'all', FALSE); - drupal_set_html_head(''); - $variables = array( - 'head_title' => strip_tags(drupal_get_title()), - 'head' => drupal_get_html_head(), - 'styles' => drupal_get_css(), - 'scripts' => drupal_get_js(), - 'left' => drupal_get_content('left'), - 'right' => drupal_get_content('right'), - 'base_path' => base_path(), - 'path_to_theme' => base_path() .'themes/garland/minnelli', - 'logo' => base_path() .'themes/garland/minnelli/logo.png', - 'site_title' => st('Drupal Installation'), - 'title' => drupal_get_title(), - 'messages' => '', - 'content' => $content, - ); + // Assign content. + $variables['content'] = $content; + // Delay setting the message variable so it can be processed below. + $variables['show_messages'] = FALSE; + // The maintenance preprocess function is recycled here. + template_preprocess_maintenance_page($variables); // Special handling of error messages $messages = drupal_set_message(); @@ -1114,7 +1076,31 @@ function theme_install_page($content) { $variables['messages'] .= theme('status_messages', 'status'); } - return theme_render_template('misc/maintenance.tpl.php', $variables); + return theme_render_template('themes/garland/minnelli/maintenance-page.tpl.php', $variables); +} + +/** + * Generate a themed update page. + * + * Note: this function is not themeable and it is hard coded for Minnelli. + * + * @param $content + * The page content to show. + * @param $show_messages + * Whether to output status and error messages. + * FALSE can be useful to postpone the messages to a subsequent page. + */ +function theme_update_page($content, $show_messages = TRUE) { + // Set required headers. + drupal_set_header('Content-Type: text/html; charset=utf-8'); + + // Assign content and show message flag. + $variables['content'] = $content; + $variables['show_messages'] = $show_messages; + // The maintenance preprocess function is recycled here. + template_preprocess_maintenance_page($variables); + + return theme_render_template('themes/garland/minnelli/maintenance-page.tpl.php', $variables); } /** @@ -1717,11 +1703,21 @@ function template_preprocess(&$variables // Tell all templates where they are located. $variables['directory'] = path_to_theme(); - // Flag front page status. - $variables['is_front'] = drupal_is_front_page(); - // Tell all templates by which kind of user they're viewed. - $variables['logged_in'] = ($user->uid > 0); - $variables['is_admin'] = user_access('access administration pages'); + + // Set default variables that depend on the database. + $variables['is_admin'] = FALSE; + $variables['is_front'] = FALSE; + $variables['logged_in'] = FALSE; + if ($variables['db_is_active'] = db_is_active()) { + // Check for administrators. + if (user_access('access administration pages')) { + $variables['is_admin'] = TRUE; + } + // Flag front page status. + $variables['is_front'] = drupal_is_front_page(); + // Tell all templates by which kind of user they're viewed. + $variables['logged_in'] = ($user->uid > 0); + } } /** @@ -1734,6 +1730,9 @@ function template_preprocess(&$variables * Uses the arg() function to generate a series of page template suggestions * based on the current path. * + * Any changes to variables in this preprocessor should also be changed inside + * template_preprocess_maintenance_page() to keep all them consistent. + * * The $variables array contains the following arguments: * - $content * - $show_blocks @@ -1872,6 +1871,106 @@ function template_preprocess_page(&$vari } /** + * The variables generated here is a mirror of template_preprocess_page(). + * This preprocessor will run it's course when theme_maintenance_page() is + * invoked. It is also used in theme_install_page() and theme_update_page() to + * keep all the variables consistent. + * + * An alternate template file of "maintenance-page-offline.tpl.php" can be + * used when the database is offline to hide errors and completely replace the + * content. + * + * The $variables array contains the following arguments: + * - $content + * - $show_blocks + * + * @see maintenance-page.tpl.php + */ +function template_preprocess_maintenance_page(&$variables) { + /* Add favicon */ + if (theme_get_setting('toggle_favicon')) { + drupal_set_html_head(''); + } + + global $theme; + // Retrieve the theme data to list all available regions. + $theme_data = _system_theme_data($theme); + $regions = $theme_data->info['regions']; + + // Get all region content set with drupal_set_content(). + foreach (array_keys($regions) as $region) { + // Assign region to a region variable. + $region_content = drupal_get_content($region); + isset($variables[$region]) ? $variables[$region] .= $region_content : $variables[$region] = $region_content; + } + + // Setup layout variable. + $variables['layout'] = 'none'; + if (!empty($variables['left'])) { + $variables['layout'] = 'left'; + } + if (!empty($variables['right'])) { + $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right'; + } + + // Construct page title + if (drupal_get_title()) { + $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); + } + else { + $head_title = array(variable_get('site_name', 'Drupal')); + if (variable_get('site_slogan', '')) { + $head_title[] = variable_get('site_slogan', ''); + } + } + $variables['head_title'] = implode(' | ', $head_title); + $variables['base_path'] = base_path(); + $variables['breadcrumb'] = ''; + $variables['feed_icons'] = ''; + $variables['footer_message'] = filter_xss_admin(variable_get('site_footer', FALSE)); + $variables['head'] = drupal_get_html_head(); + $variables['help'] = ''; + $variables['language'] = $GLOBALS['language']; + $variables['logo'] = theme_get_setting('logo'); + $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; + $variables['mission'] = ''; + $variables['primary_links'] = array(); + $variables['secondary_links'] = array(); + $variables['search_box'] = ''; + $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); + $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); + $variables['css'] = drupal_add_css(); + $variables['styles'] = drupal_get_css(); + $variables['scripts'] = drupal_get_js(); + $variables['tabs'] = ''; + $variables['title'] = drupal_get_title(); + $variables['closure'] = ''; + + // Compile a list of classes that are going to be applied to the body element. + $body_classes = array(); + $body_classes[] = 'in-maintenance'; + if (isset($variables['db_is_active']) && !$variables['db_is_active']) { + $body_classes[] = 'db-offline'; + } + if ($variables['layout'] == 'both') { + $body_classes[] = 'two-sidebars'; + } + elseif ($variables['layout'] == 'none') { + $body_classes[] = 'no-sidebars'; + } + else { + $body_classes[] = 'one-sidebar sidebar-'. $variables['layout']; + } + $variables['body_classes'] = implode(' ', $body_classes); + + // Dead databases will show error messages so supplying this template will + // allow themers to override the page and the content completely. + if (isset($variables['db_is_active']) && !$variables['db_is_active']) { + $variables['template_file'] = 'maintenance-page-offline'; + } +} + +/** * Process variables for node.tpl.php * * Most themes utilize their own copy of node.tpl.php. The default is located Index: misc/maintenance.css =================================================================== RCS file: misc/maintenance.css diff -N misc/maintenance.css --- misc/maintenance.css 2 Mar 2007 09:40:13 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -/* $Id: maintenance.css,v 1.7 2007/03/02 09:40:13 unconed Exp $ */ - -/* Update styles */ -#update-results { - margin-top: 3em; - padding: 0.25em; - border: 1px solid #ccc; - background: #eee; - font-size: smaller; -} -#update-results h2 { - margin-top: 0.25em; -} -#update-results h4 { - margin-bottom: 0.25em; -} -#update-results li.none { - color: #888; - font-style: italic; -} -#update-results li.failure strong { - color: #b63300; -} Index: misc/maintenance.tpl.php =================================================================== RCS file: misc/maintenance.tpl.php diff -N misc/maintenance.tpl.php --- misc/maintenance.tpl.php 11 Oct 2007 09:51:28 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,62 +0,0 @@ - - - - <?php print $head_title ?> - - - - - - - - - -
- -
-
- - - - - - - -
- '. $title .''; endif; ?> - - -
- -
- - - -
- - - - - -
-
- - - - Index: modules/system/maintenance-page.tpl.php =================================================================== RCS file: modules/system/maintenance-page.tpl.php diff -N modules/system/maintenance-page.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/maintenance-page.tpl.php 16 Nov 2007 18:16:30 -0000 @@ -0,0 +1,98 @@ + + + + + + <?php print $head_title; ?> + + + + + + +
+ + +
+ + + + + +
+ +
+

+ +
+ +
+
+ +
+ + + + + +
+ + + +
+ + + Index: modules/system/maintenance.css =================================================================== RCS file: modules/system/maintenance.css diff -N modules/system/maintenance.css --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/system/maintenance.css 16 Nov 2007 18:16:30 -0000 @@ -0,0 +1,23 @@ +/* $Id: maintenance.css,v 1.7 2007/03/02 09:40:13 unconed Exp $ */ + +/* Update styles */ +#update-results { + margin-top: 3em; + padding: 0.25em; + border: 1px solid #ccc; + background: #eee; + font-size: smaller; +} +#update-results h2 { + margin-top: 0.25em; +} +#update-results h4 { + margin-bottom: 0.25em; +} +#update-results li.none { + color: #888; + font-style: italic; +} +#update-results li.failure strong { + color: #b63300; +} Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.551 diff -u -p -r1.551 system.module --- modules/system/system.module 11 Nov 2007 08:48:22 -0000 1.551 +++ modules/system/system.module 16 Nov 2007 18:16:31 -0000 @@ -73,7 +73,7 @@ function system_help($path, $arg) { } function system_theme() { - return array_merge(drupal_common_themes(), array( + return array_merge(drupal_common_theme(), array( 'system_theme_select_form' => array( 'arguments' => array('form' => NULL), 'file' => 'system.admin.inc', @@ -707,111 +707,127 @@ function system_theme_default() { } /** - * Collect data about all currently available themes + * Collect data about all currently available themes. + * + * @return + * Array of all available themes and their data. */ function system_theme_data() { - // Find themes - $themes = drupal_system_listing('\.info$', 'themes'); - // Find theme engines - $engines = drupal_system_listing('\.engine$', 'themes/engines'); + // Scan the installation theme .info files and engines. + $themes = _system_theme_data(); - // Remove all theme engines from the system table - db_query("DELETE FROM {system} WHERE type = '%s'", 'theme_engine'); + // Extract current files from database. + system_get_files_database($themes, 'theme'); - foreach ($engines as $engine) { - // Insert theme engine into system table - drupal_get_filename('theme_engine', $engine->name, $engine->filename); - drupal_load('theme_engine', $engine->name); - db_query("INSERT INTO {system} (name, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', %d, %d, %d)", $engine->name, 'theme_engine', $engine->filename, 1, 0, 0); - } + db_query("DELETE FROM {system} WHERE type = 'theme'"); - $defaults = system_theme_default(); + foreach ($themes as $theme) { + if (!isset($theme->owner)) { + $theme->owner = ''; + } - $sub_themes = array(); - // Read info files for each theme - foreach ($themes as $key => $theme) { - $themes[$key]->info = drupal_parse_info_file($theme->filename) + $defaults; + db_query("INSERT INTO {system} (name, owner, info, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d)", $theme->name, $theme->owner, serialize($theme->info), 'theme', $theme->filename, isset($theme->status) ? $theme->status : 0, 0, 0); + } - // Invoke hook_system_info_alter() to give installed modules a chance to - // modify the data in the .info files if necessary. - drupal_alter('system_info', $themes[$key]->info, $themes[$key]); + return $themes; +} - if (!empty($themes[$key]->info['base theme'])) { - $sub_themes[] = $key; - } - if (empty($themes[$key]->info['engine'])) { - $filename = dirname($themes[$key]->filename) .'/'. $themes[$key]->name .'.theme'; - if (file_exists($filename)) { - $themes[$key]->owner = $filename; - $themes[$key]->prefix = $key; +/** + * Helper function to scan and collect theme .info data and their engines. + * + * @param $theme_key + * The name of the theme. When set this returns theme data specific to the + * theme. When left empty, the data from every installed theme is returned. + * @return + * Array of theme data. The depth of the array depends on whether $theme_key + * is set or not. + */ +function _system_theme_data($theme_key = '') { + static $themes_info = array(); + + if (empty($theme_info)) { + // Find themes + $themes = drupal_system_listing('\.info$', 'themes'); + // Find theme engines + $engines = drupal_system_listing('\.engine$', 'themes/engines'); + + $defaults = system_theme_default(); + + $sub_themes = array(); + // Read info files for each theme + foreach ($themes as $key => $theme) { + $themes[$key]->info = drupal_parse_info_file($theme->filename) + $defaults; + + // Invoke hook_system_info_alter() to give installed modules a chance to + // modify the data in the .info files if necessary. + drupal_alter('system_info', $themes[$key]->info, $themes[$key]); + + if (!empty($themes[$key]->info['base theme'])) { + $sub_themes[] = $key; } - } - else { - $engine = $themes[$key]->info['engine']; - if (isset($engines[$engine])) { - $themes[$key]->owner = $engines[$engine]->filename; - $themes[$key]->prefix = $engines[$engine]->name; - $themes[$key]->template = TRUE; + if (empty($themes[$key]->info['engine'])) { + $filename = dirname($themes[$key]->filename) .'/'. $themes[$key]->name .'.theme'; + if (file_exists($filename)) { + $themes[$key]->owner = $filename; + $themes[$key]->prefix = $key; + } } - } - - // Give the stylesheets proper path information. - $pathed_stylesheets = array(); - foreach ($themes[$key]->info['stylesheets'] as $media => $stylesheets) { - foreach ($stylesheets as $stylesheet) { - $pathed_stylesheets[$media][$stylesheet] = dirname($themes[$key]->filename) .'/'. $stylesheet; + else { + $engine = $themes[$key]->info['engine']; + if (isset($engines[$engine])) { + $themes[$key]->owner = $engines[$engine]->filename; + $themes[$key]->prefix = $engines[$engine]->name; + $themes[$key]->template = TRUE; + } } - } - $themes[$key]->info['stylesheets'] = $pathed_stylesheets; - // Give the scripts proper path information. - $scripts = array(); - foreach ($themes[$key]->info['scripts'] as $script) { - $scripts[$script] = dirname($themes[$key]->filename) .'/'. $script; - } - $themes[$key]->info['scripts'] = $scripts; - // Give the screenshot proper path information. - if (!empty($themes[$key]->info['screenshot'])) { - $themes[$key]->info['screenshot'] = dirname($themes[$key]->filename) .'/'. $themes[$key]->info['screenshot']; - } - } + // Give the stylesheets proper path information. + $pathed_stylesheets = array(); + foreach ($themes[$key]->info['stylesheets'] as $media => $stylesheets) { + foreach ($stylesheets as $stylesheet) { + $pathed_stylesheets[$media][$stylesheet] = dirname($themes[$key]->filename) .'/'. $stylesheet; + } + } + $themes[$key]->info['stylesheets'] = $pathed_stylesheets; - // Now that we've established all our master themes, go back and fill in - // data for subthemes. - foreach ($sub_themes as $key) { - $base_key = system_find_base_theme($themes, $key); - if (!$base_key) { - continue; - } - // Copy the 'owner' and 'engine' over if the top level theme uses a - // theme engine. - if (isset($themes[$base_key]->owner)) { - if (isset($themes[$base_key]->info['engine'])) { - $themes[$key]->info['engine'] = $themes[$base_key]->info['engine']; - $themes[$key]->owner = $themes[$base_key]->owner; - $themes[$key]->prefix = $themes[$base_key]->prefix; + // Give the scripts proper path information. + $scripts = array(); + foreach ($themes[$key]->info['scripts'] as $script) { + $scripts[$script] = dirname($themes[$key]->filename) .'/'. $script; } - else { - $themes[$key]->prefix = $key; + $themes[$key]->info['scripts'] = $scripts; + // Give the screenshot proper path information. + if (!empty($themes[$key]->info['screenshot'])) { + $themes[$key]->info['screenshot'] = dirname($themes[$key]->filename) .'/'. $themes[$key]->info['screenshot']; } } - } - - // Extract current files from database. - system_get_files_database($themes, 'theme'); - db_query("DELETE FROM {system} WHERE type = 'theme'"); - - foreach ($themes as $theme) { - if (!isset($theme->owner)) { - $theme->owner = ''; + // Now that we've established all our master themes, go back and fill in + // data for subthemes. + foreach ($sub_themes as $key) { + $base_key = system_find_base_theme($themes, $key); + if (!$base_key) { + continue; + } + // Copy the 'owner' and 'engine' over if the top level theme uses a + // theme engine. + if (isset($themes[$base_key]->owner)) { + if (isset($themes[$base_key]->info['engine'])) { + $themes[$key]->info['engine'] = $themes[$base_key]->info['engine']; + $themes[$key]->owner = $themes[$base_key]->owner; + $themes[$key]->prefix = $themes[$base_key]->prefix; + } + else { + $themes[$key]->prefix = $key; + } + } } - - db_query("INSERT INTO {system} (name, owner, info, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d)", $theme->name, $theme->owner, serialize($theme->info), 'theme', $theme->filename, isset($theme->status) ? $theme->status : 0, 0, 0); + + $themes_info = $themes; } - return $themes; + return !empty($theme_key) ? $themes_info[$theme_key] : $themes_info; } /** Index: sites/default/default.settings.php =================================================================== RCS file: /cvs/drupal/drupal/sites/default/default.settings.php,v retrieving revision 1.3 diff -u -p -r1.3 default.settings.php --- sites/default/default.settings.php 28 Aug 2007 11:42:56 -0000 1.3 +++ sites/default/default.settings.php 16 Nov 2007 18:16:31 -0000 @@ -166,11 +166,16 @@ ini_set('url_rewriter.tags', ''); * the default settings.php. Any configuration setting from the 'variable' * table can be given a new value. * + * A custom theme can be set for cases where the database is offline through + * the 'theme_default' key. The template file should also be copied into the + * theme. It is located inside 'modules/system/maintenance-page.tpl.php'. + * * Remove the leading hash signs to enable. */ # $conf = array( # 'site_name' => 'My Drupal site', # 'theme_default' => 'minnelli', +# 'maintenance_theme' => 'minnelli', # 'anonymous' => 'Visitor', # ); Index: themes/garland/minnelli/maintenance-page.tpl.php =================================================================== RCS file: themes/garland/minnelli/maintenance-page.tpl.php diff -N themes/garland/minnelli/maintenance-page.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ themes/garland/minnelli/maintenance-page.tpl.php 16 Nov 2007 18:16:31 -0000 @@ -0,0 +1,91 @@ + + + + <?php print $head_title ?> + + + + + + > + + +
+ +
+
+ + + + + + + +
+ '. $title .''; endif; ?> + + +
+ +
+ +
+ + + + + +
+
+ + + +