X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=f72adf4b19c0210b9ef798cc2828c5ba1df85e33;hb=0226aea588ae0b433e4c2c17b23f79885c2d0da5;hp=0635460a527b70722322ff871033e0d6fa1fdafd;hpb=ac04130f9ccbaba51d7d7992d8a10c38db776eee;p=mailer.git diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 0635460a52..f72adf4b19 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,31 +61,31 @@ 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); switch ($ret) { case "done": - admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0); - if (!_FATAL) { + changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0); + 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)); @@ -96,7 +96,7 @@ if (!isBooleanConstantAndTrue('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); + changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0); // Load URL for login LOAD_URL("modules.php?module=admin&action=login"); @@ -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']), @@ -170,7 +170,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) { 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); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('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 @@ -182,7 +182,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) { LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT); } else { // Validation failed - LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2')); } } else { // Output reset password form @@ -197,7 +197,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) { if (!empty($_GET['register'])) { // Registration of first admin is done - if ($_GET['register'] == "done") LOAD_TEMPLATE("admin_settings_saved", false, "