X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodule-functions.php;h=1c8e80957f7742cb7ee2ff272f6875700f69b6af;hp=98eb9c1b46395521eed7fe86aad316f0aa5b4bb5;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hpb=4394f29aa38d7bc352a00b797a855f32c2eac8a2

diff --git a/inc/module-functions.php b/inc/module-functions.php
index 98eb9c1b46..1c8e80957f 100644
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle MySQL-Relevanten Funktionen                 *
  * -------------------------------------------------------------------- *
- * $Revision:: 1910                                                   $ *
- * $Date:: 2010-06-29 06:00:23 +0200 (Tue, 29 Jun 2010)               $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: quix0r                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -49,7 +49,7 @@ function getModuleTitle ($module) {
 	$result = false;
 
 	// Is the script installed?
-	if (isInstalled()) {
+	if ((isInstalled()) && ($module != 'error')) {
 		// Check if cache is valid
 		if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($module, $GLOBALS['cache_array']['modules']['module']))) {
 			// Load from cache
@@ -78,12 +78,18 @@ function getModuleTitle ($module) {
 
 	// Still no luck or empty title?
 	if (empty($data['title'])) {
-		// No name found
-		$data['title'] = getMaskedMessage('UNKNOWN_MODULE_DETECTED', $module);
-		if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
-			// Add module to database
-			$dummy = checkModulePermissions($module);
-		} // END - if
+		// Is it 'error'?
+		if ($module == 'error') {
+			// Error (real module was not found)
+			$data['title'] = getMessage('MODULE_ERROR_404');
+		}  else {
+			// No name found
+			$data['title'] = getMaskedMessage('UNKNOWN_MODULE_DETECTED', $module);
+			if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
+				// Add module to database
+				$dummy = checkModulePermissions($module);
+			} // END - if
+		}
 	} // END - if
 
 	// Return name
@@ -230,7 +236,7 @@ function checkModulePermissions ($module = '') {
 
 			// Destroy cache here
 			// @TODO Rewrite this to a filter
-			if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
+			if ((isHtmlOutputMode()) || (isRawOutputMode())) rebuildCache('modules', 'modules');
 
 			// And reload data
 			unset($GLOBALS['module_status'][$module]);
@@ -239,7 +245,7 @@ function checkModulePermissions ($module = '') {
 			// Module not found we don't add it to the database
 			$ret = '404';
 		}
-	} elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
+	} elseif (($ret == 'cache_miss') && (isHtmlOutputMode())) {
 		// Rebuild the cache files
 		rebuildCache('modules', 'modules');
 	} elseif ($found === false) {
@@ -251,7 +257,7 @@ function checkModulePermissions ($module = '') {
 			$data['hidden'],
 			$data['mem_only'],
 			$data['admin_only'],
-			getOutputMode()
+			getScriptOutputMode()
 		));
 	}