diff options
author | Florian Pritz <bluewind@xinu.at> | 2011-09-24 20:43:02 +0400 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2011-09-24 20:43:02 +0400 |
commit | 793e29e1245d079f89505294bef47f01c9111e8b (patch) | |
tree | 70c66381ebb5221547e881c99dc2b435e26e97e4 /index.php | |
parent | f65d0e4f80eba0d24ee48f16a22d290fb1f334b3 (diff) | |
parent | 842ce24d2b17685c27eabdd2d0bb01899efdbc6f (diff) |
Merge branch 'working'
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/index.php b/index.php index 23bc4fb7764..26e90ddfa5c 100644 --- a/index.php +++ b/index.php @@ -55,7 +55,7 @@ elseif(OC_User::isLoggedIn()) { // remember was checked after last login elseif(isset($_COOKIE["oc_remember_login"]) && $_COOKIE["oc_remember_login"]) { OC_App::loadApps(); - error_log("Trying to login from cookie"); + if(defined("DEBUG") && DEBUG) {error_log("Trying to login from cookie");} // confirm credentials in cookie if(OC_User::userExists($_COOKIE['oc_username']) && OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) { @@ -72,7 +72,7 @@ elseif(isset($_POST["user"]) && isset($_POST['password'])) { OC_App::loadApps(); if(OC_User::login($_POST["user"], $_POST["password"])) { if(!empty($_POST["remember_login"])){ - error_log("Setting remember login to cookie"); + if(defined("DEBUG") && DEBUG) {error_log("Setting remember login to cookie");} $token = md5($_POST["user"].time()); OC_Preferences::setValue($_POST['user'], 'login', 'token', $token); OC_User::setMagicInCookie($_POST["user"], $token); |