X-Git-Url: https://git.toastfreeware.priv.at/toast/cookiecaptcha.git/blobdiff_plain/21d725024c8a02a515d261971812d4d706f3d8db..9d09f41fd1c558fb1bc905be467b7e0eab881875:/ConfirmEdit.php

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 8285703..9de3da6 100644
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -35,10 +35,9 @@ global $wgExtensionFunctions, $wgGroupPermissions;
 
 $wgExtensionFunctions[] = 'confirmEditSetup';
 $wgExtensionCredits['other'][] = array(
+	'path' => __FILE__,
 	'name' => 'ConfirmEdit',
 	'author' => 'Brion Vibber',
-	'svn-date' => '$LastChangedDate$',
-	'svn-revision' => '$LastChangedRevision$',
 	'url' => 'http://www.mediawiki.org/wiki/Extension:ConfirmEdit',
 	'description' => 'Simple captcha implementation',
 	'descriptionmsg' => 'captcha-desc',
@@ -96,7 +95,7 @@ $wgCaptchaTriggers['badlogin']      = true;  // Special:Userlogin after failure
 
 /**
  * You may wish to apply special rules for captcha triggering on some namespaces.
- * $wgCaptchaTriggersOnNamespace[<namespace id>][<trigger>] forces an always on / 
+ * $wgCaptchaTriggersOnNamespace[<namespace id>][<trigger>] forces an always on /
  * always off configuration with that trigger for the given namespace.
  * Leave unset to use the global options ($wgCaptchaTriggers).
  *
@@ -104,9 +103,9 @@ $wgCaptchaTriggers['badlogin']      = true;  // Special:Userlogin after failure
  */
 $wgCaptchaTriggersOnNamespace = array();
 
-#Example:
-#$wgCaptchaTriggersOnNamespace[NS_TALK]['create'] = false; //Allow creation of talk pages without captchas.
-#$wgCaptchaTriggersOnNamespace[NS_PROJECT]['edit'] = true; //Show captcha whenever editing Project pages.
+# Example:
+# $wgCaptchaTriggersOnNamespace[NS_TALK]['create'] = false; //Allow creation of talk pages without captchas.
+# $wgCaptchaTriggersOnNamespace[NS_PROJECT]['edit'] = true; //Show captcha whenever editing Project pages.
 
 /**
  * Indicate how to store per-session data required to match up the
@@ -149,13 +148,12 @@ $wgCaptchaBadLoginExpiration = 5 * 60;
 global $ceAllowConfirmedEmail;
 $ceAllowConfirmedEmail = false;
 
-/** 
- * Number of bad login attempts allowed before triggering the captcha.
- * 
- * Default is 0.
+/**
+ * Number of bad login attempts before triggering the captcha.  0 means the
+ * captcha is presented on the first login.
  */
 global $wgCaptchaBadLoginAttempts;
-$wgCaptchaBadLoginAttempts = 0;
+$wgCaptchaBadLoginAttempts = 3;
 
 /**
  * Regex to whitelist URLs to known-good sites...
@@ -181,6 +179,7 @@ $wgSpecialPages['Captcha'] = array( /*class*/'CaptchaSpecialPage', /*name*/'Capt
 
 $wgConfirmEditIP = dirname( __FILE__ );
 $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php";
+$wgExtensionAliasesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.alias.php";
 
 if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) {
 	$wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged';
@@ -195,8 +194,8 @@ $wgHooks['AbortLogin'][] = 'ConfirmEditHooks::confirmUserLogin';
 # Register API hook
 $wgHooks['APIEditBeforeSave'][] = 'ConfirmEditHooks::confirmEditAPI';
 
-$wgAutoloadClasses['ConfirmEditHooks'] 
-	= $wgAutoloadClasses['SimpleCaptcha'] 
+$wgAutoloadClasses['ConfirmEditHooks']
+	= $wgAutoloadClasses['SimpleCaptcha']
 	= $wgAutoloadClasses['CaptchaSessionStore']
 	= $wgAutoloadClasses['CaptchaCacheStore']
 	= $wgAutoloadClasses['CaptchaSpecialPage']
@@ -207,7 +206,7 @@ $wgAutoloadClasses['ConfirmEditHooks']
  */
 function confirmEditSetup() {
 	global $wgGroupPermissions, $wgCaptchaTriggers;
-	if( !$wgGroupPermissions['*']['read'] && $wgCaptchaTriggers['badlogin'] ) {
+	if ( !$wgGroupPermissions['*']['read'] && $wgCaptchaTriggers['badlogin'] ) {
 		// We need to ensure that the captcha interface is accessible
 		// so that unauthenticated users can actually get in after a
 		// mistaken password typing.
@@ -218,5 +217,3 @@ function confirmEditSetup() {
 		$wgWhitelistRead[] = $help->getPrefixedText();
 	}
 }
-
-