diff --git a/ChangeLog b/ChangeLog index 4757c939d..fd23d81c8 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,9 @@ $Source$ 2005-10-13 Michal Čihař * Documentation.html: Fix URL rewriting not to match empty parts. - * calendar.php: Use common header. + * calendar.php, themes.php, libraries/auth/config.auth.lib.php, + libraries/auth/cookie.auth.lib.php, libraries/auth/http.auth.lib.php: + Use common header. * libraries/header_meta_style.inc.php: Add support for defining page title. diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 4fe33dc1b..9ebef1adb 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -81,57 +81,10 @@ function PMA_auth_fails() header('Content-Type: text/html; charset=' . $GLOBALS['charset']); // Defines the theme to be used require_once('./libraries/select_theme.lib.php'); + /* HTML header */ + $page_title = $GLOBALS['strAccessDenied']; + require('./libraries/header_meta_style.inc.php'); ?> - - - - -<?php echo $GLOBALS['strAccessDenied']; ?> - - - - - diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 8929d50c0..70e970683 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -113,53 +113,10 @@ function PMA_auth() // Defines the "item" image depending on text direction $item_img = $GLOBALS['pmaThemeImage'] . 'item_ltr.png'; - // Title + /* HTML header */ + $page_title = 'phpMyAdmin ' . PMA_VERSION; + require('./libraries/header_meta_style.inc.php'); ?> - - - - -phpMyAdmin <?php echo PMA_VERSION; ?> - - - - - - diff --git a/themes.php b/themes.php index db40b5520..f58f66969 100644 --- a/themes.php +++ b/themes.php @@ -12,53 +12,10 @@ require_once('./libraries/header_http.inc.php'); /* Gets the font sizes to use */ PMA_setFontSizes(); -/* remove vertical scroll bar bug in ie */ -echo ""; +/* HTML header */ +$page_title = 'phpMyAdmin - ' . $strTheme; +require('./libraries/header_meta_style.inc.php'); ?> - - - - -phpMyAdmin <?php echo PMA_VERSION; ?> - - - -