Complete rewrite and debug message surpressed:
authorRoland Häder <roland@mxchange.org>
Sun, 26 Jul 2009 16:07:55 +0000 (16:07 +0000)
committerRoland Häder <roland@mxchange.org>
Sun, 26 Jul 2009 16:07:55 +0000 (16:07 +0000)
- Function isExtensionInstalled() added
- rewritten all calls for error messages
- debug message about missing extension in database now only in debug-mode

76 files changed:
inc/db/lib-mysql3.php
inc/extensions.php
inc/functions.php
inc/language/de.php
inc/libs/admins_functions.php
inc/libs/sponsor_functions.php
inc/libs/yoomedia_functions.php
inc/modules/admin/action-task.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-config_other.php
inc/modules/admin/what-config_yoomedia.php
inc/modules/admin/what-del_task.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_yoomedia_tm.php
inc/modules/admin/what-send_bonus.php
inc/modules/admin/what-theme_edit.php
inc/modules/admin/what-theme_import.php
inc/modules/guest/action-
inc/modules/guest/action-sponsor.php
inc/modules/guest/action-themes.php
inc/modules/guest/what-active.php
inc/modules/guest/what-beg.php
inc/modules/guest/what-doubler.php
inc/modules/guest/what-login.php
inc/modules/guest/what-mediadata.php
inc/modules/guest/what-rallyes.php
inc/modules/guest/what-register.php
inc/modules/guest/what-sponsor_agb.php
inc/modules/guest/what-sponsor_infos.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-sponsor_reg.php
inc/modules/guest/what-top10.php
inc/modules/guest/what-wernis_portal.php
inc/modules/member/action-
inc/modules/member/action-bank.php
inc/modules/member/action-order.php
inc/modules/member/action-surfbar.php
inc/modules/member/action-themes.php
inc/modules/member/what-bank_create.php
inc/modules/member/what-bank_deposit.php
inc/modules/member/what-bank_infos.php
inc/modules/member/what-bank_output.php
inc/modules/member/what-bank_withdraw.php
inc/modules/member/what-beg.php
inc/modules/member/what-beg2.php
inc/modules/member/what-bonus.php
inc/modules/member/what-doubler.php
inc/modules/member/what-holiday.php
inc/modules/member/what-html_mail.php
inc/modules/member/what-mydata.php
inc/modules/member/what-newsletter.php
inc/modules/member/what-nickname.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-points.php
inc/modules/member/what-primera.php
inc/modules/member/what-rallyes.php
inc/modules/member/what-refback.php
inc/modules/member/what-sponsor.php
inc/modules/member/what-support.php
inc/modules/member/what-surfbar_book.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-surfbar_start.php
inc/modules/member/what-surfbar_stats.php
inc/modules/member/what-themes.php
inc/modules/member/what-transfer.php
inc/modules/member/what-wernis.php
inc/modules/order.php
inc/modules/sponsor.php
inc/modules/sponsor/.php
inc/modules/sponsor/account.php
inc/modules/sponsor/settings.php
inc/modules/sponsor/welcome.php

index e005e75..b62e913 100644 (file)
@@ -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
index e11a41a..62ab4f4 100644 (file)
@@ -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&amp;msg=' . getCode('EXTENSION_PROBLEM') . '&amp;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;
+}
+
 //
 ?>
index d157a7e..d7a3275 100644 (file)
@@ -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 //
 //////////////////////////////////////////////////
index 4fb75ef..b48f6ee 100644 (file)
@@ -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>.");
index 04511c3..5663a35 100644 (file)
@@ -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)) {
index 5dd6d1a..edd7071 100644 (file)
@@ -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) {
index e236335..3650465 100644 (file)
@@ -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}");
        }
 
index 18ebd57..8897cf7 100644 (file)
@@ -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;
 }
 
index 045b1e5..b78e6ba 100644 (file)
@@ -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
        }
 
index 0cc236c..d6bca2d 100644 (file)
@@ -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;
 }
 
index cbb1693..b435d4a 100644 (file)
@@ -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;
 }
 
index a7f9363..088c0dc 100644 (file)
@@ -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;
 }
 
index 79b0ab4..3f5d28c 100644 (file)
@@ -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;
 }
 
index 877418b..d56d74d 100644 (file)
@@ -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;
 }
 
index a655d0a..521cc90 100644 (file)
@@ -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;
 }
 
index 608e29e..a0143e2 100644 (file)
@@ -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;
 }
 
index 8457e3d..dd4e230 100644 (file)
@@ -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))));
index 837cf5e..5e9794b 100644 (file)
@@ -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;
 }
 
index 7ada1d7..1e4c1d3 100644 (file)
@@ -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;
 }
 
index 8fcec41..31b565a 100644 (file)
@@ -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;
 }
 
index 7df879c..1dcd93d 100644 (file)
@@ -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
index 7be1cea..b53694d 100644 (file)
@@ -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
index 6b31185..80210b2 100644 (file)
@@ -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;
 }
 
index 9fedf82..d41f722 100644 (file)
@@ -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;
 }
 
index 0ccdf2f..6a224c3 100644 (file)
@@ -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;
 }
 
index ec07d79..418557d 100644 (file)
@@ -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;
 }
 
index 9da2af3..04c9285 100644 (file)
@@ -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;
 }
 
index 6f11214..2d6d3c0 100644 (file)
@@ -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;
 }
 
index c6a235a..fffb7ab 100644 (file)
@@ -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;
 }
 
index 31192f0..44b4797 100644 (file)
@@ -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;
 }
 
index a3cd85d..05d1ea5 100644 (file)
@@ -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;
 }
 
index 3b95669..7b20ab7 100644 (file)
@@ -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;
 }
 
index fdbcf0c..2d2d548 100644 (file)
@@ -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;
 }
 
index 0554e2c..86f7f0b 100644 (file)
@@ -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;
 }
 
index 05ab1bb..b784135 100644 (file)
@@ -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;
 }
 
index d8449c0..9b131e7 100644 (file)
@@ -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;
 }
 
index 4ca4e74..e238f6d 100644 (file)
@@ -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
index a1d15b1..dbf88b3 100644 (file)
@@ -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
index 1a93c35..756a6b2 100644 (file)
@@ -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
index 1aae77c..24945ce 100644 (file)
@@ -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
index 3676d07..2bce462 100644 (file)
@@ -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;
 }
 
index f5c2dbd..23366aa 100644 (file)
@@ -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');
index 8591bd5..6b995fd 100644 (file)
@@ -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;
 }
 
index 0314130..2707a6f 100644 (file)
@@ -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;
 }
 
index 0314130..2707a6f 100644 (file)
@@ -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;
 }
 
index 0314130..2707a6f 100644 (file)
@@ -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;
 }
 
index f2887a2..e0fb928 100644 (file)
@@ -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;
 }
 
index a681c7f..f6ab9f7 100644 (file)
@@ -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;
 }
 
index 6fd3e44..895a23c 100644 (file)
@@ -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;
 }
 
index 6249d0a..d9fe1ec 100644 (file)
@@ -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;
 }
 
index 9797991..d7f8b2b 100644 (file)
@@ -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;
 }
 
index 4f3b61e..f00ec34 100644 (file)
@@ -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;
 }
 
index c14cb09..e1fef34 100644 (file)
@@ -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;
 }
 
index ec76990..1e815de 100644 (file)
@@ -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;
 }
 
index 1d9bd89..7a61a89 100644 (file)
@@ -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;
 }
 
index 64b56b5..503676b 100644 (file)
@@ -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;
 }
 
index af8b3c2..f9b5405 100644 (file)
@@ -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;
 }
 
index 58f7016..0624cd4 100644 (file)
@@ -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'));
index 7ee4c98..7cc98ac 100644 (file)
@@ -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;
 }
 
index f6e6f03..fce5430 100644 (file)
@@ -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;
 }
 
index 7916265..75ebc94 100644 (file)
@@ -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;
 }
 
index aa0ba8c..08150b9 100644 (file)
@@ -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;
 }
 
index 13ef8d0..592fb1b 100644 (file)
@@ -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;
 }
 
index 7db373f..f98b284 100644 (file)
@@ -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;
 }
 
index 52831e2..46583dd 100644 (file)
@@ -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;
 }
 
index 8a10439..23033cd 100644 (file)
@@ -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;
 }
 
index 76f4fb4..aa613d7 100644 (file)
@@ -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;
 }
 
index fa3e614..51ffcb5 100644 (file)
@@ -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;
 }
 
index caf44d5..e7691f0 100644 (file)
@@ -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;
 }
 
index 507209c..bc7327d 100644 (file)
@@ -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;
 }
 
index af09ab9..01ec35f 100644 (file)
@@ -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!
index 2a2a7fc..d42bcc6 100644 (file)
@@ -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!
index 469cc3e..8b34a57 100644 (file)
@@ -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!
index a2eeaeb..1052d83 100644 (file)
@@ -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!
index 74b96ad..84c9165 100644 (file)
@@ -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!
index 24a979a..fd4d4fb 100644 (file)
@@ -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!