diff options
| author | Bart Visscher <bart@thisnet.nl> | 2011-09-18 21:37:54 +0400 |
|---|---|---|
| committer | Bart Visscher <bart@thisnet.nl> | 2011-09-18 21:37:54 +0400 |
| commit | 82c7598861db175617694891bb9f21b426426225 (patch) | |
| tree | fce8fb4717b4cc2a5dc6da8835bdb51b5fb40054 /index.php | |
| parent | d5656716f69caa6a1eb98706994ffcb9a08553a7 (diff) | |
Remove global vars and use the OC static version.
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/index.php b/index.php index 5255e8fadbe..249ce41d51e 100644 --- a/index.php +++ b/index.php @@ -50,11 +50,11 @@ if($_SERVER['REQUEST_METHOD']=='PROPFIND'){//handle webdav elseif(OC_User::isLoggedIn()) { if(isset($_GET["logout"]) and ($_GET["logout"])) { OC_User::logout(); - header("Location: ".$WEBROOT.'/'); + header("Location: ".OC::$WEBROOT.'/'); exit(); } else { - header("Location: ".$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php")); + header("Location: ".OC::$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php")); exit(); } } @@ -67,7 +67,7 @@ elseif(isset($_COOKIE["oc_remember_login"]) && $_COOKIE["oc_remember_login"]) { if(OC_User::userExists($_COOKIE['oc_username']) && OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) { OC_User::setUserId($_COOKIE['oc_username']); - header("Location: ". $WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php")); + header("Location: ". OC::$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php")); } else { OC_Template::printGuestPage("", "login", array("error" => true)); @@ -78,7 +78,7 @@ elseif(isset($_COOKIE["oc_remember_login"]) && $_COOKIE["oc_remember_login"]) { elseif(isset($_POST["user"]) && isset($_POST['password'])) { OC_App::loadApps(); if(OC_User::login($_POST["user"], $_POST["password"])) { - header("Location: ".$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php")); + header("Location: ".OC::$WEBROOT.'/'.OC_Appconfig::getValue("core", "defaultpage", "files/index.php")); if(!empty($_POST["remember_login"])){ error_log("Setting remember login to cookie"); $token = md5($_POST["user"].time()); |