invoice_sections_with_taxes per-agent, RT#79636

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

diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index c4fef03..1b18d2e 100644 (file)
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -1,43 +1,50 @@
 % if ( $error ) {
 %   $cgi->param('error', $error);
-<% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
+    <% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
 % } else {
-<% include('/elements/header.html', 'Preferences updated') %>
-<% include('/elements/footer.html') %>
+    <% $cgi->redirect( -uri    => popurl(1). "pref.html",
+                   -cookie => CGI::Cookie->new(
+                     -name    => 'freeside_status',
+                     -value   => mt('Preferences updated'),
+                     -expires => '+5m',
+                   ),
+       )
+    %>
 % }
 <%init>
 
+my $access_user = $FS::CurrentUser::CurrentUser;
+
 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 = '';
 
-if ( grep { $cgi->param($_) !~ /^\s*$/ }
-          qw(_password new_password new_password2)
+if ( FS::Auth->auth_class->can('change_password')
+       && grep { $cgi->param($_) !~ /^\s*$/ }
+            qw(_password new_password new_password2)
    ) {
 
-  $access_user = qsearchs( 'access_user', {
-    'username'  => getotaker,
-    '_password' => scalar($cgi->param('_password')),
-  } );
+  my $oldpass = $cgi->param('_password');
+  my $newpass = $cgi->param('new_password');
 
-  $error = 'Current password incorrect; password not changed'
-    unless $access_user;
+  if ( $newpass ne $cgi->param('new_password2') ) {
+    $error = mt("New passwords don't match");
 
-  $error ||= "New passwords don't match"
-    unless $cgi->param('new_password') eq $cgi->param('new_password2');
+  } elsif ( ! length($newpass) ) {
+    $error = mt('No new password entered');
 
-  $error ||= "No new password entered"
-   unless length($cgi->param('new_password'));
+  } elsif ( ! FS::Auth->authenticate( $access_user, $oldpass ) ) {
+    $error = mt('Current password incorrect; password not changed');
 
-  $access_user->_password($cgi->param('new_password')) unless $error;
+  } else {
 
-} else {
+    $error = $access_user->is_password_allowed($newpass)
+          || $access_user->change_password($newpass);
 
-  $access_user = $FS::CurrentUser::CurrentUser;
+  }
 
 }
 
@@ -49,21 +56,24 @@ unless ( $error ) { # if ($access_user) {
 
   #XXX autogen
   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
+                      enable_mask_clipboard_hack dashboard_customers
+                      customer_view_emails
+                      printtofit
                       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
                     );
 
   foreach (@paramlist) {
     scalar($cgi->param($_)) =~ /^[,.\-\@\w]*$/ && next;
-    $error ||= "Illegal value for parameter $_";
+    $error ||= mt("Illegal value for parameter")." $_";
     last;
   }
 
@@ -81,7 +91,7 @@ if ( !$error and ($FS::TicketSystem::system || '') eq 'RT_Internal' ) {
   FS::TicketSystem->init;
   my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
   # Bypass RT ModifySelf ACL
-  $UserObj->CurrentUser( RT::SystemUser );
+  $UserObj->CurrentUser( $RT::SystemUser );
   if ( $UserObj->Lang ne $locale ) {
     my ($val, $msg) = $UserObj->SetLang($locale);
     $error = $msg if !$val;