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

Remember database when using cookie login (bug #1027873).

Browse Source
This commit is contained in:
Michal Čihař
2004-09-14 14:42:47 +00:00
parent 4e37b29113
commit a5d9f7d1d9
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ $Source$
* themes.php, libraries/common.lib.php, libraries/defines.lib.php, * themes.php, libraries/common.lib.php, libraries/defines.lib.php,
libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php, libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php,
themes/original/info.inc.php: Better theme version check (bug #1023029). themes/original/info.inc.php: Better theme version check (bug #1023029).
* libraries/auth/cookie.auth.lib.php: Remember database when using cookie
login (bug #1027873).
2004-09-13 Garvin Hicking <me@supergarv.de> 2004-09-13 Garvin Hicking <me@supergarv.de>
* browse_foreigners.php: bug #1027204 - paging did not * browse_foreigners.php: bug #1027204 - paging did not

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

@@ -422,6 +422,11 @@ if (top != self) {
?> ?>
<input type="hidden" name="lang" value="<?php echo $lang; ?>" /> <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
<input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" /> <input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
<?php
if (isset($GLOBALS['db'])) {
echo ' <input type="hidden" name="db" value="' . htmlspecialchars($GLOBALS['db']) . '" />' . "\n";
}
?>
<input type="submit" value="<?php echo $GLOBALS['strLogin']; ?>" id="buttonYes" /> <input type="submit" value="<?php echo $GLOBALS['strLogin']; ?>" id="buttonYes" />
</td> </td>
</tr> </tr>
@@ -529,7 +534,7 @@ function PMA_auth_check()
if ($decrypted_time < $GLOBALS['current_time'] - $GLOBALS['cfg']['LoginCookieValidity']) { if ($decrypted_time < $GLOBALS['current_time'] - $GLOBALS['cfg']['LoginCookieValidity']) {
return FALSE; return FALSE;
} }
// password // password
if (!empty($pma_cookie_password)) { if (!empty($pma_cookie_password)) {
$PHP_AUTH_PW = $pma_cookie_password; $PHP_AUTH_PW = $pma_cookie_password;
@@ -608,12 +613,12 @@ function PMA_auth_set_user()
// Name and password cookies needs to be refreshed each time // Name and password cookies needs to be refreshed each time
// Duration = one month for username // Duration = one month for username
setcookie('pma_cookie_username-' . $server, setcookie('pma_cookie_username-' . $server,
PMA_blowfish_encrypt($cfg['Server']['user'] . ':' . $GLOBALS['current_time'], PMA_blowfish_encrypt($cfg['Server']['user'] . ':' . $GLOBALS['current_time'],
$GLOBALS['cfg']['blowfish_secret']), $GLOBALS['cfg']['blowfish_secret']),
time() + (60 * 60 * 24 * 30), time() + (60 * 60 * 24 * 30),
$GLOBALS['cookie_path'], '', $GLOBALS['cookie_path'], '',
$GLOBALS['is_https']); $GLOBALS['is_https']);
// Duration = till the browser is closed for password (we don't want this to be saved) // Duration = till the browser is closed for password (we don't want this to be saved)
setcookie('pma_cookie_password-' . $server, setcookie('pma_cookie_password-' . $server,
PMA_blowfish_encrypt(!empty($cfg['Server']['password']) ? $cfg['Server']['password'] : "\xff(blank)", PMA_blowfish_encrypt(!empty($cfg['Server']['password']) ? $cfg['Server']['password'] : "\xff(blank)",