signup fix for new redirect

[sql-web.git] / tpl / signup.php

diff --git a/tpl/signup.php b/tpl/signup.php
index f01aa182432ea077252c3bb036bd057751e75213..c65228b7a04e8bed6db57fe71068b276ea182ff3 100644 (file)
--- a/tpl/signup.php
+++ b/tpl/signup.php
@@ -8,23 +8,22 @@ $thisTxt = isSSL()?' with this Certificate':' via SQL';
 
 <?php printErrors($err); ?>
 
-<?php if (isset($Login2) && !$Login2->canLogin()): ?>
-<h3>You are registering as: <?=$Username?></h3>
-<p><?=$SSLName?></p>
-<p><?=$SSLEmail?></p>
-<?php endif; ?>
+<?php if ($LoginSSL->canSignup()): ?>
+<h3>You are registering as: <?=$LoginSSL->getUsername()?></h3>
+<p><?=$LoginSSL->getName()?></p>
+<p><?=$LoginSSL->getEmail()?></p>
 
-<?php if (isset($Login2) && $Login2->canSignup()): ?>
+Your MySQL password should be different from your Athena account password.
 
 <form method=post>
-<p>password: <input type="password" name="p1"></p>
-<p>confirm: <input type="password" name="p2"></p>
+<p><span style="width: 150px;"><label for="p1">password:</label></span> <input type="password" name="p1"></p>
+<p><span style="width: 150px;"><label for="p2">repeat password:</label></span> <input type="password" name="p2"></p>
 <input type=submit value="Confirm Registration">
 </form>
 
-<?php elseif (isset($Login2) && $Login2->canLogin()): ?>
+<?php elseif ($LoginSSL->canLogin()): ?>
 
-<h3><a href="login">Login</a>. This account is signed up.</h3>
+<h3>This account is already signed up.</h3>
 
 <?php else: ?>