More fixes from profi-concept for extension loading, guest/member menu and smaller...

diff --git a/inc/databases.php b/inc/databases.php
index ad12324fb3324a4646c3f713e1bef013e8449d68..1419c54ffbca19ba73e761a3b85b4b770cf1d050 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");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "598");
+define('CURR_SVN_REVISION', "599");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 221e75955fe408ea91f067857a8a7c7964b1ee0c..7b6f3fc915edfb020bb44a0ffc440401f77926df 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -291,7 +291,7 @@ function SQL_ESCAPE($str, $secureString=true,$strip=true) {
                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />\n";
                return mysql_real_escape_string($str, $link);
        } elseif (function_exists('mysql_escape_string')) {
-               // The obsulete function
+               // The obsolete function
                return mysql_escape_string($str, $link);
        } else {
                // If nothing else works

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 8d69d37d79da508a1975e1a91517c32bedacd45d..e7d7e0b9003cff8fa6f04f65c7041bcee1d1e2db 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -36,7 +36,8 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
-//
+
+// Init variables
 global $EXT_CSS_FILES;
 $EXT_CSS_FILES = array();
 $ADD = "";
@@ -69,12 +70,20 @@ if (EXT_IS_ACTIVE("cache")) {
        }
 
        // Do not recreate cache file when it's switched off!
-       if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == "N")) $cacheMode = "skip";
+
+       // If we need to init the cache init it now
+       if ($cacheMode == "init") {
+               // Init cache file
+               $cacheInstance->cache_init("EXTENSIONS");
+
+               if ($_CONFIG['cache_exts'] == "N") $cacheMode = "skip";
+       } // END - if
 } else {
        // Cache extension not active
        $cacheMode = "no";
 }
 
+// Load cache?
 if ($cacheMode == "load") {
        // Init include array
        $EXT_POOL = array();
@@ -166,8 +175,9 @@ if ($cacheMode == "load") {
        // Remove array
        unset($EXT_POOL);
 } else {
-       // If current user is not admin load only activated extensions
-       // The admin shall use every available extension for testing purposes
+       // If current user is not admin load only activated extensions. But load
+       // them all if we are going to init the cache files. The admin shall use
+       // every available extension for testing purposes.
        if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
 
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
@@ -176,7 +186,7 @@ if ($cacheMode == "load") {
 FROM "._MYSQL_PREFIX."_extensions".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
-               // Old obsulete query string
+               // Old obsolete query string
                $res_ext_crt = SQL_QUERY("SELECT id, ext_name, ext_lang_file, ext_name, ext_active, ext_version
 FROM "._MYSQL_PREFIX."_extensions".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
@@ -187,13 +197,10 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode == "no")) && ($CSS != "1") && ($CSS != "-1")) {
+if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1") && ($CSS != "-1")) || ($cacheMode == "no"))) {
        // Load theme management
        require_once(PATH."inc/theme-manager.php");
 
-       // If we need to init the cache init it now
-       if ($cacheMode == "init") $cacheInstance->cache_init("EXTENSIONS");
-
        // Extensions are registered so we load them
        while (list($EXT_ID, $name, $lang, $css, $active, $version) = SQL_FETCHROW($res_ext_crt)) {
                // Get menu entry

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index c5c60dbc4971e6e57d1e6fb1c6adc4f0df2c7d24..a31675b174bf2d0c0b1f43b9c93981cbdd4c9d84 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -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("")) {
+} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
        return;
 } elseif ($BLOCK_MODE) {

diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index 07fbcec63bad705e2be00944b7b8359f4ed0ae81..c7acfbbab8400a5506edb1b4487f48ca78acc6ca 100644 (file)
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.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("online")) {
+} elseif ((!EXT_IS_ACTIVE("online")) && (!IS_ADMIN())) {
        // Just skip this extension
        return;
 }

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 2cd8983eda93c8460b37acad88f77f2194e0fb33..1b7b18db342f387bab4c1d986e95d7a27eaf2e85 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -34,7 +34,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("sponsor")) {
+} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
        return;
 } elseif ($BLOCK_MODE) {

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 522158d0abdc066b42138bcbd9ceb569fea2610c..e0b248c952bb3664cd04d1036d086c068714c3ad 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.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("theme")) {
+} elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
        return;
 }

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index cc5774b0e0a6fd4ef24206b28505c4f70a189f79..69a16d1de0f8fcc8473ed2dd6fe57afc7fecd248 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")) {
+} elseif ((!EXT_IS_ACTIVE("active")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "active");
        return;
 }
@@ -43,25 +43,24 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("guest", __FILE__);
 
-// The day normally starts on 00:00:00, so let's subtract current hours/minutes/seconds from current time stamp!
-$START = time() - date("H", time())*60*60 - date("m", time())*60 - date("s", time());
-
-// Check for members who were active only this day
+// Extra field to include is by default uid
 $ADD = "uid";
+
+// If nickname is installed the extra field is the nickname of the user
 if (EXT_IS_ACTIVE("nickname")) $ADD = "nickname";
 
+// Check for members who were active only this day
 $result = SQL_QUERY_ESC("SELECT userid, ".$ADD.", last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE last_online >= %s AND status='CONFIRMED'
 ORDER BY last_online DESC LIMIT %s",
- array($START, $_CONFIG['active_limit']), __FILE__, __LINE__);
+       array(START_TDAY, $_CONFIG['active_limit']), __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0)
-{
+// Entries found?
+if (SQL_NUMROWS($result) > 0) {
        // At least one member was online so let's load them all
        $OUT = ""; $SW = 2;
-       while(list($uid, $nick, $last) = SQL_FETCHROW($result))
-       {
+       while(list($uid, $nick, $last) = SQL_FETCHROW($result)) {
                $nick2 = "---";
                if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
 
@@ -80,9 +79,7 @@ if (SQL_NUMROWS($result) > 0)
                // Switch colors
                $SW = 3 - $SW;
        }
-}
- else
-{
+} else {
        // No member was online today! :-(
        $OUT = LOAD_TEMPLATE("guest_active_none_row", true);
 }

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index bf86a824a39ff23a56c113316348687af593db04..4d627db7758c4f4f8692cbb4b02b6673a08c27c1 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")) {
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
        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 bb53c0656b321357061ec1dfc1b2a7d28e68ade0..aea44a21329d9e60487c6cd9e650fdf7d762fa40 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")) {
+} elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");
        return;
 }

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 36a08cea700b88bbef4781045b01e321d86c08cd..987746d2a18a0a14719908cc1f47c752359aac0e 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -38,7 +38,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("mediadata")) {
+} elseif ((!EXT_IS_ACTIVE("mediadata")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "mediadata");
        return;
 }

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 680f16125d7ae9846b8d7756e8c8ce1e62d42deb..4c8acf31c06196cff08ccb9ecc676b065bc673ad 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")) {
+} elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
        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 8536854d676fb762afc3da15f528636253c34556..f4e0c86e2f03dfc9fb7232356002055bc227e56f 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")) {
+} elseif ((!EXT_IS_ACTIVE("top10")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "top10");
        return;
 }

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index 0cb400b6cb811a77283f7b769ca4f21cdc300ead..c891089b7ec2e128441152eed6298f4c50aed76d 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.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("wernis")) {
+} elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis");
        return;
 }

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 1ac4b9912201c555477ac536573a69c6802d4e8e..fb602ae72231854e213e43617bc516529b1a321c 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.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("sql_patches", true)) {
+} elseif ((!EXT_IS_ACTIVE("sql_patches", true)) && (!IS_ADMIN())) {
        // The extension "sql_patches" *MUST* be activated or you have lot's of problems!
        LOAD_URL("modules.php?module=admin");
 }

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index 171ebea3ad948319b0fe9f3c317f24918af01869..9f305f19f2f36d7a18c8d883d5d06252203a75a0 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_LOGGED_IN()) {
        LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("")) {
+} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
        return;
 } elseif ($BLOCK_MODE) {

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index 459b46d1765c4fc3cf1e761b8b0cda47a486bf7f..d334432548d6bbf323173bb55c534ce780955ecd 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("bank")) {
+} elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
        return;
 } elseif ($BLOCK_MODE) {

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 5b1492cab392c33588baf1a9b176a302ba05eb06..b546a774dad7722ec27e916df2bffd6160ae6ca5 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("order")) {
+} elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 } elseif ($BLOCK_MODE) {

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index f1f864698d2e701823a97e92fb0c255067460581..a32c5907000566cfede46af10ae8f9acc953cfb1 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("surfbar")) {
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
        return;
 } elseif ($BLOCK_MODE) {

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 493833f320e2a9b0c33736e46e73f3669e9373d7..3b395570bb128db8c291713bce224d9f86ecc2b4 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("theme")) {
+} elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
        return;
 }

diff --git a/inc/modules/member/what-bank_create.php b/inc/modules/member/what-bank_create.php
index 5d50ac7ddab4acda56689368edad32377530c9f8..fc9288fe53133ae48f7f4fec6452c1e9a4890c43 100644 (file)
--- a/inc/modules/member/what-bank_create.php
+++ b/inc/modules/member/what-bank_create.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("bank")) {
+} elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
        return;
 } elseif (!IS_MEMBER()) {

diff --git a/inc/modules/member/what-bank_deposit.php b/inc/modules/member/what-bank_deposit.php
index 9316759fe2631703c9af8f4a258e173b381a8ed0..7012c64f8208ce3c5f6fc5ee47cb10017c783076 100644 (file)
--- a/inc/modules/member/what-bank_deposit.php
+++ b/inc/modules/member/what-bank_deposit.php
@@ -4,7 +4,7 @@
  * ================                             Last change: 01/07/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : what-                                            *
+ * File              : what-bank_deposit.php                            *
  * -------------------------------------------------------------------- *
  * Short description :                                                  *
  * -------------------------------------------------------------------- *
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("bank")) {
+} elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
        return;
 }

diff --git a/inc/modules/member/what-bank_infos.php b/inc/modules/member/what-bank_infos.php
index 9316759fe2631703c9af8f4a258e173b381a8ed0..c622b560df0312f09cfb724fb252e2bed616f1fb 100644 (file)
--- a/inc/modules/member/what-bank_infos.php
+++ b/inc/modules/member/what-bank_infos.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("bank")) {
+} elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
        return;
 }

diff --git a/inc/modules/member/what-bank_output.php b/inc/modules/member/what-bank_output.php
index 9316759fe2631703c9af8f4a258e173b381a8ed0..c622b560df0312f09cfb724fb252e2bed616f1fb 100644 (file)
--- a/inc/modules/member/what-bank_output.php
+++ b/inc/modules/member/what-bank_output.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("bank")) {
+} elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
        return;
 }

diff --git a/inc/modules/member/what-bank_withdraw.php b/inc/modules/member/what-bank_withdraw.php
index 9316759fe2631703c9af8f4a258e173b381a8ed0..c622b560df0312f09cfb724fb252e2bed616f1fb 100644 (file)
--- a/inc/modules/member/what-bank_withdraw.php
+++ b/inc/modules/member/what-bank_withdraw.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("bank")) {
+} elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
        return;
 }

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index 70af3d4e2c68ecdc7d599756865609386601dd02..8cd19555c8351f3d490d927ff1d7a1469d310998 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")) {
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
        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 1c9ecfdc6997c2650c394472b7138962e8f61c36..d3ce12bbc0794456bc5b08352f8fec96ef01e264 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")) {
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
        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 9d340d18e7a50bffe9ced1f003742e3fa6e82254..324fbda0e5c7a63da140817949a2dd327fa708b4 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")) {
+} elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
        return;
 }

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index e746259a2da353691fd5c9a1f4a2d73ede3574b3..cdb130df2075b6fa484fd119b2795434636fa007 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
-} elseif (!EXT_IS_ACTIVE("doubler")) {
+} elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");
        return;
 }

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 4cbbc22cad8112144a31b3c9005126939cb141e8..0a840a1882396fc57e95b2d34ff949bca0cecab4 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")) {
+} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
        return;
 }

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 545aa1d375cc7837c3de3078a33f48e2a687e686..6944df89680fba4257518644860a36e88d5faa7f 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("html_mail")) {
+} elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");
        return;
 }

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 8213cb1644315351f88206ce7a3596d2c4b446c6..b8e685fb5d789c6eb54a5d935d2030b35906c228 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("mydata")) {
+} elseif ((!EXT_IS_ACTIVE("mydata")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "mydata");
        return;
 }

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index e6d343d55d6edae93d161ff9d6dc7f39d16f968e..efe6475d10a89884660a18ee4236a4d1816c8d6a 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("newsletter")) {
+} elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");
        return;
 }

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 038010f0540e1a0dfecfc70d3fe92aa81db0f33f..251fe238da6db01dbefd72604cd1247f1beb29a9 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")) {
+} elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "nickname");
        return;
 }

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 5a45378a5b7b4787b7d8133b9e50f3534d83a792..ea88b93e1b4afed9243cd418f3250c8f57fb4844 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("order")) {
+} elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 }

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 1c81b69455a788a1e65b67e05c9795186d1c4059..2ad39b14f0cb4a40bbc1dd362689f9abee87f99c 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")) {
+} elseif ((!EXT_IS_ACTIVE("payout")) && (!IS_ADMIN())) {
        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 746f59e376a8430ea72d39e3e22e3645b091a6cf..86a8b09d3e13587baeed06eb2991a86e173c1c58 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")) {
+} elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) {
        // Extension "primera" is not activated
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
        return;

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 375699d1818e613ee5bfb8385dee38ed2980ac15..0f8fcc58fe80995247e15d45f35dc6cd999239a3 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("rallye")) {
+} elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
        return;
 }

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index a3e61a45a1c4e8bb44870bb25760e339d8fc7b01..eac8db386d6dea72b9ce2d9a4d200a5d82aad766 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")) {
+} elseif ((!EXT_IS_ACTIVE("refback")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "refback");
        return;
 }

diff --git a/inc/modules/member/what-sponsor.php b/inc/modules/member/what-sponsor.php
index 059429d87f07d29fd10df565797cd0ee2a567536..6a39e181a62bde86bf40da4ae0cf2c8eb4b5f07f 100644 (file)
--- a/inc/modules/member/what-sponsor.php
+++ b/inc/modules/member/what-sponsor.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("sponsor")) {
+} elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
        return;
 }

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index bf9dda5e2facf53e3d0e9310e5a0625fa193554f..1e8980809eda3930aa8b0a09f876ab8446c638b4 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 }  elseif (!IS_MEMBER()){
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("support")) {
+} elseif ((!EXT_IS_ACTIVE("support")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "support");
        return;
 }

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index b81c7d785c7ada4604e3e17875fab874cea5cd67..c10c6cdd8fd4fce4c14afd03bd277889e7502357 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        // Redirect
        LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("surfbar")) {
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
        return;
 }

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 243d4800b5bfa1222a4e8f7557c7482887189d4d..b9b9df87dd8662eb406e95db3c58d620d6101bac 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("surfbar")) {
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
        return;
 }

diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php
index 7e2f7036bb4e3e6df42a2a3711afd95d0187a8eb..9fb90957946bda22b786e03e6adb5076aeedf3e2 100644 (file)
--- a/inc/modules/member/what-surfbar_start.php
+++ b/inc/modules/member/what-surfbar_start.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        // Not logged in
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("surfbar")) {
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
        return;
 }

diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php
index 38ae863068ba70b43bc88bc2eea00667d20bd915..a1d6f979e33926fc17452c2b9d9cc2882b64ba3a 100644 (file)
--- a/inc/modules/member/what-surfbar_stats.php
+++ b/inc/modules/member/what-surfbar_stats.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL(URL."/modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("surfbar")) {
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
        return;
 }

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index ecce7b10fc9b496d47a9541ea7a4a2586d4fb148..5e6a5fcfc77c54fa20e9fab2c7fd36810abd552a 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("theme")) {
+} elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
        return;
 }

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 6698a42deff7e35f979039a461f74173e766749e..aa9062a243280d119a3c92d826d3d79f12d963ba 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")) {
+} elseif ((!EXT_IS_ACTIVE("transfer")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "transfer");
        return;
 }

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 91725bf67df93b839a30cc88012306ca7713dc32..f381e4322480472c52f19a8610b752aeef49717f 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("mailid")) {
+} elseif ((!EXT_IS_ACTIVE("mailid")) && (!IS_ADMIN())) {
        LOAD_URL("modules.php?module=login");
 }
 

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index 227d5031a0d756a2c0bcb019f3d9850b0a289498..b74c42a53b7beb99fe463d92f9beee34460f47c8 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")) {
+} elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis");
        return;
 }

diff --git a/inc/modules/order.php b/inc/modules/order.php
index a880995003bf04058c46b6676db1e0bb60cddb15..6e52c0745d0469b9ab840c3a103fa4491d913df1 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -36,7 +36,7 @@ $URL = "";
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("order")) {
+} elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 } elseif (!IS_MEMBER()) {

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2aa4d8b7715346c749bf9ceb639272b68c16b3be..ef0072bff840a4949ee980158bf3be301cc21706 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -972,7 +972,8 @@ function GET_ACTION ($MODE, &$wht)
        // Return action value
        return $ret;
 }
-//
+
+// Get category name back
 function GET_CATEGORY ($cid) {
        // Default is not found
        $ret = _CATEGORY_404;
@@ -997,7 +998,8 @@ function GET_CATEGORY ($cid) {
        // Return result
        return $ret;
 }
-//
+
+// Get a string of "mail title" and price back
 function GET_PAYMENT ($pid, $full=false) {
        // Default is not found
        $ret = _PAYMENT_404;
@@ -1023,7 +1025,8 @@ function GET_PAYMENT ($pid, $full=false) {
        // Return result
        return $ret;
 }
-//
+
+// Get (basicly) the price of given payment id
 function GET_PAY_POINTS($pid, $lookFor="price")
 {
        $ret = "-1";
@@ -1037,8 +1040,9 @@ function GET_PAY_POINTS($pid, $lookFor="price")
        }
        return $ret;
 }
+
 // Remove a receiver's ID from $ARRAY and add a link for him to confirm
-function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false)
+function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false)
 {
        $ret = "failed";
        if ($uid > 0)
@@ -1405,7 +1409,7 @@ WHERE sid='%s' LIMIT 1",
        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
         array($_CONFIG['online_timeout']), __FILE__, __LINE__);
 }
-// OBSULETE: Sends out mail to all administrators
+// OBSOLETE: Sends out mail to all administrators
 function SEND_ADMIN_EMAILS ($subj, $msg) {
        // Load all admin email addresses
        $result = SQL_QUERY("SELECT email FROM "._MYSQL_PREFIX."_admins ORDER BY id ASC", __FILE__, __LINE__);