Merge pull request #54 from Crizz0/issue/53

Repair use of recaptcha

Author: Crizz0

controller/main.php

@@ -324,25 +324,18 @@ 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))
 				{
 					// 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
+					// We have errors, we don't insert here, but instead go back to the submit page and tell the user what he did wrong
 					$s_error = implode('<br />', $error);
 				}
 				else
@@ -359,6 +352,12 @@ private function display_pb()
 							'snippet_prune_on'	=> time() + $this::SECONDS_MONTH * $data['snippet_prune_on'],
 					);
 
+					// Okay, captcha, your job is done.
+					if (!$this->auth->acl_get('u_pastebin_post_novc') && isset($captcha) && $captcha->is_solved() === true)
+					{
+						$captcha->reset();
+					}
+
 					$sql = 'INSERT INTO ' . $this->pastebin_table . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
 					$this->db->sql_query($sql);
 
@@ -543,16 +542,16 @@ 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());
 		}
 
@@ -595,6 +594,9 @@ private function display_pb()
 		}
 		$highlight_select = $this->util->highlight_select($highlight);
 
+		$captcha_in_use = $this->config['captcha_plugin'];
+		$is_recaptcha = strpos($captcha_in_use, 'recaptcha');
+
 		add_form_key('pastebinform');
 
 		$this->template->assign_vars(array(
@@ -608,12 +610,12 @@ private function display_pb()
 
 				'FILESIZE'			=> $this->config['max_filesize'],
 
-				'CONFIRM_IMG'		=> $confirm_image,
+				'PASTEBIN_IS_RECAPTCHA'		=> $is_recaptcha,
 
 				'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) : '',
-				'S_CONFIRM_CODE'	=> (!$this->auth->acl_get('u_pastebin_post_novc')) ? true : false,
+				'S_HIDDEN_FIELDS'	=> build_hidden_fields($s_hidden_fields),
+				'S_CONFIRM_CODE'	=> !$this->auth->acl_get('u_pastebin_post_novc'),
 		));
 	}
 }

language/de/pastebin.php

@@ -57,8 +57,8 @@
 	'PASTEBIN'					=> 'Pastebin',
 	'PASTEBIN_AUTH_NO_VIEW'		=> 'Du hast keine Berechtigung, die Seite anzuzeigen.',
 	'PASTEBIN_AUTH_NO_POST'		=> 'Du hast keine Berechtigung, einen Eintrag zu erstellen.',
-	'PASTEBIN_CONFIRM'			=> 'Visuelle Bestätigung',
-	'PASTEBIN_CONFIRM_EXPLAIN'	=> 'Gib den Code genau so ein, wie du ihn siehst; Groß- und Kleinschreibung wird nicht unterschieden, Null wird nicht verwendet.',
+	'PASTEBIN_CONFIRM'			=> 'Anti-Spam-Bot-Maßnahmen',
+	'PASTEBIN_CONFIRM_EXPLAIN'	=> 'Bitte löse die Anti-Spam-Bot-Maßnahmen, damit dein Eintrag abgesendet werden kann.',
 	'PASTEBIN_EMPTY_FILEUPLOAD'	=> 'Die hochgeladene Datei ist leer.',
 	'PASTEBIN_EXPLAIN'			=> 'Im Pastebin kannst du Codeabschnitte oder auch ganze Dateien ablegen, um sie zum Beispiel später in einem Supportthema zu verlinken.',
 	'PASTEBIN_HELLO'			=> 'Hat dich jemand hierher geschickt?',

language/en/pastebin.php

@@ -56,8 +56,8 @@
 	'PASTEBIN'					=> 'Pastebin',
 	'PASTEBIN_AUTH_NO_VIEW'		=> 'You are not authorized to view this page.',
 	'PASTEBIN_AUTH_NO_POST'		=> 'You are not authorized to enter a new entry.',
-	'PASTEBIN_CONFIRM'			=> 'Visual confirmation',
-	'PASTEBIN_CONFIRM_EXPLAIN'	=> 'Enter the code exactly as you see it; capitalization will be ignored, zero is not used.',
+	'PASTEBIN_CONFIRM'			=> 'Spambot countermeasures',
+	'PASTEBIN_CONFIRM_EXPLAIN'	=> 'Please solve the spambot countermeasures to submit your entry.',
 	'PASTEBIN_EMPTY_FILEUPLOAD'	=> 'The uploaded file is empty.',
 	'PASTEBIN_EXPLAIN'			=> 'In the pastebin, you can paste code snippets or whole files, for example to add a link to them to a support topic.',
 	'PASTEBIN_HELLO'			=> 'Did someone direct you here?',

styles/prosilver/template/pastebin_post.html

@@ -54,10 +54,11 @@ <h3>{{ lang('PASTEBIN_SNIPPET_TEXT') }}</h3>
 		</fieldset>
 
 		{% if PASTEBIN_CAPTCHA_TEMPLATE %}
-		<h3>{{ lang('PASTEBIN_CONFIRM') }}</h3>
-		<p>{{ lang('PASTEBIN_CONFIRM_EXPLAIN') }}</p>
+			{% if not PASTEBIN_IS_RECAPTCHA %}
+			<h3>{{ lang('PASTEBIN_CONFIRM') }}</h3>
+			<p>{{ lang('PASTEBIN_CONFIRM_EXPLAIN') }}</p>
+			{% endif %}
 
-			
 				{% DEFINE CAPTCHA_TAB_INDEX = 8 %}
 				{% INCLUDE ''~ PASTEBIN_CAPTCHA_TEMPLATE ~'' %}