Patch by holger@holger.om.org (Holger Schurig) -- was displaying header twice in some cases.

2 files changed, 5 insertions, 3 deletions

diff --git a/CGI.pl b/CGI.pl
index 0d9762b22..328b4d9ea 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -355,8 +355,6 @@ To use the wonders of bugzilla, you can use the following:
     print SENDMAIL $msg;
     close SENDMAIL;
 
-    print "Content-type: text/html\n\n";
-    PutHeader("Password mailed");
     print "The password for the e-mail address\n";
     print "$login has been e-mailed to that address.\n";
     print "<p>When the e-mail arrives, you can click <b>Back</b>\n";
@@ -389,6 +387,8 @@ sub confirm_login {
 			SqlQuote($enteredlogin));
 		$realpwd = FetchOneColumn();
             }
+	    print "Content-type: text/html\n\n";
+	    PutHeader("<H1>Password has been emailed");
             MailPassword($enteredlogin, $realpwd);
             exit;
         }
diff --git a/createaccount.cgi b/createaccount.cgi
index cc9bdd018..8451ab4b0 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -41,19 +41,20 @@ Content-type: text/html
 
 ";
 
-PutHeader("Create a new bugzilla account");
 
 my $login = $::FORM{'login'};
 my $realname = $::FORM{'realname'};
 if (defined $login) {
     CheckEmailSyntax($login);
     if (DBname_to_id($login) != 0) {
+	PutHeader("Account exists");
 	print "A bugzilla account for the name <tt>$login</tt> already\n";
 	print "exists.  If you have forgotten the password for it, then\n";
 	print "<a href=query.cgi?GoAheadAndLogIn>click here</a> and use\n";
 	print "the <b>E-mail me a password</b> button.\n";
 	exit;
     }
+    PutHeader("Account created");
     my $password = InsertNewUser($login, $realname);
     MailPassword($login, $password);
     print "A bugzilla account for <tt>$login</tt> has been created.  The\n";
@@ -64,6 +65,7 @@ if (defined $login) {
     exit;
 }
 
+PutHeader("Create a new bugzilla account");
 print q{
 To create a bugzilla account, all that you need to do is to enter a
 legitimate e-mail address.  The account will be created, and its