X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin.php;h=761d9181aa0a6ab11251c6a1374f0af26ac73ff6;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hp=b9578683dd45dc676848432c5aade2730492d51e;hpb=c15eee48f9da1469cf3cdca3a48ba2d3c382a7c9;p=mailer.git diff --git a/inc/modules/admin.php b/inc/modules/admin.php index b9578683dd..761d9181aa 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -64,7 +64,7 @@ if (!isAdminRegistered()) { $hashedPass = md5(postRequestElement('admin_pass1')); // Kill maybe existing session variables - destroyAdminSession(false); + destroyAdminSession(FALSE); // Do registration $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster()); @@ -76,7 +76,7 @@ if (!isAdminRegistered()) { $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0); // Was it successfull? - if ($done === true) { + if ($done === TRUE) { // Registering is done redirectToUrl('modules.php?module=admin&register=done'); } else { @@ -166,17 +166,17 @@ if (!isAdminRegistered()) { } // END - if // Output error messages - $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); - $content['pass1_message'] = loadTemplate('admin_login_msg', true, $pass1Message); - $content['pass2_message'] = loadTemplate('admin_login_msg', true, $pass2Message); - $content['error_message'] = loadTemplate('admin_login_msg', true, $errorMessage); + $content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage); + $content['pass1_message'] = loadTemplate('admin_login_msg', TRUE, $pass1Message); + $content['pass2_message'] = loadTemplate('admin_login_msg', TRUE, $pass2Message); + $content['error_message'] = loadTemplate('admin_login_msg', TRUE, $errorMessage); } // END - if // Output message in seperate template displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}'); // Load register template - loadTemplate('admin_reg_form', false, $content); + loadTemplate('admin_reg_form', FALSE, $content); } // END - if } elseif (isGetRequestElementSet('reset_pass')) { // Is the form submitted? @@ -185,13 +185,13 @@ if (!isAdminRegistered()) { displayMessage(sendAdminPasswordResetLink(postRequestElement('email'))); } elseif (isGetRequestElementSet('hash')) { // Output form for hash validation - loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash')); + loadTemplate('admin_validate_reset_hash_form', FALSE, getRequestElement('hash')); } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) { // Validate the login data and hash $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login')); // Valid? - if ($valid === true) { + if ($valid === TRUE) { // Prepare content first $content = array( 'hash' => postRequestElement('hash'), @@ -199,7 +199,7 @@ if (!isAdminRegistered()) { ); // Validation okay so display form for final password change - loadTemplate('admin_reset_password_form', false, $content); + loadTemplate('admin_reset_password_form', FALSE, $content); } else { // Cannot validate the login data and hash displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}'); @@ -208,7 +208,7 @@ if (!isAdminRegistered()) { // Okay, we shall the admin password here. So first revalidate the hash if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) { // Output result - loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1'))); + loadTemplate('admin_reset_password_done', FALSE, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1'))); } else { // Validation failed displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}'); @@ -305,10 +305,10 @@ if (!isAdminRegistered()) { // Load message templates if the messages have been set if (!empty($loginMessage)) { - $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); + $content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage); } // END - if if (!empty($passwdMessage)) { - $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage); + $content['pass_message'] = loadTemplate('admin_login_msg', TRUE, $passwdMessage); } // END - if } // END - if @@ -316,7 +316,7 @@ if (!isAdminRegistered()) { $content['all_parameter'] = addAllGetRequestParameters(); // Load login form template - loadTemplate('admin_login_form', false, $content); + loadTemplate('admin_login_form', FALSE, $content); } // END - if } elseif (isGetRequestElementSet('logout')) { // Only try to remove cookies @@ -340,7 +340,7 @@ if (!isAdminRegistered()) { } } else { // Something went wrong here... - loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}'); + loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_LOGOUT_FAILED--}'); // Add fatal message addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');