X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=9566d60516a22ca37d57aee50cac5327281f1797;hp=ad1d0507ce75b9c459f3e424f4d77fe8ecd59a9b;hb=80516903d4a4162a9c4dc48067c16d82e84d2502;hpb=2379934be6a196a54f4155bb8e24c49b20736969

diff --git a/inc/language-functions.php b/inc/language-functions.php
index ad1d0507ce..9566d60516 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 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 +41,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 +51,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 +95,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,14 +110,14 @@ function setCurrentLanguage ($language) {
 	$GLOBALS['language'] = (string) $language;
 }
 
-// Checks wether current language is set
+// Checks whether current language is set
 function isCurrentLanguageSet () {
 	return (isset($GLOBALS['language']));
 }
 
 // "Getter" for language
 function getLanguage () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isCurrentLanguageSet()) {
 		// Default is 'de'. DO NOT CHANGE THIS!!!
 		$ret = 'de';
@@ -162,17 +161,17 @@ function setLanguage ($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
@@ -200,7 +199,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');
@@ -215,7 +214,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()
@@ -223,7 +222,7 @@ function loadLanguageFile ($ext_name = 'none') {
 	}
 
 	// Check for installation mode
-	if ((isInstallationPhase()) || (!isAdminRegistered())) {
+	if ((isInstaller()) || (!isAdminRegistered())) {
 		// Load language file
 		loadLanguageInclude('install');
 	} // END - if
@@ -234,10 +233,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
@@ -246,7 +245,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));
 	}
 }
 
@@ -275,18 +274,18 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	} // 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
@@ -295,7 +294,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']);
@@ -303,7 +302,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();
@@ -322,7 +321,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) {
@@ -347,19 +346,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 = isInString('%', $GLOBALS['messages'][getCurrentLanguage()][$messageId]);
+	$isMasked = isInString('%', getMessage($messageId));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'messageId=' . $messageId . ',isMasked=' . intval($isMasked));
 
 	// Return result
-	return $masked;
+	return $isMasked;
 }
 
 // [EOF]