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

cleanup

Browse Source
This commit is contained in:
Sebastian Mendel
2007-10-18 12:10:22 +00:00
parent 2f476bf502
commit 62ee5d8491
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/auth/cookie.auth.lib.php
View File

@@ -88,8 +88,6 @@ if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
* @uses $GLOBALS['target'] * @uses $GLOBALS['target']
* @uses $GLOBALS['db'] * @uses $GLOBALS['db']
* @uses $GLOBALS['table'] * @uses $GLOBALS['table']
* @uses $GLOBALS['convcharset']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['strWelcome'] * @uses $GLOBALS['strWelcome']
* @uses $GLOBALS['strSecretRequired'] * @uses $GLOBALS['strSecretRequired']
* @uses $GLOBALS['strError'] * @uses $GLOBALS['strError']
@@ -275,18 +273,18 @@ if (top != self) {
</fieldset> </fieldset>
<fieldset class="tblFooters"> <fieldset class="tblFooters">
<input value="<?php echo $GLOBALS['strGo']; ?>" type="submit" /> <input value="<?php echo $GLOBALS['strGo']; ?>" type="submit" />
<input type="hidden" name="lang" value="<?php echo $GLOBALS['lang']; ?>" />
<input type="hidden" name="convcharset" value="<?php echo $GLOBALS['convcharset']; ?>" />
<?php <?php
$_form_params = array();
if (! empty($GLOBALS['target'])) { if (! empty($GLOBALS['target'])) {
echo ' <input type="hidden" name="target" value="' . htmlspecialchars($GLOBALS['target']) . '" />' . "\n"; $_form_params['target'] = $GLOBALS['target'];
} }
if (! empty($GLOBALS['db'])) { if (! empty($GLOBALS['db'])) {
echo ' <input type="hidden" name="db" value="' . htmlspecialchars($GLOBALS['db']) . '" />' . "\n"; $_form_params['db'] = $GLOBALS['db'];
} }
if (! empty($GLOBALS['table'])) { if (! empty($GLOBALS['table'])) {
echo ' <input type="hidden" name="table" value="' . htmlspecialchars($GLOBALS['table']) . '" />' . "\n"; $_form_params['table'] = $GLOBALS['table'];
} }
echo PMA_generate_common_hidden_inputs();
?> ?>
</fieldset> </fieldset>
</form> </form>
@@ -573,10 +571,6 @@ function PMA_auth_set_user()
if (strlen($GLOBALS['table'])) { if (strlen($GLOBALS['table'])) {
$url_params['table'] = $GLOBALS['table']; $url_params['table'] = $GLOBALS['table'];
} }
// Language change from the login panel needs to be remembered
if (! empty($GLOBALS['lang'])) {
$url_params['lang'] = $GLOBALS['lang'];
}
// any target to pass? // any target to pass?
if (! empty($GLOBALS['target']) && $GLOBALS['target'] != 'index.php') { if (! empty($GLOBALS['target']) && $GLOBALS['target'] != 'index.php') {
$url_params['target'] = $GLOBALS['target']; $url_params['target'] = $GLOBALS['target'];