Update to MediaWiki 1.21.1

1 files changed, 182 insertions, 0 deletions

diff --git a/extensions/TitleBlacklist/TitleBlacklist.hooks.php b/extensions/TitleBlacklist/TitleBlacklist.hooks.php
new file mode 100644
index 00000000..f0e8ce13
--- /dev/null
+++ b/extensions/TitleBlacklist/TitleBlacklist.hooks.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Hooks for Title Blacklist
+ * @author Victor Vasiliev
+ * @copyright © 2007-2010 Victor Vasiliev et al
+ * @license GNU General Public License 2.0 or later
+ */
+
+/**
+ * Hooks for the TitleBlacklist class
+ *
+ * @ingroup Extensions
+ */
+class TitleBlacklistHooks {
+
+	/**
+	 * getUserPermissionsErrorsExpensive hook
+	 *
+	 * @param $title Title
+	 * @param $user User
+	 * @param $action
+	 * @param $result
+	 * @return bool
+	 */
+	public static function userCan( $title, $user, $action, &$result ) {
+		# Some places check createpage, while others check create.
+		# As it stands, upload does createpage, but normalize both
+		# to the same action, to stop future similar bugs.
+		if ( $action === 'createpage' || $action === 'createtalk' ) {
+			$action = 'create';
+		}
+		if ( $action == 'create' || $action == 'edit' || $action == 'upload' ) {
+			$blacklisted = TitleBlacklist::singleton()->userCannot( $title, $user, $action );
+			if ( $blacklisted instanceof TitleBlacklistEntry ) {
+				$result = array( $blacklisted->getErrorMessage( 'edit' ),
+					htmlspecialchars( $blacklisted->getRaw() ),
+					$title->getFullText() );
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * AbortMove hook
+	 *
+	 * @param $old Title
+	 * @param $nt Title
+	 * @param $user User
+	 * @param $err
+	 * @return bool
+	 */
+	public static function abortMove( $old, $nt, $user, &$err ) {
+		$titleBlacklist = TitleBlacklist::singleton();
+		$blacklisted = $titleBlacklist->userCannot( $nt, $user, 'move' );
+		if ( !$blacklisted ) {
+			$blacklisted = $titleBlacklist->userCannot( $old, $user, 'edit' );
+		}
+		if ( $blacklisted instanceof TitleBlacklistEntry ) {
+			$err = wfMessage( $blacklisted->getErrorMessage( 'move' ),
+				$blacklisted->getRaw(),
+				$old->getFullText(),
+				$nt->getFullText() )->parse();
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check whether a user name is acceptable,
+	 * and set a message if unacceptable.
+	 *
+	 * Used by abortNewAccount and centralAuthAutoCreate
+	 *
+	 * @return bool Acceptable
+	 */
+	private static function acceptNewUserName( $userName, $permissionsUser, &$err, $override = true ) {
+		$title = Title::makeTitleSafe( NS_USER, $userName );
+		$blacklisted = TitleBlacklist::singleton()->userCannot( $title, $permissionsUser,
+			'new-account', $override );
+		if ( $blacklisted instanceof TitleBlacklistEntry ) {
+			$message = $blacklisted->getErrorMessage( 'new-account' );
+			$err = wfMessage( $message, $blacklisted->getRaw(), $userName )->parse();
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * AbortNewAccount hook
+	 *
+	 * @param User $user
+	 */
+	public static function abortNewAccount( $user, &$message ) {
+		global $wgUser, $wgRequest;
+		$override = $wgRequest->getCheck( 'wpIgnoreTitleBlacklist' );
+		return self::acceptNewUserName( $user->getName(), $wgUser, $message, $override );
+	}
+
+	/** CentralAuthAutoCreate hook */
+	public static function centralAuthAutoCreate( $user, $userName ) {
+		$message = ''; # Will be ignored
+		$anon = new User;
+		return self::acceptNewUserName( $userName, $anon, $message );
+	}
+
+	/**
+	 * EditFilter hook
+	 *
+	 * @param $editor EditPage
+	 */
+	public static function validateBlacklist( $editor, $text, $section, &$error ) {
+		global $wgUser;
+		$title = $editor->mTitle;
+
+		if ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDBkey() == 'Titleblacklist' ) {
+
+			$blackList = TitleBlacklist::singleton();
+			$bl = $blackList->parseBlacklist( $text, 'page' );
+			$ok = $blackList->validate( $bl );
+			if ( count( $ok ) == 0 ) {
+				return true;
+			}
+
+			$errmsg = wfMessage( 'titleblacklist-invalid' )->numParams( count( $ok ) )->text();
+			$errlines = '* <code>' . implode( "</code>\n* <code>", array_map( 'wfEscapeWikiText', $ok ) ) . '</code>';
+			$error = Html::openElement( 'div', array( 'class' => 'errorbox' ) ) .
+				$errmsg .
+				"\n" .
+				$errlines .
+				Html::closeElement( 'div' ) . "\n" .
+				Html::element( 'br', array( 'clear' => 'all' ) ) . "\n";
+
+			// $error will be displayed by the edit class
+			return true;
+		} elseif ( !$section ) {
+			# Block redirects to nonexistent blacklisted titles
+			$retitle = Title::newFromRedirect( $text );
+			if ( $retitle !== null && !$retitle->exists() )  {
+				$blacklisted = TitleBlacklist::singleton()->userCannot( $retitle, $wgUser, 'create' );
+				if ( $blacklisted instanceof TitleBlacklistEntry ) {
+					$error = Html::openElement( 'div', array( 'class' => 'errorbox' ) ) .
+						wfMessage( 'titleblacklist-forbidden-edit',
+							$blacklisted->getRaw(),
+							$retitle->getFullText() )->escaped() .
+						Html::closeElement( 'div' ) . "\n" .
+						Html::element( 'br', array( 'clear' => 'all' ) ) . "\n";
+				}
+			}
+
+			return true;
+		}
+		return true;
+	}
+
+	/**
+	 * ArticleSaveComplete hook
+	 *
+	 * @param Article $article
+	 */
+	public static function clearBlacklist( &$article, &$user,
+		$text, $summary, $isminor, $iswatch, $section )
+	{
+		$title = $article->getTitle();
+		if ( $title->getNamespace() == NS_MEDIAWIKI && $title->getDBkey() == 'Titleblacklist' ) {
+			TitleBlacklist::singleton()->invalidate();
+		}
+		return true;
+	}
+
+	/** UserCreateForm hook based on the one from AntiSpoof extension */
+	public static function addOverrideCheckbox( &$template ) {
+		global $wgRequest, $wgUser;
+
+		if ( TitleBlacklist::userCanOverride( $wgUser, 'new-account' ) ) {
+			$template->addInputItem( 'wpIgnoreTitleBlacklist',
+				$wgRequest->getCheck( 'wpIgnoreTitleBlacklist' ),
+				'checkbox', 'titleblacklist-override' );
+		}
+		return true;
+	}
+}