mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move login handling to OC class

This commit is contained in:
Bart Visscher 2012-08-10 12:17:13 +02:00
parent 1823dafe44
commit 5e7086adc9
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
index.php
View File

@ -21,26 +21,8 @@
* *
*/ */
$RUNTIME_NOAPPS = TRUE; //no apps, yet $RUNTIME_NOAPPS = TRUE; //no apps, yet
require_once('lib/base.php'); require_once('lib/base.php');
if (!OC::handleRequest()) { OC::handleRequest();
// Not handled -> we display the login page:
OC_App::loadApps(array('prelogin'));
$error = false;
// remember was checked after last login
if (OC::tryRememberLogin()) {
// nothing more to do
// Someone wants to log in :
} elseif (OC::tryFormLogin()) {
$error = true;
// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
} elseif(OC::tryBasicAuthLogin()) {
$error = true;
}
OC_Util::displayLoginPage($error);
}

37
lib/base.php
View File

@ -389,18 +389,18 @@ class OC{
} }
/** /**
* @brief Try to handle request * @brief Handle the request
* @return true when the request is handled here
*/ */
public static function handleRequest() { public static function handleRequest() {
// Handle WebDAV // Handle WebDAV
if($_SERVER['REQUEST_METHOD']=='PROPFIND'){ if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
header('location: '.OC_Helper::linkToRemote('webdav')); header('location: '.OC_Helper::linkToRemote('webdav'));
return true; return;
} }
// Handle app css files
if(substr(OC::$REQUESTEDFILE,-3) == 'css') { if(substr(OC::$REQUESTEDFILE,-3) == 'css') {
self::loadCSSFile(); self::loadCSSFile();
return true; return;
} }
// Someone is logged in : // Someone is logged in :
if(OC_User::isLoggedIn()) { if(OC_User::isLoggedIn()) {
@ -415,9 +415,10 @@ class OC{
self::loadfile(); self::loadfile();
} }
} }
return true; return;
} }
return false; // Not handled and not logged in
self::handleLogin();
} }
protected static function loadapp() { protected static function loadapp() {
@ -461,7 +462,25 @@ class OC{
} }
} }
public static function tryRememberLogin() { protected static function handleLogin() {
OC_App::loadApps(array('prelogin'));
$error = false;
// remember was checked after last login
if (OC::tryRememberLogin()) {
// nothing more to do
// Someone wants to log in :
} elseif (OC::tryFormLogin()) {
$error = true;
// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
} elseif (OC::tryBasicAuthLogin()) {
$error = true;
}
OC_Util::displayLoginPage($error);
}
protected static function tryRememberLogin() {
if(!isset($_COOKIE["oc_remember_login"]) if(!isset($_COOKIE["oc_remember_login"])
|| !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_token"])
|| !isset($_COOKIE["oc_username"]) || !isset($_COOKIE["oc_username"])
@ -484,7 +503,7 @@ class OC{
return true; return true;
} }
public static function tryFormLogin() { protected static function tryFormLogin() {
if(!isset($_POST["user"]) if(!isset($_POST["user"])
|| !isset($_POST['password']) || !isset($_POST['password'])
|| !isset($_SESSION['sectoken']) || !isset($_SESSION['sectoken'])
@ -510,7 +529,7 @@ class OC{
return true; return true;
} }
public static function tryBasicAuthLogin() { protected static function tryBasicAuthLogin() {
if (!isset($_SERVER["PHP_AUTH_USER"]) if (!isset($_SERVER["PHP_AUTH_USER"])
|| !isset($_SERVER["PHP_AUTH_PW"])){ || !isset($_SERVER["PHP_AUTH_PW"])){
return false; return false;