Skip to content
This repository was archived by the owner on Aug 12, 2023. It is now read-only.

Compatibility with PHP 7+ and Nette 3+ #10

Open
peterpp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compatibility with PHP 7+ and Nette 3+ #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions CaptchaControl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ public function __construct()
$this->useNumbers(self::$defaultUseNumbers);

$this->setUid(uniqid());

$this->monitor("Nette\Forms\Form", [$this, "onAttached"]);
}

/**
Expand All @@ -161,7 +163,7 @@ public static function register(Session $session)
self::$defaultFontFile = __DIR__ . "/fonts/Vera.ttf";


FormContainer::extensionMethod('addCaptcha', callback(__CLASS__, 'addCaptcha'));
FormContainer::extensionMethod('addCaptcha', [__CLASS__, 'addCaptcha']);
self::$registered = TRUE;
}

Expand Down Expand Up @@ -477,11 +479,11 @@ private function getWord()
for ($i = 0; $i < $this->getLength(); $i++) {
if($this->useNumbers === true && mt_rand(0, 10) % 3 === 0){
$group = self::NUMBERS;
$s .= $group{mt_rand(0, strlen($group) - 1)};
$s .= $group[mt_rand(0, strlen($group) - 1)];
continue;
}
$group = $i % 2 === 0 ? self::CONSONANTS : self::VOWELS;
$s .= $group{mt_rand(0, strlen($group) - 1)};
$s .= $group[mt_rand(0, strlen($group) - 1)];
}
$this->word = $s;
}
Expand Down Expand Up @@ -510,7 +512,7 @@ public function getLabel($caption = NULL)
return $image;
}

public function getControl()
public function getControl(): Nette\Utils\Html
{
/** TODO: Make sure captcha is validated at this time */
$parent = $this->getParent();
Expand All @@ -522,16 +524,13 @@ public function getControl()
/**
* This method will be called when the component (or component's parent)
* becomes attached to a monitored object. Do not call this method yourself.
* @param \Nette\ComponentModel\IComponent
* @param \Nette\Forms\Form
* @return void
*/
protected function attached($form)
protected function onAttached($form)
{
parent::attached($form);
if ($form instanceof Form) {
$uidFieldName = $this->getUidFieldName();
$form[$uidFieldName] = new HiddenField();
}
$uidFieldName = $this->getUidFieldName();
$form[$uidFieldName] = new HiddenField();
}

/* * **************** Drawing image **************p*m* */
Expand Down Expand Up @@ -560,8 +559,8 @@ protected function getImageData()
$first = Image::fromBlank($width, $height, $bgColor);
$second = Image::fromBlank($width, $height, $bgColor);

$x = ($width - $box['width']) / 2;
$y = ($height + $box['height']) / 2;
$x = (int)(($width - $box['width']) / 2);
$y = (int)(($height + $box['height']) / 2);

$first->fttext($size, 0, $x, $y, $textColor, $font, $word);

Expand All @@ -571,8 +570,8 @@ protected function getImageData()

for ($x = 0; $x < $width; $x++) {
for ($y = 0; $y < $height; $y++) {
$sy = round($y + sin($x * $frequency + $phase) * $amplitude);
$sx = round($x + sin($y * $frequency + $phase) * $amplitude);
$sy = (int)round($y + sin($x * $frequency + $phase) * $amplitude);
$sx = (int)round($x + sin($y * $frequency + $phase) * $amplitude);

$color = $first->colorat($x, $y);
$second->setpixel($sx, $sy, $color);
Expand Down Expand Up @@ -658,7 +657,7 @@ public function validateCaptcha(CaptchaControl $control)
*/
public function getValidator()
{
return callback($this, 'validateCaptcha');
return [$this, 'validateCaptcha'];
}

}