X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=71a861f0cd1b0be15ef48d4a2cfc81bd0f39ef7d;hp=cdb5daf0b8b29fc4790734598132132cd87a3129;hb=5071030af40e69ca4284642f44758964e18f5be8;hpb=59bd8a9805c51c895a92cc12825f4cbdfd792597

diff --git a/modules.php b/modules.php
index cdb5daf0b8..71a861f0cd 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"
-global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['output_mode'] = 0;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-$GLOBALS['userid'] = 0;
-
-// Fix missing module to "index"
-if (empty($_GET['module'])) $_GET['module'] = "index";
-
-// Secure action/what if present
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what']))   $GLOBALS['what']   = secureString($_GET['what']);
-
-// Secure the module name (very important line!)
-$GLOBALS['module'] = secureString($_GET['module']);
+$GLOBALS['what']   = '';
+$GLOBALS['action'] = '';
+$GLOBALS['module'] = '';
 
 // Needed include files
-require("inc/config.php");
+require('inc/config-global.php');
+
+// 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'));
-} elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
+	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":
-		// Does the module exists on local file system?
-		if ((FILE_READABLE(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));
-		} elseif (getTotalFatalErrors() == 0) {
-			addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
-		}
-		break;
-
-	case "404":
-		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
-		break;
-
-	case "locked":
-		if (!FILE_READABLE(constant('__MODULE'))) {
-			// Module does addionally not exists
-			addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
-		} // END - if
-
-		// Add fatal message
-		addFatalMessage(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));
-		break;
+		case 'admin_only':
+		case 'mem_only':
+		case 'done':
+			// Does the module exists on local file system?
+			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
+				redirectToUrl(DEREFERER($URL));
+			} elseif (getTotalFatalErrors() == 0) {
+				addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+			}
+			break;
+
+		case '404':
+			addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+			break;
+
+		case 'locked':
+			if (!isFileReadable(constant('__MODULE'))) {
+				// Module does addionally not exists
+				addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+			} // END - if
+
+			// Add fatal message
+			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(__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');
 
 //
 ?>