Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs
In directory usw-pr-cvs1:/tmp/cvs-serv22986/chat/lib/index_libs
Modified Files:
index_validation.lib.php3
Log Message:
Fied bug #425803: C_REQUIRE_REGISTER not taken into account
Index: index_validation.lib.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/index_validation.lib.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** index_validation.lib.php3 2001/05/16 20:55:37 1.10
--- index_validation.lib.php3 2001/05/21 19:21:32 1.11
***************
*** 102,106 ****
// 3. If registration is required but no password has been submitted
// -> deny access
! if ($error1 == '' && $requireReg)
{
if ($password == '')
--- 102,106 ----
// 3. If registration is required but no password has been submitted
// -> deny access
! if ($error1 == '' && !$isJsValidated && $requireReg)
{
if ($password == '')
***************
*** 117,131 ****
if ($isRegNick)
{
! $regUserPassword = pmcHandleMagicQuotes($regUserPassword, '', 1, 'del');
! $regNickModeratedRooms = pmcHandleMagicQuotes($regNickModeratedRooms, '', 1, 'del');
}
$dbLink->cleanResults();
! // Skip the validation work when it has already be done before the
! // 'main_index.lib.php3' is ran
! if (!isset($GLOBALS['$exitMessage']) && $isRegNick)
{
// Reserved nick but no password submitted -> deny access
! if ($password == '')
{
$error1 = L_ERR_USR_3;
--- 117,136 ----
if ($isRegNick)
{
! $regUserPassword = pmcHandleMagicQuotes($regUserPassword, '', 1, 'del');
! $regNickModeratedRooms = pmcHandleMagicQuotes($regNickModeratedRooms, '', 1, 'del');
}
$dbLink->cleanResults();
! // Nick isn't a registered one but registration is required
! if (!$isRegNick && $requireReg)
{
+ $error1 = L_ERR_USR_14;
+ }
+ // Skip the validation of the password when it has already be done before
+ // the 'main_index.lib.php3' is ran
+ else if (!isset($GLOBALS['$exitMessage']) && $isRegNick)
+ {
// Reserved nick but no password submitted -> deny access
! if (!$isJsValidated && $password == '')
{
$error1 = L_ERR_USR_3;
|
