NG auth: fix new customer, remove mapsecrets support, RT#21563

[freeside.git] / httemplate / pref / pref-process.html

diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 4ff878f..242e122 100644 (file)
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -20,7 +20,8 @@ if ( grep { $cgi->param($_) !~ /^\s*$/ }
    ) {
 
   $access_user = qsearchs( 'access_user', {
-    'username'  => getotaker,
+    'usernum'   => $FS::CurrentUser::CurrentUser->usernum,
+    'username'  => $FS::CurrentUser::CurrentUser->username,
     '_password' => scalar($cgi->param('_password')),
   } );
 
@@ -48,14 +49,17 @@ unless ( $error ) { # if ($access_user) {
   my %param = $access_user->options;
 
   #XXX autogen
-  my @paramlist = qw( locale menu_position default_customer_view mobile_menu
-                      disable_html_editor
+  my @paramlist = qw( locale menu_position default_customer_view 
+                      history_order
+                      spreadsheet_format mobile_menu
+                      enable_fuzzy_on_exact
+                      disable_html_editor disable_enter_submit_onetimecharge
                       email_address
                       snom-ip snom-username snom-password
                       vonage-fromnumber vonage-username vonage-password
                       cust_pkg-display_times
                       show_pkgnum show_confitem_counts export_getsettings
-                      show_db_profile save_db_profile
+                      show_db_profile save_db_profile save_tmp_typesetting
                       height width availHeight availWidth colorDepth
                     );
 
@@ -80,7 +84,9 @@ if ( !$error and ($FS::TicketSystem::system || '') eq 'RT_Internal' ) {
   my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
   # Bypass RT ModifySelf ACL
   $UserObj->CurrentUser( RT::SystemUser );
-  my ($val, $msg) = $UserObj->SetLang($locale);
-  $error = $msg if !$val;
+  if ( $UserObj->Lang ne $locale ) {
+    my ($val, $msg) = $UserObj->SetLang($locale);
+    $error = $msg if !$val;
+  }
 }
 </%init>