diff --git a/.phan/config.php b/.phan/config.php index c80a10fdc..71dd58808 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -7,18 +7,9 @@ $cfg['directory_list'] = array_merge( [ 'FancyCaptcha/', 'hCaptcha/', - 'MathCaptcha/', 'QuestyCaptcha/', 'ReCaptchaNoCaptcha/', 'SimpleCaptcha/', - '../../extensions/Math', - ] -); - -$cfg['exclude_analysis_directory_list'] = array_merge( - $cfg['exclude_analysis_directory_list'], - [ - '../../extensions/Math', ] ); diff --git a/Gruntfile.js b/Gruntfile.js index dda2dab8b..b8860bc1b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -5,7 +5,6 @@ module.exports = function ( grunt ) { 'QuestyCaptcha', 'ReCaptchaNoCaptcha', 'FancyCaptcha', - 'MathCaptcha', 'hCaptcha' ] ) { // eslint-disable-next-line security/detect-non-literal-require diff --git a/MathCaptcha/COPYING b/MathCaptcha/COPYING deleted file mode 100644 index d159169d1..000000000 --- a/MathCaptcha/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/MathCaptcha/extension.json b/MathCaptcha/extension.json deleted file mode 100644 index 542cc3c59..000000000 --- a/MathCaptcha/extension.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "MathCaptcha", - "author": [ - "..." - ], - "requires": { - "extensions": { - "Math": "*" - } - }, - "url": "https://www.mediawiki.org/wiki/Extension:ConfirmEdit#MathCaptcha", - "descriptionmsg": "mathcaptcha-desc", - "license-name": "GPL-2.0-or-later", - "type": "antispam", - "MessagesDirs": { - "MathCaptcha": [ - "i18n" - ] - }, - "AutoloadClasses": { - "MathCaptcha": "includes/MathCaptcha.php", - "MediaWiki\\Extension\\ConfirmEdit\\MathCaptcha\\MathCaptcha": "includes/MathCaptcha.php" - }, - "AutoloadNamespaces": { - "MediaWiki\\Extension\\ConfirmEdit\\MathCaptcha\\": "includes/" - }, - "config": { - "CaptchaClass": { - "value": "MediaWiki\\Extension\\ConfirmEdit\\MathCaptcha\\MathCaptcha" - } - }, - "manifest_version": 2 -} diff --git a/MathCaptcha/i18n/ar.json b/MathCaptcha/i18n/ar.json deleted file mode 100644 index ff59f56ee..000000000 --- a/MathCaptcha/i18n/ar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Meno25" - ] - }, - "mathcaptcha-desc": "وحدة MathCAPTCHA لConfirm Edit" -} diff --git a/MathCaptcha/i18n/ast.json b/MathCaptcha/i18n/ast.json deleted file mode 100644 index 77d64dde3..000000000 --- a/MathCaptcha/i18n/ast.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Xuacu" - ] - }, - "mathcaptcha-desc": "Módulu MathCAPTCHA pa Confirmar Edición" -} diff --git a/MathCaptcha/i18n/de.json b/MathCaptcha/i18n/de.json deleted file mode 100644 index 13863ac83..000000000 --- a/MathCaptcha/i18n/de.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Kghbln", - "Metalhead64" - ] - }, - "mathcaptcha-desc": "Ergänzt die Erweiterung „ConfirmEdit“ um ein MathCAPTCHA-Modul" -} diff --git a/MathCaptcha/i18n/diq.json b/MathCaptcha/i18n/diq.json deleted file mode 100644 index f886822f1..000000000 --- a/MathCaptcha/i18n/diq.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Orbot707" - ] - }, - "mathcaptcha-desc": "Tesdiqın vurnayışi rê module MathCAPTCHA" -} diff --git a/MathCaptcha/i18n/en.json b/MathCaptcha/i18n/en.json deleted file mode 100644 index dd3eccd00..000000000 --- a/MathCaptcha/i18n/en.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "@metadata": {}, - "mathcaptcha-desc": "MathCAPTCHA module for Confirm Edit" -} diff --git a/MathCaptcha/i18n/fr.json b/MathCaptcha/i18n/fr.json deleted file mode 100644 index 5d0cecfc4..000000000 --- a/MathCaptcha/i18n/fr.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Verdy p" - ] - }, - "mathcaptcha-desc": "Module MathCAPTCHA pour Confirm Edit" -} diff --git a/MathCaptcha/i18n/gl.json b/MathCaptcha/i18n/gl.json deleted file mode 100644 index 65f7346db..000000000 --- a/MathCaptcha/i18n/gl.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Toliño" - ] - }, - "mathcaptcha-desc": "Módulo MathCAPTCHA para Confirm Edit" -} diff --git a/MathCaptcha/i18n/he.json b/MathCaptcha/i18n/he.json deleted file mode 100644 index da9fbd5c9..000000000 --- a/MathCaptcha/i18n/he.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Amire80" - ] - }, - "mathcaptcha-desc": "מודול MathCAPTCHA ל־Confirm Edit" -} diff --git a/MathCaptcha/i18n/ia.json b/MathCaptcha/i18n/ia.json deleted file mode 100644 index d46c63b2a..000000000 --- a/MathCaptcha/i18n/ia.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "McDutchie" - ] - }, - "mathcaptcha-desc": "Modulo MathCAPTCHA pro Confirm Edit" -} diff --git a/MathCaptcha/i18n/id.json b/MathCaptcha/i18n/id.json deleted file mode 100644 index e090324eb..000000000 --- a/MathCaptcha/i18n/id.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Daud I.F. Argana" - ] - }, - "mathcaptcha-desc": "Modul MathCAPTCHA untuk Confirm Edit" -} diff --git a/MathCaptcha/i18n/ja.json b/MathCaptcha/i18n/ja.json deleted file mode 100644 index 843c9fec4..000000000 --- a/MathCaptcha/i18n/ja.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Ryoya3" - ] - }, - "mathcaptcha-desc": "ConfirmEdit用のMathCAPTCHAモジュール" -} diff --git a/MathCaptcha/i18n/mk.json b/MathCaptcha/i18n/mk.json deleted file mode 100644 index 094b92d51..000000000 --- a/MathCaptcha/i18n/mk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Bjankuloski06" - ] - }, - "mathcaptcha-desc": "Модул MathCAPTCHA за потврда на уредувања" -} diff --git a/MathCaptcha/i18n/nb.json b/MathCaptcha/i18n/nb.json deleted file mode 100644 index 4a1562be9..000000000 --- a/MathCaptcha/i18n/nb.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Jon Harald Søby" - ] - }, - "mathcaptcha-desc": "MathCAPTCHA-modul for Confirm Edit" -} diff --git a/MathCaptcha/i18n/nl.json b/MathCaptcha/i18n/nl.json deleted file mode 100644 index 89a936b9d..000000000 --- a/MathCaptcha/i18n/nl.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "McDutchie" - ] - }, - "mathcaptcha-desc": "MathCAPTCHA module voor Confirm Edit" -} diff --git a/MathCaptcha/i18n/pl.json b/MathCaptcha/i18n/pl.json deleted file mode 100644 index 4f720c9a6..000000000 --- a/MathCaptcha/i18n/pl.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Rail" - ] - }, - "mathcaptcha-desc": "Moduł MathCAPTCHA do rozszerzenia ConfirmEdit" -} diff --git a/MathCaptcha/i18n/pt-br.json b/MathCaptcha/i18n/pt-br.json deleted file mode 100644 index 8f330320b..000000000 --- a/MathCaptcha/i18n/pt-br.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Eduardo Addad de Oliveira", - "Eduardoaddad" - ] - }, - "mathcaptcha-desc": "Módulo MathCAPTCHA para Confirm Edit" -} diff --git a/MathCaptcha/i18n/pt.json b/MathCaptcha/i18n/pt.json deleted file mode 100644 index e3daf66bd..000000000 --- a/MathCaptcha/i18n/pt.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Hamilton Abreu" - ] - }, - "mathcaptcha-desc": "Módulo MathCAPTCHA para Confirm Edit" -} diff --git a/MathCaptcha/i18n/qqq.json b/MathCaptcha/i18n/qqq.json deleted file mode 100644 index fbb2c3735..000000000 --- a/MathCaptcha/i18n/qqq.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Amire80", - "Raymond" - ] - }, - "mathcaptcha-desc": "{{desc}}\n\n\"Confirm Edit\" is an extension and shouldn't be translated." -} diff --git a/MathCaptcha/i18n/roa-tara.json b/MathCaptcha/i18n/roa-tara.json deleted file mode 100644 index 56d3d8b0f..000000000 --- a/MathCaptcha/i18n/roa-tara.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Joetaras" - ] - }, - "mathcaptcha-desc": "'U module MathCAPTCHA pe 'a Conferme de le Cangiaminde" -} diff --git a/MathCaptcha/i18n/scn.json b/MathCaptcha/i18n/scn.json deleted file mode 100644 index a77369c84..000000000 --- a/MathCaptcha/i18n/scn.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Ajeje Brazorf" - ] - }, - "mathcaptcha-desc": "Mòdulu MathCAPTCHA pi Confirm Edit" -} diff --git a/MathCaptcha/i18n/sl.json b/MathCaptcha/i18n/sl.json deleted file mode 100644 index 472e45fa5..000000000 --- a/MathCaptcha/i18n/sl.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Eleassar" - ] - }, - "mathcaptcha-desc": "Modul MathCAPTCHA za razširitev »Confirm Edit«" -} diff --git a/MathCaptcha/i18n/sr-ec.json b/MathCaptcha/i18n/sr-ec.json deleted file mode 100644 index 82fcff0e4..000000000 --- a/MathCaptcha/i18n/sr-ec.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Kizule", - "Zoranzoki21" - ] - }, - "mathcaptcha-desc": "MathCAPTCHA модул за Confirm Edit" -} diff --git a/MathCaptcha/i18n/sr-el.json b/MathCaptcha/i18n/sr-el.json deleted file mode 100644 index a949855d4..000000000 --- a/MathCaptcha/i18n/sr-el.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "@metadata": { - "authors": [] - }, - "mathcaptcha-desc": "MathCAPTCHA modul za Confirm Edit" -} diff --git a/MathCaptcha/i18n/sv.json b/MathCaptcha/i18n/sv.json deleted file mode 100644 index b26740054..000000000 --- a/MathCaptcha/i18n/sv.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Sabelöga" - ] - }, - "mathcaptcha-desc": "MathCAPTCHA-modul för Confirm Edit" -} diff --git a/MathCaptcha/i18n/tr.json b/MathCaptcha/i18n/tr.json deleted file mode 100644 index 80ad6f092..000000000 --- a/MathCaptcha/i18n/tr.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "BaRaN6161 TURK" - ] - }, - "mathcaptcha-desc": "Onayla Düzenleme için MathCAPTCHA modülü" -} diff --git a/MathCaptcha/i18n/uk.json b/MathCaptcha/i18n/uk.json deleted file mode 100644 index 5f1a7ef3d..000000000 --- a/MathCaptcha/i18n/uk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Piramidion" - ] - }, - "mathcaptcha-desc": "Модуль MathCAPTCHA для Confirm Edit" -} diff --git a/MathCaptcha/i18n/zh-hans.json b/MathCaptcha/i18n/zh-hans.json deleted file mode 100644 index 0fd0937f7..000000000 --- a/MathCaptcha/i18n/zh-hans.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Dianliang233" - ] - }, - "mathcaptcha-desc": "Confirm Edit的MathCAPTCHA模块" -} diff --git a/MathCaptcha/i18n/zh-hant.json b/MathCaptcha/i18n/zh-hant.json deleted file mode 100644 index f8836e860..000000000 --- a/MathCaptcha/i18n/zh-hant.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Kly" - ] - }, - "mathcaptcha-desc": "用於確認編輯的 MathCAPTCHA 模組" -} diff --git a/MathCaptcha/includes/MathCaptcha.php b/MathCaptcha/includes/MathCaptcha.php deleted file mode 100644 index e960f75fc..000000000 --- a/MathCaptcha/includes/MathCaptcha.php +++ /dev/null @@ -1,129 +0,0 @@ -pickSum(); - $html = $this->fetchMath( $sum ); - $index = $this->storeCaptcha( [ 'answer' => $answer ] ); - $resultArr['captcha'] = $this->describeCaptchaType(); - $resultArr['captcha']['id'] = $index; - $resultArr['captcha']['question'] = $html; - } - - /** - * @return array - */ - public function describeCaptchaType() { - return [ - 'type' => 'math', - 'mime' => 'text/html', - ]; - } - - /** - * @param int $tabIndex - * @return array - */ - public function getFormInformation( $tabIndex = 1 ) { - [ $sum, $answer ] = $this->pickSum(); - $index = $this->storeCaptcha( [ 'answer' => $answer ] ); - - $form = ''; - $form .= '
' . $this->fetchMath( $sum ) . '' . Html::input( 'wpCaptchaWord', '', '', [ - 'tabindex' => $tabIndex, - 'autocomplete' => 'off', - 'required' - ] ) . '
'; - $form .= Html::hidden( 'wpCaptchaId', $index ); - return [ 'html' => $form ]; - } - - /** - * Pick a random sum - * @return array - */ - private function pickSum() { - $a = mt_rand( 0, 100 ); - $b = mt_rand( 0, 10 ); - $op = mt_rand( 0, 1 ) ? '+' : '-'; - $sum = "{$a} {$op} {$b} = "; - $ans = $op == '+' ? ( $a + $b ) : ( $a - $b ); - return [ $sum, $ans ]; - } - - /** - * Fetch the math - * @param string $sum - * @return string - */ - private function fetchMath( $sum ) { - $math = MathRenderer::getRenderer( $sum, [], 'png' ); - $math->render(); - $html = $math->getHtmlOutput(); - return preg_replace( '/alt=".*?"/', '', $html ); - } - - /** - * @return array - */ - public function getCaptcha() { - [ $sum, $answer ] = $this->pickSum(); - return [ 'question' => $sum, 'answer' => $answer ]; - } - - /** - * @param array $captchaData - * @param string $id - * @return mixed - */ - public function getCaptchaInfo( $captchaData, $id ) { - $sum = $captchaData['question']; - return $this->fetchMath( $sum ); - } - - /** - * @param array $requests - * @param array $fieldInfo - * @param array &$formDescriptor - * @param string $action - */ - public function onAuthChangeFormFields( array $requests, array $fieldInfo, - array &$formDescriptor, $action ) { - /** @var CaptchaAuthenticationRequest $req */ - $req = AuthenticationRequest::getRequestByClass( - $requests, - CaptchaAuthenticationRequest::class, - true - ); - if ( !$req ) { - return; - } - - $formDescriptor['captchaInfo']['raw'] = true; - $formDescriptor['captchaWord']['label-message'] = null; - } -} - -class_alias( MathCaptcha::class, 'MathCaptcha' ); diff --git a/README.md b/README.md index a1c239382..fd50c2ada 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,6 @@ https://www.mediawiki.org/wiki/Extension:ConfirmEdit The following modules are included in ConfirmEdit: * SimpleCaptcha - users have to solve an arithmetic math problem -* MathCaptcha - users have to solve a math problem that's displayed as -an image * FancyCaptcha - users have to identify a series of characters, displayed in a stylized way * QuestyCaptcha - users have to answer a question, out of a series of @@ -33,9 +31,7 @@ ConfirmEdit is published under the GPL license. ### Authors The main framework, and the SimpleCaptcha and FancyCaptcha modules, were -written by Brion Vibber. - -The MathCaptcha module was written by Rob Church. +written by Brooke Vibber. The QuestyCaptcha module was written by Benjamin Lees. diff --git a/resources/libs/ext.confirmEdit.CaptchaInputWidget.js b/resources/libs/ext.confirmEdit.CaptchaInputWidget.js index 410f036a2..781fd7d56 100644 --- a/resources/libs/ext.confirmEdit.CaptchaInputWidget.js +++ b/resources/libs/ext.confirmEdit.CaptchaInputWidget.js @@ -64,8 +64,7 @@ mw.libs.confirmEdit.CaptchaInputWidget.prototype.makeCaptchaInterface = function $( '' ).addClass( 'fancycaptcha-reload' ).text( mw.msg( 'fancycaptcha-reload-text' ) ) ); } else { - if ( captchaData.type === 'simple' || captchaData.type === 'math' ) { - // SimpleCaptcha and MathCaptcha + if ( captchaData.type === 'simple' ) { msg = 'captcha-edit'; } else if ( captchaData.type === 'question' ) { // QuestyCaptcha diff --git a/resources/ve-confirmedit/ve.init.mw.CaptchaSaveErrorHandler.js b/resources/ve-confirmedit/ve.init.mw.CaptchaSaveErrorHandler.js index 63bc83d0e..266c84e54 100644 --- a/resources/ve-confirmedit/ve.init.mw.CaptchaSaveErrorHandler.js +++ b/resources/ve-confirmedit/ve.init.mw.CaptchaSaveErrorHandler.js @@ -1,8 +1,8 @@ // Captcha "errors" usually aren't errors. We simply don't know about them ahead of time, // so we save once, then (if required) we get an error with a captcha back and try again after // the user solved the captcha. -// TODO: ConfirmEdit API is horrible, there is no reliable way to know whether it is a "math", -// "question" or "fancy" type of captcha. They all expose differently named properties in the +// TODO: ConfirmEdit API is horrible, there is no reliable way to know whether it is a "question" +// or "fancy" type of captcha. They all expose differently named properties in the // API for different things in the UI. At this point we only support the SimpleCaptcha and // FancyCaptcha which we very intuitively detect by the presence of a "url" property. mw.loader.using( 'ext.visualEditor.targetLoader' ).then( function () { @@ -20,7 +20,6 @@ mw.loader.using( 'ext.visualEditor.targetLoader' ).then( function () { return !!( captchaData && ( captchaData.url || captchaData.type === 'simple' || - captchaData.type === 'math' || captchaData.type === 'question' ) ); };