Some entities created. I have US layout here, but they will be converted to UTF-8...

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 882cd3aa9bd755a3a0554e4c3fc5dce28570aeb8..b76f513d39a06a91a60111ec4535c8be4051ab0b 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -488,12 +488,12 @@ function setWhatFromConfig ($configEntry) {
 }
 
 // Checks wether what is set and optionally aborts on miss
-function isWhatSet ($abortOnMiss =  false) {
+function isWhatSet ($strict =  false) {
        // Check for it
        $isset = (isset($GLOBALS['what']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
                debug_report_bug('what is empty.');
        } // END - if
@@ -523,12 +523,12 @@ function setAction ($newAction) {
 }
 
 // Checks wether action is set and optionally aborts on miss
-function isActionSet ($abortOnMiss =  false) {
+function isActionSet ($strict =  false) {
        // Check for it
        $isset = (isset($GLOBALS['action']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
                debug_report_bug('action is empty.');
        } // END - if
@@ -538,12 +538,12 @@ function isActionSet ($abortOnMiss =  false) {
 }
 
 // Getter for 'module' value
-function getModule () {
+function getModule ($strict = true) {
        // Default is null
        $module = null;
 
        // Is the value set?
-       if (isModuleSet(true)) {
+       if (isModuleSet($strict)) {
                // Then use it
                $module = $GLOBALS['module'];
        } // END - if
@@ -559,14 +559,14 @@ function setModule ($newModule) {
 }
 
 // Checks wether module is set and optionally aborts on miss
-function isModuleSet ($abortOnMiss =  false) {
+function isModuleSet ($strict =  false) {
        // Check for it
        $isset = (!empty($GLOBALS['module']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
-               print '<pre>';
+               print 'Module not set!<pre>';
                debug_print_backtrace();
                die('</pre');
                debug_report_bug('module is empty.');
@@ -593,16 +593,16 @@ function getOutputMode () {
 
 // Setter for 'output_mode' value
 function setOutputMode ($newOutputMode) {
-       $GLOBALS['output_mode'] = SQL_ESCAPE($newOutputMode);
+       $GLOBALS['output_mode'] = (int) $newOutputMode;
 }
 
 // Checks wether output_mode is set and optionally aborts on miss
-function isOutputModeSet ($abortOnMiss =  false) {
+function isOutputModeSet ($strict =  false) {
        // Check for it
        $isset = (isset($GLOBALS['output_mode']));
 
        // Should we abort here?
-       if (($abortOnMiss === true) && ($isset === false)) {
+       if (($strict === true) && ($isset === false)) {
                // Output backtrace
                debug_report_bug('output_mode is empty.');
        } // END - if
@@ -646,12 +646,14 @@ function redirectToIndexMemberOnlyModule () {
 // Wrapper function for checking if extension is installed and newer or same version
 function isExtensionInstalledAndNewer ($ext_name, $version) {
        // Return it
+       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.'<br />';
        return ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version));
 }
 
 // Wrapper function for checking if extension is installed and older than given version
 function isExtensionInstalledAndOlder ($ext_name, $version) {
        // Return it
+       //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.'<br />';
        return ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version)));
 }