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!}.

diff --git a/inc/databases.php b/inc/databases.php
index befcddf2a010cbf618c11da9e74e7fe764bcb901..4b854c7b9d2d778d1892f96387fa8ef962bc17db 100644 (file)
--- 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 6746286960877044137165f2c0e9187295e1249e..51ddb9440c4601c843a2b94c2e16634c08020152 100644 (file)
--- 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 746aa0d227ae005f322854d37aa809324de58ef4..f908e68f1cbbf10fbafe042a9ab90e153f507932 100644 (file)
--- 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 <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227</FONT> behoben.";
+               $UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> 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 f6c66816f2fb6c62d937188dd0f8b9938c57b28d..cc369ce4ba34781df0a20790a398d5219a8951bc 100644 (file)
--- 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 05c8c0f409b8ef1d4a2e4a705342185d0d4c474c..db31e7deec7d4c2e531a421cef77604badfc2962 100644 (file)
--- 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 223d4fe7528f080afa68db197b715f9bd07b067f..c8d31fc5ff51633ccd49878338ec1650ca34dce0 100644 (file)
--- 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&auml;chstes nach wer als letztes Online war umsortiert.";
+               $UPDATE_NOTES = "Bei {!POINTS!}-Gleichstand wird als n&auml;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 05149fb04efd424702f033efe5f8718acf8b9c87..8364994377e0d5a99b7d57027b6182df2c87b9f6 100644 (file)
--- 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 34bac1b73416631516dcf2fd23cd1bc912cd24c0..d6c81a171491325dd2de6008f9c1655dd0ef9d93 100644 (file)
--- 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 <STRONG>noch auf Auszahlung wartendem Guthaben</STRONG> aufaddiert wird, wird eine entsprechende Nachricht ausgegeben (neue Templates <STRONG>mailid_points_locked</STRONG> und <STRONG>mailid_points_locked2</STRONG> sind hinzugekommen!)";
+               $UPDATE_NOTES = "Wenn die {!POINTS!} dem <STRONG>noch auf Auszahlung wartendem Guthaben</STRONG> aufaddiert wird, wird eine entsprechende Nachricht ausgegeben (neue Templates <STRONG>mailid_points_locked</STRONG> und <STRONG>mailid_points_locked2</STRONG> 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 <em><strong>".PATH."/templates/de/html/mailid/mailid_points_lcoked2.tpl</strong></em> l&ouml;schen. Noices fixed.";
+               $UPDATE_NOTES = "Bitte das Template <em><strong>{!PATH!}/templates/de/html/mailid/mailid_points_lcoked2.tpl</strong></em> l&ouml;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 969b05d5c7afdc368840d577483f913b9f8e565e..ff09e7841bd3ad419bdc6991005e939a84d0b6e0 100644 (file)
--- 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 cccb1678592b760dd2ed1e7cc40f5b784e037885..e213c22c21dfa05af42539edff8ebcae783ac296 100644 (file)
--- 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 <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227</FONT> behoben.";
+               $UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> 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 f6d025021e57e8a77d2eee856cb43d1a3bfd990b..19385c7d1a321e3f6f5de69c1ad1ef71f7ddafab 100644 (file)
--- 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 8143d0c3c8437d6035542b44ccb9e16e4f83bd74..daaa854ef53db36c6abdbb1a45ce0df585213aa4 100644 (file)
--- 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 <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227</FONT> behoben.";
+               $UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> 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 982efbecfb8b042f786563632c78d592a592fe42..c9f548d0697b5f5a2a95261d8f0d56f7dce516e7 100644 (file)
--- 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 <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227</FONT> behoben.";
+               $UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> 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&ouml;nnen nun wieder wie gewohnt transferiert werden. Der Grund f&uuml;r <em>{--TRANSFER_INVALID_PASSWORD--}</em> war, dass der Cookie-Hash ein anderer ist, als der in der Datenbank... :-/";
+               $UPDATE_NOTES = "Die {!POINTS!} k&ouml;nnen nun wieder wie gewohnt transferiert werden. Der Grund f&uuml;r <em>{--TRANSFER_INVALID_PASSWORD--}</em> 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 <em>Notice: Undefined index: to_uid in ".PATH."/inc/modules/member/what-transfer.php on line 301</em> gefixt. Danke an <a href=\"http://forum.mxchange.org/profile-8.html\" target=\"_blank\" title=\"Forumprofil von Piter01\">Piter01</a>.";
+               $UPDATE_NOTES = "Fehlermeldung <em>Notice: Undefined index: to_uid in {!PATH!}/inc/modules/member/what-transfer.php on line 301</em> gefixt. Danke an <a href=\"http://forum.mxchange.org/profile-8.html\" target=\"_blank\" title=\"Forumprofil von Piter01\">Piter01</a>.";
                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 338dc08369782d3756c0860af05f256f787cb08c..bd7cb1088667e03472c06cf3ef7be24ef7abe74e 100644 (file)
--- 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 2b0a50e368dd0eb51bc57cd10fe6feffaf69da7b..2d701c2ddcdc6ea37054cf5455f39d0a06aa8caf 100644 (file)
--- 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 4d627db7758c4f4f8692cbb4b02b6673a08c27c1..36ba9831d5f937ccd372a441ac589675b84a4b62 100644 (file)
--- 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 aea44a21329d9e60487c6cd9e650fdf7d762fa40..ccec7e30920dee7360996df1e5cbd6012ac1f375 100644 (file)
--- 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 4c8acf31c06196cff08ccb9ecc676b065bc673ad..94b818a74c450b7cab17ec3301ccc80a4dbfe803 100644 (file)
--- 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 f4e0c86e2f03dfc9fb7232356002055bc227e56f..7ae01f4d41dcffa5ffdc584f435e5a2e9f168224 100644 (file)
--- 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 8cd19555c8351f3d490d927ff1d7a1469d310998..47c3a1710caee127888c5ddccb08c842f880c869 100644 (file)
--- 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 d3ce12bbc0794456bc5b08352f8fec96ef01e264..f8952e552b22fedb3e7a488a3de6f76a73a8e50c 100644 (file)
--- 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 bd2ee2fe93ce27fc07336a3b7d2dcaa7fdce5fd7..9a223e9a2023f2f15f22d1e4e9fc0d4e0c2a92c0 100644 (file)
--- 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 0a840a1882396fc57e95b2d34ff949bca0cecab4..b17294aea1913af3f534c999da25cc31d7893fd1 100644 (file)
--- 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 aa62022e13c780ac3caedbabcd6e4667aceb0bef..13995d1e409f057c8a54f1d337dd17987f391483 100644 (file)
--- 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 9b9f607cfc1b827a4d623ae8439336f1c228a6c4..9a555afefac2caaced3f24cfa115067694a7b810 100644 (file)
--- 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 ad350d165c5f56b946cec51bc8c1772221fc387d..ed27dd0bedb0f4656081cb75388fbe6f64e65f95 100644 (file)
--- 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 d827e2e2ec2c7ace63ccd9b96c9a8d3fb2b82c60..9f834fda3f5a29592809ef25927c134a843edc90 100644 (file)
--- 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 fa3037a5f494388f6c58244f1a1b85296b59faf8..57b83620462754c51f37b7f1b035502f360f4cb5 100644 (file)
--- 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 c7130ff3deb2a2add9122177e6be739aa046b70a..ffbe1fc3b8378e58b0c43b443f6b9dab855344f0 100644 (file)
--- 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 eba573efd6aa7a8d4fccf870bf7d65f515e53992..627ac41651dea3f0093dba0ad5018d1bec572062 100644 (file)
--- 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 c6b2aa7544b7c731dd62e14c66fec89574de8491..90b2e46e78ccbfa947aec4246656d1eab8893fa4 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor.tpl
+++ b/templates/de/html/admin/admin_add_sponsor.tpl
@@ -257,12 +257,12 @@
   <TD>
     <SELECT name="warning_interval" class="admin_select" size="1">
       <OPTION value="0">{--SELECT_NONE--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*56)--}">8 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 80dcde7ff8c0e981aa2920e53de0afe2e09cdd7d..855899924ba22de293f6a5b246877bed98bf0fa4 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -286,12 +286,12 @@
   <TD>
     <SELECT name="warning_interval" class="guest_select" size="1">
       <OPTION value="0">{--SELECT_NONE--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*56)--}">8 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*7)--}" selected>1 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>

diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl
index 46fe4925f78a4e78bdf62289a59701ec7c2ee184..3a886167baaa6cb13dd8d0f28673b97435cde948 100644 (file)
--- a/templates/de/html/sponsor/sponsor_settings_form.tpl
+++ b/templates/de/html/sponsor/sponsor_settings_form.tpl
@@ -22,12 +22,12 @@
   <TD class="bottom2" width="275" align="center">
     <SELECT name="warning_interval" class="guest_select" size="1">
       <OPTION value="$content[warning_interval]">{!__CURRENT!}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*1)--}">1 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*3)--}">3 {--DAYS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*7)--}">1 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*14)--}">2 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*28)--}">4 {--LIFE_WEEKS--}</OPTION>
-      <OPTION value="{--($_CONFIG[one_day]*56)--}">8 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*1)--}">1 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*3)--}">3 {--DAYS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*7)--}">1 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*14)--}">2 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*28)--}">4 {--LIFE_WEEKS--}</OPTION>
+      <OPTION value="{--($_CONFIG['one_day']*56)--}">8 {--LIFE_WEEKS--}</OPTION>
     </SELECT>
   </TD>
 </TR>

diff --git a/unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php b/unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php
index 91dbe13d8eed6822cc22fbd6dd3e397a065d06c8..533796f5b72dd1a61e77b9c9adf51ecb4eacf5e2 100644 (file)
--- 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 ef99505357bb2518b4ec7e395575e69cd962eb06..801e075ccc8ce2b060654bf2e718d9cd905df09f 100644 (file)
--- 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;
 }