X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Flang%2Flanguage.php;h=5b0509258b109e3271478b2197c5d929053ffe45;hb=e3004d8581b1ea3c02bfe2b1e880990309c4459e;hp=32290eda9f2cb0f288ed21a90b6b91e4c10b47fe;hpb=29318efa009a326b64e1aa3723ae92cedd5fc720;p=fa-stable.git

diff --git a/includes/lang/language.php b/includes/lang/language.php
index 32290eda..5b050925 100644
--- 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,14 +22,17 @@ 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) 
+	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 = "ltr";
+		$this->dir = $dir;
 	}
 
 	function get_language_dir() 
@@ -45,63 +48,46 @@ class language
 
 	function set_language($code) 
 	{
-	    global $comp_path, $path_to_root;
+	    global $path_to_root, $installed_languages, $GetText;
+
+		$lang = array_search_value($code, $installed_languages, 'code');
+		$changed = $this->code != $code || $this->version != @$lang['version'];
 
-		$changed = $_SESSION['language']->code != $code;
-		if (isset($_SESSION['languages'][$code]) && $changed)
+		if ($lang && $changed)
 		{
 		// flush cache as we can use several languages in one account
-		    flush_dir($comp_path.'/'.user_company().'/js_cache');
-		    $_SESSION['language'] = $_SESSION['languages'][$code];
-			$locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
-			// check id file exists only once for session
-			$_SESSION['language']->is_locale_file = file_exists($locale);
+			flush_dir(company_path().'/js_cache');
+
+			$this->name = $lang['name'];
+			$this->code = $lang['code'];
+			$this->encoding = $lang['encoding'];
+			$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);
 		}
-		$lang = PHP_VERSION<5 ? $_SESSION['language'] : clone($_SESSION['language']);
 
-		$_SESSION['get_text']->set_language($lang->code, $lang->encoding);
-		$_SESSION['get_text']->add_domain($lang->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
-		ini_set('default_charset', $lang->encoding);
+		ini_set('default_charset', $this->encoding);
 
 		if (isset($_SESSION['App']) && $changed)
 			$_SESSION['App']->init(); // refresh menu
 	}
 }
-	/**
-	 * This method loads an array of language objects into a session variable
-     * called $_SESSIONS['languages']. Only supported languages are added.
-     */
-	function load_languages() 
-	{
-		global $installed_languages, $dflt_lang;
-
-		$_SESSION['languages'] = array();
-
-        foreach ($installed_languages as $lang) 
-        {
-			$l = new language($lang['name'],$lang['code'],$lang['encoding']);
-			if (isset($lang['rtl']))
-				$l->dir = "rtl";
-			$_SESSION['languages'][$l->code] = $l;
-        }
-
-		if (!isset($_SESSION['language']))
-			$_SESSION['language'] = $_SESSION['languages'][$dflt_lang];
-	}
-
-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;