From 81cd3d35dca061e87e15cfb012ccc1dcd5e03dd2 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Thu, 24 Nov 2005 17:23:46 +0000 Subject: [PATCH] moved setting of cookies into index.php --- ChangeLog | 1 + index.php | 14 ++++++++++---- main.php | 5 +---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26b9b5017..bc0866b0e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ $Source$ * libraries/url_generating.lib.php: - dont add variables already in cookie (reduces html output up to 30%) - can pass all url variables as array to function + * main.php, index.php: moved setting of cookies into index.php 2005-11-23 Sebastian Mendel * *REVERTED* libraries/display_select_lang.lib.php: correct lang definition diff --git a/index.php b/index.php index c55367bc0..f40dd4057 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ // vim: expandtab sw=4 ts=4 sts=4: /** * forms frameset - * + * * @uses libraries/common.lib.php global fnctions * @uses libraries/select_theme.lib.php theme manager * @uses libraries/relation.lib.php table relations @@ -38,6 +38,12 @@ * Gets core libraries and defines some variables */ require_once('./libraries/common.lib.php'); + +setcookie('pma_lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https); +if (isset($convcharset)) { + setcookie('pma_charset', $convcharset, time() + 60*60*24*30, $cookie_path, '', $is_https); +} + /** * Includes the ThemeManager if it hasn't been included yet */ @@ -141,7 +147,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); // definitions used in querywindow.js var common_query = ''; var opendb_url = ''; - var safari_browser = ; + var safari_browser = ; var querywindow_height = ; var querywindow_width = ; var collation_connection = ''; @@ -157,10 +163,10 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); <body> diff --git a/main.php b/main.php index 375a100b9..7eb0e6ee3 100644 --- a/main.php +++ b/main.php @@ -11,10 +11,6 @@ define('PMA_DISPLAY_HEADING', 0); * Gets some core libraries and displays a top message if required */ require_once('./libraries/common.lib.php'); -setcookie('pma_lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https); -if (isset($convcharset)) { - setcookie('pma_charset', $convcharset, time() + 60*60*24*30, $cookie_path, '', $is_https); -} /** * Includes the ThemeManager @@ -64,6 +60,7 @@ if ( $server > 0 ) { } ?> + <div id="mysqlmaininformation"> <?php // robbat2: Use the verbose name of the server instead of the hostname