remove duplicate shared-tag in xml - the android apps dont like this

[scuttle] / register.php

diff --git a/register.php b/register.php
index 8549d05c2e6d0495bbb6f88f67dc733f69ca4675..e93c2ab6d4083c7a5e79aeaa899a073b115ada08 100644 (file)
--- a/register.php
+++ b/register.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
 <?php
 /***************************************************************************

-Copyright (C) 2004 - 2006 Marcus Campbell
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell

 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify


@@ -19,46 +18,90 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 

-require_once('header.inc.php');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+require_once 'header.inc.php';
+$userservice     =& ServiceFactory::getServiceInstance('UserService');

 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 

-$tplVars = array();
+$tplVars   = array();
+$completed = FALSE;

 
 if ($_POST['submitted']) {
 
 if ($_POST['submitted']) {

+  if (!$completed) {  

     $posteduser = trim(utf8_strtolower($_POST['username']));
     $posteduser = trim(utf8_strtolower($_POST['username']));

+    $postedpass = trim($_POST['password']);
+    $postedconf = trim($_POST['passconf']);
+    $postedmail = trim($_POST['email']);
+
+    // Check token
+    if (!isset($_SESSION['token']) || $_POST['token'] != $_SESSION['token']) {
+      $tplVars['error'] = T_('Form could not be authenticated. Please try again.');
+    }
+
+    // Check elapsed time
+    if (!isset($_SESSION['token_time']) || time() - $_SESSION['token_time'] < 1) {
+      $tplVars['error'] = T_('Form was submitted too quickly. Please wait before trying again.');
+    }

 
     // Check if form is incomplete
 
     // Check if form is incomplete

-    if (!($posteduser) || !($_POST['password']) || !($_POST['email'])) {
-        $tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.');
+    elseif (!$posteduser || !$postedpass || !$postedmail) {
+      $tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.');
+    }

 
     // Check if username is reserved
 
     // Check if username is reserved

-    } elseif ($userservice->isReserved($posteduser)) {
-        $tplVars['error'] = T_('This username has been reserved, please make another choice.');
+    elseif ($userservice->isReserved($posteduser)) {
+      $tplVars['error'] = T_('This username has been reserved, please make another choice.');
+    }

 
     // Check if username already exists
 
     // Check if username already exists

-    } elseif ($userservice->getUserByUsername($posteduser)) {
-        $tplVars['error'] = T_('This username already exists, please make another choice.');
+    elseif ($userservice->getUserByUsername($posteduser)) {
+      $tplVars['error'] = T_('This username already exists, please make another choice.');
+    }

     
     

+    // Check that password is long enough
+    elseif ($postedpass != '' && strlen($postedpass) < 6) {
+      $tplVars['error'] = T_('Password must be at least 6 characters long.');       
+    }
+
+    // Check if password matches confirmation
+    elseif ($postedpass != $postedconf) {
+      $tplVars['error'] = T_('Password and confirmation do not match.');
+    }
+
+    // Check if e-mail address is blocked
+    elseif ($userservice->isBlockedEmail($postedmail)) {
+      $tplVars['error'] = T_('This e-mail address is not permitted.');
+    }
+

     // Check if e-mail address is valid
     // Check if e-mail address is valid

-    } elseif (!$userservice->isValidEmail($_POST['email'])) {
-        $tplVars['error'] = T_('E-mail address is not valid. Please try again.');
+    elseif (!$userservice->isValidEmail($postedmail)) {
+      $tplVars['error'] = T_('E-mail address is not valid. Please try again.');
+    }

 
     // Register details
 
     // Register details

-    } elseif ($userservice->addUser($posteduser, $_POST['password'], $_POST['email'])) {
-        // Log in with new username
-        $login = $userservice->login($posteduser, $_POST['password']);
-        if ($login) {
-            header('Location: '. createURL('bookmarks', $posteduser));
-        }
-        $tplVars['msg'] = T_('You have successfully registered. Enjoy!');
-    } else {
-        $tplVars['error'] = T_('Registration failed. Please try again.');
+    elseif ($userservice->addUser($posteduser, $_POST['password'], $postedmail)) {
+      // Log in with new username
+      $login = $userservice->login($posteduser, $_POST['password']);
+      if ($login) {
+        header('Location: '. createURL('bookmarks', $posteduser));
+      }
+      $tplVars['msg'] = T_('You have successfully registered. Enjoy!');

     }
     }

+    else {
+      $tplVars['error'] = T_('Registration failed. Please try again.');
+    }
+  }
+  else {
+    $tplVars['msg'] = T_('Woah there, go easy on the Register button! Your registration was successful. Check your e-mail for instructions on how to verify your account.');  
+  }

 }
 
 }
 

-$tplVars['loadjs']      = true;
-$tplVars['subtitle']    = T_('Register');
-$tplVars['formaction']  = createURL('register');
+// Generate anti-CSRF token
+$token = md5(uniqid(rand(), TRUE));
+$_SESSION['token']      = $token;
+$_SESSION['token_time'] = time();
+
+$tplVars['loadjs']     = TRUE;
+$tplVars['subtitle']   = T_('Register');
+$tplVars['formaction'] = createURL('register');
+$tplVars['token']      = $token;

 $templateservice->loadTemplate('register.tpl', $tplVars);
 $templateservice->loadTemplate('register.tpl', $tplVars);

-?>