diff options
| author | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2007-03-16 19:55:45 +0300 |
|---|---|---|
| committer | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2007-03-16 19:55:45 +0300 |
| commit | c29b8627f9b02d871e785a2b955267a22abf6eda (patch) | |
| tree | b9e6c952adef6de2954ec983976e2ef68046f54d /user_password.php | |
| parent | 3707f0d8e60ba2e80b3f97eda8842aa25db6dc2f (diff) | |
hopefully cookie login is now working again as expected ...
Diffstat (limited to 'user_password.php')
| -rw-r--r-- | user_password.php | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/user_password.php b/user_password.php index c5feacd764..d3ef11629c 100644 --- a/user_password.php +++ b/user_password.php @@ -46,8 +46,8 @@ if (isset($nopass)) { $common_url_query = PMA_generate_common_url(); $err_url = 'user_password.php?' . $common_url_query; - $hashing_function = (PMA_MYSQL_INT_VERSION >= 40102 && !empty($pw_hash) && $pw_hash == 'old' ? 'OLD_' : '') - . 'PASSWORD'; + $hashing_function = (PMA_MYSQL_INT_VERSION >= 40102 && !empty($pw_hash) && $pw_hash == 'old' ? 'OLD_' : '') + . 'PASSWORD'; $sql_query = 'SET password = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')'); $local_query = 'SET password = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddslashes($pma_pw) . '\')'); @@ -57,7 +57,7 @@ if (isset($nopass)) { // Duration = till the browser is closed for password (we don't want this to be saved) if ($cfg['Server']['auth_type'] == 'cookie') { - PMA_setCookie('pma_cookie_password-' . $server, PMA_blowfish_encrypt($pma_pw, $GLOBALS['cfg']['blowfish_secret'] . $GLOBALS['current_time'])); + PMA_setCookie('pmaPass-' . $server, PMA_blowfish_encrypt($pma_pw, $GLOBALS['cfg']['blowfish_secret'] . $GLOBALS['current_time'])); } // end if // For http auth. mode, the "back" link will also enforce new @@ -129,23 +129,23 @@ if (PMA_MYSQL_INT_VERSION >= 40102) { ?> <tr> <td> - <?php echo $strPasswordHashing; ?>: - </td> - <td> - <input type="radio" name="pw_hash" id="radio_pw_hash_new" value="new" checked="checked" /> - <label for="radio_pw_hash_new"> - MySQL 4.1 - </label> - </td> + <?php echo $strPasswordHashing; ?>: + </td> + <td> + <input type="radio" name="pw_hash" id="radio_pw_hash_new" value="new" checked="checked" /> + <label for="radio_pw_hash_new"> + MySQL 4.1 + </label> + </td> </tr> <tr> <td> </td> - <td> - <input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" /> - <label for="radio_pw_hash_old"> - <?php echo $strCompatibleHashing; ?> - </label> - </td> + <td> + <input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" /> + <label for="radio_pw_hash_old"> + <?php echo $strCompatibleHashing; ?> + </label> + </td> </tr> <?php } |