[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: Add extension.json, empty PHP entry point
..


Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bumped version to 1.4.0. And start following semver-notation.

Based on a cherry pick from: I21f417d9f5985598358d53a0afae815543f001ee

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
---
A CHANGELOG.md
M ConfirmEdit.php
D README
A README.md
A extension.json
5 files changed, 302 insertions(+), 221 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve

Objections:
  jenkins-bot: Fails



diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..328ef15
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+ConfirmEdit Changelog
+=
+
+### Changelog
+
+ Version 1.2
+
+Fixes bug 46132 - ConfirmEdit fatal error when using MathCaptcha and current 
Math extension.
+See .
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 479abb5..8116e5a 100644
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,181 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw Exception( 'This version of ConfirmEdit requires MediaWiki 1.21 
or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * "$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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */
-$wgCaptchaTriggersOnNamespace 

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add extension.json, empty PHP entry point
..


Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bumped version to 1.4.0. And start following semver-notation.

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
(Cherry-picked from I21f417d9f5985598358d53a0afae815543f001ee)
---
A CHANGELOG.md
M ConfirmEdit.php
D README
A README.md
A extension.json
5 files changed, 303 insertions(+), 221 deletions(-)

Approvals:
  Chad: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..328ef15
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+ConfirmEdit Changelog
+=
+
+### Changelog
+
+ Version 1.2
+
+Fixes bug 46132 - ConfirmEdit fatal error when using MathCaptcha and current 
Math extension.
+See .
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 0990a66..8116e5a 100755
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,181 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw new Exception( 'This version of ConfirmEdit requires MediaWiki 
1.21 or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * "$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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250276

Change subject: Add extension.json, empty PHP entry point
..

Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Change-Id: Ia8e786e307d9240fc0a9da70e65798d6ee67eec4
---
A extension.json
1 file changed, 122 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/76/250276/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..d73d2ec
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,122 @@
+{
+   "name": "ConfirmEdit",
+   "version": "1.3",
+   "author": [
+   "Brion Vibber",
+   "..."
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:ConfirmEdit;,
+   "descriptionmsg": "captcha-desc",
+   "license-name": "GPL-2.0+",
+   "type": "antispam",
+   "GroupPermissions": {
+   "*": {
+   "skipcaptcha": false
+   },
+   "user": {
+   "skipcaptcha": false
+   },
+   "autoconfirmed": {
+   "skipcaptcha": false
+   },
+   "bot": {
+   "skipcaptcha": true
+   },
+   "sysop": {
+   "skipcaptcha": true
+   }
+   },
+   "AvailableRights": [
+   "skipcaptcha"
+   ],
+   "ExtensionFunctions": [
+   "ConfirmEditHooks::confirmEditSetup"
+   ],
+   "SpecialPages": {
+   "Captcha": "CaptchaSpecialPage"
+   },
+   "MessagesDirs": {
+   "ConfirmEdit": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "ConfirmEditAlias": "ConfirmEdit.alias.php"
+   },
+   "AutoloadClasses": {
+   "ConfirmEditHooks": "includes/ConfirmEditHooks.php",
+   "SimpleCaptcha": "SimpleCaptcha/Captcha.php",
+   "CaptchaStore": "includes/CaptchaStore.php",
+   "CaptchaSessionStore": "includes/CaptchaStore.php",
+   "CaptchaCacheStore": "includes/CaptchaStore.php",
+   "CaptchaSpecialPage": "includes/specials/SpecialCaptcha.php"
+   },
+   "Hooks": {
+   "EditPageBeforeEditButtons": [
+   "ConfirmEditHooks::confirmEditPage"
+   ],
+   "UserCreateForm": [
+   "ConfirmEditHooks::injectUserCreate"
+   ],
+   "AbortNewAccount": [
+   "ConfirmEditHooks::confirmUserCreate"
+   ],
+   "LoginAuthenticateAudit": [
+   "ConfirmEditHooks::triggerUserLogin"
+   ],
+   "UserLoginForm": [
+   "ConfirmEditHooks::injectUserLogin"
+   ],
+   "AbortLogin": [
+   "ConfirmEditHooks::confirmUserLogin"
+   ],
+   "EmailUserForm": [
+   "ConfirmEditHooks::injectEmailUser"
+   ],
+   "EmailUser": [
+   "ConfirmEditHooks::confirmEmailUser"
+   ],
+   "EditPage::showEditForm:fields": [
+   "ConfirmEditHooks::showEditFormFields"
+   ],
+   "EditFilterMergedContent": [
+   "ConfirmEditHooks::confirmEditMerged"
+   ],
+   "APIGetAllowedParams": [
+   "ConfirmEditHooks::APIGetAllowedParams"
+   ],
+   "APIGetParamDescription": [
+   "ConfirmEditHooks::APIGetParamDescription"
+   ],
+   "AddNewAccountApiForm": [
+   "ConfirmEditHooks::addNewAccountApiForm"
+   ],
+   "AddNewAccountApiResult": [
+   "ConfirmEditHooks::addNewAccountApiResult"
+   ],
+   "UnitTestsList": [
+   "ConfirmEditHooks::onUnitTestsList"
+   ]
+   },
+   "config": {
+   "CaptchaWhitelistIP": false,
+   "Captcha": null,
+   "CaptchaClass": "SimpleCaptcha",
+   "CaptchaTriggers": {
+   "edit": false,
+   "create": false,
+   "sendemail": false,
+   "addurl": true,
+   "createaccount": true,
+   "badlogin": true
+   },
+   "CaptchaTriggersOnNamespace": [],
+   "CaptchaStorageClass": "CaptchaSessionStore",
+   "CaptchaSessionExpiration": 1800,
+   "CaptchaBadLoginExpiration": 300,
+   

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add extension.json, empty PHP entry point
..


Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bumped version to 1.4.0. And start following semver-notation.

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
---
A CHANGELOG.md
M ConfirmEdit.php
D README
A README.md
A extension.json
5 files changed, 303 insertions(+), 223 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..328ef15
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+ConfirmEdit Changelog
+=
+
+### Changelog
+
+ Version 1.2
+
+Fixes bug 46132 - ConfirmEdit fatal error when using MathCaptcha and current 
Math extension.
+See .
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index e9b4184..8116e5a 100755
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,183 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw new Exception( 'This version of ConfirmEdit requires MediaWiki 
1.21 or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * "$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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */
-$wgCaptchaTriggersOnNamespace = array();
-
-# Example:
-# // Allow creation of talk pages without captchas
-# 

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250277

Change subject: Add extension.json, empty PHP entry point
..

Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bumped version to 1.4.0. And start following semver-notation.

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
---
A CHANGELOG.md
M ConfirmEdit.php
D README
A README.md
A extension.json
5 files changed, 303 insertions(+), 221 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/77/250277/1

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..328ef15
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+ConfirmEdit Changelog
+=
+
+### Changelog
+
+ Version 1.2
+
+Fixes bug 46132 - ConfirmEdit fatal error when using MathCaptcha and current 
Math extension.
+See .
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 0990a66..8116e5a 100755
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,181 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw new Exception( 'This version of ConfirmEdit requires MediaWiki 
1.21 or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * "$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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */
-$wgCaptchaTriggersOnNamespace = array();
-
-# 

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250275

Change subject: Add extension.json, empty PHP entry point
..

Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bumped version to 1.4.0. And start following semver-notation.

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
---
A CHANGELOG.md
M ConfirmEdit.php
D README
A README.md
A extension.json
5 files changed, 303 insertions(+), 221 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/75/250275/1

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..328ef15
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+ConfirmEdit Changelog
+=
+
+### Changelog
+
+ Version 1.2
+
+Fixes bug 46132 - ConfirmEdit fatal error when using MathCaptcha and current 
Math extension.
+See .
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 0990a66..8116e5a 100755
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,181 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw new Exception( 'This version of ConfirmEdit requires MediaWiki 
1.21 or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * "$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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */
-$wgCaptchaTriggersOnNamespace = array();
-
-# 

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250278

Change subject: Add extension.json, empty PHP entry point
..

Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bug: T88047
Bug: T94758
Change-Id: Ia8e786e307d9240fc0a9da70e65798d6ee67eec4
---
M ConfirmEdit.php
D README
A README.md
A extension.json
4 files changed, 292 insertions(+), 221 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/78/250278/1

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 479abb5..8116e5a 100644
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,181 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw Exception( 'This version of ConfirmEdit requires MediaWiki 1.21 
or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * "$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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */
-$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.
-
-/**
- * Indicate how to store per-session data required to match up the
- * internal captcha data with the editor.
- *
- * 'CaptchaSessionStore' uses PHP's session storage, which is cookie-based
- * and may 

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213825

Change subject: Add extension.json, empty PHP entry point
..

Add extension.json, empty PHP entry point

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
---
M ConfirmEdit.php
M FancyCaptcha/i18n/ms.json
A extension.json
M i18n/ms.json
M includes/ConfirmEditHooks.php
A includes/README
6 files changed, 366 insertions(+), 211 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/25/213825/1

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 0990a66..888017a 100755
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -1,210 +1,14 @@
 ?php
-
-/**
- * ConfirmEdit MediaWiki extension.
- *
- * This is a framework that holds a variety of CAPTCHA tools. The
- * default one, 'SimpleCaptcha', is not intended as a production-
- * level CAPTCHA system, and another one of the options provided
- * should be used in its place for any real usages.
- *
- * Copyright (C) 2005-2007 Brion Vibber br...@wikimedia.org
- * http://www.mediawiki.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Extensions
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. 
Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw new Exception( 'This version of ConfirmEdit requires MediaWiki 
1.21 or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' = __FILE__,
-   'name' = 'ConfirmEdit',
-   'author' = array( 'Brion Vibber', '...' ),
-   'url' = 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' = '1.3',
-   'descriptionmsg' = 'captcha-desc',
-   'license-name' = 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$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:
- * $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;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.