diff options
| author | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-03-14 03:40:47 +0000 |
|---|---|---|
| committer | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-03-14 03:40:47 +0000 |
| commit | 9a872491dd3d5846b772bdf2dc93873b7e8a688a (patch) | |
| tree | 6aa083a3b085aac82d55120e84e7bb2e0000eb71 /lib/init.php | |
| parent | 1b57e267e030c5463baab4136be66232a123d3a5 (diff) | |
| download | ampache-9a872491dd3d5846b772bdf2dc93873b7e8a688a.tar.gz ampache-9a872491dd3d5846b772bdf2dc93873b7e8a688a.tar.bz2 ampache-9a872491dd3d5846b772bdf2dc93873b7e8a688a.zip | |
Unbreak http auth, make it more sane. Old broken method renamed to null, in
case crazy people still want it. Add support for redirecting to a SSO
provider after logout.
Diffstat (limited to 'lib/init.php')
| -rw-r--r-- | lib/init.php | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/lib/init.php b/lib/init.php index 3405a754..9adc0e86 100644 --- a/lib/init.php +++ b/lib/init.php @@ -1,4 +1,5 @@ <?php +/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ /* Copyright (c) Ampache.org @@ -179,24 +180,6 @@ set_memory_limit($results['memory_limit']); /**** END Set PHP Vars ****/ -/* We have to check for HTTP Auth, only run this if we don't have an ampache session cookie */ -$session_name = Config::get('session_name'); -if (in_array("http",$results['auth_methods']) AND empty($_COOKIE[$session_name])) { - - $username = scrub_in($_SERVER['PHP_AUTH_USER']); - $results = vauth::http_auth($username); - - // We've found someone or were able to create them, go ahead and generate the session - if ($results['success']) { - vauth::create_cookie(); - vauth::session_create($results); - $session_name = Config::get('session_name'); - $_SESSION['userdata'] = $results; - $_COOKIE[$session_name] = session_id(); - } - -} // end if http auth - // If we want a session if (NO_SESSION != '1' AND Config::get('use_auth')) { /* Verify Their session */ |