diff options
67 files changed, 206 insertions, 137 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php index c6d8150144..dd11f98f40 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -13,7 +13,8 @@ $field = $_REQUEST['field']; PMA_checkParameters(array('db', 'table', 'field')); -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->disableMenu(); $header->setBodyId('body_browse_foreigners'); diff --git a/db_events.php b/db_events.php index af1d0a2926..b22df7a540 100644 --- a/db_events.php +++ b/db_events.php @@ -15,7 +15,9 @@ require_once 'libraries/common.lib.php'; /** * Include JavaScript libraries */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('jquery/timepicker.js'); $scripts->addFile('rte/common.js'); $scripts->addFile('rte/events.js'); diff --git a/db_export.php b/db_export.php index ae937f6d1c..a7d2bb162c 100644 --- a/db_export.php +++ b/db_export.php @@ -11,7 +11,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('export.js'); // $sub_part is also used in db_info.inc.php to see if we are coming from diff --git a/db_import.php b/db_import.php index e804657928..39ec68004d 100644 --- a/db_import.php +++ b/db_import.php @@ -10,7 +10,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('import.js'); /** diff --git a/db_operations.php b/db_operations.php index 8771d11d6c..b2d29a1ee5 100644 --- a/db_operations.php +++ b/db_operations.php @@ -19,7 +19,9 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/mysql_charsets.lib.php'; // add a javascript file for jQuery functions to handle Ajax actions -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('db_operations.js'); /** diff --git a/db_printview.php b/db_printview.php index e8aa3e3ad7..a32de036d4 100644 --- a/db_printview.php +++ b/db_printview.php @@ -10,7 +10,8 @@ */ require_once 'libraries/common.inc.php'; -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->enablePrintView(); $header->display(); diff --git a/db_routines.php b/db_routines.php index b9d9cdc1b1..9a54a5815c 100644 --- a/db_routines.php +++ b/db_routines.php @@ -16,7 +16,9 @@ require_once 'libraries/mysql_charsets.lib.php'; /** * Include JavaScript libraries */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('jquery/timepicker.js'); $scripts->addFile('rte/common.js'); $scripts->addFile('rte/routines.js'); diff --git a/db_search.php b/db_search.php index 4faa1ace6f..4d12e8fe3a 100644 --- a/db_search.php +++ b/db_search.php @@ -13,7 +13,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('db_search.js'); $scripts->addFile('sql.js'); $scripts->addFile('makegrid.js'); diff --git a/db_sql.php b/db_sql.php index 2fdeb0a8c6..aa82ef946b 100644 --- a/db_sql.php +++ b/db_sql.php @@ -13,7 +13,9 @@ require_once 'libraries/common.inc.php'; /** * Runs common work */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('functions.js'); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); diff --git a/db_structure.php b/db_structure.php index d337c24e7d..cb5a765fa7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -10,7 +10,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('db_structure.js'); $scripts->addFile('tbl_change.js'); $scripts->addFile('jquery/timepicker.js'); diff --git a/db_tracking.php b/db_tracking.php index 5573f56203..5cc0b90e30 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -10,7 +10,9 @@ require_once 'libraries/common.inc.php'; //Get some js files needed for Ajax requests -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('db_structure.js'); /** diff --git a/db_triggers.php b/db_triggers.php index 80db582947..95dfb7e818 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -14,7 +14,9 @@ require_once 'libraries/common.inc.php'; /** * Include JavaScript libraries */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('rte/common.js'); $scripts->addFile('rte/triggers.js'); diff --git a/export.php b/export.php index 20432ab750..c79ebe9e4e 100644 --- a/export.php +++ b/export.php @@ -407,7 +407,8 @@ if (! $save_on_server) { } } $backup_cfgServer = $cfg['Server']; - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); $cfg['Server'] = $backup_cfgServer; unset($backup_cfgServer); echo "\n" . '<div style="text-align: ' . $cell_align_left . '">' . "\n"; diff --git a/import.php b/import.php index f801c9bbde..7dcf9966c6 100644 --- a/import.php +++ b/import.php @@ -83,7 +83,8 @@ if (! empty($sql_query)) { // upload limit has been reached, let's assume the second possibility. ; if ($_POST == array() && $_GET == array()) { - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); $message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.')); $message->addParam('[a@./Documentation.html#faq1_16@_blank]'); $message->addParam('[/a]'); @@ -72,7 +72,8 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; // start output -PMA_Header::getInstance()->sendHttpHeaders(); +$response = PMA_Response::getInstance(); +$response->getHeader()->sendHttpHeaders(); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index fd87c56ec7..ec31fe0077 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -12,22 +12,13 @@ if (! defined('PHPMYADMIN')) { require_once 'libraries/Footnotes.class.php'; /** - * Singleton class used to output the footer + * Class used to output the footer * * @package PhpMyAdmin */ class PMA_Footer { /** - * PMA_Footer instance - * - * @access private - * @static - * @var object - */ - private static $_instance; - - /** * PMA_Footnotes instance * * @access private @@ -48,7 +39,7 @@ class PMA_Footer * * @return new PMA_Footer object */ - private function __construct() + public function __construct() { $this->_footnotes = new PMA_Footnotes(); $this->_scripts = new PMA_Scripts(); @@ -236,19 +227,6 @@ class PMA_Footer } /** - * Returns the singleton PMA_Footer object - * - * @return PMA_Footer object - */ - public static function getInstance() - { - if (empty(self::$_instance)) { - self::$_instance = new PMA_Footer(); - } - return self::$_instance; - } - - /** * Returns the PMA_Footnotes object * * @return PMA_Footnotes object diff --git a/libraries/Header.class.php b/libraries/Header.class.php index 2dad27c943..040b530da3 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -20,21 +20,13 @@ require_once 'libraries/Menu.class.php'; $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); /** - * Singleton class used to output the HTTP and HTML headers + * Class used to output the HTTP and HTML headers * * @package PhpMyAdmin */ class PMA_Header { /** - * PMA_Header instance - * - * @access private - * @static - * @var object - */ - private static $_instance; - /** * PMA_Scripts instance * * @access private @@ -107,7 +99,7 @@ class PMA_Header * * @return new PMA_Header object */ - private function __construct() + public function __construct() { $this->_isAjax = false; if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { @@ -208,19 +200,6 @@ class PMA_Header } /** - * Returns the singleton PMA_Header object - * - * @return PMA_Header object - */ - public static function getInstance() - { - if (empty(self::$_instance)) { - self::$_instance = new PMA_Header(); - } - return self::$_instance; - } - - /** * Returns the PMA_Scripts object * * @return PMA_Scripts object diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php index 6a2597cdd6..013c0f0235 100644 --- a/libraries/PDF.class.php +++ b/libraries/PDF.class.php @@ -85,7 +85,8 @@ class PMA_PDF extends TCPDF */ function Error($error_message = '') { - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display(); include './libraries/footer.inc.php'; } diff --git a/libraries/Response.class.php b/libraries/Response.class.php index 4079af502e..f7c7a2edb7 100644 --- a/libraries/Response.class.php +++ b/libraries/Response.class.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * + * Manages the rendering of pages in PMA * * @package PhpMyAdmin */ @@ -13,7 +13,7 @@ require_once 'libraries/Header.class.php'; require_once 'libraries/Footer.class.php'; /** - * + * Singleton class used to manage the rendering of pages in PMA * * @package PhpMyAdmin */ @@ -40,9 +40,9 @@ class PMA_Response private function __construct() { $this->_data = array(); - $this->_header = PMA_Header::getInstance(); + $this->_header = new PMA_Header(); $this->_content = ''; - $this->_footer = PMA_Footer::getInstance(); + $this->_footer = new PMA_Footer(); } /** diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 3ca75f76df..404a9919ab 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -74,7 +74,8 @@ function PMA_auth_fails() /* HTML header */ $GLOBALS['page_title'] = __('Access denied'); - $header = PMA_Header::getInstance(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); $header->setTitle(__('Access denied')); $header->disableMenu(); $header->display(); @@ -90,7 +91,7 @@ function PMA_auth_fails() <td> <?php - PMA_Header::getInstance()->isHeaderSent = true; + PMA_Header::$headerIsSent = true; if (isset($GLOBALS['allowDeny_forbidden']) && $GLOBALS['allowDeny_forbidden']) { trigger_error(__('Access denied'), E_USER_NOTICE); diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 3e35494283..7b6df5fb26 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -155,7 +155,8 @@ function PMA_auth() $cell_align = ($GLOBALS['text_dir'] == 'ltr') ? 'left' : 'right'; $GLOBALS['page_title'] = 'phpMyAdmin'; - $header = PMA_Header::getInstance(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); $header->setBodyId('loginform'); $header->disableMenu(); $header->display(); diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 86231bed4e..1105359289 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -50,7 +50,8 @@ function PMA_auth() /* HTML header */ $GLOBALS['page_title'] = __('Access denied'); - $header = PMA_Header::getInstance(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); $header->setTitle(__('Access denied')); $header->disableMenu(); $header->display(); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e46241e704..01a32d4cc3 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -540,7 +540,8 @@ function PMA_showPHPDocu($target) */ function PMA_showHint($message, $bbcode = false) { - $footnotes = PMA_Footer::getInstance()->getFootnotes(); + $response = PMA_Response::getInstance(); + $footnotes = $response->getFooter()->getFootnotes(); return $footnotes->add($message, $bbcode); } @@ -569,7 +570,8 @@ function PMA_mysqlDie( /** * start http output, display html headers */ - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); $error_msg = ''; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 8d125fab3b..40fd24640c 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -774,7 +774,7 @@ function PMA_includeJS($url, $ie_conditional = false) } /** - * Adds JS code snippets to be displayed by the PMA_Header class. + * Adds JS code snippets to be displayed by the PMA_Response class. * Adds a newline to each snippet. * * @param string $str Js code to be added (e.g. "token=1234;") @@ -783,12 +783,15 @@ function PMA_includeJS($url, $ie_conditional = false) */ function PMA_addJSCode($str) { - PMA_Header::getInstance()->getScripts()->addCode($str); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); + $scripts = $header->getScripts(); + $scripts->addCode($str); } /** * Adds JS code snippet for variable assignment - * to be displayed by the PMA_Header class. + * to be displayed by the PMA_Response class. * * @param string $key Name of value to set * @param mixed $value Value to set, can be either string or array of strings diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index d8c40cb390..42f8a18461 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -79,7 +79,8 @@ if (isset($submitcollation) && !empty($db_collation)) { /** * Displays headers */ -PMA_Header::getInstance()->display(); +$response = PMA_Response::getInstance(); +$response->getHeader()->display(); /** * Set parameters for links diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 5b6fe7064d..4500c393e2 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1551,7 +1551,9 @@ function PMA_isInsertRow() && $_REQUEST['insert_rows'] != $GLOBALS['cfg']['InsertRows'] ) { $GLOBALS['cfg']['InsertRows'] = $_REQUEST['insert_rows']; - $scripts = PMA_Header::getInstance()->getScripts(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); + $scripts = $header->getScripts(); $scripts->addFile('tbl_change.js'); include 'tbl_change.php'; exit; diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 1933b88424..26bc8f19cd 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -226,7 +226,8 @@ class PMA_Export_Relation_Schema { global $db; - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); echo "<p><strong>" . __("SCHEMA ERROR: ") . $type . "</strong></p>" . "\n"; if (!empty($error_message)) { $error_message = htmlspecialchars($error_message); diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 50e2143d1a..e64e769611 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -30,7 +30,8 @@ $err_url = 'main.php' . $url_query; /** * Displays headers */ -PMA_Header::getInstance()->display(); +$response = PMA_Response::getInstance(); +$response->getHeader()->display(); /** * @global boolean Checks for superuser privileges diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php index 398050a164..54586fd560 100644 --- a/libraries/tbl_common.inc.php +++ b/libraries/tbl_common.inc.php @@ -48,7 +48,8 @@ require_once './libraries/db_table_exists.lib.php'; /** * Displays headers */ -PMA_Header::getInstance()->display(); +$response = PMA_Response::getInstance(); +$response->getHeader()->display(); if (PMA_Tracker::isActive() && PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"]) @@ -26,7 +26,8 @@ if ($GLOBALS['PMA_Config']->isGitRevision()) { $GLOBALS['db'] = ''; $GLOBALS['table'] = ''; $show_query = '1'; -PMA_Header::getInstance()->display(); +$response = PMA_Response::getInstance(); +$response->getHeader()->display(); // Any message to display? if (! empty($message)) { diff --git a/navigation.php b/navigation.php index 6149a21b37..2e752fea4c 100644 --- a/navigation.php +++ b/navigation.php @@ -83,7 +83,8 @@ $db_start = $GLOBALS['db']; */ $cfgRelation = PMA_getRelationsParam(); -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->disableMenu(); $header->setBodyId('body_leftFrame'); $scripts = $header->getScripts(); diff --git a/pmd_general.php b/pmd_general.php index 7824e62681..1d3bc42c36 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -39,8 +39,8 @@ if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; } - -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->setBodyId('pmd_body'); $scripts = $header->getScripts(); $scripts->addFile('pmd/ajax.js'); diff --git a/pmd_pdf.php b/pmd_pdf.php index 79186aa450..1f8c5910d1 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -77,7 +77,8 @@ if (isset($mode)) { } } -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->disableMenu(); $header->display(); diff --git a/prefs_forms.php b/prefs_forms.php index 6871afccf9..5b7c435667 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -69,9 +69,12 @@ if ($form_display->process(false) && !$form_display->hasErrors()) { } // display forms -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('config.js'); -PMA_Header::getInstance()->display(); +$header->display(); + require 'libraries/user_preferences.inc.php'; if ($error) { $error->display(); diff --git a/prefs_manage.php b/prefs_manage.php index 096ca5dee3..94977aa6de 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -109,7 +109,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == } if (!$all_ok) { // mimic original form and post json in a hidden field - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); include 'libraries/user_preferences.inc.php'; $msg = PMA_Message::error(__('Configuration contains incorrect data for some fields.')); $msg->display(); @@ -216,9 +217,11 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == exit; } -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('config.js'); -PMA_Header::getInstance()->display(); +$header->display(); require 'libraries/user_preferences.inc.php'; if ($error) { if (!$error instanceof PMA_Message) { diff --git a/querywindow.php b/querywindow.php index c3683d78dc..da9e34fd1a 100644 --- a/querywindow.php +++ b/querywindow.php @@ -118,7 +118,8 @@ $sql_query = ''; /** * prepare JavaScript functionality */ -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->disableMenu(); $header->setBodyId('bodyquerywindow'); $scripts = $header->getScripts(); diff --git a/server_databases.php b/server_databases.php index 9fb4974041..cacf35c9be 100644 --- a/server_databases.php +++ b/server_databases.php @@ -9,8 +9,9 @@ * Does the common work */ require_once 'libraries/common.inc.php'; - -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_databases.js'); require 'libraries/server_common.inc.php'; diff --git a/server_export.php b/server_export.php index 5dc8f7f023..910d574730 100644 --- a/server_export.php +++ b/server_export.php @@ -10,7 +10,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('export.js'); require 'libraries/server_common.inc.php'; diff --git a/server_import.php b/server_import.php index 3ba59c8c36..13c93df45b 100644 --- a/server_import.php +++ b/server_import.php @@ -10,7 +10,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('import.js'); /** diff --git a/server_plugins.php b/server_plugins.php index 09f3004fbe..16fb6d5799 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -13,7 +13,9 @@ require_once 'libraries/common.inc.php'; /** * JS includes */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('jquery/jquery.cookie.js'); $scripts->addFile('jquery/jquery.tablesorter.js'); $scripts->addFile('server_plugins.js'); diff --git a/server_privileges.php b/server_privileges.php index a73dc6c0de..673d3fd47c 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -13,7 +13,9 @@ require_once 'libraries/common.inc.php'; /** * Does the common work */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); $_add_user_error = false; diff --git a/server_replication.php b/server_replication.php index 13447f8e74..bdace06135 100644 --- a/server_replication.php +++ b/server_replication.php @@ -13,7 +13,9 @@ require_once 'libraries/common.inc.php'; /** * Does the common work */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); $scripts->addFile('replication.js'); diff --git a/server_sql.php b/server_sql.php index e750054e06..fbaf554556 100644 --- a/server_sql.php +++ b/server_sql.php @@ -13,7 +13,9 @@ require_once 'libraries/common.inc.php'; /** * Does the common work */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); diff --git a/server_status.php b/server_status.php index 5618acea57..737b861178 100644 --- a/server_status.php +++ b/server_status.php @@ -10,7 +10,7 @@ require_once 'libraries/common.inc.php'; if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { - PMA_Header::getInstance()->isHeaderSent = true; + PMA_Header::$headerIsSent = true; } /** @@ -429,8 +429,9 @@ if (PMA_DRIZZLE) { /** * JS Includes */ - -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_status.js'); $scripts->addFile('jquery/jquery.tablesorter.js'); diff --git a/server_synchronize.php b/server_synchronize.php index 11ede98a81..cceb1ec2d1 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -14,7 +14,9 @@ require_once 'libraries/common.inc.php'; /** * Does the common work */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_synchronize.js'); require_once 'libraries/server_common.inc.php'; diff --git a/server_variables.php b/server_variables.php index 1ff766e6c3..41f01b62fb 100644 --- a/server_variables.php +++ b/server_variables.php @@ -7,7 +7,9 @@ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_variables.js'); PMA_addJSVar('pma_token', $_SESSION[' PMA_token ']); diff --git a/setup/index.php b/setup/index.php index 31805d0c16..e15cd1dd83 100644 --- a/setup/index.php +++ b/setup/index.php @@ -27,7 +27,8 @@ $action_done = filter_input(INPUT_GET, 'action_done'); $action_done = preg_replace('/[^a-z_]/', '', $action_done); // send no-cache headers -PMA_Header::getInstance()->sendHttpHeaders(); +$response = PMA_Response::getInstance(); +$response->getHeader()->sendHttpHeaders(); ?> <!DOCTYPE HTML> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -15,7 +15,9 @@ require_once 'libraries/Header.class.php'; require_once 'libraries/check_user_privileges.lib.php'; require_once 'libraries/bookmark.lib.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('jquery/timepicker.js'); $scripts->addFile('tbl_change.js'); // the next one needed because sql.php may do a "goto" to tbl_structure.php @@ -57,7 +59,9 @@ if (isset($_REQUEST['printview'])) { } if (isset($_SESSION['profiling'])) { - $scripts = PMA_Header::getInstance()->getScripts(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); + $scripts = $header->getScripts(); /* < IE 9 doesn't support canvas natively */ if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { $scripts->addFile('canvg/flashcanvas.js'); @@ -287,7 +291,8 @@ if (! defined('PMA_CHK_DROP') && $is_drop_database && ! $is_superuser ) { - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); PMA_mysqlDie(__('"DROP DATABASE" statements are disabled.'), '', '', $err_url); } // end if @@ -383,7 +388,8 @@ if (! $cfg['Confirm'] if ($do_confirm) { $stripped_sql_query = $sql_query; - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); if ($is_drop_database) { echo '<h1 class="error">' . __( 'You are about to DESTROY a complete database!' @@ -871,7 +877,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { } if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) { - $scripts = PMA_Header::getInstance()->getScripts(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); + $scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); @@ -907,7 +915,8 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { if (isset($printview) && $printview == '1') { PMA_checkParameters(array('db', 'full_sql_query')); - $header = PMA_Header::getInstance(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); $header->enablePrintView(); $header->display(); @@ -939,7 +948,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { echo "</p>"; } else { - $scripts = PMA_Header::getInstance()->getScripts(); + $response = PMA_Response::getInstance(); + $header = $response->getHeader(); + $scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); @@ -957,7 +968,8 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { include 'libraries/server_common.inc.php'; } } else { - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); //we don't need to buffer the output in PMA_getMessage here. //set a global variable and check against it in the function $GLOBALS['buffer_message'] = false; diff --git a/tbl_addfield.php b/tbl_addfield.php index 959fd91055..74664c55ec 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -10,7 +10,8 @@ */ require_once 'libraries/common.inc.php'; -PMA_Header::getInstance()->display(); +$response = PMA_Response::getInstance(); +$response->getHeader()->display(); // Check parameters PMA_checkParameters(array('db', 'table')); diff --git a/tbl_change.php b/tbl_change.php index f4246ccc97..ea89f7b500 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -109,7 +109,9 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) { /** * Load JavaScript files */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('functions.js'); $scripts->addFile('tbl_change.js'); $scripts->addFile('jquery/timepicker.js'); @@ -118,7 +120,7 @@ $scripts->addFile('gis_data_editor.js'); /** * HTTP and HTML headers */ -PMA_Header::getInstance()->display(); +$header->display(); /** * Displays the query submitted and its result diff --git a/tbl_chart.php b/tbl_chart.php index 368e4a2ba2..ce35a8ce18 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -11,7 +11,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('tbl_chart.js'); $scripts->addFile('highcharts/highcharts.js'); /* Files required for chart exporting */ diff --git a/tbl_create.php b/tbl_create.php index ed3369848d..6051751c4e 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -11,7 +11,8 @@ require_once 'libraries/common.inc.php'; $action = 'tbl_create.php'; -PMA_Header::getInstance()->display(); +$response = PMA_Response::getInstance(); +$response->getHeader()->display(); $titles = PMA_buildActionTitles(); diff --git a/tbl_export.php b/tbl_export.php index d25bd5d0e2..7d261f8d39 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -10,7 +10,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('export.js'); /** diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 6c11359680..98baeaf8ee 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -8,7 +8,9 @@ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('openlayers/OpenLayers.js'); $scripts->addFile('jquery/jquery.svg.js'); $scripts->addFile('jquery/jquery.mousewheel.js'); diff --git a/tbl_import.php b/tbl_import.php index 31fa9fcae5..fb864b2fe1 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -10,7 +10,9 @@ */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('import.js'); /** diff --git a/tbl_indexes.php b/tbl_indexes.php index 08f474cbc2..2eca4f94e9 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -129,7 +129,9 @@ if (isset($_REQUEST['do_save_data'])) { */ // Displays headers (if needed) -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('indexes.js'); require_once 'libraries/tbl_info.inc.php'; diff --git a/tbl_printview.php b/tbl_printview.php index 48e1b9731a..4da57090aa 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -11,7 +11,8 @@ */ require_once 'libraries/common.inc.php'; -PMA_Header::getInstance()->enablePrintView(); +$response = PMA_Response::getInstance(); +$response->getHeader()->enablePrintView(); require 'libraries/tbl_common.inc.php'; diff --git a/tbl_relation.php b/tbl_relation.php index 657001b767..cbe36ceee6 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -17,7 +17,9 @@ * Gets some core libraries */ require_once 'libraries/common.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('tbl_relation.js'); require_once 'libraries/tbl_common.inc.php'; diff --git a/tbl_replace.php b/tbl_replace.php index 04753f2a03..23bfa9b4c0 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -31,7 +31,9 @@ PMA_DBI_select_db($GLOBALS['db']); */ $goto_include = false; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); // Needed for generation of Inline Edit anchors $scripts->addFile('sql.js'); diff --git a/tbl_select.php b/tbl_select.php index 3323d0b8e9..81762f60cf 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -16,7 +16,9 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/mysql_charsets.lib.php'; require_once 'libraries/tbl_select.lib.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); $scripts->addFile('tbl_select.js'); diff --git a/tbl_sql.php b/tbl_sql.php index e2841a4cbb..3ec346bb7f 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -13,7 +13,9 @@ require_once 'libraries/common.inc.php'; /** * Runs common work */ -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); diff --git a/tbl_structure.php b/tbl_structure.php index 9068c18622..2bf35b1906 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -12,7 +12,9 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/mysql_charsets.lib.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('tbl_structure.js'); $scripts->addFile('indexes.js'); diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 0f553b8364..317fe0192f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -17,7 +17,9 @@ require_once './libraries/tbl_select.lib.php'; require_once './libraries/relation.lib.php'; require_once './libraries/tbl_info.inc.php'; -$scripts = PMA_Header::getInstance()->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); $scripts->addFile('date.js'); diff --git a/themes.php b/themes.php index eb587beceb..f5723f3833 100644 --- a/themes.php +++ b/themes.php @@ -9,8 +9,8 @@ * get some globals */ require './libraries/common.inc.php'; - -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->setBodyId('bodythemes'); $header->setTitle('phpMyAdmin - ' . __('Theme')); $header->disableMenu(); diff --git a/transformation_overview.php b/transformation_overview.php index cc5c513ef5..cfe0d809b2 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -11,7 +11,8 @@ require_once './libraries/common.inc.php'; require_once './libraries/transformations.lib.php'; -$header = PMA_Header::getInstance(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); $header->disableMenu(); $header->display(); diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 317ff3875b..ab1625c234 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -85,7 +85,8 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) { } // Only output the http headers -PMA_Header::getInstance()->sendHttpHeaders(); +$response = PMA_Response::getInstance(); +$response->getHeader()->sendHttpHeaders(); // [MIME] if (isset($ct) && !empty($ct)) { diff --git a/user_password.php b/user_password.php index d28550bb93..2be7b839c6 100644 --- a/user_password.php +++ b/user_password.php @@ -12,8 +12,9 @@ */ require_once './libraries/common.inc.php'; -$header = PMA_Header::getInstance(); -$scripts = $header->getScripts(); +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); /** @@ -204,7 +205,8 @@ function PMA_changePassAuthType($_url_params, $password) */ function PMA_changePassDisplayPage($message, $sql_query, $_url_params) { - PMA_Header::getInstance()->display(); + $response = PMA_Response::getInstance(); + $response->getHeader()->display(); echo '<h1>' . __('Change password') . '</h1>' . "\n\n"; echo PMA_getMessage($message, $sql_query, 'success'); echo '<a href="index.php'.PMA_generate_common_url($_url_params).' target="_parent">'. "\n" |