Merged changes from main branch up to release 2.2.1

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

diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index d23363e161ad6fe14db490a09275faf32839b344..4374df3a6fcbab9dcf20b2ef0cc1a9a65a3675c4 100644 (file)
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -1,19 +1,19 @@
 <?php
 /**********************************************************************
-    Copyright (C) 2008  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.
+    Copyright (C) FrontAccounting, LLC.
+       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>.
 ***********************************************************************/
-$page_security =10;
+$page_security = 'SA_SETUPDISPLAY';
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Display Setup"));
+page(_($help_context = "Display Setup"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -27,10 +27,12 @@ if (isset($_POST['setprefs']))
        if (!is_numeric($_POST['query_size']) || ($_POST['query_size']<1))
        {
                display_error($_POST['query_size']);
-               display_error( _("Query size must integer and greater than zero."));
+               display_error( _("Query size must be integer and greater than zero."));
                set_focus('query_size');
        } else {
-               $theme = user_theme();
+               $chg_theme = user_theme() != $_POST['theme'];
+               $chg_lang = $_SESSION['language']->code != $_POST['language'];
+
                set_user_prefs($_POST['prices'], $_POST['Quantities'],
                        $_POST['Rates'], $_POST['Percent'],
                        check_value('show_gl'),
@@ -38,22 +40,35 @@ if (isset($_POST['setprefs']))
                        $_POST['date_format'], $_POST['date_sep'],
                        $_POST['tho_sep'], $_POST['dec_sep'],
                        $_POST['theme'], $_POST['page_size'], check_value('show_hints'),
-                       $_POST['profile'], check_value('rep_popup'), (int)($_POST['query_size']), check_value('graphic_links'));
+                       $_POST['profile'], check_value('rep_popup'), 
+                       (int)($_POST['query_size']), check_value('graphic_links'), 
+                       $_POST['language'], check_value('sticky_doc_date'), $_POST['startup_tab']);
 
-               language::set_language($_POST['language']);
+               if ($chg_lang)
+                       $_SESSION['language']->set_language($_POST['language']);
+                       // refresh main menu
 
                flush_dir($comp_path.'/'.user_company().'/js_cache');   
 
-               if (user_theme() != $theme)
-                       reload_page("");
+               if ($chg_theme)
+                       $_SESSION['bordercolor'] = "#8cacbb";
+
+               if ($chg_theme || $chg_lang)
+                       meta_forward($_SERVER['PHP_SELF']);
 
-               display_notification_centered(_("Display settings have been updated."));
+               
+               if ($allow_demo_mode)  
+                       display_warning(_("Display settings have been updated. Keep in mind that changed settings are restored on every login in demo mode."));
+               else
+                       display_notification_centered(_("Display settings have been updated."));
        }
 }
 
 start_form();
-start_table($table_style2);
 
+start_outer_table($table_style2);
+
+table_section(1);
 table_section_title(_("Decimal Places"));
 
 text_row_ex(_("Prices/Amounts:"), 'prices', 5, 5, '', user_price_dec());
@@ -79,7 +94,14 @@ decseps_list_row(_("Decimal Separator:"), "dec_sep", user_dec_sep());
 
 /* The array $decseps is set up in config.php for modifications
 possible separators can be added by modifying the array definition by editing that file */
+if (!isset($_POST['language']))
+       $_POST['language'] = $_SESSION['language']->code;
+
+table_section_title(_("Language"));
+
+languages_list_row(_("Language:"), 'language', $_POST['language']);
 
+table_section(2);
 table_section_title(_("Miscellaneous"));
 
 check_row(_("Show hints for new users:"), 'show_hints', user_hints());
@@ -95,6 +117,8 @@ possible separators can be added by modifying the array definition by editing th
 
 pagesizes_list_row(_("Page Size:"), "page_size", user_pagesize());
 
+tab_list_row(_("Start-up Tab"), 'startup_tab', user_startup_tab());
+
 /* The array $pagesizes is set up in config.php for modifications
 possible separators can be added by modifying the array definition by editing that file */
 
@@ -112,16 +136,12 @@ check_row(_("Use icons instead of text links:"), 'graphic_links', user_graphic_l
 
 text_row_ex(_("Query page size:"), 'query_size',  5, 5, '', user_query_size());
 
-table_section_title(_("Language"));
-
-if (!isset($_POST['language']))
-       $_POST['language'] = $_SESSION['language']->code;
-
-languages_list_row(_("Language:"), 'language', $_POST['language']);
+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'));
 
-end_table(1);
+end_outer_table(1);
 
-submit_center('setprefs', _("Update"), true, '', true);
+submit_center('setprefs', _("Update"), true, '',  'default');
 
 end_form(2);