X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Faccess_user.html;h=fcd210f83c57569517b2dcc38fa4898f49208fe9;hp=bbe4268be70b274a42b1b3c632b5f4b971d672d1;hb=f4209091a9f7120f1961ab2d2efd4d3a00b94268;hpb=450d0dec955bf6ae8d7acdc13a8bfc19777089d3

diff --git a/httemplate/edit/process/access_user.html b/httemplate/edit/process/access_user.html
index bbe4268be..fcd210f83 100644
--- a/httemplate/edit/process/access_user.html
+++ b/httemplate/edit/process/access_user.html
@@ -11,7 +11,7 @@
                                        'target_table' => 'access_group',
                                      },
                  'precheck_callback'        => \&precheck_callback,
-                 'post_new_object_callback' => \&post_new_object_callback,
+                 #'post_new_object_callback' => \&post_new_object_callback,
                  'noerror_callback'         => \&noerror_callback,
              )
 %>
@@ -29,7 +29,7 @@ if ( FS::Conf->new->exists('disable_acl_changes') ) {
 sub precheck_callback {
   my $cgi = shift;
 
-  my $o = FS::access_user->new({username => $cgi->param('username')});
+  my $o = FS::access_user->new({username => scalar($cgi->param('username'))});
   if( $o->is_system_user and !$cgi->param('usernum') ) {
     $cgi->param('username','');
     return "username '".$o->username."' reserved for system account."
@@ -38,20 +38,24 @@ sub precheck_callback {
   return '';
 }
 
-sub post_new_object_callback {
+#sub post_new_object_callback {
+#  my( $cgi, $access_user ) = @_;
+#
+#  if ( length($cgi->param('_password')) ) {
+#    my $password = scalar($cgi->param('_password'));
+#    my $error = $access_user->is_password_allowed($password);
+#    #XXX and then bubble the error back up to the UI
+#  }
+#}
+
+sub noerror_callback {
   my( $cgi, $access_user ) = @_;
 
   if ( length($cgi->param('_password')) ) {
     my $password = scalar($cgi->param('_password'));
-    my $error = $access_user->is_password_allowed($password)
-             || $access_user->change_password($password);
+    $access_user->change_password($password);
   }
 
-}
-
-sub noerror_callback {
-  my( $cgi, $access_user ) = @_;
-
   #handle installer checkbox
   my @sched_item = $access_user->sched_item;
   my $sched_item = $sched_item[0];