X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=ad1d0507ce75b9c459f3e424f4d77fe8ecd59a9b;hb=9b06a0b9b72fbdaf5bf638df82ae37c56a5654cb;hp=dad887e92cf3d1a21fdef4096c74784b7b9f604a;hpb=ef8bdde1d3b805a341e64cb29c89e562e1ca963f;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index dad887e92c..ad1d0507ce 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -111,10 +111,15 @@ function setCurrentLanguage ($language) {
 	$GLOBALS['language'] = (string) $language;
 }
 
+// Checks wether current language is set
+function isCurrentLanguageSet () {
+	return (isset($GLOBALS['language']));
+}
+
 // "Getter" for language
 function getLanguage () {
 	// Do we have cache?
-	if (!isset($GLOBALS['language'])) {
+	if (!isCurrentLanguageSet()) {
 		// Default is 'de'. DO NOT CHANGE THIS!!!
 		$ret = 'de';
 
@@ -124,17 +129,17 @@ function getLanguage () {
 		} // END - if
 
 		// Is the variable set
-		if (isGetRequestParameterSet('mx_lang')) {
+		if (isGetRequestElementSet('mailer_lang')) {
 			// Accept only first 2 chars
-			$ret = substr(getRequestParameter('mx_lang'), 0, 2);
-		} elseif (isset($GLOBALS['language'])) {
+			$ret = substr(getRequestElement('mailer_lang'), 0, 2);
+		} elseif (isCurrentLanguageSet()) {
 			// Use cached
 			$ret = getCurrentLanguage();
-		} elseif (isSessionVariableSet('mx_lang')) {
+		} elseif (isSessionVariableSet('mailer_lang')) {
 			// Return stored value from cookie
-			$ret = getSession('mx_lang');
+			$ret = getSession('mailer_lang');
 
-			// Fixes a warning before the session has the mx_lang constant
+			// Fixes a warning before the session has the mailer_lang constant
 			if (empty($ret)) {
 				$ret = getDefaultLanguage();
 			} // END - if
@@ -154,7 +159,7 @@ function setLanguage ($lang) {
 	$lang = substr(secureString($lang), 0, 2);
 
 	// Set cookie
-	setSession('mx_lang', $lang);
+	setSession('mailer_lang', $lang);
 }
 
 // Checks wether a language file is there for optional extension
@@ -172,7 +177,7 @@ function isLanguageIncludeReadable ($ext_name = 'none') {
 
 		// Look for file if no extension name is provided
 		$GLOBALS['lang_inc'][$ext_name] = isIncludeReadable($languageInclude);
-		//* DEBUG: */ debugOutput(__FUNCTION__.':'.$ext_name.'='.$languageInclude.'='.intval(isIncludeReadable($languageInclude)));
+		//* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $ext_name . '=' . $languageInclude . '=' . intval(isIncludeReadable($languageInclude)));
 	} // END - if
 
 	// Return it
@@ -265,7 +270,9 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	// Init differences
 	$GLOBALS['lang_diff'][$target] = array();
 	$GLOBALS['lang_diff_count'][$target] = 0;
-	if (!isset($GLOBALS['lang_diff_count']['total'])) $GLOBALS['lang_diff_count']['total'] = 0;
+	if (!isset($GLOBALS['lang_diff_count']['total'])) {
+		$GLOBALS['lang_diff_count']['total'] = 0;
+	} // END - if
 
 	// *Does* match by default
 	$matches = true;
@@ -349,7 +356,7 @@ function isMessageMasked ($messageId) {
 	} // END - if
 
 	// Now simply check it
-	$masked = (strpos($GLOBALS['messages'][getCurrentLanguage()][$messageId], '%') !== false);
+	$masked = isInString('%', $GLOBALS['messages'][getCurrentLanguage()][$messageId]);
 
 	// Return result
 	return $masked;