X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finc-functions.php;h=7b33f373227ce3ff16b2a07f97855519803da402;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hp=8d3a036efeb95760e53291464c958f3c96196fe6;hpb=1d6211aa6e979663f2235c6f94b5aae09754c915;p=mailer.git

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 8d3a036efe..7b33f37322 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,49 +42,53 @@ if (!defined('__SECURITY')) {
 
 // Init INC_POOL
 function initIncludePool ($pool) {
-	//* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
 	$GLOBALS['inc_pool'][$pool] = array();
 }
 
 // Setter for INC_POOL
 function setIncludePool ($pool, $includePool) {
-	//* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
 	$GLOBALS['inc_pool'][$pool] = (array) $includePool;
 }
 
 // Getter for INC_POOL
 function getIncludePool ($pool) {
-	//* DEBUG: */ debugOutput(__FUNCTION__.':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)
-		return $GLOBALS['inc_pool'][$pool];
-	} else {
-		// Return empty array if not found
-		return array();
-	}
+		$poolArray = $GLOBALS['inc_pool'][$pool];
+	} // END - if
+
+	// Return it
+	return $poolArray;
 }
 
 // Count INC_POOL
 function countIncludePool ($pool) {
-	//* DEBUG: */ debugOutput(__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: */ debugOutput(__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: */ debugOutput(__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: */ debugOutput(__FUNCTION__.':pool='.$pool);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool);
 	// First look it up
 	$key = array_search($inc, getIncludePool($pool));
 
@@ -100,12 +104,12 @@ function removeIncludeFromPool ($pool, $inc) {
 
 // Load the whole include pool
 function loadIncludePool ($pool) {
-	//* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool.' - START');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool.' - START');
 	foreach (getIncludePool($pool) as $inc) {
 		//* DEBUG: */ debugOutput(__FUNCTION__.':inc='.$inc);
 		loadIncludeOnce($inc);
 	} // END - foreach
-	//* DEBUG: */ debugOutput(__FUNCTION__.':pool='.$pool.' - END');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pool=' . $pool.' - END');
 
 	// Remove it
 	initIncludePool($pool);
@@ -115,14 +119,14 @@ 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] = getPath() . $inc;
-
 		// Is the include file there?
 		if (!isIncludeReadable($inc)) {
 			// Not there so log it
-			debug_report_bug(__FUNCTION__, __LINE__, sprintf("Include file %s not found or deprecated.", $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
@@ -141,7 +145,7 @@ 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])) {