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 6d1bd6c47e839ec6b3139778e6e9e3df12b9b70a..4374df3a6fcbab9dcf20b2ef0cc1a9a65a3675c4 100644 (file)
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 1;
+$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");
@@ -42,18 +42,25 @@ if (isset($_POST['setprefs']))
                        $_POST['theme'], $_POST['page_size'], check_value('show_hints'),
                        $_POST['profile'], check_value('rep_popup'), 
                        (int)($_POST['query_size']), check_value('graphic_links'), 
-                       $_POST['language'], check_value('sticky_doc_date'));
+                       $_POST['language'], check_value('sticky_doc_date'), $_POST['startup_tab']);
 
                if ($chg_lang)
-                       language::set_language($_POST['language']);
+                       $_SESSION['language']->set_language($_POST['language']);
                        // refresh main menu
 
                flush_dir($comp_path.'/'.user_company().'/js_cache');   
 
+               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."));
        }
 }
 
@@ -110,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 */