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

patch #1972915 version 3 + Luc modifs + Marc modifs (link in contrib/swekey.sample.conf

Browse Source
This commit is contained in:
Marc Delisle
2008-06-17 17:20:53 +00:00
parent d328affeef
commit fdff4d6b71
65 changed files with 758 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ if (! defined('PMA_COMING_FROM_COMMON')) {
exit;
}
require './libraries/auth/feebee/feebee.auth.lib.php';
require './libraries/auth/swekey/swekey.auth.lib.php';
if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
/**
@@ -219,10 +219,10 @@ if (top != self) {
exit;
}
// BEGIN Feebee Integration
$feebeeErr = Feebee_auth_error();
if ($feebeeErr != null) {
PMA_Message::error($feebeeErr)->display();
// BEGIN Swekey Integration
$swekeyErr = Swekey_auth_error();
if ($swekeyErr != null) {
PMA_Message::error($swekeyErr)->display();
if ($GLOBALS['error_handler']->hasDisplayErrors()) {
echo '<div>';
$GLOBALS['error_handler']->dispErrors();
@@ -242,7 +242,7 @@ if (top != self) {
}
else
$user_input_disabled = '';
// END Feebee Integration
// END Swekey Integration
?>
<br />
@@ -417,10 +417,10 @@ function PMA_auth_check()
return false;
}
// BEGIN Feebee Integration
if (! Feebee_auth_check())
// BEGIN Swekey Integration
if (! Swekey_auth_check())
return false;
// END Feebee Integration
// END Swekey Integration
if (defined('PMA_CLEAR_COOKIES')) {
foreach($GLOBALS['cfg']['Servers'] as $key => $val) {