git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into dilatometer
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
users
/
forgot-password.php
diff --git
a/testing/MCTXWeb/public_html/users/forgot-password.php
b/testing/MCTXWeb/public_html/users/forgot-password.php
index
fa68835
..
77fec13
100644
(file)
--- a/
testing/MCTXWeb/public_html/users/forgot-password.php
+++ b/
testing/MCTXWeb/public_html/users/forgot-password.php
@@
-6,6
+6,7
@@
http://usercake.com
\r
require_once("models/config.php");
\r
if (!securePage($_SERVER['PHP_SELF'])){die();}
\r
\r
require_once("models/config.php");
\r
if (!securePage($_SERVER['PHP_SELF'])){die();}
\r
+if (isUserLoggedIn()){header("Location: index.php"); die();}
\r
\r
//User has confirmed they want their password changed
\r
if(!empty($_GET["confirm"]))
\r
\r
//User has confirmed they want their password changed
\r
if(!empty($_GET["confirm"]))
\r
@@
-174,22
+175,13
@@
if(!empty($_POST))
}
\r
\r
require_once("models/header.php");
\r
}
\r
\r
require_once("models/header.php");
\r
-echo "
\r
-<body>
\r
-<div id='wrapper'>
\r
-<div id='top'><div id='logo'></div></div>
\r
-<div id='content'>
\r
-<h1>UserCake</h1>
\r
-<h2>Forgot Password</h2>
\r
-<div id='left-nav'>";
\r
+startPage();
\r
\r
\r
-
include("left-nav.php"
);
\r
+
//echo notificationBlock($errors,$successes
);
\r
\r
echo "
\r
\r
echo "
\r
-</div>
\r
-<div id='main'>";
\r
-
\r
-echo resultBlock($errors,$successes);
\r
+<div id='login-container'>
\r
+<div class='widget'><div class='title centre'>Forgot password</div>";
\r
\r
echo "
\r
<div id='regbox'>
\r
\r
echo "
\r
<div id='regbox'>
\r
@@
-205,13
+197,15
@@
echo "
<p>
\r
<label> </label>
\r
<input type='submit' value='Submit' class='submit' />
\r
<p>
\r
<label> </label>
\r
<input type='submit' value='Submit' class='submit' />
\r
-</p>
\r
+</p>";
\r
+echo resultBlock($errors,$successes);
\r
+
\r
+echo "
\r
</form>
\r
</div>
\r
</div>
\r
</form>
\r
</div>
\r
</div>
\r
-<div id='bottom'></div>
\r
-</div>
\r
-</body>
\r
-</html>";
\r
+</div>";
\r
+
\r
+finishPage();
\r
\r
?>
\r
\r
?>
\r
UCC
git Repository :: git.ucc.asn.au