X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=2e401e4bc565234818cddc67e5d3b3b11d43f8e7;hb=6a675521bf2bf11b0cd521a9c602085f7bec5283;hp=da71a257dfaf64ccb12ae72633ea648add793d38;hpb=96a270e713e9bc75a6199ff76d5f4831b732ff15;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index da71a257df..2e401e4bc5 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -343,9 +343,9 @@ function isInstalled () {
 			// First is config
 			(
 				(
-					isConfigEntrySet('MXCHANGE_INSTALLED')
+					isConfigEntrySet('MAILER_INSTALLED')
 				) && (
-					getConfig('MXCHANGE_INSTALLED') == 'Y'
+					getConfig('MAILER_INSTALLED') == 'Y'
 				)
 			)
 		) || (
@@ -603,7 +603,7 @@ function setWhatFromConfig ($configEntry) {
 }
 
 // Checks whether what is set and optionally aborts on miss
-function isWhatSet ($strict =  false) {
+function isWhatSet ($strict = FALSE) {
 	// Check for it
 	$isset = (isset($GLOBALS['__what']) && (!empty($GLOBALS['__what'])));
 
@@ -638,7 +638,7 @@ function setAction ($newAction) {
 }
 
 // Checks whether action is set and optionally aborts on miss
-function isActionSet ($strict =  false) {
+function isActionSet ($strict = FALSE) {
 	// Check for it
 	$isset = ((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action'])));
 
@@ -674,7 +674,7 @@ function setModule ($newModule) {
 }
 
 // Checks whether module is set and optionally aborts on miss
-function isModuleSet ($strict =  false) {
+function isModuleSet ($strict = FALSE) {
 	// Check for it
 	$isset = ((isset($GLOBALS['__module'])) && (!empty($GLOBALS['__module'])));
 
@@ -707,13 +707,13 @@ function getScriptOutputMode () {
 }
 
 // Setter for 'output_mode' value
-function setOutputMode ($newOutputMode) {
+function setScriptOutputMode ($newOutputMode) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'output_mode=' . $newOutputMode);
 	$GLOBALS['__output_mode'] = (int) $newOutputMode;
 }
 
 // Checks whether output_mode is set and optionally aborts on miss
-function isOutputModeSet ($strict =  false) {
+function isOutputModeSet ($strict = FALSE) {
 	// Check for it
 	$isset = (isset($GLOBALS['__output_mode']));
 
@@ -1176,7 +1176,7 @@ function sendRawRedirect ($url) {
 	$GLOBALS['__output'] = '';
 
 	// To make redirects working (no content type), output mode must be raw
-	setOutputMode(-1);
+	setScriptOutputMode(-1);
 
 	// Send helping header
 	setHttpStatus('302 Found');
@@ -2474,6 +2474,42 @@ function isDisplayHomeInIndexEnabled () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// Getter for 'ap_server_name_since'
+function getApServerNameSince () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('ap_server_name_since');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'ap_server_name'
+function getApServerName () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('ap_server_name');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Checks whether 'ap_server_name' is 'Y'
+function isApServerNameEnabled () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = (getApServerName() == 'Y');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
 // Getter for 'admin_menu_javascript'
 function getAdminMenuJavascript () {
 	// Is the cache entry set?