diff --git a/www/register.php b/www/register.php index 7d68667..6733fe3 100644 --- a/www/register.php +++ b/www/register.php @@ -164,65 +164,4 @@ $tplVars['error'] .= implode( '
', array_unique($tplVars['form']['errors']) ); $templateservice->loadTemplate('register.tpl', $tplVars); - -exit(); - - - - - - -/* Managing all possible inputs */ -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['email']) ? define('POST_MAIL', $_POST['email']): define('POST_MAIL', ''); -isset($_POST['antispamAnswer']) ? define('POST_ANTISPAMANSWER', $_POST['antispamAnswer']): define('POST_ANTISPAMANSWER', ''); - - -if (POST_SUBMITTED != '') { - $posteduser = trim(utf8_strtolower(POST_USERNAME)); - - // Check if form is incomplete - if (!($posteduser) || POST_PASS == '' || POST_MAIL == '') { - $tplVars['error'] = T_('You must enter a username, password and e-mail address.'); - - // Check if username is reserved - } elseif ($userservice->isReserved($posteduser)) { - $tplVars['error'] = T_('This username has been reserved, please make another choice.'); - - // Check if username already exists - } elseif ($userservice->getUserByUsername($posteduser)) { - $tplVars['error'] = T_('This username already exists, please make another choice.'); - - // Check if username is valid (length, authorized characters) - } elseif (!$userservice->isValidUsername($posteduser)) { - $tplVars['error'] = T_('This username is not valid (too short, too long, forbidden characters...), please make another choice.'); - - // Check if e-mail address is valid - } elseif (!$userservice->isValidEmail(POST_MAIL)) { - $tplVars['error'] = T_('E-mail address is not valid. Please try again.'); - - // Check if antispam answer is valid (doesn't take into account spaces and uppercase) - } elseif (strcasecmp(str_replace(' ', '', POST_ANTISPAMANSWER), str_replace(' ', '', $GLOBALS['antispamAnswer'])) != 0) { - $tplVars['error'] = T_('Antispam answer is not valid. Please try again.'); - - // Register details - } elseif ($userservice->addUser($posteduser, POST_PASS, POST_MAIL) !== false) { - // Log in with new username - $login = $userservice->login($posteduser, POST_PASS); - if ($login) { - header('Location: '. createURL('bookmarks', $posteduser)); - } - $tplVars['msg'] = T_('You have successfully registered. Enjoy!'); - } else { - $tplVars['error'] = T_('Registration failed. Please try again.'); - } -} - -$tplVars['antispamQuestion'] = $GLOBALS['antispamQuestion']; -$tplVars['loadjs'] = true; -$tplVars['subtitle'] = T_('Register'); -$tplVars['formaction'] = createURL('register'); -$templateservice->loadTemplate('register.tpl', $tplVars); ?>