@@ -277,9 +277,9 @@ discard block |
||
277 | 277 | } |
278 | 278 | |
279 | 279 | return $api ? [ |
280 | - 'sensitive' => $generator['sensitive'], |
|
281 | - 'key' => $generator['key'], |
|
282 | - 'img' => $this->image->encode('data-url')->encoded |
|
280 | + 'sensitive' => $generator['sensitive'], |
|
281 | + 'key' => $generator['key'], |
|
282 | + 'img' => $this->image->encode('data-url')->encoded |
|
283 | 283 | ] : $this->image->response('png', $this->quality); |
284 | 284 | } |
285 | 285 | |
@@ -300,24 +300,24 @@ discard block |
||
300 | 300 | */ |
301 | 301 | protected function generate() |
302 | 302 | { |
303 | - $bag = []; |
|
304 | - for($i = 0; $i < $this->length; $i++) |
|
305 | - { |
|
306 | - $char = $this->characters[rand(0, count($this->characters) - 1)]; |
|
307 | - $bag[] = $this->sensitive ? $char : $this->str->lower($char); |
|
308 | - } |
|
309 | - |
|
310 | - $hash = $this->hasher->make(implode('', $bag)); |
|
311 | - $this->session->put('captcha', [ |
|
312 | - 'sensitive' => $this->sensitive, |
|
313 | - 'key' => $hash |
|
314 | - ]); |
|
315 | - |
|
316 | - return [ |
|
317 | - 'value' => $bag, |
|
318 | - 'sensitive' => $this->sensitive, |
|
319 | - 'key' => $hash |
|
320 | - ]; |
|
303 | + $bag = []; |
|
304 | + for($i = 0; $i < $this->length; $i++) |
|
305 | + { |
|
306 | + $char = $this->characters[rand(0, count($this->characters) - 1)]; |
|
307 | + $bag[] = $this->sensitive ? $char : $this->str->lower($char); |
|
308 | + } |
|
309 | + |
|
310 | + $hash = $this->hasher->make(implode('', $bag)); |
|
311 | + $this->session->put('captcha', [ |
|
312 | + 'sensitive' => $this->sensitive, |
|
313 | + 'key' => $hash |
|
314 | + ]); |
|
315 | + |
|
316 | + return [ |
|
317 | + 'value' => $bag, |
|
318 | + 'sensitive' => $this->sensitive, |
|
319 | + 'key' => $hash |
|
320 | + ]; |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | /** |
@@ -325,24 +325,24 @@ discard block |
||
325 | 325 | */ |
326 | 326 | protected function text() |
327 | 327 | { |
328 | - $marginTop = $this->image->height() / $this->length; |
|
329 | - |
|
330 | - $i = 0; |
|
331 | - foreach($this->text as $char) |
|
332 | - { |
|
333 | - $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length); |
|
334 | - |
|
335 | - $this->image->text($char, $marginLeft, $marginTop, function($font) { |
|
336 | - $font->file($this->font()); |
|
337 | - $font->size($this->fontSize()); |
|
338 | - $font->color($this->fontColor()); |
|
339 | - $font->align('left'); |
|
340 | - $font->valign('top'); |
|
341 | - $font->angle($this->angle()); |
|
342 | - }); |
|
343 | - |
|
344 | - $i++; |
|
345 | - } |
|
328 | + $marginTop = $this->image->height() / $this->length; |
|
329 | + |
|
330 | + $i = 0; |
|
331 | + foreach($this->text as $char) |
|
332 | + { |
|
333 | + $marginLeft = $this->textLeftPadding + ($i * ($this->image->width() - $this->textLeftPadding) / $this->length); |
|
334 | + |
|
335 | + $this->image->text($char, $marginLeft, $marginTop, function($font) { |
|
336 | + $font->file($this->font()); |
|
337 | + $font->size($this->fontSize()); |
|
338 | + $font->color($this->fontColor()); |
|
339 | + $font->align('left'); |
|
340 | + $font->valign('top'); |
|
341 | + $font->angle($this->angle()); |
|
342 | + }); |
|
343 | + |
|
344 | + $i++; |
|
345 | + } |
|
346 | 346 | } |
347 | 347 | |
348 | 348 | /** |
@@ -416,42 +416,42 @@ discard block |
||
416 | 416 | return $this->image; |
417 | 417 | } |
418 | 418 | |
419 | - /** |
|
420 | - * Captcha check |
|
421 | - * |
|
422 | - * @param $value |
|
423 | - * @return bool |
|
424 | - */ |
|
425 | - public function check($value) |
|
426 | - { |
|
427 | - if ( ! $this->session->has('captcha')) |
|
428 | - { |
|
429 | - return false; |
|
430 | - } |
|
431 | - |
|
432 | - $key = $this->session->get('captcha.key'); |
|
433 | - $sensitive = $this->session->get('captcha.sensitive'); |
|
434 | - |
|
435 | - if ( ! $sensitive) |
|
436 | - { |
|
437 | - $value = $this->str->lower($value); |
|
438 | - } |
|
439 | - |
|
440 | - $this->session->remove('captcha'); |
|
441 | - |
|
442 | - return $this->hasher->check($value, $key); |
|
443 | - } |
|
444 | - |
|
445 | - /** |
|
446 | - * Captcha check |
|
447 | - * |
|
448 | - * @param $value |
|
449 | - * @return bool |
|
450 | - */ |
|
451 | - public function check_api($value, $key) |
|
452 | - { |
|
453 | - return $this->hasher->check($value, $key); |
|
454 | - } |
|
419 | + /** |
|
420 | + * Captcha check |
|
421 | + * |
|
422 | + * @param $value |
|
423 | + * @return bool |
|
424 | + */ |
|
425 | + public function check($value) |
|
426 | + { |
|
427 | + if ( ! $this->session->has('captcha')) |
|
428 | + { |
|
429 | + return false; |
|
430 | + } |
|
431 | + |
|
432 | + $key = $this->session->get('captcha.key'); |
|
433 | + $sensitive = $this->session->get('captcha.sensitive'); |
|
434 | + |
|
435 | + if ( ! $sensitive) |
|
436 | + { |
|
437 | + $value = $this->str->lower($value); |
|
438 | + } |
|
439 | + |
|
440 | + $this->session->remove('captcha'); |
|
441 | + |
|
442 | + return $this->hasher->check($value, $key); |
|
443 | + } |
|
444 | + |
|
445 | + /** |
|
446 | + * Captcha check |
|
447 | + * |
|
448 | + * @param $value |
|
449 | + * @return bool |
|
450 | + */ |
|
451 | + public function check_api($value, $key) |
|
452 | + { |
|
453 | + return $this->hasher->check($value, $key); |
|
454 | + } |
|
455 | 455 | |
456 | 456 | /** |
457 | 457 | * Generate captcha image source |