summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/default/register.tpl.php5
-rw-r--r--www/register.php5
2 files changed, 10 insertions, 0 deletions
diff --git a/data/templates/default/register.tpl.php b/data/templates/default/register.tpl.php
index 62cebad..6cfddd7 100644
--- a/data/templates/default/register.tpl.php
+++ b/data/templates/default/register.tpl.php
@@ -23,6 +23,11 @@ window.onload = function() {
<td></td>
</tr>
<tr>
+ <th align="left"><label for="password2"><?php echo T_('Repeat Password'); ?></label></th>
+ <td><input type="password" id="password2" name="password2" size="20" class="required" /></td>
+ <td></td>
+</tr>
+<tr>
<th align="left"><label for="email"><?php echo T_('E-mail'); ?></label></th>
<td><input type="text" id="email" name="email" size="40" class="required" value="<?php echo htmlspecialchars(POST_MAIL); ?>" /></td>
<td><?php echo '←'.T_(' to send you your password if you forget it')?></td>
diff --git a/www/register.php b/www/register.php
index d78ede3..a607c17 100644
--- a/www/register.php
+++ b/www/register.php
@@ -34,6 +34,7 @@ if (!$GLOBALS['enableRegistration']) {
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', '');
isset($_POST['password']) ? define('POST_PASS', $_POST['password']): define('POST_PASS', '');
+isset($_POST['password2']) ? define('POST_PASS2', $_POST['password2']): define('POST_PASS2', '');
if (isset($_POST['email'])) {
define('POST_MAIL', $_POST['email']);
} else if (isset($_SERVER['SSL_CLIENT_S_DN_Email'])) {
@@ -51,6 +52,10 @@ if (POST_SUBMITTED != '') {
if (!($posteduser) || POST_PASS == '' || POST_MAIL == '') {
$tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.');
+ // Check if passwords match
+ } elseif (POST_PASS != POST_PASS2) {
+ $tplVars['error'] = T_('Those passwords do not match.');
+
// Check if username is reserved
} elseif ($userservice->isReserved($posteduser)) {
$tplVars['error'] = T_('This username has been reserved, please make another choice.');