'. 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.') .'
'); @@ -600,7 +600,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(''. st('One or more required modules are missing. Please check the error messages and try again.', array('!url' => "install.php?profile=$profile")) .'
'); @@ -631,7 +631,7 @@ function install_tasks($profile, $task) $_SESSION['messages'] = $messages; // Build a page for a final task. - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); if (empty($task)) { variable_set('install_task', 'configure'); $task = 'configure'; @@ -774,7 +774,7 @@ function install_check_requirements($pro // If there are issues, report them. if ($severity == REQUIREMENT_ERROR) { - drupal_maintenance_theme(); + drupal_maintenance_theme('install'); install_task_list('requirements'); foreach ($requirements as $requirement) { @@ -839,7 +839,7 @@ function install_task_list($active = NUL if (in_array($active, array('finished', 'done'))) { $active = NULL; } - drupal_set_content('left', theme_task_list($tasks, $active)); + drupal_set_content('left', theme('task_list', $tasks, $active)); } function install_configure_form() { Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.236 diff -u -p -r1.236 update.php --- update.php 20 Oct 2007 21:57:49 -0000 1.236 +++ update.php 29 Oct 2007 18:56:54 -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. @@ -813,8 +813,8 @@ ini_set('display_errors', FALSE); include_once './includes/bootstrap.inc'; update_fix_system_table(); +drupal_maintenance_theme('update'); drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -drupal_maintenance_theme(); // This must happen *after* drupal_bootstrap(), since it calls // variable_(get|set), which only works after a full bootstrap. Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.198 diff -u -p -r1.198 bootstrap.inc --- includes/bootstrap.inc 25 Oct 2007 15:38:24 -0000 1.198 +++ includes/bootstrap.inc 29 Oct 2007 18:56:54 -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 { @@ -977,29 +976,35 @@ function _drupal_bootstrap($phase) { * without the full Drupal API loaded. For example, theme_page() is * unavailable and theme_maintenance_page() must be used in its place. */ -function drupal_maintenance_theme() { - global $theme; +function drupal_maintenance_theme($state = NULL) { + //print var_dump(debug_backtrace()); + global $conf; require_once './includes/path.inc'; require_once './includes/theme.inc'; require_once './includes/common.inc'; + require_once './includes/database.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_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'; - } + if ($state == 'install' || $state == 'update') { + $conf['theme_default'] = 'minnelli'; + } + else { + $conf['theme_default'] = variable_get('maintenance_theme', 'minnelli'); } - _theme_set_registry($themes); + + $module_list['system']['filename'] = 'modules/system/system.module'; + $module_list['filter']['filename'] = 'modules/filter/filter.module'; + + module_list(TRUE, FALSE, FALSE, $module_list); + } /** Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.708 diff -u -p -r1.708 common.inc --- includes/common.inc 25 Oct 2007 15:38:24 -0000 1.708 +++ includes/common.inc 29 Oct 2007 18:56:56 -0000 @@ -324,7 +324,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', @@ -2719,7 +2718,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( @@ -2731,6 +2730,7 @@ function drupal_common_themes() { ), 'maintenance_page' => array( 'arguments' => array('content' => NULL, 'show_messages' => TRUE), + 'template' => 'maintenance-page', ), 'install_page' => array( 'arguments' => array('content' => NULL), 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 29 Oct 2007 18:56:56 -0000 @@ -146,7 +146,7 @@ function db_set_active($name = 'default' include_once $handler; } else { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_title('Unsupported database type'); print theme('maintenance_page', 'The database type '. theme('placeholder', $db_type) .' is unsupported. Please use either mysql for MySQL 3.x & 4.0.x databases, mysqli for MySQL 4.1.x+ databases, or pgsql for PostgreSQL databases. The database information is in your settings.php file.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); @@ -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/database.mysql.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v retrieving revision 1.83 diff -u -p -r1.83 database.mysql.inc --- includes/database.mysql.inc 20 Oct 2007 21:57:49 -0000 1.83 +++ includes/database.mysql.inc 29 Oct 2007 18:56:56 -0000 @@ -53,7 +53,7 @@ function db_connect($url) { // Check if MySQL support is present in PHP if (!function_exists('mysql_connect')) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_title('PHP MySQL support not enabled'); print theme('maintenance_page', 'We were unable to use the MySQL database because the MySQL extension for PHP is not installed. Check your PHP.ini to see how you can enable it.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); @@ -86,7 +86,7 @@ function db_connect($url) { $connection = @mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2); if (!$connection) { // Show error screen otherwise - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_header('HTTP/1.1 503 Service Unavailable'); drupal_set_title('Unable to connect to database server'); print theme('maintenance_page', 'If you still have to install Drupal, proceed to the installation page.
@@ -103,7 +103,7 @@ function db_connect($url) { } if (!mysql_select_db(substr($url['path'], 1))) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_title('Unable to select database'); print theme('maintenance_page', 'We were able to connect to the MySQL database server (which means your username and password are okay) but not able to select the database.
The MySQL error was: '. theme('placeholder', mysql_error($connection)) .'.
Index: includes/database.mysqli.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.mysqli.inc,v retrieving revision 1.48 diff -u -p -r1.48 database.mysqli.inc --- includes/database.mysqli.inc 20 Oct 2007 21:57:49 -0000 1.48 +++ includes/database.mysqli.inc 29 Oct 2007 18:56:57 -0000 @@ -58,7 +58,7 @@ function db_version() { function db_connect($url) { // Check if MySQLi support is present in PHP if (!function_exists('mysqli_init') && !extension_loaded('mysqli')) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_title('PHP MySQLi support not enabled'); print theme('maintenance_page', 'We were unable to use the MySQLi database because the MySQLi extension for PHP is not installed. Check your PHP.ini to see how you can enable it.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); @@ -84,7 +84,7 @@ function db_connect($url) { // Find all database connection errors and error 1045 for access denied for user account if (mysqli_connect_errno() >= 2000 || mysqli_connect_errno() == 1045) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_header('HTTP/1.1 503 Service Unavailable'); drupal_set_title('Unable to connect to database server'); print theme('maintenance_page', 'If you still have to install Drupal, proceed to the installation page.
@@ -101,7 +101,7 @@ function db_connect($url) { exit; } else if (mysqli_connect_errno() > 0) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_title('Unable to select database'); print theme('maintenance_page', 'We were able to connect to the MySQL database server (which means your username and password are okay) but not able to select the database.
The MySQL error was: '. theme('placeholder', mysqli_connect_error()) .'.
Index: includes/database.pgsql.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.pgsql.inc,v retrieving revision 1.63 diff -u -p -r1.63 database.pgsql.inc --- includes/database.pgsql.inc 17 Oct 2007 12:47:28 -0000 1.63 +++ includes/database.pgsql.inc 29 Oct 2007 18:56:57 -0000 @@ -47,7 +47,7 @@ function db_version() { function db_connect($url) { // Check if PostgreSQL support is present in PHP if (!function_exists('pg_connect')) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_title('PHP PostgreSQL support not enabled'); print theme('maintenance_page', 'We were unable to use the PostgreSQL database because the PostgreSQL extension for PHP is not installed. Check your PHP.ini to see how you can enable it.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); @@ -82,7 +82,7 @@ function db_connect($url) { $connection = @pg_connect($conn_string); if (!$connection) { - drupal_maintenance_theme(); + drupal_maintenance_theme('error'); drupal_set_header('HTTP/1.1 503 Service Unavailable'); drupal_set_title('Unable to connect to database'); print theme('maintenance_page', 'If you still have to install Drupal, proceed to the installation page.
Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.48 diff -u -p -r1.48 install.inc --- includes/install.inc 7 Sep 2007 10:48:24 -0000 1.48 +++ includes/install.inc 29 Oct 2007 18:56:57 -0000 @@ -614,7 +614,7 @@ function st($string, $args = array()) { } require_once './includes/theme.inc'; - $GLOBALS['theme'] = 'theme'; + //$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.392 diff -u -p -r1.392 theme.inc --- includes/theme.inc 23 Oct 2007 09:42:09 -0000 1.392 +++ includes/theme.inc 29 Oct 2007 18:56:58 -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. + 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; } } @@ -1039,34 +1053,81 @@ function theme_placeholder($text) { * 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(''); +function template_preprocess_maintenance_page(&$variables) { + global $theme; - // 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, - ); + // 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', ''); + } + } + + // Maintenance style sheet. + drupal_add_css(drupal_get_path('module', 'system') .'/maintenance.css', 'module'); + + if (db_is_active()) { + if (theme_get_setting('toggle_favicon')) { + drupal_set_html_head(''); + } + $logo = theme_get_setting('logo'); + $site_name = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); + $site_slogan = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); + } + else { + drupal_set_html_head(''); + if (isset($theme->info['logo'])) { + $logo = base_path() . path_to_theme() .'/'. $theme->info['logo']; + } + $site_name = t('Drupal'); + $site_slogan = ''; + } - $output = theme_render_template('misc/maintenance.tpl.php', $variables); + // Prepare variables. + $variables['head_title'] = implode(' | ', $head_title); + $variables['head'] = drupal_get_html_head(); + $variables['language'] = $GLOBALS['language']; + $variables['logo'] = $logo; + $variables['css'] = drupal_add_css(); + $variables['styles'] = drupal_get_css(); + $variables['scripts'] = drupal_get_js(); + $variables['left'] = drupal_get_content('left'); + $variables['right'] = drupal_get_content('right'); + $variables['base_path'] = base_path(); + $variables['site_name'] = $site_name; + $variables['site_slogan'] = $site_slogan; + $variables['title'] = drupal_get_title(); + $variables['footer_message'] = filter_xss_admin(variable_get('site_footer', FALSE)); - return $output; + // Setup layout variable. + $variables['layout'] = 'none'; + if (!empty($variables['left'])) { + $variables['layout'] = 'left'; + } + if (!empty($variables['right'])) { + $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right'; + } + $body_classes = array(); + $body_classes[] = $variables['is_front'] ? 'front' : 'not-front'; + $body_classes[] = $variables['logged_in'] ? 'logged-in' : 'not-logged-in'; + 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); + + if (!db_is_active()) { + $variables['template_files'][] = 'maintenance-page-offline'; + } } /** @@ -1113,7 +1174,7 @@ 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); } /** @@ -1716,11 +1777,17 @@ function template_preprocess(&$variables // Tell all templates where they are located. $variables['directory'] = path_to_theme(); + // Set defaults. + $variables['is_front'] = FALSE; + $variables['logged_in'] = FALSE; + $variables['is_admin'] = FALSE; + if ($variables['db_is_active'] = db_is_active()) { // 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'); + $variables['is_admin'] = user_access('access administration pages'); + } } /** 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 @@ - - - -