X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Flanguage.php;h=0b8ba215021c68587c14f33a58c96e33e90db989;hb=3613e32ad573d5faccb974a421702bdd87583878;hp=62866f0b0279564036e144e42a07576351652d18;hpb=e3b48984f41047ad16201ff1e757af02d228d79e;p=fa-stable.git

diff --git a/includes/lang/language.php b/includes/lang/language.php
index 62866f0b..0b8ba215 100644
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -9,8 +9,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
-	die(_("Restricted access"));
+// 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 . "/includes/lang/gettext.php");
 
@@ -23,12 +24,14 @@ class language
 						// Right-To-Left (rtl)
 	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 : 'en_GB');
 		$this->encoding = $encoding;
-		$this->dir = "ltr";
+		$this->dir = $dir;
 	}
 
 	function get_language_dir() 
@@ -36,7 +39,6 @@ class language
 		return "lang/" . $this->code;
 	}
 
-
 	function get_current_language_dir() 
 	{
 		$lang = $_SESSION['language'];
@@ -45,92 +47,46 @@ class language
 
 	function set_language($code) 
 	{
-	    global $comp_path, $path_to_root;
-	    
-		if (isset($_SESSION['languages'][$code]) &&
-			$_SESSION['language'] != $_SESSION['languages'][$code]) 
+	    global $path_to_root, $installed_languages;
+
+		$changed = $this->code != $code;
+		$lang = array_search_value($code, $installed_languages, 'code');
+
+		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 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;
+			$this->name = $lang['name'];
+			$this->code = $lang['code'];
+			$this->encoding = $lang['encoding'];
+			$this->dir = isset($lang['rtl']) ? 'rtl' : 'ltr';
+			$locale = $path_to_root . "/lang/" . $this->code . "/locale.inc";
+			$this->is_locale_file = file_exists($locale);
+		}
 
-		$_SESSION['languages'] = array();
+		$_SESSION['get_text']->set_language($this->code, $this->encoding);
+		$_SESSION['get_text']->add_domain($this->code, $path_to_root . "/lang");
 
-        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;
-        }
+		// Necessary for ajax calls. Due to bug in php 4.3.10 for this 
+		// version set globally in php.ini
+		ini_set('default_charset', $this->encoding);
 
-		if (!isset($_SESSION['language']))
-			$_SESSION['language'] = $_SESSION['languages'][$dflt_lang];
+		if (isset($_SESSION['App']) && $changed)
+			$_SESSION['App']->init(); // refresh menu
 	}
-
-}
-/*
-	Test if named function is defined in locale.inc file.
-*/
-function has_locale($fun=null)
-{
-	global $path_to_root;
-	
-	if ($_SESSION['language']->is_locale_file)
-	{
-		global $path_to_root;
-		include_once($path_to_root . "/lang/" . 
-			$_SESSION['language']->code . "/locale.inc");
-
-		if (!isset($fun) || function_exists($fun))
-			return true;
-	}
-	return false;
 }
 
 function _set($key,$value) 
 {
-	get_text::set_var($key,$value);
-}
-
-function reload_page($msg) 
-{
-	global $Ajax;
-//	header("Location: $_SERVER['PHP_SELF']."");
-//	exit;
-	echo "<html>";
-	echo "<head>";
-    echo "<title>Changing Languages</title>";
-	echo '<meta http-equiv="refresh" content="0;url=' . $_SERVER['PHP_SELF'] . '">';
-	echo '</head>';
-	echo '<body>';
-	echo '<div>';
-	if ($msg != "")
-		echo $msg . " " . $_SERVER['PHP_SELF'];
-	echo "</div>";	
-	echo "</body>";
-	echo "</html>";
-	$Ajax->redirect($_SERVER['PHP_SELF']);
+	$_SESSION['get_text']->set_var($key,$value);
 }
 
 if (!function_exists("_")) 
 {
 	function _($text) 
 	{
-		$retVal = get_text::gettext($text);
+		$retVal = $_SESSION['get_text']->gettext($text);
 		if ($retVal == "")
 			return $text;
 		return $retVal;