X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=0db9afe7130c7ff49f4be9ce105ca9522a2fe7e1;hb=8848f4a3fd7b32a1bbd9139766171701b94b2f42;hp=5e393b722519d8ee0bb5cb9153cc1e70db0455a7;hpb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 5e393b7225..0db9afe713 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Sprachfunktionen                                 *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -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
@@ -169,10 +163,10 @@ function isLanguageIncludeReadable ($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());
 		}
 
 		// Look for file if no extension name is provided
@@ -215,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()
@@ -223,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
@@ -234,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
@@ -246,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));
 	}
 }
 
@@ -275,7 +269,7 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	} // END - if
 
 	// *Does* match by default
-	$matches = true;
+	$matches = TRUE;
 
 	// Is one not readable?
 	if (!isIncludeReadable($source)) {
@@ -295,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']);
@@ -322,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) {
@@ -348,18 +342,19 @@ function getLanguageComparisonDifference ($target) {
 }
 
 // Checks whether the given message is masked
-function isMessageMasked ($messageId, $strict = true) {
+function isMessageMasked ($messageId, $strict = TRUE) {
 	// Is the message id valid?
-	if (($strict === true) && (!isMessageIdValid($messageId))) {
+	if (($strict === TRUE) && (!isMessageIdValid($messageId))) {
 		// No, then abort here
 		reportBug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
 	} // END - if
 
 	// Now simply check it
-	$masked = isInString('%', getMessage($messageId));
+	$isMasked = isInString('%', getMessage($messageId));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'messageId=' . $messageId . ',isMasked=' . intval($isMasked));
 
 	// Return result
-	return $masked;
+	return $isMasked;
 }
 
 // [EOF]