X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=f8b068dc3523cd20ea144b4de3b66d1935c90445;hb=cd1c86e193ad61cce0998c3092b044258d9a6da9;hp=0f89445a06222c3fcb2a83b573f2a24574efe6f9;hpb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 0f89445a06..f8b068dc35 100644
--- 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.');
@@ -597,12 +597,12 @@ function setOutputMode ($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