Fixes for doubler (not fully fixed) and rewrites for beg/doubler:

[mailer.git] / inc / module-functions.php

diff --git a/inc/module-functions.php b/inc/module-functions.php
index 7918a233e8533e8237ce3c398a873fc1b1025b68..beb8929522dfe78fb7b87a7fe046bde6ff8673ba 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -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