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
/
register.php
diff --git
a/testing/MCTXWeb/public_html/users/register.php
b/testing/MCTXWeb/public_html/users/register.php
index
32f1ae1
..
8a0d6e6
100644
(file)
--- a/
testing/MCTXWeb/public_html/users/register.php
+++ b/
testing/MCTXWeb/public_html/users/register.php
@@
-40,9
+40,9
@@
if(!empty($_POST))
if(!ctype_alnum($displayname)){
\r
$errors[] = lang("ACCOUNT_DISPLAY_INVALID_CHARACTERS");
\r
}
\r
if(!ctype_alnum($displayname)){
\r
$errors[] = lang("ACCOUNT_DISPLAY_INVALID_CHARACTERS");
\r
}
\r
- if(minMaxRange(
8,50,$password) && minMaxRange(8
,50,$confirm_pass))
\r
+ if(minMaxRange(
6,50,$password) && minMaxRange(6
,50,$confirm_pass))
\r
{
\r
{
\r
- $errors[] = lang("ACCOUNT_PASS_CHAR_LIMIT",array(
8
,50));
\r
+ $errors[] = lang("ACCOUNT_PASS_CHAR_LIMIT",array(
6
,50));
\r
}
\r
else if($password != $confirm_pass)
\r
{
\r
}
\r
else if($password != $confirm_pass)
\r
{
\r
@@
-81,25
+81,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>Register</h2>
\r
+startPage();
\r
\r
\r
-<div id='left-nav'>";
\r
-include("left-nav.php");
\r
echo "
\r
echo "
\r
-</div>
\r
-
\r
-<div id='main'>";
\r
-
\r
-echo resultBlock($errors,$successes);
\r
+<div class='widget' id='login-container'><div class='title centre'>User registration</div>";
\r
\r
echo "
\r
\r
echo "
\r
-<div id='
regbox
'>
\r
+<div id=''>
\r
<form name='newUser' action='".$_SERVER['PHP_SELF']."' method='post'>
\r
\r
<p>
\r
<form name='newUser' action='".$_SERVER['PHP_SELF']."' method='post'>
\r
\r
<p>
\r
@@
-122,23
+110,26
@@
echo "
<label>Email:</label>
\r
<input type='text' name='email' />
\r
</p>
\r
<label>Email:</label>
\r
<input type='text' name='email' />
\r
</p>
\r
+
\r
<p>
\r
<label>Security Code:</label>
\r
<img src='models/captcha.php'>
\r
</p>
\r
<p>
\r
<label>Security Code:</label>
\r
<img src='models/captcha.php'>
\r
</p>
\r
+<p>
\r
<label>Enter Security Code:</label>
\r
<input name='captcha' type='text'>
\r
</p>
\r
<label>Enter Security Code:</label>
\r
<input name='captcha' type='text'>
\r
</p>
\r
-<label> <br>
\r
+<p class='right'>
\r
+<label> </label>
\r
<input type='submit' value='Register'/>
\r
<input type='submit' value='Register'/>
\r
-</p>
\r
+</p>
";
\r
\r
\r
+echo resultBlock($errors,$successes);
\r
+echo "
\r
</form>
\r
</div>
\r
\r
</form>
\r
</div>
\r
\r
-</div>
\r
-<div id='bottom'></div>
\r
-</div>
\r
-</body>
\r
-</html>";
\r
+</div>";
\r
+
\r
+finishPage();
\r
?>
\r
?>
\r
UCC
git Repository :: git.ucc.asn.au