X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=85703b5e056b5332a9a043b5ca6c4f3a41b44d76;hp=5a372e0fc40bc68f76c8aba021783bbcc9550ef3;hb=05e9ddd952a47d42b9970a9d2afef20d77d3aecf;hpb=3e49938396ad0b4af9919363e5adcf0d713acf81

diff --git a/modules.php b/modules.php
index 5a372e0fc4..85703b5e05 100644
--- a/modules.php
+++ b/modules.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Hauptladedatei. Laedt alle benoetigten Dateien   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -34,53 +39,46 @@
 // XDEBUG call
 //xdebug_start_trace();
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require("inc/libs/security_functions.php");
+// Load security stuff here
+require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
 $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['output_mode'] = 0;
-$GLOBALS['what']   = "";
-$GLOBALS['action'] = "";
-$GLOBALS['userid'] = 0;
+$GLOBALS['what']   = '';
+$GLOBALS['action'] = '';
+$GLOBALS['module'] = '';
 
 // Needed include files
-require("inc/config.php");
-
-// Fix missing module to "index"
-if (!REQUEST_ISSET_GET(('module'))) REQUEST_SET_GET('module', "index");
-
-// Secure action/what if present
-if (REQUEST_ISSET_GET(('action'))) $GLOBALS['action'] = secureString(REQUEST_GET('action'));
-if (REQUEST_ISSET_GET(('what')))   $GLOBALS['what']   = secureString(REQUEST_GET('what'));
+require('inc/config.php');
 
-// Secure the module name (very important line!)
-$GLOBALS['module'] = secureString(REQUEST_GET('module'));
+// Fix missing module to 'index'
+if (!REQUEST_ISSET_GET('module')) REQUEST_SET_GET('module', 'index');
 
 // Check if logged in
 if (IS_MEMBER()) {
 	// Is still logged in so we welcome him with his name
 	$result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-	 array($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Load surname and family's name and build the username
 		list($s, $f) = SQL_FETCHROW($result);
-		$username = $s." ".$f;
+		$username = $s.' '.$f;
 
 		// Additionally admin?
 		if (IS_ADMIN()) {
 			// Add it
-			$username .= " ({!_ADMIN_SHORT!})";
+			$username .= ' ({--_ADMIN_SHORT--})';
 		} // END - if
 	} else {
 		// Hmmm, logged in and no valid userid?
-		$username = "<em>{!_UNKNOWN!}</em>";
+		$username = '<em>{--_UNKNOWN--}</em>';
 
 		// Destroy session
-		destroy_user_session();
+		destroyUserSession();
 
 		// Kill userid
-		$GLOBALS['userid'] = 0;
+		setUserId(0);
 	}
 
 	// Free memory
@@ -94,58 +92,58 @@ if (IS_MEMBER()) {
 }
 
 // The header file
-LOAD_INC_ONCE("inc/header.php");
+loadIncludeOnce('inc/header.php');
 
 // Modules are by default not valid!
-$MOD_VALID = false; $check = "failed";
-if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
+$MOD_VALID = false; $check = 'failed';
+if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] != 'admin')) {
 	// Maintain mode is active and you are no admin
-	addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
+	addFatalMessage(__FILE__, __LINE__, getMessage('LANG_DOWN_MAINTAINCE'));
 } elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
 	// Construct module name
 	define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
 
 	// Did we found the module listed in allowed modules and are we successfully connected?
-	$check = CHECK_MODULE($GLOBALS['module']);
+	$check = checkModulePermissions($GLOBALS['module']);
 	switch ($check)
 	{
-	case "admin_only":
-	case "mem_only":
-	case "done":
+	case 'admin_only':
+	case 'mem_only':
+	case 'done':
 		// Does the module exists on local file system?
-		if ((FILE_READABLE(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
+		if ((isFileReadable(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
 			// Module is valid, active and located on the local disc...
 			$MOD_VALID = true;
 		} elseif (!empty($URL)) {
 			// An URL was specified so we load the de-referrer module
-			LOAD_URL(DEREFERER($URL));
+			redirectToUrl(DEREFERER($URL));
 		} elseif (getTotalFatalErrors() == 0) {
-			addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+			addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
 		}
 		break;
 
-	case "404":
-		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+	case '404':
+		addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
 		break;
 
-	case "locked":
-		if (!FILE_READABLE(constant('__MODULE'))) {
+	case 'locked':
+		if (!isFileReadable(constant('__MODULE'))) {
 			// Module does addionally not exists
-			addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+			addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
 		} // END - if
 
 		// Add fatal message
-		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
+		addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
 		break;
 
 	default:
 		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
-		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
+		addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
 		break;
 	}
 } elseif (getTotalFatalErrors() == 0) {
 	// MySQL problems!
-	addFatalMessage(getMessage('MYSQL_ERRORS'));
+	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
 }
 
 if (($MOD_VALID) && (defined('__MODULE'))) {
@@ -154,11 +152,11 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
 	/////////////////////////////////////////////
 	//
 	// Everything is okay so we can load the module
-	LOAD_INC_ONCE(constant('__MODULE'));
+	loadIncludeOnce(constant('__MODULE'));
 } // END - if
 
 // Next-to-end add the footer
-LOAD_INC_ONCE("inc/footer.php");
+loadIncludeOnce('inc/footer.php');
 
 //
 ?>