X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finc-functions.php;h=7279db570a12ac27aada5b7f362c61363900b367;hb=9f30db83eedcaf1d265d973e4bffcd3fa7df9bde;hp=d93731ab0dbc14ee3cc4eac0a4cfa70eb95bdd4e;hpb=9f6cb960b3cf0a17ad2479cbda93b52dd25fd61e;p=mailer.git
diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index d93731ab0d..7279db570a 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -14,11 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -44,19 +42,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 +66,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 +100,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,12 +116,12 @@ 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
@@ -133,9 +131,6 @@ function loadInclude ($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
@@ -150,11 +145,8 @@ function loadIncludeOnce ($inc) {
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);