@@ -18,7 +18,6 @@ |
||
| 18 | 18 | use Illuminate\Config\Repository; |
| 19 | 19 | use Illuminate\Hashing\BcryptHasher as Hasher; |
| 20 | 20 | use Illuminate\Filesystem\Filesystem; |
| 21 | -use Illuminate\Support\Facades\Crypt; |
|
| 22 | 21 | use Illuminate\Support\Str; |
| 23 | 22 | use Intervention\Image\ImageManager; |
| 24 | 23 | use Illuminate\Session\Store as Session; |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | $this->session = $session; |
| 193 | 193 | $this->hasher = $hasher; |
| 194 | 194 | $this->str = $str; |
| 195 | - $this->characters = config('captcha.characters','2346789abcdefghjmnpqrtuxyzABCDEFGHJMNPQRTUXYZ'); |
|
| 195 | + $this->characters = config('captcha.characters', '2346789abcdefghjmnpqrtuxyzABCDEFGHJMNPQRTUXYZ'); |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /** |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | protected function configure($config) |
| 203 | 203 | { |
| 204 | - if ($this->config->has('captcha.' . $config)) |
|
| 204 | + if ($this->config->has('captcha.'.$config)) |
|
| 205 | 205 | { |
| 206 | - foreach($this->config->get('captcha.' . $config) as $key => $val) |
|
| 206 | + foreach ($this->config->get('captcha.'.$config) as $key => $val) |
|
| 207 | 207 | { |
| 208 | 208 | $this->{$key} = $val; |
| 209 | 209 | } |
@@ -219,10 +219,10 @@ discard block |
||
| 219 | 219 | */ |
| 220 | 220 | public function create($config = 'default', $api = false) |
| 221 | 221 | { |
| 222 | - $this->backgrounds = $this->files->files(__DIR__ . '/../assets/backgrounds'); |
|
| 223 | - $this->fonts = $this->files->files(__DIR__ . '/../assets/fonts'); |
|
| 222 | + $this->backgrounds = $this->files->files(__DIR__.'/../assets/backgrounds'); |
|
| 223 | + $this->fonts = $this->files->files(__DIR__.'/../assets/fonts'); |
|
| 224 | 224 | |
| 225 | - if (app()->version() >= 5.5){ |
|
| 225 | + if (app()->version() >= 5.5) { |
|
| 226 | 226 | $this->fonts = array_map(function($file) { |
| 227 | 227 | return $file->getPathName(); |
| 228 | 228 | }, $this->fonts); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | $characters = str_split($this->characters); |
| 304 | 304 | |
| 305 | 305 | $bag = ''; |
| 306 | - for($i = 0; $i < $this->length; $i++) |
|
| 306 | + for ($i = 0; $i < $this->length; $i++) |
|
| 307 | 307 | { |
| 308 | 308 | $bag .= $characters[rand(0, count($characters) - 1)]; |
| 309 | 309 | } |
@@ -331,9 +331,9 @@ discard block |
||
| 331 | 331 | $marginTop = $this->image->height() / $this->length; |
| 332 | 332 | |
| 333 | 333 | $i = 0; |
| 334 | - foreach(str_split($this->text) as $char) |
|
| 334 | + foreach (str_split($this->text) as $char) |
|
| 335 | 335 | { |
| 336 | - $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length); |
|
| 336 | + $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length); |
|
| 337 | 337 | |
| 338 | 338 | $this->image->text($char, $marginLeft, $marginTop, function($font) { |
| 339 | 339 | $font->file($this->font()); |
@@ -404,14 +404,14 @@ discard block |
||
| 404 | 404 | */ |
| 405 | 405 | protected function lines() |
| 406 | 406 | { |
| 407 | - for($i = 0; $i <= $this->lines; $i++) |
|
| 407 | + for ($i = 0; $i <= $this->lines; $i++) |
|
| 408 | 408 | { |
| 409 | 409 | $this->image->line( |
| 410 | 410 | rand(0, $this->image->width()) + $i * rand(0, $this->image->height()), |
| 411 | 411 | rand(0, $this->image->height()), |
| 412 | 412 | rand(0, $this->image->width()), |
| 413 | 413 | rand(0, $this->image->height()), |
| 414 | - function ($draw) { |
|
| 414 | + function($draw) { |
|
| 415 | 415 | $draw->color($this->fontColor()); |
| 416 | 416 | } |
| 417 | 417 | ); |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | */ |
| 465 | 465 | public function src($config = null) |
| 466 | 466 | { |
| 467 | - return url('captcha' . ($config ? '/' . $config : '/default')) . '?' . $this->str->random(8); |
|
| 467 | + return url('captcha'.($config ? '/'.$config : '/default')).'?'.$this->str->random(8); |
|
| 468 | 468 | } |
| 469 | 469 | |
| 470 | 470 | /** |
@@ -478,14 +478,14 @@ discard block |
||
| 478 | 478 | public function img($config = null, $attrs = []) |
| 479 | 479 | { |
| 480 | 480 | $attrs_str = ''; |
| 481 | - foreach($attrs as $attr => $value){ |
|
| 482 | - if ($attr == 'src'){ |
|
| 481 | + foreach ($attrs as $attr => $value) { |
|
| 482 | + if ($attr == 'src') { |
|
| 483 | 483 | //Neglect src attribute |
| 484 | 484 | continue; |
| 485 | 485 | } |
| 486 | 486 | $attrs_str .= $attr.'="'.$value.'" '; |
| 487 | 487 | } |
| 488 | - return '<img src="' . $this->src($config) . '" '. trim($attrs_str).'>'; |
|
| 488 | + return '<img src="'.$this->src($config).'" '.trim($attrs_str).'>'; |
|
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | } |