From 0dd6adfce3f1136bf3cc9c18d518f9940897c945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Schneider?= Date: Mon, 23 Jul 2012 22:27:03 +0200 Subject: [PATCH] Admin autolock is now disabled by default --- .../Frameworks/BaikalAdmin/Controller/Install/Initialize.php | 4 ++-- CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php | 2 +- CoreVersions/0.2.0/Frameworks/Flake/Util/Tools.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php index 1e2a776..54040ae 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php @@ -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", ""); diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php index 0f5bbab..db268eb 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php @@ -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; } diff --git a/CoreVersions/0.2.0/Frameworks/Flake/Util/Tools.php b/CoreVersions/0.2.0/Frameworks/Flake/Util/Tools.php index f187b29..19c9d99 100755 --- a/CoreVersions/0.2.0/Frameworks/Flake/Util/Tools.php +++ b/CoreVersions/0.2.0/Frameworks/Flake/Util/Tools.php @@ -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 {