X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=da1be6a77cef86a5d8e50500446d2070bee27e83;hp=986c37892f0aeae727b22e5e99f5465a2c0c274a;hb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;hpb=00797d46cc0b7e2c4e8c084eb4c6ac26cd0336e1

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 986c37892f..da1be6a77c 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -40,7 +40,7 @@
 if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-}
+} // END - if
 
 // Load include file
 loadIncludeOnce('inc/modules/admin/admin-inc.php');
@@ -54,9 +54,9 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
 	// Admin is not registered so we have to inform the user
-	if ((isFormSent()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+	if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
 		REQUEST_SET_POST('ok', '***');
-	}
+	} // END - if
 
 	if ((isFormSent()) && (REQUEST_POST('ok') != '***')) {
 		// Hash the password with the old function because we are here in install mode
@@ -67,8 +67,9 @@ if (!isAdminRegistered()) {
 
 		// Do registration
 		$ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass, constant('WEBMASTER'));
-		switch ($ret)
-		{
+
+		// Check if registration wents fine
+		switch ($ret) {
 			case 'done':
 				$done = changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', "ADMIN-SETUP", "setConfigEntry('ADMIN_REGISTERED', \"", "\");", 'Y', 0);
 				if ($done === true) {
@@ -104,13 +105,13 @@ if (!isAdminRegistered()) {
 					redirectToUrl('modules.php?module=admin');
 				} // END - if
 				break;
-		}
+		} // END - switch
 	}
 
 	// Whas that action okay?
 	if ($ret != 'done') {
 		// Fixes another notice
-		if (REQUEST_ISSET_POST(('login'))) {
+		if (REQUEST_ISSET_POST('login')) {
 			define('__LOGIN_VALUE', REQUEST_POST('login'));
 		} else {
 			define('__LOGIN_VALUE', '');
@@ -119,7 +120,7 @@ if (!isAdminRegistered()) {
 		// Yet-another notice-fix
 		if ((isFormSent()) && (REQUEST_POST('ok') == '***')) {
 			// No login entered?
-			if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+			if (!REQUEST_ISSET_POST('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
 			// An error comes back from registration?
 			if (!empty($ret)) $loginMessage = $ret;
@@ -148,18 +149,18 @@ if (!isAdminRegistered()) {
 		// Load register template
 		LOAD_TEMPLATE('admin_reg_form');
 	}
-} elseif (REQUEST_ISSET_GET(('reset_pass'))) {
+} elseif (REQUEST_ISSET_GET('reset_pass')) {
 	// Is the form submitted?
-	if ((REQUEST_ISSET_POST(('send_link'))) && (REQUEST_ISSET_POST('email'))) {
+	if ((REQUEST_ISSET_POST('send_link')) && (REQUEST_ISSET_POST('email'))) {
 		// Try to send the link out
 		$OUT = ADMIN_SEND_PASSWORD_RESET_LINK(REQUEST_POST('email'));
 
 		// Output result
 		LOAD_TEMPLATE('admin_settings_saved', false, $OUT);
-	} elseif (REQUEST_ISSET_GET(('hash'))) {
+	} elseif (REQUEST_ISSET_GET('hash')) {
 		// Output form for hash validation
 		LOAD_TEMPLATE('admin_validate_reset_hash_form', false, REQUEST_GET('hash'));
-	} elseif ((REQUEST_ISSET_POST(('validate_hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('hash')))) {
+	} elseif ((REQUEST_ISSET_POST('validate_hash')) && (REQUEST_ISSET_POST('login')) && (REQUEST_ISSET_POST('hash'))) {
 		// Validate the login data and hash
 		$valid = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'));
 
@@ -177,7 +178,7 @@ if (!isAdminRegistered()) {
 			// Cannot validate the login data and hash
 			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
 		}
-	} elseif ((REQUEST_ISSET_POST(('reset_pass'))) && (REQUEST_ISSET_POST(('hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
+	} elseif ((REQUEST_ISSET_POST('reset_pass')) && (REQUEST_ISSET_POST('hash')) && (REQUEST_ISSET_POST('login')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
 		// Okay, we shall the admin password here. So first revalidate the hash
 		if (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'))) {
 			// Set the password now
@@ -206,7 +207,7 @@ if (!isAdminRegistered()) {
 	} // END - if
 
 	// Check if the admin has submitted data or not
-	if ((isFormSent()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+	if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
 		REQUEST_SET_POST('ok', '***');
 	} // END - if
 
@@ -215,8 +216,7 @@ if (!isAdminRegistered()) {
 		$ret = CHECK_ADMIN_LOGIN(REQUEST_POST('login'), REQUEST_POST('pass'));
 
 		// Which status do we have?
-		switch ($ret)
-		{
+		switch ($ret) {
 			case 'done': // Admin and password are okay, so we log in now
 				// Construct URL and redirect
 				$URL = 'modules.php?module=admin&amp;';
@@ -227,9 +227,9 @@ if (!isAdminRegistered()) {
 				} // END - if
 
 				// Add data to URL
-				if (!empty($GLOBALS['what'])) $URL .= 'what='.$GLOBALS['what'];
-			 elseif (!empty($GLOBALS['action'])) $URL .= 'action='.$GLOBALS['action'];
-			 elseif (REQUEST_ISSET_GET('area')) $URL .= 'area='.REQUEST_GET('area');
+				if (!empty($GLOBALS['what']))        $URL .= 'what='.$GLOBALS['what'];
+			 	 elseif (!empty($GLOBALS['action'])) $URL .= 'action='.$GLOBALS['action'];
+			 	 elseif (REQUEST_ISSET_GET('area'))  $URL .= 'area='.REQUEST_GET('area');
 
 			 // Load URL
 			 redirectToUrl($URL);
@@ -256,7 +256,7 @@ if (!isAdminRegistered()) {
 	// Error detected?
 	// @TODO Rewrite all these constants
 	if ($ret != 'done') {
-		if (REQUEST_ISSET_POST(('login'))) {
+		if (REQUEST_ISSET_POST('login')) {
 			define('__LOGIN_VALUE', REQUEST_POST('login'));
 		} else {
 			define('__LOGIN_VALUE', '');
@@ -267,7 +267,7 @@ if (!isAdminRegistered()) {
 			$loginMessage = ''; $passwdMessage = '';
 
 			// No login entered?
-			if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+			if (!REQUEST_ISSET_POST('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
 			// An error comes back from login?
 			if ((!empty($ret)) && (REQUEST_POST('ok') == '404')) $loginMessage = $ret;