Updated propset.sh, fixed all SVN properties

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index d8f31433575d1afa84ba71801b28c093d5c1e33d..2e500b1617efa3bfb7f4a79d87fb0319d5fb6bb0 100644 (file)
--- 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'
                                )
                        )
                ) || (
@@ -443,6 +443,18 @@ function isDebugRegularExpressionEnabled () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// Checks whether debugging of build mails is enabled
+function isDebugBuildMailsEnabled () {
+       // Is cache set?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Simply check it
+               $GLOBALS[__FUNCTION__] = ((isConfigEntrySet('DEBUG_BUILD_MAILS')) && (getConfig('DEBUG_BUILD_MAILS') == 'Y'));
+       } // END - if
+
+       // Return it
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Checks whether the cache instance is valid
 function isCacheInstanceValid () {
        // Is there cache?
@@ -591,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'])));
 
@@ -626,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'])));
 
@@ -662,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'])));
 
@@ -695,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']));
 
@@ -1164,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');
@@ -1291,7 +1303,7 @@ function isValidUserId ($userid) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Check it out
-               $GLOBALS[__FUNCTION__][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid > 0));
+               $GLOBALS[__FUNCTION__][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid != 'NULL') && ($userid > 0));
        } // END - if
 
        // Return cache
@@ -2462,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?
@@ -2817,18 +2865,20 @@ function search_array ($array, $key, $value, $parentIndex = NULL) {
        if (is_array($array)) {
                // Search for whole array
                foreach ($array as $idx => $dummy) {
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',idx=' . $idx);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex);
+                       //* DEBUG: */ print 'idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',key=' . $key . ',value=' . $value . ',array=<pre>'.print_r($array, TRUE).'</pre>';
                        // Is dummy an array?
-                       if (is_array($dummy)) {
+                       if ((is_array($dummy)) && ((is_null($parentIndex)) || ($parentIndex === $value))) {
                                // Then search again
                                $subResult = search_array($dummy, $key, $value, $idx);
                                //* DEBUG: */ print 'subResult=<pre>' . print_r($subResult, TRUE).'</pre>';
 
                                // And merge both
                                $results = merge_array($results, $subResult, TRUE);
-                       } elseif ((isset($array[$key])) && ($array[$key] == $value)) {
+                       } elseif (($key == $idx) && (isset($array[$key])) && ($array[$key] === $value)) {
                                // Is found, so add it
                                $results[$parentIndex] = $array;
+                               //* DEBUG: */ print 'ARRAY: key=' . $key . ',idx=' . $idx . ',value=' . $value . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',array=<pre>' . print_r($array, TRUE).'</pre>';
                        }
                } // END - foreach
        } // END - if