Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php	(revision 252)
+++ trunk/wb/admin/settings/index.php	(revision 253)
@@ -319,6 +319,11 @@
 } else {
 	$template->set_var('CAPTCHA_VERIFICATION_DISABLED', ' checked');
 }
+if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
+	$template->set_var('GD_EXTENSION_ENABLED', '');
+} else {
+	$template->set_var('GD_EXTENSION_ENABLED', 'none');
+}
 
 // Work-out if section blocks feature is enabled
 if(defined('SECTION_BLOCKS') AND SECTION_BLOCKS == true) {
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 252)
+++ trunk/wb/admin/settings/template.html	(revision 253)
@@ -176,7 +176,7 @@
 		<label for="smart_login_false">{TEXT_DISABLED}</label>
 	</td>
 </tr>
-<tr class="advanced">
+<tr class="advanced" style="display: {GD_EXTENSION_LOADED};">
 	<td class="setting_name">{TEXT_CAPTCHA_VERIFICATION}:</td>
 	<td class="setting_value" colspan="2">
 		<input type="radio" name="captcha_verification" id="captcha_verification_true" style="width: 14px; height: 14px;" value="true"{CAPTCHA_VERIFICATION_ENABLED} />
Index: trunk/wb/account/signup2.php
===================================================================
--- trunk/wb/account/signup2.php	(revision 252)
+++ trunk/wb/account/signup2.php	(revision 253)
@@ -27,6 +27,9 @@
 	header('Location: ../pages/index.php');
 }
 
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Start', 'start', false, false);
+
 // Create new database object
 $database = new database();
 
@@ -54,6 +57,18 @@
 } else {
 	$admin->print_error($MESSAGE['SIGNUP']['NO_EMAIL'], $js_back);
 }
+// Captcha
+if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
+	if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){
+		// Check for a mismatch
+		if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) {
+			$admin->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back);
+		}
+	} else {
+		$admin->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back);
+	}
+}
+if(isset($_SESSION['catpcha'])) { unset($_SESSION['captcha']); }
 
 // Generate a random password then update the database with it
 $new_pass = '';
Index: trunk/wb/account/signup_form.php
===================================================================
--- trunk/wb/account/signup_form.php	(revision 252)
+++ trunk/wb/account/signup_form.php	(revision 253)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: signup_form.php,v 1.2 2005/04/08 07:36:57 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -58,6 +58,24 @@
 		<input type="text" name="email" maxlength="255" />
 	</td>
 </tr>
+<?php
+// Captcha
+if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
+	if(CAPTCHA_VERIFICATION == true) {
+		$_SESSION['captcha'] = '';
+		for($i = 0; $i < 5; $i++) {
+			$_SESSION['captcha'] .= rand(0,9);
+		}
+		?><tr><td class="field_title"><?php echo $TEXT['VERIFICATION']; ?>:</td><td>
+		<table cellpadding="2" cellspacing="0" border="0">
+		<tr><td><img src="<?php echo WB_URL; ?>/include/captcha.php" alt="Captcha" /></td>
+		<td><input type="text" name="captcha" maxlength="5" /></td>
+		</tr></table>
+		</td></tr>
+		<?php
+	}
+}
+?>
 <tr>
 	<td>&nbsp;</td>
 	<td>