Changing Languages

X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Flanguage.php;h=f9b86b17ceaf2bfb84cfb10a54c87b893315dca1;hb=6bdb8986a143a35e8f8a1c318bd14fab839000b2;hp=62866f0b0279564036e144e42a07576351652d18;hpb=e3b48984f41047ad16201ff1e757af02d228d79e;p=fa-stable.git diff --git a/includes/lang/language.php b/includes/lang/language.php index 62866f0b..f9b86b17 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 . ***********************************************************************/ -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"); @@ -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'); @@ -57,8 +57,18 @@ class language // check id file exists only once for session $_SESSION['language']->is_locale_file = file_exists($locale); } - } + $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. @@ -81,56 +91,16 @@ class language $_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; -} - function _set($key,$value) { - get_text::set_var($key,$value); -} - -function reload_page($msg) -{ - global $Ajax; -// header("Location: $_SERVER['PHP_SELF'].""); -// exit; - echo ""; - echo ""; - echo "Changing Languages"; - echo ''; - echo ''; - echo ''; - echo '

'; - if ($msg != "") - echo $msg . " " . $_SERVER['PHP_SELF']; - echo "

"; - echo ""; - echo ""; - $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;