X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=df7b6b569307515b038657295c35ca9d8e857137;hb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;hp=d3980ba8d75bd9a8a7764ddc459421c213def790;hpb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;p=mailer.git

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index d3980ba8d7..df7b6b5693 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Administrationsmodul                             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
@@ -61,14 +66,14 @@ if (!isAdminRegistered()) {
 		destroyAdminSession(false);
 
 		// Do registration
-		$ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass);
+		$ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass, constant('WEBMASTER'));
 		switch ($ret)
 		{
 		case "done":
 			$done = changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 			if ($done === true) {
 				// Registering is done
-				LOAD_URL("modules.php?module=admin&action=login&register=done");
+				LOAD_URL("modules.php?module=admin&register=done");
 			} else {
 				$ret = getMessage('ADMIN_CANNOT_COMPLETE');
 			}
@@ -96,7 +101,7 @@ if (!isAdminRegistered()) {
 				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");
+				LOAD_URL("modules.php?module=admin");
 			} // END - if
 			break;
 		}
@@ -108,35 +113,38 @@ if (!isAdminRegistered()) {
 		if (REQUEST_ISSET_POST(('login'))) {
 			define('__LOGIN_VALUE', REQUEST_POST('login'));
 		} else {
-			define('__LOGIN_VALUE', "");
+			define('__LOGIN_VALUE', '');
 		}
 
 		// Yet-another "Notice" fix
 		if ((IS_FORM_SENT()) && (REQUEST_POST('ok') == "***")) {
 			// No login entered?
-			if (!REQUEST_ISSET_POST(('login'))) $MSG1 = getMessage('ADMIN_NO_LOGIN');
+			if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
 			// An error comes back from registration?
-			if (!empty($ret)) $MSG1 = $ret;
+			if (!empty($ret)) $loginMessage = $ret;
 
 			// No password entered?
-			if (!REQUEST_ISSET_POST(('pass'))) $MSG2 = getMessage('ADMIN_NO_PASS');
+			if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
 			// Or password too short?
-			if (strlen(REQUEST_POST('pass')) < 4) $MSG2 = getMessage('ADMIN_SHORT_PASS');
+			if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
 			// Output error messages
-			define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1));
-			define('__MSG_PASS',  LOAD_TEMPLATE("admin_login_msg", true, $MSG2));
+			define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $loginMessage));
+			define('__MSG_PASS',  LOAD_TEMPLATE("admin_login_msg", true, $passwdMessage));
 
 			// Reset variables
-  			$MSG1 = ""; $MSG2 = "";
-  		} else {
+			$loginMessage = ''; $passwdMessage = '';
+		} else {
 			// Reset values to nothing
-			define('__MSG_LOGIN', "");
-			define('__MSG_PASS' , "");
+			define('__MSG_LOGIN', '');
+			define('__MSG_PASS' , '');
 		}
 
+		// Output message in seperate template
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
+
 		// Load register template
 		LOAD_TEMPLATE("admin_reg_form");
 	}
@@ -147,7 +155,7 @@ if (!isAdminRegistered()) {
 		$OUT = ADMIN_SEND_PASSWORD_RESET_LINK(REQUEST_POST('email'));
 
 		// Output result
-		LOAD_TEMPLATE("admin_settings_saved", false, $OUT);
+		LOAD_TEMPLATE('admin_settings_saved', false, $OUT);
 	} elseif (REQUEST_ISSET_GET(('hash'))) {
 		// Output form for hash validation
 		LOAD_TEMPLATE("admin_validate_reset_hash_form", false, REQUEST_GET('hash'));
@@ -167,7 +175,7 @@ if (!isAdminRegistered()) {
 			LOAD_TEMPLATE("admin_reset_password_form", false, $content);
 		} else {
 			// Cannot validate the login data and hash
-			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
+			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'))) {
 		// Okay, we shall the admin password here. So first revalidate the hash
@@ -179,7 +187,7 @@ if (!isAdminRegistered()) {
 			LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
 		} else {
 			// Validation failed
-			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
 		}
 	} else {
 		// Output reset password form
@@ -189,18 +197,18 @@ if (!isAdminRegistered()) {
 	// At leat one administrator account was created
 	if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
 		// Timeout for last login, we have to logout first!
-		LOAD_URL("modules.php?module=admin&amp;action=login&amp;logout=1");
+		LOAD_URL("modules.php?module=admin&amp;logout=1");
 	} // END - if
 
 	if (REQUEST_ISSET_GET(('register'))) {
 		// Registration of first admin is done
-		if (REQUEST_GET('register') == "done") LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REGISTER_DONE'));
+		if (REQUEST_GET('register') == "done") LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
 	} // END - if
 
 	// Check if the admin has submitted data or not
 	if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
 		REQUEST_SET_POST('ok', "***");
-	}
+	} // END - if
 
 	if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != "***")) {
 		// All required data was entered so we check his account
@@ -221,7 +229,7 @@ if (!isAdminRegistered()) {
 			// 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');
+			 elseif (REQUEST_ISSET_GET('area')) $URL .= "area=".REQUEST_GET('area');
 
 			// Load URL
 			LOAD_URL($URL);
@@ -233,7 +241,7 @@ if (!isAdminRegistered()) {
 			destroyAdminSession();
 			break;
 
-		case "pass": // Wrong password
+		case 'pass': // Wrong password
 			REQUEST_SET_POST('ok', $ret);
 			$ret = "{--WRONG_PASS--} [<a href=\"{!URL!}/modules.php?module=admin&amp;reset_pass=1\">{--ADMIN_RESET_PASS--}</a>]\n";
 			destroyAdminSession();
@@ -246,42 +254,44 @@ if (!isAdminRegistered()) {
 	} // END - if
 
 	// Error detected?
+	// @TODO Rewrite all these constants
 	if ($ret != "done") {
 		if (REQUEST_ISSET_POST(('login'))) {
 			define('__LOGIN_VALUE', REQUEST_POST('login'));
 		} else {
-			define('__LOGIN_VALUE', "");
+			define('__LOGIN_VALUE', '');
 		}
 
 		if (IS_FORM_SENT()) {
 			// Set messages to zero
-			$MSG1 = ""; $MSG2 = "";
+			$loginMessage = ''; $passwdMessage = '';
 
 			// No login entered?
-			if (!REQUEST_ISSET_POST(('login'))) $MSG1 = 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")) $MSG1 = $ret;
+			if ((!empty($ret)) && (REQUEST_POST('ok') == "404")) $loginMessage = $ret;
 
 			// No password entered?
-			if (!REQUEST_ISSET_POST(('pass'))) $MSG2 = getMessage('ADMIN_NO_PASS');
+			if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
 			// Or password too short?
-			if (strlen(REQUEST_POST('pass')) < 4) $MSG2 = getMessage('ADMIN_SHORT_PASS');
+			if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
 			// An error comes back from login?
-			if ((!empty($ret)) && (REQUEST_POST('ok') == "pass")) $MSG2 = $ret;
+			if ((!empty($ret)) && (REQUEST_POST('ok') == 'pass')) $passwdMessage = $ret;
 
 			// Load message template
-			define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1));
-			define('__MSG_PASS' , LOAD_TEMPLATE("admin_login_msg", true, $MSG2));
+			define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $loginMessage));
+			define('__MSG_PASS' , LOAD_TEMPLATE("admin_login_msg", true, $passwdMessage));
 
 			// Reset variables
-  			$MSG1 = ""; $MSG2 = "";
-  		} else {
+			unset($loginMessage);
+			unset($passwdMessage);
+		} else {
 			// Set constants to empty for hiding them
-			define('__MSG_LOGIN', "");
-			define('__MSG_PASS' , "");
+			define('__MSG_LOGIN', '');
+			define('__MSG_PASS' , '');
 		}
 
 		// Load login form
@@ -296,7 +306,7 @@ if (!isAdminRegistered()) {
 				// Set default values
 				$content = array('target' => "action", 'value' => "login");
 			}
-		} elseif (REQUEST_ISSET_GET(('area'))) {
+		} elseif (REQUEST_ISSET_GET('area')) {
 			// Restore old area value
 			$content = array('target' => "area", 'value' => REQUEST_GET('area'));
 		} else {
@@ -317,9 +327,9 @@ if (!isAdminRegistered()) {
 
 			// Special logout redirect for installation of given extension
 			LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register));
-		} elseif (REQUEST_ISSET_GET(('remove'))) {
+		} elseif (REQUEST_ISSET_GET('remove')) {
 			// Secure input
-			$remove = REQUEST_GET(('remove'));
+			$remove = REQUEST_GET('remove');
 
 			// Special logout redirect for removal of given extension
 			LOAD_TEMPLATE(sprintf("admin_logout_%s_remove", $remove));
@@ -329,7 +339,7 @@ if (!isAdminRegistered()) {
 		}
 	} else {
 		// Something went wrong here...
-		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_fatal\">{--ADMIN_LOGOUT_FAILED--}</div>");
+		LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_fatal\">{--ADMIN_LOGOUT_FAILED--}</div>");
 
 		// Add fatal message
 		addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
@@ -352,7 +362,7 @@ if (!isAdminRegistered()) {
 			$area = "entrance";
 
 			// Check for similar URL variable
-			if (REQUEST_ISSET_GET(('area'))) $area = REQUEST_GET(('area'));
+			if (REQUEST_ISSET_GET('area')) $area = REQUEST_GET('area');
 
 			// Load "logical-area menu-system" file
 			LOAD_INC_ONCE("inc/modules/admin/lasys-inc.php");
@@ -361,7 +371,7 @@ if (!isAdminRegistered()) {
 			ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
 		} else {
 			// This little call constructs the whole default old and lacky menu system
-			// on left side
+			// on left side. It also renders the content on right side
 			ADMIN_DO_ACTION($GLOBALS['what']);
 		}
 		break;
@@ -372,7 +382,7 @@ if (!isAdminRegistered()) {
 		addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_NOT_FOUND'));
 		break;
 
-	case "pass": // Wrong password
+	case 'pass': // Wrong password
 		REQUEST_SET_POST('ok', $ret);
 		destroyAdminSession();
 		addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));