X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=ccf61cb51e3c1cccba7eeaeea909b4772102f8b6;hp=21dc3ed7cbe9a1c2ff2c758d3fc62f19dd5566de;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 21dc3ed7cb..ccf61cb51e 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -110,9 +111,9 @@ function getLanguage () {
 	if (isConfigEntrySet('DEFAULT_LANG')) $ret = getConfig('DEFAULT_LANG');
 
 	// Is the variable set
-	if (isGetRequestElementSet('mx_lang')) {
+	if (isGetRequestParameterSet('mx_lang')) {
 		// Accept only first 2 chars
-		$ret = substr(getRequestElement('mx_lang'), 0, 2);
+		$ret = substr(getRequestParameter('mx_lang'), 0, 2);
 	} elseif (isset($GLOBALS['language'])) {
 		// Use cached
 		$ret = getCurrentLanguage();
@@ -155,7 +156,7 @@ function isLanguageIncludeReadable ($ext_name = 'none') {
 
 		// Look for file if no extension name is provided
 		$GLOBALS['lang_inc'][$ext_name] = isIncludeReadable($languageInclude);
-		//* DEBUG: */ print __FUNCTION__.':'.$ext_name.'='.$languageInclude.'='.intval(isIncludeReadable($languageInclude)).'<br />';
+		//* DEBUG: */ debugOutput(__FUNCTION__.':'.$ext_name.'='.$languageInclude.'='.intval(isIncludeReadable($languageInclude)));
 	} // END - if
 
 	// Return it
@@ -256,13 +257,13 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
 	// Is one not readable?
 	if (!isIncludeReadable($source)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__ . ': Source file ' . $source . ' is not readable.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Source file ' . $source . ' is not readable.');
 	} elseif (!isIncludeReadable($target)) {
 		// Please report this bug!
-		debug_report_bug(__FUNCTION__ . ': Target file ' . $target . ' is not readable.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Target file ' . $target . ' is not readable.');
 	} elseif ($targetLanguage == getCurrentLanguage()) {
 		// Must be different
-		debug_report_bug(__FUNCTION__ . ': Target language ' . $targetLanguage . ' is same as current.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Target language ' . $targetLanguage . ' is same as current.');
 	}
 
 	// Backup current messages/language
@@ -323,5 +324,20 @@ function getLanguageComparisonDifference ($target) {
 	return $GLOBALS['lang_diff_count'][$target];
 }
 
+// Checks wether the given message is masked
+function isMessageMasked ($messageId) {
+	// Is the message id valid?
+	if (!isMessageIdValid($messageId)) {
+		// No, then abort here
+		debug_report_bug(__FUNCTION__, __LINE__, 'Invalid message id ' . $messageId . ' detected.');
+	} // END - if
+
+	// Now simply check it
+	$masked = (strpos($GLOBALS['messages'][getCurrentLanguage()][$messageId], '%') !== false);
+
+	// Return result
+	return $masked;
+}
+
 // [EOF]
 ?>