New wrapper function getTransferCode() introduced, double-quotes to single-quotes...

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 8758f853d6c910cc8bd6b1de640650ed4b017c11..b5d5bf4bd18d62359484dfc6ff645a49f927b6dd 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -660,17 +660,23 @@ function isModuleSet ($strict =  false) {
 
 // Getter for 'output_mode' value
 function getScriptOutputMode () {
-       // Default is null
-       $output_mode = null;
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Default is null
+               $output_mode = null;
 
-       // Is the value set?
-       if (isOutputModeSet(true)) {
-               // Then use it
-               $output_mode = $GLOBALS['output_mode'];
+               // Is the value set?
+               if (isOutputModeSet(true)) {
+                       // Then use it
+                       $output_mode = $GLOBALS['output_mode'];
+               } // END - if
+
+               // Store it in cache
+               $GLOBALS[__FUNCTION__] = $output_mode;
        } // END - if
 
-       // Return it
-       return $output_mode;
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
 }
 
 // Setter for 'output_mode' value
@@ -686,7 +692,7 @@ function isOutputModeSet ($strict =  false) {
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               debug_report_bug(__FUNCTION__, __LINE__, 'Output_mode is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Output mode is not set.');
        } // END - if
 
        // Return it
@@ -2082,6 +2088,54 @@ function getDbName () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for DOMAIN
+function getDomain () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('DOMAIN');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for SMTP_HOSTNAME
+function getSmtpHostname () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('SMTP_HOSTNAME');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for SMTP_USER
+function getSmtpUser () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('SMTP_USER');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for SMTP_PASSWORD
+function getSmtpPassword() {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('SMTP_PASSWORD');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
        // Do we have cache?
@@ -2216,7 +2270,7 @@ function changeDataInInclude ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0)
        $FQFN = getPath() . $FQFN;
 
        // Call inner function
-       changeDataInFile($FQFN, $comment, $prefix, $suffix, $DATA, $seek);
+       return changeDataInFile($FQFN, $comment, $prefix, $suffix, $DATA, $seek);
 }
 
 // Shortens ucfirst(strtolower()) calls