@@ -159,8 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL'); |
161 | 161 | trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action)); |
162 | - } |
|
163 | - else if ($this->request->is_set_post('submit')) |
|
162 | + } else if ($this->request->is_set_post('submit')) |
|
164 | 163 | { |
165 | 164 | trigger_error($this->user->lang['FORM_INVALID'] . adm_back_link($module->u_action)); |
166 | 165 | } |
@@ -193,8 +192,7 @@ discard block |
||
193 | 192 | if ($this->is_solved()) |
194 | 193 | { |
195 | 194 | return false; |
196 | - } |
|
197 | - else |
|
195 | + } else |
|
198 | 196 | { |
199 | 197 | $contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx); |
200 | 198 | $explain = $this->user->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); |
@@ -254,8 +252,7 @@ discard block |
||
254 | 252 | if (!parent::validate()) |
255 | 253 | { |
256 | 254 | return false; |
257 | - } |
|
258 | - else |
|
255 | + } else |
|
259 | 256 | { |
260 | 257 | try |
261 | 258 | { |
@@ -265,14 +262,12 @@ discard block |
||
265 | 262 | { |
266 | 263 | $this->solved = true; |
267 | 264 | return false; |
268 | - } |
|
269 | - else |
|
265 | + } else |
|
270 | 266 | { |
271 | 267 | // TODO: Can we pass something less general back from the response? |
272 | 268 | return $this->user->lang['GOTHICK_RECAPTCHA2_INCORRECT']; |
273 | 269 | } |
274 | - } |
|
275 | - catch (\Exception $e) |
|
270 | + } catch (\Exception $e) |
|
276 | 271 | { |
277 | 272 | trigger_error($this->user->lang('GOTHICK_RECAPTCHA2_EXCEPTION', $e->getMessage()), E_USER_ERROR); |
278 | 273 | } |
@@ -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'); |