* (bug 32609) API: Move captchaid/captchaword of action=edit from core to Captcha...

[toast/cookiecaptcha.git] / Captcha.php

diff --git a/Captcha.php b/Captcha.php
index 1d781ae86e050375edb4f09ae8ea3fe378b9e45d..a67870c8e61e444cc834753bb415bff98b53d961 100644 (file)
--- a/Captcha.php
+++ b/Captcha.php
@@ -44,7 +44,7 @@ abstract class Captcha {
 
        /**
         * Instantiate a new Captcha object for a given Id
 
        /**
         * Instantiate a new Captcha object for a given Id

-        * 
+        *

         * @param  $id Int
         * @return Captcha
         */
         * @param  $id Int
         * @return Captcha
         */


@@ -253,7 +253,9 @@ class SimpleCaptcha {
                $captcha = $this->getCaptcha();
                $index = $this->storeCaptcha( $captcha );
 
                $captcha = $this->getCaptcha();
                $index = $this->storeCaptcha( $captcha );
 

-               return "<p><label for=\"wpCaptchaWord\">{$captcha['question']}</label> = " .
+               // dir="ltr" is needed because otherwise it may say
+               // "5 - 20" instead of "20 - 5" and that would be wrong.
+               return "<p><label dir=\"ltr\" for=\"wpCaptchaWord\">{$captcha['question']}</label> = " .

                        Xml::element( 'input', array(
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',
                        Xml::element( 'input', array(
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',


@@ -303,7 +305,7 @@ class SimpleCaptcha {
                                wfDebug( "ConfirmEdit: user group allows skipping captcha on email sending\n" );
                                return true;
                        }
                                wfDebug( "ConfirmEdit: user group allows skipping captcha on email sending\n" );
                                return true;
                        }

-                       $form->addFooterText( 
+                       $form->addFooterText(

                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'sendemail' ) ) .
                                $this->getForm() .
                                "<div class='captcha'>" .
                                $wgOut->parse( $this->getMessage( 'sendemail' ) ) .
                                $this->getForm() .


@@ -690,6 +692,7 @@ class SimpleCaptcha {
                        $this->addCaptchaAPI( $resultArr );
                        return false;
                }
                        $this->addCaptchaAPI( $resultArr );
                        return false;
                }

+

                return true;
        }
 
                return true;
        }
 


@@ -740,7 +743,7 @@ class SimpleCaptcha {
        }
 
        /**
        }
 
        /**

-        * Check the captcha on Special:EmailUser 
+        * Check the captcha on Special:EmailUser

         * @param $from MailAddress
         * @param $to MailAddress
         * @param $subject String
         * @param $from MailAddress
         * @param $to MailAddress
         * @param $subject String


@@ -757,7 +760,7 @@ class SimpleCaptcha {
                        }
                        if ( $this->isIPWhitelisted() )
                                return true;
                        }
                        if ( $this->isIPWhitelisted() )
                                return true;

-               
+

                        if ( defined( 'MW_API' ) ) {
                                # API mode
                                # Asking for captchas in the API is really silly
                        if ( defined( 'MW_API' ) ) {
                                # API mode
                                # Asking for captchas in the API is really silly


@@ -773,6 +776,36 @@ class SimpleCaptcha {
                return true;
        }
 
                return true;
        }
 

+       /**
+        * @param $module ApiBase
+        * @param $params array
+        * @return bool
+        */
+       public function APIGetAllowedParams( &$module, &$params ) {
+               if ( !$module instanceof ApiEditPage ) {
+                       return true;
+               }
+               $params['captchaword'] = null;
+               $params['captchaid'] = null;
+
+               return true;
+       }
+
+       /**
+        * @param $module ApiBae
+        * @param $desc array
+        * @return bool
+        */
+       public function APIGetParamDescription( &$module, &$desc ) {
+               if ( !$module instanceof ApiEditPage ) {
+                       return true;
+               }
+               $desc['captchaid'] = 'CAPTCHA ID from previous request';
+               $desc['captchaword'] = 'Answer to the CAPTCHA';
+
+               return true;
+       }
+

        /**
         * Given a required captcha run, test form input for correct
         * input on the open session.
        /**
         * Given a required captcha run, test form input for correct
         * input on the open session.