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 6d4f89a..1b18d2e 100644 (file)
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -1,12 +1,20 @@
 % 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";
@@ -19,29 +27,27 @@ if ( FS::Auth->auth_class->can('change_password')
             qw(_password new_password new_password2)
    ) {
 
-  if ( $cgi->param('new_password') ne $cgi->param('new_password2') ) {
-    $error = "New passwords don't match";
+  my $oldpass = $cgi->param('_password');
+  my $newpass = $cgi->param('new_password');
+
+  if ( $newpass ne $cgi->param('new_password2') ) {
+    $error = mt("New passwords don't match");
 
-  } elsif ( ! length($cgi->param('new_password')) ) {
-    $error = 'No new password entered';
+  } elsif ( ! length($newpass) ) {
+    $error = mt('No new password entered');
 
-  } elsif ( ! FS::Auth->authenticate( $FS::CurrentUser::CurrentUser,
-                                      scalar($cgi->param('_password')) )
-          ) {
-    $error = 'Current password incorrect; password not changed';
+  } elsif ( ! FS::Auth->authenticate( $access_user, $oldpass ) ) {
+    $error = mt('Current password incorrect; password not changed');
 
   } else {
 
-    $error = $FS::CurrentUser::CurrentUser->change_password(
-      scalar($cgi->param('new_password'))
-    );
+    $error = $access_user->is_password_allowed($newpass)
+          || $access_user->change_password($newpass);
 
   }
 
 }
 
-my $access_user = $FS::CurrentUser::CurrentUser;
-
 #well, if you got your password change wrong, you don't get anything else
 #changed right now.  but it should be sticky on the form
 unless ( $error ) { # if ($access_user) {
@@ -52,14 +58,14 @@ unless ( $error ) { # if ($access_user) {
   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
+                      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
-                      hide_package_changes
                       show_pkgnum show_confitem_counts export_getsettings
                       show_db_profile save_db_profile save_tmp_typesetting
                       height width availHeight availWidth colorDepth
@@ -67,7 +73,7 @@ unless ( $error ) { # if ($access_user) {
 
   foreach (@paramlist) {
     scalar($cgi->param($_)) =~ /^[,.\-\@\w]*$/ && next;
-    $error ||= "Illegal value for parameter $_";
+    $error ||= mt("Illegal value for parameter")." $_";
     last;
   }