Commit graph

39 commits

Author SHA1 Message Date
EBernhardson 804903b4a7 Revert "Getting rid of some globals"
This broke account creation for apps.

 <   anomie>bd808: Very likely $wgRequest !==
               $loginForm->getContext()->getRequest() in SimpleCaptcha::addNewAccountApiForm(), so when it
               uses $wgRequest to check later on it doesn't see the parameter renames made by that hook
               function.

This reverts commit 23c6f2f04f.

Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
2015-04-02 16:36:13 -07:00
EBernhardson 84ad17c07e Merge "Getting rid of some globals" 2015-03-24 15:38:11 +00:00
Florianschmidtwelzow b6c22b0e02 FancyCaptcha: Don't return status code 500, if no server error
A missing captchaId usually isn't a server error, it's a request error, so return
an appropriate status code (400).

Bug: T92827
Change-Id: Ia04da583858a8450b8445ad69bc1ef2b7d05f061
2015-03-18 07:58:08 +01:00
Florianschmidtwelzow 23c6f2f04f Getting rid of some globals
wgUser/wgOut/wgRequest shouldn't be used, if there is a context available.

Change-Id: Ife4fca8ecf03780046634f5871192f6380291c10
2015-03-10 09:52:45 +01:00
jenkins-bot 3710af668b Merge "MWException -> Exception" 2015-01-23 21:03:34 +00:00
Sumit Asthana 2237e2c4ce Captcha.php: modified to add captcha to 'extrafields' in Userlogin and Usercreate
Captcha.php inserts captcha in the header of Userlogin and Usercreate template.
This leads to inconsistent view because js,if enabled, moves the captcha before
submit button. Now the captcha is inserted at the 'extrafields' parameter just
before submit button in both the templates,for uniformity of view.

JS functionality in
resources/src/mediawiki.special/mediawiki.special.userlogin.common.js migrated
to backed in FancyCaptcha.class.php, so that the FancyCaptch is already styled
and positioned before 'submit'.
Depends on I82c68814e79cbc5aa250a308862c59fcbb6fd527
Depends on Ie95305b2e6dcbf527a23c92613755092185e6a05

Bug: T85192
Bug: T87190
Change-Id: If9a68aaee2cf98d63647816ccc8fc0bad12ca3d3
2015-01-19 18:43:50 +00:00
Ori Livneh ce20b1cef8 MWException -> Exception
Change-Id: I816b62c93e4eb08514b122add614f5457d6fad9a
2015-01-09 17:48:35 -08:00
jdlrobson 5d6f684da3 Make captchas use mw-ui-input when available
Change-Id: I44453a2cc238721468565403b9625039cb8742ef
2014-07-29 18:40:56 -07:00
tonythomas01 bcd0a3fc6c Fix depreciation warnings in FileBackend construction for ConfirmEdit
Modified getBackend() function to add values for WikiID and
lockmanager( array() )
Fixed spacing

Bug: 58614
Change-Id: I448579ac71809365d9f8c64eccfd2e08949f149d
2014-01-13 00:25:17 +05:30
jenkins-bot 87f02d40c3 Merge "Position the "Refresh" link over the image" 2013-05-09 07:52:23 +00:00
S Page dbe64ca161 Position the "Refresh" link over the image
This changes the CSS of the .fancycaptcha-image-container to allow
positioning within it, and repositions .fancycaptcha-reload at its
lower-right.  The container is taller than nearly all images, but
there's a chance the ↻Refresh link might obscure part of a captcha
image.

This is compatible with the new Create account form's repositioning of
the FancyCaptcha inside a gray frame using JS, though gerrit I003c5f1b75
improves Create account once this is deployed.

Bug: 47699
Change-Id: I57be0bc8aa80b9ea6148db979ad28397d2107b86
2013-05-06 18:44:31 -07:00
Matthew Flaschen 8765b88fbf Disable autocomplete for Simple, Fancy, Math, and Questy.
Bug: 48030
Change-Id: Id0eed4797ab5649fc5bb965b5d94fba21f120d9f
2013-05-02 21:09:51 -04:00
jenkins-bot 677b06eb85 Merge "Reduce size of FancyCaptcha input field" 2013-05-03 00:09:17 +00:00
S Page 8837bd469a Move reload image into the _Refresh_ background
This makes the icon and text a single item, so they don't split across
lines, and reduces code and messages.

Bug: 47398
Change-Id: If81313b9fe03693dcdc06d5d682f0ef9a9994f76
2013-04-26 19:52:04 -07:00
S Page 696d529cd3 Reduce size of FancyCaptcha input field
Helps in some circumstances.
Bug: 47763

Change-Id: I29672b63d12cd380d7b00cad3449807da76e4188
2013-04-26 18:26:53 -07:00
Matthew Flaschen 0546e82aee Fix HTML escaping error
* Consistently use more indented style for HTML method calls in FancyCaptcha.class.php

Change-Id: I31ff9d58451f431b22bbdad1196318707b5109f4
2013-04-23 23:50:02 -04:00
lalei 12361c5f31 Add a button to request a new fancy captcha
This adds HTML, CSS, and JS to FancyCaptcha output to refresh the image,
which requests it via a new fancycaptchareload API.
It also cleans up the Asirra class a little.

Bug: 14230
Change-Id: I4e476f32de199534c9798fc78e8490b3ef91dd45
2013-04-17 20:10:33 -04:00
Aaron Schulz 93e45f2870 Removed redundant width/height tags to avoid getimagesize() call.
Change-Id: I8dc1a343d107536ba038fe9f20c5a1819d3c1b11
2013-01-07 01:43:00 +00:00
Aaron Schulz 3589fc100b Avoid caching empty directory lists.
Change-Id: I574043a240018043126e2b1b05b08bf7e23610d6
2012-12-31 16:36:02 -08:00
Aaron Schulz 13d62bf9c7 File backend support for Captchas.
* Added $wgCaptchaFileBackend configuration setting.
  This causes captchas to be stored in the registered backend.
* Added $wgMemc usage to reduce directory operation I/O.
* Improved $wgCaptchaDeleteOnSolve in terms of race conditions.
* Added maintenance script to create and store new captchas based
  on the total amount desired and the current number remaining.

Change-Id: Iac490503fb94a8f003e3b7e1474a949b037af5df
2012-09-25 23:22:04 -07:00
Reedy 881ab04b19 Fix max(-1) is smaller than min(0) warning
Warning:  mt_rand() [<a href='function.mt-rand'>function.mt-rand</a>]: max(-1) is smaller than min(0) in /usr/local/apache/common-local/php-1.20wmf10/extensions/ConfirmEdit/FancyCaptcha.class.php on
line 135

Change-Id: I344504c133c84aea24ce38a4a4c05c2a0c12041b
2012-09-04 06:41:53 +00:00
Siebrand Mazeland 3ef1ab740a More maintenance for ConfirmEdit extension.
* Replace dirname( __FILE__ ) by __DIR__.
* Replace deprecated method calls. Now requires MediaWiki 1.19 or later.
* Fix some documentation.
* Remove commented out code.
* Remove superfluous newlines.

Change-Id: Ib73e1619aa331c83e375224b6adae4c1e5db3bb9
2012-09-02 14:26:45 +02:00
Siebrand Mazeland 55c17aa367 Maintenance for ConfirmEdit extension.
* Removed unused globals and local variables.
* Use Message class.
* Remove PHP4-ism from recaptchalib.php.
* Remove superfluous newlines.
* Add missing semi-colon in ext.confirmedit.asirra.js.
* Fix up some documentation.

Change-Id: I8916003d083a8c00aeabc9e485cc9a50030f0982
2012-08-16 23:21:50 +02:00
Timo Tijhof b6f8fdf0c3 fix syntax error
Change-Id: I46199405e43b50ef23590ec1e4282d900ea5059e
2012-06-07 18:31:11 +02:00
Kai_Nissen_(WMDE) 440cb15b2f (bug 34753) Added label for captcha field shown in forms
Every field should have a descriptive label to clarify what is expected
to be entered.

Though users who are using screen readers are not able to retype the
text shown by the captcha image at least they know what the application
is expecting and may get help from other people.

The label text is also added to the translation arrays for English and
German language as well as the descriptive array 'qqq'.

Removed trailing whitespaces and redundant internationalization
according to reviewer's comment.

Removed usage of global $wgOut;

Change-Id: I975dddb60891b162a62e547bb83669c13cb133a1
2012-06-06 20:24:11 +02:00
Aaron Schulz 20073ffeb0 MFT r114675; infinite loop fix
Change-Id: Ic688143bb6f414aabf19481cffceaf5bbc2d70df
2012-04-09 16:02:21 -07:00
Brion Vibber 3965ac8a83 * (bug 33366) ConfirmEdit: Disable autocorrect, autocapitalize on FancyCaptcha's input form to aid tablet users
Autocorrect / autocapitalize could mess up your input data, making it harder to get through the captcha. Disabled it so what you type is what you get.
2011-12-26 19:50:20 +00:00
Platonides 1eb6f82d00 Add required attribute to captcha answers per
http://www.mediawiki.org/wiki/Extension_talk:ConfirmEdit#HTML5_required_input_8261
This won't have any real-world effect until r67283 
HTML5 form validation is enabled again.
2011-10-21 14:59:16 +00:00
Happy-melon 54fa154b40 Introduce a CaptchaStore abstract class that CaptchaSessionStore and CaptchaCacheStore can extend. Some tidying, documentation and type hinting. 2011-04-24 11:41:49 +00:00
Platonides a8b20e2906 (Bug 24730) - add a "delete on success" option.
Patch by infinity0x@gmail.com

I just added some spaces and added the FancyCaptcha.php definition.
2010-08-29 13:31:31 +00:00
Sam Reed 89349038f9 Remove some more unused globals/variables 2010-07-26 21:42:17 +00:00
Siebrand Mazeland 3db4c19909 Replace Title::makeTitle[Safe]( NS_SPECIAL, 'x' ) with SpecialPage::getTitleFor ( 'x' )
And a few other minor changes.
2010-06-08 19:30:48 +00:00
Siebrand Mazeland 4a6c4e2bcf * Update messages for QuestyCaptcha
* stylize.php and trailing whitespace removed for ConfirmEdit
* add support for QuestyCaptcha to Translate
* svn execute bits removed
2009-07-19 15:13:01 +00:00
Aaron Schulz acdbf7ae1a Search & replace war on old wf* xml functions 2008-12-20 09:32:47 +00:00
Roan Kattouw 2df8abceff Adding MIME type to CAPTCHA API result per discussion on wikitech-l. 2008-02-29 21:44:21 +00:00
Roan Kattouw c112c24f54 Modifying ConfirmEdit extension to make it API-friendly:
* Hooking into the APIEditBeforeSave hook (which will appear in the ApiEdit_Vodafone branch in the next revision)
* Moved general CAPTCHA generation in SimpleCaptcha to getCaptcha()
* Moved general confirmEdit() functionality to doConfirmEdit() to facilitate differtiating between UI and API handling
* Adding SimpleCaptcha::addCaptchaAPI() method that adds CAPTCHA information to an API result array. Other CAPTCHA implementations should override this method with a function that does the same (did this for FancyCaptcha and MathCaptcha)
2008-02-28 17:42:23 +00:00
Brion Vibber 4eadac72c8 (bug 4816) Allow captcha images to be loaded multiple times during the session, if one so desires.
Konqueror seems to reload the image sometimes, which was causing it to vanish from the page when scrolling, redrawing etc.
2008-02-13 06:44:23 +00:00
Roan Kattouw ae8beb8dd5 ConfirmEdit: Cleaning up brain-damaged implementation of keyMatch() which expected $wgRequest as an argument only to call $wgRequest->getVal('wpCaptchaWord') and do nothing else with it 2008-01-24 21:42:21 +00:00
Tim Starling 152f5e39e0 * Optimised startup
* Use the new EditFilterMerged hook if available, for faster link finding
2007-11-12 07:42:25 +00:00