X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finc-functions.php;h=43ac1d9f4385be0412abe0974db13ce2395eb2c5;hb=9d794e925ba857067b03efb20649c72eee9c5797;hp=06e912fa06bfb3ae58c7c504dab956597790d7f8;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git
diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 06e912fa06..43ac1d9f43 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -1,7 +1,7 @@
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
$GLOBALS['inc_pool'][$pool] = array();
}
// Setter for INC_POOL
function setIncludePool ($pool, $includePool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':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: */ debugOutput(__FUNCTION__.':pool='.$pool);
+ if (isset($GLOBALS['inc_pool'][$pool])) {
+ // Return found pool (array)
+ return $GLOBALS['inc_pool'][$pool];
+ } else {
+ // Return empty array if not found
+ return array();
+ }
}
// Count INC_POOL
function countIncludePool ($pool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
return count($GLOBALS['inc_pool'][$pool]);
}
// Merge INC_POOL into given
function mergeIncludePool ($pool, $includePool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':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.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
$GLOBALS['inc_pool'][$pool][] = (string) $inc;
}
// Remove an include file from INC_POOL
function removeIncludeFromPool ($pool, $inc) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
// First look it up
$key = array_search($inc, getIncludePool($pool));
@@ -95,12 +102,12 @@ function removeIncludeFromPool ($pool, $inc) {
// Load the whole include pool
function loadIncludePool ($pool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.' - START
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':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: */ debugOutput(__FUNCTION__.':pool='.$pool.' - END');
// Remove it
initIncludePool($pool);
@@ -111,23 +118,23 @@ 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;
+ $GLOBALS['inc_loaded'][$inc] = getPath() . $inc;
// Is the include file there?
if (!isIncludeReadable($inc)) {
// Not there so log it
- debug_report_bug(sprintf("Include file %s not found.", $inc));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Include file %s not found.", $inc));
} // END - if
} // 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);
+ $inc = str_replace(getPath(), '', $inc);
// Is it not loaded?
if (!isset($GLOBALS['load_once'][$inc])) {
@@ -144,10 +151,10 @@ function isIncludeReadable ($inc) {
// Do we have cache?
if (!isset($GLOBALS['inc_readable'][$inc])) {
// Remove double path
- $inc = str_replace(getConfig('PATH'), '', $inc);
+ $inc = str_replace(getPath(), '', $inc);
// Construct FQFN
- $FQFN = getConfig('PATH') . $inc;
+ $FQFN = getPath() . $inc;
// Is it readable?
$GLOBALS['inc_readable'][$inc] = isFileReadable($FQFN);