Release 2.3.23

[fa-stable.git] / includes / lang / language.php

diff --git a/includes/lang/language.php b/includes/lang/language.php
index 8960928377024f8071c6cf0e0b1dfaaab1eb4e29..5b0509258b109e3271478b2197c5d929053ffe45 100644 (file)
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -12,7 +12,7 @@
 // Prevent register_globals vulnerability
 if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
-include_once($path_to_root . "/lang/installed_languages.inc");
+@include_once($path_to_root . "/lang/installed_languages.inc");
 include_once($path_to_root . "/includes/lang/gettext.php");
 
 class language 
@@ -22,12 +22,15 @@ class language
        var $encoding;          // eg. UTF-8, CP1256, ISO8859-1
        var     $dir;                   // Currently support for Left-to-Right (ltr) and
                                                // Right-To-Left (rtl)
+       var $version; // lang package version
        var $is_locale_file;
        
        function language($name, $code, $encoding, $dir = 'ltr') 
        {
+               global $dflt_lang;
+               
                $this->name = $name;
-               $this->code = $code;
+               $this->code = $code ? $code : ($dflt_lang ? $dflt_lang : 'C');
                $this->encoding = $encoding;
                $this->dir = $dir;
        }
@@ -45,26 +48,27 @@ class language
 
        function set_language($code) 
        {
-           global $comp_path, $path_to_root, $installed_languages;
+           global $path_to_root, $installed_languages, $GetText;
 
-               $changed = $this->code != $code;
                $lang = array_search_value($code, $installed_languages, 'code');
+               $changed = $this->code != $code || $this->version != @$lang['version'];
 
                if ($lang && $changed)
                {
                // flush cache as we can use several languages in one account
-                       flush_dir($comp_path.'/'.user_company().'/js_cache');
+                       flush_dir(company_path().'/js_cache');
 
                        $this->name = $lang['name'];
                        $this->code = $lang['code'];
                        $this->encoding = $lang['encoding'];
-                       $this->dir = isset($lang['rtl']) ? 'rtl' : 'ltr';
+                       $this->version = @$lang['version'];
+                       $this->dir = (isset($lang['rtl']) && $lang['rtl'] === true) ? 'rtl' : 'ltr';
                        $locale = $path_to_root . "/lang/" . $this->code . "/locale.inc";
                        $this->is_locale_file = file_exists($locale);
                }
 
-               $_SESSION['get_text']->set_language($this->code, $this->encoding);
-               $_SESSION['get_text']->add_domain($this->code, $path_to_root . "/lang");
+               $GetText->set_language($this->code, $this->encoding);
+               $GetText->add_domain($this->code, $path_to_root . "/lang", $this->version);
 
                // Necessary for ajax calls. Due to bug in php 4.3.10 for this 
                // version set globally in php.ini
@@ -75,16 +79,15 @@ class language
        }
 }
 
-function _set($key,$value) 
-{
-       $_SESSION['get_text']->set_var($key,$value);
-}
-
 if (!function_exists("_")) 
 {
        function _($text) 
        {
-               $retVal = $_SESSION['get_text']->gettext($text);
+               global $GetText;
+               if (!isset($GetText)) // Don't allow using gettext if not is net.
+                       return $text;
+
+               $retVal = $GetText->gettext($text);
                if ($retVal == "")
                        return $text;
                return $retVal;