X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finc-functions.php;h=7b33f373227ce3ff16b2a07f97855519803da402;hb=e255180539a9fdfac8a8b51d1aefc6f4909d8e07;hp=06e912fa06bfb3ae58c7c504dab956597790d7f8;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git
diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 06e912fa06..7b33f37322 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -1,7 +1,7 @@
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
$GLOBALS['inc_pool'][$pool] = array();
}
// Setter for INC_POOL
function setIncludePool ($pool, $includePool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
$GLOBALS['inc_pool'][$pool] = (array) $includePool;
}
// Getter for INC_POOL
function getIncludePool ($pool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
- return $GLOBALS['inc_pool'][$pool];
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
+ // Default is empty pool
+ $poolArray = array();
+
+ // Is it set?
+ if (isset($GLOBALS['inc_pool'][$pool])) {
+ // Return found pool (array)
+ $poolArray = $GLOBALS['inc_pool'][$pool];
+ } // END - if
+
+ // Return it
+ return $poolArray;
}
// Count INC_POOL
function countIncludePool ($pool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
return count($GLOBALS['inc_pool'][$pool]);
}
// Merge INC_POOL into given
function mergeIncludePool ($pool, $includePool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
setIncludePool($pool, merge_array(getIncludePool($pool), $includePool));
}
// Add single include file to INC_POOL
function addIncludeToPool ($pool, $inc) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
- $GLOBALS['inc_pool'][$pool][] = (string) $inc;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
+ array_push($GLOBALS['inc_pool'][$pool], $inc);
}
// Remove an include file from INC_POOL
function removeIncludeFromPool ($pool, $inc) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
// First look it up
$key = array_search($inc, getIncludePool($pool));
@@ -95,12 +104,12 @@ function removeIncludeFromPool ($pool, $inc) {
// Load the whole include pool
function loadIncludePool ($pool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.' - START
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool.' - START');
foreach (getIncludePool($pool) as $inc) {
- //* DEBUG: */ print __FUNCTION__.':inc='.$inc.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':inc='.$inc);
loadIncludeOnce($inc);
} // END - foreach
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.' - END
';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool.' - END');
// Remove it
initIncludePool($pool);
@@ -110,25 +119,22 @@ function loadIncludePool ($pool) {
function loadInclude ($inc) {
// Do we have cache?
if (!isset($GLOBALS['inc_loaded'][$inc])) {
- // Add the path. This is why we need a trailing slash in config.php
- $GLOBALS['inc_loaded'][$inc] = getConfig('PATH') . $inc;
-
// Is the include file there?
if (!isIncludeReadable($inc)) {
// Not there so log it
- debug_report_bug(sprintf("Include file %s not found.", $inc));
+ reportBug(__FUNCTION__, __LINE__, sprintf("Include file %s not found or deprecated.", $inc));
} // END - if
+
+ // Add the path. This is why we need a trailing slash in config.php
+ $GLOBALS['inc_loaded'][$inc] = getPath() . $inc;
} // END - if
// Try to load it
- require($GLOBALS['inc_loaded'][$inc]);
+ include($GLOBALS['inc_loaded'][$inc]);
}
// Loads an include file once
function loadIncludeOnce ($inc) {
- // Remove double path
- $inc = str_replace(getConfig('PATH'), '', $inc);
-
// Is it not loaded?
if (!isset($GLOBALS['load_once'][$inc])) {
// Mark it as loaded
@@ -139,18 +145,15 @@ function loadIncludeOnce ($inc) {
} // END - if
}
-// Checks wether an include file (non-FQFN better) is readable
+// Checks whether an include file (non-FQFN better) is readable
function isIncludeReadable ($inc) {
// Do we have cache?
if (!isset($GLOBALS['inc_readable'][$inc])) {
- // Remove double path
- $inc = str_replace(getConfig('PATH'), '', $inc);
-
// Construct FQFN
- $FQFN = getConfig('PATH') . $inc;
+ $FQFN = getPath() . $inc;
- // Is it readable?
- $GLOBALS['inc_readable'][$inc] = isFileReadable($FQFN);
+ // Is it readable and at least 50 byte large? Include file sizes < 50 byte are always deprecated
+ $GLOBALS['inc_readable'][$inc] = ((isFileReadable($FQFN)) && (filesize($FQFN) >= 50));
} // END - if
// Return result