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

diff --git a/Asirra.php b/Asirra.php
index 21dd37a45570aa66067a42b09851dfe36f73db4c..ff4cee9a6730d00b31e13d601903e67e3cd6f806 100644 (file)
--- a/Asirra.php
+++ b/Asirra.php
@@ -24,9 +24,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        exit;
 }
 
-$dir = dirname( __FILE__ ) . '/';
+$dir = __DIR__ . '/';
 require_once( "$dir/ConfirmEdit.php" );
-$dir = dirname( __FILE__ ) . '/';
 
 $wgCaptchaClass = 'Asirra';
 $wgExtensionMessagesFiles['Asirra'] = "$dir/Asirra.i18n.php";

diff --git a/Captcha.php b/Captcha.php
index bf9295b948cd7df421307dfea8a2c9231c509e75..ab52fae8ff32673a8e402cac8683e991c2cf45e1 100644 (file)
--- a/Captcha.php
+++ b/Captcha.php
@@ -1,7 +1,6 @@
 <?php
 
 class SimpleCaptcha {
-
        function getCaptcha() {
                $a = mt_rand( 0, 100 );
                $b = mt_rand( 0, 10 );
@@ -65,7 +64,7 @@ class SimpleCaptcha {
         * Show a message asking the user to enter a captcha on edit
         * The result will be treated as wiki text
         *
-        * @param $action Action being performed
+        * @param $action string Action being performed
         * @return string
         */
        function getMessage( $action ) {
@@ -182,8 +181,7 @@ class SimpleCaptcha {
                if ( $wgCaptchaWhitelistIP ) {
                        global $wgRequest;
 
-                       // Compat: WebRequest::getIP is only available since MW 1.19.
-                       $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP();
+                       $ip = $wgRequest->getIP();
 
                        foreach ( $wgCaptchaWhitelistIP as $range ) {
                                if ( IP::isInRange( $ip, $range ) ) {
@@ -201,8 +199,7 @@ class SimpleCaptcha {
         */
        function badLoginKey() {
                global $wgRequest;
-               // Compat: WebRequest::getIP is only available since MW 1.19.
-               $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP();
+               $ip = $wgRequest->getIP();
                return wfMemcKey( 'captcha', 'badlogin', 'ip', $ip );
        }
 
@@ -350,7 +347,7 @@ class SimpleCaptcha {
 
        /**
         * Filter callback function for URL whitelisting
-        * @param string url to check
+        * @param $url string to check
         * @return bool true if unknown, false if whitelisted
         * @access private
         */
@@ -370,7 +367,7 @@ class SimpleCaptcha {
 
        /**
         * Build regex from whitelist
-        * @param string lines from [[MediaWiki:Captcha-addurl-whitelist]]
+        * @param $lines string from [[MediaWiki:Captcha-addurl-whitelist]]
         * @return string Regex or bool false if whitelist is empty
         * @access private
         */
@@ -594,7 +591,7 @@ class SimpleCaptcha {
        }
 
        /**
-        * @param $module ApiBae
+        * @param $module ApiBase
         * @param $desc array
         * @return bool
         */

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index b0e71c7b24e91d692ab87591978db756a1e25ca6..87a48e0abc9d449166f7e47dbb33fa0daf7cc606 100644 (file)
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -173,7 +173,7 @@ $wgCaptchaRegexes = array();
 /** Register special page */
 $wgSpecialPages['Captcha'] = 'CaptchaSpecialPage';
 
-$wgConfirmEditIP = dirname( __FILE__ );
+$wgConfirmEditIP = __DIR__;
 $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php";
 $wgExtensionMessagesFiles['ConfirmEditAlias'] = "$wgConfirmEditIP/ConfirmEdit.alias.php";
 

diff --git a/FancyCaptcha.class.php b/FancyCaptcha.class.php
index a204f09322f87b5a4b96bf6a6f81b76ecca99905..c6ee03c6ddf76b155bc8c1cd8c88a2162c7cf276 100644 (file)
--- a/FancyCaptcha.class.php
+++ b/FancyCaptcha.class.php
@@ -183,17 +183,8 @@ class FancyCaptcha extends SimpleCaptcha {
 
                $info = $this->retrieveCaptcha();
                if ( $info ) {
-                       /*
-                       // Be a little less restrictive for now; in at least some circumstances,
-                       // Konqueror tries to reload the image even if you haven't navigated
-                       // away from the page.
-                       if( $info['viewed'] ) {
-                               wfHttpError( 403, 'Access Forbidden', "Can't view captcha image a second time." );
-                               return false;
-                       }
-                       */
-
-                       $info['viewed'] = wfTimestamp();
+                       $timestamp = new MWTimestamp();
+                       $info['viewed'] = $timestamp->getTimestamp();
                        $this->storeCaptcha( $info );
 
                        $salt = $info['salt'];
@@ -204,7 +195,7 @@ class FancyCaptcha extends SimpleCaptcha {
                                global $IP;
                                require_once "$IP/includes/StreamFile.php";
                                header( "Cache-Control: private, s-maxage=0, max-age=3600" );
-                               wfStreamFile( $file );
+                               StreamFile::stream( $file );
                                return true;
                        }
                }
@@ -228,7 +219,7 @@ class FancyCaptcha extends SimpleCaptcha {
         * Show a message asking the user to enter a captcha on edit
         * The result will be treated as wiki text
         *
-        * @param $action Action being performed
+        * @param $action string Action being performed
         * @return string
         */
        function getMessage( $action ) {

diff --git a/FancyCaptcha.php b/FancyCaptcha.php
index dbc136b88c644da4acc2c869ba0cc28fe88951c1..6de858a3f32c7e493eeaa8fe6e888dd74271c1a6 100644 (file)
--- a/FancyCaptcha.php
+++ b/FancyCaptcha.php
@@ -29,7 +29,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        exit;
 }
 
-require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$dir = __DIR__;
+require_once $dir . '/ConfirmEdit.php';
 $wgCaptchaClass = 'FancyCaptcha';
 
 global $wgCaptchaDirectory;
@@ -49,5 +50,5 @@ $wgCaptchaSecret = "CHANGE_THIS_SECRET!";
  */
 $wgCaptchaDeleteOnSolve = false;
 
-$wgExtensionMessagesFiles['FancyCaptcha'] = dirname( __FILE__ ) . '/FancyCaptcha.i18n.php';
-$wgAutoloadClasses['FancyCaptcha'] = dirname( __FILE__ ) . '/FancyCaptcha.class.php';
+$wgExtensionMessagesFiles['FancyCaptcha'] = $dir . '/FancyCaptcha.i18n.php';
+$wgAutoloadClasses['FancyCaptcha'] = $dir . '/FancyCaptcha.class.php';

diff --git a/HTMLCaptchaField.php b/HTMLCaptchaField.php
index bc912e8b9dd107efee143efaf81df5cd88d1b2a7..c069ce9e3543fba83ace543d37e912debef9d174 100644 (file)
--- a/HTMLCaptchaField.php
+++ b/HTMLCaptchaField.php
@@ -20,7 +20,6 @@
  * @class
  */
 class HTMLCaptchaField extends HTMLFormField {
-
        /**
         * @var Captcha
         */

diff --git a/MathCaptcha.php b/MathCaptcha.php
index 8c815bf7986e835fea021002fdad62dd00661c4d..d1eb44efc0d66b8927a0647f070cfcdfdf5f9640 100644 (file)
--- a/MathCaptcha.php
+++ b/MathCaptcha.php
@@ -15,7 +15,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        exit;
 }
 
-require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$dir = __DIR__;
+require_once $dir . '/ConfirmEdit.php';
 $wgCaptchaClass = 'MathCaptcha';
 
-$wgAutoloadClasses['MathCaptcha'] = dirname( __FILE__ ) . '/MathCaptcha.class.php';
+$wgAutoloadClasses['MathCaptcha'] = $dir . '/MathCaptcha.class.php';

diff --git a/QuestyCaptcha.php b/QuestyCaptcha.php
index d4c23fd688356b70aa059a666c33085401ababd0..2cef79c775195983667e5977b7b8bb575daebbad 100644 (file)
--- a/QuestyCaptcha.php
+++ b/QuestyCaptcha.php
@@ -28,7 +28,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        exit;
 }
 
-require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$dir = __DIR__;
+require_once $dir . '/ConfirmEdit.php';
 $wgCaptchaClass = 'QuestyCaptcha';
 
 global $wgCaptchaQuestions;
@@ -41,5 +42,5 @@ $wgCaptchaQuestions = array();
 // You can also provide several acceptable answers to a given question (the answers shall be in lowercase):
 // $wgCaptchaQuestions[] = array( 'question' => "2 + 2 ?", 'answer' => array( '4', 'four' ) );
 
-$wgExtensionMessagesFiles['QuestyCaptcha'] = dirname( __FILE__ ) . '/QuestyCaptcha.i18n.php';
-$wgAutoloadClasses['QuestyCaptcha'] = dirname( __FILE__ ) . '/QuestyCaptcha.class.php';
+$wgExtensionMessagesFiles['QuestyCaptcha'] = $dir . '/QuestyCaptcha.i18n.php';
+$wgAutoloadClasses['QuestyCaptcha'] = $dir . '/QuestyCaptcha.class.php';

diff --git a/ReCaptcha.class.php b/ReCaptcha.class.php
index c3898f80410c55957f88e35fd2d70e890b97b3ae..59b31f47e6729a76bbeebcc63e1b065b6d66b6e2 100644 (file)
--- a/ReCaptcha.class.php
+++ b/ReCaptcha.class.php
@@ -36,8 +36,7 @@ class ReCaptcha extends SimpleCaptcha {
                        return false;
                }
 
-               // Compat: WebRequest::getIP is only available since MW 1.19.
-               $ip = method_exists( $wgRequest, 'getIP' ) ? $wgRequest->getIP() : wfGetIP();
+               $ip = $wgRequest->getIP();
 
                $recaptcha_response = recaptcha_check_answer(
                        $wgReCaptchaPrivateKey,
@@ -70,7 +69,7 @@ class ReCaptcha extends SimpleCaptcha {
         * Show a message asking the user to enter a captcha on edit
         * The result will be treated as wiki text
         *
-        * @param $action Action being performed
+        * @param $action string Action being performed
         * @return string
         */
        function getMessage( $action ) {

diff --git a/ReCaptcha.php b/ReCaptcha.php
index cedaae100ae0149d9ac956809b4159dbb92ea93b..8d44e6f6342798aa94d32565467f827319b43180 100644 (file)
--- a/ReCaptcha.php
+++ b/ReCaptcha.php
@@ -14,11 +14,10 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        exit;
 }
 
-require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$dir = __DIR__;
+require_once $dir . '/ConfirmEdit.php';
 $wgCaptchaClass = 'ReCaptcha';
 
-$dir = dirname( __FILE__ );
-
 $wgExtensionMessagesFiles['ReCaptcha'] = $dir . '/ReCaptcha.i18n.php';
 
 $wgAutoloadClasses['ReCaptcha'] = $dir . '/ReCaptcha.class.php';