Admin autolock is now disabled by default

This commit is contained in:
Jérôme Schneider 2012-07-23 22:27:03 +02:00
parent a5462f6f9c
commit 0dd6adfce3
3 changed files with 4 additions and 4 deletions

View file

@ -142,8 +142,8 @@ define("BAIKAL_CAL_ENABLED", TRUE);
# Baïkal Web Admin ON/OFF switch; default TRUE
define("BAIKAL_ADMIN_ENABLED", TRUE);
# Baïkal Web Admin autolock ON/OFF switch; default TRUE
define("BAIKAL_ADMIN_AUTOLOCKENABLED", TRUE);
# Baïkal Web Admin autolock ON/OFF switch; default FALSE
define("BAIKAL_ADMIN_AUTOLOCKENABLED", FALSE);
# Baïkal Web admin password hash; Set by Core/Scripts/adminpassword.php or via Baïkal Web Admin
define("BAIKAL_ADMIN_PASSWORDHASH", "");

View file

@ -37,7 +37,7 @@ class Auth {
public static function assertUnlocked() {
if(defined("BAIKAL_ADMIN_AUTOLOCKENABLED") && BAIKAL_ADMIN_AUTOLOCKENABLED === FALSE) {
if(!defined("BAIKAL_ADMIN_AUTOLOCKENABLED") || BAIKAL_ADMIN_AUTOLOCKENABLED === FALSE) {
return TRUE;
}

View file

@ -34,7 +34,7 @@ class Tools extends \Flake\Core\FLObject {
public static function getCurrentUrl() {
if(MONGOOSE_SERVER) {
$sUrl = $GLOBALS["_SERVER"]["REQUEST_URI"];
if(trim($GLOBALS["_SERVER"]["QUERY_STRING"]) !== "") {
if(array_key_exists("QUERY_STRING", $GLOBALS["_SERVER"]) && trim($GLOBALS["_SERVER"]["QUERY_STRING"]) !== "") {
$sUrl .= "?" . $GLOBALS["_SERVER"]["QUERY_STRING"];
}
} else {