biscolab / laravel-recaptcha

src/ReCaptchaServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
     {
         $this->addValidationRule();
         $this->publishes([
-            __DIR__ . '/../config/recaptcha.php' => config_path('recaptcha.php'),
+            __DIR__.'/../config/recaptcha.php' => config_path('recaptcha.php'),
         ]);
     }
 
@@ -33,7 +33,7 @@ 
     {
 
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/recaptcha.php', 'recaptcha'
+            __DIR__.'/../config/recaptcha.php', 'recaptcha'
         );
 
         $this->registerReCaptchaBuilder();
@@ -46,8 +46,8 @@ 
      */
     protected function registerReCaptchaBuilder()
     {
-        $this->app->singleton('recaptcha', function ($app) {
-            if(config('recaptcha.version') == 'v2') return new ReCaptchaBuilderV2(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
+        $this->app->singleton('recaptcha', function($app) {
+            if (config('recaptcha.version') == 'v2') return new ReCaptchaBuilderV2(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
             else return new ReCaptchaBuilderInvisible(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
         });
     }

Braces +5 added lines, -2 removed lines

@@ -47,8 +47,11 @@
     protected function registerReCaptchaBuilder()
     {
         $this->app->singleton('recaptcha', function ($app) {
-            if(config('recaptcha.version') == 'v2') return new ReCaptchaBuilderV2(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
-            else return new ReCaptchaBuilderInvisible(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
+            if(config('recaptcha.version') == 'v2') {
+                return new ReCaptchaBuilderV2(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
+            } else {
+                return new ReCaptchaBuilderInvisible(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.version'));
+            }
         });
     }
 

src/ReCaptchaBuilderInvisible.php

Indentation +8 added lines, -8 removed lines

@@ -13,13 +13,13 @@
 
 class ReCaptchaBuilderInvisible extends ReCaptchaBuilder {
 
-	/**
-	 * Write HTML <button> tag in your HTML code
-	 * Insert before </form> tag
-	 */
-	public function htmlFormButton($buttonInnerHTML = 'Submit')
-	{
-		return ($this->version == 'invisible')? '<button class="g-recaptcha" data-sitekey="'.$this->api_site_key.'" data-callback="biscolabLaravelReCaptcha">'.$buttonInnerHTML.'</button>' : '';
-	}
+    /**
+     * Write HTML <button> tag in your HTML code
+     * Insert before </form> tag
+     */
+    public function htmlFormButton($buttonInnerHTML = 'Submit')
+    {
+        return ($this->version == 'invisible')? '<button class="g-recaptcha" data-sitekey="'.$this->api_site_key.'" data-callback="biscolabLaravelReCaptcha">'.$buttonInnerHTML.'</button>' : '';
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 */
 	public function htmlFormButton($buttonInnerHTML = 'Submit')
 	{
-		return ($this->version == 'invisible')? '<button class="g-recaptcha" data-sitekey="'.$this->api_site_key.'" data-callback="biscolabLaravelReCaptcha">'.$buttonInnerHTML.'</button>' : '';
+		return ($this->version == 'invisible') ? '<button class="g-recaptcha" data-sitekey="'.$this->api_site_key.'" data-callback="biscolabLaravelReCaptcha">'.$buttonInnerHTML.'</button>' : '';
 	}
 
 }
\ No newline at end of file

src/ReCaptchaBuilderV2.php

Indentation +8 added lines, -8 removed lines

@@ -13,13 +13,13 @@
 
 class ReCaptchaBuilderV2 extends ReCaptchaBuilder {
 
-	/**
-	 * Write ReCAPTCHA HTML tag in your FORM
-	 * Insert before </form> tag
-	 */
-	public function htmlFormSnippet()
-	{
-		return ($this->version == 'v2')? '<div class="g-recaptcha" data-sitekey="'.$this->api_site_key.'"></div>' : '';
-	}
+    /**
+     * Write ReCAPTCHA HTML tag in your FORM
+     * Insert before </form> tag
+     */
+    public function htmlFormSnippet()
+    {
+        return ($this->version == 'v2')? '<div class="g-recaptcha" data-sitekey="'.$this->api_site_key.'"></div>' : '';
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 */
 	public function htmlFormSnippet()
 	{
-		return ($this->version == 'v2')? '<div class="g-recaptcha" data-sitekey="'.$this->api_site_key.'"></div>' : '';
+		return ($this->version == 'v2') ? '<div class="g-recaptcha" data-sitekey="'.$this->api_site_key.'"></div>' : '';
 	}
 
 }
\ No newline at end of file

src/ReCaptchaBuilder.php

Indentation +60 added lines, -60 removed lines

@@ -15,66 +15,66 @@ 
 
 class ReCaptchaBuilder {
 
-	/**
-	 * The Site key
-	 * please visit https://developers.google.com/recaptcha/docs/start
-	 * @var string
-	 */
-	protected $api_site_key;
-
-	/**
-	 * The Secret key
-	 * please visit https://developers.google.com/recaptcha/docs/start	 
-	 * @var string
-	 */	
-	protected $api_secret_key;
-
-	/**
-	 * The chosen ReCAPTCHA version
-	 * please visit https://developers.google.com/recaptcha/docs/start	 
-	 * @var string
-	 */	
-	protected $version;
-
-	/**
-	 * Whether is true the ReCAPTCHA is inactive
-	 * @var boolean
-	 */	
-	protected $skip_by_ip = false;
-
-	/**
-	 * The API request URI
-	 */
-	protected $api_url = 'https://www.google.com/recaptcha/api/siteverify';
-
-	public function __construct($api_site_key, $api_secret_key, $version = 'v2')
-	{
-		$this->api_site_key		= $api_site_key;
-		$this->api_secret_key	= $api_secret_key;
-		$this->version 			= $version;
-		$this->skip_by_ip 		= self::skipByIp();
-	}
+    /**
+     * The Site key
+     * please visit https://developers.google.com/recaptcha/docs/start
+     * @var string
+     */
+    protected $api_site_key;
+
+    /**
+     * The Secret key
+     * please visit https://developers.google.com/recaptcha/docs/start	 
+     * @var string
+     */	
+    protected $api_secret_key;
+
+    /**
+     * The chosen ReCAPTCHA version
+     * please visit https://developers.google.com/recaptcha/docs/start	 
+     * @var string
+     */	
+    protected $version;
+
+    /**
+     * Whether is true the ReCAPTCHA is inactive
+     * @var boolean
+     */	
+    protected $skip_by_ip = false;
+
+    /**
+     * The API request URI
+     */
+    protected $api_url = 'https://www.google.com/recaptcha/api/siteverify';
+
+    public function __construct($api_site_key, $api_secret_key, $version = 'v2')
+    {
+        $this->api_site_key		= $api_site_key;
+        $this->api_secret_key	= $api_secret_key;
+        $this->version 			= $version;
+        $this->skip_by_ip 		= self::skipByIp();
+    }
 	
-	/**
-	 * Write script HTML tag in you HTML code
-	 * Insert before </head> tag
-	 *
-	 * @param $formId required if you are using invisible ReCaptcha
-	 */
-	public function htmlScriptTagJsApi($formId = '')
-	{
-		if($this->skip_by_ip) return '';
-		$html = "<script src='https://www.google.com/recaptcha/api.js' async defer></script>";
-		if($this->version != 'v2'){
-			if(!$formId) throw new Exception("formId required", 1);
-			$html.= '<script>
+    /**
+     * Write script HTML tag in you HTML code
+     * Insert before </head> tag
+     *
+     * @param $formId required if you are using invisible ReCaptcha
+     */
+    public function htmlScriptTagJsApi($formId = '')
+    {
+        if($this->skip_by_ip) return '';
+        $html = "<script src='https://www.google.com/recaptcha/api.js' async defer></script>";
+        if($this->version != 'v2'){
+            if(!$formId) throw new Exception("formId required", 1);
+            $html.= '<script>
 		       function biscolabLaravelReCaptcha(token) {
 		         document.getElementById("'.$formId.'").submit();
 		       }
 		     </script>';
-		}
-		return $html;
-	}
+        }
+        return $html;
+    }
 
     /**
      * Call out to reCAPTCHA and process the response
@@ -85,9 +85,9 @@ 
      */
     public function validate($response)
     {
-    	if($this->skip_by_ip) {
-    		return true;
-    	} 
+        if($this->skip_by_ip) {
+            return true;
+        } 
 
         $params = http_build_query([
             'secret'   => $this->api_secret_key,
@@ -121,7 +121,7 @@ 
      * @return boolean     
      */
     public static function skipByIp(){
-    	$skip_ip = (config('recaptcha.skip_ip'))? config('recaptcha.skip_ip') : [];
-    	return (in_array(request()->ip(), $skip_ip));
+        $skip_ip = (config('recaptcha.skip_ip'))? config('recaptcha.skip_ip') : [];
+        return (in_array(request()->ip(), $skip_ip));
     }
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -49,10 +49,10 @@ 
 
 	public function __construct($api_site_key, $api_secret_key, $version = 'v2')
 	{
-		$this->api_site_key		= $api_site_key;
-		$this->api_secret_key	= $api_secret_key;
-		$this->version 			= $version;
-		$this->skip_by_ip 		= self::skipByIp();
+		$this->api_site_key = $api_site_key;
+		$this->api_secret_key = $api_secret_key;
+		$this->version = $version;
+		$this->skip_by_ip = self::skipByIp();
 	}
 	
 	/**
@@ -63,11 +63,11 @@ 
 	 */
 	public function htmlScriptTagJsApi($formId = '')
 	{
-		if($this->skip_by_ip) return '';
+		if ($this->skip_by_ip) return '';
 		$html = "<script src='https://www.google.com/recaptcha/api.js' async defer></script>";
-		if($this->version != 'v2'){
-			if(!$formId) throw new Exception("formId required", 1);
-			$html.= '<script>
+		if ($this->version != 'v2') {
+			if (!$formId) throw new Exception("formId required", 1);
+			$html .= '<script>
 		       function biscolabLaravelReCaptcha(token) {
 		         document.getElementById("'.$formId.'").submit();
 		       }
@@ -85,7 +85,7 @@ 
      */
     public function validate($response)
     {
-    	if($this->skip_by_ip) {
+    	if ($this->skip_by_ip) {
     		return true;
     	} 
 
@@ -95,7 +95,7 @@ 
             'response' => $response,
         ]);
 
-        $url = $this->api_url. '?' . $params;
+        $url = $this->api_url.'?'.$params;
 
         if (function_exists('curl_version')) {
             $curl = curl_init($url);
@@ -107,7 +107,7 @@ 
         } else {
             $curl_response = file_get_contents($url);
         }
-        if (is_null($curl_response) || empty( $curl_response )) {
+        if (is_null($curl_response) || empty($curl_response)) {
             return false;
         }
         $response = json_decode(trim($curl_response), true);
@@ -120,8 +120,8 @@ 
      *
      * @return boolean     
      */
-    public static function skipByIp(){
-    	$skip_ip = (config('recaptcha.skip_ip'))? config('recaptcha.skip_ip') : [];
+    public static function skipByIp() {
+    	$skip_ip = (config('recaptcha.skip_ip')) ? config('recaptcha.skip_ip') : [];
     	return (in_array(request()->ip(), $skip_ip));
     }
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -63,10 +63,14 @@
 	 */
 	public function htmlScriptTagJsApi($formId = '')
 	{
-		if($this->skip_by_ip) return '';
+		if($this->skip_by_ip) {
+		    return '';
+		}
 		$html = "<script src='https://www.google.com/recaptcha/api.js' async defer></script>";
 		if($this->version != 'v2'){
-			if(!$formId) throw new Exception("formId required", 1);
+			if(!$formId) {
+			    throw new Exception("formId required", 1);
+			}
 			$html.= '<script>
 		       function biscolabLaravelReCaptcha(token) {
 		         document.getElementById("'.$formId.'").submit();

config/recaptcha.php

Indentation +12 added lines, -12 removed lines

@@ -13,20 +13,20 @@
 
 return [
 
-	/**
-	 *
-	 * The site key
-	 * get site key @ www.google.com/recaptcha/admin
-	 *
-	 */
+    /**
+     *
+     * The site key
+     * get site key @ www.google.com/recaptcha/admin
+     *
+     */
     'api_site_key'      => '',
 
-	/**
-	 *
-	 * The secret key
-	 * get secret key @ www.google.com/recaptcha/admin
-	 *
-	 */    
+    /**
+     *
+     * The secret key
+     * get secret key @ www.google.com/recaptcha/admin
+     *
+     */    
     'api_secret_key'    => '',
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      * get more info @ https://developers.google.com/recaptcha/docs/versions
      *
      */
-    'version'			=> 'v2'  ,
+    'version'			=> 'v2',
 
     /**
      *