From 9976231a6912f167006012db6a3b757e097c46b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 24 Nov 2008 02:05:38 +0000 Subject: [PATCH] More bugs fixed, thanks to Piter01: :-) - Non-loading language strings in transfer extension and maybe more, we used a deprecated way of checking "if extension foo is not installed AND if there is no admin". The 2nd part of the AND statement is deprecated and now removed. - In Update notes the constants POINTS and PATH are now included dynamically by {!CONSTANT!}. --- inc/databases.php | 2 +- inc/extensions/ext-admins.php | 2 +- inc/extensions/ext-autopurge.php | 2 +- inc/extensions/ext-beg.php | 4 ++-- inc/extensions/ext-birthday.php | 2 +- inc/extensions/ext-bonus.php | 2 +- inc/extensions/ext-doubler.php | 2 +- inc/extensions/ext-mailid.php | 4 ++-- inc/extensions/ext-order.php | 2 +- inc/extensions/ext-other.php | 2 +- inc/extensions/ext-register.php | 2 +- inc/extensions/ext-task.php | 2 +- inc/extensions/ext-transfer.php | 6 +++--- inc/modules/admin/what-config_yoomedia.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-rallyes.php | 2 +- inc/modules/guest/what-top10.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-holiday.php | 2 +- inc/modules/member/what-nickname.php | 2 +- inc/modules/member/what-payout.php | 2 +- inc/modules/member/what-primera.php | 2 +- inc/modules/member/what-refback.php | 2 +- inc/modules/member/what-reflist.php | 4 ---- inc/modules/member/what-transfer.php | 2 +- inc/modules/member/what-wernis.php | 2 +- templates/de/html/admin/admin_add_sponsor.tpl | 12 ++++++------ templates/de/html/guest/guest_sponsor_reg.tpl | 12 ++++++------ templates/de/html/sponsor/sponsor_settings_form.tpl | 12 ++++++------ .../inc/modules/admin/what-config_affiliblatt.php | 2 +- .../gollox/inc/modules/admin/what-config_gollox.php | 2 +- 35 files changed, 53 insertions(+), 57 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index befcddf2a0..4b854c7b9d 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "546"); +define('CURR_SVN_REVISION', "547"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 6746286960..51ddb9440c 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -231,7 +231,7 @@ PRIMARY KEY (id) case "0.6.2": // SQL queries for v0.6.2 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bitte verschieben Sie die admins-Templates (Ordner: ".PATH."/templates/de/emails/) in den neuen Order admins!"; + $UPDATE_NOTES = "Bitte verschieben Sie die admins-Templates (Ordner: {!PATH!}/templates/de/emails/) in den neuen Order admins!"; break; case "0.6.3": // SQL queries for v0.6.3 diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 746aa0d227..f908e68f1c 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -102,7 +102,7 @@ case "update": // Update an extension case "0.1.4": // SQL queries for v0.1.4 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227 behoben."; + $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227 behoben."; break; case "0.1.5": // SQL queries for v0.1.5 diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index f6c66816f2..cc369ce4ba 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -139,7 +139,7 @@ case "update": // Update an extension case "0.0.9": // SQL queries for v0.0.9 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bitte verschieben Sie die beg-Templates (Ordner: ".PATH."/templates/".GET_LANGUAGE()."/html/) in den neuen Order beg!"; + $UPDATE_NOTES = "Bitte verschieben Sie die beg-Templates (Ordner: {!PATH!}/templates/".GET_LANGUAGE()."/html/) in den neuen Order beg!"; break; case "0.1.0": // SQL queries for v0.2.1 @@ -216,7 +216,7 @@ case "update": // Update an extension case "0.2.0": // SQL queries for v0.2.0 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bei ".POINTS."-Gleichstand wird als nächstes nach wer als letztes Online war umsortiert."; + $UPDATE_NOTES = "Bei {!POINTS!}-Gleichstand wird als nächstes nach wer als letztes Online war umsortiert."; break; case "0.2.1": // SQL queries for v0.2.1 diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 05c8c0f409..db31e7deec 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -147,7 +147,7 @@ PRIMARY KEY(id) case "0.3.3": // SQL queries for v0.3.3 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bitte verschieben Sie die birthday-Templates (Ordner: ".PATH."/templates/".GET_LANGUAGE()."/html/) in den neuen Order birthday!"; + $UPDATE_NOTES = "Bitte verschieben Sie die birthday-Templates (Ordner: {!PATH!}/templates/".GET_LANGUAGE()."/html/) in den neuen Order birthday!"; break; case "0.3.4": // SQL queries for v0.3.4 diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index 223d4fe752..c8d31fc5ff 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -497,7 +497,7 @@ WHERE last_online < ".$mark." ORDER BY userid"; break; case "0.8.1": // SQL queries for v0.8.1 - $UPDATE_NOTES = "Bei ".POINTS."-Gleichstand wird als nächstes nach wer als letztes Online war umsortiert."; + $UPDATE_NOTES = "Bei {!POINTS!}-Gleichstand wird als nächstes nach wer als letztes Online war umsortiert."; break; case "0.8.2": // SQL queries for v0.8.2 diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 05149fb04e..8364994377 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -187,7 +187,7 @@ case "update": // Update an extension case "0.0.8": // SQL queries for v0.0.8 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bitte verschieben Sie die doubler-Templates (Ordner: ".PATH."/templates/".GET_LANGUAGE()."/html/) in den neuen Order doubler!"; + $UPDATE_NOTES = "Bitte verschieben Sie die doubler-Templates (Ordner: {!PATH!}/templates/".GET_LANGUAGE()."/html/) in den neuen Order doubler!"; break; case "0.0.9": // SQL queries for v0.0.9 diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index 34bac1b734..d6c81a1714 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -200,7 +200,7 @@ case "update": // Update an extension case "0.2.7": // SQL queries for v0.2.7 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Wenn die ".POINTS." dem noch auf Auszahlung wartendem Guthaben aufaddiert wird, wird eine entsprechende Nachricht ausgegeben (neue Templates mailid_points_locked und mailid_points_locked2 sind hinzugekommen!)"; + $UPDATE_NOTES = "Wenn die {!POINTS!} dem noch auf Auszahlung wartendem Guthaben aufaddiert wird, wird eine entsprechende Nachricht ausgegeben (neue Templates mailid_points_locked und mailid_points_locked2 sind hinzugekommen!)"; break; case "0.2.8": // SQL queries for v0.2.8 @@ -225,7 +225,7 @@ case "update": // Update an extension case "0.3.2": // SQL queries for v0.3.2 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bitte das Template ".PATH."/templates/de/html/mailid/mailid_points_lcoked2.tpl löschen. Noices fixed."; + $UPDATE_NOTES = "Bitte das Template {!PATH!}/templates/de/html/mailid/mailid_points_lcoked2.tpl löschen. Noices fixed."; break; case "0.3.3": // SQL queries for v0.3.3 diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index 969b05d5c7..ff09e7841b 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -295,7 +295,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD repay_deleted_mails ENUM('REPAY','JACKPOT','SHRED') NOT NULL DEFAULT 'REPAY'"; // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Bei Löschung von Mailbuchungen kann nun global entschieden werden (Einstellungen also), ob die verbliebenen ".POINTS." wieder gutgeschrieben werden sollen oder in den Jackpot landen."; + $UPDATE_NOTES = "Bei Löschung von Mailbuchungen kann nun global entschieden werden (Einstellungen also), ob die verbliebenen {!POINTS!} wieder gutgeschrieben werden sollen oder in den Jackpot landen."; break; } diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php index cccb167859..e213c22c21 100644 --- a/inc/extensions/ext-other.php +++ b/inc/extensions/ext-other.php @@ -73,7 +73,7 @@ case "update": // Update an extension { case "0.0.1": // SQL queries for v0.0.1 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227 behoben."; + $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227 behoben."; break; case "0.0.2": // SQL queries for v0.0.2 diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index f6d025021e..19385c7d1a 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -286,7 +286,7 @@ PRIMARY KEY(id) case "0.4.6": // SQL queries for v0.4.6 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Einstellung nach ".POINTS."-Einstellungen verlagert."; + $UPDATE_NOTES = "Einstellung nach {!POINTS!}-Einstellungen verlagert."; break; case "0.4.7": // SQL queries for v0.4.7 diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index 8143d0c3c8..daaa854ef5 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -93,7 +93,7 @@ case "update": // Update an extension case "0.0.4": // SQL queries for v0.0.4 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227 behoben."; + $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227 behoben."; break; case "0.0.5": // SQL queries for v0.0.5 diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 982efbecfb..c9f548d069 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -125,7 +125,7 @@ case "update": // Update an extension { case "0.0.2": // SQL queries for v0.0.2 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227 behoben."; + $UPDATE_NOTES = "Fehler Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227 behoben."; break; case "0.0.3": // SQL queries for v0.0.3 @@ -261,12 +261,12 @@ case "update": // Update an extension case "0.2.7": // SQL queries for v0.2.7 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Die ".POINTS." können nun wieder wie gewohnt transferiert werden. Der Grund für {--TRANSFER_INVALID_PASSWORD--} war, dass der Cookie-Hash ein anderer ist, als der in der Datenbank... :-/"; + $UPDATE_NOTES = "Die {!POINTS!} können nun wieder wie gewohnt transferiert werden. Der Grund für {--TRANSFER_INVALID_PASSWORD--} war, dass der Cookie-Hash ein anderer ist, als der in der Datenbank... :-/"; break; case "0.2.8": // SQL queries for v0.2.8 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Fehlermeldung Notice: Undefined index: to_uid in ".PATH."/inc/modules/member/what-transfer.php on line 301 gefixt. Danke an Piter01."; + $UPDATE_NOTES = "Fehlermeldung Notice: Undefined index: to_uid in {!PATH!}/inc/modules/member/what-transfer.php on line 301 gefixt. Danke an Piter01."; break; case "0.2.9": // SQL queries for v0.2.9 diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php index 338dc08369..bd7cb10886 100644 --- a/inc/modules/admin/what-config_yoomedia.php +++ b/inc/modules/admin/what-config_yoomedia.php @@ -35,7 +35,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")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("yoomedia")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia"); return; } diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php index 2b0a50e368..2d701c2ddc 100644 --- a/inc/modules/guest/what-active.php +++ b/inc/modules/guest/what-active.php @@ -35,7 +35,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())) { +} elseif (!EXT_IS_ACTIVE("active")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "active"); return; } diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php index 4d627db775..36ba9831d5 100644 --- a/inc/modules/guest/what-beg.php +++ b/inc/modules/guest/what-beg.php @@ -35,7 +35,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())) { +} elseif (!EXT_IS_ACTIVE("beg")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg"); return; } diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php index aea44a2132..ccec7e3092 100644 --- a/inc/modules/guest/what-doubler.php +++ b/inc/modules/guest/what-doubler.php @@ -35,7 +35,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())) { +} elseif (!EXT_IS_ACTIVE("doubler")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler"); return; } diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index 4c8acf31c0..94b818a74c 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -35,7 +35,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())) { +} elseif (!EXT_IS_ACTIVE("rallye")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye"); return; } diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php index f4e0c86e2f..7ae01f4d41 100644 --- a/inc/modules/guest/what-top10.php +++ b/inc/modules/guest/what-top10.php @@ -35,7 +35,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())) { +} elseif (!EXT_IS_ACTIVE("top10")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "top10"); return; } diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php index 8cd19555c8..47c3a1710c 100644 --- a/inc/modules/member/what-beg.php +++ b/inc/modules/member/what-beg.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { require($INC); } elseif (!IS_MEMBER()) { LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("beg")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg"); return; } diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php index d3ce12bbc0..f8952e552b 100644 --- a/inc/modules/member/what-beg2.php +++ b/inc/modules/member/what-beg2.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { require($INC); } elseif (!IS_MEMBER()) { LOAD_URL("modules.php[5~?module=index"); -} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("beg")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg"); return; } diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index bd2ee2fe93..9a223e9a20 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { require($INC); } elseif (!IS_MEMBER()) { LOAD_URL("modules.php[5~?module=index"); -} elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("bonus")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus"); return; } diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 0a840a1882..b17294aea1 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { require($INC); } elseif (!IS_MEMBER()) { LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("holiday")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday"); return; } diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php index aa62022e13..13995d1e40 100644 --- a/inc/modules/member/what-nickname.php +++ b/inc/modules/member/what-nickname.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { require($INC); } elseif (!IS_MEMBER()) { LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("nickname")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "nickname"); return; } diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 9b9f607cfc..9a555afefa 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { } elseif (!IS_MEMBER()) { // Not logged in LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("payout")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("payout")) // Extension "payout" is not active ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "payout"); return; diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index ad350d165c..ed27dd0bed 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } elseif (!IS_MEMBER()) { // User is not logged in LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("primera")) // Extension "primera" is not activated ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "primera"); return; diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index d827e2e2ec..9f834fda3f 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } elseif (!IS_MEMBER()) { // User is not logged in LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("refback")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("refback")) // Extension "refback" is not active ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "refback"); return; diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php index fa3037a5f4..57b8362046 100644 --- a/inc/modules/member/what-reflist.php +++ b/inc/modules/member/what-reflist.php @@ -38,10 +38,6 @@ if (!defined('__SECURITY')) { } elseif (!IS_MEMBER()) { // User is not logged in LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("reflist")) && (!IS_ADMIN())) { - // Extension "reflist" is not active - ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "reflist"); - return; } // Add description as navigation point diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index c7130ff3de..ffbe1fc3b8 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { require($INC); } elseif (!IS_MEMBER()) { LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("transfer")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("transfer")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "transfer"); return; } diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index eba573efd6..627ac41651 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } elseif (!IS_MEMBER()) { // User is not logged in LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("wernis")) // Extension "wernis" is not activated ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis"); return; diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index c6b2aa7544..90b2e46e78 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -257,12 +257,12 @@   diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 80dcde7ff8..855899924b 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -286,12 +286,12 @@   diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl index 46fe4925f7..3a886167ba 100644 --- a/templates/de/html/sponsor/sponsor_settings_form.tpl +++ b/templates/de/html/sponsor/sponsor_settings_form.tpl @@ -22,12 +22,12 @@ diff --git a/unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php b/unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php index 91dbe13d8e..533796f5b7 100644 --- a/unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php +++ b/unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php @@ -35,7 +35,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); -} elseif ((!EXT_IS_ACTIVE("affliliblatt")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("affliliblatt")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "affliliblatt"); return; } diff --git a/unsupported/gollox/inc/modules/admin/what-config_gollox.php b/unsupported/gollox/inc/modules/admin/what-config_gollox.php index ef99505357..801e075ccc 100644 --- a/unsupported/gollox/inc/modules/admin/what-config_gollox.php +++ b/unsupported/gollox/inc/modules/admin/what-config_gollox.php @@ -35,7 +35,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); -} elseif ((!EXT_IS_ACTIVE("gollox")) && (!IS_ADMIN())) { +} elseif (!EXT_IS_ACTIVE("gollox")) ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "gollox"); return; } -- 2.39.5