get rid of propicon

This commit is contained in:
Marc Delisle
2007-02-10 15:58:46 +00:00
parent f0ba262783
commit 42ac66ad74
163 changed files with 9459 additions and 3448 deletions

View File

@@ -20,7 +20,7 @@
*/
function PMA_auth() {
if (empty($GLOBALS['cfg']['Server']['SignonURL'])) {
PMA_sendHeaderLocation('error.php?error=' . urlencode('You must set SignonURL!'));
PMA_fatalError('You must set SignonURL!');
} elseif (!empty($_REQUEST['old_usr']) && !empty($GLOBALS['cfg']['Server']['LogoutURL'])) {
/* Perform logout to custom URL */
PMA_sendHeaderLocation($GLOBALS['cfg']['Server']['LogoutURL']);
@@ -53,7 +53,7 @@ function PMA_auth() {
function PMA_auth_check()
{
global $PHP_AUTH_USER, $PHP_AUTH_PW;
/* Session name */
$session_name = $GLOBALS['cfg']['Server']['SignonSession'];
@@ -68,7 +68,7 @@ function PMA_auth_check()
session_write_close();
/* Load single signon session */
session_name($session_name);
session_name($session_name);
session_id($_COOKIE[$session_name]);
session_start();
@@ -104,7 +104,7 @@ function PMA_auth_check()
session_start();
/* Restore our token */
if (!empty($pma_token)) {
if (!empty($pma_token)) {
$_SESSION[' PMA_token '] = $pma_token;
}
}
@@ -154,8 +154,7 @@ function PMA_auth_fails()
{
$error = PMA_DBI_getError();
if ($error && $GLOBALS['errno'] != 1045) {
PMA_sendHeaderLocation('error.php?error=' . urlencode($error));
exit;
PMA_fatalError($error);
} else {
PMA_auth();
return true;