X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finc-functions.php;h=43ac1d9f4385be0412abe0974db13ce2395eb2c5;hp=989eb238d4fb910d572ab93a4b0c8eb02f77420a;hb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;hpb=ad30a667fd8abeb576c04026b62c2e8a29d86f52
diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 989eb238d4..43ac1d9f43 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -44,19 +44,19 @@ if (!defined('__SECURITY')) {
// Init INC_POOL
function initIncludePool ($pool) {
- //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
';
+ //* 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.'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
if (isset($GLOBALS['inc_pool'][$pool])) {
// Return found pool (array)
return $GLOBALS['inc_pool'][$pool];
@@ -68,25 +68,25 @@ function getIncludePool ($pool) {
// 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));
@@ -102,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);
@@ -118,7 +118,7 @@ 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)) {
@@ -134,7 +134,7 @@ function loadInclude ($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])) {
@@ -151,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);