The EditPage object is not passed by reference in the EditFilter hooks

[toast/cookiecaptcha.git] / ConfirmEdit.php

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 4c5796653e233f2f428e18d08bb019523fdb9502..7a4f78af63db603c2b50c5c500ed5b3063112b13 100644 (file)
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -35,11 +35,12 @@ global $wgExtensionFunctions, $wgGroupPermissions;
 
 $wgExtensionFunctions[] = 'confirmEditSetup';
 $wgExtensionCredits['other'][] = array(
 
 $wgExtensionFunctions[] = 'confirmEditSetup';
 $wgExtensionCredits['other'][] = array(

+       'path' => __FILE__,

        'name' => 'ConfirmEdit',
        'name' => 'ConfirmEdit',

-       'version' => '1.1',

        'author' => 'Brion Vibber',
        'url' => 'http://www.mediawiki.org/wiki/Extension:ConfirmEdit',
        'description' => 'Simple captcha implementation',
        'author' => 'Brion Vibber',
        'url' => 'http://www.mediawiki.org/wiki/Extension:ConfirmEdit',
        'description' => 'Simple captcha implementation',

+       'descriptionmsg' => 'captcha-desc',

 );
 
 /**
 );
 
 /**


@@ -55,6 +56,7 @@ $wgGroupPermissions['user'         ]['skipcaptcha'] = false;
 $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
 $wgGroupPermissions['bot'          ]['skipcaptcha'] = true; // registered bots
 $wgGroupPermissions['sysop'        ]['skipcaptcha'] = true;
 $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
 $wgGroupPermissions['bot'          ]['skipcaptcha'] = true; // registered bots
 $wgGroupPermissions['sysop'        ]['skipcaptcha'] = true;

+$wgAvailableRights[] = 'skipcaptcha';

 
 /**
  * List of IP ranges to allow to skip the captcha, similar to the group setting:
 
 /**
  * List of IP ranges to allow to skip the captcha, similar to the group setting:


@@ -146,6 +148,13 @@ $wgCaptchaBadLoginExpiration = 5 * 60;
 global $ceAllowConfirmedEmail;
 $ceAllowConfirmedEmail = false;
 
 global $ceAllowConfirmedEmail;
 $ceAllowConfirmedEmail = false;
 

+/** 
+ * Number of bad login attempts before triggering the captcha.  0 means the
+ * captcha is presented on the first login.
+ */
+global $wgCaptchaBadLoginAttempts;
+$wgCaptchaBadLoginAttempts = 3;
+

 /**
  * Regex to whitelist URLs to known-good sites...
  * For instance:
 /**
  * Regex to whitelist URLs to known-good sites...
  * For instance:


@@ -166,11 +175,11 @@ $wgCaptchaWhitelist = false;
 $wgCaptchaRegexes = array();
 
 /** Register special page */
 $wgCaptchaRegexes = array();
 
 /** Register special page */

-global $wgSpecialPages;

 $wgSpecialPages['Captcha'] = array( /*class*/'CaptchaSpecialPage', /*name*/'Captcha' );
 
 $wgConfirmEditIP = dirname( __FILE__ );
 $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php";
 $wgSpecialPages['Captcha'] = array( /*class*/'CaptchaSpecialPage', /*name*/'Captcha' );
 
 $wgConfirmEditIP = dirname( __FILE__ );
 $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php";

+$wgExtensionAliasesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.alias.php";

 
 if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) {
        $wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged';
 
 if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) {
        $wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged';


@@ -182,6 +191,8 @@ $wgHooks['AbortNewAccount'][] = 'ConfirmEditHooks::confirmUserCreate';
 $wgHooks['LoginAuthenticateAudit'][] = 'ConfirmEditHooks::triggerUserLogin';
 $wgHooks['UserLoginForm'][] = 'ConfirmEditHooks::injectUserLogin';
 $wgHooks['AbortLogin'][] = 'ConfirmEditHooks::confirmUserLogin';
 $wgHooks['LoginAuthenticateAudit'][] = 'ConfirmEditHooks::triggerUserLogin';
 $wgHooks['UserLoginForm'][] = 'ConfirmEditHooks::injectUserLogin';
 $wgHooks['AbortLogin'][] = 'ConfirmEditHooks::confirmUserLogin';

+# Register API hook
+$wgHooks['APIEditBeforeSave'][] = 'ConfirmEditHooks::confirmEditAPI';

 
 $wgAutoloadClasses['ConfirmEditHooks'] 
        = $wgAutoloadClasses['SimpleCaptcha'] 
 
 $wgAutoloadClasses['ConfirmEditHooks'] 
        = $wgAutoloadClasses['SimpleCaptcha']