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

diff --git a/inc/language-functions.php b/inc/language-functions.php
index dad887e92c..0db9afe713 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -10,14 +10,9 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Sprachfunktionen                                 *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 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 *
@@ -41,7 +36,6 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // "Getter" for language strings
-// @TODO Rewrite all language constants to this function.
 function getMessage ($messageId) {
 	// Default is not found
 	$return = '!' . $messageId . '!';
@@ -52,7 +46,7 @@ function getMessage ($messageId) {
 		$return = $GLOBALS['messages'][getCurrentLanguage()][$messageId];
 	} else {
 		// Missing language constant
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Missing message string %s detected.", $messageId));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf('Missing message string %s detected.', $messageId));
 	}
 
 	// Return the string
@@ -96,7 +90,7 @@ function addMessages ($messages) {
 	}
 }
 
-// Checks wether given message id is valid
+// Checks whether given message id is valid
 function isMessageIdValid ($messageId) {
 	return (isset($GLOBALS['messages'][getCurrentLanguage()][$messageId]));
 }
@@ -111,10 +105,15 @@ function setCurrentLanguage ($language) {
 	$GLOBALS['language'] = (string) $language;
 }
 
+// Checks whether current language is set
+function isCurrentLanguageSet () {
+	return (isset($GLOBALS['language']));
+}
+
 // "Getter" for language
 function getLanguage () {
-	// Do we have cache?
-	if (!isset($GLOBALS['language'])) {
+	// Is there cache?
+	if (!isCurrentLanguageSet()) {
 		// Default is 'de'. DO NOT CHANGE THIS!!!
 		$ret = 'de';
 
@@ -124,17 +123,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,25 +153,25 @@ 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
+// Checks whether a language file is there for optional extension
 function isLanguageIncludeReadable ($ext_name = 'none') {
-	// Do we have array element?
+	// Is there array element?
 	if (!isset($GLOBALS['lang_inc'][$ext_name])) {
 		// Generate filename
 		if ($ext_name == 'none') {
 			// Generic
-			$languageInclude = sprintf("inc/language/%s.php", getLanguage());
+			$languageInclude = sprintf('inc/language/%s.php', getLanguage());
 		} else {
 			// Extension's language file
-			$languageInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage());
+			$languageInclude = sprintf('inc/language/%s_%s.php', $ext_name, getLanguage());
 		}
 
 		// 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
@@ -195,7 +194,7 @@ function loadLanguageFile ($ext_name = 'none') {
 		setLanguage($currLanguage);
 	} // END - if
 
-	// Do we have the language file NOT?
+	// Is there the language file NOT?
 	if (!isLanguageIncludeReadable($ext_name)) {
 		// Switch to default (DO NOT CHANGE!!!)
 		setLanguage('de');
@@ -210,7 +209,7 @@ function loadLanguageFile ($ext_name = 'none') {
 		loadLanguageInclude($ext_name);
 	} elseif ((isDebugModeEnabled()) && (isHtmlOutputMode()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
 		// No language file is not so good...
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no language file or we cannot read from it. lang=%s, mode=%s",
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf('NOTICE: Extension %s has no language file or we cannot read from it. lang=%s, mode=%s',
 			$ext_name,
 			getLanguage(),
 			getExtensionMode()
@@ -218,7 +217,7 @@ function loadLanguageFile ($ext_name = 'none') {
 	}
 
 	// Check for installation mode
-	if ((isInstallationPhase()) || (!isAdminRegistered())) {
+	if ((isInstaller()) || (!isAdminRegistered())) {
 		// Load language file
 		loadLanguageInclude('install');
 	} // END - if
@@ -229,10 +228,10 @@ function loadLanguageInclude ($ext_name = 'none') {
 	// Generate filename
 	if ($ext_name == 'none') {
 		// Generic
-		$languageInclude = sprintf("inc/language/%s.php", getLanguage());
+		$languageInclude = sprintf('inc/language/%s.php', getLanguage());
 	} else {
 		// Extension's language file
-		$languageInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage());
+		$languageInclude = sprintf('inc/language/%s_%s.php', $ext_name, getLanguage());
 	}
 
 	// Check it before loading
@@ -241,7 +240,7 @@ function loadLanguageInclude ($ext_name = 'none') {
 		loadIncludeOnce($languageInclude);
 	} else {
 		// Not readable!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Language file %s not found or readable.", $languageInclude));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf('Language file %s not found or readable.', $languageInclude));
 	}
 }
 
@@ -265,21 +264,23 @@ 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;
+	$matches = TRUE;
 
 	// Is one not readable?
 	if (!isIncludeReadable($source)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Source file ' . $source . ' is not readable.');
+		reportBug(__FUNCTION__, __LINE__, 'Source file ' . $source . ' is not readable.');
 	} elseif (!isIncludeReadable($target)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Target file ' . $target . ' is not readable.');
+		reportBug(__FUNCTION__, __LINE__, 'Target file ' . $target . ' is not readable.');
 	} elseif ($targetLanguage == getCurrentLanguage()) {
 		// Must be different
-		debug_report_bug(__FUNCTION__, __LINE__, 'Target language ' . $targetLanguage . ' is same as current.');
+		reportBug(__FUNCTION__, __LINE__, 'Target language ' . $targetLanguage . ' is same as current.');
 	}
 
 	// Backup current messages/language
@@ -288,7 +289,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	$GLOBALS['messages'][$backupLang] = array();
 
 	// Both are readable so include current language file
-	$GLOBALS['count'] = false;
+	$GLOBALS['count'] = FALSE;
 	loadInclude($source);
 	$GLOBALS['msgs'][$source] = $GLOBALS['messages'][$backupLang];
 	unset($GLOBALS['count']);
@@ -296,7 +297,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	// Set target language
 	setCurrentLanguage($targetLanguage);
 
-	// Do we have an array?
+	// Is there an array?
 	if (!isset($GLOBALS['messages'][$targetLanguage])) {
 		// Then create it to avoid notice
 		$GLOBALS['messages'][$targetLanguage] = array();
@@ -315,7 +316,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	// Do they mismatch?
 	if ((count($GLOBALS['msgs'][$source])) != (count($GLOBALS['msgs'][$target]))) {
 		// Does not match
-		$matches = false;
+		$matches = FALSE;
 
 		// Check all differences
 		foreach ($GLOBALS['msgs'][$source] as $key => $value) {
@@ -340,19 +341,20 @@ function getLanguageComparisonDifference ($target) {
 	return $GLOBALS['lang_diff_count'][$target];
 }
 
-// Checks wether the given message is masked
-function isMessageMasked ($messageId) {
+// Checks whether the given message is masked
+function isMessageMasked ($messageId, $strict = TRUE) {
 	// Is the message id valid?
-	if (!isMessageIdValid($messageId)) {
+	if (($strict === TRUE) && (!isMessageIdValid($messageId))) {
 		// No, then abort here
-		debug_report_bug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
+		reportBug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
 	} // END - if
 
 	// Now simply check it
-	$masked = (strpos($GLOBALS['messages'][getCurrentLanguage()][$messageId], '%') !== false);
+	$isMasked = isInString('%', getMessage($messageId));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'messageId=' . $messageId . ',isMasked=' . intval($isMasked));
 
 	// Return result
-	return $masked;
+	return $isMasked;
 }
 
 // [EOF]