(bug 31363) Expand description URLs for thumbnails to canonical form

[lhc/web/wiklou.git] / includes / WikiMap.php

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 878e165..94907ad 100644 (file)
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -12,20 +12,21 @@ class WikiMap {
         * @return WikiReference object or null if the wiki was not found
         */
        public static function getWiki( $wikiID ) {
-               global $wgConf, $IP;
+               global $wgConf;
 
                $wgConf->loadFullData();
 
                list( $major, $minor ) = $wgConf->siteFromDB( $wikiID );
-               if( isset( $major ) ) {
-                       $server = $wgConf->get( 'wgServer', $wikiID, $major,
-                               array( 'lang' => $minor, 'site' => $major ) );
-                       $path = $wgConf->get( 'wgArticlePath', $wikiID, $major,
-                               array( 'lang' => $minor, 'site' => $major ) );
-                       return new WikiReference( $major, $minor, $server, $path );
-               } else {
+               if( $major === null ) {
                        return null;
                }
+               $canonicalServer = $wgConf->get( 'wgCanonicalServer', $wikiID, $major,
+                       array( 'lang' => $minor, 'site' => $major ) );
+               $server = $wgConf->get( 'wgServer', $wikiID, $major,
+                       array( 'lang' => $minor, 'site' => $major ) );
+               $path = $wgConf->get( 'wgArticlePath', $wikiID, $major,
+                       array( 'lang' => $minor, 'site' => $major ) );
+               return new WikiReference( $major, $minor, $canonicalServer, $path, $server );
        }
        
        /**
@@ -65,17 +66,16 @@ class WikiMap {
         * @return String: HTML link or false if the wiki was not found
         */
        public static function makeForeignLink( $wikiID, $page, $text=null ) {
-               global $wgUser;
-               $sk = $wgUser->getSkin();
-
-               if ( !$text )
+               if ( !$text ) {
                        $text = $page;
+               }
 
                $url = self::getForeignURL( $wikiID, $page );
-               if ( $url === false )
+               if ( $url === false ) {
                        return false;
+               }
 
-               return $sk->makeExternalLink( $url, $text );
+               return Linker::makeExternalLink( $url, $text );
        }
 
        /**
@@ -88,8 +88,9 @@ class WikiMap {
        public static function getForeignURL( $wikiID, $page ) {
                $wiki = WikiMap::getWiki( $wikiID );
                
-               if ( $wiki )
+               if ( $wiki ) {
                        return $wiki->getUrl( $page );
+               }
                        
                return false;
        }
@@ -101,21 +102,23 @@ class WikiMap {
 class WikiReference {
        private $mMinor; ///< 'en', 'meta', 'mediawiki', etc
        private $mMajor; ///< 'wiki', 'wiktionary', etc
-       private $mServer; ///< server override, 'www.mediawiki.org'
-       private $mPath;   ///< path override, '/wiki/$1'
+       private $mCanonicalServer; ///< canonical server URL, e.g. 'http://www.mediawiki.org'
+       private $mServer; ///< server URL, may be protocol-relative, e.g. '//www.mediawiki.org'
+       private $mPath;   ///< path, '/wiki/$1'
 
-       public function __construct( $major, $minor, $server, $path ) {
+       public function __construct( $major, $minor, $canonicalServer, $path, $server = null ) {
                $this->mMajor = $major;
                $this->mMinor = $minor;
-               $this->mServer = $server;
+               $this->mCanonicalServer = $canonicalServer;
                $this->mPath = $path;
+               $this->mServer = $server === null ? $canonicalServer : $server;
        }
 
        public function getHostname() {
                $prefixes = array( 'http://', 'https://' );
                foreach ( $prefixes as $prefix ) {
-                       if ( substr( $this->mServer, 0, strlen( $prefix ) ) ) {
-                               return substr( $this->mServer, strlen( $prefix ) );
+                       if ( substr( $this->mCanonicalServer, 0, strlen( $prefix ) ) ) {
+                               return substr( $this->mCanonicalServer, strlen( $prefix ) );
                        }
                }
                throw new MWException( "Invalid hostname for wiki {$this->mMinor}.{$this->mMajor}" );
@@ -129,17 +132,19 @@ class WikiReference {
         */
        public function getDisplayName() {
                $url = $this->getUrl( '' );
-               $url = preg_replace( '!^https?://!', '', $url );
-               $url = preg_replace( '!/index\.php(\?title=|/)$!', '/', $url );
-               $url = preg_replace( '!/wiki/$!', '/', $url );
-               $url = preg_replace( '!/$!', '', $url );
-               return $url;
+               $parsed = wfParseUrl( $url );
+               if ( $parsed ) {
+                       return $parsed['host'];
+               } else {
+                       // Invalid URL. There's no sane thing to do here, so just return it
+                       return $url;
+               }
        }
 
        /**
         * Helper function for getUrl()
         *
-        * @todo FIXME: this may be generalized...
+        * @todo FIXME: This may be generalized...
         * @param $page String: page name (must be normalised before calling this function!)
         * @return String: Url fragment
         */
@@ -148,12 +153,32 @@ class WikiReference {
        }
 
        /**
-        * Get a URL to a page on this foreign wiki
+        * Get a canonical (i.e. based on $wgCanonicalServer) URL to a page on this foreign wiki
         *
         * @param $page String: page name (must be normalised before calling this function!)
         * @return String: Url
         */
+       public function getCanonicalUrl( $page ) {
+               return
+                       $this->mCanonicalServer .
+                       $this->getLocalUrl( $page );
+       }
+       
+       /**
+        * Alias for getCanonicalUrl(), for backwards compatibility.
+        */
        public function getUrl( $page ) {
+               return $this->getCanonicalUrl( $page );
+       }
+       
+       /**
+        * Get a URL based on $wgServer, like Title::getFullUrl() would produce
+        * when called locally on the wiki.
+        * 
+        * @param $page String: page name (must be normalized before calling this function!)
+        * @return String: URL
+        */
+       public function getFullUrl( $page ) {
                return
                        $this->mServer .
                        $this->getLocalUrl( $page );