X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=c59e12c9230ff867178214fe42712c79bf40bd95;hb=50b91687d7e7201f6c596a9ad40e8ff35c995074;hp=1df653fb9bcd16d13e00ef9d72c7a603d651929a;hpb=ff21321f09918909f7e21f850b6617156323e332;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 1df653fb9b..c59e12c923 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -114,7 +114,7 @@ function clearOutputBuffer () {
 // Loads an include file and logs any missing files for debug purposes
 function loadInclude ($INC) {
 	// Add the path. This is why we need a trailing slash in config.php
-	$FQFN = constant('PATH') . $INC;
+	$FQFN = getConfig('PATH') . $INC;
 
 	// Is the include file there?
 	if (!isIncludeReadable($INC)) {
@@ -132,7 +132,7 @@ function loadIncludeOnce ($INC) {
 	// Is it not loaded?
 	if (!isset($GLOBALS['load_once'][$INC])) {
 		// Mark it as loaded
-		$GLOBALS['load_once'][$INC] = "loaded";
+		$GLOBALS['load_once'][$INC] = 'loaded';
 
 		// Then try to load it
 		loadInclude($INC);
@@ -142,7 +142,7 @@ function loadIncludeOnce ($INC) {
 // Checks wether an include file (non-FQFN better) is readable
 function isIncludeReadable ($INC) {
 	// Construct FQFN
-	$FQFN = constant('PATH') . $INC;
+	$FQFN = getConfig('PATH') . $INC;
 
 	// Is it readable?
 	return isFileReadable($FQFN);
@@ -180,21 +180,19 @@ function decodeEntities ($str) {
 // Merges an array together but only if both are arrays
 function merge_array ($array1, $array2) {
 	// Are both an array?
-	if ((is_array($array1)) && (is_array($array2))) {
-		// Merge all together
-		return array_merge($array1, $array2);
-	} elseif (is_array($array1)) {
-		// Return left array
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
-		return $array1;
-	} elseif (is_array($array2)) {
-		// Return right array
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
-		return $array2;
+	if ((!is_array($array1)) && (!is_array($array2))) {
+		// Both are not arrays
+		debug_report_bug(__FUNCTION__ . ': No arrays provided!');
+	} elseif (!is_array($array1)) {
+		// Left one is not an array
+		debug_report_bug(__FUNCTION__, sprintf("array1 is not an array. array != %s", gettype($array1)));
+	} elseif (!is_array($array2)) {
+		// Right one is not an array
+		debug_report_bug(__FUNCTION__, sprintf("array2 is not an array. array != %s", gettype($array2)));
 	}
 
-	// Both are not arrays
-	debug_report_bug(__FUNCTION__.": No arrays provided!");
+	// Merge all together
+	return array_merge($array1, $array2);
 }
 
 // Check if given FQFN is a readable file
@@ -287,10 +285,10 @@ function isInstalled () {
 	return (
 	(
 		// New config file found and loaded
-		getConfig('MXCHANGE_INSTALLED') == 'Y'
+		isIncludeReadable('inc/cache/config-local.php')
 	) || (
-		// Fall-back!
-		isIncludeReadable('inc/config.php')
+		// Fall-back to config
+		getConfig('MXCHANGE_INSTALLED') == 'Y'
 	) || (
 		(
 			// New config file found, but not yet read
@@ -352,7 +350,7 @@ function copyFileVerified ($source, $dest, $chmod = '') {
 	// Is the target directory there?
 	if (!isDirectory(dirname($dest))) {
 		// Then abort here
-		debug_report_bug('Cannot find directory ' . str_replace(constant('PATH'), '', dirname($dest)) . '.');
+		debug_report_bug('Cannot find directory ' . str_replace(getConfig('PATH'), '', dirname($dest)) . '.');
 	} // END - if
 
 	// Now try to copy it
@@ -434,7 +432,7 @@ function isNicknameUsed ($userid) {
 		$isUsed = $GLOBALS['cache_probe_nicknames'][$userid];
 	} else {
 		// Determine it
-		$isUsed = ((EXT_IS_ACTIVE('nickname')) && ((''.round($userid).'') != $userid));
+		$isUsed = ((EXT_IS_ACTIVE('nickname')) && (('' . round($userid) . '') != $userid));
 
 		// And write it to the cache
 		$GLOBALS['cache_probe_nicknames'][$userid] = $isUsed;
@@ -593,5 +591,22 @@ function isOutputModeSet ($abortOnMiss =  false) {
 	return $isset;
 }
 
+// Enables block-mode
+function enableBlockMode ($enabled = true) {
+	$GLOBALS['block_mode'] = $enabled;
+}
+
+// Checks wether block-mode is enabled
+function isBlockModeEnabled () {
+	// Abort if not set
+	if (!isset($GLOBALS['block_mode'])) {
+		// Needs to be fixed
+		debug_report_bug(__FUNCTION__ . ': block_mode is not set.');
+	} // END - if
+
+	// Return it
+	return $GLOBALS['block_mode'];
+}
+
 // [EOF]
 ?>