X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=5d27ca58265e2582b7332ef9b2a41767e17dcd51;hp=b3c3c1359075475571a31c68efae5c3145b8cdb1;hb=84b5a1d2c46f271f2a10ae8bba4b531e9bd9d5e6;hpb=0437f06b273f885db05736449a952c6eb72086ca

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index b3c3c13590..5d27ca5826 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -44,6 +44,12 @@ if (!defined('__SECURITY')) {
 
 // Read a given file
 function readFromFile ($FQFN, $sqlPrepare = false) {
+	// 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
@@ -278,7 +284,28 @@ function isInstalling () {
 
 // Check wether this script is installed
 function isInstalled () {
-	return ((getConfig('MXCHANGE_INSTALLED') == 'Y') || (isIncludeReadable('inc/cache/config-local.php')));
+	return (
+	(
+		// New config file found and loaded
+		getConfig('MXCHANGE_INSTALLED') == 'Y'
+	) || (
+		// Fall-back!
+		isIncludeReadable('inc/config.php')
+	) || (
+		(
+			// New config file found, but not yet read
+			isIncludeReadable('inc/cache/config-local.php')
+		) && (
+			(
+				// Only new config file is found
+				!isIncludeReadable('inc/config.php')
+			) || (
+				// Is installation mode
+				isInstalling()
+			)
+		)
+	)
+	);
 }
 
 // Check wether an admin is registered
@@ -351,14 +378,14 @@ function sendHeader ($header) {
 	} // END - if
 
 	// Send the header
-	header($header);
+	header(trim($header));
 }
 
 // Wrapper function for chmod()
 // @TODO Do some more sanity check here
 function changeMode ($FQFN, $mode) {
 	// Is the file/directory there?
-	if ((!isFile($FQFN)) && (!isDirectory($FQFN))) {
+	if ((!isFileReadable($FQFN)) && (!isDirectory($FQFN))) {
 		// Neither, so abort here
 		debug_report_bug('Cannot chmod() on ' . basename($FQFN) . '.');
 	} // END - if
@@ -367,6 +394,19 @@ function changeMode ($FQFN, $mode) {
 	chmod($FQFN, $mode);
 }
 
+// Wrapper for unlink()
+function removeFile ($FQFN) {
+	// Is the file there?
+	if (isFileReadable($FQFN)) {
+		// Yes, so remove it
+		return unlink($FQFN);
+	} // END - if
+
+	// All fine if no file was removed. If we change this to 'false' or rewrite
+	// above if() block it would be to restrictive.
+	return true;
+}
+
 // Wrapper for $_POST['sel']
 function countPostSelection () {
 	return countSelection(REQUEST_POST('sel'));