Stable branch merged up to 2.3.21

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

diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index fb7004da738808dcbbda4bd7539ecb345b63422e..e4a69f75c456d51b57680523c7bad9b6199d128e 100644 (file)
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -30,8 +30,11 @@ if (isset($_POST['setprefs']))
                display_error( _("Query size must be integer and greater than zero."));
                set_focus('query_size');
        } else {
+               $_POST['theme'] = clean_file_name($_POST['theme']);
                $chg_theme = user_theme() != $_POST['theme'];
                $chg_lang = $_SESSION['language']->code != $_POST['language'];
+               $chg_date_format = user_date_format() != $_POST['date_format'];
+               $chg_date_sep = user_date_sep() != $_POST['date_sep'];
 
                set_user_prefs(get_post( 
                        array('prices_dec', 'qty_dec', 'rates_dec', 'percent_dec',
@@ -39,15 +42,17 @@ if (isset($_POST['setprefs']))
                        'theme', 'page_size', 'language', 'startup_tab',
                        'show_gl' => 0, 'show_codes'=> 0, 'show_hints' => 0,
                        'rep_popup' => 0, 'graphic_links' => 0, 'sticky_doc_date' => 0,
-                       'query_size' => 10.0)));
+                       'query_size' => 10.0, 'transaction_days' => 30)));
 
                if ($chg_lang)
                        $_SESSION['language']->set_language($_POST['language']);
                        // refresh main menu
 
-               flush_dir($comp_path.'/'.user_company().'/js_cache');   
+               flush_dir(company_path().'/js_cache');  
 
-               if ($chg_theme || $chg_lang)
+               if ($chg_theme && $allow_demo_mode)
+                       $_SESSION["wa_current_user"]->prefs->theme = $_POST['theme'];
+               if ($chg_theme || $chg_lang || $chg_date_format || $chg_date_sep)
                        meta_forward($_SERVER['PHP_SELF']);
 
                
@@ -60,15 +65,15 @@ if (isset($_POST['setprefs']))
 
 start_form();
 
-start_outer_table($table_style2);
+start_outer_table(TABLESTYLE2);
 
 table_section(1);
 table_section_title(_("Decimal Places"));
 
-text_row_ex(_("Prices/Amounts:"), 'prices_dec', 5, 5, '', user_price_dec());
-text_row_ex(_("Quantities:"), 'qty_dec', 5, 5, '', user_qty_dec());
-text_row_ex(_("Exchange Rates:"), 'rates_dec', 5, 5, '', user_exrate_dec());
-text_row_ex(_("Percentages:"), 'percent_dec',  5, 5, '', user_percent_dec());
+number_list_row(_("Prices/Amounts:"), 'prices_dec', user_price_dec(), 0, 10);
+number_list_row(_("Quantities:"), 'qty_dec', user_qty_dec(), 0, 10);
+number_list_row(_("Exchange Rates:"), 'rates_dec', user_exrate_dec(), 0, 10);
+number_list_row(_("Percentages:"), 'percent_dec', user_percent_dec(), 0, 10);
 
 table_section_title(_("Dateformat and Separators"));
 
@@ -133,6 +138,8 @@ text_row_ex(_("Query page size:"), 'query_size',  5, 5, '', user_query_size());
 check_row(_("Remember last document date:"), 'sticky_doc_date', sticky_doc_date(),
        false, _('If set document date is remembered on subsequent documents, otherwise default is current date'));
 
+text_row_ex(_("Transaction days:"), 'transaction_days', 5, 5, '', user_transaction_days());
+
 end_outer_table(1);
 
 submit_center('setprefs', _("Update"), true, '',  'default');