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 368d84f..242e122 100644 (file)
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -7,6 +7,11 @@
 % }
 <%init>
 
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage("Preference changes disabled in public demo");
+  die "shouldn't be reached";
+}
+
 my $error = '';
 my $access_user = '';
 
@@ -15,8 +20,9 @@ if ( grep { $cgi->param($_) !~ /^\s*$/ }
    ) {
 
   $access_user = qsearchs( 'access_user', {
-    'username'  => getotaker,
-    '_password' => $cgi->param('_password'),
+    'usernum'   => $FS::CurrentUser::CurrentUser->usernum,
+    'username'  => $FS::CurrentUser::CurrentUser->username,
+    '_password' => scalar($cgi->param('_password')),
   } );
 
   $error = 'Current password incorrect; password not changed'
@@ -43,10 +49,17 @@ unless ( $error ) { # if ($access_user) {
   my %param = $access_user->options;
 
   #XXX autogen
-  my @paramlist = qw( menu_position
+  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
-                      show_pkgnum show_db_profile save_db_profile
+                      cust_pkg-display_times
+                      show_pkgnum show_confitem_counts export_getsettings
+                      show_db_profile save_db_profile save_tmp_typesetting
                       height width availHeight availWidth colorDepth
                     );
 
@@ -64,4 +77,16 @@ unless ( $error ) { # if ($access_user) {
 
 }
 
+if ( !$error and ($FS::TicketSystem::system || '') eq 'RT_Internal' ) {
+  # sync RT user locale on every update
+  my $locale = $access_user->option('locale');
+  FS::TicketSystem->init;
+  my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
+  # Bypass RT ModifySelf ACL
+  $UserObj->CurrentUser( RT::SystemUser );
+  if ( $UserObj->Lang ne $locale ) {
+    my ($val, $msg) = $UserObj->SetLang($locale);
+    $error = $msg if !$val;
+  }
+}
 </%init>