| @@ -158,11 +158,11 @@ discard block | ||
| 158 | 158 | } | 
| 159 | 159 | |
| 160 | 160 |  			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL'); | 
| 161 | - trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action)); | |
| 161 | + trigger_error($this->user->lang['CONFIG_UPDATED'].adm_back_link($module->u_action)); | |
| 162 | 162 | } | 
| 163 | 163 |  		else if ($this->request->is_set_post('submit')) | 
| 164 | 164 |  		{ | 
| 165 | - trigger_error($this->user->lang['FORM_INVALID'] . adm_back_link($module->u_action)); | |
| 165 | + trigger_error($this->user->lang['FORM_INVALID'].adm_back_link($module->u_action)); | |
| 166 | 166 | } | 
| 167 | 167 | |
| 168 | 168 | foreach ($captcha_vars as $captcha_var => $template_var) | 
| @@ -197,7 +197,7 @@ discard block | ||
| 197 | 197 | else | 
| 198 | 198 |  		{ | 
| 199 | 199 | $contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx); | 
| 200 | - $explain = $this->user->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); | |
| 200 | + $explain = $this->user->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="'.$contact_link.'">', '</a>'); | |
| 201 | 201 | |
| 202 | 202 | // Language code for reCAPTCHA to use | 
| 203 | 203 |  			$recaptcha2_lang = $this->user->lang('GOTHICK_RECAPTCHA2_LANG'); | 
| @@ -156,8 +156,7 @@ discard block | ||
| 156 | 156 | |
| 157 | 157 |  			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL'); | 
| 158 | 158 | trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action)); | 
| 159 | - } | |
| 160 | -		else if ($this->request->is_set_post('submit')) | |
| 159 | +		} else if ($this->request->is_set_post('submit')) | |
| 161 | 160 |  		{ | 
| 162 | 161 | trigger_error($this->user->lang['FORM_INVALID'] . adm_back_link($module->u_action)); | 
| 163 | 162 | } | 
| @@ -190,8 +189,7 @@ discard block | ||
| 190 | 189 | if ($this->is_solved()) | 
| 191 | 190 |  		{ | 
| 192 | 191 | return false; | 
| 193 | - } | |
| 194 | - else | |
| 192 | + } else | |
| 195 | 193 |  		{ | 
| 196 | 194 | $contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx); | 
| 197 | 195 | $explain = $this->user->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); | 
| @@ -251,8 +249,7 @@ discard block | ||
| 251 | 249 | if (!parent::validate()) | 
| 252 | 250 |  		{ | 
| 253 | 251 | return false; | 
| 254 | - } | |
| 255 | - else | |
| 252 | + } else | |
| 256 | 253 |  		{ | 
| 257 | 254 | try | 
| 258 | 255 |  			{ | 
| @@ -267,8 +264,7 @@ discard block | ||
| 267 | 264 | // TODO: Can we pass something less general back from the error response above? | 
| 268 | 265 | return $this->user->lang['GOTHICK_RECAPTCHA2_INCORRECT']; | 
| 269 | 266 | } | 
| 270 | - } | |
| 271 | - catch (\Exception $e) | |
| 267 | + } catch (\Exception $e) | |
| 272 | 268 |  			{ | 
| 273 | 269 |  				trigger_error($this->user->lang('GOTHICK_RECAPTCHA2_EXCEPTION', $e->getMessage()), E_USER_ERROR); | 
| 274 | 270 | } |