CATPCHA can now be enabled on the admin login and user-login pages separately.

e107_admin/auth.php

@@ -79,7 +79,7 @@ else
 	
 	$sec_img = e107::getSecureImg();
 
-	$use_imagecode = ($pref['logcode'] && extension_loaded("gd"));
+	$use_imagecode = (vartrue($pref['admincode']) && extension_loaded("gd"));
 
 	if ($_POST['authsubmit'])
 	{

e107_admin/prefs.php

@@ -1387,22 +1387,39 @@ $text .= "
 							<div class='field-help'>".PRFLAN_61."</div>
 						</td>
 					</tr>
-					<tr>
+					<!-- Secure Image -->
-						<td>".PRFLAN_76.": </td>
+					
-						<td>
 ";
 
-if($hasGD)
+	$secureImage = array('signcode'=>PRFLAN_76, 'logcode'=>PRFLAN_81, "fpwcode"=>PRFLAN_138,'admincode'=>PRFLAN_222);
-{
+	
-	$text .= $frm->radio_switch('signcode', $pref['signcode']);
+	foreach($secureImage as $key=>$label)
-}
+	{
-else
+		
-{
+		$label = str_replace($srch,$repl,$label);
-	$text .= PRFLAN_133;
+		
-}
+		$text .= "<tr><td>".$label."</td><td>";	
-$text .= "
+		if($hasGD)
-						</td>
+		{
-					</tr>
+			$text .= $frm->radio_switch($key, $pref[$key]);
+		}
+		else
+		{
+			$text .= PRFLAN_133;
+		}
+		
+		$text .= "
+		<div class='field-help'>".PRFLAN_223."</div>
+		</td></tr>\n";
+		
+	}
+
+
+/*
+
+
+					
+	$text .= "
 					<tr>
 						<td>".PRFLAN_81.": </td>
 						<td>
@@ -1434,8 +1451,11 @@ else
 
 $text .= "
 						</td>
-					</tr>
+					</tr>";
-					<tr>
+ * 
+ 
+ */
+$text .= "					<tr>
 						<td>".PRFLAN_92.": </td>
 						<td>
 							".$frm->radio_switch('user_reg_secureveri', $pref['user_reg_secureveri'])."

e107_core/xml/default_install.xml

@@ -5,6 +5,7 @@
 		<core name="admin_alerts_uniquemenu">0</core>
 		<core name="admin_separate_plugins">0</core>
 		<core name="admin_slidedown_subs">1</core>
+		<core name="admincode">0</core>		
 		<core name="admincss">admin_dark.css</core>
 		<core name="adminpwordchange">0</core>
 		<core name="adminstyle">infopanel</core>

e107_languages/English/admin/lan_prefs.php

@@ -66,11 +66,11 @@ define("PRFLAN_58", "Restrict website to members only");
 define("PRFLAN_59", "ticking will restrict all areas apart from the front page and signup page to members only");
 define("PRFLAN_60", "Enable SSL");
 define("PRFLAN_61", "Only enable SSL if <span class='error'>you are sure you know what you are doing!</span>");
-define("PRFLAN_76", "Enable Image-code verification during signup.");
+define("PRFLAN_76", "Display CAPTCHA on signup page.");
 define("PRFLAN_77", "Admin Display Options ");
 define("PRFLAN_78", "Leave blank to disable");
 // define("PRFLAN_80", "Click here to view");
-define("PRFLAN_81", "Enable Image-code verification during login.");
+define("PRFLAN_81", "Display CAPTCHA on login page.");
 define("PRFLAN_83", "example");
 define("PRFLAN_87", "Comments/Posting");
 define("PRFLAN_88", "Turn on nested comments");
@@ -138,7 +138,7 @@ define("PRFLAN_134", "Redirect all requests to site URL");
 define("PRFLAN_135", "for example, if your site URL above is set http://foo.com, anyone requesting http://www.foo.com will be redirected to http://foo.com");
 define("PRFLAN_136", "Maximum Signups permitted from the same IP address.");
 define("PRFLAN_137", "Display Memory Usage");
-define("PRFLAN_138", "Enable Image-code verification during forgotten password.");
+define("PRFLAN_138", "Display CAPTCHA on forgotten password page.");
 define("PRFLAN_139", "Display warning when main administrator password hasn't changed for at least 30 days");
 define("PRFLAN_140", "Text to display after signup form has been submitted.");
 //define("PRFLAN_141", "Allow registration using XML User Profiles");
@@ -231,6 +231,8 @@ define('PRFLAN_218', 'If \'off\', puts users at increased risk of XSS exploits p
 define('PRFLAN_219', 'Not allowed characters found in Cookie name (alphanumeric characters allowed only). Cookie name not saved.');
 define('PRFLAN_220', 'HTML Abuse filter (experimental)');
 define('PRFLAN_221', 'Blocks some unmatched tags for those allowed to post HTML');
+define("PRFLAN_222", "Display CAPTCHA on admin-area login page.");
+define("PRFLAN_223", "Completely Automated Public Turing test to tell Computers and Humans Apart");
 // define('PRFLAN_222', 'Moderate Comments made by');
 // define('PRFLAN_223', 'Comments will require manual approval by an admin prior to being visible to other users');