mewebstudio / captcha

src/Captcha.php

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
                 $this->height
             );
             $this->canvas->insert($this->image);
-        }
-        else
+        } else
         {
             $this->image = $this->canvas;
         }
@@ -351,8 +350,7 @@ 
         if ( ! empty($this->fontColors))
         {
             $color = $this->fontColors[rand(0, count($this->fontColors) - 1)];
-        }
-        else
+        } else
         {
             $color = [rand(0, 255), rand(0, 255), rand(0, 255)];
         }

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
 use Illuminate\Config\Repository;
 use Illuminate\Hashing\BcryptHasher as Hasher;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManager;
 use Illuminate\Session\Store as Session;

Indentation +75 added lines, -75 removed lines

@@ -277,9 +277,9 @@ 
         }
 
         return $api ? [
-	        'sensitive' => $generator['sensitive'],
-	        'key'       => $generator['key'],
-        	'img'       => $this->image->encode('data-url')->encoded
+            'sensitive' => $generator['sensitive'],
+            'key'       => $generator['key'],
+            'img'       => $this->image->encode('data-url')->encoded
         ] : $this->image->response('png', $this->quality);
     }
 
@@ -300,24 +300,24 @@ 
      */
     protected function generate()
     {
-	    $bag = [];
-	    for($i = 0; $i < $this->length; $i++)
-	    {
-		    $char = $this->characters[rand(0, count($this->characters) - 1)];
-		    $bag[] = $this->sensitive ? $char : $this->str->lower($char);
-	    }
-
-	    $hash = $this->hasher->make(implode('', $bag));
-	    $this->session->put('captcha', [
-		    'sensitive' => $this->sensitive,
-		    'key'       => $hash
-	    ]);
-
-	    return [
-		    'value'     => $bag,
-		    'sensitive' => $this->sensitive,
-		    'key'       => $hash
-	    ];
+        $bag = [];
+        for($i = 0; $i < $this->length; $i++)
+        {
+            $char = $this->characters[rand(0, count($this->characters) - 1)];
+            $bag[] = $this->sensitive ? $char : $this->str->lower($char);
+        }
+
+        $hash = $this->hasher->make(implode('', $bag));
+        $this->session->put('captcha', [
+            'sensitive' => $this->sensitive,
+            'key'       => $hash
+        ]);
+
+        return [
+            'value'     => $bag,
+            'sensitive' => $this->sensitive,
+            'key'       => $hash
+        ];
     }
 
     /**
@@ -325,24 +325,24 @@ 
      */
     protected function text()
     {
-	    $marginTop = $this->image->height() / $this->length;
-
-	    $i = 0;
-	    foreach($this->text as $char)
-	    {
-		    $marginLeft = $this->textLeftPadding +  ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
-
-		    $this->image->text($char, $marginLeft, $marginTop, function($font) {
-			    $font->file($this->font());
-			    $font->size($this->fontSize());
-			    $font->color($this->fontColor());
-			    $font->align('left');
-			    $font->valign('top');
-			    $font->angle($this->angle());
-		    });
-
-		    $i++;
-	    }
+        $marginTop = $this->image->height() / $this->length;
+
+        $i = 0;
+        foreach($this->text as $char)
+        {
+            $marginLeft = $this->textLeftPadding +  ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
+
+            $this->image->text($char, $marginLeft, $marginTop, function($font) {
+                $font->file($this->font());
+                $font->size($this->fontSize());
+                $font->color($this->fontColor());
+                $font->align('left');
+                $font->valign('top');
+                $font->angle($this->angle());
+            });
+
+            $i++;
+        }
     }
 
     /**
@@ -416,42 +416,42 @@ 
         return $this->image;
     }
 
-	/**
-	 * Captcha check
-	 *
-	 * @param $value
-	 * @return bool
-	 */
-	public function check($value)
-	{
-		if ( ! $this->session->has('captcha'))
-		{
-			return false;
-		}
-
-		$key = $this->session->get('captcha.key');
-		$sensitive = $this->session->get('captcha.sensitive');
-
-		if ( ! $sensitive)
-		{
-			$value = $this->str->lower($value);
-		}
-
-		$this->session->remove('captcha');
-
-		return $this->hasher->check($value, $key);
-	}
-
-	/**
-	 * Captcha check
-	 *
-	 * @param $value
-	 * @return bool
-	 */
-	public function check_api($value, $key)
-	{
-		return $this->hasher->check($value, $key);
-	}
+    /**
+     * Captcha check
+     *
+     * @param $value
+     * @return bool
+     */
+    public function check($value)
+    {
+        if ( ! $this->session->has('captcha'))
+        {
+            return false;
+        }
+
+        $key = $this->session->get('captcha.key');
+        $sensitive = $this->session->get('captcha.sensitive');
+
+        if ( ! $sensitive)
+        {
+            $value = $this->str->lower($value);
+        }
+
+        $this->session->remove('captcha');
+
+        return $this->hasher->check($value, $key);
+    }
+
+    /**
+     * Captcha check
+     *
+     * @param $value
+     * @return bool
+     */
+    public function check_api($value, $key)
+    {
+        return $this->hasher->check($value, $key);
+    }
 
     /**
      * Generate captcha image source

Spacing +15 added lines, -15 removed lines

@@ -192,7 +192,7 @@ 
         $this->session = $session;
         $this->hasher = $hasher;
         $this->str = $str;
-        $this->characters = config('captcha.characters',[]);
+        $this->characters = config('captcha.characters', []);
     }
 
     /**
@@ -201,9 +201,9 @@ 
      */
     protected function configure($config)
     {
-        if ($this->config->has('captcha.' . $config))
+        if ($this->config->has('captcha.'.$config))
         {
-            foreach($this->config->get('captcha.' . $config) as $key => $val)
+            foreach ($this->config->get('captcha.'.$config) as $key => $val)
             {
                 $this->{$key} = $val;
             }
@@ -219,10 +219,10 @@ 
      */
     public function create($config = 'default', $api = false)
     {
-        $this->backgrounds = $this->files->files(__DIR__ . '/../assets/backgrounds');
-        $this->fonts = $this->files->files(__DIR__ . '/../assets/fonts');
+        $this->backgrounds = $this->files->files(__DIR__.'/../assets/backgrounds');
+        $this->fonts = $this->files->files(__DIR__.'/../assets/fonts');
         
-        if (app()->version() >= 5.5){
+        if (app()->version() >= 5.5) {
             $this->fonts = array_map(function($file) {
                 return $file->getPathName();
             }, $this->fonts);
@@ -301,7 +301,7 @@ 
     protected function generate()
     {
 	    $bag = [];
-	    for($i = 0; $i < $this->length; $i++)
+	    for ($i = 0; $i < $this->length; $i++)
 	    {
 		    $char = $this->characters[rand(0, count($this->characters) - 1)];
 		    $bag[] = $this->sensitive ? $char : $this->str->lower($char);
@@ -328,9 +328,9 @@ 
 	    $marginTop = $this->image->height() / $this->length;
 
 	    $i = 0;
-	    foreach($this->text as $char)
+	    foreach ($this->text as $char)
 	    {
-		    $marginLeft = $this->textLeftPadding +  ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
+		    $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length);
 
 		    $this->image->text($char, $marginLeft, $marginTop, function($font) {
 			    $font->file($this->font());
@@ -401,14 +401,14 @@ 
      */
     protected function lines()
     {
-        for($i = 0; $i <= $this->lines; $i++)
+        for ($i = 0; $i <= $this->lines; $i++)
         {
             $this->image->line(
                 rand(0, $this->image->width()) + $i * rand(0, $this->image->height()),
                 rand(0, $this->image->height()),
                 rand(0, $this->image->width()),
                 rand(0, $this->image->height()),
-                function ($draw) {
+                function($draw) {
                     $draw->color($this->fontColor());
                 }
             );
@@ -461,7 +461,7 @@ 
      */
     public function src($config = null)
     {
-        return url('captcha' . ($config ? '/' . $config : '/default')) . '?' . $this->str->random(8);
+        return url('captcha'.($config ? '/'.$config : '/default')).'?'.$this->str->random(8);
     }
 
     /**
@@ -475,14 +475,14 @@ 
     public function img($config = null, $attrs = [])
     {
         $attrs_str = '';
-        foreach($attrs as $attr => $value){
-            if ($attr == 'src'){
+        foreach ($attrs as $attr => $value) {
+            if ($attr == 'src') {
                 //Neglect src attribute
                 continue;
             }
             $attrs_str .= $attr.'="'.$value.'" ';
         }
-        return '<img src="' . $this->src($config) . '" '. trim($attrs_str).'>';
+        return '<img src="'.$this->src($config).'" '.trim($attrs_str).'>';
     }
 
 }

src/helpers.php

Indentation +16 added lines, -16 removed lines

@@ -36,23 +36,23 @@
 }
 
 if ( ! function_exists('captcha_check')) {
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	function captcha_check($value)
-	{
-		return app('captcha')->check($value);
-	}
+    /**
+     * @param $value
+     * @return bool
+     */
+    function captcha_check($value)
+    {
+        return app('captcha')->check($value);
+    }
 }
 
 if ( ! function_exists('captcha_api_check')) {
-	/**
-	 * @param $value
-	 * @return bool
-	 */
-	function captcha_api_check($value, $key)
-	{
-		return app('captcha')->check_api($value, $key);
-	}
+    /**
+     * @param $value
+     * @return bool
+     */
+    function captcha_api_check($value, $key)
+    {
+        return app('captcha')->check_api($value, $key);
+    }
 }

src/CaptchaServiceProvider.php

Indentation +16 added lines, -16 removed lines

@@ -24,29 +24,29 @@
 
         // HTTP routing
         if (strpos($this->app->version(), 'Lumen') !== false) {
-	        $this->app->get('captcha[/api/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptchaApi');
-	        $this->app->get('captcha[/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptcha');
+            $this->app->get('captcha[/api/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptchaApi');
+            $this->app->get('captcha[/{config}]', 'Mews\Captcha\LumenCaptchaController@getCaptcha');
         } else {
             if ((double) $this->app->version() >= 5.2) {
-	            $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
-	            $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
+                $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('web');
+                $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('web');
             } else {
-	            $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi');
-	            $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha');
+                $this->app['router']->get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi');
+                $this->app['router']->get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha');
             }
         }
 
-	    // Validator extensions
-	    $this->app['validator']->extend('captcha', function($attribute, $value, $parameters)
-	    {
-		    return captcha_check($value);
-	    });
+        // Validator extensions
+        $this->app['validator']->extend('captcha', function($attribute, $value, $parameters)
+        {
+            return captcha_check($value);
+        });
 
-	    // Validator extensions
-	    $this->app['validator']->extend('captcha_api', function($attribute, $value, $parameters)
-	    {
-		    return captcha_api_check($value, $parameters[0]);
-	    });
+        // Validator extensions
+        $this->app['validator']->extend('captcha_api', function($attribute, $value, $parameters)
+        {
+            return captcha_api_check($value, $parameters[0]);
+        });
     }
 
     /**

src/CaptchaController.php

Indentation +26 added lines, -26 removed lines

@@ -11,32 +11,32 @@
 class CaptchaController extends Controller
 {
 
-	/**
-	 * get CAPTCHA
-	 *
-	 * @param \Mews\Captcha\Captcha $captcha
-	 * @param string $config
-	 * @return \Intervention\Image\ImageManager->response
-	 */
-	public function getCaptcha(Captcha $captcha, $config = 'default')
-	{
-		if (ob_get_contents())
-		{
-			ob_clean();
-		}
-		return $captcha->create($config);
-	}
+    /**
+     * get CAPTCHA
+     *
+     * @param \Mews\Captcha\Captcha $captcha
+     * @param string $config
+     * @return \Intervention\Image\ImageManager->response
+     */
+    public function getCaptcha(Captcha $captcha, $config = 'default')
+    {
+        if (ob_get_contents())
+        {
+            ob_clean();
+        }
+        return $captcha->create($config);
+    }
 
-	/**
-	 * get CAPTCHA api
-	 *
-	 * @param \Mews\Captcha\Captcha $captcha
-	 * @param string $config
-	 * @return \Intervention\Image\ImageManager->response
-	 */
-	public function getCaptchaApi(Captcha $captcha, $config = 'default')
-	{
-		return $captcha->create($config, true);
-	}
+    /**
+     * get CAPTCHA api
+     *
+     * @param \Mews\Captcha\Captcha $captcha
+     * @param string $config
+     * @return \Intervention\Image\ImageManager->response
+     */
+    public function getCaptchaApi(Captcha $captcha, $config = 'default')
+    {
+        return $captcha->create($config, true);
+    }
 
 }

config/captcha.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 return [
 
-    'characters' => ['2','3','4','6','7','8','9','a','b','c','d','e','f','g','h','j','m','n','p','q','r','t','u','x','y','z','A','B','C','D','E','F','G','H','J','M','N','P','Q','R','T','U','X','Y','Z'],
+    'characters' => ['2', '3', '4', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'm', 'n', 'p', 'q', 'r', 't', 'u', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'M', 'N', 'P', 'Q', 'R', 'T', 'U', 'X', 'Y', 'Z'],
 
     'default'   => [
         'length'    => 5,