MDL-51217 auth: Check if recaptcha enabled in the plugin used for signup.

This commit is contained in:
Ruslan Kabalin 2015-08-26 14:34:43 +01:00
parent 6d392b3027
commit 7f2033eafe
2 changed files with 3 additions and 2 deletions

View File

@ -240,7 +240,7 @@ class auth_plugin_email extends auth_plugin_base {
*/
function is_captcha_enabled() {
global $CFG;
return isset($CFG->recaptchapublickey) && isset($CFG->recaptchaprivatekey) && get_config("auth/{$this->authtype}", 'recaptcha');
return $this->config->recaptcha;
}
}

View File

@ -192,7 +192,8 @@ class login_signup_form extends moodleform {
*/
function signup_captcha_enabled() {
global $CFG;
return !empty($CFG->recaptchapublickey) && !empty($CFG->recaptchaprivatekey) && get_config('auth/email', 'recaptcha');
$authplugin = get_auth_plugin($CFG->registerauth);
return !empty($CFG->recaptchapublickey) && !empty($CFG->recaptchaprivatekey) && $authplugin->is_captcha_enabled();
}
}