4 files changed, 147 insertions, 140 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index a3ed706aeb..1b511b9c49 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -1,8 +1,8 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
+* @version $Id$
 * @copyright (c) 2006 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
@@ -33,33 +33,33 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 	function init($type)
 	{
 		global $config, $db, $user;
-		
+
 		// read input
 		$this->confirm_id = request_var('confirm_id', '');
 		$this->confirm_code = request_var('confirm_code', '');
 		$this->type = (int) $type;
-		
+
 		if (!strlen($this->confirm_id))
 		{
 			// we have no confirm ID, better get ready to display something
 			$this->generate_code();
 		}
 	}
-	
+
 	function execute_demo()
 	{
 		global $user;
-	
+
 		$this->code = gen_rand_string(mt_rand(5, 8));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
-				
+
 		// compute $seed % 0x7fffffff
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
-		
+
 		captcha::execute($this->code, $this->seed);
 	}
-	
-	
+
+
 	function execute()
 	{
 		if (empty($this->code))
@@ -72,28 +72,28 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 		}
 		captcha::execute($this->code, $this->seed);
 	}
-	
-	
+
+
 	function get_template()
 	{
 		global $config, $user, $template;
-		
+
 		$template->set_filenames(array(
 			'captcha' => 'captcha_default.html')
 		);
-		
+
 		$template->assign_vars(array(
 			'CONFIRM_IMAGE'				=> append_sid('ucp', 'mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type),
 			'CONFIRM_ID'				=> $this->confirm_id,
 		));
-	
+
 		return $template->assign_display('captcha');
 	}
-	
+
 	function get_demo_template($id)
 	{
 		global $config, $user, $template;
-		
+
 		$template->set_filenames(array(
 			'captcha_demo' => 'captcha_default_acp_demo.html')
 		);
@@ -102,14 +102,14 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 			'CONFIRM_IMAGE'		=> append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'captcha_demo=1&amp;mode=visual&amp;i=' . $id . '&amp;select_captcha=' . $this->get_class_name()),
 			'CONFIRM_ID'		=> $this->confirm_id,
 		));
-		
+
 		return $template->assign_display('captcha_demo');
 	}
-		
+
 	function get_hidden_fields()
 	{
 		$hidden_fields = array();
-		
+
 		// this is required for postig.php - otherwise we would forget about the captcha being already solved
 		if ($this->solved)
 		{
@@ -118,7 +118,7 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 		$hidden_fields['confirm_id'] = $this->confirm_id;
 		return $hidden_fields;
 	}
-	
+
 	static function garbage_collect($type)
 	{
 		global $db, $config;
@@ -148,23 +148,23 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 		}
 		$db->sql_freeresult($result);
 	}
-	
+
 	function uninstall()
 	{
 		self::garbage_collect(0);
 	}
-	
+
 	function install()
 	{
 		return;
 	}
-	
+
 	function validate()
 	{
 		global $config, $db, $user;
-		
+
 		$this->confirm_code = request_var('confirm_code', '');
-		
+
 		if (!$this->confirm_id)
 		{
 			$error = $user->lang['CONFIRM_CODE_WRONG'];
@@ -181,7 +181,7 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 				$error = $user->lang['CONFIRM_CODE_WRONG'];
 			}
 		}
-	
+
 		if (strlen($error))
 		{
 			// okay, inorect answer. Let's ask a new question
@@ -193,15 +193,15 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 			return false;
 		}
 	}
-	
-	
+
+
 	/**
 	* The old way to generate code, suitable for GD and non-GD. Resets the internal state.
 	*/
 	protected function generate_code()
 	{
 		global $db, $user;
-		
+
 		$this->code = gen_rand_string(mt_rand(5, 8));
 		$this->confirm_id = md5(unique_id($user->ip));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
@@ -218,9 +218,9 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 		);
 		$db->sql_query($sql);
 	}
-	
+
 	/**
-	* Look up everything we need for painting&checking. 
+	* Look up everything we need for painting&checking.
 	*/
 	protected function load_code()
 	{
@@ -240,13 +240,13 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 			return true;
 		}
 		return false;
-		
+
 	}
-	
+
 	protected function check_code()
 	{
 		global $db;
-		
+
 		if (empty($this->code))
 		{
 			if (!$this->load_code())
@@ -256,22 +256,22 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 		}
 		return (strcasecmp($this->code, $this->confirm_code) === 0);
 	}
-	
+
 	protected function delete_code()
 	{
 		global $db, $user;
-		
+
 		$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
 				WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
 					AND session_id = '" . $db->sql_escape($user->session_id) . "'
 					AND confirm_type = " . $this->type;
 		$db->sql_query($sql);
 	}
-	
+
 	function get_attempt_count()
 	{
 		global $db, $user;
-		
+
 		$sql = 'SELECT COUNT(session_id) AS attempts
 				FROM ' . CONFIRM_TABLE . "
 				WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
@@ -279,23 +279,24 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
 		$result = $db->sql_query($sql);
 		$attempts = (int) $db->sql_fetchfield('attempts');
 		$db->sql_freeresult($result);
-		
+
 		return $attempts;
 	}
-	
-	
+
+
 	function reset()
 	{
 		global $db, $user;
-		
+
 		$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
 					WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
 						AND confirm_type = " . (int) $this->type;
 		$db->sql_query($sql);
-		
+
 		// we leave the class usable by generating a new question
 		$this->generate_code();
 	}
-	
+
 }
 
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index e4f0bff87e..d3f8634834 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -1,8 +1,8 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
+* @version $Id$
 * @copyright (c) 2006 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
@@ -15,19 +15,19 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-/** 
+/**
 * Placeholder for autoload
 */
-include_once(PHPBB_ROOT_PATH . "includes/captcha/plugins/captcha_abstract." . PHP_EXT);
+include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
 
 class phpbb_captcha_gd extends phpbb_default_captcha implements phpbb_captcha_plugin
 {
 
 	function __construct()
 	{
-		include_once(PHPBB_ROOT_PATH . "includes/captcha/captcha_gd." . PHP_EXT);
+		include_once(PHPBB_ROOT_PATH . 'includes/captcha/captcha_gd.' . PHP_EXT);
 	}
-	
+
 	public static function get_instance()
 	{
 		return new phpbb_captcha_gd();
@@ -37,21 +37,21 @@ class phpbb_captcha_gd extends phpbb_default_captcha implements phpbb_captcha_pl
 	{
 		return (@extension_loaded('gd') || can_load_dll('gd'));
 	}
-	
+
 	static function get_name()
 	{
 		return 'CAPTCHA_GD';
 	}
-	
+
 	static function get_class_name()
 	{
 		return 'phpbb_captcha_gd';
 	}
-		
+
 	function acp_page($id, &$module)
 	{
 		global $config, $db, $template, $user;
-		
+
 		$captcha_vars = array(
 			'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
 			'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
@@ -99,3 +99,4 @@ class phpbb_captcha_gd extends phpbb_default_captcha implements phpbb_captcha_pl
 	}
 }
 
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index a2521a330e..ac09e4f3c7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -1,8 +1,8 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
+* @version $Id$
 * @copyright (c) 2006 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
@@ -15,16 +15,16 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-include_once(PHPBB_ROOT_PATH . "includes/captcha/plugins/captcha_abstract." . PHP_EXT);
+include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
 
 class phpbb_captcha_nogd extends phpbb_default_captcha implements phpbb_captcha_plugin
 {
 
 	function __construct()
 	{
-		include_once(PHPBB_ROOT_PATH . "includes/captcha/captcha_non_gd." . PHP_EXT);
+		include_once(PHPBB_ROOT_PATH . 'includes/captcha/captcha_non_gd.' . PHP_EXT);
 	}
-	
+
 	public static function get_instance()
 	{
 		return new phpbb_captcha_nogd();
@@ -34,25 +34,26 @@ class phpbb_captcha_nogd extends phpbb_default_captcha implements phpbb_captcha_
 	{
 		return true;
 	}
-	
+
 	static function get_name()
 	{
 		global $user;
-		
-		return 'CAPTCHA_NO_GD'; 
+
+		return 'CAPTCHA_NO_GD';
 	}
-	
+
 	static function get_class_name()
 	{
 		return 'phpbb_captcha_nogd';
 	}
-	
-	
+
+
 	function acp_page($id, &$module)
 	{
 		global $user;
-		
+
 		trigger_error($user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action));
 	}
 }
 
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 2593f1259c..f9bd345f02 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -1,8 +1,8 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
+* @version $Id: constants.php 8818 2008-09-04 14:06:43Z acydburn $
 * @copyright (c) 2006 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
@@ -16,9 +16,8 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-
 // we need the classic captcha code for tracking solutions and attempts
-include_once(PHPBB_ROOT_PATH . "includes/captcha/plugins/captcha_abstract." . PHP_EXT);
+include_once(PHPBB_ROOT_PATH . 'includes/captcha/plugins/captcha_abstract.' . PHP_EXT);
 
 class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plugin
 {
@@ -27,18 +26,17 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 	protected $challenge;
 	protected $response;
 
-	
 	function init($type)
 	{
 		global $config, $db, $user;
-		
+
 		$user->add_lang('recaptcha');
 		parent::init($type);
+
 		$this->challenge = request_var('recaptcha_challenge_field', '');
 		$this->response = request_var('recaptcha_response_field', '');
 	}
-	
-	
+
 	public static function get_instance()
 	{
 		return new phpbb_recaptcha();
@@ -46,25 +44,25 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 
 	static function is_available()
 	{
-		global $config, $user; 
+		global $config, $user;
 		$user->add_lang('recaptcha');
 		return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
 	}
-	
+
 	static function get_name()
 	{
 		return 'CAPTCHA_RECAPTCHA';
 	}
-	
+
 	static function get_class_name()
 	{
 		return 'phpbb_recaptcha';
 	}
-		
+
 	function acp_page($id, &$module)
 	{
 		global $config, $db, $template, $user;
-		
+
 		$captcha_vars = array(
 			'recaptcha_pubkey'				=> 'RECAPTCHA_PUBKEY',
 			'recaptcha_privkey'				=> 'RECAPTCHA_PRIVKEY',
@@ -108,47 +106,47 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 
 		}
 	}
-	
-	
+
+
 	// not needed
 	function execute_demo()
 	{
 	}
-	
-	
+
+
 	// not needed
 	function execute()
 	{
 	}
-	
-	
+
+
 	function get_template()
 	{
 		global $config, $user, $template;
-		
+
 		$template->set_filenames(array(
 			'captcha' => 'captcha_recaptcha.html')
 		);
-		
+
 		$template->assign_vars(array(
 			'RECAPTCHA_SERVER'			=> self::recaptcha_server,
 			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
 			'RECAPTCHA_ERRORGET'		=> '',
 			'S_RECAPTCHA_AVAILABLE'		=> self::is_available(),
 		));
-	
+
 		return $template->assign_display('captcha');
 	}
-	
+
 	function get_demo_template($id)
 	{
 		return $this->get_template();
 	}
-		
+
 	function get_hidden_fields()
 	{
 		$hidden_fields = array();
-		
+
 		// this is required for postig.php - otherwise we would forget about the captcha being already solved
 		if ($this->solved)
 		{
@@ -157,17 +155,17 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 		$hidden_fields['confirm_id'] = $this->confirm_id;
 		return $hidden_fields;
 	}
-		
+
 	function uninstall()
 	{
 		self::garbage_collect(0);
 	}
-	
+
 	function install()
 	{
 		return;
 	}
-	
+
 	function validate()
 	{
 		if (!parent::validate())
@@ -179,7 +177,7 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 			return $this->recaptcha_check_answer();
 		}
 	}
-	
+
 
 // Code from here on is based on recaptchalib.php
 /*
@@ -216,14 +214,14 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
  */
 
 	/**
-	 * Submits an HTTP POST to a reCAPTCHA server
-	 * @param string $host
-	 * @param string $path
-	 * @param array $data
-	 * @param int port
-	 * @return array response
-	 */
-	protected function _recaptcha_http_post($host, $path, $data, $port = 80) 
+	* Submits an HTTP POST to a reCAPTCHA server
+	* @param string $host
+	* @param string $path
+	* @param array $data
+	* @param int port
+	* @return array response
+	*/
+	protected function _recaptcha_http_post($host, $path, $data, $port = 80)
 	{
 		$req = $this->_recaptcha_qsencode ($data);
 
@@ -236,52 +234,56 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 		$http_request .= $req;
 
 		$response = '';
-		if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-				die ('Could not open socket');
+		if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
+		{
+			trigger_error('Could not open socket', E_USER_ERROR);
 		}
 
 		fwrite($fs, $http_request);
 
-		while ( !feof($fs) )
-				$response .= fgets($fs, 1160); // One TCP-IP packet
+		while (!feof($fs))
+		{
+			// One TCP-IP packet
+			$response .= fgets($fs, 1160);
+		}
 		fclose($fs);
+
 		$response = explode("\r\n\r\n", $response, 2);
 
 		return $response;
 	}
 
-
 	/**
-	  * Calls an HTTP POST function to verify if the user's guess was correct
-	  * @param array $extra_params an array of extra variables to post to the server
-	  * @return ReCaptchaResponse
-	  */
-	protected function recaptcha_check_answer ($extra_params = array())
+	* Calls an HTTP POST function to verify if the user's guess was correct
+	* @param array $extra_params an array of extra variables to post to the server
+	* @return ReCaptchaResponse
+	*/
+	protected function recaptcha_check_answer($extra_params = array())
 	{
 		global $config, $user;
-		//discard spam submissions
-		if ($this->challenge == null || strlen($this->challenge) == 0 || $this->response == null || strlen($this->response) == 0) 
+
+		// discard spam submissions
+		if ($this->challenge == null || strlen($this->challenge) == 0 || $this->response == null || strlen($this->response) == 0)
 		{
-				return $user->lang['RECAPTCHA_INCORRECT'];
+			return $user->lang['RECAPTCHA_INCORRECT'];
 		}
 
-		$response = $this->_recaptcha_http_post (self::recaptcha_verify_server, "/verify",
-										  array (
-												 'privatekey'	=> $config['recaptcha_privkey'],
-												 'remoteip'		=> $user->ip,
-												 'challenge'	=> $this->challenge,
-												 'response'		=> $this->response
-												 ) + $extra_params
-										  );
-
-		$answers = explode ("\n", $response[1]);
-		
-		if (trim ($answers[0]) === 'true') 
+		$response = $this->_recaptcha_http_post(self::recaptcha_verify_server, '/verify', array(
+			'privatekey'	=> $config['recaptcha_privkey'],
+			'remoteip'		=> $user->ip,
+			'challenge'		=> $this->challenge,
+			'response'		=> $this->response,
+			) + $extra_params
+		);
+
+		$answers = explode("\n", $response[1]);
+
+		if (trim($answers[0]) === 'true')
 		{
 			$this->solved = true;
 			return false;
 		}
-		else 
+		else
 		{
 			if ($answers[1] === 'incorrect-captcha-sol')
 			{
@@ -289,22 +291,24 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
 			}
 		}
 	}
-	
-		/**
-	 * Encodes the given data into a query string format
-	 * @param $data - array of string elements to be encoded
-	 * @return string - encoded request
-	 */
-	protected function _recaptcha_qsencode ($data)
+
+	/**
+	* Encodes the given data into a query string format
+	* @param $data - array of string elements to be encoded
+	* @return string - encoded request
+	*/
+	protected function _recaptcha_qsencode($data)
 	{
 		$req = '';
-		foreach ( $data as $key => $value )
+
+		foreach ($data as $key => $value)
 		{
-			$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
 		}
 		// Cut the last '&'
-		$req=substr($req,0,strlen($req)-1);
+		$req = substr($req, 0, strlen($req) - 1);
 		return $req;
 	}
 }
 
+?>
+\ No newline at end of file