From b776d02682492077a4fafd8835d7c4a17e50762d Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 2 Jun 2009 14:12:23 +0000
Subject: Okay, a first ci of the new captcha plugins. We'll add dynamic
 template includes later, as well as documentation on how to use this. I'm
 prepared to get yelled at for bugs (oh, I know that there are plenty); but
 please blame spammers for broken styles and MODs.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9524 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_factory.php         |  92 +++
 phpBB/includes/captcha/captcha_gd_wave.php         | 842 +++++++++++++++++++++
 phpBB/includes/captcha/captcha_plugin.php          |  97 +++
 .../includes/captcha/plugins/captcha_abstract.php  | 332 ++++++++
 .../captcha/plugins/phpbb_captcha_gd_plugin.php    | 122 +++
 .../plugins/phpbb_captcha_gd_wave_plugin.php       |  66 ++
 .../captcha/plugins/phpbb_captcha_nogd_plugin.php  |  68 ++
 .../captcha/plugins/phpbb_recaptcha_plugin.php     | 312 ++++++++
 8 files changed, 1931 insertions(+)
 create mode 100755 phpBB/includes/captcha/captcha_factory.php
 create mode 100755 phpBB/includes/captcha/captcha_gd_wave.php
 create mode 100755 phpBB/includes/captcha/captcha_plugin.php
 create mode 100755 phpBB/includes/captcha/plugins/captcha_abstract.php
 create mode 100755 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
 create mode 100755 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
 create mode 100755 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
 create mode 100644 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
new file mode 100755
index 0000000000..e6f56172ec
--- /dev/null
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -0,0 +1,92 @@
+<?
+/**
+*
+* @package VC
+* @version $Id: $
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+/** A small class until we get the autoloader done */
+class phpbb_captcha_factory
+{
+	/**
+	* return an instance of class $name in file $name_plugin.php
+	*/
+	function get_instance($name)
+	{
+		global $phpbb_root_path, $phpEx;
+		
+		$name = basename($name);
+		if (!class_exists($name))
+		{
+			include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx);
+		}
+		return call_user_func(array($name, 'get_instance'));
+	}
+	
+	/**
+	* Call the garbage collector
+	*/
+	function garbage_collect($name)
+	{
+		global $phpbb_root_path, $phpEx;
+
+		$name = basename($name);
+		if (!class_exists($name))
+		{
+			include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx);
+		}
+		call_user_func(array($name, 'garbage_collect'), 0);
+	}
+	
+	/**
+	* return a list of all discovered CAPTCHA plugins
+	*/
+	function get_captcha_types()
+	{
+		global $phpbb_root_path, $phpEx;
+	
+		$captchas = array();
+		$captchas['available'] = array();
+		$captchas['unavailable'] = array();
+	
+		$dp = @opendir($phpbb_root_path . 'includes/captcha/plugins');
+
+		if ($dp)
+		{
+			while (($file = readdir($dp)) !== false)
+			{
+				if ((preg_match('#_plugin\.' . $phpEx . '$#', $file)))
+				{
+					$name = preg_replace('#^(.*?)_plugin\.' . $phpEx . '$#', '\1', $file);
+					if (!class_exists($name))
+					{
+						include($phpbb_root_path . "includes/captcha/plugins/$file");
+					}
+					if (call_user_func(array($name, 'is_available')))
+					{
+						$captchas['available'][$name] = call_user_func(array($name, 'get_name'));
+					}
+					else
+					{
+						$captchas['unavailable'][$name] = call_user_func(array($name, 'get_name'));
+					}
+				}
+			}
+			closedir($dp);
+		}
+
+		return $captchas;
+	}
+}
\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
new file mode 100755
index 0000000000..0356538a4d
--- /dev/null
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -0,0 +1,842 @@
+<?php
+/** 
+*
+* @package VC
+* @version $Id: captcha_gd.php,v 1.19 2007/01/26 16:07:43 acydburn Exp $
+* @copyright (c) 2006 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+
+/** 
+Wave3D CAPTCHA by Robert Hetzler
+*/
+class captcha
+{
+	var $width		= 360;
+	var $height		= 96;
+
+	function execute($code, $seed)
+	{
+		global $starttime;
+		
+		// seed the random generator
+		mt_srand($seed);
+	
+		// set height and width
+		$img_x = $this->width;
+		$img_y = $this->height;
+
+		// Generate image
+		$img	= imagecreatetruecolor($img_x, $img_y);
+		$x_grid = mt_rand(6, 10);
+		$y_grid = mt_rand(6, 10);
+ 
+		// Ok, so lets cut to the chase. We could accurately represent this in 3d and
+		// do all the appropriate linear transforms. my questions is... why bother?
+		// The computational overhead is unnecessary when you consider the simple fact:
+		// we're not here to accurately represent a model, but to just show off some random-ish
+		// polygons
+
+		// Conceive of 3 spaces.
+		// 1) planar-space (discrete "pixel" grid)
+		// 2) 3-space. (planar-space with z/height aspect)
+		// 3) image space (pixels on the screen)
+		// resolution of the planar-space we're embedding the text code in
+		$plane_x	= 100;
+		$plane_y	= 30;
+
+		$subdivision_factor	= 3;
+		// $box is the 4 points in img_space that correspond to the corners of the plane in 3-space
+		$box = array(
+			'upper_left'	=> array(
+				'x' => mt_rand(5, 15),
+				'y' => mt_rand(10, 15)
+			), 
+			'upper_right'	=> array(
+				'x' => mt_rand($img_x - 35, $img_x - 19),
+				'y' => mt_rand(10, 17)
+			), 
+			'lower_left'	=> array(
+				'x' => mt_rand($img_x - 5, $img_x - 45),
+				'y' => mt_rand($img_y - 0, $img_y - 15)
+			), 
+		);
+		$box['lower_right'] = array(
+				'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
+				'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
+		);
+
+
+		// TODO
+		$background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255));
+		imagefill($img, 0, 0, $background);
+		$black = imagecolorallocate($img, 0, 0, 0);
+
+		$random = array();
+		$fontcolors = array();
+
+		for ($i = 0; $i < 15; ++$i)
+		{
+			$random[$i] = imagecolorallocate($img, mt_rand(120, 255), mt_rand(120, 255), mt_rand(120, 255));
+		}
+
+		$fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120));
+		
+ 		$colors = array();
+
+		$minr = mt_rand(20, 30);
+		$ming = mt_rand(20, 30);
+		$minb = mt_rand(20, 30);
+
+		$maxr = mt_rand(150, 230);
+		$maxg = mt_rand(150, 230);
+		$maxb = mt_rand(150, 230);
+
+		for ($i = -30; $i <= 30; ++$i)
+		{
+			$coeff1 = ($i + 12) / 45;
+			$coeff2 = 1 - $coeff1;
+			$colors[$i] = imagecolorallocate($img, ($coeff2 * $maxr) + ($coeff1 * $minr), ($coeff2 * $maxg) + ($coeff1 * $ming), ($coeff2 * $maxb) + ($coeff1 * $minb));
+		}
+
+		// $img_buffer is the last row of 3-space positions (converted to img-space), cached
+		// (using this means we don't need to recalculate all 4 positions for each new polygon,
+		// merely the newest point that we're adding, which is then cached.
+		$img_buffer = array(array(), array());
+
+		// In image-space, the x- and y-offset necessary to move one unit in the x-direction in planar-space
+		$dxx = ($box['upper_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_x);
+		$dxy = ($box['upper_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_x);
+
+		// In image-space, the x- and y-offset necessary to move one unit in the y-direction in planar-space
+		$dyx = ($box['lower_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_y);
+		$dyy = ($box['lower_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_y);
+
+		// Initial captcha-letter offset in planar-space
+		$plane_offset_x = mt_rand(3, 8);
+		$plane_offset_y = mt_rand( 12, 15);
+
+		// character map
+		$map = $this->captcha_bitmaps();
+
+		// matrix
+		$plane = array();
+
+		// for each character, we'll silkscreen it into our boolean pixel plane
+		for ($c = 0, $code_num = strlen($code); $c < $code_num; ++$c)
+		{
+			$letter = $code[$c];
+
+			for ($x = $map['width'] - 1; $x >= 0; --$x)
+			{
+				for ($y = $map['height'] - 1; $y >= 0; --$y)
+				{
+					if ($map['data'][$letter][$y][$x])
+					{
+						$plane[$y + $plane_offset_y + (($c & 1) ? 1 : -1)][$x + $plane_offset_x] = true;
+					}
+				}
+			}
+			$plane_offset_x += 11;
+		}
+
+		// calculate our first buffer, we can't actually draw polys with these yet
+		// img_pos_prev == screen x,y location to our immediate left.
+		// img_pos_cur == current screen x,y location
+		// we calculate screen position of our
+		// current cell based on the difference from the previous cell
+		// rather than recalculating from absolute coordinates
+		// What we cache into the $img_buffer contains the raised text coordinates.
+		$img_pos_prev	= $img_buffer[0][0] = array($box['upper_left']['x'], $box['upper_left']['y']);
+		$cur_height		= $prev_height = $this->wave_height(0, 0, $subdivision_factor);
+		$full_x			= $plane_x * $subdivision_factor;
+		$full_y			= $plane_y * $subdivision_factor;
+
+		for ($x = 1; $x <= $full_x; ++$x)
+		{
+			$cur_height		= $this->wave_height($x, 0, $subdivision_factor);
+			$offset			= $cur_height - $prev_height;
+			$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
+									
+			$img_buffer[0][$x]	= $img_pos_cur;
+			$img_pos_prev		= $img_pos_cur;
+			$prev_height		= $cur_height;
+		}
+
+		for ($y = 1; $y <= $full_y; ++$y)
+		{
+			// swap buffers
+			$buffer_cur		= $y & 1;
+			$buffer_prev	= 1 - $buffer_cur;
+			
+			$prev_height	= $this->wave_height(0, $y, $subdivision_factor);
+			$offset			= $prev_height - $this->wave_height(0, $y - 1, $subdivision_factor);
+			$img_pos_cur	= array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1));
+
+			// make sure we don't try to write off the page
+			$img_pos_prev	= $img_pos_cur;
+
+			$img_buffer[$buffer_cur][0]	= $img_pos_cur;
+			
+			for ($x = 1; $x <= $full_x; ++$x)
+			{
+				$cur_height		= $this->wave_height($x, $y, $subdivision_factor) + $this->grid_height($x, $y, 1, $x_grid, $y_grid);
+
+				// height is a z-factor, not a y-factor
+				$offset			= $cur_height - $prev_height;
+				$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
+
+				// height is float, index it to an int, get closest color
+				$color			= $colors[intval($cur_height)];
+				$img_pos_prev	= $img_pos_cur;
+				$prev_height	= $cur_height;
+
+				$y_index_old = intval(($y - 1) / $subdivision_factor);
+				$y_index_new = intval($y / $subdivision_factor);
+				$x_index_old = intval(($x - 1) / $subdivision_factor);
+				$x_index_new = intval($x / $subdivision_factor);
+
+				if (!empty($plane[$y_index_new][$x_index_new]))
+				{
+					$img_pos_cur[1]	+= $this->wave_height($x, $y, $subdivision_factor, 1) - 30 - $cur_height;
+					$color			= $colors[20];
+				}
+				$img_pos_cur[1] = min($img_pos_cur[1], $img_y - 1);
+				$img_buffer[$buffer_cur][$x] = $img_pos_cur;
+
+				// Smooth the edges as much as possible by having not more than one low<->high traingle per square
+				// Otherwise, just
+				$diag_down	= (empty($plane[$y_index_old][$x_index_old]) == empty($plane[$y_index_new][$x_index_new]));
+				$diag_up	= (empty($plane[$y_index_old][$x_index_new]) == empty($plane[$y_index_new][$x_index_old]));
+
+				// natural switching
+				$mode = ($x + $y) & 1;
+
+				// override if it requires it
+				if ($diag_down != $diag_up)
+				{
+					$mode = $diag_up;
+				}
+
+				if ($mode)
+				{
+					//		+-/			  /
+					// 1	|/		2	 /|
+					//		/			/-+
+					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x]);
+					$poly2 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_cur][$x], $img_buffer[$buffer_prev][$x]);
+				}
+				else
+				{
+					//		\			\-+
+					// 1	|\		2	 \|
+					//		+-\			  \
+					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_cur][$x]);
+					$poly2 = array_merge($img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x], $img_buffer[$buffer_cur][$x]);
+				}
+
+				imagefilledpolygon($img, $poly1, 3, $color);
+				imagefilledpolygon($img, $poly2, 3, $color);
+			}
+		}
+
+		// Output image
+		header('Content-Type: image/png');
+		header('Cache-control: no-cache, no-store');
+		//$mtime = explode(' ', microtime());
+		//$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+		//echo $totaltime . "<br />\n";
+		//echo memory_get_usage() - $tmp;
+		imagepng($img);
+		imagedestroy($img);
+	}
+
+	function wave_height($x, $y, $factor = 1, $tweak = 0.7)
+	{
+		// stretch the wave. TODO: pretty it up
+		$x = $x/5 + 180;
+		$y = $y/4;
+		return ((sin($x / (3 * $factor)) + sin($y / (3 * $factor))) * 10 * $tweak);
+	}
+
+	function grid_height($x, $y, $factor = 1, $x_grid, $y_grid)
+	{
+		return ((!($x % ($x_grid * $factor)) || !($y % ($y_grid * $factor))) ? 3 : 0);
+	}
+
+	function captcha_bitmaps()
+	{
+		return array(
+			'width'		=> 9,
+			'height'	=> 13,
+			'data'		=> array(
+				'A' => array(
+					array(0,0,1,1,1,1,0,0,0),
+					array(0,1,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,1,1,1,1,1,1,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'B' => array(
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'C' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'D' => array(
+					array(1,1,1,1,1,1,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'E' => array(
+					array(0,0,1,1,1,1,1,1,1),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'F' => array(
+					array(0,0,1,1,1,1,1,1,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'G' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'H' => array(
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'I' => array(
+					array(0,1,1,1,1,1,1,1,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,1,1,1,1,1,1,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'J' => array(
+					array(0,0,0,0,0,0,1,1,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'K' => array(
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,1,0,0,0),
+					array(1,0,0,0,1,0,0,0,0),
+					array(1,0,0,1,0,0,0,0,0),
+					array(1,0,1,0,0,0,0,0,0),
+					array(1,1,0,0,0,0,0,0,0),
+					array(1,0,1,0,0,0,0,0,0),
+					array(1,0,0,1,0,0,0,0,0),
+					array(1,0,0,0,1,0,0,0,0),
+					array(1,0,0,0,0,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'L' => array(
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'M' => array(
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,1,0,0,0,1,1,0),
+					array(0,1,0,1,0,1,0,1,0),
+					array(0,1,0,0,1,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'N' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,1,0,0,0,0,0,0,1),
+					array(1,0,1,0,0,0,0,0,1),
+					array(1,0,0,1,0,0,0,0,1),
+					array(1,0,0,0,1,0,0,0,1),
+					array(1,0,0,0,0,1,0,0,1),
+					array(1,0,0,0,0,0,1,0,1),
+					array(1,0,0,0,0,0,0,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),		
+				'O' => array(
+					array(0,0,0,1,1,1,0,0,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,1,1,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'P' => array(
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'Q' => array(
+					array(0,0,1,1,1,1,0,0,0),
+					array(0,1,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,1,0,0,1,0),
+					array(1,0,0,0,0,1,0,1,0),
+					array(0,1,0,0,0,0,1,0,0),
+					array(0,0,1,1,1,1,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'R' => array(
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,1,0,0,0,0,0,0),
+					array(1,0,0,1,0,0,0,0,0),
+					array(1,0,0,0,1,0,0,0,0),
+					array(1,0,0,0,0,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'S' => array(
+					array(0,0,1,1,1,1,1,1,1),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'T' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'U' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'V' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'W' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,1,0,0,0,1),
+					array(1,0,0,1,0,1,0,0,1),
+					array(1,0,1,0,0,0,1,0,1),
+					array(1,1,0,0,0,0,0,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'X' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'Y' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'Z' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,0,0,0,0,0),
+					array(0,0,1,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'1' => array(
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,1,0,0,0,0),
+					array(0,0,1,0,1,0,0,0,0),
+					array(0,1,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,1,1,1,1,1,1,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'2' => array(
+					array(0,0,0,1,1,1,0,0,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,0,0,0,0,0),
+					array(0,0,1,0,0,0,0,0,0),
+					array(0,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'3' => array(
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,1,1,0,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'4' => array(
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,1,0),
+					array(0,0,0,0,0,1,0,1,0),
+					array(0,0,0,0,1,0,0,1,0),
+					array(0,0,0,1,0,0,0,1,0),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'5' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'6' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,1,1,1,1,0,0),
+					array(1,0,1,0,0,0,0,1,0),
+					array(1,1,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'7' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'8' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'9' => array(
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,1),
+					array(0,0,1,1,1,1,1,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+			)
+		);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_plugin.php b/phpBB/includes/captcha/captcha_plugin.php
new file mode 100755
index 0000000000..08a149764c
--- /dev/null
+++ b/phpBB/includes/captcha/captcha_plugin.php
@@ -0,0 +1,97 @@
+<?
+
+interface phpbb_captcha_plugin
+{
+	/**
+	* Initiates the CAPTCHA to validate codes. 
+	* @param int $type the type as defined in constants.php
+	*/
+	function init($type);
+
+
+	/**
+	* Returns true if the captcha will work on the current install
+	*/
+	static function is_available();
+	
+	/**
+	* Returns the translated pretty name of the captcha.
+	*/
+	static function get_name();
+	
+	/**
+	* Returns the class name of the captcha.
+	*/
+	static function get_class_name();
+	
+	/**
+	* Returns an instance; does not have to be the same instance twice.
+	*/
+	static function get_instance();
+
+	/**
+	* Returns the HTML needed to embed the captcha in another template
+	*/
+	function get_template();
+	
+	
+	/**
+	* Delivers the image of image based captchas; not required for text/remote etc CAPTCHAs
+	*/
+	function execute();
+	
+	/**
+	* Returns the HTML needed to display a demo of the captcha
+	*/
+	function get_demo_template($id);
+	
+	
+	/**
+	* Delivers the demo image of image based captchas; not required for text/remote etc CAPTCHAs
+	*/
+	function execute_demo();
+	
+	/**
+	* Clears leftover entries in the database. 
+	*/
+	static function garbage_collect($type);
+	
+	
+	/**
+	* Clears all entries from the database if the CAPTCHA is replaced
+	*/
+	function uninstall();
+	
+	/**
+	* Sets up the CAPTCHA when it is selected in the ACP.
+	*/
+	function install();
+	
+	
+	/**
+	* Checks the captcha; returns false if the code was correct; a translated error string otherwise
+	*/
+	function validate();
+	
+	/**
+	* Prepares the captcha to ask a new question; required call on failed answers
+	*/
+	function reset();
+	
+	/**
+	* Displays the configuration options in the ACP
+	*/
+	function acp_page($id, &$module);
+		
+	/**
+	* Returns the entries for the hidden field array needed to preserve the current state.
+	*/
+	function get_hidden_fields();
+	
+	
+	/**
+	* Returns the number of solving attempts of the current user 
+	*/
+	function get_attempt_count();
+
+}
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
new file mode 100755
index 0000000000..f5c135dc74
--- /dev/null
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -0,0 +1,332 @@
+<?
+/**
+*
+* @package VC
+* @version $Id: $
+* @copyright (c) 2006 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+/**
+* This class holds the code shared by the two default 3.0 CAPTCHAs.
+*/
+class phpbb_default_captcha
+{
+	var $confirm_id;
+	var $confirm_code;
+	var $code;
+	var $seed;
+	var $type;
+	var $solved = false;
+
+
+	function init($type)
+	{
+		global $config, $db, $user;
+		
+		// read input
+		$this->confirm_id = request_var('confirm_id', '');
+		$this->confirm_code = request_var('confirm_code', '');
+		$refresh = request_var('refresh_vc', false) && $config['confirm_refresh'];
+		
+		$this->type = (int) $type;
+		
+		if (!strlen($this->confirm_id))
+		{
+			// we have no confirm ID, better get ready to display something
+			$this->generate_code();
+		}
+		else if ($refresh)
+		{
+			$this->regenerate_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 = new captcha();
+		$captcha->execute($this->code, $this->seed);
+	}
+	
+	
+	function execute()
+	{
+		if (empty($this->code))
+		{
+			if (!$this->load_code())
+			{
+				// invalid request, bail out
+				return false;
+			}
+		}
+		$captcha = new captcha();
+		$captcha->execute($this->code, $this->seed);
+	}
+	
+	
+	function get_template()
+	{
+		global $config, $user, $template, $phpEx, $phpbb_root_path;
+		
+		$template->set_filenames(array(
+			'captcha' => 'captcha_default.html')
+		);
+		
+		$template->assign_vars(array(
+			'CONFIRM_IMAGE'				=> append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type),
+			'CONFIRM_ID'				=> $this->confirm_id,			
+			'S_REFRESH'					=> (bool) $config['confirm_refresh'],
+
+		));
+	
+		return $template->assign_display('captcha');
+	}
+	
+	function get_demo_template($id)
+	{
+		global $config, $user, $template, $phpbb_admin_path, $phpEx;
+		
+		$template->set_filenames(array(
+			'captcha_demo' => 'captcha_default_acp_demo.html')
+		);
+		// acp_captcha has a delivery function; let's use it
+		$template->assign_vars(array(
+			'CONFIRM_IMAGE'		=> append_sid($phpbb_admin_path . 'index.' . $phpEx . '?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)
+		{
+			$hidden_fields['confirm_code'] = $this->confirm_code;
+		}
+		$hidden_fields['confirm_id'] = $this->confirm_id;
+		return $hidden_fields;
+	}
+	
+	function garbage_collect($type)
+	{
+		global $db, $config;
+
+		$sql = 'SELECT DISTINCT c.session_id
+				FROM ' . CONFIRM_TABLE . ' c
+				LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
+				WHERE s.session_id IS NULL' .
+					((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
+		$result = $db->sql_query($sql);
+
+		if ($row = $db->sql_fetchrow($result))
+		{
+			$sql_in = array();
+			do
+			{
+				$sql_in[] = (string) $row['session_id'];
+			}
+			while ($row = $db->sql_fetchrow($result));
+
+			if (sizeof($sql_in))
+			{
+				$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
+					WHERE ' . $db->sql_in_set('session_id', $sql_in);
+				$db->sql_query($sql);
+			}
+		}
+		$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'];
+		}
+		else
+		{
+			if ($this->check_code())
+			{
+				// $this->delete_code(); commented out to allow posting.php to repeat the question
+				$this->solved = true;
+			}
+			else
+			{
+				$error = $user->lang['CONFIRM_CODE_WRONG'];
+			}
+		}
+	
+		if (strlen($error))
+		{
+			// okay, inorect answer. Let's ask a new question
+			$this->generate_code();
+			return $error;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	
+	/**
+	* The old way to generate code, suitable for GD and non-GD. Resets the internal state.
+	*/
+	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));
+		$this->solved = false;
+		// compute $seed % 0x7fffffff
+		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
+
+		$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'confirm_id'	=> (string) $this->confirm_id,
+				'session_id'	=> (string) $user->session_id,
+				'confirm_type'	=> (int) $this->type,
+				'code'			=> (string) $this->code,
+				'seed'			=> (int) $this->seed)
+		);
+		$db->sql_query($sql);
+	}
+	
+	/**
+	* New Question, if desired.
+	*/
+	function regenerate_code()
+	{
+		global $db, $user;
+		
+		$this->code = gen_rand_string(mt_rand(5, 8));
+		$this->seed = hexdec(substr(unique_id(), 4, 10));
+		$this->solved = false;
+		// compute $seed % 0x7fffffff
+		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
+		$sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+				'code'			=> (string) $this->code,
+				'seed'			=> (int) $this->seed)) . '
+				WHERE
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
+				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+		$db->sql_query($sql);
+	}
+	
+	/**
+	* Look up everything we need for painting&checking. 
+	*/
+	function load_code()
+	{
+		global $db, $user;
+		$sql = 'SELECT code, seed
+				FROM ' . CONFIRM_TABLE . "
+				WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
+				AND session_id = '" . $db->sql_escape($user->session_id) . "'
+					AND confirm_type = " . $this->type;
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		if ($row)
+		{
+			$this->code = $row['code'];
+			$this->seed = $row['seed'];
+			return true;
+		}
+		return false;
+		
+	}
+	
+	function check_code()
+	{
+		global $db;
+		
+		if (empty($this->code))
+		{
+			if (!$this->load_code())
+			{
+				return false;
+			}
+		}
+		return (strcasecmp($this->code, $this->confirm_code) === 0);
+	}
+	
+	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) . "'
+					AND confirm_type = " . $this->type;
+		$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();
+	}
+	
+}
+
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
new file mode 100755
index 0000000000..850794e133
--- /dev/null
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -0,0 +1,122 @@
+<?
+/**
+*
+* @package VC
+* @version $Id: $
+* @copyright (c) 2006 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/** 
+* Placeholder for autoload
+*/
+if (!class_exists('phpbb_default_captcha'))
+{
+	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+}
+
+class phpbb_captcha_gd extends phpbb_default_captcha
+{
+
+	function phpbb_captcha_gd()
+	{
+		global $phpbb_root_path, $phpEx;
+		if (!class_exists('captcha'))
+		{
+			include_once($phpbb_root_path . "includes/captcha/captcha_gd." . $phpEx);
+		}
+	}
+	
+	function get_instance()
+	{
+		return new phpbb_captcha_gd();
+	}
+
+	function is_available()
+	{
+		return (@extension_loaded('gd') || can_load_dll('gd'));
+	}
+	
+	function get_name()
+	{
+		return 'CAPTCHA_GD';
+	}
+	
+	function get_class_name()
+	{
+		return 'phpbb_captcha_gd';
+	}
+		
+	function acp_page($id, &$module)
+	{
+		global $db, $user, $auth, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang('acp/board');
+		$captcha_vars = array(
+			'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
+			'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
+			'captcha_gd_foreground_noise'	=> 'CAPTCHA_GD_FOREGROUND_NOISE',
+			'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED',
+			'captcha_gd_wave'				=> 'CAPTCHA_GD_WAVE',
+			'captcha_gd_3d_noise'			=> 'CAPTCHA_GD_3D_NOISE',
+			'captcha_gd_fonts'				=> 'CAPTCHA_GD_FONTS',
+
+		);
+
+		$config_vars = array(
+			'enable_confirm'		=> 'REG_ENABLE',
+			'enable_post_confirm'	=> 'POST_ENABLE',
+			'confirm_refresh'		=> 'CONFIRM_REFRESH',
+			'captcha_gd'			=> 'CAPTCHA_GD',
+		);
+
+
+		$module->tpl_name = 'captcha_gd_acp';
+		$module->page_title = 'ACP_VC_SETTINGS';
+		$form_key = 'acp_captcha';
+		add_form_key($form_key);
+
+		$submit = request_var('submit', '');
+
+		if ($submit && check_form_key($form_key))
+		{
+			$captcha_vars = array_keys($captcha_vars);
+			foreach ($captcha_vars as $captcha_var)
+			{
+				$value = request_var($captcha_var, 0);
+				if ($value >= 0)
+				{
+					set_config($captcha_var, $value);
+				}
+			}
+			trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action));
+		}
+		else if ($submit)
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+		}
+		else
+		{
+			foreach ($captcha_vars as $captcha_var => $template_var)
+			{
+				$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var];
+				$template->assign_var($template_var, $var);
+			}
+			$template->assign_vars(array(
+				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
+				'CAPTCHA_NAME'		=> $this->get_class_name(),
+			));
+
+		}
+	}
+}
+
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
new file mode 100755
index 0000000000..769867655c
--- /dev/null
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* @package VC
+* @version $Id$
+* @copyright (c) 2006 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Placeholder for autoload
+*/
+if (!class_exists('captcha_abstract'))
+{
+	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
+}
+
+class phpbb_captcha_gd_wave extends phpbb_default_captcha
+{
+
+	function phpbb_captcha_gd_wave()
+	{
+		global $phpbb_root_path, $phpEx;
+		if (!class_exists('captcha'))
+		{
+			include_once($phpbb_root_path . 'includes/captcha/captcha_gd_wave.' . $phpEx);
+		}
+	}
+
+	function get_instance()
+	{
+		return new phpbb_captcha_gd_wave();
+	}
+
+	function is_available()
+	{
+		return (@extension_loaded('gd') || can_load_dll('gd'));
+	}
+
+	function get_name()
+	{
+		return 'CAPTCHA_GD_WAVE';
+	}
+
+	function get_class_name()
+	{
+		return 'phpbb_captcha_gd_wave';
+	}
+
+	function acp_page($id, &$module)
+	{
+		global $config, $db, $template, $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_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
new file mode 100755
index 0000000000..c5a32137d7
--- /dev/null
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -0,0 +1,68 @@
+<?
+/**
+*
+* @package VC
+* @version $Id: $
+* @copyright (c) 2006 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/** 
+* Placeholder for autoload
+*/
+if (!class_exists('phpbb_default_captcha'))
+{
+	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+}
+
+class phpbb_captcha_nogd extends phpbb_default_captcha
+{
+
+	function phpbb_captcha_nogd()
+	{
+		global $phpbb_root_path, $phpEx;
+		if (!class_exists('captcha'))
+		{
+			include_once($phpbb_root_path . "includes/captcha/captcha_non_gd." . $phpEx);
+		}
+	}
+	
+	function get_instance()
+	{
+		return new phpbb_captcha_nogd();
+	}
+
+	function is_available()
+	{
+		return true;
+	}
+	
+	function get_name()
+	{
+		global $user;
+		
+		return 'CAPTCHA_NO_GD'; 
+	}
+	
+	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));
+	}
+}
+
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
new file mode 100644
index 0000000000..7a3c406324
--- /dev/null
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -0,0 +1,312 @@
+<?
+/**
+*
+* @package VC
+* @version $Id: $
+* @copyright (c) 2006 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (!class_exists('phpbb_default_captcha'))
+{
+	// we need the classic captcha code for tracking solutions and attempts
+	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+}
+
+class phpbb_recaptcha extends phpbb_default_captcha
+{
+	var $recaptcha_server = 'http://api.recaptcha.net';
+	var $recaptcha_verify_server = 'api-verify.recaptcha.net';
+	var $challenge;
+	var $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', '');
+	}
+	
+	
+	function get_instance()
+	{
+		return new phpbb_recaptcha();
+	}
+
+	function is_available()
+	{
+		global $config, $user; 
+		$user->add_lang('recaptcha');
+		return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
+	}
+	
+	function get_name()
+	{
+		return 'CAPTCHA_RECAPTCHA';
+	}
+	
+	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',
+		);
+
+		$module->tpl_name = 'captcha_recaptcha_acp';
+		$module->page_title = 'ACP_VC_SETTINGS';
+		$form_key = 'acp_captcha';
+		add_form_key($form_key);
+
+		$submit = request_var('submit', '');
+
+		if ($submit && check_form_key($form_key))
+		{
+			$captcha_vars = array_keys($captcha_vars);
+			foreach ($captcha_vars as $captcha_var)
+			{
+				$value = request_var($captcha_var, '');
+				if ($value)
+				{
+					set_config($captcha_var, $value);
+				}
+			}
+			trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action));
+		}
+		else if ($submit)
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+		}
+		else
+		{
+			foreach ($captcha_vars as $captcha_var => $template_var)
+			{
+				$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, '') : ((isset($config[$captcha_var])) ? $config[$captcha_var] : '');
+				$template->assign_var($template_var, $var);
+			}
+			$template->assign_vars(array(
+				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
+				'CAPTCHA_NAME'		=> $this->get_class_name(),
+			));
+
+		}
+	}
+	
+	
+	// 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'			=> $this->recaptcha_server,
+			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
+			'RECAPTCHA_ERRORGET'		=> '',
+			'S_RECAPTCHA_AVAILABLE'		=> $this->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)
+		{
+			$hidden_fields['confirm_code'] = $this->confirm_code;
+		}
+		$hidden_fields['confirm_id'] = $this->confirm_id;
+		return $hidden_fields;
+	}
+		
+	function uninstall()
+	{
+		self::garbage_collect(0);
+	}
+	
+	function install()
+	{
+		return;
+	}
+	
+	function validate()
+	{
+		if (!parent::validate())
+		{
+			return false;
+		}
+		else
+		{
+			return $this->recaptcha_check_answer();
+		}
+	}
+	
+
+// Code from here on is based on recaptchalib.php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ *	- Documentation and latest version
+ *		  http://recaptcha.net/plugins/php/
+ *	- Get a reCAPTCHA API Key
+ *		  http://recaptcha.net/api/getkey
+ *	- Discussion group
+ *		  http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ *   Mike Crawford
+ *   Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+	/**
+	 * Submits an HTTP POST to a reCAPTCHA server
+	 * @param string $host
+	 * @param string $path
+	 * @param array $data
+	 * @param int port
+	 * @return array response
+	 */
+	function _recaptcha_http_post($host, $path, $data, $port = 80) 
+	{
+		$req = $this->_recaptcha_qsencode ($data);
+
+		$http_request  = "POST $path HTTP/1.0\r\n";
+		$http_request .= "Host: $host\r\n";
+		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= "User-Agent: reCAPTCHA/PHP/phpBB\r\n";
+		$http_request .= "\r\n";
+		$http_request .= $req;
+
+		$response = '';
+		if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+				die ('Could not open socket');
+		}
+
+		fwrite($fs, $http_request);
+
+		while ( !feof($fs) )
+				$response .= fgets($fs, 1160); // One TCP-IP packet
+		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
+	  */
+	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) 
+		{
+				return $user->lang['RECAPTCHA_INCORRECT'];
+		}
+
+		$response = $this->_recaptcha_http_post ($this->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 
+		{
+			if ($answers[1] === 'incorrect-captcha-sol')
+			{
+				return $user->lang['RECAPTCHA_INCORRECT'];
+			}
+		}
+	}
+	
+		/**
+	 * Encodes the given data into a query string format
+	 * @param $data - array of string elements to be encoded
+	 * @return string - encoded request
+	 */
+	function _recaptcha_qsencode ($data)
+	{
+		$req = '';
+		foreach ( $data as $key => $value )
+		{
+			$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+		}
+		// Cut the last '&'
+		$req=substr($req,0,strlen($req)-1);
+		return $req;
+	}
+}
+
-- 
cgit v1.2.1


From a975f8454aea77f1e42332b8fb52e66a77415e76 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Jun 2009 13:30:01 +0000
Subject: Fix up and tidy :)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9532 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_factory.php                 |  8 +++++---
 phpBB/includes/captcha/captcha_gd_wave.php                 | 12 ++++++------
 phpBB/includes/captcha/captcha_plugin.php                  |  6 ++++--
 phpBB/includes/captcha/plugins/captcha_abstract.php        |  7 ++++---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 14 ++++++++------
 .../captcha/plugins/phpbb_captcha_gd_wave_plugin.php       |  4 +++-
 .../includes/captcha/plugins/phpbb_captcha_nogd_plugin.php | 12 +++++++-----
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php  |  8 ++++----
 8 files changed, 41 insertions(+), 30 deletions(-)
 mode change 100755 => 100644 phpBB/includes/captcha/captcha_factory.php
 mode change 100755 => 100644 phpBB/includes/captcha/captcha_gd_wave.php
 mode change 100755 => 100644 phpBB/includes/captcha/captcha_plugin.php
 mode change 100755 => 100644 phpBB/includes/captcha/plugins/captcha_abstract.php
 mode change 100755 => 100644 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
 mode change 100755 => 100644 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
 mode change 100755 => 100644 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
old mode 100755
new mode 100644
index e6f56172ec..fbe615a043
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -1,8 +1,8 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
+* @version $Id$
 * @copyright (c) 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
@@ -89,4 +89,6 @@ class phpbb_captcha_factory
 
 		return $captchas;
 	}
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
old mode 100755
new mode 100644
index 0356538a4d..41dfcdd9d4
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -2,15 +2,15 @@
 /** 
 *
 * @package VC
-* @version $Id: captcha_gd.php,v 1.19 2007/01/26 16:07:43 acydburn Exp $
+* @version $Id$
 * @copyright (c) 2006 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 */
-
-
-/** 
-Wave3D CAPTCHA by Robert Hetzler
+
+
+/** 
+* Wave3D CAPTCHA by Robert Hetzler
 */
 class captcha
 {
@@ -836,7 +836,7 @@ class captcha
 				),
 			)
 		);
-	}
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_plugin.php b/phpBB/includes/captcha/captcha_plugin.php
old mode 100755
new mode 100644
index 08a149764c..7c601caa93
--- a/phpBB/includes/captcha/captcha_plugin.php
+++ b/phpBB/includes/captcha/captcha_plugin.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 interface phpbb_captcha_plugin
 {
@@ -94,4 +94,6 @@ interface phpbb_captcha_plugin
 	*/
 	function get_attempt_count();
 
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
old mode 100755
new mode 100644
index f5c135dc74..f88d82b2a0
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -1,9 +1,9 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -330,3 +330,4 @@ class phpbb_default_captcha
 	
 }
 
+?>
\ 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
old mode 100755
new mode 100644
index 850794e133..5b3c09f32d
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -1,12 +1,13 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+
 /**
 * @ignore
 */
@@ -20,18 +21,18 @@ if (!defined('IN_PHPBB'))
 */
 if (!class_exists('phpbb_default_captcha'))
 {
-	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 class phpbb_captcha_gd extends phpbb_default_captcha
 {
-
 	function phpbb_captcha_gd()
 	{
 		global $phpbb_root_path, $phpEx;
+
 		if (!class_exists('captcha'))
 		{
-			include_once($phpbb_root_path . "includes/captcha/captcha_gd." . $phpEx);
+			include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx);
 		}
 	}
 	
@@ -120,3 +121,4 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 	}
 }
 
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
old mode 100755
new mode 100644
index 769867655c..38e5aabedd
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -3,10 +3,11 @@
 *
 * @package VC
 * @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+
 /**
 * @ignore
 */
@@ -29,6 +30,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 	function phpbb_captcha_gd_wave()
 	{
 		global $phpbb_root_path, $phpEx;
+
 		if (!class_exists('captcha'))
 		{
 			include_once($phpbb_root_path . 'includes/captcha/captcha_gd_wave.' . $phpEx);
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
old mode 100755
new mode 100644
index c5a32137d7..8df11bfe8a
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -1,12 +1,13 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+
 /**
 * @ignore
 */
@@ -20,7 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 if (!class_exists('phpbb_default_captcha'))
 {
-	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 class phpbb_captcha_nogd extends phpbb_default_captcha
@@ -29,9 +30,10 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 	function phpbb_captcha_nogd()
 	{
 		global $phpbb_root_path, $phpEx;
+
 		if (!class_exists('captcha'))
 		{
-			include_once($phpbb_root_path . "includes/captcha/captcha_non_gd." . $phpEx);
+			include_once($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx);
 		}
 	}
 	
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 7a3c406324..42ca25ae54 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -1,9 +1,9 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 if (!class_exists('phpbb_default_captcha'))
 {
 	// we need the classic captcha code for tracking solutions and attempts
-	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 class phpbb_recaptcha extends phpbb_default_captcha
-- 
cgit v1.2.1


From 710604caa328be820d6240cb9cfccf568bc874d2 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Jun 2009 15:09:59 +0000
Subject: Fix DOS line endings, evil<3 this doesn't count as spam you told me
 to :P

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9539 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_gd_wave.php | 1682 ++++++++++++++--------------
 1 file changed, 841 insertions(+), 841 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
index 41dfcdd9d4..d911d574f7 100644
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -1,842 +1,842 @@
-<?php
-/** 
-*
-* @package VC
-* @version $Id$
-* @copyright (c) 2006 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-*
-*/
-
-
-/** 
-* Wave3D CAPTCHA by Robert Hetzler
-*/
-class captcha
-{
-	var $width		= 360;
-	var $height		= 96;
-
-	function execute($code, $seed)
-	{
-		global $starttime;
-		
-		// seed the random generator
-		mt_srand($seed);
-	
-		// set height and width
-		$img_x = $this->width;
-		$img_y = $this->height;
-
-		// Generate image
-		$img	= imagecreatetruecolor($img_x, $img_y);
-		$x_grid = mt_rand(6, 10);
-		$y_grid = mt_rand(6, 10);
- 
-		// Ok, so lets cut to the chase. We could accurately represent this in 3d and
-		// do all the appropriate linear transforms. my questions is... why bother?
-		// The computational overhead is unnecessary when you consider the simple fact:
-		// we're not here to accurately represent a model, but to just show off some random-ish
-		// polygons
-
-		// Conceive of 3 spaces.
-		// 1) planar-space (discrete "pixel" grid)
-		// 2) 3-space. (planar-space with z/height aspect)
-		// 3) image space (pixels on the screen)
-		// resolution of the planar-space we're embedding the text code in
-		$plane_x	= 100;
-		$plane_y	= 30;
-
-		$subdivision_factor	= 3;
-		// $box is the 4 points in img_space that correspond to the corners of the plane in 3-space
-		$box = array(
-			'upper_left'	=> array(
-				'x' => mt_rand(5, 15),
-				'y' => mt_rand(10, 15)
-			), 
-			'upper_right'	=> array(
-				'x' => mt_rand($img_x - 35, $img_x - 19),
-				'y' => mt_rand(10, 17)
-			), 
-			'lower_left'	=> array(
-				'x' => mt_rand($img_x - 5, $img_x - 45),
-				'y' => mt_rand($img_y - 0, $img_y - 15)
-			), 
-		);
-		$box['lower_right'] = array(
-				'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
-				'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
-		);
-
-
-		// TODO
-		$background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255));
-		imagefill($img, 0, 0, $background);
-		$black = imagecolorallocate($img, 0, 0, 0);
-
-		$random = array();
-		$fontcolors = array();
-
-		for ($i = 0; $i < 15; ++$i)
-		{
-			$random[$i] = imagecolorallocate($img, mt_rand(120, 255), mt_rand(120, 255), mt_rand(120, 255));
-		}
-
-		$fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120));
-		
- 		$colors = array();
-
-		$minr = mt_rand(20, 30);
-		$ming = mt_rand(20, 30);
-		$minb = mt_rand(20, 30);
-
-		$maxr = mt_rand(150, 230);
-		$maxg = mt_rand(150, 230);
-		$maxb = mt_rand(150, 230);
-
-		for ($i = -30; $i <= 30; ++$i)
-		{
-			$coeff1 = ($i + 12) / 45;
-			$coeff2 = 1 - $coeff1;
-			$colors[$i] = imagecolorallocate($img, ($coeff2 * $maxr) + ($coeff1 * $minr), ($coeff2 * $maxg) + ($coeff1 * $ming), ($coeff2 * $maxb) + ($coeff1 * $minb));
-		}
-
-		// $img_buffer is the last row of 3-space positions (converted to img-space), cached
-		// (using this means we don't need to recalculate all 4 positions for each new polygon,
-		// merely the newest point that we're adding, which is then cached.
-		$img_buffer = array(array(), array());
-
-		// In image-space, the x- and y-offset necessary to move one unit in the x-direction in planar-space
-		$dxx = ($box['upper_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_x);
-		$dxy = ($box['upper_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_x);
-
-		// In image-space, the x- and y-offset necessary to move one unit in the y-direction in planar-space
-		$dyx = ($box['lower_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_y);
-		$dyy = ($box['lower_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_y);
-
-		// Initial captcha-letter offset in planar-space
-		$plane_offset_x = mt_rand(3, 8);
-		$plane_offset_y = mt_rand( 12, 15);
-
-		// character map
-		$map = $this->captcha_bitmaps();
-
-		// matrix
-		$plane = array();
-
-		// for each character, we'll silkscreen it into our boolean pixel plane
-		for ($c = 0, $code_num = strlen($code); $c < $code_num; ++$c)
-		{
-			$letter = $code[$c];
-
-			for ($x = $map['width'] - 1; $x >= 0; --$x)
-			{
-				for ($y = $map['height'] - 1; $y >= 0; --$y)
-				{
-					if ($map['data'][$letter][$y][$x])
-					{
-						$plane[$y + $plane_offset_y + (($c & 1) ? 1 : -1)][$x + $plane_offset_x] = true;
-					}
-				}
-			}
-			$plane_offset_x += 11;
-		}
-
-		// calculate our first buffer, we can't actually draw polys with these yet
-		// img_pos_prev == screen x,y location to our immediate left.
-		// img_pos_cur == current screen x,y location
-		// we calculate screen position of our
-		// current cell based on the difference from the previous cell
-		// rather than recalculating from absolute coordinates
-		// What we cache into the $img_buffer contains the raised text coordinates.
-		$img_pos_prev	= $img_buffer[0][0] = array($box['upper_left']['x'], $box['upper_left']['y']);
-		$cur_height		= $prev_height = $this->wave_height(0, 0, $subdivision_factor);
-		$full_x			= $plane_x * $subdivision_factor;
-		$full_y			= $plane_y * $subdivision_factor;
-
-		for ($x = 1; $x <= $full_x; ++$x)
-		{
-			$cur_height		= $this->wave_height($x, 0, $subdivision_factor);
-			$offset			= $cur_height - $prev_height;
-			$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-									
-			$img_buffer[0][$x]	= $img_pos_cur;
-			$img_pos_prev		= $img_pos_cur;
-			$prev_height		= $cur_height;
-		}
-
-		for ($y = 1; $y <= $full_y; ++$y)
-		{
-			// swap buffers
-			$buffer_cur		= $y & 1;
-			$buffer_prev	= 1 - $buffer_cur;
-			
-			$prev_height	= $this->wave_height(0, $y, $subdivision_factor);
-			$offset			= $prev_height - $this->wave_height(0, $y - 1, $subdivision_factor);
-			$img_pos_cur	= array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1));
-
-			// make sure we don't try to write off the page
-			$img_pos_prev	= $img_pos_cur;
-
-			$img_buffer[$buffer_cur][0]	= $img_pos_cur;
-			
-			for ($x = 1; $x <= $full_x; ++$x)
-			{
-				$cur_height		= $this->wave_height($x, $y, $subdivision_factor) + $this->grid_height($x, $y, 1, $x_grid, $y_grid);
-
-				// height is a z-factor, not a y-factor
-				$offset			= $cur_height - $prev_height;
-				$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-
-				// height is float, index it to an int, get closest color
-				$color			= $colors[intval($cur_height)];
-				$img_pos_prev	= $img_pos_cur;
-				$prev_height	= $cur_height;
-
-				$y_index_old = intval(($y - 1) / $subdivision_factor);
-				$y_index_new = intval($y / $subdivision_factor);
-				$x_index_old = intval(($x - 1) / $subdivision_factor);
-				$x_index_new = intval($x / $subdivision_factor);
-
-				if (!empty($plane[$y_index_new][$x_index_new]))
-				{
-					$img_pos_cur[1]	+= $this->wave_height($x, $y, $subdivision_factor, 1) - 30 - $cur_height;
-					$color			= $colors[20];
-				}
-				$img_pos_cur[1] = min($img_pos_cur[1], $img_y - 1);
-				$img_buffer[$buffer_cur][$x] = $img_pos_cur;
-
-				// Smooth the edges as much as possible by having not more than one low<->high traingle per square
-				// Otherwise, just
-				$diag_down	= (empty($plane[$y_index_old][$x_index_old]) == empty($plane[$y_index_new][$x_index_new]));
-				$diag_up	= (empty($plane[$y_index_old][$x_index_new]) == empty($plane[$y_index_new][$x_index_old]));
-
-				// natural switching
-				$mode = ($x + $y) & 1;
-
-				// override if it requires it
-				if ($diag_down != $diag_up)
-				{
-					$mode = $diag_up;
-				}
-
-				if ($mode)
-				{
-					//		+-/			  /
-					// 1	|/		2	 /|
-					//		/			/-+
-					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x]);
-					$poly2 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_cur][$x], $img_buffer[$buffer_prev][$x]);
-				}
-				else
-				{
-					//		\			\-+
-					// 1	|\		2	 \|
-					//		+-\			  \
-					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_cur][$x]);
-					$poly2 = array_merge($img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x], $img_buffer[$buffer_cur][$x]);
-				}
-
-				imagefilledpolygon($img, $poly1, 3, $color);
-				imagefilledpolygon($img, $poly2, 3, $color);
-			}
-		}
-
-		// Output image
-		header('Content-Type: image/png');
-		header('Cache-control: no-cache, no-store');
-		//$mtime = explode(' ', microtime());
-		//$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-		//echo $totaltime . "<br />\n";
-		//echo memory_get_usage() - $tmp;
-		imagepng($img);
-		imagedestroy($img);
-	}
-
-	function wave_height($x, $y, $factor = 1, $tweak = 0.7)
-	{
-		// stretch the wave. TODO: pretty it up
-		$x = $x/5 + 180;
-		$y = $y/4;
-		return ((sin($x / (3 * $factor)) + sin($y / (3 * $factor))) * 10 * $tweak);
-	}
-
-	function grid_height($x, $y, $factor = 1, $x_grid, $y_grid)
-	{
-		return ((!($x % ($x_grid * $factor)) || !($y % ($y_grid * $factor))) ? 3 : 0);
-	}
-
-	function captcha_bitmaps()
-	{
-		return array(
-			'width'		=> 9,
-			'height'	=> 13,
-			'data'		=> array(
-				'A' => array(
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'B' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'C' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'D' => array(
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'E' => array(
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'F' => array(
-					array(0,0,1,1,1,1,1,1,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'G' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'H' => array(
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'I' => array(
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'J' => array(
-					array(0,0,0,0,0,0,1,1,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'K' => array(
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,1,0,0,0,0,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'L' => array(
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'M' => array(
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,1,0,0,0,1,1,0),
-					array(0,1,0,1,0,1,0,1,0),
-					array(0,1,0,0,1,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'N' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,1,0,0,0,0,0,0,1),
-					array(1,0,1,0,0,0,0,0,1),
-					array(1,0,0,1,0,0,0,0,1),
-					array(1,0,0,0,1,0,0,0,1),
-					array(1,0,0,0,0,1,0,0,1),
-					array(1,0,0,0,0,0,1,0,1),
-					array(1,0,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),		
-				'O' => array(
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'P' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Q' => array(
-					array(0,0,1,1,1,1,0,0,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,1,0,0,1,0),
-					array(1,0,0,0,0,1,0,1,0),
-					array(0,1,0,0,0,0,1,0,0),
-					array(0,0,1,1,1,1,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'R' => array(
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(1,1,1,1,1,1,0,0,0),
-					array(1,0,1,0,0,0,0,0,0),
-					array(1,0,0,1,0,0,0,0,0),
-					array(1,0,0,0,1,0,0,0,0),
-					array(1,0,0,0,0,1,0,0,0),
-					array(1,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'S' => array(
-					array(0,0,1,1,1,1,1,1,1),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(1,1,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'T' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'U' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'V' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'W' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,1,0,0,0,1),
-					array(1,0,0,1,0,1,0,0,1),
-					array(1,0,1,0,0,0,1,0,1),
-					array(1,1,0,0,0,0,0,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'X' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Y' => array(
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,0,0,1,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'Z' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,0,0,0,0),
-					array(0,0,1,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'1' => array(
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,1,0,0,0,0),
-					array(0,0,1,0,1,0,0,0,0),
-					array(0,1,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'2' => array(
-					array(0,0,0,1,1,1,0,0,0),
-					array(0,0,1,0,0,0,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,1,0,0,0,0,0),
-					array(0,0,1,0,0,0,0,0,0),
-					array(0,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'3' => array(
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'4' => array(
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,1,0),
-					array(0,0,0,0,0,1,0,1,0),
-					array(0,0,0,0,1,0,0,1,0),
-					array(0,0,0,1,0,0,0,1,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,1,1,1,1,1,1,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'5' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(0,1,0,0,0,0,0,0,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'6' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,0,0,0,0,0,0),
-					array(1,0,0,1,1,1,1,0,0),
-					array(1,0,1,0,0,0,0,1,0),
-					array(1,1,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'7' => array(
-					array(1,1,1,1,1,1,1,1,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,1,0),
-					array(0,0,0,0,0,0,1,0,0),
-					array(0,0,0,0,0,1,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,1,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'8' => array(
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,1,0,0,0,0,0,1,0),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(1,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,0),
-					array(0,0,1,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-				'9' => array(
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,1,1),
-					array(0,0,1,1,1,1,1,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,0,0,0,0,0,0,0,1),
-					array(0,1,0,0,0,0,0,0,1),
-					array(0,0,1,0,0,0,0,1,0),
-					array(0,0,0,1,1,1,1,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-					array(0,0,0,0,0,0,0,0,0),
-				),
-			)
-		);
-	}
-}
-
+<?php
+/** 
+*
+* @package VC
+* @version $Id$
+* @copyright (c) 2006 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+
+/** 
+* Wave3D CAPTCHA by Robert Hetzler
+*/
+class captcha
+{
+	var $width		= 360;
+	var $height		= 96;
+
+	function execute($code, $seed)
+	{
+		global $starttime;
+		
+		// seed the random generator
+		mt_srand($seed);
+	
+		// set height and width
+		$img_x = $this->width;
+		$img_y = $this->height;
+
+		// Generate image
+		$img	= imagecreatetruecolor($img_x, $img_y);
+		$x_grid = mt_rand(6, 10);
+		$y_grid = mt_rand(6, 10);
+ 
+		// Ok, so lets cut to the chase. We could accurately represent this in 3d and
+		// do all the appropriate linear transforms. my questions is... why bother?
+		// The computational overhead is unnecessary when you consider the simple fact:
+		// we're not here to accurately represent a model, but to just show off some random-ish
+		// polygons
+
+		// Conceive of 3 spaces.
+		// 1) planar-space (discrete "pixel" grid)
+		// 2) 3-space. (planar-space with z/height aspect)
+		// 3) image space (pixels on the screen)
+		// resolution of the planar-space we're embedding the text code in
+		$plane_x	= 100;
+		$plane_y	= 30;
+
+		$subdivision_factor	= 3;
+		// $box is the 4 points in img_space that correspond to the corners of the plane in 3-space
+		$box = array(
+			'upper_left'	=> array(
+				'x' => mt_rand(5, 15),
+				'y' => mt_rand(10, 15)
+			), 
+			'upper_right'	=> array(
+				'x' => mt_rand($img_x - 35, $img_x - 19),
+				'y' => mt_rand(10, 17)
+			), 
+			'lower_left'	=> array(
+				'x' => mt_rand($img_x - 5, $img_x - 45),
+				'y' => mt_rand($img_y - 0, $img_y - 15)
+			), 
+		);
+		$box['lower_right'] = array(
+				'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
+				'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
+		);
+
+
+		// TODO
+		$background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255));
+		imagefill($img, 0, 0, $background);
+		$black = imagecolorallocate($img, 0, 0, 0);
+
+		$random = array();
+		$fontcolors = array();
+
+		for ($i = 0; $i < 15; ++$i)
+		{
+			$random[$i] = imagecolorallocate($img, mt_rand(120, 255), mt_rand(120, 255), mt_rand(120, 255));
+		}
+
+		$fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120));
+		
+ 		$colors = array();
+
+		$minr = mt_rand(20, 30);
+		$ming = mt_rand(20, 30);
+		$minb = mt_rand(20, 30);
+
+		$maxr = mt_rand(150, 230);
+		$maxg = mt_rand(150, 230);
+		$maxb = mt_rand(150, 230);
+
+		for ($i = -30; $i <= 30; ++$i)
+		{
+			$coeff1 = ($i + 12) / 45;
+			$coeff2 = 1 - $coeff1;
+			$colors[$i] = imagecolorallocate($img, ($coeff2 * $maxr) + ($coeff1 * $minr), ($coeff2 * $maxg) + ($coeff1 * $ming), ($coeff2 * $maxb) + ($coeff1 * $minb));
+		}
+
+		// $img_buffer is the last row of 3-space positions (converted to img-space), cached
+		// (using this means we don't need to recalculate all 4 positions for each new polygon,
+		// merely the newest point that we're adding, which is then cached.
+		$img_buffer = array(array(), array());
+
+		// In image-space, the x- and y-offset necessary to move one unit in the x-direction in planar-space
+		$dxx = ($box['upper_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_x);
+		$dxy = ($box['upper_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_x);
+
+		// In image-space, the x- and y-offset necessary to move one unit in the y-direction in planar-space
+		$dyx = ($box['lower_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_y);
+		$dyy = ($box['lower_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_y);
+
+		// Initial captcha-letter offset in planar-space
+		$plane_offset_x = mt_rand(3, 8);
+		$plane_offset_y = mt_rand( 12, 15);
+
+		// character map
+		$map = $this->captcha_bitmaps();
+
+		// matrix
+		$plane = array();
+
+		// for each character, we'll silkscreen it into our boolean pixel plane
+		for ($c = 0, $code_num = strlen($code); $c < $code_num; ++$c)
+		{
+			$letter = $code[$c];
+
+			for ($x = $map['width'] - 1; $x >= 0; --$x)
+			{
+				for ($y = $map['height'] - 1; $y >= 0; --$y)
+				{
+					if ($map['data'][$letter][$y][$x])
+					{
+						$plane[$y + $plane_offset_y + (($c & 1) ? 1 : -1)][$x + $plane_offset_x] = true;
+					}
+				}
+			}
+			$plane_offset_x += 11;
+		}
+
+		// calculate our first buffer, we can't actually draw polys with these yet
+		// img_pos_prev == screen x,y location to our immediate left.
+		// img_pos_cur == current screen x,y location
+		// we calculate screen position of our
+		// current cell based on the difference from the previous cell
+		// rather than recalculating from absolute coordinates
+		// What we cache into the $img_buffer contains the raised text coordinates.
+		$img_pos_prev	= $img_buffer[0][0] = array($box['upper_left']['x'], $box['upper_left']['y']);
+		$cur_height		= $prev_height = $this->wave_height(0, 0, $subdivision_factor);
+		$full_x			= $plane_x * $subdivision_factor;
+		$full_y			= $plane_y * $subdivision_factor;
+
+		for ($x = 1; $x <= $full_x; ++$x)
+		{
+			$cur_height		= $this->wave_height($x, 0, $subdivision_factor);
+			$offset			= $cur_height - $prev_height;
+			$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
+									
+			$img_buffer[0][$x]	= $img_pos_cur;
+			$img_pos_prev		= $img_pos_cur;
+			$prev_height		= $cur_height;
+		}
+
+		for ($y = 1; $y <= $full_y; ++$y)
+		{
+			// swap buffers
+			$buffer_cur		= $y & 1;
+			$buffer_prev	= 1 - $buffer_cur;
+			
+			$prev_height	= $this->wave_height(0, $y, $subdivision_factor);
+			$offset			= $prev_height - $this->wave_height(0, $y - 1, $subdivision_factor);
+			$img_pos_cur	= array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1));
+
+			// make sure we don't try to write off the page
+			$img_pos_prev	= $img_pos_cur;
+
+			$img_buffer[$buffer_cur][0]	= $img_pos_cur;
+			
+			for ($x = 1; $x <= $full_x; ++$x)
+			{
+				$cur_height		= $this->wave_height($x, $y, $subdivision_factor) + $this->grid_height($x, $y, 1, $x_grid, $y_grid);
+
+				// height is a z-factor, not a y-factor
+				$offset			= $cur_height - $prev_height;
+				$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
+
+				// height is float, index it to an int, get closest color
+				$color			= $colors[intval($cur_height)];
+				$img_pos_prev	= $img_pos_cur;
+				$prev_height	= $cur_height;
+
+				$y_index_old = intval(($y - 1) / $subdivision_factor);
+				$y_index_new = intval($y / $subdivision_factor);
+				$x_index_old = intval(($x - 1) / $subdivision_factor);
+				$x_index_new = intval($x / $subdivision_factor);
+
+				if (!empty($plane[$y_index_new][$x_index_new]))
+				{
+					$img_pos_cur[1]	+= $this->wave_height($x, $y, $subdivision_factor, 1) - 30 - $cur_height;
+					$color			= $colors[20];
+				}
+				$img_pos_cur[1] = min($img_pos_cur[1], $img_y - 1);
+				$img_buffer[$buffer_cur][$x] = $img_pos_cur;
+
+				// Smooth the edges as much as possible by having not more than one low<->high traingle per square
+				// Otherwise, just
+				$diag_down	= (empty($plane[$y_index_old][$x_index_old]) == empty($plane[$y_index_new][$x_index_new]));
+				$diag_up	= (empty($plane[$y_index_old][$x_index_new]) == empty($plane[$y_index_new][$x_index_old]));
+
+				// natural switching
+				$mode = ($x + $y) & 1;
+
+				// override if it requires it
+				if ($diag_down != $diag_up)
+				{
+					$mode = $diag_up;
+				}
+
+				if ($mode)
+				{
+					//		+-/			  /
+					// 1	|/		2	 /|
+					//		/			/-+
+					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x]);
+					$poly2 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_cur][$x], $img_buffer[$buffer_prev][$x]);
+				}
+				else
+				{
+					//		\			\-+
+					// 1	|\		2	 \|
+					//		+-\			  \
+					$poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_cur][$x]);
+					$poly2 = array_merge($img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x], $img_buffer[$buffer_cur][$x]);
+				}
+
+				imagefilledpolygon($img, $poly1, 3, $color);
+				imagefilledpolygon($img, $poly2, 3, $color);
+			}
+		}
+
+		// Output image
+		header('Content-Type: image/png');
+		header('Cache-control: no-cache, no-store');
+		//$mtime = explode(' ', microtime());
+		//$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+		//echo $totaltime . "<br />\n";
+		//echo memory_get_usage() - $tmp;
+		imagepng($img);
+		imagedestroy($img);
+	}
+
+	function wave_height($x, $y, $factor = 1, $tweak = 0.7)
+	{
+		// stretch the wave. TODO: pretty it up
+		$x = $x/5 + 180;
+		$y = $y/4;
+		return ((sin($x / (3 * $factor)) + sin($y / (3 * $factor))) * 10 * $tweak);
+	}
+
+	function grid_height($x, $y, $factor = 1, $x_grid, $y_grid)
+	{
+		return ((!($x % ($x_grid * $factor)) || !($y % ($y_grid * $factor))) ? 3 : 0);
+	}
+
+	function captcha_bitmaps()
+	{
+		return array(
+			'width'		=> 9,
+			'height'	=> 13,
+			'data'		=> array(
+				'A' => array(
+					array(0,0,1,1,1,1,0,0,0),
+					array(0,1,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,1,1,1,1,1,1,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'B' => array(
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'C' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'D' => array(
+					array(1,1,1,1,1,1,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'E' => array(
+					array(0,0,1,1,1,1,1,1,1),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'F' => array(
+					array(0,0,1,1,1,1,1,1,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'G' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'H' => array(
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'I' => array(
+					array(0,1,1,1,1,1,1,1,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,1,1,1,1,1,1,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'J' => array(
+					array(0,0,0,0,0,0,1,1,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'K' => array(
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,1,0,0,0),
+					array(1,0,0,0,1,0,0,0,0),
+					array(1,0,0,1,0,0,0,0,0),
+					array(1,0,1,0,0,0,0,0,0),
+					array(1,1,0,0,0,0,0,0,0),
+					array(1,0,1,0,0,0,0,0,0),
+					array(1,0,0,1,0,0,0,0,0),
+					array(1,0,0,0,1,0,0,0,0),
+					array(1,0,0,0,0,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'L' => array(
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'M' => array(
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,1,0,0,0,1,1,0),
+					array(0,1,0,1,0,1,0,1,0),
+					array(0,1,0,0,1,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'N' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,1,0,0,0,0,0,0,1),
+					array(1,0,1,0,0,0,0,0,1),
+					array(1,0,0,1,0,0,0,0,1),
+					array(1,0,0,0,1,0,0,0,1),
+					array(1,0,0,0,0,1,0,0,1),
+					array(1,0,0,0,0,0,1,0,1),
+					array(1,0,0,0,0,0,0,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),		
+				'O' => array(
+					array(0,0,0,1,1,1,0,0,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,1,1,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'P' => array(
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'Q' => array(
+					array(0,0,1,1,1,1,0,0,0),
+					array(0,1,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,1,0,0,1,0),
+					array(1,0,0,0,0,1,0,1,0),
+					array(0,1,0,0,0,0,1,0,0),
+					array(0,0,1,1,1,1,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'R' => array(
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(1,1,1,1,1,1,0,0,0),
+					array(1,0,1,0,0,0,0,0,0),
+					array(1,0,0,1,0,0,0,0,0),
+					array(1,0,0,0,1,0,0,0,0),
+					array(1,0,0,0,0,1,0,0,0),
+					array(1,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'S' => array(
+					array(0,0,1,1,1,1,1,1,1),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(1,1,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'T' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'U' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'V' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'W' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,1,0,0,0,1),
+					array(1,0,0,1,0,1,0,0,1),
+					array(1,0,1,0,0,0,1,0,1),
+					array(1,1,0,0,0,0,0,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'X' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'Y' => array(
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,0,0,1,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'Z' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,0,0,0,0,0),
+					array(0,0,1,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'1' => array(
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,1,0,0,0,0),
+					array(0,0,1,0,1,0,0,0,0),
+					array(0,1,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,1,1,1,1,1,1,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'2' => array(
+					array(0,0,0,1,1,1,0,0,0),
+					array(0,0,1,0,0,0,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,1,0,0,0,0,0),
+					array(0,0,1,0,0,0,0,0,0),
+					array(0,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'3' => array(
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,1,1,0,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'4' => array(
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,1,0),
+					array(0,0,0,0,0,1,0,1,0),
+					array(0,0,0,0,1,0,0,1,0),
+					array(0,0,0,1,0,0,0,1,0),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,1,1,1,1,1,1,1,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'5' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(0,1,0,0,0,0,0,0,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'6' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,0,0,0,0,0,0),
+					array(1,0,0,1,1,1,1,0,0),
+					array(1,0,1,0,0,0,0,1,0),
+					array(1,1,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'7' => array(
+					array(1,1,1,1,1,1,1,1,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,1,0),
+					array(0,0,0,0,0,0,1,0,0),
+					array(0,0,0,0,0,1,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,1,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'8' => array(
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,1,0,0,0,0,0,1,0),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(1,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,0),
+					array(0,0,1,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+				'9' => array(
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,1,1),
+					array(0,0,1,1,1,1,1,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,0,0,0,0,0,0,0,1),
+					array(0,1,0,0,0,0,0,0,1),
+					array(0,0,1,0,0,0,0,1,0),
+					array(0,0,0,1,1,1,1,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+					array(0,0,0,0,0,0,0,0,0),
+				),
+			)
+		);
+	}
+}
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.1


From a539fca62b10f53a5f5dadf07f9ab07340fdabf9 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 7 Jun 2009 11:34:01 +0000
Subject: some corrections, only very minor things.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9554 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_factory.php         |  25 ++--
 phpBB/includes/captcha/captcha_gd_wave.php         |  45 ++++---
 .../includes/captcha/plugins/captcha_abstract.php  | 139 ++++++++++----------
 .../captcha/plugins/phpbb_captcha_gd_plugin.php    |  16 ++-
 .../plugins/phpbb_captcha_gd_wave_plugin.php       |   5 +-
 .../captcha/plugins/phpbb_captcha_nogd_plugin.php  |  21 +--
 .../captcha/plugins/phpbb_recaptcha_plugin.php     | 142 +++++++++++----------
 7 files changed, 205 insertions(+), 188 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index fbe615a043..b5fa69990d 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -16,8 +16,11 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-
-/** A small class until we get the autoloader done */
+/**
+* A small class for 3.0.x (no autoloader in 3.0.x)
+*
+* @package VC
+*/
 class phpbb_captcha_factory
 {
 	/**
@@ -26,7 +29,7 @@ class phpbb_captcha_factory
 	function get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
-		
+
 		$name = basename($name);
 		if (!class_exists($name))
 		{
@@ -34,7 +37,7 @@ class phpbb_captcha_factory
 		}
 		return call_user_func(array($name, 'get_instance'));
 	}
-	
+
 	/**
 	* Call the garbage collector
 	*/
@@ -49,18 +52,19 @@ class phpbb_captcha_factory
 		}
 		call_user_func(array($name, 'garbage_collect'), 0);
 	}
-	
+
 	/**
 	* return a list of all discovered CAPTCHA plugins
 	*/
 	function get_captcha_types()
 	{
 		global $phpbb_root_path, $phpEx;
-	
-		$captchas = array();
-		$captchas['available'] = array();
-		$captchas['unavailable'] = array();
-	
+
+		$captchas = array(
+			'available'		=> array(),
+			'unavailable'	=> array(),
+		);
+
 		$dp = @opendir($phpbb_root_path . 'includes/captcha/plugins');
 
 		if ($dp)
@@ -74,6 +78,7 @@ class phpbb_captcha_factory
 					{
 						include($phpbb_root_path . "includes/captcha/plugins/$file");
 					}
+
 					if (call_user_func(array($name, 'is_available')))
 					{
 						$captchas['available'][$name] = call_user_func(array($name, 'get_name'));
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
index d911d574f7..f706c98d43 100644
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -1,16 +1,18 @@
 <?php
-/** 
+/**
 *
 * @package VC
 * @version $Id$
-* @copyright (c) 2006 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+* @copyright (c) 2006 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
 
-
-/** 
-* Wave3D CAPTCHA by Robert Hetzler
+/**
+* Wave3D CAPTCHA
+*
+* @author Robert Hetzler
+* @package VC
 */
 class captcha
 {
@@ -20,10 +22,10 @@ class captcha
 	function execute($code, $seed)
 	{
 		global $starttime;
-		
+
 		// seed the random generator
 		mt_srand($seed);
-	
+
 		// set height and width
 		$img_x = $this->width;
 		$img_y = $this->height;
@@ -32,7 +34,7 @@ class captcha
 		$img	= imagecreatetruecolor($img_x, $img_y);
 		$x_grid = mt_rand(6, 10);
 		$y_grid = mt_rand(6, 10);
- 
+
 		// Ok, so lets cut to the chase. We could accurately represent this in 3d and
 		// do all the appropriate linear transforms. my questions is... why bother?
 		// The computational overhead is unnecessary when you consider the simple fact:
@@ -47,28 +49,29 @@ class captcha
 		$plane_x	= 100;
 		$plane_y	= 30;
 
-		$subdivision_factor	= 3;
+		$subdivision_factor = 3;
+
 		// $box is the 4 points in img_space that correspond to the corners of the plane in 3-space
 		$box = array(
 			'upper_left'	=> array(
 				'x' => mt_rand(5, 15),
 				'y' => mt_rand(10, 15)
-			), 
+			),
 			'upper_right'	=> array(
 				'x' => mt_rand($img_x - 35, $img_x - 19),
 				'y' => mt_rand(10, 17)
-			), 
+			),
 			'lower_left'	=> array(
 				'x' => mt_rand($img_x - 5, $img_x - 45),
 				'y' => mt_rand($img_y - 0, $img_y - 15)
-			), 
+			),
 		);
+
 		$box['lower_right'] = array(
-				'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
-				'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
+			'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'],
+			'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'],
 		);
 
-
 		// TODO
 		$background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255));
 		imagefill($img, 0, 0, $background);
@@ -83,7 +86,7 @@ class captcha
 		}
 
 		$fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120));
-		
+
  		$colors = array();
 
 		$minr = mt_rand(20, 30);
@@ -159,7 +162,7 @@ class captcha
 			$cur_height		= $this->wave_height($x, 0, $subdivision_factor);
 			$offset			= $cur_height - $prev_height;
 			$img_pos_cur	= array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset);
-									
+
 			$img_buffer[0][$x]	= $img_pos_cur;
 			$img_pos_prev		= $img_pos_cur;
 			$prev_height		= $cur_height;
@@ -170,7 +173,7 @@ class captcha
 			// swap buffers
 			$buffer_cur		= $y & 1;
 			$buffer_prev	= 1 - $buffer_cur;
-			
+
 			$prev_height	= $this->wave_height(0, $y, $subdivision_factor);
 			$offset			= $prev_height - $this->wave_height(0, $y - 1, $subdivision_factor);
 			$img_pos_cur	= array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1));
@@ -179,7 +182,7 @@ class captcha
 			$img_pos_prev	= $img_pos_cur;
 
 			$img_buffer[$buffer_cur][0]	= $img_pos_cur;
-			
+
 			for ($x = 1; $x <= $full_x; ++$x)
 			{
 				$cur_height		= $this->wave_height($x, $y, $subdivision_factor) + $this->grid_height($x, $y, 1, $x_grid, $y_grid);
@@ -496,7 +499,7 @@ class captcha
 					array(0,0,0,0,0,0,0,0,0),
 					array(0,0,0,0,0,0,0,0,0),
 					array(0,0,0,0,0,0,0,0,0),
-				),		
+				),
 				'O' => array(
 					array(0,0,0,1,1,1,0,0,0),
 					array(0,0,1,0,0,0,1,0,0),
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index f88d82b2a0..0666a3ca67 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -18,7 +18,9 @@ if (!defined('IN_PHPBB'))
 
 
 /**
-* This class holds the code shared by the two default 3.0 CAPTCHAs.
+* This class holds the code shared by the two default 3.0.x CAPTCHAs.
+*
+* @package VC
 */
 class phpbb_default_captcha
 {
@@ -29,18 +31,17 @@ class phpbb_default_captcha
 	var $type;
 	var $solved = false;
 
-
 	function init($type)
 	{
 		global $config, $db, $user;
-		
+
 		// read input
 		$this->confirm_id = request_var('confirm_id', '');
 		$this->confirm_code = request_var('confirm_code', '');
 		$refresh = request_var('refresh_vc', false) && $config['confirm_refresh'];
-		
+
 		$this->type = (int) $type;
-		
+
 		if (!strlen($this->confirm_id))
 		{
 			// we have no confirm ID, better get ready to display something
@@ -50,24 +51,22 @@ class phpbb_default_captcha
 		{
 			$this->regenerate_code();
 		}
-
 	}
-	
+
 	function execute_demo()
 	{
 		global $user;
-	
-		$this->code = gen_rand_string(mt_rand(5, 8));
+
+		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
-				
+
 		// compute $seed % 0x7fffffff
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
-		
+
 		$captcha = new captcha();
 		$captcha->execute($this->code, $this->seed);
 	}
-	
-	
+
 	function execute()
 	{
 		if (empty($this->code))
@@ -81,46 +80,46 @@ class phpbb_default_captcha
 		$captcha = new captcha();
 		$captcha->execute($this->code, $this->seed);
 	}
-	
-	
+
 	function get_template()
 	{
 		global $config, $user, $template, $phpEx, $phpbb_root_path;
-		
+
 		$template->set_filenames(array(
 			'captcha' => 'captcha_default.html')
 		);
-		
+
 		$template->assign_vars(array(
 			'CONFIRM_IMAGE'				=> append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type),
-			'CONFIRM_ID'				=> $this->confirm_id,			
+			'CONFIRM_ID'				=> $this->confirm_id,
 			'S_REFRESH'					=> (bool) $config['confirm_refresh'],
 
 		));
-	
+
 		return $template->assign_display('captcha');
 	}
-	
+
 	function get_demo_template($id)
 	{
 		global $config, $user, $template, $phpbb_admin_path, $phpEx;
-		
+
 		$template->set_filenames(array(
 			'captcha_demo' => 'captcha_default_acp_demo.html')
 		);
+
 		// acp_captcha has a delivery function; let's use it
 		$template->assign_vars(array(
 			'CONFIRM_IMAGE'		=> append_sid($phpbb_admin_path . 'index.' . $phpEx . '?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)
 		{
@@ -129,16 +128,16 @@ class phpbb_default_captcha
 		$hidden_fields['confirm_id'] = $this->confirm_id;
 		return $hidden_fields;
 	}
-	
+
 	function garbage_collect($type)
 	{
 		global $db, $config;
 
 		$sql = 'SELECT DISTINCT c.session_id
-				FROM ' . CONFIRM_TABLE . ' c
-				LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
-				WHERE s.session_id IS NULL' .
-					((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
+			FROM ' . CONFIRM_TABLE . ' c
+			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
+			WHERE s.session_id IS NULL' .
+				((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
 		$result = $db->sql_query($sql);
 
 		if ($row = $db->sql_fetchrow($result))
@@ -159,21 +158,21 @@ class phpbb_default_captcha
 		}
 		$db->sql_freeresult($result);
 	}
-	
+
 	function uninstall()
 	{
-		self::garbage_collect(0);
+		$this->garbage_collect(0);
 	}
-	
+
 	function install()
 	{
 		return;
 	}
-	
+
 	function validate()
 	{
 		global $config, $db, $user;
-		
+
 		$this->confirm_code = request_var('confirm_code', '');
 		if (!$this->confirm_id)
 		{
@@ -191,10 +190,10 @@ class phpbb_default_captcha
 				$error = $user->lang['CONFIRM_CODE_WRONG'];
 			}
 		}
-	
+
 		if (strlen($error))
 		{
-			// okay, inorect answer. Let's ask a new question
+			// okay, incorrect answer. Let's ask a new question.
 			$this->generate_code();
 			return $error;
 		}
@@ -203,16 +202,15 @@ class phpbb_default_captcha
 			return false;
 		}
 	}
-	
-	
+
 	/**
 	* The old way to generate code, suitable for GD and non-GD. Resets the internal state.
 	*/
 	function generate_code()
 	{
 		global $db, $user;
-		
-		$this->code = gen_rand_string(mt_rand(5, 8));
+
+		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
 		$this->confirm_id = md5(unique_id($user->ip));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
 		$this->solved = false;
@@ -228,19 +226,20 @@ class phpbb_default_captcha
 		);
 		$db->sql_query($sql);
 	}
-	
+
 	/**
 	* New Question, if desired.
 	*/
 	function regenerate_code()
 	{
 		global $db, $user;
-		
-		$this->code = gen_rand_string(mt_rand(5, 8));
+
+		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
 		$this->solved = false;
 		// compute $seed % 0x7fffffff
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
+
 		$sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
 				'code'			=> (string) $this->code,
 				'seed'			=> (int) $this->seed)) . '
@@ -249,35 +248,37 @@ class phpbb_default_captcha
 				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
-	
+
 	/**
-	* Look up everything we need for painting&checking. 
+	* Look up everything we need for painting&checking.
 	*/
 	function load_code()
 	{
 		global $db, $user;
+
 		$sql = 'SELECT code, seed
-				FROM ' . CONFIRM_TABLE . "
-				WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
-				AND session_id = '" . $db->sql_escape($user->session_id) . "'
-					AND confirm_type = " . $this->type;
+			FROM ' . CONFIRM_TABLE . "
+			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
+			AND session_id = '" . $db->sql_escape($user->session_id) . "'
+				AND confirm_type = " . $this->type;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
+
 		if ($row)
 		{
 			$this->code = $row['code'];
 			$this->seed = $row['seed'];
 			return true;
 		}
+
 		return false;
-		
 	}
-	
+
 	function check_code()
 	{
 		global $db;
-		
+
 		if (empty($this->code))
 		{
 			if (!$this->load_code())
@@ -287,47 +288,45 @@ class phpbb_default_captcha
 		}
 		return (strcasecmp($this->code, $this->confirm_code) === 0);
 	}
-	
+
 	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;
+			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) . "'
-					AND confirm_type = " . $this->type;
+			FROM ' . CONFIRM_TABLE . "
+			WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
+				AND confirm_type = " . $this->type;
 		$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;
+			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 5b3c09f32d..ac78b3d1c4 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-/** 
+/**
 * Placeholder for autoload
 */
 if (!class_exists('phpbb_default_captcha'))
@@ -24,6 +24,9 @@ if (!class_exists('phpbb_default_captcha'))
 	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
+/**
+* @package VC
+*/
 class phpbb_captcha_gd extends phpbb_default_captcha
 {
 	function phpbb_captcha_gd()
@@ -35,7 +38,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 			include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx);
 		}
 	}
-	
+
 	function get_instance()
 	{
 		return new phpbb_captcha_gd();
@@ -45,17 +48,17 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 	{
 		return (@extension_loaded('gd') || can_load_dll('gd'));
 	}
-	
+
 	function get_name()
 	{
 		return 'CAPTCHA_GD';
 	}
-	
+
 	function get_class_name()
 	{
 		return 'phpbb_captcha_gd';
 	}
-		
+
 	function acp_page($id, &$module)
 	{
 		global $db, $user, $auth, $template;
@@ -80,7 +83,6 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 			'captcha_gd'			=> 'CAPTCHA_GD',
 		);
 
-
 		$module->tpl_name = 'captcha_gd_acp';
 		$module->page_title = 'ACP_VC_SETTINGS';
 		$form_key = 'acp_captcha';
@@ -112,11 +114,11 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 				$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var];
 				$template->assign_var($template_var, $var);
 			}
+
 			$template->assign_vars(array(
 				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
 			));
-
 		}
 	}
 }
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 38e5aabedd..36cbaf7d79 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -24,6 +24,9 @@ if (!class_exists('captcha_abstract'))
 	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
+/**
+* @package VC
+*/
 class phpbb_captcha_gd_wave extends phpbb_default_captcha
 {
 
@@ -60,7 +63,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 	function acp_page($id, &$module)
 	{
 		global $config, $db, $template, $user;
-		
+
 		trigger_error($user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action));
 	}
 }
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 8df11bfe8a..517b55f09e 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-/** 
+/**
 * Placeholder for autoload
 */
 if (!class_exists('phpbb_default_captcha'))
@@ -24,6 +24,9 @@ if (!class_exists('phpbb_default_captcha'))
 	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
+/**
+* @package VC
+*/
 class phpbb_captcha_nogd extends phpbb_default_captcha
 {
 
@@ -36,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 			include_once($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx);
 		}
 	}
-	
+
 	function get_instance()
 	{
 		return new phpbb_captcha_nogd();
@@ -46,25 +49,23 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 	{
 		return true;
 	}
-	
+
 	function get_name()
 	{
-		global $user;
-		
-		return 'CAPTCHA_NO_GD'; 
+		return 'CAPTCHA_NO_GD';
 	}
-	
+
 	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 42ca25ae54..a96f5ef9c6 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -22,6 +22,9 @@ if (!class_exists('phpbb_default_captcha'))
 	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
+/**
+* @package VC
+*/
 class phpbb_recaptcha extends phpbb_default_captcha
 {
 	var $recaptcha_server = 'http://api.recaptcha.net';
@@ -29,18 +32,16 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	var $challenge;
 	var $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', '');
 	}
-	
-	
+
 	function get_instance()
 	{
 		return new phpbb_recaptcha();
@@ -48,25 +49,25 @@ class phpbb_recaptcha extends phpbb_default_captcha
 
 	function is_available()
 	{
-		global $config, $user; 
+		global $config, $user;
 		$user->add_lang('recaptcha');
 		return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
 	}
-	
+
 	function get_name()
 	{
 		return 'CAPTCHA_RECAPTCHA';
 	}
-	
+
 	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',
@@ -103,6 +104,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 				$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, '') : ((isset($config[$captcha_var])) ? $config[$captcha_var] : '');
 				$template->assign_var($template_var, $var);
 			}
+
 			$template->assign_vars(array(
 				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
@@ -110,47 +112,44 @@ class phpbb_recaptcha extends phpbb_default_captcha
 
 		}
 	}
-	
-	
+
 	// 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'			=> $this->recaptcha_server,
 			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
 			'RECAPTCHA_ERRORGET'		=> '',
 			'S_RECAPTCHA_AVAILABLE'		=> $this->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)
 		{
@@ -159,17 +158,17 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$hidden_fields['confirm_id'] = $this->confirm_id;
 		return $hidden_fields;
 	}
-		
+
 	function uninstall()
 	{
-		self::garbage_collect(0);
+		$this->garbage_collect(0);
 	}
-	
+
 	function install()
 	{
 		return;
 	}
-	
+
 	function validate()
 	{
 		if (!parent::validate())
@@ -181,7 +180,6 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			return $this->recaptcha_check_answer();
 		}
 	}
-	
 
 // Code from here on is based on recaptchalib.php
 /*
@@ -218,14 +216,14 @@ class phpbb_recaptcha extends phpbb_default_captcha
  */
 
 	/**
-	 * Submits an HTTP POST to a reCAPTCHA server
-	 * @param string $host
-	 * @param string $path
-	 * @param array $data
-	 * @param int port
-	 * @return array response
-	 */
-	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
+	*/
+	function _recaptcha_http_post($host, $path, $data, $port = 80)
 	{
 		$req = $this->_recaptcha_qsencode ($data);
 
@@ -238,52 +236,56 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$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
-	  */
-	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
+	*/
+	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) 
+		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 ($this->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($this->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')
 			{
@@ -291,22 +293,24 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			}
 		}
 	}
-	
-		/**
-	 * Encodes the given data into a query string format
-	 * @param $data - array of string elements to be encoded
-	 * @return string - encoded request
-	 */
-	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
+	*/
+	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
-- 
cgit v1.2.1


From 41a2f0fb03a433ad98d0c96acdd7215f1b94da60 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 10 Jun 2009 12:28:41 +0000
Subject: language collision

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9568 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 36cbaf7d79..4198dcdf5b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -52,7 +52,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 
 	function get_name()
 	{
-		return 'CAPTCHA_GD_WAVE';
+		return 'CAPTCHA_GD_3D';
 	}
 
 	function get_class_name()
-- 
cgit v1.2.1


From 8c246032cc03ceceb8fcf24fe3802a1f8165de2f Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 12 Jun 2009 15:24:30 +0000
Subject: fix preview in ACP

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9576 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../includes/captcha/plugins/captcha_abstract.php  | 13 +++++++-
 .../captcha/plugins/phpbb_captcha_gd_plugin.php    | 39 ++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 0666a3ca67..9e52762bc2 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -30,6 +30,7 @@ class phpbb_default_captcha
 	var $seed;
 	var $type;
 	var $solved = false;
+	var $captcha_vars = false;
 
 	function init($type)
 	{
@@ -106,10 +107,20 @@ class phpbb_default_captcha
 		$template->set_filenames(array(
 			'captcha_demo' => 'captcha_default_acp_demo.html')
 		);
+		
+		$variables = '';
+		
+		if (is_array($this->captcha_vars))
+		{
+			foreach ($this->captcha_vars as $captcha_var => $template_var)
+			{
+				$variables .= '&amp;' . rawurlencode($captcha_var) . '=' . request_var($captcha_var, (int) $config[$captcha_var]);
+			}
+		}
 
 		// acp_captcha has a delivery function; let's use it
 		$template->assign_vars(array(
-			'CONFIRM_IMAGE'		=> append_sid($phpbb_admin_path . 'index.' . $phpEx . '?captcha_demo=1&amp;mode=visual&amp;i=' . $id . '&amp;select_captcha=' . $this->get_class_name()),
+			'CONFIRM_IMAGE'		=> append_sid($phpbb_admin_path . 'index.' . $phpEx . '?captcha_demo=1&amp;mode=visual&amp;i=' . $id . '&amp;select_captcha=' . $this->get_class_name()) . $variables,
 			'CONFIRM_ID'		=> $this->confirm_id,
 		));
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index ac78b3d1c4..cd821f959e 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -29,6 +29,18 @@ if (!class_exists('phpbb_default_captcha'))
 */
 class phpbb_captcha_gd extends phpbb_default_captcha
 {
+
+	var $captcha_vars = array(
+		'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
+		'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
+		'captcha_gd_foreground_noise'	=> 'CAPTCHA_GD_FOREGROUND_NOISE',
+		'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED',
+		'captcha_gd_wave'				=> 'CAPTCHA_GD_WAVE',
+		'captcha_gd_3d_noise'			=> 'CAPTCHA_GD_3D_NOISE',
+		'captcha_gd_fonts'				=> 'CAPTCHA_GD_FONTS',
+
+	);
+		
 	function phpbb_captcha_gd()
 	{
 		global $phpbb_root_path, $phpEx;
@@ -65,16 +77,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$user->add_lang('acp/board');
-		$captcha_vars = array(
-			'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
-			'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
-			'captcha_gd_foreground_noise'	=> 'CAPTCHA_GD_FOREGROUND_NOISE',
-			'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED',
-			'captcha_gd_wave'				=> 'CAPTCHA_GD_WAVE',
-			'captcha_gd_3d_noise'			=> 'CAPTCHA_GD_3D_NOISE',
-			'captcha_gd_fonts'				=> 'CAPTCHA_GD_FONTS',
 
-		);
 
 		$config_vars = array(
 			'enable_confirm'		=> 'REG_ENABLE',
@@ -92,7 +95,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 
 		if ($submit && check_form_key($form_key))
 		{
-			$captcha_vars = array_keys($captcha_vars);
+			$captcha_vars = array_keys($this->captcha_vars);
 			foreach ($captcha_vars as $captcha_var)
 			{
 				$value = request_var($captcha_var, 0);
@@ -109,7 +112,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 		else
 		{
-			foreach ($captcha_vars as $captcha_var => $template_var)
+			foreach ($this->captcha_vars as $captcha_var => $template_var)
 			{
 				$var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var];
 				$template->assign_var($template_var, $var);
@@ -121,6 +124,20 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 			));
 		}
 	}
+	
+	function execute_demo()
+	{
+		global $config;
+		
+		$config_old = $config;
+		foreach ($this->captcha_vars as $captcha_var => $template_var)
+		{
+				$config[$captcha_var] = request_var($captcha_var, (int) $config[$captcha_var]);
+		}
+		parent::execute_demo();
+		$config = $config_old;
+	}
+	
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.1


From 11dc41063313d62b100c16bceb289b12c7c3bf2b Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sat, 13 Jun 2009 14:09:51 +0000
Subject: Oh right. PHP4

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9581 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_factory.php                   | 5 +++--
 phpBB/includes/captcha/captcha_gd.php                        | 1 +
 phpBB/includes/captcha/plugins/captcha_abstract.php          | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php   | 5 +++--
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php | 5 +++--
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php    | 5 +++--
 6 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index b5fa69990d..73406a954f 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -26,7 +26,7 @@ class phpbb_captcha_factory
 	/**
 	* return an instance of class $name in file $name_plugin.php
 	*/
-	function get_instance($name)
+	function &get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -35,7 +35,8 @@ class phpbb_captcha_factory
 		{
 			include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx);
 		}
-		return call_user_func(array($name, 'get_instance'));
+		$instance =& call_user_func(array($name, 'get_instance'));
+		return $instance;
 	}
 
 	/**
diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 9734a63c1b..91915ce80c 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -34,6 +34,7 @@ class captcha
 	function execute($code, $seed)
 	{
 		global $config;
+		
 		srand($seed);
 		//mt_srand($seed);
 
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 9e52762bc2..6ca6bc628e 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -131,7 +131,7 @@ class phpbb_default_captcha
 	{
 		$hidden_fields = array();
 
-		// this is required for postig.php - otherwise we would forget about the captcha being already solved
+		// this is required for posting.php - otherwise we would forget about the captcha being already solved
 		if ($this->solved)
 		{
 			$hidden_fields['confirm_code'] = $this->confirm_code;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index cd821f959e..06178ece50 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -51,9 +51,10 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	function &get_instance()
 	{
-		return new phpbb_captcha_gd();
+		$instance =& new phpbb_captcha_gd();
+		return $instance;
 	}
 
 	function is_available()
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 517b55f09e..1fc859532a 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -40,9 +40,10 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	function &get_instance()
 	{
-		return new phpbb_captcha_nogd();
+		$instance =& new phpbb_captcha_nogd();
+		return $instance;
 	}
 
 	function is_available()
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index a96f5ef9c6..2a20b4b78d 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -42,9 +42,10 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	function get_instance()
+	function &get_instance()
 	{
-		return new phpbb_recaptcha();
+		$instance =& new phpbb_recaptcha();
+		return $instance;
 	}
 
 	function is_available()
-- 
cgit v1.2.1


From b60f96c4ec09a41f0ecd19f16caca7f88808cc23 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 14 Jun 2009 15:24:03 +0000
Subject: See if this plays out: do not require people to re-enter the CAPTCHA

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9591 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 6ca6bc628e..1446df9874 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -183,7 +183,8 @@ class phpbb_default_captcha
 	function validate()
 	{
 		global $config, $db, $user;
-
+		
+		$error = '';
 		$this->confirm_code = request_var('confirm_code', '');
 		if (!$this->confirm_id)
 		{
-- 
cgit v1.2.1


From a49eef594bf059f9ac1fa480049838af6cf0f260 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 15 Jun 2009 11:21:27 +0000
Subject: Fix bug #46455 - Make sure can_load_dll() is available. Authorised
 by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9595 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_gd_plugin.php    | 22 ++++++++++++++++------
 .../plugins/phpbb_captcha_gd_wave_plugin.php       | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 06178ece50..108e8f686e 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -38,9 +38,8 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		'captcha_gd_wave'				=> 'CAPTCHA_GD_WAVE',
 		'captcha_gd_3d_noise'			=> 'CAPTCHA_GD_3D_NOISE',
 		'captcha_gd_fonts'				=> 'CAPTCHA_GD_FONTS',
-
 	);
-		
+
 	function phpbb_captcha_gd()
 	{
 		global $phpbb_root_path, $phpEx;
@@ -59,7 +58,19 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 
 	function is_available()
 	{
-		return (@extension_loaded('gd') || can_load_dll('gd'));
+		global $phpbb_root_path, $phpEx;
+
+		if (@extension_loaded('gd'))
+		{
+			return true;
+		}
+
+		if (!function_exists('can_load_dll'))
+		{
+			include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
+		}
+
+		return can_load_dll('gd');
 	}
 
 	function get_name()
@@ -79,7 +90,6 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 
 		$user->add_lang('acp/board');
 
-
 		$config_vars = array(
 			'enable_confirm'		=> 'REG_ENABLE',
 			'enable_post_confirm'	=> 'POST_ENABLE',
@@ -125,7 +135,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 			));
 		}
 	}
-	
+
 	function execute_demo()
 	{
 		global $config;
@@ -138,7 +148,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		parent::execute_demo();
 		$config = $config_old;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 4198dcdf5b..ce678b6d29 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -47,7 +47,19 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 
 	function is_available()
 	{
-		return (@extension_loaded('gd') || can_load_dll('gd'));
+		global $phpbb_root_path, $phpEx;
+
+		if (@extension_loaded('gd'))
+		{
+			return true;
+		}
+
+		if (!function_exists('can_load_dll'))
+		{
+			include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
+		}
+
+		return can_load_dll('gd');
 	}
 
 	function get_name()
-- 
cgit v1.2.1


From c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 17 Jun 2009 13:29:26 +0000
Subject: Use dynamic includes, fix some style bugs, make the old default
 captcha family backwards compatible to 3.0.5 styles

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9609 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_gd.php              |  5 ++---
 .../includes/captcha/plugins/captcha_abstract.php  | 26 ++++++++++------------
 .../captcha/plugins/phpbb_captcha_gd_plugin.php    |  2 +-
 .../captcha/plugins/phpbb_recaptcha_plugin.php     |  6 +----
 4 files changed, 16 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 91915ce80c..96e39af85b 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -35,8 +35,7 @@ class captcha
 	{
 		global $config;
 		
-		srand($seed);
-		//mt_srand($seed);
+		mt_srand($seed);
 
 		// Create image
 		$img = imagecreatetruecolor($this->width, $this->height);
@@ -109,7 +108,7 @@ class captcha
 		
 		if ($config['captcha_gd_3d_noise'])
 		{
-			$xoffset = rand(0,9);
+			$xoffset = mt_rand(0,9);
 			$noise_bitmaps = $this->captcha_noise_bg_bitmaps();
 			for ($i = 0; $i < $code_len; ++$i)
 			{
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 1446df9874..1682293c02 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -85,29 +85,27 @@ class phpbb_default_captcha
 	function get_template()
 	{
 		global $config, $user, $template, $phpEx, $phpbb_root_path;
-
-		$template->set_filenames(array(
-			'captcha' => 'captcha_default.html')
-		);
-
+		
+		$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
+		$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
+		
 		$template->assign_vars(array(
-			'CONFIRM_IMAGE'				=> append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type),
+			'CONFIRM_IMAGE_LINK'		=> $link,
+			'CONFIRM_IMAGE'				=> '<img src="'. $link . '" />',
+			'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
 			'CONFIRM_ID'				=> $this->confirm_id,
-			'S_REFRESH'					=> (bool) $config['confirm_refresh'],
-
+			'S_CONFIRM_CODE'			=> true,
+			'S_CONFIRM_REFRESH'			=> ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
+			'L_CONFIRM_EXPLAIN'			=> $explain,
 		));
 
-		return $template->assign_display('captcha');
+		return 'captcha_default.html';
 	}
 
 	function get_demo_template($id)
 	{
 		global $config, $user, $template, $phpbb_admin_path, $phpEx;
 
-		$template->set_filenames(array(
-			'captcha_demo' => 'captcha_default_acp_demo.html')
-		);
-		
 		$variables = '';
 		
 		if (is_array($this->captcha_vars))
@@ -124,7 +122,7 @@ class phpbb_default_captcha
 			'CONFIRM_ID'		=> $this->confirm_id,
 		));
 
-		return $template->assign_display('captcha_demo');
+		return 'captcha_default_acp_demo.html';
 	}
 
 	function get_hidden_fields()
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 108e8f686e..ab71da10d7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -34,7 +34,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		'captcha_gd_x_grid'				=> 'CAPTCHA_GD_X_GRID',
 		'captcha_gd_y_grid'				=> 'CAPTCHA_GD_Y_GRID',
 		'captcha_gd_foreground_noise'	=> 'CAPTCHA_GD_FOREGROUND_NOISE',
-		'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED',
+//		'captcha_gd'					=> 'CAPTCHA_GD_PREVIEWED',
 		'captcha_gd_wave'				=> 'CAPTCHA_GD_WAVE',
 		'captcha_gd_3d_noise'			=> 'CAPTCHA_GD_3D_NOISE',
 		'captcha_gd_fonts'				=> 'CAPTCHA_GD_FONTS',
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 2a20b4b78d..bd8fbce0fa 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -128,10 +128,6 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	{
 		global $config, $user, $template;
 
-		$template->set_filenames(array(
-			'captcha' => 'captcha_recaptcha.html')
-		);
-
 		$template->assign_vars(array(
 			'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
 			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
@@ -139,7 +135,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
 		));
 
-		return $template->assign_display('captcha');
+		return 'captcha_recaptcha.html';
 	}
 
 	function get_demo_template($id)
-- 
cgit v1.2.1


From 5d9cf2aa41c61dd35114223006c5e16c104c5a2b Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 19 Jun 2009 12:31:28 +0000
Subject: Make captchas stricter by oly having one entry per session; fix a bug
 in ucp_register that caused three captcha instances to be generated.
 Non-MySQL databases and garbage collecting needs extensive testing.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9626 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../includes/captcha/plugins/captcha_abstract.php  | 53 ++++++++++++----------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 1682293c02..6962100945 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -28,6 +28,7 @@ class phpbb_default_captcha
 	var $confirm_code;
 	var $code;
 	var $seed;
+	var $attempts = 0;
 	var $type;
 	var $solved = false;
 	var $captcha_vars = false;
@@ -43,7 +44,7 @@ class phpbb_default_captcha
 
 		$this->type = (int) $type;
 
-		if (!strlen($this->confirm_id))
+		if (!strlen($this->confirm_id) || !$this->load_code())
 		{
 			// we have no confirm ID, better get ready to display something
 			$this->generate_code();
@@ -183,7 +184,6 @@ class phpbb_default_captcha
 		global $config, $db, $user;
 		
 		$error = '';
-		$this->confirm_code = request_var('confirm_code', '');
 		if (!$this->confirm_id)
 		{
 			$error = $user->lang['CONFIRM_CODE_WRONG'];
@@ -204,7 +204,7 @@ class phpbb_default_captcha
 		if (strlen($error))
 		{
 			// okay, incorrect answer. Let's ask a new question.
-			$this->generate_code();
+			$this->new_attempt();
 			return $error;
 		}
 		else
@@ -259,6 +259,29 @@ class phpbb_default_captcha
 		$db->sql_query($sql);
 	}
 
+	/**
+	* New Question, if desired.
+	*/
+	function new_attempt()
+	{
+		global $db, $user;
+
+		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
+		$this->seed = hexdec(substr(unique_id(), 4, 10));
+		$this->solved = false;
+		// compute $seed % 0x7fffffff
+		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
+
+		$sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+				'code'			=> (string) $this->code,
+				'seed'			=> (int) $this->seed)) . '
+				, attempts = attempts + 1 
+				WHERE
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
+				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+		$db->sql_query($sql);
+	}
+	
 	/**
 	* Look up everything we need for painting&checking.
 	*/
@@ -266,7 +289,7 @@ class phpbb_default_captcha
 	{
 		global $db, $user;
 
-		$sql = 'SELECT code, seed
+		$sql = 'SELECT code, seed, attempts
 			FROM ' . CONFIRM_TABLE . "
 			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
 			AND session_id = '" . $db->sql_escape($user->session_id) . "'
@@ -279,6 +302,7 @@ class phpbb_default_captcha
 		{
 			$this->code = $row['code'];
 			$this->seed = $row['seed'];
+			$this->attempts = $row['attempts'];
 			return true;
 		}
 
@@ -287,15 +311,6 @@ class phpbb_default_captcha
 
 	function check_code()
 	{
-		global $db;
-
-		if (empty($this->code))
-		{
-			if (!$this->load_code())
-			{
-				return false;
-			}
-		}
 		return (strcasecmp($this->code, $this->confirm_code) === 0);
 	}
 
@@ -312,17 +327,7 @@ class phpbb_default_captcha
 
 	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) . "'
-				AND confirm_type = " . $this->type;
-		$result = $db->sql_query($sql);
-		$attempts = (int) $db->sql_fetchfield('attempts');
-		$db->sql_freeresult($result);
-
-		return $attempts;
+		return $this->attempts;
 	}
 
 	function reset()
-- 
cgit v1.2.1


From c2c79d8297369fa461976061e0b7b95dd8c8a721 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 21 Jun 2009 13:31:26 +0000
Subject: fix the captcha ACP, restore xhtml compliance for recaptcha (#46195)
 - note, that this will not work in IE

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9645 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index bd8fbce0fa..50a456179b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -107,7 +107,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			}
 
 			$template->assign_vars(array(
-				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
+				'CAPTCHA_PREVIEW'	=> $this->get_demo_template(),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
 			));
 
-- 
cgit v1.2.1


From 6c9ddcf1df1d4255867ef1d34eb4498ba908338c Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 23 Jun 2009 12:10:50 +0000
Subject: fix previews

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9659 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 50a456179b..bd8fbce0fa 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -107,7 +107,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			}
 
 			$template->assign_vars(array(
-				'CAPTCHA_PREVIEW'	=> $this->get_demo_template(),
+				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
 			));
 
-- 
cgit v1.2.1


From b4c17b3732659991e979b989327fe375a9218df0 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 25 Jun 2009 08:26:51 +0000
Subject: We have to use the documented API

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9672 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 6962100945..e23cfd0de0 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -30,7 +30,7 @@ class phpbb_default_captcha
 	var $seed;
 	var $attempts = 0;
 	var $type;
-	var $solved = false;
+	var $solved = 0;
 	var $captcha_vars = false;
 
 	function init($type)
@@ -223,7 +223,7 @@ class phpbb_default_captcha
 		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
 		$this->confirm_id = md5(unique_id($user->ip));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
-		$this->solved = false;
+		$this->solved = 0;
 		// compute $seed % 0x7fffffff
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
 
@@ -246,7 +246,7 @@ class phpbb_default_captcha
 
 		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
-		$this->solved = false;
+		$this->solved = 0;
 		// compute $seed % 0x7fffffff
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
 
@@ -268,7 +268,7 @@ class phpbb_default_captcha
 
 		$this->code = gen_rand_string(mt_rand(CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS));
 		$this->seed = hexdec(substr(unique_id(), 4, 10));
-		$this->solved = false;
+		$this->solved = 0;
 		// compute $seed % 0x7fffffff
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
 
@@ -342,6 +342,16 @@ class phpbb_default_captcha
 		// we leave the class usable by generating a new question
 		$this->generate_code();
 	}
+	
+	function is_solved()
+	{
+		if ($this->solved === 0)
+		{
+			$this->validate();
+		}
+		return (bool) $this->solved;
+	}
+	
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.1


From 076067f85649e53c77aceddf68b469ef59a294ca Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 26 Jun 2009 20:58:36 +0000
Subject: Okay, okay, I see the issue. I'll revisit this tomorrow.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9695 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index e23cfd0de0..c6de2ff887 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -38,13 +38,12 @@ class phpbb_default_captcha
 		global $config, $db, $user;
 
 		// read input
-		$this->confirm_id = request_var('confirm_id', '');
 		$this->confirm_code = request_var('confirm_code', '');
 		$refresh = request_var('refresh_vc', false) && $config['confirm_refresh'];
 
 		$this->type = (int) $type;
 
-		if (!strlen($this->confirm_id) || !$this->load_code())
+		if (!$this->load_code())
 		{
 			// we have no confirm ID, better get ready to display something
 			$this->generate_code();
@@ -205,6 +204,7 @@ class phpbb_default_captcha
 		{
 			// okay, incorrect answer. Let's ask a new question.
 			$this->new_attempt();
+			$this->solved = false;
 			return $error;
 		}
 		else
@@ -277,7 +277,6 @@ class phpbb_default_captcha
 				'seed'			=> (int) $this->seed)) . '
 				, attempts = attempts + 1 
 				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
 				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
@@ -289,10 +288,9 @@ class phpbb_default_captcha
 	{
 		global $db, $user;
 
-		$sql = 'SELECT code, seed, attempts
+		$sql = 'SELECT code, confirm_id, seed, attempts
 			FROM ' . CONFIRM_TABLE . "
-			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
-			AND session_id = '" . $db->sql_escape($user->session_id) . "'
+			WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
 				AND confirm_type = " . $this->type;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
@@ -300,6 +298,7 @@ class phpbb_default_captcha
 
 		if ($row)
 		{
+			$this->confirm_id = $row['confirm_id'];
 			$this->code = $row['code'];
 			$this->seed = $row['seed'];
 			$this->attempts = $row['attempts'];
-- 
cgit v1.2.1


From e146efbd165c71b00003f6ae3ea3f4de2da3d64b Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 29 Jun 2009 12:52:45 +0000
Subject: Add some data for akismet et al

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9702 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index c6de2ff887..86ecdaf97e 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -178,7 +178,7 @@ class phpbb_default_captcha
 		return;
 	}
 
-	function validate()
+	function validate($data = false)
 	{
 		global $config, $db, $user;
 		
@@ -344,7 +344,7 @@ class phpbb_default_captcha
 	
 	function is_solved()
 	{
-		if ($this->solved === 0)
+		if (request_var('confirm_code', false) && $this->solved === 0)
 		{
 			$this->validate();
 		}
-- 
cgit v1.2.1


From 5f89b6a6d085701a0f999feb15879a62148f6fac Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 30 Jun 2009 14:00:27 +0000
Subject: *blinks* there were supposed to be more files, where are they? Ah,
 here

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9707 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 86ecdaf97e..2a93b3f895 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -38,12 +38,13 @@ class phpbb_default_captcha
 		global $config, $db, $user;
 
 		// read input
+		$this->confirm_id = request_var('confirm_id', '');
 		$this->confirm_code = request_var('confirm_code', '');
 		$refresh = request_var('refresh_vc', false) && $config['confirm_refresh'];
 
 		$this->type = (int) $type;
 
-		if (!$this->load_code())
+		if (!strlen($this->confirm_id) || !$this->load_code())
 		{
 			// we have no confirm ID, better get ready to display something
 			$this->generate_code();
@@ -95,6 +96,7 @@ class phpbb_default_captcha
 			'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
 			'CONFIRM_ID'				=> $this->confirm_id,
 			'S_CONFIRM_CODE'			=> true,
+			'S_TYPE'					=> $this->type,
 			'S_CONFIRM_REFRESH'			=> ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
 			'L_CONFIRM_EXPLAIN'			=> $explain,
 		));
@@ -178,7 +180,7 @@ class phpbb_default_captcha
 		return;
 	}
 
-	function validate($data = false)
+	function validate()
 	{
 		global $config, $db, $user;
 		
@@ -204,7 +206,6 @@ class phpbb_default_captcha
 		{
 			// okay, incorrect answer. Let's ask a new question.
 			$this->new_attempt();
-			$this->solved = false;
 			return $error;
 		}
 		else
@@ -277,6 +278,7 @@ class phpbb_default_captcha
 				'seed'			=> (int) $this->seed)) . '
 				, attempts = attempts + 1 
 				WHERE
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
 				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
@@ -288,9 +290,10 @@ class phpbb_default_captcha
 	{
 		global $db, $user;
 
-		$sql = 'SELECT code, confirm_id, seed, attempts
+		$sql = 'SELECT code, seed, attempts
 			FROM ' . CONFIRM_TABLE . "
-			WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
+			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
+			AND session_id = '" . $db->sql_escape($user->session_id) . "'
 				AND confirm_type = " . $this->type;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
@@ -298,7 +301,6 @@ class phpbb_default_captcha
 
 		if ($row)
 		{
-			$this->confirm_id = $row['confirm_id'];
 			$this->code = $row['code'];
 			$this->seed = $row['seed'];
 			$this->attempts = $row['attempts'];
-- 
cgit v1.2.1


From 7d22229045484897246e70cf7208a13af34c7531 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 30 Jun 2009 14:23:16 +0000
Subject: a bit of text

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9709 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 2a93b3f895..fb64063a90 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -255,8 +255,8 @@ class phpbb_default_captcha
 				'code'			=> (string) $this->code,
 				'seed'			=> (int) $this->seed)) . '
 				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
-				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
+					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
 
@@ -278,8 +278,8 @@ class phpbb_default_captcha
 				'seed'			=> (int) $this->seed)) . '
 				, attempts = attempts + 1 
 				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
-				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
+					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
 	
@@ -293,7 +293,7 @@ class phpbb_default_captcha
 		$sql = 'SELECT code, seed, attempts
 			FROM ' . CONFIRM_TABLE . "
 			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
-			AND session_id = '" . $db->sql_escape($user->session_id) . "'
+				AND session_id = '" . $db->sql_escape($user->session_id) . "'
 				AND confirm_type = " . $this->type;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
-- 
cgit v1.2.1


From 7a5db8b55d163ae4b0b0bd433362dbbe8cbbfdf4 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 16 Jul 2009 10:17:20 +0000
Subject: assign vars

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9762 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index bd8fbce0fa..41ce242e91 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -133,6 +133,8 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
 			'RECAPTCHA_ERRORGET'		=> '',
 			'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
+			'S_CONFIRM_CODE'			=> true,
+			'S_TYPE'					=> $this->type,
 		));
 
 		return 'captcha_recaptcha.html';
-- 
cgit v1.2.1


From ba0d8b5a55ae69e228f303c01ba0fe2f545489ee Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sat, 18 Jul 2009 23:37:09 +0000
Subject: Initial commit for the QA captcha. Needs language & style finetuning
 and bug searching & fixing

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9786 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 758 +++++++++++++++++++++
 1 file changed, 758 insertions(+)
 create mode 100755 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
new file mode 100755
index 0000000000..fe8a14c70f
--- /dev/null
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -0,0 +1,758 @@
+<?php
+/**
+*
+* @package VC
+* @version $Id: captcha_abstract.php 9709 2009-06-30 14:23:16Z Kellanved $
+* @copyright (c) 2006, 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+global $table_prefix;
+define('QUESTIONS_TABLE',	$table_prefix . 'captcha_questions');
+define('ANSWERS_TABLE',		$table_prefix . 'captcha_answers');
+define('QA_CONFIRM_TABLE',	$table_prefix . 'qa_confirm');
+
+
+
+/**
+* QA CAPTCHA sample implementation
+*
+* @package VC
+*/
+class phpbb_captcha_qa
+{
+	var $confirm_id;
+	var $confirm_code;
+	var $answer;
+	var $question_ids;
+	var $question_text;
+	var $question_lang;
+	var $question_strict;
+	var $attempts = 0;
+	var $type;
+	var $solved = 0;
+	var $captcha_vars = false;
+
+	function init($type)
+	{
+		global $config, $db, $user;
+
+		$user->add_lang('captcha_qa');
+		// read input
+		$this->confirm_id = request_var('confirm_id', '');
+		$this->answer = request_var('answer', '');
+
+		$this->type = (int) $type;
+		$this->question_lang = $user->data['user_lang'];
+
+		$sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\''; 
+		$result = $db->sql_query($sql, 3600);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$this->question_ids[$row['question_id']] = $row['question_id'];
+		}
+		$db->sql_freeresult($result);
+		if (!sizeof($this->question_ids))
+		{
+			$this->question_lang = $config['default_lang'];
+			$sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
+			$result = $db->sql_query($sql, 7200);
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$this->question_ids[$row['question_id']] = $row['question_id'];
+			}
+			$db->sql_freeresult($result);
+		}
+
+		if (!strlen($this->confirm_id) || !$this->load_answer())
+		{
+			// we have no confirm ID, better get ready to display something
+			$this->select_question();
+		}
+	}
+	
+	
+	function &get_instance()
+	{
+		$instance =& new phpbb_captcha_qa();
+		return $instance;
+	}
+
+
+	function is_installed()
+	{
+		global $db, $phpbb_root_path, $phpEx;
+
+		if (!class_exists('phpbb_db_tools'))
+		{
+			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
+		}
+		$db_tool = new phpbb_db_tools($db);
+		if (!$db_tool->sql_table_exists(QUESTIONS_TABLE))
+		{
+			return false;
+		}
+	}
+	
+	function is_available()
+	{
+		global $config, $db, $phpbb_root_path, $phpEx, $user;
+		
+		$user->add_lang('captcha_qa');
+		
+		if (self::is_installed())
+		{
+			return false;
+		}
+		$sql = 'SELECT COUNT(question_id) as count FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		return ((bool) $row['count']);
+	}
+
+	function get_name()
+	{
+		return 'CAPTCHA_QA';
+	}
+
+	function get_class_name()
+	{
+		return 'phpbb_captcha_qa';
+	}
+
+
+	function execute_demo()
+	{
+	}
+
+	function execute()
+	{
+	}
+
+	function get_template()
+	{
+		global $config, $user, $template, $phpEx, $phpbb_root_path;
+		
+		$template->assign_vars(array(
+			'CONFIRM_QUESTION'			=> $this->question_text,
+			'CONFIRM_ID'				=> $this->confirm_id,
+			'S_CONFIRM_CODE'			=> true,
+			'S_TYPE'					=> $this->type,
+		));
+
+		return 'captcha_qa.html';
+	}
+
+	function get_demo_template($id)
+	{
+		return 'captcha_qa_acp_demo.html';
+	}
+
+	function get_hidden_fields()
+	{
+		$hidden_fields = array();
+
+		// this is required - otherwise we would forget about the captcha being already solved
+		if ($this->solved)
+		{
+			$hidden_fields['answer'] = $this->answer;
+		}
+		$hidden_fields['confirm_id'] = $this->confirm_id;
+		return $hidden_fields;
+	}
+
+	function garbage_collect($type)
+	{
+		global $db, $config;
+
+		$sql = 'SELECT DISTINCT c.session_id
+			FROM ' . QA_CONFIRM_TABLE . ' c
+			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
+			WHERE s.session_id IS NULL' .
+				((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
+		$result = $db->sql_query($sql);
+
+		if ($row = $db->sql_fetchrow($result))
+		{
+			$sql_in = array();
+			do
+			{
+				$sql_in[] = (string) $row['session_id'];
+			}
+			while ($row = $db->sql_fetchrow($result));
+
+			if (sizeof($sql_in))
+			{
+				$sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . '
+					WHERE ' . $db->sql_in_set('session_id', $sql_in);
+				$db->sql_query($sql);
+			}
+		}
+		$db->sql_freeresult($result);
+	}
+
+	function uninstall()
+	{
+		$this->garbage_collect(0);
+	}
+
+	function install()
+	{
+		global $db, $phpbb_root_path, $phpEx;
+		
+		if (!class_exists('phpbb_db_tools'))
+		{
+			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
+		}
+		$db_tool = new phpbb_db_tools($db);
+		$tables = array(QUESTIONS_TABLE, ANSWERS_TABLE, QA_CONFIRM_TABLE);
+		
+		$schemas = array(
+				QUESTIONS_TABLE		=> array (
+								'COLUMNS' => array(
+									'question_id'	=> array('UINT', Null, 'auto_increment'),
+									'strict'		=> array('BOOL', 0),
+									'lang_id'		=> array('UINT', 0),
+									'lang_iso'		=> array('VCHAR:30', 0),
+									'question_text'	=> array('TEXT', 0),
+								),
+								'PRIMARY_KEY'		=> 'question_id',
+								'KEYS'				=> array(
+									'question_id'			=> array('INDEX', array('question_id', 'language_iso')),
+								),
+				),
+				ANSWERS_TABLE		=> array (
+								'COLUMNS' => array(
+									'question_id'	=> array('UINT', 0),
+									'answer_text'	=> array('TEXT', 0),
+								),
+								'KEYS'				=> array(
+									'question_id'			=> array('INDEX', 'question_id'),
+								),
+				),
+				QA_CONFIRM_TABLE		=> array (
+								'COLUMNS' => array(
+									'session_id'	=> array('CHAR:32', ''),
+									'confirm_id'	=> array('CHAR:32', ''),
+									'lang_iso'		=> array('VCHAR:30', 0),
+									'question_id'	=> array('UINT', 0),
+									'attempts'		=> array('UINT', 0),
+									'confirm_type'	=> array('USINT', 0),
+								),
+								'KEYS'				=> array(
+									'confirm_id'			=> array('INDEX', 'confirm_id'),
+									'lookup'				=> array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
+								),
+								'PRIMARY_KEY'		=> 'confirm_id',
+				),
+		);
+		
+
+		foreach($schemas as $table => $schema)
+		{
+			if (!$db_tool->sql_table_exists($table))
+			{
+				$db_tool->sql_create_table($table, $schema);
+			}
+		}
+	}
+
+
+	function validate()
+	{
+		global $config, $db, $user;
+		
+		$error = '';
+		if (!$this->confirm_id)
+		{
+			$error = $user->lang['CONFIRM_QUESTION_WRONG'];
+		}
+		else
+		{
+			if ($this->check_answer())
+			{
+				// $this->delete_code(); commented out to allow posting.php to repeat the question
+				$this->solved = true;
+			}
+			else
+			{
+				$error = $user->lang['CONFIRM_QUESTION_WRONG'];
+			}
+		}
+
+		if (strlen($error))
+		{
+			// okay, incorrect answer. Let's ask a new question.
+			$this->new_attempt();
+			return $error;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	*  Select a question
+	*/
+	function select_question()
+	{
+		global $db, $user;
+
+		$this->confirm_id = md5(unique_id($user->ip));
+		$this->question = (int) array_rand($this->question_ids);
+		
+		$sql = 'INSERT INTO ' . QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'confirm_id'	=> (string) $this->confirm_id,
+				'session_id'	=> (string) $user->session_id,
+				'lang_iso'		=> (string) $this->question_lang,
+				'confirm_type'	=> (int) $this->type,
+				'question_id'	=> (int) $this->question,
+		));
+		$db->sql_query($sql);
+		$this->load_answer();
+
+	}
+
+	/**
+	* New Question, if desired.
+	*/
+	function reselect_question()
+	{
+		global $db, $user;
+
+		$this->question = (int) array_rand($this->question_ids);
+		$this->solved = 0;
+		// compute $seed % 0x7fffffff
+
+		$sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+				'question'			=> (int) $this->question,)) . '
+				WHERE
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
+					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+		$db->sql_query($sql);
+		$this->load_answer();
+	}
+
+	/**
+	* New Question, if desired.
+	*/
+	function new_attempt()
+	{
+		global $db, $user;
+
+		$this->question = (int) array_rand($this->question_ids);
+		$this->solved = 0;
+		// compute $seed % 0x7fffffff
+
+		$sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+				'question_id'			=> (int) $this->question)) . ', 
+				attempts = attempts + 1 
+				WHERE
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
+					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+		$db->sql_query($sql);
+		$this->load_answer();
+	}
+	
+	/**
+	* Look up everything we need.
+	*/
+	function load_answer()
+	{
+		global $db, $user;
+
+		$sql = 'SELECT con.question_id, attempts, question_text, strict
+			FROM ' . QA_CONFIRM_TABLE . ' con, ' . QUESTIONS_TABLE . " qes 
+			WHERE con.question_id = qes.question_id
+				AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
+				AND session_id = '" . $db->sql_escape($user->session_id) . "'
+				AND qes.lang_iso = '" . $db->sql_escape($this->question_lang) . "'
+				AND confirm_type = " . $this->type;
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if ($row)
+		{
+			$this->question = $row['question_id'];
+
+			$this->attempts = $row['attempts'];
+			$this->question_strict = $row['strict'];
+			$this->question_text = $row['question_text'];
+			return true;
+		}
+		return false;
+	}
+
+	function check_answer()
+	{
+		global $db;
+		
+		$answer = ($this->question_strict) ? request_var('answer', '') : utf8_clean_string(request_var('answer', ''));
+		
+		$sql = 'SELECT answer_text
+					FROM ' . ANSWERS_TABLE . '
+					WHERE question_id = ' . (int) $this->question;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text'] );
+			if ($solution === $answer)
+			{
+				$this->solved = true;
+				break;
+			}
+		}
+		$db->sql_freeresult($result);
+		return $this->solved;
+	}
+
+	function delete_code()
+	{
+		global $db, $user;
+
+		$sql = 'DELETE FROM ' . QA_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()
+	{
+		return $this->attempts;
+	}
+
+	function reset()
+	{
+		global $db, $user;
+
+		$sql = 'DELETE FROM ' . QA_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();
+	}
+	
+	function is_solved()
+	{
+		if (request_var('answer', false) && $this->solved === 0)
+		{
+			$this->validate();
+		}
+		return (bool) $this->solved;
+	}
+	
+	function acp_page($id, &$module)
+	{
+		global $db, $user, $auth, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang('acp/board');
+		$user->add_lang('captcha_qa');
+
+		if (!$this->is_installed())
+		{
+			$this->install();
+		}
+		$module->tpl_name = 'captcha_qa_acp';
+		$module->page_title = 'ACP_VC_SETTINGS';
+		$form_key = 'acp_captcha';
+		add_form_key($form_key);
+
+		$submit = request_var('submit', false);
+		$question_id = request_var('question_id', 0);
+		$action = request_var('action', '');
+		
+		
+		$template->assign_vars(array(
+				'U_ACTION'		=> $module->u_action,
+				'QUESTION_ID'	=> $question_id ,
+				'CLASS'			=> $this->get_class_name(),
+		));
+		
+		if (!$question_id && $action != 'add')
+		{
+			$this->acp_question_list($module);
+		}
+		else if ($question_id && $action == 'delete')
+		{
+			if (confirm_box(true))
+			{
+				$this->acp_delete_question($question_id);
+				trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($module->u_action));
+			}
+			else
+			{
+				confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+					'question_id'		=> $question_id,
+					'action'			=> $action,
+					'configure'			=> 1,
+					'select_captcha'	=> $this->get_class_name(),
+					))
+				);
+			}
+		}
+		else
+		{
+			
+			$error = false;
+			$input_question = request_var('question_text', '');
+			$input_answers = request_var('answers', '');
+			$input_lang = request_var('lang_iso', '');
+			$input_strict = request_var('strict', false);
+			$langs = $this->get_languages();
+			foreach ($langs as $lang => $entry)
+			{
+				$template->assign_block_vars('langs', array(
+					'ISO' => $lang,
+					'NAME' => $entry['name'],
+				));
+			}
+			
+			if ($question_id)
+			{
+				if ($question = $this->acp_get_question_data($question_id))
+				{
+					$answers = (isset($input_answers[$lang])) ? $input_answers[$lang] : implode("\n", $question['answers']);
+					$template->assign_vars(array(
+						'QUESTION_TEXT'		=> ($input_question) ? $input_question : $question['question_text'],
+						'LANG_ISO'			=> ($input_lang) ? $input_lang : $question['lang_iso'],
+						'STRICT'			=> (isset($_REQUEST['strict'])) ? $input_strict : $question['strict'],
+						'ANSWERS'			=> $answers,
+					));
+				}
+				else
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+				}
+			}
+			else
+			{
+			
+				$template->assign_vars(array(
+						'QUESTION_TEXT'		=> $input_question,
+						'LANG_ISO'			=> $input_lang,
+						'STRICT'			=> $input_strict,
+						'ANSWERS'			=> $input_answers,
+				));
+			}
+			
+			if ($submit && check_form_key($form_key))
+			{
+				$data = $this->acp_get_question_input();
+				if (!$this->validate_input($data))
+				{
+					$template->assign_vars(array(
+						'S_ERROR'			=> true,
+					));
+				}
+				else
+				{
+					if ($question_id)
+					{
+						$this->acp_update_question($data, $question_id);
+					}
+					else
+					{
+						$this->acp_add_question($data);
+					}
+					
+					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action . "&amp;configure=1&amp;select_captcha=" . $this->get_class_name()));
+				}
+			}
+			else if ($submit)
+			{
+				trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+			}
+		}
+	}
+	
+	function acp_question_list(&$module)
+	{
+		global $db, $template;
+		
+		$sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE 1';
+		$result = $db->sql_query($sql);
+		$template->assign_vars(array(
+						'S_LIST'			=> true,
+		));
+
+		while($row = $db->sql_fetchrow($result))
+		{
+			$url = $module->u_action . "&amp;question_id={$row['question_id']}&amp;configure=1&amp;select_captcha=" . $this->get_class_name() . "&amp;";
+			
+			$template->assign_block_vars('questions', array(
+				'QUESTION_TEXT'		=> $row['question_text'],
+				'QUESTION_ID'		=> $row['question_id'],
+				'QUESTION_LANG'		=> $row['lang_iso'],
+				'U_DELETE'			=> "{$url}action=delete",
+				'U_EDIT'			=> "{$url}action=edit",
+			));
+		}
+		$db->sql_freeresult($result);
+	}
+	
+	function acp_get_question_data($question_id)
+	{
+		global $db;
+
+
+		if ($question_id)
+		{
+			$sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
+			$result = $db->sql_query($sql);
+			if ($row = $db->sql_fetchrow($result))
+			{
+				$question = $row;
+			}
+			else
+			{
+				$db->sql_freeresult($result);
+				return false;
+			}
+			$question['answers'] = array();
+			$sql = 'SELECT * FROM ' . ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
+			$result = $db->sql_query($sql);
+			while($row = $db->sql_fetchrow($result))
+			{
+				$question['answers'][] = $row['answer_text'];
+			}
+			$db->sql_freeresult($result);
+			return $question;
+		}
+		
+	}
+	
+	
+	function acp_get_question_input()
+	{
+		global $db;
+
+		$question = array(
+			'question_text'	=> request_var('question_text', ''),
+			'strict'		=> request_var('strict', false),
+			'lang_iso'		=> request_var('lang_iso', ''),
+			'answers'		=> explode("\n", request_var('answers', '')),
+		);
+		
+		return $question;
+	}
+
+
+
+	function acp_update_question($data, $question_id)
+	{
+		global $db;
+
+		$sql = "DELETE FROM " . ANSWERS_TABLE . " WHERE question_id = $question_id";
+		$db->sql_query($sql);
+		$langs = $this->get_languages();
+		$question_ary = $data;
+		$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
+		unset($question_ary['answers']);
+		$sql = "UPDATE " . QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
+				WHERE question_id = $question_id";
+		$db->sql_query($sql);
+		$this->acp_insert_answers($data, $question_id);
+	}
+	
+	function acp_add_question($data)
+	{
+		global $db;
+	
+		$langs = $this->get_languages();
+		$question_ary = $data;
+		
+		$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
+		unset($question_ary['answers']);
+		$sql = "INSERT INTO " . QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
+		$db->sql_query($sql);
+		$question_id = $db->sql_nextid();
+		$this->acp_insert_answers($data, $question_id);
+	}
+	
+	function acp_insert_answers($data, $question_id)
+	{
+		global $db;
+		
+		foreach($data['answers'] as $answer)
+		{
+			$answer_ary = array(
+				'question_id'	=> $question_id,
+				'answer_text'	=> $answer,
+			);
+			$sql = "INSERT INTO " . ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
+			$db->sql_query($sql);
+		}
+	}
+	
+
+
+	function acp_delete_question($question_id)
+	{
+		global $db;
+		
+		$tables = array(QUESTIONS_TABLE, ANSWERS_TABLE);
+		foreach($tables as $table)
+		{
+			$sql = "DELETE FROM $table WHERE question_id = $question_id";
+			$db->sql_query($sql);
+		}
+	}
+	
+	
+	function validate_input($question_data)
+	{
+		$langs = $this->get_languages();
+		if (!isset($question_data['lang_iso']) ||
+			!isset($question_data['question_text']) ||
+			!isset($question_data['strict']) ||
+			!isset($question_data['answers']))
+		{
+			return false;
+		}
+		if (!isset($langs[$question_data['lang_iso']]) ||
+			!$question_data['question_text'] ||
+			!sizeof($question_data['answers']))
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	function get_languages()
+	{
+		global $db;
+		
+		$langs = array();
+		$sql = 'SELECT * FROM ' . LANG_TABLE . ' WHERE 1';
+		$result = $db->sql_query($sql);
+		while($row = $db->sql_fetchrow($result))
+		{
+			$langs[$row['lang_iso']] = array(
+				'name'	=> $row['lang_local_name'],
+				'id'	=> $row['lang_id'],
+			);
+		}
+		$db->sql_freeresult($result);
+		return $langs;
+	}
+	
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From 08a7255c8eb517a2b536e7be1f198619a30c7f69 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sat, 18 Jul 2009 23:39:45 +0000
Subject: Initial commit for the QA captcha. Needs language & style finetuning
 and bug searching & fixing

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9787 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
old mode 100755
new mode 100644
-- 
cgit v1.2.1


From 45e127fc64bd6876aedd77e4d28d74a547baae04 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 19 Jul 2009 09:51:25 +0000
Subject: First round of fixes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9793 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index fe8a14c70f..bcb1370a1b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -97,10 +97,7 @@ class phpbb_captcha_qa
 			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
 		}
 		$db_tool = new phpbb_db_tools($db);
-		if (!$db_tool->sql_table_exists(QUESTIONS_TABLE))
-		{
-			return false;
-		}
+		return $db_tool->sql_table_exists(QUESTIONS_TABLE);
 	}
 	
 	function is_available()
@@ -109,7 +106,7 @@ class phpbb_captcha_qa
 		
 		$user->add_lang('captcha_qa');
 		
-		if (self::is_installed())
+		if (!self::is_installed())
 		{
 			return false;
 		}
-- 
cgit v1.2.1


From a8c759a033195431b35137987fed2d0a556c6a1a Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 19 Jul 2009 09:51:50 +0000
Subject: First round of fixes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9794 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index bcb1370a1b..1992117e09 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -225,7 +225,7 @@ class phpbb_captcha_qa
 								),
 								'PRIMARY_KEY'		=> 'question_id',
 								'KEYS'				=> array(
-									'question_id'			=> array('INDEX', array('question_id', 'language_iso')),
+									'question_id'			=> array('INDEX', array('question_id', 'lang_iso')),
 								),
 				),
 				ANSWERS_TABLE		=> array (
-- 
cgit v1.2.1


From ff60fc9c1e6565eb12f4c8f4591c5cafc012bfb7 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 20 Jul 2009 10:22:13 +0000
Subject: fixing back links

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9801 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 12 ++++++++----
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php  |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 1992117e09..d6ef8f50b1 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -474,6 +474,7 @@ class phpbb_captcha_qa
 		$question_id = request_var('question_id', 0);
 		$action = request_var('action', '');
 		
+		$list_url = $module->u_action . "&amp;configure=1&amp;select_captcha=" . $this->get_class_name();
 		
 		$template->assign_vars(array(
 				'U_ACTION'		=> $module->u_action,
@@ -490,7 +491,7 @@ class phpbb_captcha_qa
 			if (confirm_box(true))
 			{
 				$this->acp_delete_question($question_id);
-				trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($module->u_action));
+				trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($list_url));
 			}
 			else
 			{
@@ -520,6 +521,9 @@ class phpbb_captcha_qa
 				));
 			}
 			
+			$template->assign_vars(array(
+						'U_LIST'		=> $list_url,
+			));
 			if ($question_id)
 			{
 				if ($question = $this->acp_get_question_data($question_id))
@@ -534,7 +538,7 @@ class phpbb_captcha_qa
 				}
 				else
 				{
-					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($list_url));
 				}
 			}
 			else
@@ -568,12 +572,12 @@ class phpbb_captcha_qa
 						$this->acp_add_question($data);
 					}
 					
-					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action . "&amp;configure=1&amp;select_captcha=" . $this->get_class_name()));
+					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url));
 				}
 			}
 			else if ($submit)
 			{
-				trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
+				trigger_error($user->lang['FORM_INVALID'] . adm_back_link($list_url));
 			}
 		}
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 41ce242e91..f148b12656 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -36,7 +36,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	{
 		global $config, $db, $user;
 
-		$user->add_lang('recaptcha');
+		$user->add_lang('captcha_recaptcha');
 		parent::init($type);
 		$this->challenge = request_var('recaptcha_challenge_field', '');
 		$this->response = request_var('recaptcha_response_field', '');
@@ -51,7 +51,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	function is_available()
 	{
 		global $config, $user;
-		$user->add_lang('recaptcha');
+		$user->add_lang('captcha_recaptcha');
 		return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
 	}
 
-- 
cgit v1.2.1


From 04b948c5fd8e7bf8be35c1cedf9bdab1f309e0cb Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 20 Jul 2009 10:42:27 +0000
Subject: cleaning

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9803 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 133 ++++++++++++++++++---
 1 file changed, 116 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index d6ef8f50b1..fdbbf1d218 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -24,6 +24,7 @@ define('QA_CONFIRM_TABLE',	$table_prefix . 'qa_confirm');
 
 
 /**
+* And now to something completely different. Let's make a captcha without extending the abstract class.
 * QA CAPTCHA sample implementation
 *
 * @package VC
@@ -39,9 +40,12 @@ class phpbb_captcha_qa
 	var $question_strict;
 	var $attempts = 0;
 	var $type;
+	// dirty trick: 0 is false, but can still encode that the captcha is not yet validated
 	var $solved = 0;
-	var $captcha_vars = false;
 
+	/**
+	* @param int $type  as per the CAPTCHA API docs, the type
+	*/
 	function init($type)
 	{
 		global $config, $db, $user;
@@ -53,7 +57,8 @@ class phpbb_captcha_qa
 
 		$this->type = (int) $type;
 		$this->question_lang = $user->data['user_lang'];
-
+		// we need all defined questions - shouldn't be too many, so we can just grab them
+		// try the user's lang first
 		$sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\''; 
 		$result = $db->sql_query($sql, 3600);
 		while ($row = $db->sql_fetchrow($result))
@@ -61,6 +66,7 @@ class phpbb_captcha_qa
 			$this->question_ids[$row['question_id']] = $row['question_id'];
 		}
 		$db->sql_freeresult($result);
+		// fallback to the board default lang
 		if (!sizeof($this->question_ids))
 		{
 			$this->question_lang = $config['default_lang'];
@@ -73,21 +79,26 @@ class phpbb_captcha_qa
 			$db->sql_freeresult($result);
 		}
 
+		// okay, if there is a confirm_id, we try to load that confirm's state
 		if (!strlen($this->confirm_id) || !$this->load_answer())
 		{
-			// we have no confirm ID, better get ready to display something
+			// we have no valid confirm ID, better get ready to ask something
 			$this->select_question();
 		}
 	}
 	
-	
+	/**
+	*  API function
+	*/
 	function &get_instance()
 	{
 		$instance =& new phpbb_captcha_qa();
 		return $instance;
 	}
 
-
+	/**
+	* See if the captcha has created its tables.
+	*/
 	function is_installed()
 	{
 		global $db, $phpbb_root_path, $phpEx;
@@ -100,6 +111,9 @@ class phpbb_captcha_qa
 		return $db_tool->sql_table_exists(QUESTIONS_TABLE);
 	}
 	
+	/**
+	*  API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
+	*/
 	function is_available()
 	{
 		global $config, $db, $phpbb_root_path, $phpEx, $user;
@@ -117,28 +131,43 @@ class phpbb_captcha_qa
 		return ((bool) $row['count']);
 	}
 
+	/**
+	*  API function
+	*/
 	function get_name()
 	{
 		return 'CAPTCHA_QA';
 	}
 
+	/**
+	*  API function
+	*/
 	function get_class_name()
 	{
 		return 'phpbb_captcha_qa';
 	}
 
 
+	/**
+	*  API function - not needed as we don't display an image
+	*/
 	function execute_demo()
 	{
 	}
 
+	/**
+	*  API function - not needed as we don't display an image
+	*/
 	function execute()
 	{
 	}
 
+	/**
+	*  API function - send the question to the template
+	*/
 	function get_template()
 	{
-		global $config, $user, $template, $phpEx, $phpbb_root_path;
+		global $template;
 		
 		$template->assign_vars(array(
 			'CONFIRM_QUESTION'			=> $this->question_text,
@@ -150,11 +179,17 @@ class phpbb_captcha_qa
 		return 'captcha_qa.html';
 	}
 
-	function get_demo_template($id)
+	/**
+	*  API function - we just display a mockup so that the captcha doesn't need to be installed
+	*/
+	function get_demo_template()
 	{
 		return 'captcha_qa_acp_demo.html';
 	}
 
+	/**
+	*  API function
+	*/
 	function get_hidden_fields()
 	{
 		$hidden_fields = array();
@@ -168,6 +203,9 @@ class phpbb_captcha_qa
 		return $hidden_fields;
 	}
 
+	/**
+	*  API function
+	*/
 	function garbage_collect($type)
 	{
 		global $db, $config;
@@ -198,11 +236,17 @@ class phpbb_captcha_qa
 		$db->sql_freeresult($result);
 	}
 
+	/**
+	*  API function - we don't drop the tables here, as that would cause the loss of all entered questions.
+	*/
 	function uninstall()
 	{
 		$this->garbage_collect(0);
 	}
 
+	/**
+	*  API function - set up shop
+	*/
 	function install()
 	{
 		global $db, $phpbb_root_path, $phpEx;
@@ -226,6 +270,7 @@ class phpbb_captcha_qa
 								'PRIMARY_KEY'		=> 'question_id',
 								'KEYS'				=> array(
 									'question_id'			=> array('INDEX', array('question_id', 'lang_iso')),
+									'lang_iso'			=> array('INDEX', 'lang_iso'),
 								),
 				),
 				ANSWERS_TABLE		=> array (
@@ -254,7 +299,6 @@ class phpbb_captcha_qa
 				),
 		);
 		
-
 		foreach($schemas as $table => $schema)
 		{
 			if (!$db_tool->sql_table_exists($table))
@@ -265,6 +309,9 @@ class phpbb_captcha_qa
 	}
 
 
+	/**
+	*  API function - see what has to be done to validate
+	*/
 	function validate()
 	{
 		global $config, $db, $user;
@@ -342,12 +389,13 @@ class phpbb_captcha_qa
 	}
 
 	/**
-	* New Question, if desired.
+	* Wrong answer, so we increase the attempts and use a different question.
 	*/
 	function new_attempt()
 	{
 		global $db, $user;
 
+		// yah, I would prefer a stronger rand, but this should work
 		$this->question = (int) array_rand($this->question_ids);
 		$this->solved = 0;
 		// compute $seed % 0x7fffffff
@@ -363,7 +411,7 @@ class phpbb_captcha_qa
 	}
 	
 	/**
-	* Look up everything we need.
+	* Look up everything we need and populate the instance variables.
 	*/
 	function load_answer()
 	{
@@ -392,6 +440,9 @@ class phpbb_captcha_qa
 		return false;
 	}
 
+	/**
+	*  The actual validation
+	*/
 	function check_answer()
 	{
 		global $db;
@@ -415,6 +466,9 @@ class phpbb_captcha_qa
 		return $this->solved;
 	}
 
+	/**
+	*  API function - clean the entry
+	*/
 	function delete_code()
 	{
 		global $db, $user;
@@ -426,11 +480,17 @@ class phpbb_captcha_qa
 		$db->sql_query($sql);
 	}
 
+	/**
+	*  API function 
+	*/
 	function get_attempt_count()
 	{
 		return $this->attempts;
 	}
 
+	/**
+	*  API function 
+	*/
 	function reset()
 	{
 		global $db, $user;
@@ -443,7 +503,10 @@ class phpbb_captcha_qa
 		// we leave the class usable by generating a new question
 		$this->generate_code();
 	}
-	
+
+	/**
+	*  API function 
+	*/
 	function is_solved()
 	{
 		if (request_var('answer', false) && $this->solved === 0)
@@ -453,6 +516,10 @@ class phpbb_captcha_qa
 		return (bool) $this->solved;
 	}
 	
+	
+	/**
+	*  API function - The ACP backend, this marks the end of the easy methods
+	*/
 	function acp_page($id, &$module)
 	{
 		global $db, $user, $auth, $template;
@@ -474,6 +541,7 @@ class phpbb_captcha_qa
 		$question_id = request_var('question_id', 0);
 		$action = request_var('action', '');
 		
+		// we have two pages, so users might want to navigate from one to the other
 		$list_url = $module->u_action . "&amp;configure=1&amp;select_captcha=" . $this->get_class_name();
 		
 		$template->assign_vars(array(
@@ -481,7 +549,8 @@ class phpbb_captcha_qa
 				'QUESTION_ID'	=> $question_id ,
 				'CLASS'			=> $this->get_class_name(),
 		));
-		
+
+		// show the list?
 		if (!$question_id && $action != 'add')
 		{
 			$this->acp_question_list($module);
@@ -506,7 +575,7 @@ class phpbb_captcha_qa
 		}
 		else
 		{
-			
+			// okay, show the editor
 			$error = false;
 			$input_question = request_var('question_text', '');
 			$input_answers = request_var('answers', '');
@@ -582,6 +651,10 @@ class phpbb_captcha_qa
 		}
 	}
 	
+
+	/**
+	*  This handles the list overview
+	*/
 	function acp_question_list(&$module)
 	{
 		global $db, $template;
@@ -606,7 +679,10 @@ class phpbb_captcha_qa
 		}
 		$db->sql_freeresult($result);
 	}
-	
+
+	/**
+	*  Grab a question and bring it into a format the editor understands
+	*/
 	function acp_get_question_data($question_id)
 	{
 		global $db;
@@ -639,6 +715,9 @@ class phpbb_captcha_qa
 	}
 	
 	
+	/**
+	*  Grab a question from input and bring it into a format the editor understands
+	*/
 	function acp_get_question_input()
 	{
 		global $db;
@@ -653,12 +732,15 @@ class phpbb_captcha_qa
 		return $question;
 	}
 
-
-
+	/**
+	*  Update a question.
+	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
+	*/
 	function acp_update_question($data, $question_id)
 	{
 		global $db;
 
+		// easier to delete all answers than to figure out which to update
 		$sql = "DELETE FROM " . ANSWERS_TABLE . " WHERE question_id = $question_id";
 		$db->sql_query($sql);
 		$langs = $this->get_languages();
@@ -671,6 +753,10 @@ class phpbb_captcha_qa
 		$this->acp_insert_answers($data, $question_id);
 	}
 	
+	/**
+	*  Insert a question.
+	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
+	*/
 	function acp_add_question($data)
 	{
 		global $db;
@@ -686,6 +772,10 @@ class phpbb_captcha_qa
 		$this->acp_insert_answers($data, $question_id);
 	}
 	
+	/**
+	*  Insert the answers.
+	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
+	*/
 	function acp_insert_answers($data, $question_id)
 	{
 		global $db;
@@ -702,7 +792,9 @@ class phpbb_captcha_qa
 	}
 	
 
-
+	/**
+	*  Delete a question.
+	*/
 	function acp_delete_question($question_id)
 	{
 		global $db;
@@ -716,6 +808,10 @@ class phpbb_captcha_qa
 	}
 	
 	
+	/**
+	*  Check if the entered data can be inserted/used
+	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
+	*/
 	function validate_input($question_data)
 	{
 		$langs = $this->get_languages();
@@ -736,6 +832,9 @@ class phpbb_captcha_qa
 		return true;
 	}
 	
+	/**
+	* List the installed language packs
+	*/
 	function get_languages()
 	{
 		global $db;
-- 
cgit v1.2.1


From 783da3064a2a4e7163230b75cacb6ef7073493dc Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 20 Jul 2009 18:27:26 +0000
Subject: rename variables to avoid name clashes in aggregating plugins

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9808 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_qa_plugin.php        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index fdbbf1d218..cd5ee8c91d 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -50,10 +50,11 @@ class phpbb_captcha_qa
 	{
 		global $config, $db, $user;
 
+		// load our language file 
 		$user->add_lang('captcha_qa');
 		// read input
-		$this->confirm_id = request_var('confirm_id', '');
-		$this->answer = request_var('answer', '');
+		$this->confirm_id = request_var('qa_confirm_id', '');
+		$this->answer = request_var('qa_answer', '');
 
 		$this->type = (int) $type;
 		$this->question_lang = $user->data['user_lang'];
@@ -118,6 +119,7 @@ class phpbb_captcha_qa
 	{
 		global $config, $db, $phpbb_root_path, $phpEx, $user;
 		
+		// load language file for pretty display in the ACP dropdown
 		$user->add_lang('captcha_qa');
 		
 		if (!self::is_installed())
@@ -170,8 +172,8 @@ class phpbb_captcha_qa
 		global $template;
 		
 		$template->assign_vars(array(
-			'CONFIRM_QUESTION'			=> $this->question_text,
-			'CONFIRM_ID'				=> $this->confirm_id,
+			'QA_CONFIRM_QUESTION'		=> $this->question_text,
+			'QA_CONFIRM_ID'				=> $this->confirm_id,
 			'S_CONFIRM_CODE'			=> true,
 			'S_TYPE'					=> $this->type,
 		));
@@ -197,9 +199,9 @@ class phpbb_captcha_qa
 		// this is required - otherwise we would forget about the captcha being already solved
 		if ($this->solved)
 		{
-			$hidden_fields['answer'] = $this->answer;
+			$hidden_fields['qa_answer'] = $this->answer;
 		}
-		$hidden_fields['confirm_id'] = $this->confirm_id;
+		$hidden_fields['qa_confirm_id'] = $this->confirm_id;
 		return $hidden_fields;
 	}
 
@@ -447,7 +449,7 @@ class phpbb_captcha_qa
 	{
 		global $db;
 		
-		$answer = ($this->question_strict) ? request_var('answer', '') : utf8_clean_string(request_var('answer', ''));
+		$answer = ($this->question_strict) ? request_var('qa_answer', '') : utf8_clean_string(request_var('qa_answer', ''));
 		
 		$sql = 'SELECT answer_text
 					FROM ' . ANSWERS_TABLE . '
@@ -509,7 +511,7 @@ class phpbb_captcha_qa
 	*/
 	function is_solved()
 	{
-		if (request_var('answer', false) && $this->solved === 0)
+		if (request_var('qa_answer', false) && $this->solved === 0)
 		{
 			$this->validate();
 		}
-- 
cgit v1.2.1


From c04626fa4db74dd5effda4574616460d919bedb9 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 22 Jul 2009 10:42:01 +0000
Subject: index for GC

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9826 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index cd5ee8c91d..c8951cd167 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -294,7 +294,7 @@ class phpbb_captcha_qa
 									'confirm_type'	=> array('USINT', 0),
 								),
 								'KEYS'				=> array(
-									'confirm_id'			=> array('INDEX', 'confirm_id'),
+									'session_id'			=> array('INDEX', 'session_id'),
 									'lookup'				=> array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
 								),
 								'PRIMARY_KEY'		=> 'confirm_id',
-- 
cgit v1.2.1


From 2dfd327828a5f6387ea051aa9e588f39249ed059 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 22 Jul 2009 10:57:56 +0000
Subject: index for GC

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9827 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index c8951cd167..7367816ae8 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -271,7 +271,6 @@ class phpbb_captcha_qa
 								),
 								'PRIMARY_KEY'		=> 'question_id',
 								'KEYS'				=> array(
-									'question_id'			=> array('INDEX', array('question_id', 'lang_iso')),
 									'lang_iso'			=> array('INDEX', 'lang_iso'),
 								),
 				),
-- 
cgit v1.2.1


From 63dc25e5b4596d0f00e4f1dff7fb232141e5227c Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 27 Jul 2009 06:15:47 +0000
Subject: #48685

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9865 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 7367816ae8..0a0a9f9211 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -54,7 +54,7 @@ class phpbb_captcha_qa
 		$user->add_lang('captcha_qa');
 		// read input
 		$this->confirm_id = request_var('qa_confirm_id', '');
-		$this->answer = request_var('qa_answer', '');
+		$this->answer = request_var('qa_answer', '', true);
 
 		$this->type = (int) $type;
 		$this->question_lang = $user->data['user_lang'];
@@ -448,7 +448,7 @@ class phpbb_captcha_qa
 	{
 		global $db;
 		
-		$answer = ($this->question_strict) ? request_var('qa_answer', '') : utf8_clean_string(request_var('qa_answer', ''));
+		$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
 		
 		$sql = 'SELECT answer_text
 					FROM ' . ANSWERS_TABLE . '
@@ -578,9 +578,9 @@ class phpbb_captcha_qa
 		{
 			// okay, show the editor
 			$error = false;
-			$input_question = request_var('question_text', '');
-			$input_answers = request_var('answers', '');
-			$input_lang = request_var('lang_iso', '');
+			$input_question = request_var('question_text', '', true);
+			$input_answers = request_var('answers', '', true);
+			$input_lang = request_var('lang_iso', '', true);
 			$input_strict = request_var('strict', false);
 			$langs = $this->get_languages();
 			foreach ($langs as $lang => $entry)
@@ -724,10 +724,10 @@ class phpbb_captcha_qa
 		global $db;
 
 		$question = array(
-			'question_text'	=> request_var('question_text', ''),
+			'question_text'	=> request_var('question_text', '', true),
 			'strict'		=> request_var('strict', false),
 			'lang_iso'		=> request_var('lang_iso', ''),
-			'answers'		=> explode("\n", request_var('answers', '')),
+			'answers'		=> explode("\n", request_var('answers', '', true)),
 		);
 		
 		return $question;
-- 
cgit v1.2.1


From a0acfb6a3fce9a547d19c28ac99654275152ac98 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 27 Jul 2009 11:39:28 +0000
Subject: Minor captcha API change - disable display of plugin by returning
 false in get_template.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9869 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../includes/captcha/plugins/captcha_abstract.php  | 37 +++++++++++++---------
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 21 ++++++++----
 .../captcha/plugins/phpbb_recaptcha_plugin.php     | 27 ++++++++++------
 3 files changed, 53 insertions(+), 32 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index fb64063a90..d24e554188 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -87,21 +87,28 @@ class phpbb_default_captcha
 	{
 		global $config, $user, $template, $phpEx, $phpbb_root_path;
 		
-		$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
-		$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
-		
-		$template->assign_vars(array(
-			'CONFIRM_IMAGE_LINK'		=> $link,
-			'CONFIRM_IMAGE'				=> '<img src="'. $link . '" />',
-			'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
-			'CONFIRM_ID'				=> $this->confirm_id,
-			'S_CONFIRM_CODE'			=> true,
-			'S_TYPE'					=> $this->type,
-			'S_CONFIRM_REFRESH'			=> ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
-			'L_CONFIRM_EXPLAIN'			=> $explain,
-		));
-
-		return 'captcha_default.html';
+		if ($this->is_solved())
+		{
+			return false;
+		}
+		else
+		{
+			$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
+			$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
+			
+			$template->assign_vars(array(
+				'CONFIRM_IMAGE_LINK'		=> $link,
+				'CONFIRM_IMAGE'				=> '<img src="'. $link . '" />',
+				'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
+				'CONFIRM_ID'				=> $this->confirm_id,
+				'S_CONFIRM_CODE'			=> true,
+				'S_TYPE'					=> $this->type,
+				'S_CONFIRM_REFRESH'			=> ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
+				'L_CONFIRM_EXPLAIN'			=> $explain,
+			));
+
+			return 'captcha_default.html';
+		}
 	}
 
 	function get_demo_template($id)
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 0a0a9f9211..1b34f26bfa 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -171,14 +171,21 @@ class phpbb_captcha_qa
 	{
 		global $template;
 		
-		$template->assign_vars(array(
-			'QA_CONFIRM_QUESTION'		=> $this->question_text,
-			'QA_CONFIRM_ID'				=> $this->confirm_id,
-			'S_CONFIRM_CODE'			=> true,
-			'S_TYPE'					=> $this->type,
-		));
+		if ($this->is_solved())
+		{
+			return false;
+		}
+		else
+		{
+			$template->assign_vars(array(
+				'QA_CONFIRM_QUESTION'		=> $this->question_text,
+				'QA_CONFIRM_ID'				=> $this->confirm_id,
+				'S_CONFIRM_CODE'			=> true,
+				'S_TYPE'					=> $this->type,
+			));
 
-		return 'captcha_qa.html';
+			return 'captcha_qa.html';
+		}
 	}
 
 	/**
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index f148b12656..9a2cc11ebd 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -128,16 +128,23 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	{
 		global $config, $user, $template;
 
-		$template->assign_vars(array(
-			'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
-			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
-			'RECAPTCHA_ERRORGET'		=> '',
-			'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
-			'S_CONFIRM_CODE'			=> true,
-			'S_TYPE'					=> $this->type,
-		));
-
-		return 'captcha_recaptcha.html';
+		if ($this->is_solved())
+		{
+			return false;
+		}
+		else
+		{
+			$template->assign_vars(array(
+				'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
+				'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
+				'RECAPTCHA_ERRORGET'		=> '',
+				'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
+				'S_CONFIRM_CODE'			=> true,
+				'S_TYPE'					=> $this->type,
+			));
+
+			return 'captcha_recaptcha.html';
+		}
 	}
 
 	function get_demo_template($id)
-- 
cgit v1.2.1


From f0820bc4426983ec7ef64e4ae7684020464fe6dc Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 27 Jul 2009 13:19:06 +0000
Subject: typo

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9874 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 9a2cc11ebd..3ad58851b4 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -156,7 +156,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	{
 		$hidden_fields = array();
 
-		// this is required for postig.php - otherwise we would forget about the captcha being already solved
+		// this is required for posting.php - otherwise we would forget about the captcha being already solved
 		if ($this->solved)
 		{
 			$hidden_fields['confirm_code'] = $this->confirm_code;
-- 
cgit v1.2.1


From fc4aaa3f5a32d8d7295197f15b2b9355b851342a Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 28 Jul 2009 07:05:17 +0000
Subject: #48735

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9877 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 1b34f26bfa..4836d7906f 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -32,7 +32,6 @@ define('QA_CONFIRM_TABLE',	$table_prefix . 'qa_confirm');
 class phpbb_captcha_qa
 {
 	var $confirm_id;
-	var $confirm_code;
 	var $answer;
 	var $question_ids;
 	var $question_text;
@@ -509,7 +508,7 @@ class phpbb_captcha_qa
 		$db->sql_query($sql);
 
 		// we leave the class usable by generating a new question
-		$this->generate_code();
+		$this->select_question();
 	}
 
 	/**
-- 
cgit v1.2.1


From 49625a2aec3f1fbc83952d9d7ba207995120a436 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 29 Jul 2009 22:59:51 +0000
Subject: Props.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9891 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 4836d7906f..76e5a3163c 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package VC
-* @version $Id: captcha_abstract.php 9709 2009-06-30 14:23:16Z Kellanved $
+* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
-- 
cgit v1.2.1


From 81998a510462f87acf4dc1f93d99b85f1025580c Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 4 Aug 2009 15:34:45 +0000
Subject: use new flag to place captcha errors in the error log (if debug is
 set)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9921 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index d24e554188..ceb9c4f9fb 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -66,6 +66,7 @@ class phpbb_default_captcha
 		$this->seed -= 0x7fffffff * floor($this->seed / 0x7fffffff);
 
 		$captcha = new captcha();
+		define('IMAGE_OUTPUT', 1);
 		$captcha->execute($this->code, $this->seed);
 	}
 
@@ -80,6 +81,7 @@ class phpbb_default_captcha
 			}
 		}
 		$captcha = new captcha();
+		define('IMAGE_OUTPUT', 1);
 		$captcha->execute($this->code, $this->seed);
 	}
 
-- 
cgit v1.2.1


From 04263dfa312f7daab82ab629477d785253af896a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 7 Aug 2009 14:31:24 +0000
Subject: Coding guidelines: Tiny whitespace change for an unreleased file.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9939 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index ceb9c4f9fb..72f343d6b8 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -100,8 +100,8 @@ class phpbb_default_captcha
 			
 			$template->assign_vars(array(
 				'CONFIRM_IMAGE_LINK'		=> $link,
-				'CONFIRM_IMAGE'				=> '<img src="'. $link . '" />',
-				'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
+				'CONFIRM_IMAGE'				=> '<img src="' . $link . '" />',
+				'CONFIRM_IMG'				=> '<img src="' . $link . '" />',
 				'CONFIRM_ID'				=> $this->confirm_id,
 				'S_CONFIRM_CODE'			=> true,
 				'S_TYPE'					=> $this->type,
-- 
cgit v1.2.1


From bc8e507c64a576eef209c5a72cf2965d56d6016a Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 7 Aug 2009 15:37:27 +0000
Subject: include vs include_once

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9940 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 2 +-
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index ce678b6d29..5021045785 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 if (!class_exists('captcha_abstract'))
 {
-	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
+	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 /**
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 1fc859532a..ac30ed4297 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 if (!class_exists('phpbb_default_captcha'))
 {
-	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
+	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 /**
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 3ad58851b4..b7b3ab07d3 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 if (!class_exists('phpbb_default_captcha'))
 {
 	// we need the classic captcha code for tracking solutions and attempts
-	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
+	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 /**
-- 
cgit v1.2.1


From 2547955b619e009df9c9ee4b8be2cc7c6da14630 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 10 Aug 2009 09:46:38 +0000
Subject: class name

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9942 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 5021045785..2f55d15efd 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 /**
 * Placeholder for autoload
 */
-if (!class_exists('captcha_abstract'))
+if (!class_exists('phpbb_default_captcha'))
 {
 	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
-- 
cgit v1.2.1


From af213166f36f3e71e4f3387827629fea5d190711 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 12 Aug 2009 19:57:34 +0000
Subject: some fixes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9967 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 76e5a3163c..9b05f25dd3 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -121,7 +121,7 @@ class phpbb_captcha_qa
 		// load language file for pretty display in the ACP dropdown
 		$user->add_lang('captcha_qa');
 		
-		if (!self::is_installed())
+		if (!phpbb_captcha_qa::is_installed())
 		{
 			return false;
 		}
@@ -273,7 +273,7 @@ class phpbb_captcha_qa
 									'strict'		=> array('BOOL', 0),
 									'lang_id'		=> array('UINT', 0),
 									'lang_iso'		=> array('VCHAR:30', 0),
-									'question_text'	=> array('TEXT', 0),
+									'question_text'	=> array('TEXT_UNI', ''),
 								),
 								'PRIMARY_KEY'		=> 'question_id',
 								'KEYS'				=> array(
@@ -283,7 +283,7 @@ class phpbb_captcha_qa
 				ANSWERS_TABLE		=> array (
 								'COLUMNS' => array(
 									'question_id'	=> array('UINT', 0),
-									'answer_text'	=> array('TEXT', 0),
+									'answer_text'	=> array('STEXT_UNI', ''),
 								),
 								'KEYS'				=> array(
 									'question_id'			=> array('INDEX', 'question_id'),
-- 
cgit v1.2.1


From 929fd29ce13ad42235b58f327b694a00780ebe5e Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 12 Aug 2009 22:03:14 +0000
Subject: some fixes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9968 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 9b05f25dd3..cdbb7ea864 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -272,7 +272,7 @@ class phpbb_captcha_qa
 									'question_id'	=> array('UINT', Null, 'auto_increment'),
 									'strict'		=> array('BOOL', 0),
 									'lang_id'		=> array('UINT', 0),
-									'lang_iso'		=> array('VCHAR:30', 0),
+									'lang_iso'		=> array('VCHAR:30', ''),
 									'question_text'	=> array('TEXT_UNI', ''),
 								),
 								'PRIMARY_KEY'		=> 'question_id',
@@ -293,7 +293,7 @@ class phpbb_captcha_qa
 								'COLUMNS' => array(
 									'session_id'	=> array('CHAR:32', ''),
 									'confirm_id'	=> array('CHAR:32', ''),
-									'lang_iso'		=> array('VCHAR:30', 0),
+									'lang_iso'		=> array('VCHAR:30', ''),
 									'question_id'	=> array('UINT', 0),
 									'attempts'		=> array('UINT', 0),
 									'confirm_type'	=> array('USINT', 0),
-- 
cgit v1.2.1


From 63cbd43b5ec139025afe2ba01020d2447e72adc1 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 14 Aug 2009 08:49:46 +0000
Subject: That's not supported by php4 and part of the full 3.1 system anyway

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9973 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/captcha_plugin.php | 99 -------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 phpBB/includes/captcha/captcha_plugin.php

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_plugin.php b/phpBB/includes/captcha/captcha_plugin.php
deleted file mode 100644
index 7c601caa93..0000000000
--- a/phpBB/includes/captcha/captcha_plugin.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-interface phpbb_captcha_plugin
-{
-	/**
-	* Initiates the CAPTCHA to validate codes. 
-	* @param int $type the type as defined in constants.php
-	*/
-	function init($type);
-
-
-	/**
-	* Returns true if the captcha will work on the current install
-	*/
-	static function is_available();
-	
-	/**
-	* Returns the translated pretty name of the captcha.
-	*/
-	static function get_name();
-	
-	/**
-	* Returns the class name of the captcha.
-	*/
-	static function get_class_name();
-	
-	/**
-	* Returns an instance; does not have to be the same instance twice.
-	*/
-	static function get_instance();
-
-	/**
-	* Returns the HTML needed to embed the captcha in another template
-	*/
-	function get_template();
-	
-	
-	/**
-	* Delivers the image of image based captchas; not required for text/remote etc CAPTCHAs
-	*/
-	function execute();
-	
-	/**
-	* Returns the HTML needed to display a demo of the captcha
-	*/
-	function get_demo_template($id);
-	
-	
-	/**
-	* Delivers the demo image of image based captchas; not required for text/remote etc CAPTCHAs
-	*/
-	function execute_demo();
-	
-	/**
-	* Clears leftover entries in the database. 
-	*/
-	static function garbage_collect($type);
-	
-	
-	/**
-	* Clears all entries from the database if the CAPTCHA is replaced
-	*/
-	function uninstall();
-	
-	/**
-	* Sets up the CAPTCHA when it is selected in the ACP.
-	*/
-	function install();
-	
-	
-	/**
-	* Checks the captcha; returns false if the code was correct; a translated error string otherwise
-	*/
-	function validate();
-	
-	/**
-	* Prepares the captcha to ask a new question; required call on failed answers
-	*/
-	function reset();
-	
-	/**
-	* Displays the configuration options in the ACP
-	*/
-	function acp_page($id, &$module);
-		
-	/**
-	* Returns the entries for the hidden field array needed to preserve the current state.
-	*/
-	function get_hidden_fields();
-	
-	
-	/**
-	* Returns the number of solving attempts of the current user 
-	*/
-	function get_attempt_count();
-
-}
-
-?>
\ No newline at end of file
-- 
cgit v1.2.1


From 918e66758795f744092fce2d423f6d43bb00b7c0 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 14 Aug 2009 10:00:30 +0000
Subject: #49675 #49655 - ATTENTION: small captcha API change

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9975 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../includes/captcha/plugins/captcha_abstract.php  |  8 +++
 .../captcha/plugins/phpbb_captcha_gd_plugin.php    |  8 +++
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 66 +++++++++++++---------
 .../captcha/plugins/phpbb_recaptcha_plugin.php     |  8 +++
 4 files changed, 62 insertions(+), 28 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 72f343d6b8..08ca0a91e4 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -362,6 +362,14 @@ class phpbb_default_captcha
 		return (bool) $this->solved;
 	}
 	
+	/**
+	*  API function
+	*/
+	function has_config()
+	{
+		return false;
+	}
+	
 }
 
 ?>
\ 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 ab71da10d7..863d31a45d 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -73,6 +73,14 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		return can_load_dll('gd');
 	}
 
+	/**
+	*  API function
+	*/
+	function has_config()
+	{
+		return true;
+	}
+	
 	function get_name()
 	{
 		return 'CAPTCHA_GD';
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index cdbb7ea864..84730a738c 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -17,9 +17,9 @@ if (!defined('IN_PHPBB'))
 }
 
 global $table_prefix;
-define('QUESTIONS_TABLE',	$table_prefix . 'captcha_questions');
-define('ANSWERS_TABLE',		$table_prefix . 'captcha_answers');
-define('QA_CONFIRM_TABLE',	$table_prefix . 'qa_confirm');
+define('CAPTCHA_QUESTIONS_TABLE',	$table_prefix . 'captcha_questions');
+define('CAPTCHA_ANSWERS_TABLE',		$table_prefix . 'captcha_answers');
+define('CAPTCHA_QA_CONFIRM_TABLE',	$table_prefix . 'qa_confirm');
 
 
 
@@ -59,7 +59,7 @@ class phpbb_captcha_qa
 		$this->question_lang = $user->data['user_lang'];
 		// we need all defined questions - shouldn't be too many, so we can just grab them
 		// try the user's lang first
-		$sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\''; 
+		$sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\''; 
 		$result = $db->sql_query($sql, 3600);
 		while ($row = $db->sql_fetchrow($result))
 		{
@@ -70,7 +70,7 @@ class phpbb_captcha_qa
 		if (!sizeof($this->question_ids))
 		{
 			$this->question_lang = $config['default_lang'];
-			$sql = 'SELECT question_id FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
+			$sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
 			$result = $db->sql_query($sql, 7200);
 			while ($row = $db->sql_fetchrow($result))
 			{
@@ -108,7 +108,7 @@ class phpbb_captcha_qa
 			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
 		}
 		$db_tool = new phpbb_db_tools($db);
-		return $db_tool->sql_table_exists(QUESTIONS_TABLE);
+		return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
 	}
 	
 	/**
@@ -125,13 +125,23 @@ class phpbb_captcha_qa
 		{
 			return false;
 		}
-		$sql = 'SELECT COUNT(question_id) as count FROM ' . QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
+		$sql = 'SELECT COUNT(question_id) as count FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
 		return ((bool) $row['count']);
 	}
 
+
+	/**
+	*  API function
+	*/
+	function has_config()
+	{
+		return true;
+	}
+
+
 	/**
 	*  API function
 	*/
@@ -219,7 +229,7 @@ class phpbb_captcha_qa
 		global $db, $config;
 
 		$sql = 'SELECT DISTINCT c.session_id
-			FROM ' . QA_CONFIRM_TABLE . ' c
+			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' c
 			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
 			WHERE s.session_id IS NULL' .
 				((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
@@ -236,7 +246,7 @@ class phpbb_captcha_qa
 
 			if (sizeof($sql_in))
 			{
-				$sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . '
+				$sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . '
 					WHERE ' . $db->sql_in_set('session_id', $sql_in);
 				$db->sql_query($sql);
 			}
@@ -264,10 +274,10 @@ class phpbb_captcha_qa
 			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
 		}
 		$db_tool = new phpbb_db_tools($db);
-		$tables = array(QUESTIONS_TABLE, ANSWERS_TABLE, QA_CONFIRM_TABLE);
+		$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);
 		
 		$schemas = array(
-				QUESTIONS_TABLE		=> array (
+				CAPTCHA_QUESTIONS_TABLE		=> array (
 								'COLUMNS' => array(
 									'question_id'	=> array('UINT', Null, 'auto_increment'),
 									'strict'		=> array('BOOL', 0),
@@ -280,7 +290,7 @@ class phpbb_captcha_qa
 									'lang_iso'			=> array('INDEX', 'lang_iso'),
 								),
 				),
-				ANSWERS_TABLE		=> array (
+				CAPTCHA_ANSWERS_TABLE		=> array (
 								'COLUMNS' => array(
 									'question_id'	=> array('UINT', 0),
 									'answer_text'	=> array('STEXT_UNI', ''),
@@ -289,7 +299,7 @@ class phpbb_captcha_qa
 									'question_id'			=> array('INDEX', 'question_id'),
 								),
 				),
-				QA_CONFIRM_TABLE		=> array (
+				CAPTCHA_QA_CONFIRM_TABLE		=> array (
 								'COLUMNS' => array(
 									'session_id'	=> array('CHAR:32', ''),
 									'confirm_id'	=> array('CHAR:32', ''),
@@ -363,7 +373,7 @@ class phpbb_captcha_qa
 		$this->confirm_id = md5(unique_id($user->ip));
 		$this->question = (int) array_rand($this->question_ids);
 		
-		$sql = 'INSERT INTO ' . QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+		$sql = 'INSERT INTO ' . CAPTCHA_QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
 				'confirm_id'	=> (string) $this->confirm_id,
 				'session_id'	=> (string) $user->session_id,
 				'lang_iso'		=> (string) $this->question_lang,
@@ -386,7 +396,7 @@ class phpbb_captcha_qa
 		$this->solved = 0;
 		// compute $seed % 0x7fffffff
 
-		$sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
 				'question'			=> (int) $this->question,)) . '
 				WHERE
 				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
@@ -407,7 +417,7 @@ class phpbb_captcha_qa
 		$this->solved = 0;
 		// compute $seed % 0x7fffffff
 
-		$sql = 'UPDATE ' . QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
 				'question_id'			=> (int) $this->question)) . ', 
 				attempts = attempts + 1 
 				WHERE
@@ -425,7 +435,7 @@ class phpbb_captcha_qa
 		global $db, $user;
 
 		$sql = 'SELECT con.question_id, attempts, question_text, strict
-			FROM ' . QA_CONFIRM_TABLE . ' con, ' . QUESTIONS_TABLE . " qes 
+			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes 
 			WHERE con.question_id = qes.question_id
 				AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
 				AND session_id = '" . $db->sql_escape($user->session_id) . "'
@@ -457,7 +467,7 @@ class phpbb_captcha_qa
 		$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
 		
 		$sql = 'SELECT answer_text
-					FROM ' . ANSWERS_TABLE . '
+					FROM ' . CAPTCHA_ANSWERS_TABLE . '
 					WHERE question_id = ' . (int) $this->question;
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
@@ -480,7 +490,7 @@ class phpbb_captcha_qa
 	{
 		global $db, $user;
 
-		$sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . "
+		$sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . "
 			WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
 				AND session_id = '" . $db->sql_escape($user->session_id) . "'
 				AND confirm_type = " . $this->type;
@@ -502,7 +512,7 @@ class phpbb_captcha_qa
 	{
 		global $db, $user;
 
-		$sql = 'DELETE FROM ' . QA_CONFIRM_TABLE . "
+		$sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . "
 			WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
 				AND confirm_type = " . (int) $this->type;
 		$db->sql_query($sql);
@@ -666,7 +676,7 @@ class phpbb_captcha_qa
 	{
 		global $db, $template;
 		
-		$sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE 1';
+		$sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE 1';
 		$result = $db->sql_query($sql);
 		$template->assign_vars(array(
 						'S_LIST'			=> true,
@@ -697,7 +707,7 @@ class phpbb_captcha_qa
 
 		if ($question_id)
 		{
-			$sql = 'SELECT * FROM ' . QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
+			$sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
 			$result = $db->sql_query($sql);
 			if ($row = $db->sql_fetchrow($result))
 			{
@@ -709,7 +719,7 @@ class phpbb_captcha_qa
 				return false;
 			}
 			$question['answers'] = array();
-			$sql = 'SELECT * FROM ' . ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
+			$sql = 'SELECT * FROM ' . CAPTCHA_ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
 			$result = $db->sql_query($sql);
 			while($row = $db->sql_fetchrow($result))
 			{
@@ -748,13 +758,13 @@ class phpbb_captcha_qa
 		global $db;
 
 		// easier to delete all answers than to figure out which to update
-		$sql = "DELETE FROM " . ANSWERS_TABLE . " WHERE question_id = $question_id";
+		$sql = "DELETE FROM " . CAPTCHA_ANSWERS_TABLE . " WHERE question_id = $question_id";
 		$db->sql_query($sql);
 		$langs = $this->get_languages();
 		$question_ary = $data;
 		$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
 		unset($question_ary['answers']);
-		$sql = "UPDATE " . QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
+		$sql = "UPDATE " . CAPTCHA_QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
 				WHERE question_id = $question_id";
 		$db->sql_query($sql);
 		$this->acp_insert_answers($data, $question_id);
@@ -773,7 +783,7 @@ class phpbb_captcha_qa
 		
 		$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
 		unset($question_ary['answers']);
-		$sql = "INSERT INTO " . QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
+		$sql = "INSERT INTO " . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
 		$db->sql_query($sql);
 		$question_id = $db->sql_nextid();
 		$this->acp_insert_answers($data, $question_id);
@@ -793,7 +803,7 @@ class phpbb_captcha_qa
 				'question_id'	=> $question_id,
 				'answer_text'	=> $answer,
 			);
-			$sql = "INSERT INTO " . ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
+			$sql = "INSERT INTO " . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
 			$db->sql_query($sql);
 		}
 	}
@@ -806,7 +816,7 @@ class phpbb_captcha_qa
 	{
 		global $db;
 		
-		$tables = array(QUESTIONS_TABLE, ANSWERS_TABLE);
+		$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE);
 		foreach($tables as $table)
 		{
 			$sql = "DELETE FROM $table WHERE question_id = $question_id";
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index b7b3ab07d3..3634869a06 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,6 +54,14 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$user->add_lang('captcha_recaptcha');
 		return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
 	}
+	
+	/**
+	*  API function
+	*/
+	function has_config()
+	{
+		return true;
+	}
 
 	function get_name()
 	{
-- 
cgit v1.2.1


From 7c6229784bd2f451f3addcac211507289fa5b712 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 14 Aug 2009 10:11:34 +0000
Subject: add back links

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9976 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 1 +
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 863d31a45d..a85566deff 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -140,6 +140,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 			$template->assign_vars(array(
 				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
+				'U_ACTION'			=> $module->u_action,
 			));
 		}
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 3634869a06..bd965fb10e 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -117,6 +117,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			$template->assign_vars(array(
 				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
+				'U_ACTION'			=> $module->u_action,
 			));
 
 		}
-- 
cgit v1.2.1


From bc57fdc01ce6c1a9275f16a0791c60dbc0b449b7 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sat, 15 Aug 2009 16:10:13 +0000
Subject: #49755

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9992 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 84730a738c..7dd5233045 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -676,7 +676,7 @@ class phpbb_captcha_qa
 	{
 		global $db, $template;
 		
-		$sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE 1';
+		$sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE;
 		$result = $db->sql_query($sql);
 		$template->assign_vars(array(
 						'S_LIST'			=> true,
@@ -857,7 +857,7 @@ class phpbb_captcha_qa
 		global $db;
 		
 		$langs = array();
-		$sql = 'SELECT * FROM ' . LANG_TABLE . ' WHERE 1';
+		$sql = 'SELECT * FROM ' . LANG_TABLE;
 		$result = $db->sql_query($sql);
 		while($row = $db->sql_fetchrow($result))
 		{
-- 
cgit v1.2.1


From 0393a6232b5aa2b8764c50b40e2cb8b7b0803302 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Sat, 15 Aug 2009 19:56:45 +0000
Subject: - #49775 - Some coding guidelines fixes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9993 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 101 +++++++++++++--------
 1 file changed, 65 insertions(+), 36 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 7dd5233045..adc0811a57 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -676,15 +676,17 @@ class phpbb_captcha_qa
 	{
 		global $db, $template;
 		
-		$sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE;
+		$sql = 'SELECT *
+			FROM ' . CAPTCHA_QUESTIONS_TABLE;
 		$result = $db->sql_query($sql);
+
 		$template->assign_vars(array(
-						'S_LIST'			=> true,
+			'S_LIST'			=> true,
 		));
 
-		while($row = $db->sql_fetchrow($result))
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$url = $module->u_action . "&amp;question_id={$row['question_id']}&amp;configure=1&amp;select_captcha=" . $this->get_class_name() . "&amp;";
+			$url = $module->u_action . "&amp;question_id={$row['question_id']}&amp;configure=1&amp;select_captcha=" . $this->get_class_name() . '&amp;';
 			
 			$template->assign_block_vars('questions', array(
 				'QUESTION_TEXT'		=> $row['question_text'],
@@ -704,31 +706,35 @@ class phpbb_captcha_qa
 	{
 		global $db;
 
-
 		if ($question_id)
 		{
-			$sql = 'SELECT * FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE question_id = ' . $question_id;
+			$sql = 'SELECT *
+				FROM ' . CAPTCHA_QUESTIONS_TABLE . '
+				WHERE question_id = ' . $question_id;
 			$result = $db->sql_query($sql);
-			if ($row = $db->sql_fetchrow($result))
-			{
-				$question = $row;
-			}
-			else
+			$question = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if (!$question)
 			{
-				$db->sql_freeresult($result);
 				return false;
 			}
+
 			$question['answers'] = array();
-			$sql = 'SELECT * FROM ' . CAPTCHA_ANSWERS_TABLE . ' WHERE question_id = ' . $question_id;
+
+			$sql = 'SELECT *
+				FROM ' . CAPTCHA_ANSWERS_TABLE . '
+				WHERE question_id = ' . $question_id;
 			$result = $db->sql_query($sql);
-			while($row = $db->sql_fetchrow($result))
+
+			while ($row = $db->sql_fetchrow($result))
 			{
 				$question['answers'][] = $row['answer_text'];
 			}
 			$db->sql_freeresult($result);
+
 			return $question;
 		}
-		
 	}
 	
 	
@@ -737,15 +743,13 @@ class phpbb_captcha_qa
 	*/
 	function acp_get_question_input()
 	{
-		global $db;
-
 		$question = array(
 			'question_text'	=> request_var('question_text', '', true),
 			'strict'		=> request_var('strict', false),
 			'lang_iso'		=> request_var('lang_iso', ''),
 			'answers'		=> explode("\n", request_var('answers', '', true)),
 		);
-		
+
 		return $question;
 	}
 
@@ -755,19 +759,25 @@ class phpbb_captcha_qa
 	*/
 	function acp_update_question($data, $question_id)
 	{
-		global $db;
+		global $db, $cache;
 
 		// easier to delete all answers than to figure out which to update
-		$sql = "DELETE FROM " . CAPTCHA_ANSWERS_TABLE . " WHERE question_id = $question_id";
+		$sql = 'DELETE FROM ' . CAPTCHA_ANSWERS_TABLE . " WHERE question_id = $question_id";
 		$db->sql_query($sql);
+
 		$langs = $this->get_languages();
 		$question_ary = $data;
 		$question_ary['lang_id'] = $langs[$question_ary['lang_iso']]['id'];
 		unset($question_ary['answers']);
-		$sql = "UPDATE " . CAPTCHA_QUESTIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
-				WHERE question_id = $question_id";
+
+		$sql = 'UPDATE ' . CAPTCHA_QUESTIONS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', $question_ary) . "
+			WHERE question_id = $question_id";
 		$db->sql_query($sql);
+
 		$this->acp_insert_answers($data, $question_id);
+
+		$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
 	}
 	
 	/**
@@ -776,17 +786,22 @@ class phpbb_captcha_qa
 	*/
 	function acp_add_question($data)
 	{
-		global $db;
+		global $db, $cache;
 	
 		$langs = $this->get_languages();
 		$question_ary = $data;
 		
 		$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
 		unset($question_ary['answers']);
-		$sql = "INSERT INTO " . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
+
+		$sql = 'INSERT INTO ' . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
 		$db->sql_query($sql);
+
 		$question_id = $db->sql_nextid();
+
 		$this->acp_insert_answers($data, $question_id);
+
+		$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
 	}
 	
 	/**
@@ -795,17 +810,20 @@ class phpbb_captcha_qa
 	*/
 	function acp_insert_answers($data, $question_id)
 	{
-		global $db;
+		global $db, $cache;
 		
-		foreach($data['answers'] as $answer)
+		foreach ($data['answers'] as $answer)
 		{
 			$answer_ary = array(
 				'question_id'	=> $question_id,
 				'answer_text'	=> $answer,
 			);
-			$sql = "INSERT INTO " . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
+
+			$sql = 'INSERT INTO ' . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
 			$db->sql_query($sql);
 		}
+
+		$cache->destroy('sql', CAPTCHA_ANSWERS_TABLE);
 	}
 	
 
@@ -814,14 +832,18 @@ class phpbb_captcha_qa
 	*/
 	function acp_delete_question($question_id)
 	{
-		global $db;
-		
+		global $db, $cache;
+
 		$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE);
-		foreach($tables as $table)
+
+		foreach ($tables as $table)
 		{
-			$sql = "DELETE FROM $table WHERE question_id = $question_id";
+			$sql = "DELETE FROM $table 
+				WHERE question_id = $question_id";
 			$db->sql_query($sql);
 		}
+
+		$cache->destroy('sql', $tables);
 	}
 	
 	
@@ -832,6 +854,7 @@ class phpbb_captcha_qa
 	function validate_input($question_data)
 	{
 		$langs = $this->get_languages();
+
 		if (!isset($question_data['lang_iso']) ||
 			!isset($question_data['question_text']) ||
 			!isset($question_data['strict']) ||
@@ -839,13 +862,14 @@ class phpbb_captcha_qa
 		{
 			return false;
 		}
+
 		if (!isset($langs[$question_data['lang_iso']]) ||
 			!$question_data['question_text'] ||
 			!sizeof($question_data['answers']))
 		{
 			return false;
 		}
-		
+
 		return true;
 	}
 	
@@ -855,18 +879,23 @@ class phpbb_captcha_qa
 	function get_languages()
 	{
 		global $db;
-		
+
 		$langs = array();
-		$sql = 'SELECT * FROM ' . LANG_TABLE;
+
+		$sql = 'SELECT *
+			FROM ' . LANG_TABLE;
+
 		$result = $db->sql_query($sql);
-		while($row = $db->sql_fetchrow($result))
+
+		while ($row = $db->sql_fetchrow($result))
 		{
 			$langs[$row['lang_iso']] = array(
 				'name'	=> $row['lang_local_name'],
-				'id'	=> $row['lang_id'],
+				'id'	=> (int) $row['lang_id'],
 			);
 		}
 		$db->sql_freeresult($result);
+
 		return $langs;
 	}
 	
-- 
cgit v1.2.1


From 389663872784bd4c411e9b3a813107ec51e70b11 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 16 Aug 2009 20:49:22 +0000
Subject: append_sid

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9996 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/captcha_abstract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 08ca0a91e4..e5a4e299bd 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -95,7 +95,7 @@ class phpbb_default_captcha
 		}
 		else
 		{
-			$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
+			$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx,  'mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
 			$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
 			
 			$template->assign_vars(array(
@@ -129,7 +129,7 @@ class phpbb_default_captcha
 
 		// acp_captcha has a delivery function; let's use it
 		$template->assign_vars(array(
-			'CONFIRM_IMAGE'		=> append_sid($phpbb_admin_path . 'index.' . $phpEx . '?captcha_demo=1&amp;mode=visual&amp;i=' . $id . '&amp;select_captcha=' . $this->get_class_name()) . $variables,
+			'CONFIRM_IMAGE'		=> append_sid($phpbb_admin_path . 'index.' . $phpEx, 'captcha_demo=1&amp;mode=visual&amp;i=' . $id . '&amp;select_captcha=' . $this->get_class_name()) . $variables,
 			'CONFIRM_ID'		=> $this->confirm_id,
 		));
 
-- 
cgit v1.2.1


From 6cc55a3436ea81482d0d2462b400e2b66274660d Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 16 Aug 2009 21:07:11 +0000
Subject: don't pick a new question without an explicit reset call

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9997 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index adc0811a57..35f42848b3 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -354,7 +354,8 @@ class phpbb_captcha_qa
 		if (strlen($error))
 		{
 			// okay, incorrect answer. Let's ask a new question.
-			$this->new_attempt();
+			// $this->new_attempt();
+			$this->solved = false;
 			return $error;
 		}
 		else
@@ -433,7 +434,7 @@ class phpbb_captcha_qa
 	function load_answer()
 	{
 		global $db, $user;
-
+		
 		$sql = 'SELECT con.question_id, attempts, question_text, strict
 			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes 
 			WHERE con.question_id = qes.question_id
-- 
cgit v1.2.1


From ba3e0831ea90cdf2fa740088162e57221107748c Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sun, 16 Aug 2009 21:11:17 +0000
Subject: erm, on the contrary; can that reset call

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9998 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 35f42848b3..511706bb93 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -354,7 +354,7 @@ class phpbb_captcha_qa
 		if (strlen($error))
 		{
 			// okay, incorrect answer. Let's ask a new question.
-			// $this->new_attempt();
+			$this->new_attempt();
 			$this->solved = false;
 			return $error;
 		}
-- 
cgit v1.2.1


From 20ace274d6b6d370fde9aad6d85cc57740fcfbf1 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 20 Aug 2009 14:42:38 +0000
Subject: #50025

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10034 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index bd965fb10e..89d44826d8 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -168,7 +168,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		// this is required for posting.php - otherwise we would forget about the captcha being already solved
 		if ($this->solved)
 		{
-			$hidden_fields['confirm_code'] = $this->confirm_code;
+			$hidden_fields['confirm_code'] = $this->code;
 		}
 		$hidden_fields['confirm_id'] = $this->confirm_id;
 		return $hidden_fields;
-- 
cgit v1.2.1


From 604696f9a8abd2c743336e3d20ab85746f094637 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 1 Sep 2009 15:08:04 +0000
Subject: Correctly assign board administrator email for L_CONFIRM_EXPLAIN in
 captcha plugins.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10085 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../includes/captcha/plugins/captcha_abstract.php  | 24 +++++++++++-----------
 .../captcha/plugins/phpbb_recaptcha_plugin.php     |  5 ++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index e5a4e299bd..db4b7649c7 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -88,7 +88,7 @@ class phpbb_default_captcha
 	function get_template()
 	{
 		global $config, $user, $template, $phpEx, $phpbb_root_path;
-		
+
 		if ($this->is_solved())
 		{
 			return false;
@@ -96,8 +96,8 @@ class phpbb_default_captcha
 		else
 		{
 			$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx,  'mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
-			$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
-			
+			$explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+
 			$template->assign_vars(array(
 				'CONFIRM_IMAGE_LINK'		=> $link,
 				'CONFIRM_IMAGE'				=> '<img src="' . $link . '" />',
@@ -118,7 +118,7 @@ class phpbb_default_captcha
 		global $config, $user, $template, $phpbb_admin_path, $phpEx;
 
 		$variables = '';
-		
+
 		if (is_array($this->captcha_vars))
 		{
 			foreach ($this->captcha_vars as $captcha_var => $template_var)
@@ -192,7 +192,7 @@ class phpbb_default_captcha
 	function validate()
 	{
 		global $config, $db, $user;
-		
+
 		$error = '';
 		if (!$this->confirm_id)
 		{
@@ -264,7 +264,7 @@ class phpbb_default_captcha
 				'code'			=> (string) $this->code,
 				'seed'			=> (int) $this->seed)) . '
 				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
 					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
@@ -285,13 +285,13 @@ class phpbb_default_captcha
 		$sql = 'UPDATE ' . CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
 				'code'			=> (string) $this->code,
 				'seed'			=> (int) $this->seed)) . '
-				, attempts = attempts + 1 
+				, attempts = attempts + 1
 				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
+				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\'
 					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
-	
+
 	/**
 	* Look up everything we need for painting&checking.
 	*/
@@ -352,7 +352,7 @@ class phpbb_default_captcha
 		// we leave the class usable by generating a new question
 		$this->generate_code();
 	}
-	
+
 	function is_solved()
 	{
 		if (request_var('confirm_code', false) && $this->solved === 0)
@@ -361,7 +361,7 @@ class phpbb_default_captcha
 		}
 		return (bool) $this->solved;
 	}
-	
+
 	/**
 	*  API function
 	*/
@@ -369,7 +369,7 @@ class phpbb_default_captcha
 	{
 		return false;
 	}
-	
+
 }
 
 ?>
\ 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 89d44826d8..2d37b13a4f 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$user->add_lang('captcha_recaptcha');
 		return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
 	}
-	
+
 	/**
 	*  API function
 	*/
@@ -143,6 +143,8 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		}
 		else
 		{
+			$explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+
 			$template->assign_vars(array(
 				'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
 				'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
@@ -150,6 +152,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 				'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
 				'S_CONFIRM_CODE'			=> true,
 				'S_TYPE'					=> $this->type,
+				'L_CONFIRM_EXPLAIN'			=> $explain,
 			));
 
 			return 'captcha_recaptcha.html';
-- 
cgit v1.2.1


From 46e66c04011288a79ffb6232e4ccecb20240f2ce Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 3 Sep 2009 12:45:46 +0000
Subject: Some cleanup.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10091 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 175 ++++++++++++---------
 1 file changed, 97 insertions(+), 78 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 511706bb93..d71a781ae7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -17,12 +17,11 @@ if (!defined('IN_PHPBB'))
 }
 
 global $table_prefix;
+
 define('CAPTCHA_QUESTIONS_TABLE',	$table_prefix . 'captcha_questions');
 define('CAPTCHA_ANSWERS_TABLE',		$table_prefix . 'captcha_answers');
 define('CAPTCHA_QA_CONFIRM_TABLE',	$table_prefix . 'qa_confirm');
 
-
-
 /**
 * And now to something completely different. Let's make a captcha without extending the abstract class.
 * QA CAPTCHA sample implementation
@@ -51,27 +50,37 @@ class phpbb_captcha_qa
 
 		// load our language file 
 		$user->add_lang('captcha_qa');
+
 		// read input
 		$this->confirm_id = request_var('qa_confirm_id', '');
 		$this->answer = request_var('qa_answer', '', true);
 
 		$this->type = (int) $type;
 		$this->question_lang = $user->data['user_lang'];
+
 		// we need all defined questions - shouldn't be too many, so we can just grab them
 		// try the user's lang first
-		$sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($user->data['user_lang']) . '\''; 
+		$sql = 'SELECT question_id
+			FROM ' . CAPTCHA_QUESTIONS_TABLE . "
+			WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'"; 
 		$result = $db->sql_query($sql, 3600);
+
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$this->question_ids[$row['question_id']] = $row['question_id'];
 		}
 		$db->sql_freeresult($result);
+
 		// fallback to the board default lang
 		if (!sizeof($this->question_ids))
 		{
 			$this->question_lang = $config['default_lang'];
-			$sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
+
+			$sql = 'SELECT question_id
+				FROM ' . CAPTCHA_QUESTIONS_TABLE . "
+				WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; 
 			$result = $db->sql_query($sql, 7200);
+
 			while ($row = $db->sql_fetchrow($result))
 			{
 				$this->question_ids[$row['question_id']] = $row['question_id'];
@@ -93,6 +102,7 @@ class phpbb_captcha_qa
 	function &get_instance()
 	{
 		$instance =& new phpbb_captcha_qa();
+
 		return $instance;
 	}
 
@@ -108,31 +118,35 @@ class phpbb_captcha_qa
 			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
 		}
 		$db_tool = new phpbb_db_tools($db);
+
 		return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
 	}
-	
+
 	/**
 	*  API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
 	*/
 	function is_available()
 	{
 		global $config, $db, $phpbb_root_path, $phpEx, $user;
-		
+
 		// load language file for pretty display in the ACP dropdown
 		$user->add_lang('captcha_qa');
-		
+
 		if (!phpbb_captcha_qa::is_installed())
 		{
 			return false;
 		}
-		$sql = 'SELECT COUNT(question_id) as count FROM ' . CAPTCHA_QUESTIONS_TABLE . ' WHERE lang_iso = \'' . $db->sql_escape($config['default_lang']) . '\''; 
+
+		$sql = 'SELECT COUNT(question_id) as count
+			FROM ' . CAPTCHA_QUESTIONS_TABLE . "
+			WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; 
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
+
 		return ((bool) $row['count']);
 	}
 
-
 	/**
 	*  API function
 	*/
@@ -141,7 +155,6 @@ class phpbb_captcha_qa
 		return true;
 	}
 
-
 	/**
 	*  API function
 	*/
@@ -158,7 +171,6 @@ class phpbb_captcha_qa
 		return 'phpbb_captcha_qa';
 	}
 
-
 	/**
 	*  API function - not needed as we don't display an image
 	*/
@@ -179,7 +191,7 @@ class phpbb_captcha_qa
 	function get_template()
 	{
 		global $template;
-		
+
 		if ($this->is_solved())
 		{
 			return false;
@@ -218,6 +230,7 @@ class phpbb_captcha_qa
 			$hidden_fields['qa_answer'] = $this->answer;
 		}
 		$hidden_fields['qa_confirm_id'] = $this->confirm_id;
+
 		return $hidden_fields;
 	}
 
@@ -230,7 +243,8 @@ class phpbb_captcha_qa
 
 		$sql = 'SELECT DISTINCT c.session_id
 			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' c
-			LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
+			LEFT JOIN ' . SESSIONS_TABLE . ' s
+				ON (c.session_id = s.session_id)
 			WHERE s.session_id IS NULL' .
 				((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type);
 		$result = $db->sql_query($sql);
@@ -238,6 +252,7 @@ class phpbb_captcha_qa
 		if ($row = $db->sql_fetchrow($result))
 		{
 			$sql_in = array();
+
 			do
 			{
 				$sql_in[] = (string) $row['session_id'];
@@ -274,8 +289,9 @@ class phpbb_captcha_qa
 			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
 		}
 		$db_tool = new phpbb_db_tools($db);
+
 		$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);
-		
+
 		$schemas = array(
 				CAPTCHA_QUESTIONS_TABLE		=> array (
 								'COLUMNS' => array(
@@ -315,7 +331,7 @@ class phpbb_captcha_qa
 								'PRIMARY_KEY'		=> 'confirm_id',
 				),
 		);
-		
+
 		foreach($schemas as $table => $schema)
 		{
 			if (!$db_tool->sql_table_exists($table))
@@ -325,15 +341,15 @@ class phpbb_captcha_qa
 		}
 	}
 
-
 	/**
 	*  API function - see what has to be done to validate
 	*/
 	function validate()
 	{
 		global $config, $db, $user;
-		
+
 		$error = '';
+
 		if (!$this->confirm_id)
 		{
 			$error = $user->lang['CONFIRM_QUESTION_WRONG'];
@@ -356,6 +372,7 @@ class phpbb_captcha_qa
 			// okay, incorrect answer. Let's ask a new question.
 			$this->new_attempt();
 			$this->solved = false;
+
 			return $error;
 		}
 		else
@@ -373,17 +390,17 @@ class phpbb_captcha_qa
 
 		$this->confirm_id = md5(unique_id($user->ip));
 		$this->question = (int) array_rand($this->question_ids);
-		
+
 		$sql = 'INSERT INTO ' . CAPTCHA_QA_CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-				'confirm_id'	=> (string) $this->confirm_id,
-				'session_id'	=> (string) $user->session_id,
-				'lang_iso'		=> (string) $this->question_lang,
-				'confirm_type'	=> (int) $this->type,
-				'question_id'	=> (int) $this->question,
+			'confirm_id'	=> (string) $this->confirm_id,
+			'session_id'	=> (string) $user->session_id,
+			'lang_iso'		=> (string) $this->question_lang,
+			'confirm_type'	=> (int) $this->type,
+			'question_id'	=> (int) $this->question,
 		));
 		$db->sql_query($sql);
-		$this->load_answer();
 
+		$this->load_answer();
 	}
 
 	/**
@@ -395,14 +412,13 @@ class phpbb_captcha_qa
 
 		$this->question = (int) array_rand($this->question_ids);
 		$this->solved = 0;
-		// compute $seed % 0x7fffffff
 
-		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
-				'question'			=> (int) $this->question,)) . '
-				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
-					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
+			SET question_id = ' . (int) $this->question . "
+			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "' 
+				AND session_id = '" . $db->sql_escape($user->session_id) . "'";
 		$db->sql_query($sql);
+
 		$this->load_answer();
 	}
 
@@ -416,15 +432,14 @@ class phpbb_captcha_qa
 		// yah, I would prefer a stronger rand, but this should work
 		$this->question = (int) array_rand($this->question_ids);
 		$this->solved = 0;
-		// compute $seed % 0x7fffffff
-
-		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
-				'question_id'			=> (int) $this->question)) . ', 
-				attempts = attempts + 1 
-				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' 
-					AND session_id = \'' . $db->sql_escape($user->session_id) . '\'';
+
+		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
+			SET question_id = ' . (int) $this->question . ",
+				attempts = attempts + 1
+			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "' 
+				AND session_id = '" . $db->sql_escape($user->session_id) . "'";
 		$db->sql_query($sql);
+
 		$this->load_answer();
 	}
 	
@@ -434,7 +449,7 @@ class phpbb_captcha_qa
 	function load_answer()
 	{
 		global $db, $user;
-		
+
 		$sql = 'SELECT con.question_id, attempts, question_text, strict
 			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes 
 			WHERE con.question_id = qes.question_id
@@ -453,8 +468,10 @@ class phpbb_captcha_qa
 			$this->attempts = $row['attempts'];
 			$this->question_strict = $row['strict'];
 			$this->question_text = $row['question_text'];
+
 			return true;
 		}
+
 		return false;
 	}
 
@@ -464,23 +481,27 @@ class phpbb_captcha_qa
 	function check_answer()
 	{
 		global $db;
-		
+
 		$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
-		
+
 		$sql = 'SELECT answer_text
-					FROM ' . CAPTCHA_ANSWERS_TABLE . '
-					WHERE question_id = ' . (int) $this->question;
+			FROM ' . CAPTCHA_ANSWERS_TABLE . '
+			WHERE question_id = ' . (int) $this->question;
 		$result = $db->sql_query($sql);
+
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text'] );
+			$solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text']);
+
 			if ($solution === $answer)
 			{
 				$this->solved = true;
+
 				break;
 			}
 		}
 		$db->sql_freeresult($result);
+
 		return $this->solved;
 	}
 
@@ -531,10 +552,10 @@ class phpbb_captcha_qa
 		{
 			$this->validate();
 		}
+
 		return (bool) $this->solved;
 	}
-	
-	
+
 	/**
 	*  API function - The ACP backend, this marks the end of the easy methods
 	*/
@@ -550,6 +571,7 @@ class phpbb_captcha_qa
 		{
 			$this->install();
 		}
+
 		$module->tpl_name = 'captcha_qa_acp';
 		$module->page_title = 'ACP_VC_SETTINGS';
 		$form_key = 'acp_captcha';
@@ -558,14 +580,14 @@ class phpbb_captcha_qa
 		$submit = request_var('submit', false);
 		$question_id = request_var('question_id', 0);
 		$action = request_var('action', '');
-		
+
 		// we have two pages, so users might want to navigate from one to the other
 		$list_url = $module->u_action . "&amp;configure=1&amp;select_captcha=" . $this->get_class_name();
-		
+
 		$template->assign_vars(array(
-				'U_ACTION'		=> $module->u_action,
-				'QUESTION_ID'	=> $question_id ,
-				'CLASS'			=> $this->get_class_name(),
+			'U_ACTION'		=> $module->u_action,
+			'QUESTION_ID'	=> $question_id ,
+			'CLASS'			=> $this->get_class_name(),
 		));
 
 		// show the list?
@@ -578,6 +600,7 @@ class phpbb_captcha_qa
 			if (confirm_box(true))
 			{
 				$this->acp_delete_question($question_id);
+
 				trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($list_url));
 			}
 			else
@@ -600,6 +623,7 @@ class phpbb_captcha_qa
 			$input_lang = request_var('lang_iso', '', true);
 			$input_strict = request_var('strict', false);
 			$langs = $this->get_languages();
+
 			foreach ($langs as $lang => $entry)
 			{
 				$template->assign_block_vars('langs', array(
@@ -607,15 +631,17 @@ class phpbb_captcha_qa
 					'NAME' => $entry['name'],
 				));
 			}
-			
+
 			$template->assign_vars(array(
-						'U_LIST'		=> $list_url,
+				'U_LIST' => $list_url,
 			));
+
 			if ($question_id)
 			{
 				if ($question = $this->acp_get_question_data($question_id))
 				{
 					$answers = (isset($input_answers[$lang])) ? $input_answers[$lang] : implode("\n", $question['answers']);
+
 					$template->assign_vars(array(
 						'QUESTION_TEXT'		=> ($input_question) ? $input_question : $question['question_text'],
 						'LANG_ISO'			=> ($input_lang) ? $input_lang : $question['lang_iso'],
@@ -630,18 +656,18 @@ class phpbb_captcha_qa
 			}
 			else
 			{
-			
 				$template->assign_vars(array(
-						'QUESTION_TEXT'		=> $input_question,
-						'LANG_ISO'			=> $input_lang,
-						'STRICT'			=> $input_strict,
-						'ANSWERS'			=> $input_answers,
+					'QUESTION_TEXT'		=> $input_question,
+					'LANG_ISO'			=> $input_lang,
+					'STRICT'			=> $input_strict,
+					'ANSWERS'			=> $input_answers,
 				));
 			}
-			
+
 			if ($submit && check_form_key($form_key))
 			{
 				$data = $this->acp_get_question_input();
+
 				if (!$this->validate_input($data))
 				{
 					$template->assign_vars(array(
@@ -658,7 +684,7 @@ class phpbb_captcha_qa
 					{
 						$this->acp_add_question($data);
 					}
-					
+
 					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url));
 				}
 			}
@@ -668,7 +694,6 @@ class phpbb_captcha_qa
 			}
 		}
 	}
-	
 
 	/**
 	*  This handles the list overview
@@ -676,7 +701,7 @@ class phpbb_captcha_qa
 	function acp_question_list(&$module)
 	{
 		global $db, $template;
-		
+
 		$sql = 'SELECT *
 			FROM ' . CAPTCHA_QUESTIONS_TABLE;
 		$result = $db->sql_query($sql);
@@ -688,7 +713,7 @@ class phpbb_captcha_qa
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$url = $module->u_action . "&amp;question_id={$row['question_id']}&amp;configure=1&amp;select_captcha=" . $this->get_class_name() . '&amp;';
-			
+
 			$template->assign_block_vars('questions', array(
 				'QUESTION_TEXT'		=> $row['question_text'],
 				'QUESTION_ID'		=> $row['question_id'],
@@ -737,8 +762,7 @@ class phpbb_captcha_qa
 			return $question;
 		}
 	}
-	
-	
+
 	/**
 	*  Grab a question from input and bring it into a format the editor understands
 	*/
@@ -780,7 +804,7 @@ class phpbb_captcha_qa
 
 		$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
 	}
-	
+
 	/**
 	*  Insert a question.
 	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
@@ -795,7 +819,7 @@ class phpbb_captcha_qa
 		$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
 		unset($question_ary['answers']);
 
-		$sql = 'INSERT INTO ' . CAPTCHA_QUESTIONS_TABLE . $db->sql_build_array('INSERT', $question_ary);
+		$sql = 'INSERT INTO ' . CAPTCHA_QUESTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $question_ary);
 		$db->sql_query($sql);
 
 		$question_id = $db->sql_nextid();
@@ -804,7 +828,7 @@ class phpbb_captcha_qa
 
 		$cache->destroy('sql', CAPTCHA_QUESTIONS_TABLE);
 	}
-	
+
 	/**
 	*  Insert the answers.
 	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
@@ -812,7 +836,7 @@ class phpbb_captcha_qa
 	function acp_insert_answers($data, $question_id)
 	{
 		global $db, $cache;
-		
+
 		foreach ($data['answers'] as $answer)
 		{
 			$answer_ary = array(
@@ -820,13 +844,12 @@ class phpbb_captcha_qa
 				'answer_text'	=> $answer,
 			);
 
-			$sql = 'INSERT INTO ' . CAPTCHA_ANSWERS_TABLE . $db->sql_build_array('INSERT', $answer_ary);
+			$sql = 'INSERT INTO ' . CAPTCHA_ANSWERS_TABLE . ' ' . $db->sql_build_array('INSERT', $answer_ary);
 			$db->sql_query($sql);
 		}
 
 		$cache->destroy('sql', CAPTCHA_ANSWERS_TABLE);
 	}
-	
 
 	/**
 	*  Delete a question.
@@ -846,8 +869,7 @@ class phpbb_captcha_qa
 
 		$cache->destroy('sql', $tables);
 	}
-	
-	
+
 	/**
 	*  Check if the entered data can be inserted/used
 	* param mixed $data : an array as created from acp_get_question_input or acp_get_question_data
@@ -873,7 +895,7 @@ class phpbb_captcha_qa
 
 		return true;
 	}
-	
+
 	/**
 	* List the installed language packs
 	*/
@@ -881,13 +903,11 @@ class phpbb_captcha_qa
 	{
 		global $db;
 
-		$langs = array();
-
 		$sql = 'SELECT *
 			FROM ' . LANG_TABLE;
-
 		$result = $db->sql_query($sql);
 
+		$langs = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$langs[$row['lang_iso']] = array(
@@ -899,7 +919,6 @@ class phpbb_captcha_qa
 
 		return $langs;
 	}
-	
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.1


From 19086ba57289be4101131095aeeb615de2bc5639 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 3 Sep 2009 13:56:03 +0000
Subject: Some rewording, some typo fixes, some whitespace changes.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10093 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index d71a781ae7..15ad18ba87 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -95,7 +95,7 @@ class phpbb_captcha_qa
 			$this->select_question();
 		}
 	}
-	
+
 	/**
 	*  API function
 	*/
@@ -442,7 +442,7 @@ class phpbb_captcha_qa
 
 		$this->load_answer();
 	}
-	
+
 	/**
 	* Look up everything we need and populate the instance variables.
 	*/
@@ -812,7 +812,7 @@ class phpbb_captcha_qa
 	function acp_add_question($data)
 	{
 		global $db, $cache;
-	
+
 		$langs = $this->get_languages();
 		$question_ary = $data;
 		
-- 
cgit v1.2.1


From 02b2cced5ae562145288a0dbe2bd534bf4f41b7f Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 7 Sep 2009 11:57:58 +0000
Subject: beautify q&a captcha a bit (only slightly)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10116 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    | 88 +++++++++++-----------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 15ad18ba87..6f53e8c5ad 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -48,7 +48,7 @@ class phpbb_captcha_qa
 	{
 		global $config, $db, $user;
 
-		// load our language file 
+		// load our language file
 		$user->add_lang('captcha_qa');
 
 		// read input
@@ -62,7 +62,7 @@ class phpbb_captcha_qa
 		// try the user's lang first
 		$sql = 'SELECT question_id
 			FROM ' . CAPTCHA_QUESTIONS_TABLE . "
-			WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'"; 
+			WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'";
 		$result = $db->sql_query($sql, 3600);
 
 		while ($row = $db->sql_fetchrow($result))
@@ -78,7 +78,7 @@ class phpbb_captcha_qa
 
 			$sql = 'SELECT question_id
 				FROM ' . CAPTCHA_QUESTIONS_TABLE . "
-				WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; 
+				WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
 			$result = $db->sql_query($sql, 7200);
 
 			while ($row = $db->sql_fetchrow($result))
@@ -139,7 +139,7 @@ class phpbb_captcha_qa
 
 		$sql = 'SELECT COUNT(question_id) as count
 			FROM ' . CAPTCHA_QUESTIONS_TABLE . "
-			WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; 
+			WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
@@ -283,7 +283,7 @@ class phpbb_captcha_qa
 	function install()
 	{
 		global $db, $phpbb_root_path, $phpEx;
-		
+
 		if (!class_exists('phpbb_db_tools'))
 		{
 			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
@@ -294,41 +294,41 @@ class phpbb_captcha_qa
 
 		$schemas = array(
 				CAPTCHA_QUESTIONS_TABLE		=> array (
-								'COLUMNS' => array(
-									'question_id'	=> array('UINT', Null, 'auto_increment'),
-									'strict'		=> array('BOOL', 0),
-									'lang_id'		=> array('UINT', 0),
-									'lang_iso'		=> array('VCHAR:30', ''),
-									'question_text'	=> array('TEXT_UNI', ''),
-								),
-								'PRIMARY_KEY'		=> 'question_id',
-								'KEYS'				=> array(
-									'lang_iso'			=> array('INDEX', 'lang_iso'),
-								),
+					'COLUMNS' => array(
+						'question_id'	=> array('UINT', Null, 'auto_increment'),
+						'strict'		=> array('BOOL', 0),
+						'lang_id'		=> array('UINT', 0),
+						'lang_iso'		=> array('VCHAR:30', ''),
+						'question_text'	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'question_id',
+					'KEYS'				=> array(
+						'lang_iso'			=> array('INDEX', 'lang_iso'),
+					),
 				),
 				CAPTCHA_ANSWERS_TABLE		=> array (
-								'COLUMNS' => array(
-									'question_id'	=> array('UINT', 0),
-									'answer_text'	=> array('STEXT_UNI', ''),
-								),
-								'KEYS'				=> array(
-									'question_id'			=> array('INDEX', 'question_id'),
-								),
+					'COLUMNS' => array(
+						'question_id'	=> array('UINT', 0),
+						'answer_text'	=> array('STEXT_UNI', ''),
+					),
+					'KEYS'				=> array(
+						'question_id'			=> array('INDEX', 'question_id'),
+					),
 				),
 				CAPTCHA_QA_CONFIRM_TABLE		=> array (
-								'COLUMNS' => array(
-									'session_id'	=> array('CHAR:32', ''),
-									'confirm_id'	=> array('CHAR:32', ''),
-									'lang_iso'		=> array('VCHAR:30', ''),
-									'question_id'	=> array('UINT', 0),
-									'attempts'		=> array('UINT', 0),
-									'confirm_type'	=> array('USINT', 0),
-								),
-								'KEYS'				=> array(
-									'session_id'			=> array('INDEX', 'session_id'),
-									'lookup'				=> array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
-								),
-								'PRIMARY_KEY'		=> 'confirm_id',
+					'COLUMNS' => array(
+						'session_id'	=> array('CHAR:32', ''),
+						'confirm_id'	=> array('CHAR:32', ''),
+						'lang_iso'		=> array('VCHAR:30', ''),
+						'question_id'	=> array('UINT', 0),
+						'attempts'		=> array('UINT', 0),
+						'confirm_type'	=> array('USINT', 0),
+					),
+					'KEYS'				=> array(
+						'session_id'			=> array('INDEX', 'session_id'),
+						'lookup'				=> array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
+					),
+					'PRIMARY_KEY'		=> 'confirm_id',
 				),
 		);
 
@@ -415,7 +415,7 @@ class phpbb_captcha_qa
 
 		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
 			SET question_id = ' . (int) $this->question . "
-			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "' 
+			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
 				AND session_id = '" . $db->sql_escape($user->session_id) . "'";
 		$db->sql_query($sql);
 
@@ -436,7 +436,7 @@ class phpbb_captcha_qa
 		$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
 			SET question_id = ' . (int) $this->question . ",
 				attempts = attempts + 1
-			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "' 
+			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
 				AND session_id = '" . $db->sql_escape($user->session_id) . "'";
 		$db->sql_query($sql);
 
@@ -451,7 +451,7 @@ class phpbb_captcha_qa
 		global $db, $user;
 
 		$sql = 'SELECT con.question_id, attempts, question_text, strict
-			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes 
+			FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
 			WHERE con.question_id = qes.question_id
 				AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
 				AND session_id = '" . $db->sql_escape($user->session_id) . "'
@@ -520,7 +520,7 @@ class phpbb_captcha_qa
 	}
 
 	/**
-	*  API function 
+	*  API function
 	*/
 	function get_attempt_count()
 	{
@@ -528,7 +528,7 @@ class phpbb_captcha_qa
 	}
 
 	/**
-	*  API function 
+	*  API function
 	*/
 	function reset()
 	{
@@ -544,7 +544,7 @@ class phpbb_captcha_qa
 	}
 
 	/**
-	*  API function 
+	*  API function
 	*/
 	function is_solved()
 	{
@@ -815,7 +815,7 @@ class phpbb_captcha_qa
 
 		$langs = $this->get_languages();
 		$question_ary = $data;
-		
+
 		$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
 		unset($question_ary['answers']);
 
@@ -862,7 +862,7 @@ class phpbb_captcha_qa
 
 		foreach ($tables as $table)
 		{
-			$sql = "DELETE FROM $table 
+			$sql = "DELETE FROM $table
 				WHERE question_id = $question_id";
 			$db->sql_query($sql);
 		}
-- 
cgit v1.2.1