move all captcha code to users/

2 files changed, 7 insertions, 5 deletions

diff --git a/admin/admin_login_inc.php b/admin/admin_login_inc.php
index 10bab17..653609c 100644
--- a/admin/admin_login_inc.php
+++ b/admin/admin_login_inc.php
@@ -142,8 +142,8 @@ $registerSettings = array(
 		'type' => "text",
 		'note' => "This will be given to you after registering your site with Google",
 	),
-	'users_register_recaptcha_private_key' => array(
-		'label' => "reCAPTCHA Private Key",
+	'users_register_recaptcha_secret_key' => array(
+		'label' => "reCAPTCHA Secret Key",
 		'type' => "text",
 		'note' => "This will be given to you after registering your site with Google",
 	),
diff --git a/admin/verify_emails.php b/admin/verify_emails.php
index 488ccd3..202778b 100644
--- a/admin/verify_emails.php
+++ b/admin/verify_emails.php
@@ -6,7 +6,7 @@
 // Initialization
 require_once( '../../kernel/setup_inc.php' );
 
-	
+if( $validatedGroup = $gBitSystem->getConfig( 'users_validate_email_group' ) ) {	
 	$gBitUser->verifyTicket();
 
 	$whereSql = '';
@@ -24,7 +24,7 @@ require_once( '../../kernel/setup_inc.php' );
 		flush();
 		$emailStatus = $gBitUser->verifyMx($email,$errors);
 		if( $emailStatus === true){
-			$gBitUser->addUserToGroup( $id , $gBitSystem->getConfig('users_validate_email_group') );
+			$gBitUser->addUserToGroup( $id , $validatedGroup );
 			print "valid";
 		} elseif( $emailStatus === -1 )  {
 			print "MX connection failed";
@@ -34,5 +34,7 @@ require_once( '../../kernel/setup_inc.php' );
 		print "<br/>\n";
 		flush();
 	}
-
+} else {
+	
+}