X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdisplay_prefs.php;h=18946112da2888cdbcb4ba7148d4bef2b5c07d14;hb=fbfb1ee42fac43d2e149eaad52de19becfc10034;hp=316733a77913cfc0e3318fd8ee553249392e407f;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index 316733a7..18946112 100644
--- 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");
@@ -30,44 +30,50 @@ 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($_POST['prices'], $_POST['Quantities'],
-			$_POST['Rates'], $_POST['Percent'],
-			check_value('show_gl'),
-			check_value('show_codes'),
-			$_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['language']);
+		set_user_prefs(get_post( 
+			array('prices_dec', 'qty_dec', 'rates_dec', 'percent_dec',
+			'date_format', 'date_sep', 'tho_sep', 'dec_sep', 'print_profile', 
+			'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)));
 
 		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');	
+		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']);
 
-		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_outer_table($table_style2);
+start_outer_table(TABLESTYLE2);
 
 table_section(1);
 table_section_title(_("Decimal Places"));
 
-text_row_ex(_("Prices/Amounts:"), 'prices', 5, 5, '', user_price_dec());
-text_row_ex(_("Quantities:"), 'Quantities', 5, 5, '', user_qty_dec());
-text_row_ex(_("Exchange Rates:"), 'Rates', 5, 5, '', user_exrate_dec());
-text_row_ex(_("Percentages:"), 'Percent',  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"));
 
@@ -110,13 +116,15 @@ 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 */
 
-if (!isset($_POST['profile']))
-	$_POST['profile'] = user_print_profile();
+if (!isset($_POST['print_profile']))
+	$_POST['print_profile'] = user_print_profile();
 
-print_profiles_list_row(_("Printing profile"). ':', 'profile', 
+print_profiles_list_row(_("Printing profile"). ':', 'print_profile', 
 	null, _('Browser printing support'));
 
 check_row(_("Use popup window to display reports:"), 'rep_popup', user_rep_popup(),
@@ -127,9 +135,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());
 
+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_outer_table(1);
 
-submit_center('setprefs', _("Update"), true, '', true);
+submit_center('setprefs', _("Update"), true, '',  'default');
 
 end_form(2);