X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fpref%2Fpref-process.html;h=bd6bb860a8f13e03fb7c5141c1decd20c76e5a40;hb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;hp=47f80afd049b40d160aae8402f7149c9905ecab0;hpb=b7c314a198c60a6f9236950994113aa422aa77ff;p=freeside.git

diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 47f80afd0..bd6bb860a 100644
--- 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 = '';
 
@@ -16,7 +21,7 @@ if ( grep { $cgi->param($_) !~ /^\s*$/ }
 
   $access_user = qsearchs( 'access_user', {
     'username'  => getotaker,
-    '_password' => $cgi->param('_password'),
+    '_password' => scalar($cgi->param('_password')),
   } );
 
   $error = 'Current password incorrect; password not changed'
@@ -43,11 +48,12 @@ unless ( $error ) { # if ($access_user) {
   my %param = $access_user->options;
 
   #XXX autogen
-  my @paramlist = qw( menu_position default_customer_view
-                      disable_html_editor
+  my @paramlist = qw( locale menu_position default_customer_view mobile_menu
+                      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
                       height width availHeight availWidth colorDepth
@@ -67,4 +73,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>