X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Flanguage.php;h=f9b86b17ceaf2bfb84cfb10a54c87b893315dca1;hb=6bdb8986a143a35e8f8a1c318bd14fab839000b2;hp=77d5d83b4e5a9cf2ce99738f8f75438225dddd25;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/includes/lang/language.php b/includes/lang/language.php
index 77d5d83b..f9b86b17 100644
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -1,15 +1,16 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    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']))
+// 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");
@@ -36,7 +37,6 @@ class language
 		return "lang/" . $this->code;
 	}
 
-
 	function get_current_language_dir() 
 	{
 		$lang = $_SESSION['language'];
@@ -46,9 +46,9 @@ class language
 	function set_language($code) 
 	{
 	    global $comp_path, $path_to_root;
-	    
-		if (isset($_SESSION['languages'][$code]) &&
-			$_SESSION['language'] != $_SESSION['languages'][$code]) 
+		
+		$changed = $_SESSION['language']->code != $code;
+		if (isset($_SESSION['languages'][$code]) && $changed)
 		{
 		// flush cache as we can use several languages in one account
 		    flush_dir($comp_path.'/'.user_company().'/js_cache');
@@ -56,17 +56,26 @@ class language
 			$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);
-		    reload_page("");
 		}
+		$lang = $_SESSION['language'];
+		$_SESSION['get_text']->set_language($lang->code, $lang->encoding);
+		$_SESSION['get_text']->add_domain($lang->code, $path_to_root . "/lang");
+		
+		// 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);
+
+		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;
+		global $installed_languages, $dflt_lang;
 
 		$_SESSION['languages'] = array();
 
@@ -79,87 +88,22 @@ class language
         }
 
 		if (!isset($_SESSION['language']))
-			$_SESSION['language'] = $_SESSION['languages']['en_GB'];
+			$_SESSION['language'] = $_SESSION['languages'][$dflt_lang];
 	}
 
-}
-/*
-	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;
-}
-
-session_name('FrontAccounting'.user_company());
-session_start();
-// this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
-header("Cache-control: private");
-
-// Page Initialisation
-if (!isset($_SESSION['languages'])) 
+function _set($key,$value) 
 {
-	language::load_languages();
+	$_SESSION['get_text']->set_var($key,$value);
 }
 
-$lang = $_SESSION['language'];
-
-// get_text support
-get_text::init();
-get_text::set_language($lang->code, $lang->encoding);
-//get_text::add_domain("wa", $path_to_root . "/lang");
-get_text::add_domain($lang->code, $path_to_root . "/lang");
-// Unnecessary for ajax calls. 
-// Due to bug in php 4.3.10 for this version set globally in php.ini
-ini_set('default_charset', $_SESSION['language']->encoding);
-
 if (!function_exists("_")) 
 {
 	function _($text) 
 	{
-		$retVal = get_text::gettext($text);
+		$retVal = $_SESSION['get_text']->gettext($text);
 		if ($retVal == "")
 			return $text;
 		return $retVal;
 	}
 }
-
-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']);
-}
-
-
-
 ?>
\ No newline at end of file