X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fuser%2FUser.php;h=7c32c3b5a2559891c2e6774f0c0b69a34ce0a640;hb=42b7a3bc8213ab219b47e24102d042b0c60c71e4;hp=bd1a642bf415410b5d7c6d574433feeae1cb8697;hpb=745de2274c376de39841a683cc702fe43e44f8c0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/user/User.php b/includes/user/User.php
index bd1a642bf4..7c32c3b5a2 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -20,12 +20,13 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\Session\Token;
 
 /**
  * String Some punctuation to prevent editing from broken text-mangling proxies.
- * @deprecated since 1.27, use \\MediaWiki\\Session\\Token::SUFFIX
+ * @deprecated since 1.27, use \MediaWiki\Session\Token::SUFFIX
  * @ingroup Constants
  */
 define( 'EDIT_TOKEN_SUFFIX', Token::SUFFIX );
@@ -54,7 +55,7 @@ class User implements IDBAccessObject {
 	/**
 	 * Global constant made accessible as class constants so that autoloader
 	 * magic can be used.
-	 * @deprecated since 1.27, use \\MediaWiki\\Session\\Token::SUFFIX
+	 * @deprecated since 1.27, use \MediaWiki\Session\Token::SUFFIX
 	 */
 	const EDIT_TOKEN_SUFFIX = EDIT_TOKEN_SUFFIX;
 
@@ -275,8 +276,8 @@ class User implements IDBAccessObject {
 	protected $mImplicitGroups;
 	/** @var array */
 	protected $mFormerGroups;
-	/** @var bool */
-	protected $mBlockedGlobally;
+	/** @var Block */
+	protected $mGlobalBlock;
 	/** @var bool */
 	protected $mLocked;
 	/** @var bool */
@@ -1070,9 +1071,9 @@ class User implements IDBAccessObject {
 		// Clean up name according to title rules,
 		// but only when validation is requested (bug 12654)
 		$t = ( $validate !== false ) ?
-			Title::newFromText( $name ) : Title::makeTitle( NS_USER, $name );
+			Title::newFromText( $name, NS_USER ) : Title::makeTitle( NS_USER, $name );
 		// Check for invalid titles
-		if ( is_null( $t ) ) {
+		if ( is_null( $t ) || $t->getNamespace() !== NS_USER || $t->isExternal() ) {
 			return false;
 		}
 
@@ -1534,7 +1535,8 @@ class User implements IDBAccessObject {
 		foreach ( LanguageConverter::$languagesWithVariants as $langCode ) {
 			$defOpt[$langCode == $wgContLang->getCode() ? 'variant' : "variant-$langCode"] = $langCode;
 		}
-		foreach ( SearchEngine::searchableNamespaces() as $nsnum => $nsname ) {
+		$namespaces = MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
+		foreach ( $namespaces as $nsnum => $nsname ) {
 			$defOpt['searchNs' . $nsnum] = !empty( $wgNamespacesToBeSearchedDefault[$nsnum] );
 		}
 		$defOpt['skin'] = Skin::normalizeKey( $wgDefaultSkin );
@@ -1992,8 +1994,22 @@ class User implements IDBAccessObject {
 	 * @return bool True if blocked, false otherwise
 	 */
 	public function isBlockedGlobally( $ip = '' ) {
-		if ( $this->mBlockedGlobally !== null ) {
-			return $this->mBlockedGlobally;
+		return $this->getGlobalBlock( $ip ) instanceof Block;
+	}
+
+	/**
+	 * Check if user is blocked on all wikis.
+	 * Do not use for actual edit permission checks!
+	 * This is intended for quick UI checks.
+	 *
+	 * @param string $ip IP address, uses current client if none given
+	 * @return Block|null Block object if blocked, null otherwise
+	 * @throws FatalError
+	 * @throws MWException
+	 */
+	public function getGlobalBlock( $ip = '' ) {
+		if ( $this->mGlobalBlock !== null ) {
+			return $this->mGlobalBlock ?: null;
 		}
 		// User is already an IP?
 		if ( IP::isIPAddress( $this->getName() ) ) {
@@ -2002,9 +2018,17 @@ class User implements IDBAccessObject {
 			$ip = $this->getRequest()->getIP();
 		}
 		$blocked = false;
-		Hooks::run( 'UserIsBlockedGlobally', [ &$this, $ip, &$blocked ] );
-		$this->mBlockedGlobally = (bool)$blocked;
-		return $this->mBlockedGlobally;
+		$block = null;
+		Hooks::run( 'UserIsBlockedGlobally', [ &$this, $ip, &$blocked, &$block ] );
+
+		if ( $blocked && $block === null ) {
+			// back-compat: UserIsBlockedGlobally didn't have $block param first
+			$block = new Block;
+			$block->setTarget( $ip );
+		}
+
+		$this->mGlobalBlock = $blocked ? $block : false;
+		return $this->mGlobalBlock ?: null;
 	}
 
 	/**
@@ -2694,14 +2718,36 @@ class User implements IDBAccessObject {
 			return Status::newGood( true );
 		}
 
+		$type = $oldaddr != '' ? 'changed' : 'set';
+		$notificationResult = null;
+
+		if ( $wgEmailAuthentication ) {
+			// Send the user an email notifying the user of the change in registered
+			// email address on their previous email address
+			if ( $type == 'changed' ) {
+				$change = $str != '' ? 'changed' : 'removed';
+				$notificationResult = $this->sendMail(
+					wfMessage( 'notificationemail_subject_' . $change )->text(),
+					wfMessage( 'notificationemail_body_' . $change,
+						$this->getRequest()->getIP(),
+						$this->getName(),
+						$str )->text()
+				);
+			}
+		}
+
 		$this->setEmail( $str );
 
 		if ( $str !== '' && $wgEmailAuthentication ) {
 			// Send a confirmation request to the new address if needed
-			$type = $oldaddr != '' ? 'changed' : 'set';
 			$result = $this->sendConfirmationMail( $type );
+
+			if ( $notificationResult !== null ) {
+				$result->merge( $notificationResult );
+			}
+
 			if ( $result->isGood() ) {
-				// Say to the caller that a confirmation mail has been sent
+				// Say to the caller that a confirmation and notification mail has been sent
 				$result->value = 'eauth';
 			}
 		} else {
@@ -4200,7 +4246,7 @@ class User implements IDBAccessObject {
 	 * @since 1.27
 	 * @param string|array $salt Array of Strings Optional function-specific data for hashing
 	 * @param WebRequest|null $request WebRequest object to use or null to use $wgRequest
-	 * @return MediaWiki\\Session\\Token The new edit token
+	 * @return MediaWiki\Session\Token The new edit token
 	 */
 	public function getEditTokenObject( $salt = '', $request = null ) {
 		if ( $this->isAnon() ) {
@@ -4230,7 +4276,7 @@ class User implements IDBAccessObject {
 
 	/**
 	 * Get the embedded timestamp from a token.
-	 * @deprecated since 1.27, use \\MediaWiki\\Session\\Token::getTimestamp instead.
+	 * @deprecated since 1.27, use \MediaWiki\Session\Token::getTimestamp instead.
 	 * @param string $val Input token
 	 * @return int|null
 	 */