From 1a365e77dfb8825136626202b1df462731b42060 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 16 Aug 2015 08:22:05 +0200
Subject: Update to MediaWiki 1.25.2

---
 extensions/ConfirmEdit/ApiFancyCaptchaReload.php   | 46 ----------------------
 .../FancyCaptcha/ApiFancyCaptchaReload.php         | 46 ++++++++++++++++++++++
 extensions/ConfirmEdit/FancyCaptcha/extension.json |  4 +-
 extensions/ConfirmEdit/ReCaptcha/extension.json    |  2 +-
 .../ConfirmEdit/includes/ConfirmEditHooks.php      | 27 ++++++++++++-
 5 files changed, 74 insertions(+), 51 deletions(-)
 delete mode 100644 extensions/ConfirmEdit/ApiFancyCaptchaReload.php
 create mode 100644 extensions/ConfirmEdit/FancyCaptcha/ApiFancyCaptchaReload.php

(limited to 'extensions/ConfirmEdit')

diff --git a/extensions/ConfirmEdit/ApiFancyCaptchaReload.php b/extensions/ConfirmEdit/ApiFancyCaptchaReload.php
deleted file mode 100644
index 8cd28631..00000000
--- a/extensions/ConfirmEdit/ApiFancyCaptchaReload.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Api module to reload FancyCaptcha
- *
- * @ingroup API
- * @ingroup Extensions
- */
-class ApiFancyCaptchaReload extends ApiBase {
-	public function execute() {
-		# Get a new FancyCaptcha form data
-		$captcha = new FancyCaptcha();
-		$captchaIndex = $captcha->getCaptchaIndex();
-
-		$result = $this->getResult();
-		$result->addValue( null, $this->getModuleName(), array ( 'index' => $captchaIndex ) );
-		return true;
-	}
-
-	/**
-	 * @deprecated since MediaWiki core 1.25
-	 */
-	public function getDescription() {
-		return 'Get a new FancyCaptcha.';
-	}
-
-	public function getAllowedParams() {
-		return array();
-	}
-
-	/**
-	 * @deprecated since MediaWiki core 1.25
-	 */
-	public function getExamples() {
-		return array( 'api.php?action=fancycaptchareload&format=xml' );
-	}
-
-	/**
-	 * @see ApiBase::getExamplesMessages()
-	 */
-	protected function getExamplesMessages() {
-		return array(
-			'action=fancycaptchareload'
-				=> 'apihelp-fancycaptchareload-example-1',
-		);
-	}
-}
diff --git a/extensions/ConfirmEdit/FancyCaptcha/ApiFancyCaptchaReload.php b/extensions/ConfirmEdit/FancyCaptcha/ApiFancyCaptchaReload.php
new file mode 100644
index 00000000..8cd28631
--- /dev/null
+++ b/extensions/ConfirmEdit/FancyCaptcha/ApiFancyCaptchaReload.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Api module to reload FancyCaptcha
+ *
+ * @ingroup API
+ * @ingroup Extensions
+ */
+class ApiFancyCaptchaReload extends ApiBase {
+	public function execute() {
+		# Get a new FancyCaptcha form data
+		$captcha = new FancyCaptcha();
+		$captchaIndex = $captcha->getCaptchaIndex();
+
+		$result = $this->getResult();
+		$result->addValue( null, $this->getModuleName(), array ( 'index' => $captchaIndex ) );
+		return true;
+	}
+
+	/**
+	 * @deprecated since MediaWiki core 1.25
+	 */
+	public function getDescription() {
+		return 'Get a new FancyCaptcha.';
+	}
+
+	public function getAllowedParams() {
+		return array();
+	}
+
+	/**
+	 * @deprecated since MediaWiki core 1.25
+	 */
+	public function getExamples() {
+		return array( 'api.php?action=fancycaptchareload&format=xml' );
+	}
+
+	/**
+	 * @see ApiBase::getExamplesMessages()
+	 */
+	protected function getExamplesMessages() {
+		return array(
+			'action=fancycaptchareload'
+				=> 'apihelp-fancycaptchareload-example-1',
+		);
+	}
+}
diff --git a/extensions/ConfirmEdit/FancyCaptcha/extension.json b/extensions/ConfirmEdit/FancyCaptcha/extension.json
index 11b877be..dba07d9b 100644
--- a/extensions/ConfirmEdit/FancyCaptcha/extension.json
+++ b/extensions/ConfirmEdit/FancyCaptcha/extension.json
@@ -38,9 +38,7 @@
 		"localBasePath": "resources",
 		"remoteExtPath": "ConfirmEdit/FancyCaptcha/resources"
 	},
-	"callback": [
-		"ConfirmEditHooks::onFancyCaptchaSetup"
-	],
+	"callback": "ConfirmEditHooks::onFancyCaptchaSetup",
 	"config": {
 		"CaptchaClass": "FancyCaptcha",
 		"CaptchaFileBackend": "",
diff --git a/extensions/ConfirmEdit/ReCaptcha/extension.json b/extensions/ConfirmEdit/ReCaptcha/extension.json
index 5f97810a..79c90491 100644
--- a/extensions/ConfirmEdit/ReCaptcha/extension.json
+++ b/extensions/ConfirmEdit/ReCaptcha/extension.json
@@ -1,7 +1,7 @@
 {
 	"name": "ReCaptcha",
 	"ExtensionFunctions": [
-		"efReCaptcha"
+		"ConfirmEditHooks::efReCaptcha"
 	],
 	"MessagesDirs": {
 		"ReCaptcha": [
diff --git a/extensions/ConfirmEdit/includes/ConfirmEditHooks.php b/extensions/ConfirmEdit/includes/ConfirmEditHooks.php
index 5f9c3384..41c990f1 100644
--- a/extensions/ConfirmEdit/includes/ConfirmEditHooks.php
+++ b/extensions/ConfirmEdit/includes/ConfirmEditHooks.php
@@ -139,11 +139,36 @@ class ConfirmEditHooks {
 			$wgCaptchaDirectory = "$wgUploadDirectory/captcha";
 		}
 	}
+
 	/**
 	 * Callback for extension.json of ReCaptcha to require the recaptcha library php file.
 	 * FIXME: This should be done in a better way, e.g. only load the libraray, if really needed.
 	 */
 	public static function onReCaptchaSetup() {
-		require_once( "ReCaptcha/recaptchalib.php" );
+		require_once( __DIR__ . '/../ReCaptcha/recaptchalib.php' );
+	}
+
+	/**
+	 * Extension function, moved from ReCaptcha.php when that was decimated.
+	 * Make sure the keys are defined.
+	 */
+	public static function efReCaptcha() {
+		global $wgReCaptchaPublicKey, $wgReCaptchaPrivateKey;
+		global $recaptcha_public_key, $recaptcha_private_key;
+		global $wgServerName;
+
+		// Backwards compatibility
+		if ( $wgReCaptchaPublicKey == '' ) {
+			$wgReCaptchaPublicKey = $recaptcha_public_key;
+		}
+		if ( $wgReCaptchaPrivateKey == '' ) {
+			$wgReCaptchaPrivateKey = $recaptcha_private_key;
+		}
+
+		if ( $wgReCaptchaPublicKey == '' || $wgReCaptchaPrivateKey == '' ) {
+			die ( 'You need to set $wgReCaptchaPrivateKey and $wgReCaptchaPublicKey in LocalSettings.php to ' .
+				"use the reCAPTCHA plugin. You can sign up for a key <a href='" .
+				htmlentities( recaptcha_get_signup_url ( $wgServerName, "mediawiki" ) ) . "'>here</a>." );
+		}
 	}
 }
-- 
cgit v1.2.2