X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Flanguage.php;h=1ec47d17766321e07abd07f3c808d3337e4622b3;hb=b611def496e4942321d66f183fe0e1d95417c99f;hp=819e83aa3a9d7a485636d2a9b5ab37740a4396f3;hpb=be20fac50abe2781ae3e8c344dde8bc40980ea8a;p=fa-stable.git diff --git a/includes/lang/language.php b/includes/lang/language.php index 819e83aa..1ec47d17 100644 --- a/includes/lang/language.php +++ b/includes/lang/language.php @@ -1,15 +1,16 @@ . + See the License here . ***********************************************************************/ -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"); @@ -21,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 : 'en_GB'); $this->encoding = $encoding; - $this->dir = "ltr"; + $this->dir = $dir; } function get_language_dir() @@ -36,7 +40,6 @@ class language return "lang/" . $this->code; } - function get_current_language_dir() { $lang = $_SESSION['language']; @@ -45,120 +48,50 @@ 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; + + $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'); - $_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); - //reload_page(""); - meta_forward($_SERVER['PHP_SELF']); + 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']) ? 'rtl' : 'ltr'; + $locale = $path_to_root . "/lang/" . $this->code . "/locale.inc"; + $this->is_locale_file = file_exists($locale); } - } - - /** - * 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; - - $_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; - } + $_SESSION['get_text']->set_language($this->code, $this->encoding); + $_SESSION['get_text']->add_domain($this->code, $path_to_root . "/lang", $this->version); - if (!isset($_SESSION['language'])) - $_SESSION['language'] = $_SESSION['languages']['en_GB']; - } - -} -/* - 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"); + // 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($fun) || function_exists($fun)) - return true; + if (isset($_SESSION['App']) && $changed) + $_SESSION['App']->init(); // refresh menu } - 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) -{ -// 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 ""; -} -*/ - - ?> \ No newline at end of file