X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=1c58a7b53eadfbce3112962e32662bf2016feb8b;hp=367a96cbe9fb14fc0f3d641005974a85ecdab340;hb=8454545089b9b77695498cd855cf50075151d957;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 367a96cbe9..1c58a7b53e 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
// Redirect to right URL
LOAD_URL("modules.php?module=admin&action=login");
-}
+} // END - if
// Load include file
require_once(PATH."inc/modules/admin/admin-inc.php");
@@ -57,10 +57,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);
@@ -90,14 +87,14 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
$ret = "done";
}
+ // Admin still not registered?
if (!isBooleanConstantAndTrue('admin_registered')) {
// Write to config that registration is done
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(URL."/modules.php?module=admin&action=login");
+ } // END - if
break;
}
}
@@ -189,9 +186,9 @@ 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(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."");
@@ -203,6 +200,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
// All required data was entered so we check his account
$ret = CHECK_ADMIN_LOGIN($_POST['login'], $_POST['pass']);
+
+ // Which status do we have?
switch ($ret)
{
case "done": // Admin and password are okay, so we log in now
@@ -212,7 +211,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// 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'];
@@ -226,14 +225,18 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
case "404": // Administrator login not found
$_POST['ok'] = $ret;
$ret = ADMIN_NOT_FOUND;
+ DESTROY_ADMIN_SESSION();
break;
case "pass": // Wrong password
$_POST['ok'] = $ret;
$ret = WRONG_PASS." [".ADMIN_RESET_PASS."]\n";
+ DESTROY_ADMIN_SESSION();
break;
- }
- }
+ } // END - switch
+ } // END - if
+
+ // Error detected?
if ($ret != "done") {
if (!empty($_POST['login'])) {
define('__LOGIN_VALUE', $_POST['login']);
@@ -243,8 +246,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;
@@ -294,19 +297,10 @@ 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 (set_session("admin_login", "") && set_session("admin_md5", "") && set_session("admin_last", "") && set_session("admin_to", "")) {
- // Also remove array elements
- set_session('admin_login', "");
- set_session('admin_md5' , "");
- set_session('admin_last' , "");
- set_session('admin_to' , "");
-
- // Destroy session
- @session_destroy();
-
+ if (DESTROY_ADMIN_SESSION()) {
// Load logout template
if (isset($_GET['register'])) {
// Secure input
@@ -340,34 +334,22 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// 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";
+ 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/la_sys-inc.php"))) {
+ 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 = $_GET['area'];
+ if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
// Load "logical-area menu-system" file
- require_once(PATH."inc/modules/admin/la_sys-inc.php");
+ 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']);
@@ -385,20 +367,17 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
case "404": // Administrator login not found
$_POST['ok'] = $ret;
+ DESTROY_ADMIN_SESSION();
ADD_FATAL(ADMIN_NOT_FOUND);
break;
case "pass": // Wrong password
$_POST['ok'] = $ret;
+ DESTROY_ADMIN_SESSION();
ADD_FATAL(WRONG_PASS);
break;
}
}
-if (isBooleanConstantAndTrue('admin_registered')) {
- // Check config.php and inc directory for right access rights
- if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE);
- if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE);
-}
//
?>