login page links fixed

%s/SQL/MySQL/g

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@63 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/login.php b/login.php
index 5e2d3109e2086ac8683780e11cb7a7665d93165a..98a59a5d995b73383c1903444782243b37fb10c6 100644 (file)
--- a/login.php
+++ b/login.php
@@ -18,7 +18,7 @@ if (isPost() && empty($err)) {
        }
        
        if ($Login->exists() && !$Login->isEnabled()) {
-               $err[] = 'Account not active. <a href="signup">Did you signup yet?</a>.';
+               $err[] = 'Account not active. <a href="do/signup">Did you signup yet?</a>.';
        } elseif (!$Login->exists()) {
                $err[] = 'Nonexistant account or invalid password.';
        } elseif (!$Login->canLogin()) {

diff --git a/tpl/login.php b/tpl/login.php
index b405789215921a032888e4afa9fec7c5c0a9cab8..8b8ddbaac6e639137680a6969dad23e5e668a58a 100644 (file)
--- a/tpl/login.php
+++ b/tpl/login.php
@@ -1,8 +1,7 @@
 <?php
 include 'head.php';
 
-$thisTxt = isSSL()?' with this Certificate':' via SQL';
-$otherTxt = isSSL()?' without a Certificate':' with a Certificate';
+$thisTxt = isSSL()?' using this Certificate':' using your MySQL Password';
 ?>
 
 <h2>Login</h2>
@@ -12,7 +11,7 @@ $otherTxt = isSSL()?' without a Certificate':' with a Certificate';
 <?php if (!isSSL()): ?>
 
 <form method=post>
-<h3>Enter your SQL login:</h3>
+<h3>Please enter your MySQL login information:</h3>
 <p>username: <input type="text" name="u" value="<?=isset($i_u)?$i_u:''?>"></p>
 <p>password: <input type="password" name="p"></p>
 
@@ -32,7 +31,7 @@ $otherTxt = isSSL()?' without a Certificate':' with a Certificate';
 
 <?php elseif (isSSL() && !is_null($SSLCred)): ?>
 
-<h3><a href="signup">Signup</a> to use this service.</h3>
+<h3><a href="do/signup">Sign up</a> to use this service.</h3>
 
 <?php endif; ?>
 

diff --git a/tpl/setup.php b/tpl/setup.php
index a330e14857a9352ae2629c0c3f6bbcb207f7d97d..5a402dad43de7e18809f26d95b3c226de7a0e177 100755 (executable)
--- a/tpl/setup.php
+++ b/tpl/setup.php
@@ -2,7 +2,10 @@
 include 'head.php';
 ?>
 
-<h2>Change SQL Password</h2>
+<h2>Change MySQL Password</h2>
+
+Your MySQL password should be different from your Athena account password.<br>
+<br>
 
 <?php printErrors($err); ?>
 <?php printMsgs($msg); ?>
@@ -12,7 +15,7 @@ include 'head.php';
 <?/*
 <tr><td align="right">old password:</td><td><input type="password" name="p[0]"></td></tr>*/?>
 <tr><td align="right">new password:</td><td><input type="password" name="p[1]"></td></tr>
-<tr><td align="right">confirm:</td><td><input type="password" name="p[2]"></td></tr>
+<tr><td align="right">repeat new password:</td><td><input type="password" name="p[2]"></td></tr>
 <tr><td align="right" colspan=2><br /><input name="chgpw" type="submit" value="change password"></td></tr>
 </table>
 </form>