default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / edit / process / access_user.html

diff --git a/httemplate/edit/process/access_user.html b/httemplate/edit/process/access_user.html
index d589c62..8e264c1 100644 (file)
--- a/httemplate/edit/process/access_user.html
+++ b/httemplate/edit/process/access_user.html
@@ -5,7 +5,7 @@
 <%   include( 'elements/process.html',
                  'table'          => 'access_user',
                  'viewall_dir'    => 'browse',
-                 'copy_on_empty'  => [ '_password', '_password_encoding' ],
+                 'copy_on_empty'  => [ '_password', '_password_encoding', 'totp_secret32' ],
                  'clear_on_error' => [ '_password', '_password2' ],
                  'process_m2m'    => { 'link_table'   => 'access_usergroup',
                                        'target_table' => 'access_group',
@@ -44,8 +44,11 @@ sub post_new_object_callback {
   return '' unless length($cgi->param('_password'));
 
   my $password = scalar($cgi->param('_password'));
-  $access_user->is_password_allowed($password)
-    || $access_user->change_password_fields($password);
+  my $error = $access_user->is_password_allowed($password);
+  return $error if $error;
+
+  $access_user->change_password_fields($password);
+  '';
 }
 
 sub noerror_callback {