From 1e2a4228e071a67a2d79e970a843e3e30476cfb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 26 Jul 2009 16:07:55 +0000 Subject: [PATCH] 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 --- inc/db/lib-mysql3.php | 4 +- inc/extensions.php | 20 ++++++-- inc/functions.php | 57 +++++++++++++++++++-- inc/language/de.php | 4 +- inc/libs/admins_functions.php | 2 +- inc/libs/sponsor_functions.php | 8 +-- inc/libs/yoomedia_functions.php | 7 ++- inc/modules/admin/action-task.php | 2 +- inc/modules/admin/admin-inc.php | 6 +-- inc/modules/admin/what-config_other.php | 2 +- inc/modules/admin/what-config_yoomedia.php | 2 +- inc/modules/admin/what-del_task.php | 2 +- inc/modules/admin/what-list_links.php | 2 +- inc/modules/admin/what-list_task.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 2 +- inc/modules/admin/what-list_user.php | 2 +- inc/modules/admin/what-list_yoomedia_tm.php | 21 +++++--- inc/modules/admin/what-send_bonus.php | 2 +- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-theme_import.php | 2 +- inc/modules/guest/action- | 2 +- inc/modules/guest/action-sponsor.php | 2 +- inc/modules/guest/action-themes.php | 2 +- inc/modules/guest/what-active.php | 2 +- inc/modules/guest/what-beg.php | 2 +- inc/modules/guest/what-doubler.php | 2 +- inc/modules/guest/what-login.php | 2 +- inc/modules/guest/what-mediadata.php | 2 +- inc/modules/guest/what-rallyes.php | 2 +- inc/modules/guest/what-register.php | 2 +- inc/modules/guest/what-sponsor_agb.php | 2 +- inc/modules/guest/what-sponsor_infos.php | 2 +- inc/modules/guest/what-sponsor_login.php | 2 +- inc/modules/guest/what-sponsor_reg.php | 2 +- inc/modules/guest/what-top10.php | 2 +- inc/modules/guest/what-wernis_portal.php | 2 +- inc/modules/member/action- | 2 +- inc/modules/member/action-bank.php | 2 +- inc/modules/member/action-order.php | 2 +- inc/modules/member/action-surfbar.php | 2 +- inc/modules/member/action-themes.php | 2 +- inc/modules/member/what-bank_create.php | 2 +- inc/modules/member/what-bank_deposit.php | 2 +- inc/modules/member/what-bank_infos.php | 2 +- inc/modules/member/what-bank_output.php | 2 +- inc/modules/member/what-bank_withdraw.php | 2 +- inc/modules/member/what-beg.php | 2 +- inc/modules/member/what-beg2.php | 2 +- inc/modules/member/what-bonus.php | 2 +- inc/modules/member/what-doubler.php | 2 +- inc/modules/member/what-holiday.php | 2 +- inc/modules/member/what-html_mail.php | 2 +- inc/modules/member/what-mydata.php | 2 +- inc/modules/member/what-newsletter.php | 2 +- inc/modules/member/what-nickname.php | 2 +- inc/modules/member/what-order.php | 2 +- inc/modules/member/what-payout.php | 2 +- inc/modules/member/what-points.php | 2 +- inc/modules/member/what-primera.php | 2 +- inc/modules/member/what-rallyes.php | 2 +- inc/modules/member/what-refback.php | 2 +- inc/modules/member/what-sponsor.php | 2 +- inc/modules/member/what-support.php | 2 +- inc/modules/member/what-surfbar_book.php | 2 +- inc/modules/member/what-surfbar_list.php | 2 +- inc/modules/member/what-surfbar_start.php | 2 +- inc/modules/member/what-surfbar_stats.php | 2 +- inc/modules/member/what-themes.php | 2 +- inc/modules/member/what-transfer.php | 2 +- inc/modules/member/what-wernis.php | 2 +- inc/modules/order.php | 2 +- inc/modules/sponsor.php | 2 +- inc/modules/sponsor/.php | 2 +- inc/modules/sponsor/account.php | 2 +- inc/modules/sponsor/settings.php | 2 +- inc/modules/sponsor/welcome.php | 2 +- 76 files changed, 168 insertions(+), 95 deletions(-) diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index e005e753b9..b62e913284 100644 --- 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 e11a41a315..62ab4f4301 100644 --- 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 d157a7ed00..d7a3275921 100644 --- 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 4fb75efeb4..b48f6ee9b0 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -1057,8 +1057,10 @@ define('ADMIN_POINTS_REPAYED', "Es wurden dem Mitglied %s%s {!POINTS!} in den Jackpot gelegt."); define('ADMIN_NO_POINTS_REPAYED', "Die Mailbuchung hatte keine {!POINTS!} zum zurückbuchen!"); define('ADMIN_POINTS_SHREDDED', "Es wurden %s {!POINTS!} geschrettert."); -define('EXTENSION_PROBLEM_EXT_INACTIVE', "Erweiterung %s deaktiviert! Fehler: Kann nicht fortfahren!"); +define('EXTENSION_PROBLEM_EXT_INACTIVE', "Kann nicht fortfahren! Fehler: Erweiterung %s deaktiviert!"); define('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', "Die Erweiterung %s ist derzeit deaktiviert. Hier können Sie diese aktivieren."); +define('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', "Kann nicht fortfahren! Fehler: Erweiterung %s nicht installiert!"); +define('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', "Die Erweiterung %s ist derzeit nicht installiert. Hier können Sie diese aktivieren."); define('EXTENSION_PROBLEM_NOT_INSTALLED', "Erweiterung %s nicht installiert."); define('EXTENSION_PROBLEM_UNSET_EXT', "Skriptfehler: Parameter ext nicht gesetzt!"); define('EXTENSION_WARNING_EXT_INACTIVE', "Die Erweiterung %s ist nicht aktiv. Dies kann zu Störungen führen.
\nBitte aktivieren Sie diese unter Verschiedenes->Erweiterungen."); diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 04511c3143..5663a354b1 100644 --- 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 5dd6d1aa71..edd70710bf 100644 --- 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 e236335de6..3650465a5e 100644 --- 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 '
';
+		debug_print_backtrace();
+		die('
'); DEBUG_LOG(__FUNCTION__, __LINE__, " errorCode={$errorCode}"); } diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php index 18ebd57dc3..8897cf7619 100644 --- 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 045b1e52dc..b78e6ba253 100644 --- 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 0cc236cc3c..d6bca2db09 100644 --- 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 cbb169341c..b435d4ae36 100644 --- 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 a7f9363808..088c0dca2d 100644 --- 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 79b0ab4813..3f5d28cbc4 100644 --- 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 877418b340..d56d74d9b1 100644 --- 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 a655d0a547..521cc90c12 100644 --- 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 608e29e158..a0143e28a0 100644 --- 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 8457e3d09f..dd4e2303af 100644 --- 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("
", $code); - $code = $code[0]; + $codeArray = explode(" ", $result[0]['id']); + $code = $codeArray[0]; + $codeArray = explode("
", $code); + $code = $codeArray[0]; + $codeArray = explode("
", $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 837cf5eb9f..5e9794bf2d 100644 --- 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 7ada1d712c..1e4c1d3d7b 100644 --- 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 8fcec416c3..31b565a7c9 100644 --- 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 7df879cded..1dcd93d11e 100644 --- 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 7be1cea40b..b53694dd7a 100644 --- 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 6b31185985..80210b2543 100644 --- 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 9fedf82f0e..d41f722fe4 100644 --- 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 0ccdf2faf2..6a224c3c0b 100644 --- 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 ec07d7968c..418557d367 100644 --- 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 9da2af3220..04c9285dfa 100644 --- 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 6f112149db..2d6d3c0a53 100644 --- 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 c6a235ad38..fffb7ab638 100644 --- 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 31192f0d35..44b47978d9 100644 --- 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 a3cd85da1a..05d1ea5826 100644 --- 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 3b95669058..7b20ab7fb4 100644 --- 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 fdbcf0ca11..2d2d5485d4 100644 --- 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 0554e2cc66..86f7f0b48b 100644 --- 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 05ab1bb19c..b784135a09 100644 --- 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 d8449c08cc..9b131e71ab 100644 --- 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 4ca4e74c44..e238f6d920 100644 --- 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 a1d15b16f3..dbf88b3647 100644 --- 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 1a93c3526c..756a6b232e 100644 --- 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 1aae77c405..24945ce4f0 100644 --- 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 3676d0746e..2bce462e88 100644 --- 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 f5c2dbd2b4..23366aa516 100644 --- 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 8591bd5c7f..6b995fd5b7 100644 --- 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 0314130880..2707a6f156 100644 --- 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 0314130880..2707a6f156 100644 --- 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 0314130880..2707a6f156 100644 --- 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 f2887a25de..e0fb928d31 100644 --- 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 a681c7fa0b..f6ab9f729a 100644 --- 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 6fd3e4410b..895a23c5fe 100644 --- 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 6249d0a367..d9fe1ec430 100644 --- 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 9797991f81..d7f8b2bb7c 100644 --- 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 4f3b61e135..f00ec341fd 100644 --- 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 c14cb099ce..e1fef3486a 100644 --- 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 ec76990ad0..1e815de445 100644 --- 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 1d9bd89460..7a61a8951c 100644 --- 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 64b56b5950..503676b48f 100644 --- 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 af8b3c2a11..f9b5405b39 100644 --- 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 58f7016b3b..0624cd4f2f 100644 --- 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 7ee4c9878c..7cc98acb71 100644 --- 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 f6e6f03fe7..fce5430be7 100644 --- 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 7916265d40..75ebc94133 100644 --- 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 aa0ba8c4e5..08150b9578 100644 --- 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 13ef8d0551..592fb1b3c0 100644 --- 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 7db373f543..f98b2844e1 100644 --- 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 52831e2552..46583ddd84 100644 --- 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 8a1043942c..23033cd603 100644 --- 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 76f4fb43a8..aa613d75ba 100644 --- 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 fa3e614a33..51ffcb580b 100644 --- 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 caf44d5ee9..e7691f0cf9 100644 --- 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 507209c992..bc7327ded4 100644 --- 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 af09ab9b86..01ec35f272 100644 --- 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 2a2a7fc125..d42bcc63db 100644 --- 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 469cc3e1d9..8b34a5729b 100644 --- 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 a2eeaeb420..1052d83b0c 100644 --- 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 74b96ad9eb..84c91655f1 100644 --- 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 24a979a389..fd4d4fbf0e 100644 --- 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! -- 2.39.5