Extension ext-admins updated:

[mailer.git] / inc / language-functions.php

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 6d5735476904f0c8aaf10e7145e3d8e542958f75..2f3486d033ebcfdae41da4d92aa964eb46cbb4cb 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -111,10 +111,15 @@ function setCurrentLanguage ($language) {
        $GLOBALS['language'] = (string) $language;
 }
 
+// Checks wether current language is set
+function isCurrentLanguageSet () {
+       return (isset($GLOBALS['language']));
+}
+
 // "Getter" for language
 function getLanguage () {
        // Do we have cache?
-       if (!isset($GLOBALS['language'])) {
+       if (!isCurrentLanguageSet()) {
                // Default is 'de'. DO NOT CHANGE THIS!!!
                $ret = 'de';
 
@@ -124,17 +129,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,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
@@ -265,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;
@@ -349,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;