Skip to content

Support Multiple Captcha Instances #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support Multiple Captcha Instances #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
258805d
Update BotDetectCaptcha.php
FabioWidmer Apr 30, 2019
8797bba
Update helpers.php
FabioWidmer Apr 30, 2019
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
8 changes: 4 additions & 4 deletions src/BotDetectCaptcha.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class BotDetectCaptcha
/**
* @var object
*/
private static $instance;
private static $instances = [];

/**
* BotDetect Laravel CAPTCHA package information.
Expand All @@ -32,7 +32,7 @@ class BotDetectCaptcha
*/
public function __construct($configName, $captchaInstanceId = null)
{
self::$instance = $this;
self::$instances[$configName] = $this;

// load BotDetect Library
LibraryLoader::load();
Expand Down Expand Up @@ -79,9 +79,9 @@ public function initCaptcha(array $config, $captchaInstanceId = null)
*
* @return object
*/
public static function getInstance()
public static function getInstance($configName)
{
return self::$instance;
return array_key_exists($configName, self::$instances) ? self::$instances[$configName] : null;
}

public function __call($method, $args = array())
Expand Down
2 changes: 1 addition & 1 deletion src/Support/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function captcha_library_is_loaded()
*/
function captcha_instance($captchaId)
{
$captcha = BotDetectCaptcha::getInstance();
$captcha = BotDetectCaptcha::getInstance($captchaId);
return (null !== $captcha) ? $captcha : new BotDetectCaptcha($captchaId);
}
}
Expand Down