Complete rewrite and debug message surpressed:

- Function isExtensionInstalled() added
- rewritten all calls for error messages
- debug message about missing extension in database now only in debug-mode

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index e005e753b95a7fe87ade5427feda0898a19e913f..b62e9132845f16edf451cb6ad6cafffd6a83132c 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -257,7 +257,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
        if (!SQL_IS_LINK_UP()) return false;
 
        // Init variable
-       $query = "failed";
+       $query = 'failed';
 
        if ($strip === true) {
                $strip = "true";
@@ -291,7 +291,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
        eval($eval);
 
        // Was the eval() command fine?
-       if ($query == "failed") {
+       if ($query == 'failed') {
                // Something went wrong?
                debug_report_bug("eval={$eval}");
        } // END - if

diff --git a/inc/extensions.php b/inc/extensions.php
index e11a41a315f097b4d21d7b954e2f1d2beea2292e..62ab4f43018852eede4458dad60983498b366e17 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -392,7 +392,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
                if ($load_mode == 'remove') {
                        // Delete this extension (remember to remove it from your server *before* you click on welcome!
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-                       array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
+                               array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 
@@ -434,7 +434,7 @@ function EXT_IS_ACTIVE ($ext_name) {
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-               array($ext_name), __FUNCTION__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -493,7 +493,7 @@ function GET_EXT_VERSION ($ext_name) {
                if (SQL_NUMROWS($result) == 1) {
                        // Load entry
                        list($ext_ver) = SQL_FETCHROW($result);
-               } else {
+               } elseif (isDebugModeEnabled()) {
                        // Not found!
                        DEBUG_LOG(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name));
                }
@@ -1253,11 +1253,23 @@ function EXT_GET_REMOVAL_LIST () {
 // Redirects if the provided extension is not installed
 function redirectOnUninstalledExtension ($ext_name) {
        // So is the extension there?
-       if (!EXT_IS_ACTIVE($ext_name)) {
+       if ((!isExtensionInstalled($ext_name)) || (!EXT_IS_ACTIVE($ext_name))) {
                // Redirect to index
                redirectToUrl('modules.php?module=index&msg=' . getCode('EXTENSION_PROBLEM') . '&ext=' . $ext_name);
        } // END - if
 }
 
+// Determines wether the given extension is installed
+function isExtensionInstalled ($ext_name) {
+       // Default is not installed
+       $isInstalled = false;
+
+       // Check cache ext_version
+       $isInstalled = isset($GLOBALS['cache_array']['extensions']['ext_version'][$ext_name]);
+
+       // Return status
+       return $isInstalled;
+}
+
 //
 ?>

diff --git a/inc/functions.php b/inc/functions.php
index d157a7ed00344842431105feecb76d2b92f85811..d7a327592143bbfefa1a2c89601faf9ff7c9228d 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2655,7 +2655,7 @@ function convertCodeToMessage ($code) {
 
                case getCode('EXTENSION_PROBLEM'):
                        if (REQUEST_ISSET_GET('ext')) {
-                               $msg = generateExtensionInactiveMessage(REQUEST_GET('ext'));
+                               $msg = generateExtensionInactiveNotInstalledMessage(REQUEST_GET('ext'));
                        } else {
                                $msg = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
                        }
@@ -3296,26 +3296,73 @@ function isExtraTitleSet () {
 }
 
 // Generates a 'extension foo inactive' message
-function generateExtensionInactiveMessage ($ext) {
+function generateExtensionInactiveMessage ($ext_name) {
        // Is the extension empty?
-       if (empty($ext)) {
+       if (empty($ext_name)) {
                // This should not happen
                trigger_error(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
        } // END - if
 
        // Default message
-       $msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), $ext);
+       $msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
 
        // Is an admin logged in?
        if (IS_ADMIN()) {
                // Then output admin message
-               $msg = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE'), $ext);
+               $msg = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
        } // END - if
 
        // Return prepared message
        return $msg;
 }
 
+// Generates a 'extension foo not installed' message
+function generateExtensionNotInstalledMessage ($ext_name) {
+       // Is the extension empty?
+       if (empty($ext_name)) {
+               // This should not happen
+               trigger_error(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
+       } // END - if
+
+       // Default message
+       $msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+
+       // Is an admin logged in?
+       if (IS_ADMIN()) {
+               // Then output admin message
+               $msg = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+       } // END - if
+
+       // Return prepared message
+       return $msg;
+}
+
+// Generates a message depending on if the extension is not installed or not
+// just activated
+function generateExtensionInactiveNotInstalledMessage ($ext_name) {
+       // Init message
+       $message = '';
+
+       // Is the extension not installed or just deactivated?
+       switch (isExtensionInstalled($ext_name)) {
+               case true; // Deactivated!
+                       $message = generateExtensionInactiveMessage($ext_name);
+                       break;
+
+               case false; // Not installed!
+                       $message = generateExtensionNotInstalledMessage($ext_name);
+                       break;
+
+               default: // Should not happen!
+                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid state of extension %s detected.", $ext_name));
+                       $message = sprintf("Invalid state of extension %s detected.", $ext_name);
+                       break;
+       } // END - switch
+
+       // Return the message
+       return $message;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////

diff --git a/inc/language/de.php b/inc/language/de.php
index 4fb75efeb45b45edf24e45858e35e68db2c421c5..b48f6ee9b0a2b3761acab4cecec4bc683db07842 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -1057,8 +1057,10 @@ define('ADMIN_POINTS_REPAYED', "Es wurden dem Mitglied <span class=\"data\">%s</
 define('ADMIN_POINTS_TO_JACKPOT', "Es wurden <span class=\"data\">%s</span> {!POINTS!} in den Jackpot gelegt.");
 define('ADMIN_NO_POINTS_REPAYED', "Die Mailbuchung hatte keine {!POINTS!} zum zur&uuml;ckbuchen!");
 define('ADMIN_POINTS_SHREDDED', "Es wurden <span class=\"data\">%s</span> {!POINTS!} geschrettert.");
-define('EXTENSION_PROBLEM_EXT_INACTIVE', "Erweiterung <span class=\"data\">%s</span> deaktiviert! Fehler: Kann nicht fortfahren!");
+define('EXTENSION_PROBLEM_EXT_INACTIVE', "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> deaktiviert!");
 define('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{!URL!}/modules.php?module=admin&amp;what=extensions\">Hier</a> k&ouml;nnen Sie diese aktivieren.");
+define('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> nicht installiert!");
+define('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{!URL!}/modules.php?module=admin&amp;what=extensions\">Hier</a> k&ouml;nnen Sie diese aktivieren.");
 define('EXTENSION_PROBLEM_NOT_INSTALLED', "Erweiterung <span class=\"data\">%s</span> nicht installiert.");
 define('EXTENSION_PROBLEM_UNSET_EXT', "Skriptfehler: Parameter <strong>ext</strong> nicht gesetzt!");
 define('EXTENSION_WARNING_EXT_INACTIVE', "Die Erweiterung <span class=\"data\">%s</span> ist nicht aktiv. Dies kann zu St&ouml;rungen f&uuml;hren.<br />\nBitte aktivieren Sie diese unter <em>Verschiedenes-&gt;Erweiterungen</em>.");

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 04511c31430ea6ed6bf07600def8898a5acb4f65..5663a354b1f03089b7aa974b18abd0981f692793 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -70,7 +70,7 @@ function adminsCheckAdminAcl ($act, $wht) {
        }
 
        // Shall I test for a main or sub menu? (action or what?)
-       $acl_mode = "failed";
+       $acl_mode = 'failed';
        if ((GET_EXT_VERSION('cache') >= '0.1.2') && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
                // Lookup in cache
                if ((!empty($act)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid])) & ($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid] == $act)) {

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 5dd6d1aa713403bbd698baa82250ae154cf279da..edd70710bf42201e6cc37338af9129dab5ce3d05 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -194,20 +194,20 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array()
                        if (!empty($sql)) {
                                // Run SQL command
                                $result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__);
-                       }
+                       } // END - if
 
                        // Output message
                        if ((!$NO_UPDATE) && (IS_ADMIN())) {
                                LOAD_TEMPLATE('admin_settings_saved', false, $message);
-                       }
+                       } // END - if
                } else {
                        // Error found!
-                       $message = SPONSOR_GET_MESSAGE(getMessage('SPONSOR_DATA_NOT_SAVED'), "failed", $messageArray);
+                       $message = SPONSOR_GET_MESSAGE(getMessage('SPONSOR_DATA_NOT_SAVED'), 'failed', $messageArray);
                        LOAD_TEMPLATE('admin_settings_saved', false, $message);
                }
 
                // Shall we return the status?
-               if ($RET_STATUS) return $ret;
+               if ($RET_STATUS === true) return $ret;
 }
 //
 function sponsorTranslateUserStatus ($status) {

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index e236335de6ee403bcc76b168824ebc13e3999e67..3650465a5ef781c63ddd21d85de74871c9dfaee9 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -280,8 +280,8 @@ function yoomediaTranslateIndex ($type, $index) {
 
 // "Translate" error code
 function yoomediaTranslateError ($errorCode) {
-       // Default is "failed"
-       $return = "failed";
+       // Default is 'failed'
+       $return = 'failed';
 
        // Is the entry there?
        if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) {
@@ -289,6 +289,9 @@ function yoomediaTranslateError ($errorCode) {
                $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
        } else {
                // Log missing entries
+               print '<pre>';
+               debug_print_backtrace();
+               die('</pre>');
                DEBUG_LOG(__FUNCTION__, __LINE__, " errorCode={$errorCode}");
        }
 

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 18ebd57dc33ecec17a923c67d7143028394e4371..8897cf761970194fd9a8b15b4a03ec89f71519a7 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('task')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('task'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('task'));
        return;
 }
 

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 045b1e52dcb577d2e6eed0c3f6905e45fe2a544b..b78e6ba25384a7a760bedd7b7e95df3efdfd371b 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -156,7 +156,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                rebuildCacheFiles('admins', 'admin');
 
                // Login has failed by default... ;-)
-               $ret = "failed";
+               $ret = 'failed';
 
                // Password matches so login here
                if (LOGIN_ADMIN($admin_login, $data['password'])) {
@@ -165,12 +165,12 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                } // END - if
        } elseif ((empty($salt)) && ($ret == 'pass')) {
                // Something bad went wrong
-               $ret = "failed";
+               $ret = 'failed';
        } elseif ($ret == 'done') {
                // Try to login here if we have the old hashing way (sql_patches not installed?)
                if (!LOGIN_ADMIN($admin_login, $data['password'])) {
                        // Something went wrong
-                       $ret = "failed";
+                       $ret = 'failed';
                } // END - if
        }
 

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 0cc236cc3cadd907b0c1ffb0b356d148d25190fc..d6bca2db091f8db0c22bee6df6aca071a76d3303 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif (!EXT_IS_ACTIVE('other')) {
        // Missing extension!
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('other'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('other'));
        return;
 }
 

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index cbb169341c011935c30cc34e05747bc85b949943..b435d4ae36e58dc2ede06901502a1cb7d73958d6 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('yoomedia')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('yoomedia'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
 }
 

diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php
index a7f936380836e2b8ccae9826ef587c9c7509156a..088c0dca2dba3fc2cadf1922b57d78f08990d5a5 100644 (file)
--- a/inc/modules/admin/what-del_task.php
+++ b/inc/modules/admin/what-del_task.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('task')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('task'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('task'));
        return;
 }
 

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 79b0ab48131f4a96d4d6fcfa86c4bd982542f1c8..3f5d28cbc4254dbc863de07569c064849db5818a 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('mailid')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('mailid'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mailid'));
        return;
 }
 

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 877418b340a215c904740b85610d08f4740b271f..d56d74d9b15dc237b8df04754fe95e14229ac248 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('task')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('task'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('task'));
        return;
 }
 

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index a655d0a547f39043ec7046c435322b7def13db24..521cc90c12149b13d5a78719e5d1edf927fb9ef7 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('mailid')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('mailid'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mailid'));
        return;
 }
 

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 608e29e158187896a82e3cbd4430fa59827d7bd7..a0143e28a06c820d230a694c4240fc994bb8c862 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('user')) || (GET_EXT_VERSION('user') == '')) {
        // Missing extension!
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('user'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
        return;
 }
 

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 8457e3d09f07ca8b54533ef20d4eff7bbd3898ea..dd4e2303af607e7cfa5c8fab397fe3853182cc19 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -40,10 +40,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('yoomedia')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('yoomedia'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
 } elseif (!EXT_IS_ACTIVE('bonus')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bonus'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 
@@ -85,10 +85,19 @@ if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id'])))
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
-       $code = explode(" ", $result[0]['id']);
-       $code = $code[0];
-       $code = explode("<br />", $code);
-       $code = $code[0];
+       $codeArray = explode(" ", $result[0]['id']);
+       $code = $codeArray[0];
+       $codeArray = explode("<br />", $code);
+       $code = $codeArray[0];
+       $codeArray = explode("<br>", $code);
+       $code = $codeArray[0];
+
+       // Remove all new-line characters
+       $codeArray = explode("\n", $code);
+       $code = $codeArray[0];
+
+       // Remove carrige-return
+       $code = str_replace("\n", '', $code);
 
        // Output message
        LOAD_TEMPLATE('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(yoomediaTranslateError($code))));

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 837cf5eb9fade3a12bc818a6accec75ebac4c5d7..5e9794bf2d5c3c4385892daa9365669fe073de6c 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('order')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('order'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
 }
 

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 7ada1d712c3ba26ba346bd3c7bf7da6e8a86e5d4..1e4c1d3d7b2e20e690149d4649efac877c3d742a 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('theme')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 8fcec416c3a9f3d9a51cf28bb8bf0b1e650f1cfe..31b565a7c9c003bf0054a1be30ac3e607b0c326d 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('theme')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index 7df879cded1724abccfc5f8b0e3dcd2b5a4a7188..1dcd93d11ed31b97a499ab8ae858da252540dc52 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage(''));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage(''));
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 7be1cea40beeb64dc5caf1ea72d22b0807c9d752..b53694dd7ac276e3ca4f1c4364d45f4fe8a8d863 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif ($GLOBALS['block_mode']) {
        // Block mode detected

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 6b3118598508712cdb521df6d5c0ee6fe75069dd..80210b25438b0366ed15dfa08f3794fcf6d512a0 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index 9fedf82f0e88305d0df42f35019fb7cac52852eb..d41f722fe495d0c7665b123d1f848b94126596a4 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('active')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('active'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('active'));
        return;
 }
 

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index 0ccdf2faf2167c48b84b51cd28361fc7a9c23b24..6a224c3c0bbc815ba9ffda42fd9366e3bd4dc165 100644 (file)
--- a/inc/modules/guest/what-beg.php
+++ b/inc/modules/guest/what-beg.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('beg'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index ec07d7968c2d27d0640f7393f1c4796bcd2376a8..418557d367a1439c6c265262d6d951d29ee4b901 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('doubler')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('doubler'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('doubler'));
        return;
 }
 

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 9da2af3220a3ae6905880c4ec11b5917fc7d5e9d..04c9285dfad43228f548c61039868a1d7121f89b 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('user')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('user'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
        return;
 }
 

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 6f112149db546383fbd8627d01847c1c199da14f..2d6d3c0a531406bbe2aad051af998a48db496208 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('mediadata')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('mediadata'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mediadata'));
        return;
 }
 

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index c6a235ad38b38b4ac7da0e91dae40c48eb7b4732..fffb7ab63846a31d2e8485069fbd1e895148bd70 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('rallye')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('rallye'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('rallye'));
        return;
 }
 

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 31192f0d35e950bf8e4bc15682c939d2baf6ab73..44b47978d9b3219859bafc82492e5bdb620105ad 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('register'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('register'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('register'));
        return;
 }
 

diff --git a/inc/modules/guest/what-sponsor_agb.php b/inc/modules/guest/what-sponsor_agb.php
index a3cd85da1a0f45af2738345aba973b27768001d7..05d1ea5826bf049b255711f8c8c6cb8d99bc9aeb 100644 (file)
--- a/inc/modules/guest/what-sponsor_agb.php
+++ b/inc/modules/guest/what-sponsor_agb.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 }
 

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index 3b95669058728ab815088a676105b811ab09aea4..7b20ab7fb4246a27287afa7e7ce96d0a7d32e162 100644 (file)
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 }
 

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index fdbcf0ca11e346e64d787ef0b60a48851f463aab..2d2d5485d4b5a2489d254c6342b9a2b98f4cfd8b 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 }
 

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 0554e2cc6636550a637fc29676c32a971c37c2cb..86f7f0b48b80e314c8efa99a64a99c57f0bf8c52 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 }
 

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index 05ab1bb19c8673aca51a48ef9f11149b75de7966..b784135a098b63a4bbda012909148c1269319e5b 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('top10')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('top10'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('top10'));
        return;
 }
 

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index d8449c08cccc9878caa0c6ece9cb4869b6c62192..9b131e71ab384a20eff42bd078872e0baec4a5d2 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('wernis')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('wernis'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('wernis'));
        return;
 }
 

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index 4ca4e74c44b4e6300cf51509a06b5e5496b0c938..e238f6d920206187923c47f689d7d7a00126467e 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_LOGGED_IN()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage(''));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage(''));
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index a1d15b16f3e20af89c8b974a1143b4ca62a938de..dbf88b3647f87e12edbfd05636a00dde69e8cbfb 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bank'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
 } elseif ($GLOBALS['block_mode']) {
        // Block mode detected

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 1a93c3526c90ba1e2dc51f21e530b88ba4bd7671..756a6b232e157bec0caf4e7dc352249643a593eb 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('order'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
 } elseif ($GLOBALS['block_mode']) {
        // Block mode detected

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index 1aae77c40598b8f445e7115cb0098ddc45454f9d..24945ce4f02ecb63860cb2338686705600d0e5a5 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('surfbar'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('surfbar'));
        return;
 } elseif ($GLOBALS['block_mode']) {
        // Block mode detected

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 3676d0746e20dd427643d4aaafacbd8455dab7cc..2bce462e88b4339c47107886d9161953ca6cc3f1 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 

diff --git a/inc/modules/member/what-bank_create.php b/inc/modules/member/what-bank_create.php
index f5c2dbd2b4627acf7f11236c63efaa389f37286f..23366aa516a9eb2213c298f6572ed9645d537508 100644 (file)
--- a/inc/modules/member/what-bank_create.php
+++ b/inc/modules/member/what-bank_create.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bank'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');

diff --git a/inc/modules/member/what-bank_deposit.php b/inc/modules/member/what-bank_deposit.php
index 8591bd5c7fa1a7e95a31c2419e953bfca0193de1..6b995fd5b7f1930930464e6a041bbc70bbc5981a 100644 (file)
--- a/inc/modules/member/what-bank_deposit.php
+++ b/inc/modules/member/what-bank_deposit.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bank'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
 }
 

diff --git a/inc/modules/member/what-bank_infos.php b/inc/modules/member/what-bank_infos.php
index 031413088069aa4d16a0b3653d0c43fb14bff20f..2707a6f156dddcab00e77b6f00fa1ba970c8b341 100644 (file)
--- a/inc/modules/member/what-bank_infos.php
+++ b/inc/modules/member/what-bank_infos.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bank'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
 }
 

diff --git a/inc/modules/member/what-bank_output.php b/inc/modules/member/what-bank_output.php
index 031413088069aa4d16a0b3653d0c43fb14bff20f..2707a6f156dddcab00e77b6f00fa1ba970c8b341 100644 (file)
--- a/inc/modules/member/what-bank_output.php
+++ b/inc/modules/member/what-bank_output.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bank'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
 }
 

diff --git a/inc/modules/member/what-bank_withdraw.php b/inc/modules/member/what-bank_withdraw.php
index 031413088069aa4d16a0b3653d0c43fb14bff20f..2707a6f156dddcab00e77b6f00fa1ba970c8b341 100644 (file)
--- a/inc/modules/member/what-bank_withdraw.php
+++ b/inc/modules/member/what-bank_withdraw.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bank'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
 }
 

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index f2887a25dea22c5f23bd82020bb0e8ca8cc92a16..e0fb928d31c23dd64f01f2da22031aaf32337bef 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('beg'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index a681c7fa0b13df5b52a6fbc9fa2ee9e634aa4a19..f6ab9f729a446cba959c0be956916a21b22b18a1 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('beg'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 6fd3e4410bb5ed0bafcc999b5c2bd13fe787a385..895a23c5fe1013f3f11954fd1974c751144d875b 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('bonus')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bonus'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index 6249d0a3675d23bb85bbf32a4c518d55af489cfe..d9fe1ec430cc5725b1038d998c3212dd159975c2 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('doubler')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('doubler'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('doubler'));
        return;
 }
 

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 9797991f8169df9e700dd5548b04c05f7dec4b5d..d7f8b2bb7cafb28924482b1ef33a63383c42adb8 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('holiday')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('holiday'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('holiday'));
        return;
 }
 

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 4f3b61e135568369938c5f889b6484dbeba18ff4..f00ec341fdc301a639d490fa19b593fc616e6a64 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('html_mail')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('html_mail'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('html_mail'));
        return;
 }
 

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index c14cb099ce3c5b3bf41f905fcc468da98a7e2f5e..e1fef3486a905b26568ddab6218e91d58b2b8cb6 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('mydata')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('mydata'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mydata'));
        return;
 }
 

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index ec76990ad0f5a9381361de4786e37e7cdecfed7e..1e815de44523942417d3a495bdd3029dc5dda0c0 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('newsletter')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('newsletter'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('newsletter'));
        return;
 }
 

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 1d9bd8946043169b0a9504cad4fefad9e5d5f69a..7a61a8951c56447d9aefde9127cd9635ac7b003c 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('nickname')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('nickname'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('nickname'));
        return;
 }
 

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 64b56b595079acf79936c0153961ab907af05a85..503676b48f0797585540ab7cc71344ee8052c609 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('order'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
 }
 

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index af8b3c2a11a2e623d6826a3f017abd1bf1f3ce49..f9b5405b394e2444738264e426c9de7c193665c7 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
        // Not logged in
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('payout')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('payout'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('payout'));
        return;
 }
 

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 58f7016b3b21c67e22aa6ee2b0287f3b9fb847ce..0624cd4f2fdb7da4b039e5a2d460daeac4ff6243 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -197,7 +197,7 @@ if (EXT_IS_ACTIVE('user')) {
        LOAD_TEMPLATE("member_points");
 } elseif (IS_ADMIN()) {
        // Missing extension
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('user'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
 } else {
        // Message for user
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PROBLEM_POINTS_OVERVIEW_UNAVAILABLE'));

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 7ee4c9878c522d90c8ebadb04657e078ae05e507..7cc98acb71a6f46b791335a32508740a72fab479 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('primera')) && (!IS_ADMIN())) {
        // Extension 'primera' is not activated
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('primera'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('primera'));
        return;
 }
 

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index f6e6f03fe7960cd7d047c32a6d161a545301b1b0..fce5430be71ff433d64fd821d861edcb6b18d44c 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('rallye')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('rallye'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('rallye'));
        return;
 }
 

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index 7916265d40222305349ff680c28341b63d793f29..75ebc941335ed583f5631bc2a60afe2c9dd2fc1c 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
        // User is not logged in
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('refback')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('refback'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('refback'));
        return;
 }
 

diff --git a/inc/modules/member/what-sponsor.php b/inc/modules/member/what-sponsor.php
index aa0ba8c4e5004a9525cc850c1fc5236b7c319706..08150b95786edc2b20b7646c6d00abe6ea924d5c 100644 (file)
--- a/inc/modules/member/what-sponsor.php
+++ b/inc/modules/member/what-sponsor.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('sponsor')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 }
 

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 13ef8d055176c74215d3ef67e6b7159cb7b5f838..592fb1b3c0b712042d319319408810dbeb98c7b0 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 }  elseif (!IS_MEMBER()){
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('support')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('support'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('support'));
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index 7db373f5434cc5404b619db6c889b6ad94a38c9f..f98b2844e1930a4d29c58ac420072a0238d5ba1c 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
        // Redirect
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('surfbar'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('surfbar'));
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 52831e25527994c4700ca15fd578115445368cd7..46583ddd84ee995d7c0538119735fa0b20c94737 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('surfbar'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('surfbar'));
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php
index 8a1043942c7930e6f14a4057f5c7d95e6f15cec4..23033cd6039ea8927bb546109c67f6060066f5d1 100644 (file)
--- a/inc/modules/member/what-surfbar_start.php
+++ b/inc/modules/member/what-surfbar_start.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
        // Not logged in
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('surfbar'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('surfbar'));
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php
index 76f4fb43a882a295ba30499582b02c141d59d6de..aa613d75ba4b31813da97881db7f256ed71db7c7 100644 (file)
--- a/inc/modules/member/what-surfbar_stats.php
+++ b/inc/modules/member/what-surfbar_stats.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('surfbar'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('surfbar'));
        return;
 }
 

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index fa3e614a33fc0383bdde5351f1bef10e7617489e..51ffcb580bae907891930b97176501c946bc00fc 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index caf44d5ee9b542bd60fc1f9b1e4e8d654f480a2f..e7691f0cf9584d3fb70d5678d11bc3a494748641 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('transfer')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('transfer'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('transfer'));
        return;
 }
 

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index 507209c992ed170d6245a05f4818645c53d0df8f..bc7327ded42b57a8f741727dc3b29018178c209b 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
        // User is not logged in
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('wernis')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('wernis'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('wernis'));
        return;
 }
 

diff --git a/inc/modules/order.php b/inc/modules/order.php
index af09ab9b865cb0cf639bccc52adbf99b704b244f..01ec35f27244911f07e20e3ef868abcf071f2b01 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('order'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!

diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index 2a2a7fc125caff191a60358b803f1cd6b3486076..d42bcc63db35541c38d0d076e6446cfb79f4e4f7 100644 (file)
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php
index 469cc3e1d9703ae6aec33614d7ee05041e124d6b..8b34a5729b04e36fe23d1e43441fd338f2807f52 100644 (file)
--- a/inc/modules/sponsor/.php
+++ b/inc/modules/sponsor/.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index a2eeaeb420396f75bdc595f68bf143ef3a85f4f6..1052d83b0cddc4294bbc01baea1311c9c600608d 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('sponsor')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 74b96ad9eb9e529260456c71b767d2a55fa6e6fd..84c91655f184e79fdc2f62491a08b6c80ef2b393 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('sponsor')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 24a979a389f5635e5b6d2dd8745b4935ae8c30bf..fd4d4fbf0e334e4038e5bcb527faa0a9be93d73f 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('sponsor')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!