X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FWikiMap.php;h=4f3c461699faf148342019f4cd387f6d87e8796b;hb=d19826aa35b206847a568a4b2c1c9ffaa615fca5;hp=0f479ace61df1fcd5d0565214822e9ff1a5d92e7;hpb=d42d6bd868fd5b579080639995e6a7e23851fcf3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 0f479ace61..4f3c461699 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -20,8 +20,10 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
- * Helper tools for dealing with other wikis.
+ * Helper tools for dealing with other locally-hosted wikis.
  */
 class WikiMap {
 
@@ -81,7 +83,7 @@ class WikiMap {
 	 * @return WikiReference|null WikiReference object or null if the wiki was not found
 	 */
 	private static function getWikiWikiReferenceFromSites( $wikiID ) {
-		$siteLookup = \MediaWiki\MediaWikiServices::getInstance()->getSiteLookup();
+		$siteLookup = MediaWikiServices::getInstance()->getSiteLookup();
 		$site = $siteLookup->getSite( $wikiID );
 
 		if ( !$site instanceof MediaWikiSite ) {
@@ -115,7 +117,7 @@ class WikiMap {
 	 * @return string|int Wiki's name or $wiki_id if the wiki was not found
 	 */
 	public static function getWikiName( $wikiID ) {
-		$wiki = WikiMap::getWiki( $wikiID );
+		$wiki = self::getWiki( $wikiID );
 
 		if ( $wiki ) {
 			return $wiki->getDisplayName();
@@ -166,7 +168,7 @@ class WikiMap {
 	 * @return string|bool URL or false if the wiki was not found
 	 */
 	public static function getForeignURL( $wikiID, $page, $fragmentId = null ) {
-		$wiki = WikiMap::getWiki( $wikiID );
+		$wiki = self::getWiki( $wikiID );
 
 		if ( $wiki ) {
 			return $wiki->getFullUrl( $page, $fragmentId );
@@ -174,107 +176,67 @@ class WikiMap {
 
 		return false;
 	}
-}
-
-/**
- * Reference to a locally-hosted wiki
- */
-class WikiReference {
-	private $mCanonicalServer; ///< canonical server URL, e.g. 'https://www.mediawiki.org'
-	private $mServer; ///< server URL, may be protocol-relative, e.g. '//www.mediawiki.org'
-	private $mPath; ///< path, '/wiki/$1'
 
 	/**
-	 * @param string $canonicalServer
-	 * @param string $path
-	 * @param null|string $server
-	 */
-	public function __construct( $canonicalServer, $path, $server = null ) {
-		$this->mCanonicalServer = $canonicalServer;
-		$this->mPath = $path;
-		$this->mServer = $server === null ? $canonicalServer : $server;
-	}
-
-	/**
-	 * Get the URL in a way to be displayed to the user
-	 * More or less Wikimedia specific
+	 * Get canonical server info for all local wikis in the map that have one
 	 *
-	 * @return string
+	 * @return array Map of (local wiki ID => map of (url,parts))
+	 * @since 1.30
 	 */
-	public function getDisplayName() {
-		$parsed = wfParseUrl( $this->mCanonicalServer );
-		if ( $parsed ) {
-			return $parsed['host'];
-		} else {
-			// Invalid server spec.
-			// There's no sane thing to do here, so just return the canonical server name in full.
-			return $this->mCanonicalServer;
-		}
+	public static function getCanonicalServerInfoForAllWikis() {
+		$cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
+
+		return $cache->getWithSetCallback(
+			$cache->makeGlobalKey( 'wikimap', 'canonical-urls' ),
+			$cache::TTL_DAY,
+			function () {
+				global $wgLocalDatabases, $wgCanonicalServer;
+
+				$infoMap = [];
+				// Make sure at least the current wiki is set, for simple configurations.
+				// This also makes it the first in the map, which is useful for common cases.
+				$infoMap[wfWikiID()] = [
+					'url' => $wgCanonicalServer,
+					'parts' => wfParseUrl( $wgCanonicalServer )
+				];
+
+				foreach ( $wgLocalDatabases as $wikiId ) {
+					$wikiReference = self::getWiki( $wikiId );
+					if ( $wikiReference ) {
+						$url = $wikiReference->getCanonicalServer();
+						$infoMap[$wikiId] = [ 'url' => $url, 'parts' => wfParseUrl( $url ) ];
+					}
+				}
+
+				return $infoMap;
+			}
+		);
 	}
 
 	/**
-	 * Helper function for getUrl()
-	 *
-	 * @todo FIXME: This may be generalized...
-	 *
-	 * @param string $page Page name (must be normalised before calling this function!
-	 *  May contain a section part.)
-	 * @param string|null $fragmentId
-	 *
-	 * @return string relative URL, without the server part.
+	 * @param string $url
+	 * @return bool|string Wiki ID or false
+	 * @since 1.30
 	 */
-	private function getLocalUrl( $page, $fragmentId = null ) {
-		$page = wfUrlencode( str_replace( ' ', '_', $page ) );
-
-		if ( is_string( $fragmentId ) && $fragmentId !== '' ) {
-			$page .= '#' . wfUrlencode( $fragmentId );
+	public static function getWikiFromUrl( $url ) {
+		$urlPartsCheck = wfParseUrl( $url );
+		if ( $urlPartsCheck === false ) {
+			return false;
 		}
 
-		return str_replace( '$1', $page, $this->mPath );
-	}
-
-	/**
-	 * Get a canonical (i.e. based on $wgCanonicalServer) URL to a page on this foreign wiki
-	 *
-	 * @param string $page Page name (must be normalised before calling this function!)
-	 * @param string|null $fragmentId
-	 *
-	 * @return string Url
-	 */
-	public function getCanonicalUrl( $page, $fragmentId = null ) {
-		return $this->mCanonicalServer . $this->getLocalUrl( $page, $fragmentId );
-	}
-
-	/**
-	 * Get a canonical server URL
-	 * @return string
-	 */
-	public function getCanonicalServer() {
-		return $this->mCanonicalServer;
-	}
-
-	/**
-	 * Alias for getCanonicalUrl(), for backwards compatibility.
-	 * @param string $page
-	 * @param string|null $fragmentId
-	 *
-	 * @return string
-	 */
-	public function getUrl( $page, $fragmentId = null ) {
-		return $this->getCanonicalUrl( $page, $fragmentId );
-	}
+		$urlPartsCheck = array_intersect_key( $urlPartsCheck, [ 'host' => 1, 'port' => 1 ] );
+		foreach ( self::getCanonicalServerInfoForAllWikis() as $wikiId => $info ) {
+			$urlParts = $info['parts'];
+			if ( $urlParts === false ) {
+				continue; // sanity
+			}
+
+			$urlParts = array_intersect_key( $urlParts, [ 'host' => 1, 'port' => 1 ] );
+			if ( $urlParts == $urlPartsCheck ) {
+				return $wikiId;
+			}
+		}
 
-	/**
-	 * Get a URL based on $wgServer, like Title::getFullURL() would produce
-	 * when called locally on the wiki.
-	 *
-	 * @param string $page Page name (must be normalized before calling this function!)
-	 * @param string|null $fragmentId
-	 *
-	 * @return string URL
-	 */
-	public function getFullUrl( $page, $fragmentId = null ) {
-		return $this->mServer .
-			$this->getLocalUrl( $page, $fragmentId );
+		return false;
 	}
 }