X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=719533118c282da673b8d8cd738f95bbb0ad7623;hb=e71e9e1380d65ccd06beef6fbc594bec10371f5f;hp=d416353943a48b21069446b62bd7d3bfbfd76d22;hpb=feda50ff73c05935417ed33164d30caf966ba854;p=mailer.git
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index d416353943..719533118c 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -49,6 +49,10 @@ require_once(PATH."inc/modules/admin/admin-inc.php");
// Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
+// Init return value
+$ret = "init";
+
+// Is no admin registered?
if (!isBooleanConstantAndTrue('admin_registered')) {
// Admin is not registered so we have to inform the user
if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
@@ -57,10 +61,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
$hashedPass = md5($_POST['pass']);
// Kill maybe existing session variables
- set_session('admin_login' , "");
- set_session('admin_md5' , "");
- set_session('admin_last' , "");
- set_session('admin_to' , "");
+ DESTROY_ADMIN_SESSION(false);
// Do registration
$ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
@@ -70,7 +71,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
if (!_FATAL) {
// Registering is done
- LOAD_URL(URL."/modules.php?module=admin&action=login®ister=done");
+ LOAD_URL("modules.php?module=admin&action=login®ister=done");
} else {
$ret = ADMIN_CANNOT_COMPLETE;
}
@@ -86,7 +87,9 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// Admin does already exists!
$ret = ADMIN_LOGIN_ALREADY_REG;
} else {
- // Any other kind
+ // Any other kind will be logged and interpreted as 'done'
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+ // @TODO Why is this set to 'done'?
$ret = "done";
}
@@ -96,8 +99,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
// Load URL for login
- $URL = URL."/modules.php?module=admin&action=login";
- LOAD_URL($URL);
+ LOAD_URL("modules.php?module=admin&action=login");
} // END - if
break;
}
@@ -190,16 +192,15 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// At leat one administrator account was created
if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
// Timeout for last login, we have to logout first!
- $URL = URL."/modules.php?module=admin&action=login&logout=1";
- LOAD_URL($URL);
- }
+ LOAD_URL("modules.php?module=admin&action=login&logout=1");
+ } // END - if
+
if (!empty($_GET['register'])) {
// Registration of first admin is done
if ($_GET['register'] == "done") OUTPUT_HTML("".ADMIN_REGISTER_DONE."");
} // END - if
// Check if the admin has submitted data or not
- $ret = "";
if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
// All required data was entered so we check his account
@@ -210,12 +211,12 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
{
case "done": // Admin and password are okay, so we log in now
// Construct URL and redirect
- $URL = URL."/modules.php?module=admin&";
+ $URL = "modules.php?module=admin&";
// Rewrite overview module
if ($GLOBALS['what'] == "overview") {
$GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
- }
+ } // END - if
// Add data to URL
if (!empty($GLOBALS['what'])) $URL .= "what=".$GLOBALS['what'];
@@ -237,8 +238,14 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
$ret = WRONG_PASS." [".ADMIN_RESET_PASS."]\n";
DESTROY_ADMIN_SESSION();
break;
- }
- }
+
+ default: // Others will be logged
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+ break;
+ } // END - switch
+ } // END - if
+
+ // Error detected?
if ($ret != "done") {
if (!empty($_POST['login'])) {
define('__LOGIN_VALUE', $_POST['login']);
@@ -248,8 +255,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
if (isset($_POST['ok'])) {
// Set messages to zero
-
$MSG1 = ""; $MSG2 = "";
+
// No login entered?
if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
@@ -299,7 +306,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// Load login form template
LOAD_TEMPLATE("admin_login_form", false, $content);
- }
+ } // END - if
} elseif (isset($_GET['logout'])) {
// Only try to remove cookies
if (DESTROY_ADMIN_SESSION()) {
@@ -333,49 +340,29 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
switch ($ret)
{
case "done":
- // Cookie-Data accepted
- if ((set_session("admin_md5", get_session('admin_md5'))) && (set_session("admin_login", get_session('admin_login'))) && (set_session("admin_last", time())) && (set_session("admin_to", bigintval(get_session('admin_to'))))) {
- // Ok, Cookie-Update done
- if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
- // Check if action GET variable was set
- $act = SQL_ESCAPE($GLOBALS['action']);
- if (!empty($GLOBALS['what'])) {
- // Get action value by what-value
- $act = GET_ACTION("admin", $GLOBALS['what']);
- }
-
- // Check for access control line of current menu entry
- define('__ACL_ALLOW', ADMINS_CHECK_ACL($act, $GLOBALS['what']));
- } else {
- // Extension not installed so it's always allowed to access everywhere!
- define('__ACL_ALLOW', true);
- }
+ // Check for access control line of current menu entry
+ define('__ACL_ALLOW', RUN_FILTER('check_admin_acl'));
- // When type of admin menu is not set fallback to old menu system
- if (empty($_CONFIG['admin_menu'])) $_CONFIG['admin_menu'] = "OLD";
+ // When type of admin menu is not set fallback to old menu system
+ if (getConfig('admin_menu') == null) $_CONFIG['admin_menu'] = "OLD";
- // Check for version and switch between old menu system and new "intelligent menu system"
- if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
- // Default area is the entrance, of course
- $area = "entrance";
+ // Check for version and switch between old menu system and new "intelligent menu system"
+ if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
+ // Default area is the entrance, of course
+ $area = "entrance";
- // Check for similar URL variable
- if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
+ // Check for similar URL variable
+ if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
- // Load "logical-area menu-system" file
- require_once(PATH."inc/modules/admin/lasys-inc.php");
+ // Load "logical-area menu-system" file
+ require_once(PATH."inc/modules/admin/lasys-inc.php");
- // Create new-style menu system will "logical areas"
- ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
- } else {
- // This little call constructs the whole default old and lacky menu system
- // on left side
- ADMIN_DO_ACTION($GLOBALS['what']);
- }
+ // Create new-style menu system will "logical areas"
+ ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
} else {
- // Login failed (cookies enabled?)
- OUTPUT_HTML("".ADMIN_LOGIN_FAILED."");
- ADD_FATAL(CANNOT_RE_REGISTER_SESS);
+ // This little call constructs the whole default old and lacky menu system
+ // on left side
+ ADMIN_DO_ACTION($GLOBALS['what']);
}
break;
@@ -390,6 +377,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
DESTROY_ADMIN_SESSION();
ADD_FATAL(WRONG_PASS);
break;
+
+ default: // Others will be logged
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));
+ break;
}
}