X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=e2fdb65381aba41d1264c934cfe0079386fd1a23;hb=24dfb73f1de360ec03e9ad3a277e9cd78f3b61fc;hp=333de57fec72d155269ce177afa46889ae7a78b7;hpb=084d9cda95dbe54a925dbe98630b5367427da3c3;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 333de57fec..e2fdb65381 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1186,7 +1186,7 @@ function getMessageFromErrorCode ($code) {
 		case getCode('COOKIES_DISABLED')   : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
 		case getCode('BEG_SAME_AS_OWN')    : $message = '{--BEG_SAME_USERID_AS_OWN--}'; break;
 		case getCode('LOGIN_FAILED')       : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
-		case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
+		case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestParameter('mod') . '%}'; break;
 		case getCode('OVERLENGTH')         : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
 		case getCode('URL_FOUND')          : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
 		case getCode('SUBJECT_URL')        : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
@@ -1207,13 +1207,13 @@ function getMessageFromErrorCode ($code) {
 			if (isExtensionActive('mailid', true)) {
 				$message = '{--ERROR_CONFIRMING_MAIL--}';
 			} else {
-				$message = generateExtensionInactiveNotInstalledMessage('mailid');
+				$message = '{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}';
 			}
 			break;
 
 		case getCode('EXTENSION_PROBLEM'):
 			if (isGetRequestParameterSet('ext')) {
-				$message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext'));
+				$message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestParameter('ext') . '%}';
 			} else {
 				$message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
 			}
@@ -1248,7 +1248,7 @@ function getMessageFromErrorCode ($code) {
 
 		default:
 			// Missing/invalid code
-			$message = getMaskedMessage('UNKNOWN_MAILID_CODE', $code);
+			$message = '{%message,UNKNOWN_MAILID_CODE=' . $code . '%}';
 
 			// Log it
 			logDebugMessage(__FUNCTION__, __LINE__, $message);
@@ -2300,7 +2300,7 @@ function detectMultiBytePrefix ($str) {
 }
 
 // Searches the given array for a sub-string match and returns all found keys in an array
-function getArrayKeysFromSubStrArray ($heystack, array $needles, $offset = 0) {
+function getArrayKeysFromSubStrArray ($heystack, $needles, $offset = 0) {
 	// Init array for all found keys
 	$keys = array();
 
@@ -2391,6 +2391,21 @@ function translateTaskType ($taskType) {
 	return $message;
 }
 
+// "Translates" 'true' to true and 'false' to false
+function convertStringToBoolean ($str) {
+	// Trim it lower-case for validation
+	$str = trim(strtolower($str));
+
+	// Is it valid?
+	if (!in_array($str, array('true', 'false'))) {
+		// Not valid!
+		debug_report_bug(__FUNCTION__, __LINE__, 'str=' . $str . ' is not true/false');
+	} // END - if
+
+	// Return it
+	return (($str == 'true') ? true : false);
+}
+
 //-----------------------------------------------------------------------------
 // Automatically re-created functions, all taken from user comments on www.php.net
 //-----------------------------------------------------------------------------