X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=cbf18f8b2d0e51ce25bf5e0515b812fd89413fe3;hp=058b1f8f0ef42e08344990ab2f7b616a23624a8f;hb=cd980a5c37a3f4eb1ec643b88f141f12027df2ab;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 058b1f8f0e..cbf18f8b2d 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -32,18 +32,16 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
// Login is default
-if ((empty($GLOBALS['action'])) && ($check == "admin_only"))
-{
+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");
@@ -51,35 +49,30 @@ 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'));
-// Is the logout empty?
-if (empty($_GET['logout'])) $_GET['logout'] = "";
+// Init return value
+$ret = "init";
-if (!admin_registered)
-{
+// 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'] = "***";
- if ((isset($_POST['ok'])) && ($_POST['ok'] != "***"))
- {
- // Hash the password with our new generateHash() function
- $hashedPass = generateHash($_POST['pass']);
+ if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
+ // Hash the password with the old function because we are here in install mode
+ $hashedPass = md5($_POST['pass']);
- // If the password has not been hashed we have to fall-back to md5()
- if ($hashedPass == $_POST['pass']) $hashedPass = md5($hashedPass);
+ // Kill maybe existing session variables
+ DESTROY_ADMIN_SESSION(false);
// Do registration
$ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
switch ($ret)
{
case "done":
- admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define ('admin_registered', ", ");", "true", 0);
- if (!_FATAL)
- {
- $URL = URL."/modules.php?module=admin&action=login®ister=done";
- LOAD_URL($URL);
- die($URL);
- }
- else
- {
+ 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");
+ } else {
$ret = ADMIN_CANNOT_COMPLETE;
}
break;
@@ -90,30 +83,30 @@ if (!admin_registered)
case "already":
default:
- if ($ret == "already")
- {
+ if ($ret == "already") {
// Admin does already exists!
$ret = ADMIN_LOGIN_ALREADY_REG;
- }
- else
- {
- // Any other kind
+ } else {
+ // 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";
}
- if (!admin_registered)
- {
+
+ // 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);
+ 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;
}
}
- if ($ret != "done")
- {
+
+ // Whas that action okay?
+ if ($ret != "done") {
// Fixes another "Notice"
if (!empty($_POST['login'])) {
define('__LOGIN_VALUE', $_POST['login']);
@@ -122,8 +115,7 @@ if (!admin_registered)
}
// Yet-another "Notice" fix
- if ((!empty($_POST['ok'])) && ($_POST['ok'] == "***"))
- {
+ if ((!empty($_POST['ok'])) && ($_POST['ok'] == "***")) {
// No login entered?
if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
@@ -142,9 +134,7 @@ if (!admin_registered)
// Reset variables
$MSG1 = ""; $MSG2 = "";
- }
- else
- {
+ } else {
// Reset values to nothing
define('__MSG_LOGIN', "");
define('__MSG_PASS' , "");
@@ -153,85 +143,120 @@ if (!admin_registered)
// Load register template
LOAD_TEMPLATE("admin_reg_form");
}
-}
- elseif ((empty($_SESSION['admin_login'])) || (empty($_SESSION['admin_md5'])) || (empty($_SESSION['admin_last'])) || (empty($_SESSION['admin_to'])) || (($_SESSION['admin_last'] + bigintval($_SESSION['admin_to']) * 3600 * 24) < time()))
-{
+} elseif (isset($_GET['reset_pass'])) {
+ // Is the form submitted?
+ if ((isset($_POST['send_link'])) && (!empty($_POST['email']))) {
+ // Try to send the link out
+ $OUT = ADMIN_SEND_PASSWORD_RESET_LINK($_POST['email']);
+
+ // Output result
+ LOAD_TEMPLATE("admin_settings_saved", false, $OUT);
+ } elseif (!empty($_GET['hash'])) {
+ // Output form for hash validation
+ LOAD_TEMPLATE("admin_validate_reset_hash_form", false, $_GET['hash']);
+ } elseif ((isset($_POST['validate_hash'])) && (!empty($_POST['login'])) && (!empty($_POST['hash']))) {
+ // Validate the login data and hash
+ $valid = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login']);
+
+ // Valid?
+ if ($valid) {
+ // Prepare content first
+ $content = array(
+ 'hash' => SQL_ESCAPE($_POST['hash']),
+ 'login' => SQL_ESCAPE($_POST['login'])
+ );
+
+ // Validation okay so display form for final password change
+ LOAD_TEMPLATE("admin_reset_password_form", false, $content);
+ } else {
+ // Cannot validate the login data and hash
+ LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED);
+ }
+ } elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) {
+ // Okay, we shall the admin password here. So first revalidate the hash
+ if (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login'])) {
+ // Set the password now
+ $OUT = ADMIN_RESET_PASSWORD($_POST['login'], $_POST['pass1']);
+
+ // Output result
+ LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
+ } else {
+ // Validation failed
+ LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2);
+ }
+ } else {
+ // Output reset password form
+ LOAD_TEMPLATE("admin_send_reset_link");
+ }
+} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((get_session('admin_last') + bigintval(get_session('admin_to')) * 3600 * 24) < time())) {
// At leat one administrator account was created
- if ((!empty($_SESSION['admin_login'])) && (!empty($_SESSION['admin_md5'])) && (!empty($_SESSION['admin_last'])) && (!empty($_SESSION['admin_to'])))
- {
+ 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);
- }
- if (!empty($_GET['register']))
- {
+ 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."");
- }
+ } // 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'] != "***"))
- {
+ 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
- $TIMEOUT = time() + (3600 * 24 * $_POST['timeout']);
- if ((set_session("admin_md5", generatePassString(generateHash($_POST['pass'], __SALT)), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_login", $_POST['login'], $TIMEOUT, COOKIE_PATH)) && (set_session("admin_last", time(), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_to", $_POST['timeout'], $TIMEOUT, COOKIE_PATH)))
- {
- // Construct URL and redirect
- $URL = URL."/modules.php?module=admin&";
-
- // Rewrite overview module
- if ($GLOBALS['what'] == "overview") {
- $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
- }
-
- // Add data to URL
- if (!empty($GLOBALS['what'])) $URL .= "what=".$GLOBALS['what'];
- elseif (!empty($GLOBALS['action'])) $URL .= "action=".$GLOBALS['action'];
- elseif (!empty($_GET['area'])) $URL .= "area=".$_GET['area'];
-
- // Load URL
- LOAD_URL($URL);
- }
- else
- {
- OUTPUT_HTML("".ADMIN_LOGIN_FAILED."");
- ADD_FATAL(CANNOT_REGISTER_SESS);
- }
+ // Construct URL and redirect
+ $URL = 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'];
+ elseif (!empty($GLOBALS['action'])) $URL .= "action=".$GLOBALS['action'];
+ elseif (!empty($_GET['area'])) $URL .= "area=".$_GET['area'];
+
+ // Load URL
+ LOAD_URL($URL);
break;
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;
+ $ret = WRONG_PASS." [".ADMIN_RESET_PASS."]\n";
+ DESTROY_ADMIN_SESSION();
break;
- }
- }
- if ($ret != "done")
- {
- if (!empty($_POST['login']))
- {
+
+ 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']);
- }
- else
- {
+ } else {
define('__LOGIN_VALUE', "");
}
- if (isset($_POST['ok']))
- {
+ if (isset($_POST['ok'])) {
// Set messages to zero
-
$MSG1 = ""; $MSG2 = "";
+
// No login entered?
if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
@@ -253,131 +278,96 @@ if (!admin_registered)
// Reset variables
$MSG1 = ""; $MSG2 = "";
- }
- else
- {
+ } else {
// Set constants to empty for hiding them
define('__MSG_LOGIN', "");
define('__MSG_PASS' , "");
}
// Load login form
- if (!empty($GLOBALS['what']))
- {
+ if (!empty($GLOBALS['what'])) {
// Restore old what value
$content = array('target' => "what", 'value' => $GLOBALS['what']);
- }
- elseif (!empty($GLOBALS['action']))
- {
- if ($GLOBALS['action'] != "logout")
- {
+ } elseif (!empty($GLOBALS['action'])) {
+ if ($GLOBALS['action'] != "logout") {
// Restore old action value
$content = array('target' => "action", 'value' => $GLOBALS['action']);
- }
- else
- {
+ } else {
// Set default values
$content = array('target' => "action", 'value' => "login");
}
- }
- elseif (!empty($_GET['area']))
- {
+ } elseif (!empty($_GET['area'])) {
// Restore old area value
$content = array('target' => "area", 'value' => $_GET['area']);
- }
- else
- {
+ } else {
// Set default values
$content = array('target' => "action", 'value' => "login");
}
// Load login form template
LOAD_TEMPLATE("admin_login_form", false, $content);
- }
-}
- elseif ($_GET['logout'] == "1")
-{
+ } // END - if
+} elseif (isset($_GET['logout'])) {
// Only try to remove cookies
- if (set_session("admin_login", "", (time() - 3600), COOKIE_PATH) && set_session("admin_md5", "", (time() - 3600), COOKIE_PATH) && set_session("admin_last", "", (time() - 3600), COOKIE_PATH) && set_session("admin_to", "", (time() - 3600), COOKIE_PATH))
- {
- // Also remove array elements
- unset($_SESSION['admin_login']);
- unset($_SESSION['admin_md5']);
- unset($_SESSION['admin_last']);
- unset($_SESSION['admin_to']);
-
- // Destroy session
- @session_destroy();
-
+ if (DESTROY_ADMIN_SESSION()) {
// Load logout template
- LOAD_TEMPLATE("admin_logout");
- }
- else
- {
+ if (isset($_GET['register'])) {
+ // Secure input
+ $register = SQL_ESCAPE($_GET['register']);
+
+ // Special logout redirect for installation of given extension
+ LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register));
+ } elseif (isset($_GET['remove'])) {
+ // Secure input
+ $remove = SQL_ESCAPE($_GET['remove']);
+
+ // Special logout redirect for removal of given extension
+ LOAD_TEMPLATE(sprintf("admin_logout_%s_remove", $remove));
+ } else {
+ // Logged out normally
+ LOAD_TEMPLATE("admin_logout");
+ }
+ } else {
// Something went wrong here...
OUTPUT_HTML("".ADMIN_LOGOUT_FAILED."");
// Add fatal message
ADD_FATAL(CANNOT_UNREG_SESS);
}
-}
- else
-{
+} else {
// Maybe an Admin want's to login?
- $ret = CHECK_ADMIN_COOKIES(SQL_ESCAPE($_SESSION['admin_login']), SQL_ESCAPE($_SESSION['admin_md5']));
+ $ret = CHECK_ADMIN_COOKIES(get_session('admin_login'), get_session('admin_md5'));
switch ($ret)
{
case "done":
// Cookie-Data accepted
- $TIMEOUT = time() + bigintval($_SESSION['admin_to']);
- if ((set_session("admin_md5", SQL_ESCAPE($_SESSION['admin_md5']), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_login", SQL_ESCAPE($_SESSION['admin_login']), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_last", time(), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_to", bigintval($_SESSION['admin_to']), $TIMEOUT, COOKIE_PATH)))
- {
+ 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_exists(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']);
- }
- else
- {
+ } else {
// This little call constructs the whole default old and lacky menu system
// on left side
ADMIN_DO_ACTION($GLOBALS['what']);
}
- }
- else
- {
+ } else {
// Login failed (cookies enabled?)
OUTPUT_HTML("".ADMIN_LOGIN_FAILED."");
ADD_FATAL(CANNOT_RE_REGISTER_SESS);
@@ -386,21 +376,21 @@ if (!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;
+
+ default: // Others will be logged
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));
+ break;
}
}
-if (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);
-}
//
?>