X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=e989dd9a79aa392fe0d4847acf4dc69debbc1831;hb=86993ed7d3b2dbab9d2725c7782b3e7ab693cd3f;hp=38a6eb12d2288b27863acdfe0948e317ce16fae9;hpb=215d0d0d066ee2924ec8fa4b8efe6bf93358ad6f;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 38a6eb12d2..e989dd9a79 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -42,31 +42,27 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Read a given file
-function readFromFile ($FQFN, $sqlPrepare = false) {
+function readFromFile ($FQFN) {
 	// Sanity-check if file is there (should be there, but just to make it sure)
 	if (!isFileReadable($FQFN)) {
 		// This should not happen
 		debug_report_bug(__FUNCTION__.': File ' . basename($FQFN) . ' is not readable!');
 	} // END - if
 
-	// Load the file
-	if (function_exists('file_get_contents')) {
-		// Use new function
-		$content = file_get_contents($FQFN);
-	} else {
-		// Fall-back to implode-file chain
-		$content = implode('', file($FQFN));
-	}
-
-	// Prepare SQL queries?
-	if ($sqlPrepare === true) {
-		// Remove some unwanted chars
-		$content = str_replace("\r", '', $content);
-		$content = str_replace("\n\n", "\n", $content);
+	// Is it cached?
+	if (!isset($GLOBALS['file_content'][$FQFN])) {
+		// Load the file
+		if (function_exists('file_get_contents')) {
+			// Use new function
+			$GLOBALS['file_content'][$FQFN] = file_get_contents($FQFN);
+		} else {
+			// Fall-back to implode-file chain
+			$GLOBALS['file_content'][$FQFN] = implode('', file($FQFN));
+		}
 	} // END - if
 
 	// Return the content
-	return $content;
+	return $GLOBALS['file_content'][$FQFN];
 }
 
 // Writes content to a file
@@ -110,6 +106,9 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
 	// Mark it as readable
 	$GLOBALS['file_readable'][$FQFN] = true;
 
+	// Remember content in cache
+	$GLOBALS['file_content'][$FQFN] = $content;
+
 	// Return status
 	return changeMode($FQFN, 0644);
 }
@@ -170,7 +169,13 @@ function isFileReadable ($FQFN) {
 	if (!isset($GLOBALS['file_readable'][$FQFN])) {
 		// Check all...
 		$GLOBALS['file_readable'][$FQFN] = ((file_exists($FQFN)) && (is_file($FQFN)) && (is_readable($FQFN)));
-	} // END - if
+
+		// Debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($FQFN) . ' - CHECK! (' . intval($GLOBALS['file_readable'][$FQFN]) . ')');
+	} else {
+		// Cache used
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($FQFN) . ' - CACHE! (' . intval($GLOBALS['file_readable'][$FQFN]) . ')');
+	}
 
 	// Return result
 	return $GLOBALS['file_readable'][$FQFN];
@@ -262,6 +267,12 @@ function detectQueryString () {
 	return str_replace('&', '&', (getenv('QUERY_STRING')));
 }
 
+// "Getter" for SERVER_NAME
+function detectServerName () {
+	// Return it
+	return (getenv('SERVER_NAME'));
+}
+
 // Check wether we are installing
 function isInstalling () {
 	// Determine wether we are installing
@@ -396,10 +407,12 @@ function flushHeaders () {
 		debug_report_bug('Headers already sent!');
 	} // END - if
 
-	// Flush all headers
-	foreach ($GLOBALS['header'] as $header) {
-		header($header);
-	} // END - foreach
+	// Flush all headers if found
+	if ((isset($GLOBALS['header'])) && (is_array($GLOBALS['header']))) {
+		foreach ($GLOBALS['header'] as $header) {
+			header($header);
+		} // END - foreach
+	} // END - if
 
 	// Mark them as flushed
 	$GLOBALS['header'] = array();
@@ -721,6 +734,7 @@ function getPhpCaching () {
 
 // Checks wether the admin hash is set
 function isAdminHashSet ($admin) {
+	if (!isset($GLOBALS['cache_array']['admin'])) debug_report_bug('Cache not set.');
 	return isset($GLOBALS['cache_array']['admin']['password'][$admin]);
 }