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

postpone Swekey integration

Browse Source
This commit is contained in:
Marc Delisle
2008-09-07 11:43:11 +00:00
parent 1f385a92b1
commit b189b35c4c
64 changed files with 1 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,6 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require './libraries/auth/swekey/swekey.auth.lib.php';
if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
/**
* Uses faster mcrypt library if available
@@ -218,32 +216,6 @@ if (top != self) {
echo '</body></html>';
exit;
}
// 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();
echo '</div>';
}
echo '</div>' . "\n";
if (file_exists('./config.footer.inc.php')) {
require './config.footer.inc.php';
}
echo '</body></html>';
exit;
}
if (isset($_SESSION['PHP_AUTH_FORCE_USER'])) {
$default_user = $_SESSION['PHP_AUTH_FORCE_USER'];
$user_input_disabled = 'readonly="readonly"';
}
else
$user_input_disabled = '';
// END Swekey Integration
?>
<br />
<!-- Login form -->
@@ -265,7 +237,7 @@ if (top != self) {
<?php } ?>
<div class="item">
<label for="input_username"><?php echo $GLOBALS['strLogUsername']; ?></label>
<input type="text" name="pma_username" id="input_username" value="<?php echo htmlspecialchars($default_user); ?>" size="24" class="textfield" <?php echo $user_input_disabled; ?>/>
<input type="text" name="pma_username" id="input_username" value="<?php echo htmlspecialchars($default_user); ?>" size="24" class="textfield" />
</div>
<div class="item">
<label for="input_password"><?php echo $GLOBALS['strLogPassword']; ?></label>
@@ -411,11 +383,6 @@ function PMA_auth_check()
return false;
}
// BEGIN Swekey Integration
if (! Swekey_auth_check())
return false;
// END Swekey Integration
if (defined('PMA_CLEAR_COOKIES')) {
foreach($GLOBALS['cfg']['Servers'] as $key => $val) {
PMA_removeCookie('pmaPass-' . $key);