diff --git a/ChangeLog b/ChangeLog index bc4464439..131ee7740 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL$ - bug #1615530 [upload] added more specific error message if field upload fails - bug #1627210, #1083301, #1482401 [data] warning on duplicate indexes - bug #1679055 #1050 - Table '' already exists +- bug #1668724 JavaScript focus login Opera - [gui] avoid displaying a wide selector in server selection + [core] added PMA_fatalError() and made use of it . [i18n] use generic $strOptions diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 88788ee77..d4d5baf14 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -1,14 +1,17 @@ and | -// | Dan Wilson who built this patch for the Debian package. | -// +--------------------------------------------------------------------------+ - +/* vim: expandtab sw=4 ts=4 sts=4: */ +/** + * Set of functions used to run cookie based authentication. + * Thanks to Piotr Roszatycki and + * Dan Wilson who built this patch for the Debian package. + * + * @version $Id$ + */ +/** + * @todo replace by constant + * $coming_from_common can be set from outside with register_globals on + */ if (!isset($coming_from_common)) { exit; } @@ -23,7 +26,7 @@ if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) { } else { require_once './libraries/blowfish.php'; // for main.php: - define('PMA_WARN_FOR_MCRYPT',1); + define('PMA_WARN_FOR_MCRYPT', 1); } @@ -96,7 +99,7 @@ function PMA_auth() $page_title = 'phpMyAdmin ' . PMA_VERSION; require './libraries/header_meta_style.inc.php'; ?> - - - - + - $current) { - if ($current['host'] == $cfg['Server']['host'] - && $current['port'] == $cfg['Server']['port'] - && $current['socket'] == $cfg['Server']['socket'] - && $current['ssl'] == $cfg['Server']['ssl'] - && $current['connect_type'] == $cfg['Server']['connect_type'] + if ($current['host'] == $cfg['Server']['host'] + && $current['port'] == $cfg['Server']['port'] + && $current['socket'] == $cfg['Server']['socket'] + && $current['ssl'] == $cfg['Server']['ssl'] + && $current['connect_type'] == $cfg['Server']['connect_type'] && $current['user'] == $PHP_AUTH_USER) { $server = $idx; $cfg['Server'] = $current;