X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=05336033fc0f9d58c1b52bf2f47078d6c27d09af;hp=fec5cc9fc509d9f6748aa08f012c61600bb5014d;hb=a954ccdf4aba81ec0e75a1836aa4bc14cb245aba;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index fec5cc9fc5..05336033fc 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -44,7 +44,7 @@ if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
} // END - if
// Load include file
-require_once(PATH."inc/modules/admin/admin-inc.php");
+LOAD_INC_ONCE("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'));
@@ -61,7 +61,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
$hashedPass = md5($_POST['pass']);
// Kill maybe existing session variables
- DESTROY_ADMIN_SESSION(false);
+ destroyAdminSession(false);
// Do registration
$ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
@@ -69,23 +69,23 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
{
case "done":
admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
- if (!_FATAL) {
+ if (!constant('_FATAL')) {
// Registering is done
LOAD_URL("modules.php?module=admin&action=login®ister=done");
} else {
- $ret = ADMIN_CANNOT_COMPLETE;
+ $ret = getMessage('ADMIN_CANNOT_COMPLETE');
}
break;
case "failed":
- $ret = ADMIN_REGISTER_FAILED;
+ $ret = getMessage('ADMIN_REGISTER_FAILED');
break;
case "already":
default:
if ($ret == "already") {
// Admin does already exists!
- $ret = ADMIN_LOGIN_ALREADY_REG;
+ $ret = getMessage('ADMIN_LOGIN_ALREADY_REG');
} 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));
@@ -117,16 +117,16 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
// Yet-another "Notice" fix
if ((!empty($_POST['ok'])) && ($_POST['ok'] == "***")) {
// No login entered?
- if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
+ if (empty($_POST['login'])) $MSG1 = getMessage('ADMIN_NO_LOGIN');
// An error comes back from registration?
if (!empty($ret)) $MSG1 = $ret;
// No password entered?
- if (empty($_POST['pass'])) $MSG2 = ADMIN_NO_PASS;
+ if (empty($_POST['pass'])) $MSG2 = getMessage('ADMIN_NO_PASS');
// Or password too short?
- if (strlen($_POST['pass']) < 4) $MSG2 = ADMIN_SHORT_PASS;
+ if (strlen($_POST['pass']) < 4) $MSG2 = getMessage('ADMIN_SHORT_PASS');
// Output error messages
define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1));
@@ -159,7 +159,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
$valid = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login']);
// Valid?
- if ($valid) {
+ if ($valid === true) {
// Prepare content first
$content = array(
'hash' => SQL_ESCAPE($_POST['hash']),
@@ -230,13 +230,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
case "404": // Administrator login not found
$_POST['ok'] = $ret;
$ret = getMessage('ADMIN_NOT_FOUND');
- DESTROY_ADMIN_SESSION();
+ destroyAdminSession();
break;
case "pass": // Wrong password
$_POST['ok'] = $ret;
$ret = "{!WRONG_PASS!} [{!ADMIN_RESET_PASS!}]\n";
- DESTROY_ADMIN_SESSION();
+ destroyAdminSession();
break;
default: // Others will be logged
@@ -258,16 +258,16 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
$MSG1 = ""; $MSG2 = "";
// No login entered?
- if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
+ if (empty($_POST['login'])) $MSG1 = getMessage('ADMIN_NO_LOGIN');
// An error comes back from login?
if ((!empty($ret)) && ($_POST['ok'] == "404")) $MSG1 = $ret;
// No password entered?
- if (empty($_POST['pass'])) $MSG2 = ADMIN_NO_PASS;
+ if (empty($_POST['pass'])) $MSG2 = getMessage('ADMIN_NO_PASS');
// Or password too short?
- if (strlen($_POST['pass']) < 4) $MSG2 = ADMIN_SHORT_PASS;
+ if (strlen($_POST['pass']) < 4) $MSG2 = getMessage('ADMIN_SHORT_PASS');
// An error comes back from login?
if ((!empty($ret)) && ($_POST['ok'] == "pass")) $MSG2 = $ret;
@@ -309,7 +309,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
} // END - if
} elseif (isset($_GET['logout'])) {
// Only try to remove cookies
- if (DESTROY_ADMIN_SESSION()) {
+ if (destroyAdminSession()) {
// Load logout template
if (isset($_GET['register'])) {
// Secure input
@@ -329,10 +329,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
}
} else {
// Something went wrong here...
- LOAD_TEMPLATE("admin_settings_saved", false, "".ADMIN_LOGOUT_FAILED."
");
+ LOAD_TEMPLATE("admin_settings_saved", false, "{!ADMIN_LOGOUT_FAILED!}
");
// Add fatal message
- addFatalMessage(CANNOT_UNREG_SESS);
+ addFatalMessage(getMessage('CANNOT_UNREG_SESS'));
}
} else {
// Maybe an Admin want's to login?
@@ -344,7 +344,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
define('__ACL_ALLOW', RUN_FILTER('check_admin_acl'));
// When type of admin menu is not set fallback to old menu system
- if (getConfig('admin_menu') == null) $_CONFIG['admin_menu'] = "OLD";
+ if (!isConfigEntrySet('admin_menu')) setConfigEntry('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"))) {
@@ -355,7 +355,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
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_INC_ONCE("inc/modules/admin/lasys-inc.php");
// Create new-style menu system will "logical areas"
ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
@@ -368,14 +368,14 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
case "404": // Administrator login not found
$_POST['ok'] = $ret;
- DESTROY_ADMIN_SESSION();
- addFatalMessage(ADMIN_NOT_FOUND);
+ destroyAdminSession();
+ addFatalMessage(getMessage('ADMIN_NOT_FOUND'));
break;
case "pass": // Wrong password
$_POST['ok'] = $ret;
- DESTROY_ADMIN_SESSION();
- addFatalMessage(WRONG_PASS);
+ destroyAdminSession();
+ addFatalMessage(getMessage('WRONG_PASS'));
break;
default: // Others will be logged