Fixed a typo, thanks to profi-concept. Function INCLUDE_READABLE() introduced

diff --git a/debug.php b/debug.php
index 492fe3654853b49f4263a68d133f4a1c7e6e8c4a..2466faa8585cfda18f1f181cdc4960f234b4ed4f 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -64,7 +64,7 @@ if ((isBooleanConstantAndTrue('mxchange_installed')) && (getTotalFatalErrors() =
                        );
 
                        // Is the module there? Else we log it!
-                       if (FILE_READABLE($INC)) {
+                       if (INCLUDE_READABLE($INC)) {
                                // Load the request module
                                LOAD_INC($INC);
                        } else {

diff --git a/img.php b/img.php
index e619db6b3c4fe1325ba9fa416c0c5716626d6eb4..4a6c77dd70819a24dc704281dbb6c6fb17bba65b 100644 (file)
--- a/img.php
+++ b/img.php
@@ -60,7 +60,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                );
 
                // Include is readable?
-               if (FILE_READABLE($INC)) {
+               if (INCLUDE_READABLE($INC)) {
                        // Include it
                        LOAD_INC($INC);
                } // END - if

diff --git a/inc/db/lib.php b/inc/db/lib.php
index 645721deacf8e89ed840af587d29ee61939ca7e1..e5c8ab3d9fb11d5551328490c63aa4f75f8e3846 100644 (file)
--- a/inc/db/lib.php
+++ b/inc/db/lib.php
@@ -43,7 +43,7 @@ if (!defined('_DB_TYPE')) define('_DB_TYPE', "mysql3");
 // Create include file name
 $INC = sprintf("inc/db/lib-%s.php", constant('_DB_TYPE'));
 
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Include abstraction layer
        LOAD_INC_ONCE($INC);
 } else {

diff --git a/inc/extensions.php b/inc/extensions.php
index 90a5af3374eab55fb16506297fa3fc5e4a24bbd4..8de47c2d42fa26998f81b12791aae6cd454a62b5 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -61,7 +61,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
        );
 
        // Is the extension file NOT there?
-       if (!FILE_READABLE($extInclude)) {
+       if (!FILE_READABLE($FQFN)) {
                // Debug message
                DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name));
 
@@ -105,7 +105,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 
        // Include the extension file
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded.");
-       require($extInclude);
+       require($FQFN);
 
        // Is this extension deprecated?
        if ($EXT_DEPRECATED == "Y") {

diff --git a/inc/functions.php b/inc/functions.php
index 831e497a069561a1f289424d747e3edd6a9682cd..38612873b25b6a9be882b1929a991055823ea0c6 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2628,7 +2628,7 @@ function REBUILD_CACHE ($cache, $inc="") {
                        $INC = sprintf("inc/loader/load_cache-%s.php", $inc);
 
                        // Is the include there?
-                       if (FILE_READABLE($INC)) {
+                       if (INCLUDE_READABLE($INC)) {
                                // And rebuild it from scratch
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): inc={$inc} - LOADED!<br />\n";
                                LOAD_INC($INC);
@@ -3286,6 +3286,15 @@ function GENERATE_AID_LINK ($aid) {
        return $admin;
 }
 
+// Checks wether an include file (non-FQFN better) is readable
+function INCLUDE_READABLE ($INC) {
+       // Construct FQFN
+       $FQFN = constant('PATH') . $INC;
+
+       // Is it readable?
+       return FILE_READABLE($FQFN);
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 024a0c9089a633d24a958dec757942aca3c7a58e..4f6dafa9c28e6dcac17614d7456f1aa4fedca15d 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -339,7 +339,7 @@ function GENERATE_SPONSOR_CONTENT($what)
 {
        $OUT = "";
        $INC = sprintf("inc/modules/sponsor/%s.php", $what);
-       if (FILE_READABLE($INC)) {
+       if (INCLUDE_READABLE($INC)) {
                // Every sponsor action will output nothing directly. It will be written into $OUT!
                LOAD_INC_ONCE($INC);
        } else {

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 6289a3d5611ba6383827760dce749a1ca250e4b5..ebdaf6ee52ae855eb4059d4986015a9986250c49 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -54,7 +54,7 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
        while (list($theme) = SQL_FETCHROW($result)) {
                // Load it's theme.php file
                $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($theme));
-               if (FILE_READABLE($INC)) {
+               if (INCLUDE_READABLE($INC)) {
                        // And save all data in array
                        LOAD_INC($INC);
                        $THEMES['theme_unix'][] = $theme;

diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index 85685d1bafca65a0e2fb04e66d8f96bc7342c191..2187e4b3b97e6c18989293c4d2610f63a7b5acf4 100644 (file)
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php
index 3c41577b5306acd0ca41ad7da9f3d0778e48284d..1a5574468f6d8475d1fd05c13ed06618605742e2 100644 (file)
--- a/inc/modules/admin/action-bank.php
+++ b/inc/modules/admin/action-bank.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index d9511b39dc0a11cf1bc77e6f08231a8b60eca9f2..c1d9e0082529fa2fe7aad5f87ef308f602e94082 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index 08cfc5f29c7d40628b8d0c79b8497582a6e28a89..6d06785ff6f2c6a8802af21cf7b868b896f3b300 100644 (file)
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index ca1f750f4c022e56b6f165d9e724bf9e40c9001a..cc1d9fc1d261c8da6adf6c43ad76adc2f1a87e44 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index 2cdec1e99f8a4445fe7adc227a4ac34b9b7796e3..5c51869d8340c57535f146018322b13ad5eb66e6 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index 5e4d6eba0204c0a9449d1b428adf26f81dc2470a..f83e30f7817e6a874d45a72e6b9fa19b8b4016c6 100644 (file)
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) { 
+if (INCLUDE_READABLE($INC)) { 
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index bc860f3d6c94269e0e04dbc04c0ec63575dead2f..a794d55c67282fd95036e46bd20f73e847d6106a 100644 (file)
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 81e5691207c7299d1cd28c48d6538d91ec312139..3c263d3491867443aa2fbcd825af9ae1d37654be 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index 3d523770d40d47be684980c3289a8255f0b9909b..ba7354036ac48f612a0530bb3294894a82632dce 100644 (file)
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index 658d6089a26166e1ae213d53df63a32328c0c2aa..e1338dae6c24cd97567fb3beca5618d659c25dfa 100644 (file)
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 5b9c3c0779d4b24d466af0ca30f00bd216966fa9..ccd1a7f50535176a84951a06803aa80c70b323b6 100644 (file)
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php
index 870416adf445fbff6894b9650d845e376c02144f..8e3189f46321a46b77ef1641f558a22c740fc7cb 100644 (file)
--- a/inc/modules/admin/action-primera.php
+++ b/inc/modules/admin/action-primera.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index f0719b7fb7e309d1772b4812f1226dc9a14ecfac..8edbbb8de7e0e288369e392e7450aed351b54ab7 100644 (file)
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index d6fc98d3cf1c114d1229c5db2fc9cb25100991bc..ddbe8b17c2e005fe5663d30a9e6719e69ca2fe5b 100644 (file)
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index de7d1a4455807582415e2b8b61ebf9093707899c..3a3e1898777a6117eb9668c93a5b9585491fe878 100644 (file)
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index 8eabf8819678e0b69e1d79d6fefabf7418dab8aa..920011de1ab2d944549ce6d32d9f3ddbd050fef3 100644 (file)
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index 9615d3654f2279c3955ca59fd1d409f5308a9c69..850508f9af97a90e799a849d1d7f674d6d5295c3 100644 (file)
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php
index 90b42463c3797f1967fd9cbbb55049fce960b433..603de19805d4080ea2ffe92355c2cc80c4e7e51f 100644 (file)
--- a/inc/modules/admin/action-surfbar.php
+++ b/inc/modules/admin/action-surfbar.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index cbbd29c4eda692623dca9b7d75eac6767466424d..98254c531d1c6541229d13328672670158fe1b70 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -45,7 +45,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index 05cc6dd7a62eed21d7974e922ce8e0d3bf4755a0..71aef410070af38a38ebb35e15ba4b9a0f788d95 100644 (file)
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index 048c8e35297a697c2795351be102fd99345dd688..4065cb3065b1585f66bbd13043b136f029c318f9 100644 (file)
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index a882e5445e7937f909afa6fb64d9aed74e0e49da..d3f352fd6edcd17898e9fbb65a08fc812f7b88c7 100644 (file)
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index 3e323131e708f17a7e6a0e58c138a32b15635d1f..9677e2b57cde8a104a2fe54d1cc7dd4af9e46672 100644 (file)
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 4493fca81595cb81a122d28e0f7e70a9d85c9657..c7ed2575c9acf71e71ce4a33a1d2a2b825c34312 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -350,7 +350,7 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
 
                // Is valid but does the inlcude file exists?
                $INC = sprintf("inc/modules/admin/action-%s.php", $act);
-               if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
+               if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
                        // Ok, we finally load the admin action module
                        LOAD_INC($INC);
                } elseif (__ACL_ALLOW == false) {
@@ -476,15 +476,15 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        // ACL is "allow"... hmmm
                                                        $ACL = true;
                                                }
-                                               $readable = FILE_READABLE($INC);
-                                               if ($ACL) {
+                                               $readable = INCLUDE_READABLE($INC);
+                                               if ($ACL === true) {
                                                        // Insert compiled title and description
                                                        $menuTitle[$wht_sub]      = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
                                                        $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
-                                                       if ($readable)
+                                                       if ($readable === true)
                                                        {
                                                                if ($wht == $wht_sub)
                                                                {
@@ -500,7 +500,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                                $OUT .= "<i class=\"admin_note\">";
                                                        }
                                                        $OUT .= $title_what;
-                                                       if ($readable)
+                                                       if ($readable === true)
                                                        {
                                                                if ($wht == $wht_sub)
                                                                {

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index f3c3dd0f97490f3b87ddeca8e23a2d04435cf69c..045e925e2bb630f89d9d7a9b75727773edbf22fe 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -52,7 +52,7 @@ if (!empty($_POST['theme'])) {
        if (!THEME_CHECK_EXIST($_POST['theme'])) {
                // Import theme
                $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($_POST['theme']));
-               if (FILE_READABLE($INC)) {
+               if (INCLUDE_READABLE($INC)) {
                        // Load the theme header file
                        LOAD_INC($INC);
 
@@ -96,7 +96,7 @@ while ($dir = readdir($handle)) {
        $INC = sprintf("theme/%s/theme.php", $dir);
 
        // Test it...
-       if (($dir != ".") && ($dir != "..") && (FILE_READABLE($INC))) {
+       if (($dir != ".") && ($dir != "..") && (INCLUDE_READABLE($INC))) {
                // Found a valid directory so let's load it's theme.php file
                LOAD_INC($INC);
 

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 5260a3ef79a545d2fd3d1091f08e6a2137becb24..6b3787f03a8718fd24c553b410540e2803e67b45 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 
 // Only when one admin link is clicked...
 $INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 322ec971f854062d4107954329469e8556144ccb..125585b32be402e73b85a435fdc60debf360021b 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -45,7 +45,7 @@ ADD_DESCR("guest", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index bbfbfdf790a4a670cf54bbc3eae59488d882ee49..0396821609af856458279b299118f6764811b8ae 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -45,7 +45,7 @@ ADD_DESCR("guest", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 3f29c8537168040f16cc9cbae8b614bc9459a5b5..292722cb6d807a49b985e3d8ca458571f3a5c065 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -47,7 +47,7 @@ ADD_DESCR("guest", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/guest/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 27111a3f10b3b72ff64de8f1a7bdd80bb160e0f1..8ca5c6cf014d7452bcd4cbca87de777cb60e2d2a 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -89,7 +89,7 @@ $BLOCK_MODE = false;
 $INC = sprintf("inc/modules/guest/action-%s.php", $GLOBALS['action']);
 
 // Is the file there?
-if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("guest", $GLOBALS['action'], $GLOBALS['what']))) {
+if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("guest", $GLOBALS['action'], $GLOBALS['what']))) {
        // Requested module is available so we load it
        LOAD_INC_ONCE($INC);
 } else {

diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php
index 9f1967493989a1514110d562d222506852221896..dc1568083ff03117997f540f86c4531d592b6db3 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index c276c84db2abe17e801692c330e005d8b3649a7d..5aa1df14400424fcde458d848f910426dfaae26a 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -50,7 +50,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 6aae2a04974f6b5d0914c817ef80dff5899a191a..aea409bf0a3a594bda9399316b313d44efc4463f 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index e3f4de5bbabb088fa8388b83c8155bc781412836..aa2526f736aaead65b6bcd8936169f4bbeec47e1 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index 7158a4cffbe73d33ef09679d9bcbd4defb77a6fc..3117c2cec8191e20572499a5b02ac1b2dda3e0ef 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 90f59f22d1a0f82fa4fa3cbc151b688243559094..c2b1707789b1abff085ff78c748d0d16b95cbd19 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -50,7 +50,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index 5815abf4aadcbf7d8f4eead8967286993b9d9ff1..62c102582ebff02fea56f008aa14097ce7a878ad 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index c7e9111a816d9aaa8d0e6449158de7acb0d34c44..ffdf51a6ef5eff4c11dc733d2972bffc0e39c967 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index 81bc3f8ed09ded61d3acccce2a672b0c1d785715..66ff010447196ee5c6e82bb8ebff09d0555bb065 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -50,7 +50,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load the include file
 $INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the member action module
        LOAD_INC($INC);
 } else {

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 338da85988e08363d416f34b79e2bc839c734173..990f2bedce3a11aa893d175b583b51d7986466b8 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -76,7 +76,7 @@ while ($entry = readdir($handle)) {
        // Construct absolute theme.php file name
        $INC = sprintf("theme/%s/theme.php", $entry);
 
-       if (($entry != ".") && ($entry != "..") && (FILE_READABLE($INC)) && (THEME_IS_ACTIVE($entry))) {
+       if (($entry != ".") && ($entry != "..") && (INCLUDE_READABLE($INC)) && (THEME_IS_ACTIVE($entry))) {
                // Found a valid directory so let's load it's theme.php file
                LOAD_INC($INC);
 

diff --git a/js.php b/js.php
index 644639ab498ebc1f6fe11aaa9ff77d9836f29b25..d108cd75bf40c27aa8c4539d1cfd475fdd6f9bfc 100644 (file)
--- a/js.php
+++ b/js.php
@@ -68,7 +68,7 @@ if ((isBooleanConstantAndTrue('mxchange_installed')) && (isset($_GET['tag']))) {
        );
 
        // Is that file readable?
-       if (FILE_READABLE($INC)) {
+       if (INCLUDE_READABLE($INC)) {
                // Include it
                LOAD_INC_ONCE($INC);
        } // END - if