shuffling around hte user password stuff. hopefully the user modification issues seen in 1.3.30 will be fixed.rt-1.3.31

4 files changed, 26 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 6a9441724b..96a89bd771 100755
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PERL			= 	/usr/bin/perl
 
 RT_VERSION_MAJOR	=	1
 RT_VERSION_MINOR	=	3
-RT_VERSION_PATCH	=	30
+RT_VERSION_PATCH	=	31
 
 
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
diff --git a/lib/RT/User.pm b/lib/RT/User.pm
index e3febba7d6..da087a7b13 100755
--- a/lib/RT/User.pm
+++ b/lib/RT/User.pm
@@ -109,7 +109,7 @@ sub Create  {
     #TODO check for duplicate emails and userid +++
 
     if (! $args{'Password'})  {
-        return(0, "No password set");
+	$args{'Password'} = '*NO-PASSWORD*';
     }
     elsif (length($args{'Password'}) < $RT::MinimumPasswordLength) {
         return(0,"Password too short");
@@ -121,6 +121,8 @@ sub Create  {
         
     #TODO Specify some sensible defaults.
     #TODO check ACLs
+
+    #TODO +++ SANITY CHECK THE NAME AND ABORT IF IT'S TAKEN
     
     my $id = $self->SUPER::Create(%args);
     
@@ -272,7 +274,6 @@ sub IsPassword {
     
     #TODO +++ ACL this
 
-    $RT::Logger->debug($self->UserId." attempting to authenticate with password '$value'\n");
     # RT does not allow null passwords 
     if ((!defined ($value)) or ($value eq '')) {
 	return(undef);
diff --git a/tools/insertdata b/tools/insertdata
index 9422319019..19b0ab3e82 100755
--- a/tools/insertdata
+++ b/tools/insertdata
@@ -42,7 +42,6 @@ $CurrentUser->LoadByUserId('RT_System');
 my @users = ( 
 	     { 
 	      UserId => 'Nobody',
-              Password => 'password', # TODO ++ shouldn't need password here
 	      RealName => 'Nobody in particular',
 	      Comments => 'Do not delete or modify this user. It is integral ' .
 	      'to RT\'s internal data structures',
diff --git a/webrt/Admin/Users/Modify.html b/webrt/Admin/Users/Modify.html
index 75156f4d72..2ad51e4529 100755
--- a/webrt/Admin/Users/Modify.html
+++ b/webrt/Admin/Users/Modify.html
@@ -3,8 +3,6 @@
 
 <& /Elements/ListActions, actions => \@results &>
 
-<& /Elements/TitleBoxStart, title => $title &>
-
 <FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
 %if ($Create) {
 <INPUT TYPE=HIDDEN NAME=id VALUE="new">
@@ -35,8 +33,23 @@ Extra info: <textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->Free
 <INPUT TYPE=HIDDEN NAME="SetPrivileged" VALUE="1">
 <INPUT TYPE=CHECKBOX NAME="Privileged" VALUE="1" <%$PrivilegedChecked%>> Privileged user. (Can
 be granted rights.)<BR>
-	    New Password: <input type=password name="Pass1">
-<BR>Retype Password: <input type=password name="Pass2"><BR>
+<TABLE>
+<TR>
+<TD ALIGN=RIGHT>
+New Password:
+</TD>
+<TD ALIGN=LEFT>
+<input type=password name="Pass1">
+</TD>
+</TR>
+<TR><TD ALIGN=RIGHT>
+Retype Password:
+</TD>
+<TD>
+<input type=password name="Pass2">
+</TD>
+</TR>
+</TABLE>
 <& /Elements/TitleBoxEnd &>
 </TD>
 <TR>
@@ -97,7 +110,7 @@ Pager: <input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13>
 </TR>
 </TABLE>
 
-<& /Elements/TitleBoxEnd &>
+
 <& /Elements/Submit &>
 </form>
 
@@ -148,16 +161,16 @@ eval $check;
 
 if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
 my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
-     push @results, $msg;;
+     push @results, $msg;
 }
 
 
 
 #TODO: make this report errors properly
 if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
-my ($code, $msg);
-($code, $msg) = $UserObj->SetPassword($Pass1);
-push @results, $msg;
+    my ($code, $msg);
+    ($code, $msg) = $UserObj->SetPassword($Pass1);
+    push @results, $msg;
 }