X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=2f3486d033ebcfdae41da4d92aa964eb46cbb4cb;hb=846ac0998b0735e3c538de5b3c22e4e199cb2cb2;hp=ce44f5849d69f3af7bc454936d8ec38eb4567ab9;hpb=21f7b63f7fa3e92ef44510a080ec05709fd41417;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index ce44f5849d..2f3486d033 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // "Getter" for language strings
 // @TODO Rewrite all language constants to this function.
 function getMessage ($messageId) {
-	// Default is not found!
+	// Default is not found
 	$return = '!' . $messageId . '!';
 
 	// Is the language string found?
@@ -70,6 +70,7 @@ function getMaskedMessage ($messageId, $data) {
 
 // Init messages
 function initMessages () {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getLanguage()=' . getLanguage());
 	$GLOBALS['messages'][getLanguage()] = array();
 }
 
@@ -77,6 +78,7 @@ function initMessages () {
 function addMessages ($messages) {
 	// Cache current language
 	$currentLanguage = getCurrentLanguage();
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currentLanguage=' . $currentLanguage);
 
 	// Merge both
 	$GLOBALS['messages'][$currentLanguage] = merge_array($GLOBALS['messages'][$currentLanguage], $messages);
@@ -109,34 +111,46 @@ function setCurrentLanguage ($language) {
 	$GLOBALS['language'] = (string) $language;
 }
 
+// Checks wether current language is set
+function isCurrentLanguageSet () {
+	return (isset($GLOBALS['language']));
+}
+
 // "Getter" for language
 function getLanguage () {
-	// Default is 'de'. DO NOT CHANGE THIS!!!
-	$ret = 'de';
-
-	// Set default return value to default language from config
-	if (isConfigEntrySet('DEFAULT_LANG')) $ret = getDefaultLanguage();
-
-	// Is the variable set
-	if (isGetRequestParameterSet('mx_lang')) {
-		// Accept only first 2 chars
-		$ret = substr(getRequestParameter('mx_lang'), 0, 2);
-	} elseif (isset($GLOBALS['language'])) {
-		// Use cached
-		$ret = getCurrentLanguage();
-	} elseif (isSessionVariableSet('mx_lang')) {
-		// Return stored value from cookie
-		$ret = getSession('mx_lang');
-
-		// Fixes a warning before the session has the mx_lang constant
-		if (empty($ret)) $ret = getDefaultLanguage();
-	}
+	// Do we have cache?
+	if (!isCurrentLanguageSet()) {
+		// Default is 'de'. DO NOT CHANGE THIS!!!
+		$ret = 'de';
+
+		// Set default return value to default language from config
+		if (isConfigEntrySet('DEFAULT_LANG')) {
+			$ret = getDefaultLanguage();
+		} // END - if
+
+		// Is the variable set
+		if (isGetRequestElementSet('mailer_lang')) {
+			// Accept only first 2 chars
+			$ret = substr(getRequestElement('mailer_lang'), 0, 2);
+		} elseif (isCurrentLanguageSet()) {
+			// Use cached
+			$ret = getCurrentLanguage();
+		} elseif (isSessionVariableSet('mailer_lang')) {
+			// Return stored value from cookie
+			$ret = getSession('mailer_lang');
+
+			// Fixes a warning before the session has the mailer_lang constant
+			if (empty($ret)) {
+				$ret = getDefaultLanguage();
+			} // END - if
+		}
 
-	// Cache entry
-	setCurrentLanguage($ret);
+		// Cache entry
+		setCurrentLanguage($ret);
+	} // END - if
 
-	// Return value
-	return $ret;
+	// Return cached value
+	return getCurrentLanguage();
 }
 
 // "Setter" for language
@@ -145,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
@@ -163,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
@@ -256,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;
@@ -340,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;