X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=modules.php;h=b8b9705bfe467c8eb0bbc23d48976bf4bedc1347;hb=30c4ffdadae5e5a2a39528fa9d8de4803055f123;hp=47fa7a3c0ad58eec9388f935812e2bbb68f33985;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/modules.php b/modules.php
index 47fa7a3c0a..b8b9705bfe 100644
--- a/modules.php
+++ b/modules.php
@@ -39,18 +39,18 @@
 // XDEBUG call
 //xdebug_start_trace();
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
+
+// Init output mode and module
 $GLOBALS['output_mode'] = 0;
-$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');
@@ -58,12 +58,12 @@ 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",
+	$result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
 		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()) {
@@ -107,39 +107,40 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($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 ((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
+		case 'cache_miss': // The cache is gone
+		case 'admin_only': // Admin-only access
+		case 'mem_only': // Member-only access
+		case 'done': // All fine!
+			// 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']));
-		} // 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;
+			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!