gothick / phpbb-ext-recaptcha2

captcha/recaptcha2.php

Spacing +3 added lines, -3 removed lines

@@ -163,11 +163,11 @@ 
 			}
 
 			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL');
-			trigger_error($this->lang->lang('CONFIG_UPDATED') . adm_back_link($module->u_action));
+			trigger_error($this->lang->lang('CONFIG_UPDATED').adm_back_link($module->u_action));
 		}
 		else if ($this->request->is_set_post('submit'))
 		{
-			trigger_error($this->lang->lang('FORM_INVALID'). adm_back_link($module->u_action));
+			trigger_error($this->lang->lang('FORM_INVALID').adm_back_link($module->u_action));
 		}
 
 		foreach ($captcha_vars as $captcha_var => $template_var)
@@ -202,7 +202,7 @@ 
 		else
 		{
 			$contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx);
-			$explain = $this->lang->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>');
+			$explain = $this->lang->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="'.$contact_link.'">', '</a>');
 
 			// Language code for reCAPTCHA to use
 			$recaptcha2_lang = $this->lang->lang('GOTHICK_RECAPTCHA2_LANG');

Braces +5 added lines, -10 removed lines

@@ -164,8 +164,7 @@ 
 
 			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL');
 			trigger_error($this->lang->lang('CONFIG_UPDATED') . adm_back_link($module->u_action));
-		}
-		else if ($this->request->is_set_post('submit'))
+		} else if ($this->request->is_set_post('submit'))
 		{
 			trigger_error($this->lang->lang('FORM_INVALID'). adm_back_link($module->u_action));
 		}
@@ -198,8 +197,7 @@ 
 		if ($this->is_solved())
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			$contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx);
 			$explain = $this->lang->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>');
@@ -259,8 +257,7 @@ 
 		if (!parent::validate())
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			try
 			{
@@ -271,15 +268,13 @@ 
 				{
 					$this->solved = true;
 					return false;
-				}
-				else
+				} else
 				{
 					// $errors = $response->getErrorCodes();
 					// TODO: Can we pass something less general back from the error response above?
 					return $this->lang->lang('GOTHICK_RECAPTCHA2_INCORRECT');
 				}
-			}
-			catch (\Exception $e)
+			} catch (\Exception $e)
 			{
 				trigger_error($this->lang->lang('GOTHICK_RECAPTCHA2_EXCEPTION', $e->getMessage()), E_USER_ERROR);
 			}