X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=458f1bcdae81eb3627bbaa28b16dd9dded2b9e48;hp=c0e1fdf48a4c581180ac6f9475013f3f86d9121d;hb=3f5269bfc3bc519223716d1ee2039ffc796931fb;hpb=3aeddfb08e3fa6c1bfbd54084523eaa3e06175ba
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index c0e1fdf48a..458f1bcdae 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -49,15 +49,18 @@ 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'] = "";
-
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 the old function because we are here in install mode
- $hashedPass = md5($hashedPass);
+ $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' , "");
// Do registration
$ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
@@ -86,6 +89,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// Any other kind
$ret = "done";
}
+
if (!isBooleanConstantAndTrue('admin_registered')) {
// Write to config that registration is done
admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
@@ -97,6 +101,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
break;
}
}
+
+ // Whas that action okay?
if ($ret != "done") {
// Fixes another "Notice"
if (!empty($_POST['login'])) {
@@ -134,6 +140,51 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// Load register template
LOAD_TEMPLATE("admin_reg_form");
}
+} 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, SQL_ESCAPE($_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 ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
@@ -144,7 +195,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
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 = "";
@@ -155,27 +206,21 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
switch ($ret)
{
case "done": // Admin and password are okay, so we log in now
- // Try to register the session variables
- if ((set_session("admin_md5", generatePassString(generateHash($_POST['pass'], __SALT)))) && (set_session("admin_login", $_POST['login'])) && (set_session("admin_last", time())) && (set_session("admin_to", $_POST['timeout']))) {
- // 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']);
- }
+ // Construct URL and redirect
+ $URL = URL."/modules.php?module=admin&";
- // 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);
+ // 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);
break;
case "404": // Administrator login not found
@@ -185,7 +230,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
case "pass": // Wrong password
$_POST['ok'] = $ret;
- $ret = WRONG_PASS;
+ $ret = WRONG_PASS." [".ADMIN_RESET_PASS."]\n";
break;
}
}
@@ -250,20 +295,35 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// Load login form template
LOAD_TEMPLATE("admin_login_form", false, $content);
}
-} elseif ($_GET['logout'] == "1") {
+} 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' , "");
+ set_session('admin_login', "");
+ set_session('admin_md5' , "");
+ set_session('admin_last' , "");
+ set_session('admin_to' , "");
// Destroy session
@session_destroy();
// Load logout template
- LOAD_TEMPLATE("admin_logout");
+ if (isset($_GET['register'])) {
+ // Secure input
+ $register = secureString(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 = secureString(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."");
@@ -274,7 +334,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
} else {
// Maybe an Admin want's to login?
$ret = CHECK_ADMIN_COOKIES(SQL_ESCAPE(get_session('admin_login')), SQL_ESCAPE(get_session('admin_md5')));
- switch ($ret) {
+ switch ($ret)
+ {
case "done":
// Cookie-Data accepted
if ((set_session("admin_md5", SQL_ESCAPE(get_session('admin_md5')))) && (set_session("admin_login", SQL_ESCAPE(get_session('admin_login')))) && (set_session("admin_last", time())) && (set_session("admin_to", bigintval(get_session('admin_to'))))) {