nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more documentation fixes

Browse Source
This commit is contained in:
Sebastian Mendel
2006-09-21 14:56:52 +00:00
parent 8a5630b5d0
commit 99bbc02686
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/common.lib.php
View File

@@ -2617,13 +2617,13 @@ if (! PMA_checkPageValidity($__redirect, $goto_whitelist)) {
* holds page that should be displayed * holds page that should be displayed
* @global string $GLOBALS['goto'] * @global string $GLOBALS['goto']
*/ */
$GLOBALS['goto'] = '';
// Security fix: disallow accessing serious server files via "?goto=" // Security fix: disallow accessing serious server files via "?goto="
if (PMA_checkPageValidity($_REQUEST['goto'], $goto_whitelist)) { if (PMA_checkPageValidity($_REQUEST['goto'], $goto_whitelist)) {
$GLOBALS['goto'] = $_REQUEST['goto']; $GLOBALS['goto'] = $_REQUEST['goto'];
$GLOBALS['url_params']['goto'] = $_REQUEST['goto']; $GLOBALS['url_params']['goto'] = $_REQUEST['goto'];
} else { } else {
unset($_REQUEST['goto'], $_GET['goto'], $_POST['goto'], $_COOKIE['goto']); unset($_REQUEST['goto'], $_GET['goto'], $_POST['goto'], $_COOKIE['goto']);
$GLOBALS['goto'] = '';
} }
/** /**
@@ -2683,26 +2683,24 @@ if (isset($_REQUEST['convcharset'])) {
* current selected database * current selected database
* @global string $GLOBALS['db'] * @global string $GLOBALS['db']
*/ */
$GLOBALS['db'] = '';
if (isset($_REQUEST['db'])) { if (isset($_REQUEST['db'])) {
// can we strip tags from this? // can we strip tags from this?
// only \ and / is not allowed in db names for MySQL // only \ and / is not allowed in db names for MySQL
$GLOBALS['db'] = $_REQUEST['db']; $GLOBALS['db'] = $_REQUEST['db'];
$GLOBALS['url_params']['db'] = $GLOBALS['db']; $GLOBALS['url_params']['db'] = $GLOBALS['db'];
} else {
$GLOBALS['db'] = '';
} }
/** /**
* current selected table * current selected table
* @global string $GLOBALS['table'] * @global string $GLOBALS['table']
*/ */
$GLOBALS['table'] = '';
if (isset($_REQUEST['table'])) { if (isset($_REQUEST['table'])) {
// can we strip tags from this? // can we strip tags from this?
// only \ and / is not allowed in table names for MySQL // only \ and / is not allowed in table names for MySQL
$GLOBALS['table'] = $_REQUEST['table']; $GLOBALS['table'] = $_REQUEST['table'];
$GLOBALS['url_params']['table'] = $GLOBALS['table']; $GLOBALS['url_params']['table'] = $GLOBALS['table'];
} else {
$GLOBALS['table'] = '';
} }
/** /**
@@ -2740,6 +2738,9 @@ if (empty($_SESSION['PMA_Config'])) {
exit(); exit();
} }
/**
* @global PMA_Config $_SESSION['PMA_Config']
*/
$_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php'); $_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php');
} elseif (version_compare(phpversion(), '5', 'lt')) { } elseif (version_compare(phpversion(), '5', 'lt')) {
@@ -2811,6 +2812,12 @@ if ($_SESSION['PMA_Config']->error_pma_uri) {
$GLOBALS['PMA_errors'][] = sprintf($strPmaUriError); $GLOBALS['PMA_errors'][] = sprintf($strPmaUriError);
} }
/**
* current server
* @global integer $GLOBALS['server']
*/
$GLOBALS['server'] = 0;
/** /**
* Servers array fixups. * Servers array fixups.
* $default_server comes from PMA_Config::enableBc() * $default_server comes from PMA_Config::enableBc()
@@ -2860,6 +2867,9 @@ unset($default_server);
/******************************************************************************/ /******************************************************************************/
/* setup themes LABEL_theme_setup */ /* setup themes LABEL_theme_setup */
/**
* @global PMA_Theme_Manager $_SESSION['PMA_Theme_Manager']
*/
if (! isset($_SESSION['PMA_Theme_Manager'])) { if (! isset($_SESSION['PMA_Theme_Manager'])) {
$_SESSION['PMA_Theme_Manager'] = new PMA_Theme_Manager; $_SESSION['PMA_Theme_Manager'] = new PMA_Theme_Manager;
} else { } else {
@@ -2887,11 +2897,27 @@ if (isset($_REQUEST['set_theme'])) {
$_SESSION['PMA_Theme_Manager']->setActiveTheme($_REQUEST['set_theme']); $_SESSION['PMA_Theme_Manager']->setActiveTheme($_REQUEST['set_theme']);
} }
/**
* the theme object
* @global PMA_Theme $_SESSION['PMA_Theme']
*/
$_SESSION['PMA_Theme'] = $_SESSION['PMA_Theme_Manager']->theme; $_SESSION['PMA_Theme'] = $_SESSION['PMA_Theme_Manager']->theme;
// BC // BC
/**
* the active theme
* @global string $GLOBALS['theme']
*/
$GLOBALS['theme'] = $_SESSION['PMA_Theme']->getName(); $GLOBALS['theme'] = $_SESSION['PMA_Theme']->getName();
/**
* the theme path
* @global string $GLOBALS['pmaThemePath']
*/
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath(); $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
/**
* the theme image path
* @global string $GLOBALS['pmaThemeImage']
*/
$GLOBALS['pmaThemeImage'] = $_SESSION['PMA_Theme']->getImgPath(); $GLOBALS['pmaThemeImage'] = $_SESSION['PMA_Theme']->getImgPath();
/** /**