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

Reenable bookmarking code.

Browse Source 
Just disable it for webkit based browsers, because they do not allow to
update any part of location without reload.

bug#2937481
This commit is contained in:
Michal Čihař
2010-01-25 11:50:48 +00:00
parent df1671d1c4
commit ecc4913a8c
5 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ if (function_exists('mcrypt_encrypt')) {
if (empty($_COOKIE['pma_mcrypt_iv'])
|| false === ($iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true))) {
srand((double) microtime() * 1000000);
$td = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, '');
$td = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, '');
if ($td === false) {
trigger_error(PMA_sanitize(sprintf($strCantLoad, 'mcrypt')), E_USER_WARNING);
}
@@ -95,7 +95,7 @@ if (function_exists('mcrypt_encrypt')) {
function PMA_get_blowfish_secret() {
if (empty($GLOBALS['cfg']['blowfish_secret'])) {
if (empty($_SESSION['auto_blowfish_secret'])) {
// this returns 23 characters
// this returns 23 characters
$_SESSION['auto_blowfish_secret'] = uniqid('', true);
}
return $_SESSION['auto_blowfish_secret'];
@@ -186,17 +186,14 @@ function PMA_auth()
$page_title = 'phpMyAdmin ';
require './libraries/header_meta_style.inc.php';
?>
<script src="./js/mootools.js" type="text/javascript"></script>
<script src="./js/helper.js" type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[
// show login form in top frame
if (top != self) {
window.top.location.href=location;
}
// Restore location from hash for bookmarks
if (parent.location.hash != '') {
parent.location = 'index.php?' + parent.location.hash.substring(1);
}
//]]>
</script>
</head>