[Phpbb-checkins] r10143 - /branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php

[Henry S. <kel...@ph...>]

Author: Kellanved
Date: Tue Sep 15 10:08:37 2009
New Revision: 10143

Log:
#51395 - remove legacy captcha code. authorised by: acyd burn

Modified:
    branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php

Modified: branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php Tue Sep 15 10:08:37 2009
***************
*** 67,76 ****
  	// Every auth module is able to define what to do by itself...
  	if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts'])
  	{
- 		$confirm_id = request_var('confirm_id', '');
- 
  		// Visual Confirmation handling
! 		if (!$confirm_id)
  		{
  			return array(
  				'status'		=> LOGIN_ERROR_ATTEMPTS,
--- 67,78 ----
  	// Every auth module is able to define what to do by itself...
  	if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts'])
  	{
  		// Visual Confirmation handling
! 
! 		$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
! 		$captcha->init(CONFIRM_LOGIN);
! 		$vc_response = $captcha->validate();
! 		if ($vc_response)
  		{
  			return array(
  				'status'		=> LOGIN_ERROR_ATTEMPTS,
***************
*** 78,98 ****
  				'user_row'		=> $row,
  			);
  		}
! 		else
! 		{
! 			$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
! 			$captcha->init(CONFIRM_LOGIN);
! 			$vc_response = $captcha->validate();
! 
! 			if ($vc_response)
! 			{
! 				return array(
! 					'status'		=> LOGIN_ERROR_ATTEMPTS,
! 					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
! 					'user_row'		=> $row,
! 				);
! 			}
! 		}
  	}
  
  	// If the password convert flag is set we need to convert it
--- 80,86 ----
  				'user_row'		=> $row,
  			);
  		}
! 		
  	}
  
  	// If the password convert flag is set we need to convert it