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

diff --git a/.gitignore b/.gitignore
index 98b092a98468fa024def0801401814222cd42c20..c798be9c5d9ae7f1eae5b6c5da3574fd13d097b3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *~
 *.kate-swp
 .*.swp
+.idea

diff --git a/Asirra.class.php b/Asirra.class.php
index 1f31d089c2b4796d77f6edc8feb0c9fd0e2253e9..a3b12b74657a81d35ede1614967652d5e5a52f86 100644 (file)
--- a/Asirra.class.php
+++ b/Asirra.class.php
@@ -10,12 +10,12 @@ class Asirra extends SimpleCaptcha {
        // As we don't have to store anything but some other things to do,
        // we're going to replace that constructor completely.
        function __construct() {
-               global $wgExtensionAssetsPath, $wgAsirraScriptPath;
+               global $wgExtensionAssetsPath;
                $this->asirra_localpath = "$wgExtensionAssetsPath/ConfirmEdit";
        }
 
        function getForm() {
-               global $wgAsirraEnlargedPosition, $wgAsirraCellsPerRow, $wgOut, $wgLang;
+               global $wgOut;
 
                $wgOut->addModules( 'ext.confirmedit.asirra' );
                $js = Html::linkedScript( $this->asirra_clientscript );

diff --git a/Captcha.php b/Captcha.php
index 3d6494ffc928ea54045b75b1546216c7b820dc44..bf9295b948cd7df421307dfea8a2c9231c509e75 100644 (file)
--- a/Captcha.php
+++ b/Captcha.php
@@ -70,10 +70,10 @@ class SimpleCaptcha {
         */
        function getMessage( $action ) {
                $name = 'captcha-' . $action;
-               $text = wfMsg( $name );
+               $text = wfMessage( $name )->text();
                # Obtain a more tailored message, if possible, otherwise, fall back to
                # the default for edits
-               return wfEmptyMsg( $name, $text ) ? wfMsg( 'captcha-edit' ) : $text;
+               return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'captcha-edit' )->text() : $text;
        }
 
        /**
@@ -156,7 +156,8 @@ class SimpleCaptcha {
                        if ( !$count ) {
                                $wgMemc->add( $key, 0, $wgCaptchaBadLoginExpiration );
                        }
-                       $count = $wgMemc->incr( $key );
+
+                       $wgMemc->incr( $key );
                }
                return true;
        }
@@ -236,9 +237,10 @@ class SimpleCaptcha {
        }
 
        /**
-        * @param EditPage $editPage
-        * @param string $newtext
-        * @param string $section
+        * @param $editPage EditPage
+        * @param $newtext string
+        * @param $section string
+        * @param $merged bool
         * @return bool true if the captcha should run
         */
        function shouldCheck( &$editPage, $newtext, $section, $merged = false ) {
@@ -354,9 +356,9 @@ class SimpleCaptcha {
         */
        function filterLink( $url ) {
                global $wgCaptchaWhitelist;
-               $source = wfMsgForContent( 'captcha-addurl-whitelist' );
+               $source = wfMessage( 'captcha-addurl-whitelist' )->inContentLanguage()->text();
 
-               $whitelist = wfEmptyMsg( 'captcha-addurl-whitelist', $source )
+               $whitelist = wfMessage( 'captcha-addurl-whitelist', $source )->isDisabled()
                        ? false
                        : $this->buildRegexes( explode( "\n", $source ) );
 
@@ -433,6 +435,10 @@ class SimpleCaptcha {
 
        /**
         * Backend function for confirmEdit() and confirmEditAPI()
+        * @param $editPage EditPage
+        * @param $newtext string
+        * @param $section
+        * @param $merged bool
         * @return bool false if the CAPTCHA is rejected, true otherwise
         */
        private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) {
@@ -476,6 +482,7 @@ class SimpleCaptcha {
         * A more efficient edit filter callback based on the text after section merging
         * @param EditPage $editPage
         * @param string $newtext
+        * @return bool
         */
        function confirmEditMerged( $editPage, $newtext ) {
                return $this->confirmEdit( $editPage, $newtext, false, true );
@@ -508,7 +515,7 @@ class SimpleCaptcha {
 
                        $this->trigger = "new account '" . $u->getName() . "'";
                        if ( !$this->passCaptcha() ) {
-                               $message = wfMsg( 'captcha-createaccount-fail' );
+                               $message = wfMessage( 'captcha-createaccount-fail' )->text();
                                return false;
                        }
                }
@@ -517,8 +524,9 @@ class SimpleCaptcha {
 
        /**
         * Hook for user login form submissions.
-        * @param User $u
-        * @param string $message
+        * @param $u User
+        * @param $pass
+        * @param $retval
         * @return bool true to continue, false to abort user creation
         */
        function confirmUserLogin( $u, $pass, &$retval ) {
@@ -558,12 +566,12 @@ class SimpleCaptcha {
                        if ( defined( 'MW_API' ) ) {
                                # API mode
                                # Asking for captchas in the API is really silly
-                               $error = wfMsg( 'captcha-disabledinapi' );
+                               $error = wfMessage( 'captcha-disabledinapi' )->text();
                                return false;
                        }
                        $this->trigger = "{$wgUser->getName()} sending email";
                        if ( !$this->passCaptcha() ) {
-                               $error = wfMsg( 'captcha-sendemail-fail' );
+                               $error = wfMessage( 'captcha-sendemail-fail' )->text();
                                return false;
                        }
                }
@@ -694,7 +702,8 @@ class SimpleCaptcha {
 
        /**
         * Extract a list of all recognized HTTP links in the text.
-        * @param string $text
+        * @param $editpage EditPage
+        * @param $text string
         * @return array of strings
         */
        function findLinks( &$editpage, $text ) {
@@ -712,10 +721,10 @@ class SimpleCaptcha {
         */
        function showHelp() {
                global $wgOut;
-               $wgOut->setPageTitle( wfMsg( 'captchahelp-title' ) );
-               $wgOut->addWikiText( wfMsg( 'captchahelp-text' ) );
+               $wgOut->setPageTitle( wfMessage( 'captchahelp-title' )->text() );
+               $wgOut->addWikiMsg( 'captchahelp-text' );
                if ( CaptchaStore::get()->cookiesNeeded() ) {
-                       $wgOut->addWikiText( wfMsg( 'captchahelp-cookies-needed' ) );
+                       $wgOut->addWikiMsg( 'captchahelp-cookies-needed' );
                }
        }
 }

diff --git a/FancyCaptcha.class.php b/FancyCaptcha.class.php
index 97a890455726e7fc25b29f8ad32e4c2bd8d17cd9..a204f09322f87b5a4b96bf6a6f81b76ecca99905 100644 (file)
--- a/FancyCaptcha.class.php
+++ b/FancyCaptcha.class.php
@@ -71,7 +71,7 @@ class FancyCaptcha extends SimpleCaptcha {
                        '<p>' .
                        Html::element( 'label', array(
                                'for' => 'wpCaptchaWord',
-                       ), parent::getMessage( 'label' ) . wfMsg( 'colon-separator' ) ) .
+                       ), parent::getMessage( 'label' ) . wfMessage( 'colon-separator' )->text() ) .
                        Html::element( 'input', array(
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',
@@ -161,6 +161,7 @@ class FancyCaptcha extends SimpleCaptcha {
 
        /**
         * Count the number of files in a directory.
+        * @param $dirname
         * @return int
         */
        function countFiles( $dirname ) {
@@ -232,10 +233,10 @@ class FancyCaptcha extends SimpleCaptcha {
         */
        function getMessage( $action ) {
                $name = 'fancycaptcha-' . $action;
-               $text = wfMsg( $name );
+               $text = wfMessage( $name )->text();
                # Obtain a more tailored message, if possible, otherwise, fall back to
                # the default for edits
-               return wfEmptyMsg( $name, $text ) ? wfMsg( 'fancycaptcha-edit' ) : $text;
+               return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'fancycaptcha-edit' )->text() : $text;
        }
 
        /**

diff --git a/HTMLCaptchaField.php b/HTMLCaptchaField.php
index 6b1765d098082cea36109faf401329e22e3c8344..bc912e8b9dd107efee143efaf81df5cd88d1b2a7 100644 (file)
--- a/HTMLCaptchaField.php
+++ b/HTMLCaptchaField.php
@@ -59,8 +59,6 @@ class HTMLCaptchaField extends HTMLFormField {
                if ( $data === false ) {
                        return true;
                }
-
-
        }
 
        /**
@@ -81,4 +79,4 @@ class HTMLCaptchaField extends HTMLFormField {
                // "you answered the captcha wrongly"
                return $this->captcha->exists();
        }
-}
\ No newline at end of file
+}

diff --git a/QuestyCaptcha.class.php b/QuestyCaptcha.class.php
index 8e87db3051a26622b7f126b1941c08955cf1f80f..93954f1ee5e6ce4595160583fa8bb3fa1d638455 100644 (file)
--- a/QuestyCaptcha.class.php
+++ b/QuestyCaptcha.class.php
@@ -55,18 +55,18 @@ class QuestyCaptcha extends SimpleCaptcha {
 
        function getMessage( $action ) {
                $name = 'questycaptcha-' . $action;
-               $text = wfMsg( $name );
+               $text = wfMessage( $name )->text();
                # Obtain a more tailored message, if possible, otherwise, fall back to
                # the default for edits
-               return wfEmptyMsg( $name, $text ) ? wfMsg( 'questycaptcha-edit' ) : $text;
+               return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'questycaptcha-edit' )->text() : $text;
        }
 
        function showHelp() {
                global $wgOut;
-               $wgOut->setPageTitle( wfMsg( 'captchahelp-title' ) );
-               $wgOut->addWikiText( wfMsg( 'questycaptchahelp-text' ) );
+               $wgOut->setPageTitle( wfMessage( 'captchahelp-title' )->text() );
+               $wgOut->addWikiMsg( 'questycaptchahelp-text' );
                if ( CaptchaStore::get()->cookiesNeeded() ) {
-                       $wgOut->addWikiText( wfMsg( 'captchahelp-cookies-needed' ) );
+                       $wgOut->addWikiMsg( 'captchahelp-cookies-needed' );
                }
        }
 }

diff --git a/README b/README
index 1f6ddb3ba07ff1e048b6b4828bb1f7a6d50cd41f..70e2c22ceb3e8a7251339f5e7f457903a1a549ea 100644 (file)
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ and dogs, from a widget provided by the Microsoft Asirra service
 == License ==
 
 ConfirmEdit is published under the GPL license.
- 
+
 == Authors ==
 
 The main framework, and the SimpleCaptcha and FancyCaptcha modules, were

diff --git a/ReCaptcha.class.php b/ReCaptcha.class.php
index a041aeb1309fadac874655408f95bcb9c67445db..c3898f80410c55957f88e35fd2d70e890b97b3ae 100644 (file)
--- a/ReCaptcha.class.php
+++ b/ReCaptcha.class.php
@@ -75,11 +75,11 @@ class ReCaptcha extends SimpleCaptcha {
         */
        function getMessage( $action ) {
                $name = 'recaptcha-' . $action;
-               $text = wfMsg( $name );
+               $text = wfMessage( $name )->text();
 
                # Obtain a more tailored message, if possible, otherwise, fall back to
                # the default for edits
-               return wfEmptyMsg( $name, $text ) ? wfMsg( 'recaptcha-edit' ) : $text;
+               return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'recaptcha-edit' )->text() : $text;
        }
 
        public function APIGetAllowedParams( &$module, &$params ) {

diff --git a/ext.confirmedit.asirra.js b/ext.confirmedit.asirra.js
index 6294b4f139ea6874487a95c611cf8cfff96f65da..52dc532c9bc62603d25d56cc51f6a4394b784915 100644 (file)
--- a/ext.confirmedit.asirra.js
+++ b/ext.confirmedit.asirra.js
@@ -9,7 +9,7 @@
 \*======================================================================*/
 
 jQuery( function( $ ) {
-       var asirraform = $( "form#userlogin2" )
+       var asirraform = $( "form#userlogin2" );
        var submitButtonClicked = document.createElement("input");
        var passThroughFormSubmit = false;
 
@@ -49,7 +49,7 @@ jQuery( function( $ ) {
                        asirraform.submit();
                }
        }
-       
+
        PrepareSubmit();
-       
+
 } );

diff --git a/recaptchalib.php b/recaptchalib.php
index 8e2c0c4f8216fc89da7e54775ac6a5cb6fa82d4c..73fd63097767190e1ac9bdde3c0d0dde02c93be3 100644 (file)
--- a/recaptchalib.php
+++ b/recaptchalib.php
@@ -272,6 +272,3 @@ function recaptcha_mailhide_html( $pubkey, $privkey, $email ) {
                "' onclick=\"window.open('" . htmlentities ( $url ) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ( $emailparts [1] );
 
 }
-
-
-?>