From deb4293fa309b70be72d66b394e7253c8ea7d351 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 23 Feb 2009 19:35:43 +0000 Subject: [PATCH] Fixed a typo, thanks to profi-concept. Function INCLUDE_READABLE() introduced --- debug.php | 2 +- img.php | 2 +- inc/db/lib.php | 2 +- inc/extensions.php | 4 ++-- inc/functions.php | 11 ++++++++++- inc/libs/sponsor_functions.php | 2 +- inc/libs/theme_functions.php | 2 +- inc/modules/admin/action-admins.php | 2 +- inc/modules/admin/action-bank.php | 2 +- inc/modules/admin/action-country.php | 2 +- inc/modules/admin/action-doubler.php | 2 +- inc/modules/admin/action-email.php | 2 +- inc/modules/admin/action-holiday.php | 2 +- inc/modules/admin/action-login.php | 2 +- inc/modules/admin/action-menu.php | 2 +- inc/modules/admin/action-misc.php | 2 +- inc/modules/admin/action-mods.php | 2 +- inc/modules/admin/action-newsletter.php | 2 +- inc/modules/admin/action-payouts.php | 2 +- inc/modules/admin/action-primera.php | 2 +- inc/modules/admin/action-rallye.php | 2 +- inc/modules/admin/action-repair.php | 2 +- inc/modules/admin/action-setup.php | 2 +- inc/modules/admin/action-sponsor.php | 2 +- inc/modules/admin/action-stats.php | 2 +- inc/modules/admin/action-surfbar.php | 2 +- inc/modules/admin/action-task.php | 2 +- inc/modules/admin/action-theme.php | 2 +- inc/modules/admin/action-transfer.php | 2 +- inc/modules/admin/action-user.php | 2 +- inc/modules/admin/action-wernis.php | 2 +- inc/modules/admin/admin-inc.php | 10 +++++----- inc/modules/admin/what-theme_import.php | 4 ++-- inc/modules/guest/action-admin.php | 2 +- inc/modules/guest/action-main.php | 2 +- inc/modules/guest/action-members.php | 2 +- inc/modules/guest/action-sponsor.php | 2 +- inc/modules/index.php | 2 +- inc/modules/member/action-account.php | 2 +- inc/modules/member/action-bank.php | 2 +- inc/modules/member/action-extras.php | 2 +- inc/modules/member/action-logout.php | 2 +- inc/modules/member/action-main.php | 2 +- inc/modules/member/action-order.php | 2 +- inc/modules/member/action-rals.php | 2 +- inc/modules/member/action-stats.php | 2 +- inc/modules/member/action-surfbar.php | 2 +- inc/modules/member/what-themes.php | 2 +- js.php | 2 +- 49 files changed, 64 insertions(+), 55 deletions(-) diff --git a/debug.php b/debug.php index 492fe36548..2466faa858 100644 --- 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 e619db6b3c..4a6c77dd70 100644 --- 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 645721deac..e5c8ab3d9f 100644 --- 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 90a5af3374..8de47c2d42 100644 --- 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 831e497a06..38612873b2 100644 --- 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__."(".__LINE__."): inc={$inc} - LOADED!
\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 024a0c9089..4f6dafa9c2 100644 --- 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 6289a3d561..ebdaf6ee52 100644 --- 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 85685d1baf..2187e4b3b9 100644 --- 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 3c41577b53..1a5574468f 100644 --- 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 d9511b39dc..c1d9e00825 100644 --- 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 08cfc5f29c..6d06785ff6 100644 --- 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 ca1f750f4c..cc1d9fc1d2 100644 --- 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 2cdec1e99f..5c51869d83 100644 --- 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 5e4d6eba02..f83e30f781 100644 --- 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 bc860f3d6c..a794d55c67 100644 --- 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 81e5691207..3c263d3491 100644 --- 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 3d523770d4..ba7354036a 100644 --- 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 658d6089a2..e1338dae6c 100644 --- 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 5b9c3c0779..ccd1a7f505 100644 --- 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 870416adf4..8e3189f463 100644 --- 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 f0719b7fb7..8edbbb8de7 100644 --- 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 d6fc98d3cf..ddbe8b17c2 100644 --- 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 de7d1a4455..3a3e189877 100644 --- 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 8eabf88196..920011de1a 100644 --- 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 9615d3654f..850508f9af 100644 --- 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 90b42463c3..603de19805 100644 --- 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 cbbd29c4ed..98254c531d 100644 --- 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 05cc6dd7a6..71aef41007 100644 --- 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 048c8e3529..4065cb3065 100644 --- 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 a882e5445e..d3f352fd6e 100644 --- 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 3e323131e7..9677e2b57c 100644 --- 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 4493fca815..c7ed2575c9 100644 --- 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 .= "  --> "; - if ($readable) + if ($readable === true) { if ($wht == $wht_sub) { @@ -500,7 +500,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { $OUT .= ""; } $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 f3c3dd0f97..045e925e2b 100644 --- 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 5260a3ef79..6b3787f03a 100644 --- 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 322ec971f8..125585b32b 100644 --- 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 bbfbfdf790..0396821609 100644 --- 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 3f29c85371..292722cb6d 100644 --- 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 27111a3f10..8ca5c6cf01 100644 --- 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 9f19674939..dc1568083f 100644 --- 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 c276c84db2..5aa1df1440 100644 --- 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 6aae2a0497..aea409bf0a 100644 --- 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 e3f4de5bba..aa2526f736 100644 --- 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 7158a4cffb..3117c2cec8 100644 --- 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 90f59f22d1..c2b1707789 100644 --- 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 5815abf4aa..62c102582e 100644 --- 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 c7e9111a81..ffdf51a6ef 100644 --- 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 81bc3f8ed0..66ff010447 100644 --- 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 338da85988..990f2bedce 100644 --- 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 644639ab49..d108cd75bf 100644 --- 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 -- 2.39.5