- We are now at _seven_ different policies, not counting the non-GD version. We must remove something...

- Made the CAPTCHA system idiot proof, disabling all the policies still lets an image get created. - We handle the case of a user having GD but no TTF. Thankfully, we have CAPTCHAs that don't need TTF! - Fixed that stupid language string... - Renamed Occlude to Overlap - Shape is now only enabled if TTF support is detected git-svn-id: file:///svn/phpbb/trunk@5985 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-12 12:46:38 +02:00 · 2006-05-30 04:27:14 +00:00
parent 5465ceb507
commit 74799e168d
7 changed files with 578 additions and 194 deletions
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@ -219,9 +219,9 @@ class acp_board
 						'enable_post_confirm'	=> array('lang' => 'VISUAL_CONFIRM_POST',	'type' => 'radio:yes_no', 'explain' => true),

 						'legend2'						=> 'CAPTCHA_OPTIONS',
-						'policy_occlude'				=> array('lang' => 'CAPTCHA_OCCLUDE',		'type' => 'radio:yes_no', 'explain' => false),
-						'policy_occlude_noise_pixel'	=> array('lang' => 'OCCLUDE_NOISE_PIXEL',	'type' => 'select', 'method' => 'captcha_pixel_noise_select', 'explain' => false),
-						'policy_occlude_noise_line'		=> array('lang' => 'OCCLUDE_NOISE_LINE',	'type' => 'radio:yes_no', 'explain' => false),
+						'policy_overlap'				=> array('lang' => 'CAPTCHA_OVERLAP',		'type' => 'radio:yes_no', 'explain' => false),
+						'policy_overlap_noise_pixel'	=> array('lang' => 'OVERLAP_NOISE_PIXEL',	'type' => 'select', 'method' => 'captcha_pixel_noise_select', 'explain' => false),
+						'policy_overlap_noise_line'		=> array('lang' => 'OVERLAP_NOISE_LINE',	'type' => 'radio:yes_no', 'explain' => false),
 						'policy_entropy'				=> array('lang' => 'CAPTCHA_ENTROPY',		'type' => 'radio:yes_no', 'explain' => false),
 						'policy_entropy_noise_pixel'	=> array('lang' => 'ENTROPY_NOISE_PIXEL',	'type' => 'select', 'method' => 'captcha_pixel_noise_select', 'explain' => false),
 						'policy_entropy_noise_line'		=> array('lang' => 'ENTROPY_NOISE_LINE',	'type' => 'radio:yes_no', 'explain' => false),
@ -229,6 +229,9 @@ class acp_board
 						'policy_shape_noise_pixel'		=> array('lang' => 'SHAPE_NOISE_PIXEL',		'type' => 'select', 'method' => 'captcha_pixel_noise_select', 'explain' => false),
 						'policy_shape_noise_line'		=> array('lang' => 'SHAPE_NOISE_LINE',		'type' => 'radio:yes_no', 'explain' => false),
 						'policy_3dbitmap'				=> array('lang' => 'CAPTCHA_3DBITMAP',		'type' => 'radio:yes_no', 'explain' => false),
+						'policy_cells'					=> array('lang' => 'CAPTCHA_CELLS',			'type' => 'radio:yes_no', 'explain' => false),
+						'policy_stencil'				=> array('lang' => 'CAPTCHA_STENCIL',		'type' => 'radio:yes_no', 'explain' => false),
+						'policy_composite'				=> array('lang' => 'CAPTCHA_COMPOSITE',		'type' => 'radio:yes_no', 'explain' => false),
 					)
 				);
 			break;
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@ -21,30 +21,15 @@ class captcha
 	/**
 	* Create the image containing $code
 	*/
-	function execute($code)
+	function execute($code, $policy)
 	{
-		global $config;
-
-		$policy_modules = array('policy_entropy', 'policy_occlude', 'policy_3dbitmap', 'policy_shape');
-
-		// Remove all disabled policy modules
-		foreach ($policy_modules as $key => $name)
-		{
-			if ($config[$name] === '0')
-			{
-				unset($policy_modules[$key]);
-			}
-		}
-
-		$policy = $policy_modules[array_rand($policy_modules)];
-
 		$this->$policy(str_split($code));
 	}

 	/**
 	* Send image and destroy
 	*/
-	function send_image(&$image, $array=array())
+	function send_image(&$image)
 	{
 		header('Content-Type: image/png');
 		header('Cache-control: no-cache, no-store');
@ -173,12 +158,11 @@ class captcha
 		if (!$chars)
 		{
 			$chars = array_merge(range('A', 'Z'), range('1', '9'));
-			$charcount = sizeof($chars) - 1;
 		}
 		$word   = '';
 		for ($i = mt_rand(6, 8); $i > 0; --$i)
 		{
-			$word .= $chars[mt_rand(0, $charcount)];
+			$word .= $chars[array_rand($chars)];
 		}
 		return $word;
 	}
@ -188,7 +172,7 @@ class captcha
 	*/
 	function policy_shape($code)
 	{
-		global $config;
+		global $config, $user;
 		// Generate image
 		$img_x = 800;
 		$img_y = 250;
@ -207,10 +191,6 @@ class captcha
 		}

 		// Generate code characters
-		$characters = array();
-		$sizes = array();
-		$bounding_boxes = array();
-		$width_avail = $img_x;
 		$code_num = sizeof($code);

 		// Add some line noise
@ -227,6 +207,7 @@ class captcha
 		}

 		$char_class = $this->captcha_char('char_ttf');
+
 		for ($i = 0; $i < 4; ++$i)
 		{
 			if ($i)
@ -254,8 +235,6 @@ class captcha
 				}
 			}
 		}
-
-		global $user;
 		imagestring($img, 6, 250,  50, $user->lang['CAPTCHA_LINE_1'], $fontcolors[0]);
 		imagestring($img, 6, 250, 100, $user->lang['CAPTCHA_LINE_2'], $fontcolors[0]);
 		imagestring($img, 6, 250, 150, $user->lang['CAPTCHA_LINE_3'], $fontcolors[0]);
@ -272,6 +251,367 @@ class captcha
 		$this->send_image($img);
 	}

+	function policy_composite($code)
+	{
+		// Generate image
+		$img_x = 800;
+		$img_y = 250;
+		$img = imagecreate($img_x, $img_y);
+
+		$map = captcha_vectors();
+		$fonts = captcha_load_ttf_fonts();
+
+		// Generate basic colors
+		$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));
+
+		// Specificy image portion dimensions.
+		$count = sizeof($code);
+		$cellsize = $img_x / $count;
+		$y_range = min($cellsize, $img_y);
+		$y_max = $img_y - $y_range;
+		$y_off = array(); // consecutive vertical offset of characters
+		$y_off[0] = mt_rand(0, $y_max);
+		for ($i = 1; $i < $count; ++$i)
+		{
+			// each consective character can be as much as 50% closer to the top or bottom of the image as the previous
+			$diff = mt_rand(-50, 50);
+			if ($diff > 0)
+			{
+				$y_off[$i] = $y_off[$i - 1] + ((($y_max - $y_off[$i - 1]) * $diff) / 100);
+			}
+			else
+			{
+				$y_off[$i] = $y_off[$i - 1] * ((100 + $diff) / 100);
+			}
+		}
+
+
+		$range = 0.1;
+
+		$chars = array_merge(range('A', 'Z'), range('0', '9'));
+
+		// draw some characters. if they're within the vector spec of the code character, color them differently
+		for ($i = 0; $i < 5000; ++$i)
+		{
+			$degree = mt_rand(-30, 30);
+			$x = mt_rand(0, $img_x - 1);
+			$y = mt_rand(0, $img_y);
+			$c = $chars[array_rand($chars)];
+			$char = $x / $cellsize;
+			$meta_x = ((($x % $cellsize) / $cellsize) * 1.5) - 0.25;
+			$meta_y = (($img_y - $y) - $y_off[$char]) / $y_range;
+			$font = $fonts[array_rand($fonts)];
+
+			// distance check
+			$distance = 2;
+			$show = false;
+			foreach ($map[$code[$char]] AS $vector)
+			{
+				switch ($vector[0])
+				{
+					case 'line':
+
+						$c_theta = cos($vector[5]);
+						$s_theta = sin($vector[5]);
+						$bx = $meta_x - $vector[1]; 
+						$by = $meta_y - $vector[2]; 
+						$r = ($by * $c_theta) - ($bx * $s_theta);
+						if ($r < $range && $r > -$range)
+						{
+							if (abs($c_theta) > abs($s_theta))
+							{
+								$s = (($bx + ($s_theta * $r)) / $c_theta);								
+							}
+							else
+							{
+								$s = (($by + ($c_theta * $r)) / $s_theta);
+							}
+							if ($s > -$range)
+							{
+								if ($s < 0)
+								{
+									$distance = min($distance, sqrt(pow($s, 2) + pow($r, 2)));
+								}
+								elseif ($s < $vector[6])
+								{
+									$distance = min($distance, $r);
+								}
+								elseif ($s < $vector[6] + $range)
+								{
+									$distance = min($distance, sqrt(pow($s - $vector[6], 2) + pow($r, 2)));
+								}
+							}
+						}
+
+					break;
+
+					case 'arc':
+
+						$dx = $meta_x - $vector[1];
+						$dy = -($meta_y - $vector[2]); // because our arcs are upside-down
+						if ( abs($dx) > abs($dy) )
+						{
+							$phi = rad2deg(atan(($dy * $vector[3]) / ($dx * $vector[4])));
+							$phi += ($dx < 0) ? 180 : 360;
+							$phi %= 360;
+						}
+						else
+						{
+							$phi = 90 - rad2deg(atan(($dx * $vector[4]) / ($dy * $vector[3])));
+							$phi += ($dy < 0) ? 180 : 360;
+							$phi %= 360;
+						}
+
+						$internal = $vector[6] > $vector[5]; // external wraps over the 360 point
+						$low = $phi >= $vector[5]; // phi is above our low range
+						$high = $phi <= $vector[6]; // phi is below our high range.
+						if ($internal ? ($low && $high) : ($low || $high)) // if it wraps, it can only be one or the other
+						{
+							$radphi = deg2rad($phi);
+							$px = cos($radphi) * 0.5 * $vector[3];
+							$py = sin($radphi) * 0.5 * $vector[4];
+							$distance = min($distance, sqrt(pow($px - $dx, 2) + pow($py - $dy, 2)));
+						}
+
+					break;
+				}
+			}
+
+			if ($distance <= $range)
+			{
+				imagettftext($img, 10, $degree, $x, $y, $black, $font, $c);
+			}
+			else
+			{
+				imagettftext($img, 10, $degree, $x, $y, $random[$char], $font, $c);
+			}
+
+		}
+
+		// Send image
+		$this->send_image($img);
+	}
+
+	function policy_stencil($code)
+	{
+		// Generate image
+		$img_x = 800;
+		$img_y = 250;
+		$img = imagecreate($img_x, $img_y);
+		$stencil = imagecreate($img_x, $img_y);
+
+		$map = captcha_vectors();
+		$fonts = captcha_load_ttf_fonts();
+
+		// Generate colors
+		$white1 = imagecolorallocate($img, 255, 255, 255);
+		$black2 = imagecolorallocate($stencil, 0, 0, 0);
+		$black1 = imagecolorallocate($img, 0, 0, 0);
+		$white2 = imagecolorallocate($stencil, 255, 255, 255);
+		$channel = mt_rand(0,2);
+		$c1 = (!($channel % 3)) ? 255 : 0;
+		$c2 = (!(($channel + 1) % 3)) ? 255 : 0;
+		$c3 = (!(($channel + 2) % 3)) ? 255 : 0;
+		$primary = imagecolorallocate($img, $c1, $c2, $c3);
+		$second = imagecolorallocate($img, $c2, $c3, $c1);
+		$third = imagecolorallocate($img, $c3, $c1, $c2);
+
+		imagefill($stencil, 0, 0, $black2);
+		imagefill($img, 0, 0, $white1);
+
+		$chars = array_merge(range('A', 'Z'), range('1', '9'));
+
+		for ($i = 0; $i < 1000; ++$i)
+		{
+			$degree = mt_rand(-30, 30);
+			$x = mt_rand(0, $img_x - 1);
+			$y = mt_rand(0, $img_y);
+			$c = $chars[array_rand($chars)];
+			$font = $fonts[array_rand($fonts)];
+
+			imagettftext($stencil, mt_rand(20, 30), $degree, $x, $y, $white2, $font, $c);
+		}
+
+		for ($i = 0; $i < 3; ++$i)
+		{
+			$degree1 = mt_rand(-30, 30);
+			$degree2 = mt_rand(-30, 30);
+			$x1 = mt_rand(0, $img_x - 1);
+			$x2 = mt_rand(0, $img_x - 1);
+			$y1 = mt_rand(0, $img_y);
+			$y2 = mt_rand(0, $img_y);
+			$c1 = $chars[array_rand($chars)];
+			$c2 = $chars[array_rand($chars)];
+			$font1 = $fonts[array_rand($fonts)];
+			$font2 = $fonts[array_rand($fonts)];
+			
+			imagettftext($img, 150, $degree1, $x1, $y1, $second, $font1, $c1);
+			imagettftext($img, 150, $degree2, $x2, $y2, $third, $font2, $c2);
+		}
+
+		$text = implode('', $code);
+		$font = $fonts[array_rand($fonts)];
+		imagettftext($img, 150, mt_rand(-5, 5), mt_rand(0, $img_x / 4), mt_rand(150, $img_y), $primary, $font, $text);
+
+		for ($i = 0; $i < $img_x; ++$i)
+		{
+			for ($j = 0; $j < $img_y; ++$j)
+			{
+				// if the stencil is black, set the pixel in the image black
+				if (!imagecolorat($stencil, $i, $j))
+				{
+					imagesetpixel($img, $i, $j, $black1);
+				}
+			}
+		}
+
+		// Send image
+		$this->send_image($img);
+	}
+
+	function policy_cells($code)
+	{
+		// Generate image
+		$img_x = 800;
+		$img_y = 250;
+		$img = imagecreate($img_x, $img_y);
+
+		$fonts = captcha_load_ttf_fonts();
+
+		$map = captcha_vectors();
+
+		//
+		// Generate colors
+		//
+		$white = imagecolorallocate($img, 255, 255, 255);
+		$black = imagecolorallocate($img, 0, 0, 0);
+		$colors = array(
+			imagecolorallocate($img, 128, 0, 0),
+			imagecolorallocate($img, 0, 128, 0),
+			imagecolorallocate($img, 0, 0, 128),
+			imagecolorallocate($img, 90, 90, 90)
+		);
+						
+		$red = mt_rand(0,3);
+
+		imagefill($img, 10, 10, $white);
+
+		$offset1 = 50;
+		$offset2 = 550;
+
+		// draw the cell grid
+		for ($i = 0; $i < 4; ++$i)
+		{
+			imageline($img, $offset1 + 40 + ($i * 40), 25, $offset1 + 40 + ($i * 40), 225, $black);
+			imageline($img, $offset1, 65 + ($i * 40), $offset1 + 200, 65 + ($i * 40), $black);
+			imageline($img, $offset2 + 40 + ($i * 40), 25, $offset2 + 40 + ($i * 40), 225, $black);
+			imageline($img, $offset2, 65 + ($i * 40), $offset2 + 200, 65 + ($i * 40), $black);
+		}
+
+		$code_count = sizeof($code);
+
+		$characters = array();
+		$bitmap = array_fill(0, 25, 0);
+		$cellorder = array();
+		$xs = array();
+		$ys = array();
+
+		$chars = array_merge(range('A', 'Z'), range('1', '9'));
+
+		for ($i = 0, $count = sizeof($chars) - 1; $i < 25; ++$i)
+		{
+			// Put a character in this cell
+			$characters[$i] = $chars[array_rand($chars)];
+			$xs[$i] = $offset1 + 20 + (($i % 5) * 40) + mt_rand(-13, 13);
+			$ys[$i] = 45 + (intval($i / 5) * 40) + mt_rand(-13, 13);
+			
+			// Generate a pastel color
+			$color = array(255, 255, 255);
+			for ($j = 0; $j < 3; ++$j)
+			{
+				$color[array_rand($color)] -= 25;
+			}
+			$bg = imagecolorallocate($img, $color[0], $color[1], $color[2]);
+			
+			// fill the cells with the background colors
+			imagefilledrectangle($img, $offset1 + 1 + (($i % 5) * 40), 26 + (intval($i / 5) * 40), $offset1 + 39 + (($i % 5) * 40), 64 + (intval($i / 5) * 40), $bg);
+			imagefilledrectangle($img, $offset2 + 1 + (($i % 5) * 40), 26 + (intval($i / 5) * 40), $offset2 + 39 + (($i % 5) * 40), 64 + (intval($i / 5) * 40), $bg);
+		}
+
+		// assign the code to some cells
+		$cellorder = range(0, 24);
+		shuffle($cellorder);
+		array_splice($cellorder, $code_count);
+		for ($i = 0; $i < $code_count; ++$i)
+		{
+			$bitmap[$cellorder[$i]] = $i + 1;
+			$characters[$cellorder[$i]] = $code[$i];
+		}
+
+		// assign the remaning cells to three separate colors
+		$spares = array(array(), array(), array());
+		for ($i = 0; $i < 25; ++$i)
+		{
+			if (!$bitmap[$i])
+			{
+				$spares[array_rand($spares)][] = $i;
+			}
+		}
+		shuffle($spares[0]);
+		shuffle($spares[1]);
+		shuffle($spares[2]);
+
+		// draw circles and lines for our fake entries
+		for ($k = 0; $k < 3; ++$k )
+		{
+			for ($i = 0, $size = sizeof($spares[$k]); $i < $size; ++$i )
+			{
+				imagefilledellipse($img, $xs[$spares[$k][$i]], $ys[$spares[$k][$i]], 20, 20, $colors[($red + $k + 1) % 4]);
+				if ($i)
+				{
+					imageline($img, $xs[$spares[$k][$i - 1]], $ys[$spares[$k][$i - 1]], $xs[$spares[$k][$i]], $ys[$spares[$k][$i]], $colors[($red + $k + 1) % 4]);
+				}
+			}
+		}
+
+		// draw lines for our real entries
+		for ($i = 1; $i < $code_count; ++$i )
+		{
+			imageline($img, $xs[$cellorder[$i - 1]], $ys[$cellorder[$i - 1]], $xs[$cellorder[$i]], $ys[$cellorder[$i]], $colors[$red]);
+		}
+
+		// write characters into the text cells & put white dots (change this?) on our fake entry circles
+		for ($i = 0; $i < 25; ++$i)
+		{
+			if (!$bitmap[$i])
+			{
+				imagefilledellipse($img, $xs[$i], $ys[$i], 9, 9, $white);
+			}
+			$level = intval($i / 5);
+			$pos = $i % 5;
+			imagettftext($img, 12, 0, $offset2 + 15 + ($pos * 40), 50 + ($level * 40), $black, $fonts[array_rand($fonts)], $characters[$i]);
+		}
+
+		// draw our real entries in
+		for ($i = 0; $i < $code_count; ++$i )
+		{
+			imagefilledellipse($img, $xs[$cellorder[$i]], $ys[$cellorder[$i]], 20, 20, $colors[$red]);
+			imagettftext($img, 12, 0, $xs[$cellorder[$i]] - 5, $ys[$cellorder[$i]] + 5, $white, $fonts[array_rand($fonts)], ($i + 1));
+		}
+
+		// Send image
+		$this->send_image($img);
+	}
+
 	/**
 	* entropy
 	*/
@ -564,9 +904,9 @@ class captcha
 	}

 	/**
-	* occlude
+	* overlap
 	*/
-	function policy_occlude($code)
+	function policy_overlap($code)
 	{
 		global $config;
 		$char_size = 40;
@ -610,7 +950,7 @@ class captcha
 		$offset = mt_rand(0, $width_avail);

 		// Add some line noise
-		if ($config['policy_occlude_noise_line'])
+		if ($config['policy_overlap_noise_line'])
 		{
 			$this->noise_line($img, 0, 0, $img_x, $img_y, $background, $fontcolors, $random);
 		}
@ -633,9 +973,9 @@ class captcha
 		}

 		// Add some medium pixel noise
-		if ($config['policy_occlude_noise_pixel'])
+		if ($config['policy_overlap_noise_pixel'])
 		{
-			$this->noise_pixel($img, 0, 0, $img_x, $img_y, $background, $fontcolors, $random, $config['policy_occlude_noise_pixel']);
+			$this->noise_pixel($img, 0, 0, $img_x, $img_y, $background, $fontcolors, $random, $config['policy_overlap_noise_pixel']);
 		}

 		// Send image
@ -793,8 +1133,19 @@ class captcha
 	*/
 	function captcha_char($override = false)
 	{
-		$character_classes = array('char_vector', 'char_ttf', 'char_hatches', 'char_cube3d', 'char_dots');
+		static $character_classes = array();

+		// Some people have GD but no TTF support
+		if (sizeof($character_classes) == 0)
+		{
+			$character_classes = array('char_vector', 'char_hatches', 'char_cube3d', 'char_dots');
+
+			if (function_exists('imagettfbbox') && function_exists('imagettftext'))
+			{
+				$character_classes[] = 'char_ttf';
+			}
+		}
+//$character_classes = array('char_dots');
 		// Use the module $override, else a random picked one...
 		$class = ($override !== false && in_array($override, $character_classes)) ? $override : $character_classes[array_rand($character_classes)];

@ -828,7 +1179,7 @@ class char_dots
 		$this->width_percent = (!empty($width_percent)) ? max(25, min(150, intval($width_percent))) : mt_rand(60, 90);

 		$this->space = 10;
-		$this->radius = 3;
+		$this->radius = 1;
 		$this->letter = $letter;
 	}
 	
@ -1051,7 +1402,7 @@ class char_ttf
 			$angle = (isset($args['angle'])) ? $args['angle'] : false;
 		}

-		$fonts = $this->captcha_load_ttf_fonts();
+		$fonts = captcha_load_ttf_fonts();

 		if (empty($font) || !isset($fonts[$font]))
 		{
@ -1088,33 +1439,6 @@ class char_ttf
 		$data = imagettfbbox($scale, $this->angle, $this->fontfile, $this->letter);
 		return ($this->angle > 0) ? array($data[6], $data[5], $data[2], $data[1]) : array($data[0], $data[7], $data[4], $data[3]);
 	}
-
-	/**
-	* Load True Type Fonts
-	*/
-	function captcha_load_ttf_fonts()
-	{
-		static $load_files = array();
-
-		if (sizeof($load_files) > 0)
-		{
-			return $load_files;
-		}
-
-		global $phpbb_root_path;
-
-		$dr = opendir($phpbb_root_path . 'includes/captcha/fonts');
-		while (false !== ($entry = readdir($dr)))
-		{
-			if (strtolower(pathinfo($entry, PATHINFO_EXTENSION)) == 'ttf')
-			{
-				$load_files[$entry] = $phpbb_root_path . 'includes/captcha/fonts/' . $entry;
-			}
-		}
-		closedir($dr);
-
-		return $load_files;
-	}
 }

 /**
@ -2166,23 +2490,51 @@ function captcha_bitmaps()
 	);
 }

+
+/**
+* Load True Type Fonts
+*/
+function captcha_load_ttf_fonts()
+{
+	static $load_files = array();
+
+	if (sizeof($load_files) > 0)
+	{
+		return $load_files;
+	}
+
+	global $phpbb_root_path;
+
+	$dr = opendir($phpbb_root_path . 'includes/captcha/fonts');
+	while (false !== ($entry = readdir($dr)))
+	{
+		if (strtolower(pathinfo($entry, PATHINFO_EXTENSION)) == 'ttf')
+		{
+			$load_files[$entry] = $phpbb_root_path . 'includes/captcha/fonts/' . $entry;
+		}
+	}
+	closedir($dr);
+
+	return $load_files;
+}
+
+
 /**
 * Return vectors
 */
 function captcha_vectors()
 {
 	return array(
-
 		'A' => array(
-			array('line',	0.00,0.00,	0.50,1.00),
-			array('line',	1.00,0.00,	0.50,1.00),
-			array('line',	0.25,0.50,	0.75,0.50),
+			array('line',	0.00,	0.00,	0.50,	1.00,	1.10714871779,		1.11803398875),
+			array('line',	1.00,	0.00,	0.50,	1.00,	2.0344439358,		1.11803398875),
+			array('line',	0.25,	0.50,	0.75,	0.50,	0.00,				0.50),
 		),
 		'B' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,1.00,	0.70,1.00),
-			array('line',	0.00,0.50,	0.70,0.50),
-			array('line',	0.00,0.00,	0.70,0.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	1.00,	0.70,	1.00,	0.00,				0.70),
+			array('line',	0.00,	0.50,	0.70,	0.50,	0.00,				0.70),
+			array('line',	0.00,	0.00,	0.70,	0.00,	0.00,				0.70),
 			array('arc',	0.70,	0.75,	0.60,	0.50,	270,	90),
 			array('arc',	0.70,	0.25,	0.60,	0.50,	270,	90),
 		),
@ -2190,82 +2542,79 @@ function captcha_vectors()
 			array('arc',	0.50,	0.50,	1.00,	1.00,	45,		315),
 		),
 		'D' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,0.00,	0.50,0.00),
-			array('line',	0.00,1.00,	0.50,1.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	0.00,	0.50,	0.00,	0.00,				0.50),
+			array('line',	0.00,	1.00,	0.50,	1.00,	0.00,				0.50),
 			array('arc',	0.50,	0.50,	1.00,	1.00,	270,	90),
 		),
 		'E' => array(
-			array('line',	0.00,0.00,	1.00,0.00),
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.00,0.50,	0.50,0.50),
+			array('line',	0.00,	0.00,	1.00,	0.00,	0.00,				1.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.00,	0.50,	0.50,	0.50,	0.00,				0.50),
 		),
 		'F' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.00,0.50,	0.50,0.50),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.00,	0.50,	0.50,	0.50,	0.00,				0.50),
 		),
 		'G' => array(
-			array('line',	0.50,0.50,	1.00,0.50),
-			array('line',	1.00,0.00,	1.00,0.50),
+			array('line',	0.50,	0.50,	1.00,	0.50,	0.00,				0.50),
+			array('line',	1.00,	0.00,	1.00,	0.50,	1.57079632679,		0.50),
 			array('arc',	0.50,	0.50,	1.00,	1.00,	0,		315),
 		),
 		'H' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	1.00,0.00,	1.00,1.00),
-			array('line',	0.00,0.50,	1.00,0.50),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	1.00,	0.00,	1.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	0.50,	1.00,	0.50,	0.00,	1.00),
 		),
 		'I' => array(
-			array('line',	0.00,0.00,	1.00,0.00),
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.50,0.00,	0.50,1.00),
+			array('line',	0.00,	0.00,	1.00,	0.00,	0.00,				1.00),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.50,	0.00,	0.50,	1.00,	1.57079632679,		1.00),
 		),
 		'J' => array(
-//			array('line',	0.00,1.00,	1.00,1.00),
-//			array('line',	0.50,1.00,	0.50,0.25),
-//			array('arc',	0.25,0.25,	0.50,0.50,	0,180),
-			array('line',	1.00,1.00,	1.00,0.25),
+			array('line',	1.00,	1.00,	1.00,	0.25,	-1.57079632679,		0.75),
 			array('arc',	0.50,	0.25,	1.00,	0.50,	0,		180),
 		),
 		'K' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,0.50,	1.00,1.00),
-			array('line',	0.00,0.50,	1.00,0.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	0.50,	1.00,	1.00,	0.463647609001,		1.11803398875),
+			array('line',	0.00,	0.50,	1.00,	0.00,	-0.463647609001,	1.11803398875),
 		),
 		'L' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,0.00,	1.00,0.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	0.00,	1.00,	0.00,	0.00,				1.00),
 		),
 		'M' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.50,0.50,	0.00,1.00),
-			array('line',	0.50,0.50,	1.00,1.00),
-			array('line',	1.00,0.00,	1.00,1.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.50,	0.50,	0.00,	1.00,	2.35619449019,		0.707106781187),
+			array('line',	0.50,	0.50,	1.00,	1.00,	0.785398163397,		0.707106781187),
+			array('line',	1.00,	0.00,	1.00,	1.00,	1.57079632679,		1.00),
 		),
 		'N' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,1.00,	1.00,0.00),
-			array('line',	1.00,0.00,	1.00,1.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	1.00,	1.00,	0.00,	-0.785398163397,	1.41421356237),
+			array('line',	1.00,	0.00,	1.00,	1.00,	1.57079632679,		1.00),
 		),
 		'O' => array(
 			array('arc',	0.50,	0.50,	1.00,	1.00,	0,		360),
 		),
 		'P' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,1.00,	0.70,1.00),
-			array('line',	0.00,0.50,	0.70,0.50),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	1.00,	0.70,	1.00,	0.00,				0.70),
+			array('line',	0.00,	0.50,	0.70,	0.50,	0.00,				0.70),
 			array('arc',	0.70,	0.75,	0.60,	0.50,	270,	90),
 		),
 		'Q' => array(
-			array('line',	0.70,0.30,	1.00,0.00),
+			array('line',	0.70,	0.30,	1.00,	0.00,	-0.785398163397,	0.424264068712),
 			array('arc',	0.50,	0.50,	1.00,	1.00,	0,		360),
 		),
 		'R' => array(
-			array('line',	0.00,0.00,	0.00,1.00),
-			array('line',	0.00,1.00,	0.70,1.00),
-			array('line',	0.00,0.50,	0.70,0.50),
-			array('line',	0.50,0.50,	1.00,0.00),
+			array('line',	0.00,	0.00,	0.00,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	1.00,	0.70,	1.00,	0.00,				0.70),
+			array('line',	0.00,	0.50,	0.70,	0.50,	0.00,				0.70),
+			array('line',	0.50,	0.50,	1.00,	0.00,	-0.785398163397,	0.707106781187),
 			array('arc',	0.70,	0.75,	0.60,	0.50,	270,	90),
 		),
 		'S' => array(
@ -2273,45 +2622,45 @@ function captcha_vectors()
 			array('arc',	0.50,	0.25,	1.00,	0.50,	270,	180),
 		),
 		'T' => array(
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.50,0.00,	0.50,1.00),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.50,	0.00,	0.50,	1.00,	1.57079632679,		1.00),
 		),
 		'U' => array(
-			array('line',	0.00,1.00,	0.00,0.25),
-			array('line',	1.00,1.00,	1.00,0.25),
+			array('line',	0.00,	1.00,	0.00,	0.25,	-1.57079632679,		0.75),
+			array('line',	1.00,	1.00,	1.00,	0.25,	-1.57079632679,		0.75),
 			array('arc',	0.50,	0.25,	1.00,	0.50,	0,		180),
 		),
 		'V' => array(
-			array('line',	0.00,1.00,	0.50,0.00),
-			array('line',	1.00,1.00,	0.50,0.00),
+			array('line',	0.00,	1.00,	0.50,	0.00,	-1.10714871779,		1.11803398875),
+			array('line',	1.00,	1.00,	0.50,	0.00,	-2.0344439358,		1.11803398875),
 		),
 		'W' => array(
-			array('line',	0.00,1.00,	0.25,0.00),
-			array('line',	0.50,0.50,	0.25,0.00),
-			array('line',	0.50,0.50,	0.75,0.00),
-			array('line',	1.00,1.00,	0.75,0.00),
+			array('line',	0.00,	1.00,	0.25,	0.00,	-1.32581766367,		1.0307764064),
+			array('line',	0.50,	0.50,	0.25,	0.00,	-2.0344439358,		0.559016994375),
+			array('line',	0.50,	0.50,	0.75,	0.00,	-1.10714871779,		0.559016994375),
+			array('line',	1.00,	1.00,	0.75,	0.00,	-1.81577498992,		1.0307764064),
 		),
 		'X' => array(
-			array('line',	0.00,1.00,	1.00,0.00),
-			array('line',	0.00,0.00,	1.00,1.00),
+			array('line',	0.00,	1.00,	1.00,	0.00,	-0.785398163397,	1.41421356237),
+			array('line',	0.00,	0.00,	1.00,	1.00,	0.785398163397,		1.41421356237),
 		),
 		'Y' => array(
-			array('line',	0.00,1.00,	0.50,0.50),
-			array('line',	1.00,1.00,	0.50,0.50),
-			array('line',	0.50,0.50,	0.50,0.00),
+			array('line',	0.00,	1.00,	0.50,	0.50,	-0.785398163397,	0.707106781187),
+			array('line',	1.00,	1.00,	0.50,	0.50,	-2.35619449019,		0.707106781187),
+			array('line',	0.50,	0.50,	0.50,	0.00,	-1.57079632679,		0.50),
 		),
 		'Z' => array(
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.00,0.00,	1.00,1.00),
-			array('line',	0.00,0.00,	1.00,0.00),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.00,	0.00,	1.00,	1.00,	0.785398163397,		1.41421356237),
+			array('line',	0.00,	0.00,	1.00,	0.00,	0.00,				1.00),
 		),
 		'1' => array(
-			array('line',	0.00,0.75,	0.50,1.00),
-			array('line',	0.50,0.00,	0.50,1.00),
-			array('line',	0.00,0.00,	1.00,0.00),
+			array('line',	0.00,	0.75,	0.50,	1.00,	0.463647609001,		0.559016994375),
+			array('line',	0.50,	0.00,	0.50,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	0.00,	1.00,	0.00,	0.00,				1.00),
 		),
 		'2' => array(
-			array('line',	0.00,0.00,	1.00,0.00),
+			array('line',	0.00,	0.00,	1.00,	0.00,	0.00,				1.00),
 			array('arc',	0.50,	0.70,	1.00,	0.60,	180,	360),
 			array('arc',	0.50,	0.70,	1.00,	0.70,	0,		90),
 			array('arc',	0.50,	0.00,	1.00,	0.70,	180,	270),
@ -2321,38 +2670,32 @@ function captcha_vectors()
 			array('arc',	0.50,	0.25,	1.00,	0.50,	270,	180),
 		),
 		'4' => array(
-			array('line',	0.70,0.00,	0.70,1.00),
-			array('line',	0.00,0.50,	0.70,1.00),
-			array('line',	0.00,0.50,	1.00,0.50),
+			array('line',	0.70,	0.00,	0.70,	1.00,	1.57079632679,		1.00),
+			array('line',	0.00,	0.50,	0.70,	1.00,	0.620249485983,		0.860232526704),
+			array('line',	0.00,	0.50,	1.00,	0.50,	0.00,				1.00),
 		),
 		'5' => array(
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.00,1.00,	0.00,0.60),
-			array('line',	0.00,0.60,	0.50,0.60),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.00,	1.00,	0.00,	0.60,	-1.57079632679,		0.4),
+			array('line',	0.00,	0.60,	0.50,	0.60,	0.00,				0.50),
 			array('arc',	0.50,	0.30,	1.00,	0.60,	270,	180),
 		),
 		'6' => array(
-//			array('line',	0.00,0.50,	0.00,0.30),
-//			array('arc',	0.50,0.50,	1.00,1.00,	180,315),
-//			array('arc',	0.50,0.30,	1.00,0.60,	0,360),
 			array('arc',	0.50,	0.50,	1.00,	1.00,	90,		315),
 			array('arc',	0.50,	0.30,	0.80,	0.60,	0,		360),
 		),
 		'7' => array(
-			array('line',	0.00,1.00,	1.00,1.00),
-			array('line',	0.50,0.00,	1.00,1.00),
+			array('line',	0.00,	1.00,	1.00,	1.00,	0.00,				1.00),
+			array('line',	0.50,	0.00,	1.00,	1.00,	1.10714871779,		1.11803398875),
 		),
 		'8' => array(
 			array('arc',	0.50,	0.75,	1.00,	0.50,	0,		360),
 			array('arc',	0.50,	0.25,	1.00,	0.50,	0,		360),
 		),
 		'9' => array(
-//			array('line',	1.00,0.50,	1.00,0.70),
-//			array('arc',	0.50,0.50,	1.00,1.00,	0,135),
-//			array('arc',	0.50,0.70,	1.00,0.60,	0,360),
 			array('arc',	0.50,	0.50,	1.00,	1.00,	270,	135),
 			array('arc',	0.50,	0.70,	0.80,	0.60,	0,		360),
-		),
+		)
 	);
 }

--- a/phpBB/includes/ucp/ucp_confirm.php
+++ b/phpBB/includes/ucp/ucp_confirm.php
@ -24,7 +24,7 @@ class ucp_confirm
 {
 	function main($id, $mode)
 	{
-		global $db, $user, $phpbb_root_path;
+		global $db, $user, $phpbb_root_path, $config;

 		// Do we have an id? No, then just exit
 		$confirm_id = request_var('id', '');
@ -51,9 +51,31 @@ class ucp_confirm
 			exit;
 		}

-		if (extension_loaded('gd'))
+		// Some people might want the olde style CAPTCHA even if they have GD enabled, this also saves us from people who have GD but no TTF
+		$policy_modules = array('policy_entropy', 'policy_3dbitmap');
+
+		if (function_exists('imagettfbbox') && function_exists('imagettftext'))
+		{
+			$policy_modules[] = 'policy_overlap';
+			$policy_modules[] = 'policy_shape';
+			$policy_modules[] = 'policy_cells';
+			$policy_modules[] = 'policy_stencil';
+			$policy_modules[] = 'policy_composite';
+		}
+
+		foreach ($policy_modules as $key => $name)
+		{
+			if ($config[$name] === '0')
+			{
+				unset($policy_modules[$key]);
+			}
+		}
+
+		$policy = '';
+		if (extension_loaded('gd') && sizeof($policy_modules))
 		{
 			include($phpbb_root_path . 'includes/captcha/captcha_gd.php');
+			$policy = $policy_modules[array_rand($policy_modules)];
 		}
 		else
 		{
@ -61,7 +83,7 @@ class ucp_confirm
 		}

 		$captcha = new captcha();
-		$captcha->execute($row['code']);
+		$captcha->execute($row['code'], $policy);
 		exit;
 	}
 }
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@ -1084,6 +1084,14 @@ class install_install extends module
 				SET forum_last_post_time = $current_time", 
 		);

+		// This is for people who have TTF disabled
+		if (!(@function_exists('imagettfbbox') && @function_exists('imagettftext')))
+		{
+			$sql_ary[] = 'UPDATE ' . $table_prefix . "config
+					SET config_value = '0'
+					WHERE config_name = 'policy_shape'";
+		}
+
 		foreach ($sql_ary as $sql)
 		{
 			$sql = trim(str_replace('|', ';', $sql));
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@ -162,9 +162,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', '.*
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_occlude', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_occlude_noise_pixel', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_occlude_noise_line', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap_noise_pixel', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap_noise_line', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy_noise_pixel', '2');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy_noise_line', '1');
@ -172,6 +172,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape', '1'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape_noise_pixel', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape_noise_line', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_3dbitmap', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_cells', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_stencil', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_composite', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@ -88,16 +88,21 @@ $lang = array_merge($lang, array(
 	'BOXES_LIMIT_EXPLAIN'		=> 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',

 	'CAPTCHA_OPTIONS'			=> 'Captcha Options',
-	'CAPTCHA_OCCLUDE'			=> 'Occlude',
+
+	'CAPTCHA_OVERLAP'			=> 'Overlap',
 	'CAPTCHA_ENTROPY'			=> 'Entropy',
 	'CAPTCHA_SHAPE'				=> 'Shape',
 	'CAPTCHA_3DBITMAP'			=> '3D Bitmap',
+	'CAPTCHA_CELLS'				=> 'Cells',
+	'CAPTCHA_STENCIL'			=> 'Stencil',
+	'CAPTCHA_COMPOSITE'			=> 'Composite',
+
 	'ENTROPY_NOISE_PIXEL'		=> 'Entropy pixel noise',
 	'ENTROPY_NOISE_LINE'		=> 'Entropy line noise',
 	'SHAPE_NOISE_PIXEL'			=> 'Shape pixel noise',
 	'SHAPE_NOISE_LINE'			=> 'Shape line noise',
-	'OCCLUDE_NOISE_PIXEL'		=> 'Occlude pixel noise',
-	'OCCLUDE_NOISE_LINE'		=> 'Occlude line noise',
+	'OVERLAP_NOISE_PIXEL'		=> 'Overlap pixel noise',
+	'OVERLAP_NOISE_LINE'		=> 'Overlap line noise',
 	'HEAVY'						=> 'Heavy',
 	'MEDIUM'					=> 'Medium',
 	'LIGHT'						=> 'Light',
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@ -95,7 +95,7 @@ $lang = array_merge($lang, array(
 	'CLOSE_WINDOW'			=> 'Close window',
 	'CONFIRM'				=> 'Confirm',
 	'CONFIRM_CODE'			=> 'Confirmation code',
-	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case sensitive, zero has a diagonal line through it.',
+	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case insensitive.',
 	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed',