[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42397] branches/9.x

Revision: 42397
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42397&view=rev
Author:   jonnybradley
Date:     2012-07-17 10:38:28 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
[FIX] registration: If account validation is done more than once show better error message, plus a session
array key correction for 'actpass' (thanks marclaporte)

Modified Paths:
--------------
    branches/9.x/lib/userslib.php
    branches/9.x/tiki-login_validate.php

Modified: branches/9.x/lib/userslib.php
===================================================================
--- branches/9.x/lib/userslib.php	2012-07-17 10:01:52 UTC (rev 42396)
+++ branches/9.x/lib/userslib.php	2012-07-17 10:38:28 UTC (rev 42397)
 <at>  <at>  -23,6 +23,7  <at>  <at> 
 define('ACCOUNT_WAITING_USER', -9);
 define('USER_AMBIGOUS', -7);
 define('USER_NOT_VALIDATED', -8);
+define('USER_PREVIOUSLY_VALIDATED', -10);

 //added for Auth v1.3 support
 define('AUTH_LOGIN_OK', 0);
 <at>  <at>  -1438,6 +1439,9  <at>  <at> 
 			if ($this->hash_pass($pass, $res['hash']) == $res['hash']) // new method (crypt-md5) and tikihash
method (md5(pass))
 				return array(USER_VALID, $user);