Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

[fa-stable.git] / admin / inst_lang.php

diff --git a/admin/inst_lang.php b/admin/inst_lang.php
index 69bd225f59d5588c26b39825d33c61b5d0aea717..3ed51a6819fdae185b24d2b5385f277bca4ab5f3 100644 (file)
--- a/admin/inst_lang.php
+++ b/admin/inst_lang.php
@@ -17,7 +17,7 @@ include_once($path_to_root."/includes/packages.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
 include_once($path_to_root . "/includes/ui.inc");
 
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js = get_js_open_window(900, 500);
 
 page(_($help_context = "Install/Update Languages"), false, false, "", $js);
@@ -30,7 +30,7 @@ simple_page_mode(true);
 //
 function display_languages()
 {
-       global $table_style, $installed_languages, $dflt_lang;
+       global $installed_languages, $dflt_lang, $GetText;
        
        $th = array(_("Language"), _("Name"), _("Encoding"), _("Right To Left"),
                _("Installed"), _("Available"), _("Default"), "", "");
@@ -59,6 +59,9 @@ function display_languages()
        $langs = get_languages_list();
        foreach ($langs as $pkg_name => $lng)
        {
+               if ($lng == 'C') // skip default locale (aka no translation)
+                       continue;
+
                $lang = $lng['code'];
                $lang_name = $lng['name'];
                $charset = $lng['encoding'];
@@ -72,10 +75,9 @@ function display_languages()
                else
                        alt_table_row_color($k);
 
-               $support = ($lang == 'C') ||
-                       $_SESSION['get_text']->check_support($lang, $charset);
+               $support = $GetText->check_support($lang, $charset);
 
-               if (function_exists('gettext') && !$support && !get_post('DisplayAll')) continue;
+               if (function_exists('gettext') && !$support && !get_post('DisplayAll') && $lang != 'C') continue;
 
                label_cell($lang);
                label_cell($available ? get_package_view_str($lang, $lang_name) : $lang_name);
@@ -149,16 +151,16 @@ function handle_submit($id)
                        $dflt_lang = $_POST['code'];
        }
        
-       $installed_languages[$id]['code'] = $_POST['code'];
+       $installed_languages[$id]['code'] = clean_file_name($_POST['code']);
        $installed_languages[$id]['name'] = $_POST['name'];
-       $installed_languages[$id]['path'] = 'lang/' . $_POST['code'];
+       $installed_languages[$id]['path'] = 'lang/' . clean_file_name(get_post('code'));
        $installed_languages[$id]['encoding'] = $_POST['encoding'];
        $installed_languages[$id]['rtl'] = (bool)$_POST['rtl'];
        $installed_languages[$id]['package'] = '';
        $installed_languages[$id]['version'] = '';
        if (!write_lang())
                return false;
-       $directory = $path_to_root . "/lang/" . $_POST['code'];
+       $directory = $path_to_root . "/lang/" . clean_file_name(get_post('code'));
        if (!file_exists($directory))
        {
                mkdir($directory);
@@ -167,7 +169,8 @@ function handle_submit($id)
        if (is_uploaded_file($_FILES['uploadfile']['tmp_name']))
        {
                $file1 = $_FILES['uploadfile']['tmp_name'];
-               $file2 = $directory . "/LC_MESSAGES/".$_POST['code'].".po";
+               $code = preg_replace('/[^a-zA-Z_]/', '', $_POST['code']);
+               $file2 = $directory . "/LC_MESSAGES/$code.po";
                if (file_exists($file2))
                        unlink($file2);
                move_uploaded_file($file1, $file2);
@@ -175,7 +178,8 @@ function handle_submit($id)
        if (is_uploaded_file($_FILES['uploadfile2']['tmp_name']))
        {
                $file1 = $_FILES['uploadfile2']['tmp_name'];
-               $file2 = $directory . "/LC_MESSAGES/".$_POST['code'].".mo";
+               $code = preg_replace('/[^a-zA-Z_]/', '', $_POST['code']);
+               $file2 = $directory . "/LC_MESSAGES/$code.mo";
                if (file_exists($file2))
                        unlink($file2);
                move_uploaded_file($file1, $file2);
@@ -290,4 +294,3 @@ if (isset($_GET['popup']) || get_post('Add') || $Mode == 'Edit' || $Mode == 'ADD
 //---------------------------------------------------------------------------------------------
 end_page();
 
-?>
\ No newline at end of file