Repair use of recaptcha

Author: Crizz0

controller/main.php

@@ -324,22 +324,21 @@ private function display_pb()
 					$captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
 					$captcha->init($this::CONFIRM_PASTEBIN);
 
-					if (!$captcha->is_solved())
+					$vc_response = $captcha->validate($data);
+					if ($vc_response !== false)
 					{
-						$error[] = $this->language->lang('PASTEBIN_CONFIRM_CODE_WRONG');
-					}
-					else if (!empty($error))
-					{
-						$captcha->new_attempt();
-					}
-					else
-					{
-						$captcha->garbage_collect($this::CONFIRM_PASTEBIN);
+						$error[] = $vc_response;
 					}
 				}
 
 				if (!empty($error))
 				{
+					// Okay, captcha, your job is done.
+					if (isset($captcha))
+					{
+						$captcha->reset();
+					}
+
 					// Remove duplicate entries of the error array
 					$error = array_unique($error);
 					// We have errors, we don't insert here, but instead go back to the posting page and tell the user what he did wrong
@@ -545,14 +544,15 @@ private function display_pb()
 		$s_hidden_fields['mode'] = 'post';
 
 		// Visual Confirmation - Show images (borrowed from includes/ucp/ucp_register.php)
-		$confirm_image = '';
 		if (!$this->auth->acl_get('u_pastebin_post_novc'))
 		{
 			if (!isset($captcha))
 			{
 				$captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
 				$captcha->init($this::CONFIRM_PASTEBIN);
 			}
+			$s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
+
 			$this->template->assign_var('PASTEBIN_CAPTCHA_TEMPLATE', $captcha->get_template());
 		}
 
@@ -608,8 +608,6 @@ private function display_pb()
 
 				'FILESIZE'			=> $this->config['max_filesize'],
 
-				'CONFIRM_IMG'		=> $confirm_image,
-
 				'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 				'S_ERROR'			=> (isset($s_error)) ? $s_error : '',
 				'S_HIDDEN_FIELDS'	=> (sizeof($s_hidden_fields)) ? build_hidden_fields($s_hidden_fields) : '',