gothick / phpbb-ext-recaptcha2

captcha/recaptcha2.php

Braces +5 added lines, -10 removed lines

@@ -159,8 +159,7 @@ 
 
 			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL');
 			trigger_error($this->user->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->user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
 		}
@@ -193,8 +192,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->user->lang(($this->type != CONFIRM_POST) ? 'GOTHICK_RECAPTCHA2_CONFIRM_EXPLAIN' : 'GOTHICK_RECAPTCHA2_POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>');
@@ -254,8 +252,7 @@ 
 		if (!parent::validate())
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			try
 			{
@@ -265,14 +262,12 @@ 
 				{
 					$this->solved = true;
 					return false;
-				}
-				else
+				} else
 				{
 					// TODO: Can we pass something less general back from the response?
 					return $this->user->lang['GOTHICK_RECAPTCHA2_INCORRECT'];
 				}
-			}
-			catch (\Exception $e)
+			} catch (\Exception $e)
 			{
 				trigger_error($this->user->lang('GOTHICK_RECAPTCHA2_EXCEPTION', $e->getMessage()), E_USER_ERROR);
 			}

Spacing +3 added lines, -3 removed lines

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

google/recaptcha.php

Braces +2 added lines, -4 removed lines

@@ -115,8 +115,7 @@ 
 				throw new Exception('Fatal error while contacting reCAPTCHA. ' . $errno . ': ' . curl_error($conn) . '.');
 			}
 			curl_close($conn);
-		}
-		else
+		} else
 		{
 			// fallback
 			$response = file_get_contents($path . $req);
@@ -155,8 +154,7 @@ 
 		if (isset($answers['success']))
 		{
 			$recaptcha_response->success = true;
-		}
-		else
+		} else
 		{
 			$recaptcha_response->success = false;
 			if (isset($answers['error-codes']))

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
 			$opts = array(
 					CURLOPT_HEADER => false,
 					CURLOPT_RETURNTRANSFER => true,
-					CURLOPT_USERAGENT => 'ReCaptcha ' . self::VERSION,
+					CURLOPT_USERAGENT => 'ReCaptcha '.self::VERSION,
 					CURLOPT_AUTOREFERER => true,
 					CURLOPT_CONNECTTIMEOUT => 60,
 					CURLOPT_TIMEOUT => 60,
@@ -105,21 +105,21 @@ 
 			{
 				$opts = array_merge($opts, $this->curl_opts);
 			}
-			$conn = curl_init($path . $req);
+			$conn = curl_init($path.$req);
 			curl_setopt_array($conn, $opts);
 			$response = curl_exec($conn);
 			// handle a connection error
 			$errno = curl_errno($conn);
 			if ($errno !== 0)
 			{
-				throw new Exception('Fatal error while contacting reCAPTCHA. ' . $errno . ': ' . curl_error($conn) . '.');
+				throw new Exception('Fatal error while contacting reCAPTCHA. '.$errno.': '.curl_error($conn).'.');
 			}
 			curl_close($conn);
 		}
 		else
 		{
 			// fallback
-			$response = file_get_contents($path . $req);
+			$response = file_get_contents($path.$req);
 		}
 		return $response;
 	}