diff options
| author | Rouslan Placella <rouslan@placella.com> | 2012-05-24 03:11:26 +0400 |
|---|---|---|
| committer | Rouslan Placella <rouslan@placella.com> | 2012-06-11 17:06:02 +0400 |
| commit | 54d47b89db2bcb2641f59f9ca1941698cb13b549 (patch) | |
| tree | 07d495617dff59536e1c39227ade9e1ca3424ed4 | |
| parent | 372335a8cad0295c170ccfdb36c42972a389eadc (diff) | |
Use PMA_Header class in themes.php
| -rw-r--r-- | libraries/Header.class.php | 36 | ||||
| -rw-r--r-- | themes.php | 17 |
2 files changed, 36 insertions, 17 deletions
diff --git a/libraries/Header.class.php b/libraries/Header.class.php index e59f1caf4d..6f4906d660 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -25,11 +25,17 @@ class PMA_Header { private $_scripts; private $_menu; private $_userprefs_offer_import; + private $_title; + private $_bodyId; + private $_menuEnabled; public $headerIsSent; private function __construct() { + $this->_bodyId = ''; + $this->_title = 'phpMyAdmin'; $this->_menu = PMA_Menu::getInstance(); + $this->_menuEnabled = true; $this->_scripts = new PMA_Scripts(); $this->headerIsSent = false; // if database storage for user preferences is transient, @@ -56,6 +62,21 @@ class PMA_Header { return $this->_scripts; } + public function setBodyId($id) + { + $this->_bodyId = htmlspecialchars($id); + } + + public function setTitle($title) + { + $this->_title = htmlspecialchars($title); + } + + public function disableMenu() + { + $this->_menuEnabled = false; + } + public function display() { echo $this->getDisplay(); @@ -97,7 +118,7 @@ class PMA_Header { if (! defined('PMA_DISPLAY_HEADING')) { define('PMA_DISPLAY_HEADING', 1); } - if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0) { + if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0 && $this->_menuEnabled) { $retval .= $this->_menu->getDisplay(); } $retval .= $this->_addRecentTable( @@ -177,10 +198,10 @@ class PMA_Header { private function _getTitleTag() { $retval = "<title>"; - if (empty($GLOBALS['page_title'])) { - $retval .= 'phpMyAdmin'; - } else { + if (! empty($GLOBALS['page_title'])) { $retval .= htmlspecialchars($GLOBALS['page_title']); + } else { + $retval .= $this->_title; } $retval .= "</title>"; return $retval; @@ -188,7 +209,12 @@ class PMA_Header { private function _getBodyStart() { - return "</head><body>"; + $retval = "</head><body"; + if (! empty($this->_bodyId)) { + $retval .= " id='" . $this->_bodyId . "'"; + } + $retval .= ">"; + return $retval; } private function _getWarnings() diff --git a/themes.php b/themes.php index 9c6d6731f2..eb587beceb 100644 --- a/themes.php +++ b/themes.php @@ -10,20 +10,13 @@ */ require './libraries/common.inc.php'; -/* Theme Select */ -$path_to_themes = $cfg['ThemePath'] . '/'; +$header = PMA_Header::getInstance(); +$header->setBodyId('bodythemes'); +$header->setTitle('phpMyAdmin - ' . __('Theme')); +$header->disableMenu(); +$header->display(); -/* set language and charset */ -require './libraries/header_http.inc.php'; - -/* HTML header */ -$page_title = 'phpMyAdmin - ' . __('Theme'); -require './libraries/header_meta_style.inc.php'; -require './libraries/header_scripts.inc.php'; ?> -</head> - -<body id="bodythemes"> <h1>phpMyAdmin - <?php echo __('Theme'); ?></h1> <p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>" class="_blank"><?php echo __('Get more themes!'); ?></a></p> <?php |