mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit
synced 2024-09-24 10:49:46 +00:00
Add $wgCaptchaWhitelistIP array of IP addresses or ranges allowed to skip the captcha.
From patch http://bugzilla.wikimedia.org/attachment.cgi?id=3868 by andy
This commit is contained in:
parent
f685981284
commit
a02a10f239
|
@ -56,6 +56,16 @@ $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
|
||||||
$wgGroupPermissions['bot' ]['skipcaptcha'] = true; // registered bots
|
$wgGroupPermissions['bot' ]['skipcaptcha'] = true; // registered bots
|
||||||
$wgGroupPermissions['sysop' ]['skipcaptcha'] = true;
|
$wgGroupPermissions['sysop' ]['skipcaptcha'] = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List of IP ranges to allow to skip the captcha, similar to the group setting:
|
||||||
|
* "$wgGroupPermission[...]['skipcaptcha'] = true"
|
||||||
|
*
|
||||||
|
* Specific IP addresses or CIDR-style ranges may be used,
|
||||||
|
* for instance:
|
||||||
|
* $wgCaptchaWhitelistIP = array('192.168.1.0/24', '10.1.0.0/16');
|
||||||
|
*/
|
||||||
|
$wgCaptchaWhitelistIP = false;
|
||||||
|
|
||||||
global $wgCaptcha, $wgCaptchaClass, $wgCaptchaTriggers;
|
global $wgCaptcha, $wgCaptchaClass, $wgCaptchaTriggers;
|
||||||
$wgCaptcha = null;
|
$wgCaptcha = null;
|
||||||
$wgCaptchaClass = 'SimpleCaptcha';
|
$wgCaptchaClass = 'SimpleCaptcha';
|
||||||
|
@ -393,6 +403,16 @@ class SimpleCaptcha {
|
||||||
wfDebug( "ConfirmEdit: user group allows skipping captcha\n" );
|
wfDebug( "ConfirmEdit: user group allows skipping captcha\n" );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
global $wgCaptchaWhitelistIP;
|
||||||
|
if( !empty( $wgCaptchaWhitelistIP ) ) {
|
||||||
|
$ip = wfGetIp();
|
||||||
|
foreach ( $wgCaptchaWhitelistIP as $range ) {
|
||||||
|
if ( IP::isInRange( $ip, $range ) ) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
global $wgEmailAuthentication, $ceAllowConfirmedEmail;
|
global $wgEmailAuthentication, $ceAllowConfirmedEmail;
|
||||||
if( $wgEmailAuthentication && $ceAllowConfirmedEmail &&
|
if( $wgEmailAuthentication && $ceAllowConfirmedEmail &&
|
||||||
|
|
Loading…
Reference in a new issue