(bug 14869) Allow access to QueryPage-based special pages via API
[lhc/web/wiklou.git] / includes / specials / SpecialVersion.php
index 8c8e386..da0ec1c 100644 (file)
@@ -1,42 +1,41 @@
 <?php
-/**#@+
+
+/**
  * Give information about the version of MediaWiki, PHP, the DB and extensions
  *
- * @file
  * @ingroup SpecialPage
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
-
-/**
- * constructor
- */
-function wfSpecialVersion() {
-       $version = new SpecialVersion;
-       $version->execute();
-}
-
-/**
- * @ingroup SpecialPage
- */
-class SpecialVersion {
+class SpecialVersion extends SpecialPage {
        private $firstExtOpened = true;
 
+       function __construct(){
+               parent::__construct( 'Version' );       
+       }
+
        /**
         * main()
         */
-       function execute() {
-               global $wgOut, $wgMessageCache, $wgSpecialVersionShowHooks;
+       function execute( $par ) {
+               global $wgOut, $wgMessageCache, $wgSpecialVersionShowHooks, $wgContLang;
                $wgMessageCache->loadAllMessages();
 
-               $wgOut->addHTML( '<div dir="ltr">' );
+               $this->setHeaders();
+               $this->outputHeader();
+
+               if( $wgContLang->isRTL() ) {
+                       $wgOut->addHTML( '<div dir="rtl">' );
+               } else {
+                       $wgOut->addHTML( '<div dir="ltr">' );
+               }
                $text = 
                        $this->MediaWikiCredits() .
                        $this->softwareInformation() .
                        $this->extensionCredits();
-               if  ( $wgSpecialVersionShowHooks ) {
+               if ( $wgSpecialVersionShowHooks ) {
                        $text .= $this->wgHooks();
                }
                $wgOut->addWikiText( $text );
@@ -44,6 +43,18 @@ class SpecialVersion {
                $wgOut->addHTML( '</div>' );
        }
 
+       /**
+        * execuate command for output
+        * @param string command
+        * @return string output
+        */
+       static function execOutput( $cmd ) {
+               $out = array( $cmd );
+               exec( $cmd.' 2>&1', $out );
+               unset($out[0]);
+               return implode("\n", $out );
+       }
+
        /**#@+
         * @private
         */
@@ -52,10 +63,15 @@ class SpecialVersion {
         * @return wiki text showing the license information
         */
        static function MediaWikiCredits() {
-               $ret = Xml::element( 'h2', array( 'id' => 'mw-version-license' ), wfMsg( 'version-license' ) ) .
-               "__NOTOC__
+               global $wgContLang;
+
+               $ret = Xml::element( 'h2', array( 'id' => 'mw-version-license' ), wfMsg( 'version-license' ) );
+
+               // This text is always left-to-right.
+               $ret .= '<div dir="ltr">';
+               $ret .= "__NOTOC__
                This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''',
-               copyright (C) 2001-2008 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
+               copyright © 2001-2009 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
                Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason,
                Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor,
                Aaron Schulz and others.
@@ -75,6 +91,7 @@ class SpecialVersion {
                Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
                or [http://www.gnu.org/licenses/old-licenses/gpl-2.0.html read it online].
                ";
+               $ret .= '</div>';
 
                return str_replace( "\t\t", '', $ret ) . "\n";
        }
@@ -83,27 +100,227 @@ class SpecialVersion {
         * @return wiki text showing the third party software versions (apache, php, mysql).
         */
        static function softwareInformation() {
+               global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgDiff3, $wgDiff, $wgUseTeX;
+               global $wgAllowTitlesInSVG, $wgSVGConverter, $wgSVGConverters, $wgSVGConverterPath;
                $dbr = wfGetDB( DB_SLAVE );
 
-               return Xml::element( 'h2', array( 'id' => 'mw-version-software' ), wfMsg( 'version-software' ) ) .
-                       Xml::openElement( 'table', array( 'id' => 'sv-software' ) ) .
+               // Get the web server name and its version, if applicable
+               // Chop off PHP text from the string if it has the text desired
+               $serverSoftware = $_SERVER['SERVER_SOFTWARE'];
+               if ( strrpos( $serverSoftware, 'PHP' ) === false ) {
+               } else {
+                       $serverSoftware = trim( substr( $serverSoftware, 0, strrpos($serverSoftware,'PHP') - 1 ) );
+               }
+
+               // Get the web server name and its version.
+               $serverSoftwareLine = explode('/',$serverSoftware);
+               $serverSoftwareName = $serverSoftwareLine[0];
+
+               // Insert the website of the web server if applicable.
+               if ( stristr( $serverSoftwareName, 'Apache' ) )
+                       $serverSoftwareURL = 'http://httpd.apache.org/';
+               else if ( stristr( $serverSoftwareName, 'IIS' ) )
+                       $serverSoftwareURL = 'http://www.microsoft.com/iis/';
+               else if ( stristr( $serverSoftwareName, 'Cherokee' ) )
+                       $serverSoftwareURL = 'http://www.cherokee-project.com/';
+               else if ( stristr( $serverSoftwareName, 'lighttpd' ) )
+                       $serverSoftwareURL = 'http://www.lighttpd.net/';
+               else if ( stristr( $serverSoftwareName, 'Sun' ) )
+                       $serverSoftwareURL = 'http://www.sun.com/software/products/web_srvr/';
+
+               // Get the version of the web server. If does not have one,
+               // leave it as empty.
+               if ( $serverSoftwareLine[1] != '' ) {
+                       $serverSoftwareVersion = $serverSoftwareLine[1];
+               } else {
+                       $serverSoftwareVersion = '';
+               }
+
+               // Put the software in an array of form 'name' => 'version'. All messages should
+               // be loaded here, so feel free to use wfMsg*() in the 'name'. Raw HTML or wikimarkup
+               // can be used
+               $software = array();
+               $software['[http://www.mediawiki.org/ MediaWiki]'] = self::getVersionLinked();
+               if ( isset( $serverSoftwareURL ) )
+                       $software["[$serverSoftwareURL $serverSoftwareName]"] = $serverSoftwareVersion;
+               else
+                       $software[$serverSoftwareName] = $serverSoftwareVersion;
+               $software['[http://www.php.net/ PHP]'] = phpversion() . " (" . php_sapi_name() . ")";
+               $software[$dbr->getSoftwareLink()] = $dbr->getServerVersion();
+
+               // Version information for diff3
+               if ( file_exists( trim( $wgDiff3, '"' ) ) ) {
+                       $swDiff3Info = self::execOutput( $wgDiff3 . ' -v' );
+                       $swDiff3Line = explode("\n",$swDiff3Info ,2);
+                       $swDiff3Ver = $swDiff3Line[0];
+                       $swDiff3Ver = str_replace( 'diff3 (GNU diffutils) ', '' , $swDiff3Ver);
+                       $software['[http://www.gnu.org/software/diffutils/diffutils.html diff3]'] = $swDiff3Ver;
+               }
+
+               // Version information for diff
+               if ( file_exists( trim( $wgDiff, '"' ) ) ) {
+                       $swDiffInfo = self::execOutput( $wgDiff . ' -v' );
+                       $swDiffLine = explode("\n",$swDiffInfo ,2);
+                       $swDiffVer = $swDiffLine[0];
+                       $swDiffVer = str_replace( 'diff (GNU diffutils) ', '' , $swDiffVer);
+                       $software['[http://www.gnu.org/software/diffutils/diffutils.html diff]'] = $swDiffVer;
+               }
+
+               // Look for ImageMagick's version, if did not found, try to find the GD library version
+               if ( $wgUseImageMagick ) {
+                       if ( file_exists( trim( $wgImageMagickConvertCommand, '"' ) ) ) {
+                               $swImageMagickInfo = self::execOutput( $wgImageMagickConvertCommand . ' -version' );
+                               list( $head, $tail ) = explode( 'ImageMagick', $swImageMagickInfo );
+                               list( $swImageMagickVer ) = explode('http://www.imagemagick.org', $tail );
+                               $software['[http://www.imagemagick.org/ ImageMagick]'] = $swImageMagickVer;
+                       }
+               } else {
+                       if( function_exists( 'gd_info' ) ) {
+                               $gdInfo = gd_info();
+                               if ( strstr( $gdInfo['GD Version'], 'bundled' ) != false ) {
+                                       $gd_URL = 'http://www.php.net/gd';
+                               }
+                               else {
+                                       $gd_URL = 'http://www.libgd.org';
+                               }
+                               $software['[' . $gd_URL . ' GD library]'] = $gdInfo['GD Version'];
+                       }
+               }
+
+               // Look for SVG converter and print the version info
+               if ( $wgAllowTitlesInSVG ) {
+                       $swSVGConvName = $wgSVGConverter;
+                       $haveSVGConvVer = false;
+                       $pathVar = '$path/';
+                       $binPath = '/usr/bin/';
+                       $execPath = strtok(strstr($wgSVGConverters[$wgSVGConverter],$pathVar), ' ');
+                       $execPath = substr_replace($execPath, '', 0, strlen($pathVar));
+                       $execFullPath = trim($wgSVGConverterPath,'"') . $execPath;
+                       $execBinPath = $binPath . $execPath;
+                       if (strstr($execFullPath, ' ') != false) {
+                               $execFullPath = '"' . $execFullPath . '"';
+                       }
+                       if ( !strcmp( $wgSVGConverter, 'ImageMagick') ) {
+                               // Get version info for ImageMagick
+                               if ( file_exists( $execBinPath ) )
+                                       $swSVGConvInfo = self::execOutput( $execBinPath . ' -version' );
+                               else if ( file_exists( trim( $execFullPath, '"' ) ) || ( file_exists( trim( $execFullPath, '"' ) . '.exe' ) ) )
+                                       $swSVGConvInfo = self::execOutput( $execFullPath . ' -version' );
+                               list( $head, $tail ) = explode( 'ImageMagick', $swSVGConvInfo );
+                               list( $swSVGConvVer ) = explode('http://www.imagemagick.org', $tail );
+                               $swSVGConvURL = 'http://www.imagemagick.org/';
+                               $haveSVGConvVer = true;
+                       } else if ( strstr ($execFullPath, 'rsvg') != false ) {
+                               // Get version info for rsvg
+                               if ( file_exists( $execBinPath ) )
+                                       $swSVGConvInfo = self::execOutput( $execBinPath . ' -v' );
+                               else if ( file_exists( trim( $execFullPath, '"' ) ) || ( file_exists( trim( $execFullPath, '"' ) . '.exe' ) ) )
+                                       $swSVGConvInfo = self::execOutput( $execFullPath . ' -v' );
+                               $swSVGConvLine = explode("\n",$swSVGConvInfo ,2);
+                               $swSVGConvVer = $swSVGConvLine[0];
+                               $swSVGConvURL = 'http://librsvg.sourceforge.net/';
+                               $haveSVGConvVer = true;
+                       } else if ( strstr ($execFullPath, 'inkscape') != false ) {
+                               // Get version info for Inkscape
+                               if ( file_exists( $execBinPath ) )
+                                       $swSVGConvInfo = self::execOutput( $execBinPath . ' -z -V' );
+                               else if ( file_exists( trim( $execFullPath, '"' ) ) || ( file_exists( trim( $execFullPath, '"' ) . '.exe' ) ) )
+                                       $swSVGConvInfo = self::execOutput( $execFullPath . ' -z -V' );
+                               $swSVGConvLine = explode("\n",$swSVGConvInfo ,2);
+                               $swSVGConvVer = ltrim( $swSVGConvLine[0], 'Inkscape ' );
+                               $swSVGConvURL = 'http://www.inkscape.org/';
+                               $swSVGConvName = ucfirst( $wgSVGConverter );
+                               $haveSVGConvVer = true;
+                       }
+                       if ( $haveSVGConvVer )
+                               $software["[$swSVGConvURL $swSVGConvName]"] = $swSVGConvVer;
+               }
+
+               // Look for TeX support and print the software version info
+               if ( $wgUseTeX ) {
+                       $binPath = '/usr/bin/';
+                       $swMathName = Array(
+                               'ocaml'       => 'OCaml',
+                               'gs'          => 'Ghostscript',
+                               'dvips'       => 'Dvips',
+                               'latex'       => 'LaTeX',
+                               'imagemagick' => 'ImageMagick',
+                       );
+                       $swMathURL = Array(
+                               'ocaml'       => 'http://caml.inria.fr/',
+                               'gs'          => 'http://www.ghostscript.com/',
+                               'dvips'       => 'http://www.radicaleye.com/dvips.html',
+                               'latex'       => 'http://www.latex-project.org/',
+                               'imagemagick' => 'http://www.imagemagick.org/',
+                       );
+                       $swMathExec = Array(
+                               'ocaml'       => 'ocamlc',
+                               'gs'          => 'gs',
+                               'dvips'       => 'dvips',
+                               'latex'       => 'latex',
+                               'imagemagick' => 'convert',
+                       );
+                       $swMathParam = Array(
+                               'ocaml'       => '-version',
+                               'gs'          => '-v',
+                               'dvips'       => '-v',
+                               'latex'       => '-v',
+                               'imagemagick' => '-version',
+                       );
+                       foreach ( $swMathExec as $swMath => $swMathCmd ) {
+                               $wBinPath = '';
+                               if ( file_exists( $binPath . 'whereis' ) ) {
+                                       $swWhereIsInfo = self::execOutput( $binPath . 'whereis -b ' . $swMathCmd );
+                                       $swWhereIsLine = explode( "\n", $swWhereIsInfo, 2);
+                                       $swWhereIsFirstLine = $swWhereIsLine[0];
+                                       $swWhereIsBinPath = explode( ' ', $swWhereIsFirstLine, 3);
+                                       if ( count( $swWhereIsBinPath ) > 1 )
+                                               $wBinPath = dirname( $swWhereIsBinPath[1] );
+                               } else {
+                                       $swPathLine = explode( ';', $_SERVER['PATH'] );
+                                       $swPathFound = false;
+                                       foreach( $swPathLine as $swPathDir ) {
+                                               if ( file_exists( $swPathDir . '/' . $swMathCmd . '.exe' ) && ($swPathFound === false) ) {
+                                                       $wBinPath = $swPathDir . '/';
+                                                       $swPathFound = true;
+                                               }
+                                       }
+                               }
+                               if ( file_exists( $binPath . $swMathCmd ) || file_exists( $wBinPath . $swMathCmd ) ) {
+                                       $swMathInfo = self::execOutput( $swMathCmd . ' ' . $swMathParam[$swMath] );
+                                       $swMathLine = explode( "\n", $swMathInfo, 2);
+                                       $swMathVerInfo = $swMathLine[0];
+                                       if ( !strcmp( $swMath, 'gs' ) )
+                                               $swMathVerInfo = str_replace( 'GPL Ghostscript ', '', $swMathVerInfo );
+                                       else if ( !strcmp( $swMath, 'dvips' ) ) {
+                                               $swMathVerParts = explode( ' ' , $swMathVerInfo );
+                                               $swMathVerInfo = $swMathVerParts[3];
+                                       } else if ( !strcmp( $swMath, 'imagemagick' ) ) {
+                                               list( $head, $tail ) = explode( 'ImageMagick', $swMathVerInfo );
+                                               list( $swMathVerInfo ) = explode('http://www.imagemagick.org', $tail );
+                                       }
+                                       $swMathVer[$swMath] = trim( $swMathVerInfo );
+                                       $software["[$swMathURL[$swMath] $swMathName[$swMath]]"] = $swMathVer[$swMath];
+                               }       
+                       }
+               }
+
+               // Allow a hook to add/remove items
+               wfRunHooks( 'SoftwareInfo', array( &$software ) );
+
+               $out = Xml::element( 'h2', array( 'id' => 'mw-version-software' ), wfMsg( 'version-software' ) ) .
+                          Xml::openElement( 'table', array( 'class' => 'wikitable', 'id' => 'sv-software' ) ) .
                                "<tr>
                                        <th>" . wfMsg( 'version-software-product' ) . "</th>
                                        <th>" . wfMsg( 'version-software-version' ) . "</th>
-                               </tr>\n
-                               <tr>
-                                       <td>[http://www.mediawiki.org/ MediaWiki]</td>
-                                       <td>" . self::getVersionLinked() . "</td>
-                               </tr>\n
-                               <tr>
-                                       <td>[http://www.php.net/ PHP]</td>
-                                       <td>" . phpversion() . " (" . php_sapi_name() . ")</td>
-                               </tr>\n
-                               <tr>
-                                       <td>" . $dbr->getSoftwareLink() . "</td>
-                                       <td>" . $dbr->getServerVersion() . "</td>
-                               </tr>\n" .
-                       Xml::closeElement( 'table' );
+                               </tr>\n";
+               foreach( $software as $name => $version ) {
+                       $out .= "<tr>
+                                       <td>" . $name . "</td>
+                                       <td>" . $version . "</td>
+                               </tr>\n";
+               }               
+               return $out . Xml::closeElement( 'table' );
        }
 
        /**
@@ -111,11 +328,18 @@ class SpecialVersion {
         *
         * @return mixed
         */
-       public static function getVersion() {
+       public static function getVersion( $flags = ''  ) {
                global $wgVersion, $IP;
                wfProfileIn( __METHOD__ );
-               $svn = self::getSvnRevision( $IP );
-               $version = $svn ? "$wgVersion (r$svn)" : $wgVersion;
+               $svn = self::getSvnRevision( $IP, false, false , false );
+               $svnCo = self::getSvnRevision( $IP, true, false , false );
+               if ( !$svn ) {
+                       $version = $wgVersion;
+               } elseif( $flags === 'nodb' ) {
+                       $version = "$wgVersion (r$svnCo)";
+               } else {
+                       $version = $wgVersion . wfMsg( 'version-svn-revision', $svn, $svnCo );
+               }
                wfProfileOut( __METHOD__ );
                return $version;
        }
@@ -129,9 +353,13 @@ class SpecialVersion {
        public static function getVersionLinked() {
                global $wgVersion, $IP;
                wfProfileIn( __METHOD__ );
-               $svn = self::getSvnRevision( $IP );
-               $viewvc = 'http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/?pathrev=';
-               $version = $svn ? "$wgVersion ([{$viewvc}{$svn} r$svn])" : $wgVersion;
+               $svn = self::getSvnRevision( $IP, false, false, false );
+               $svnCo = self::getSvnRevision( $IP, true, false, false );
+               $svnDir = self::getSvnRevision( $IP, true, false, true );
+               $viewvcStart = 'http://svn.wikimedia.org/viewvc/mediawiki/';
+               $viewvcEnd = '/?pathrev=';
+               $viewvc = $viewvcStart . $svnDir .  $viewvcEnd;
+               $version = $svn ? $wgVersion . " [{$viewvc}{$svnCo} " . wfMsg( 'version-svn-revision', $svn, $svnCo ) . ']' : $wgVersion;
                wfProfileOut( __METHOD__ );
                return $version;
        }
@@ -153,7 +381,7 @@ class SpecialVersion {
                wfRunHooks( 'SpecialVersionExtensionTypes', array( &$this, &$extensionTypes ) );
 
                $out = Xml::element( 'h2', array( 'id' => 'mw-version-ext' ), wfMsg( 'version-extensions' ) ) .
-                       Xml::openElement( 'table', array( 'id' => 'sv-ext' ) );
+                       Xml::openElement( 'table', array( 'class' => 'wikitable', 'id' => 'sv-ext' ) );
 
                foreach ( $extensionTypes as $type => $text ) {
                        if ( isset ( $wgExtensionCredits[$type] ) && count ( $wgExtensionCredits[$type] ) ) {
@@ -162,24 +390,31 @@ class SpecialVersion {
                                usort( $wgExtensionCredits[$type], array( $this, 'compare' ) );
 
                                foreach ( $wgExtensionCredits[$type] as $extension ) {
+                                       $version = null;
+                                       $subVersion = null;
+                                       $subVersionCo = null;
+                                       $viewvc = null;
+                                       if ( isset( $extension['path'] ) ) {
+                                               $subVersion = self::getSvnRevision(dirname($extension['path']), false, true, false);
+                                               $subVersionCo = self::getSvnRevision(dirname($extension['path']), true, true, false);
+                                               $subVersionDir = self::getSvnRevision(dirname($extension['path']), false, true, true);
+                                               if ($subVersionDir)
+                                                       $viewvc = $subVersionDir . $subVersionCo;
+                                       }
                                        if ( isset( $extension['version'] ) ) {
                                                $version = $extension['version'];
-                                       } elseif ( isset( $extension['svn-revision'] ) && 
-                                               preg_match( '/\$(?:Rev|LastChangedRevision|Revision): *(\d+)/', 
-                                                       $extension['svn-revision'], $m ) ) 
-                                       {
-                                               $version = 'r' . $m[1];
-                                       } else {
-                                               $version = null;
                                        }
 
                                        $out .= $this->formatCredits(
                                                isset ( $extension['name'] )           ? $extension['name']        : '',
                                                $version,
+                                               $subVersion,
+                                               $subVersionCo,
+                                               $viewvc,
                                                isset ( $extension['author'] )         ? $extension['author']      : '',
                                                isset ( $extension['url'] )            ? $extension['url']         : null,
                                                isset ( $extension['description'] )    ? $extension['description'] : '',
-                                               isset ( $extension['descriptionmsg'] ) ? $extension['descriptionmsg'] : ''
+                                               isset ( $extension['descriptionmsg'] ) ? $extension['descriptionmsg'] : null
                                        );
                                }
                        }
@@ -187,24 +422,24 @@ class SpecialVersion {
 
                if ( count( $wgExtensionFunctions ) ) {
                        $out .= $this->openExtType( wfMsg( 'version-extension-functions' ) );
-                       $out .= '<tr><td colspan="3">' . $this->listToText( $wgExtensionFunctions ) . "</td></tr>\n";
+                       $out .= '<tr><td colspan="4">' . $this->listToText( $wgExtensionFunctions ) . "</td></tr>\n";
                }
 
                if ( $cnt = count( $tags = $wgParser->getTags() ) ) {
                        for ( $i = 0; $i < $cnt; ++$i )
                                $tags[$i] = "&lt;{$tags[$i]}&gt;";
                        $out .= $this->openExtType( wfMsg( 'version-parser-extensiontags' ) );
-                       $out .= '<tr><td colspan="3">' . $this->listToText( $tags ). "</td></tr>\n";
+                       $out .= '<tr><td colspan="4">' . $this->listToText( $tags ). "</td></tr>\n";
                }
 
                if( $cnt = count( $fhooks = $wgParser->getFunctionHooks() ) ) {
                        $out .= $this->openExtType( wfMsg( 'version-parser-function-hooks' ) );
-                       $out .= '<tr><td colspan="3">' . $this->listToText( $fhooks ) . "</td></tr>\n";
+                       $out .= '<tr><td colspan="4">' . $this->listToText( $fhooks ) . "</td></tr>\n";
                }
 
                if ( count( $wgSkinExtensionFunctions ) ) {
                        $out .= $this->openExtType( wfMsg( 'version-skin-extension-functions' ) );
-                       $out .= '<tr><td colspan="3">' . $this->listToText( $wgSkinExtensionFunctions ) . "</td></tr>\n";
+                       $out .= '<tr><td colspan="4">' . $this->listToText( $wgSkinExtensionFunctions ) . "</td></tr>\n";
                }
                $out .= Xml::closeElement( 'table' );
                return $out;
@@ -222,9 +457,12 @@ class SpecialVersion {
                }
        }
 
-       function formatCredits( $name, $version = null, $author = null, $url = null, $description = null, $descriptionMsg = null ) {
+       function formatCredits( $name, $version = null, $subVersion = null, $subVersionCo = null, $subVersionURL = null, $author = null, $url = null, $description = null, $descriptionMsg = null ) {
+               $haveSubversion = $subVersion;
                $extension = isset( $url ) ? "[$url $name]" : $name;
-               $version = isset( $version ) ? "(" . wfMsg( 'version-version' ) . " $version)" : '';
+               $version = isset( $version ) ? wfMsg( 'version-version', $version ) : '';
+               $subVersion = isset( $subVersion ) ? wfMsg( 'version-svn-revision', $subVersion, $subVersionCo ) : '';
+               $subVersion = isset( $subVersionURL ) ? "[$subVersionURL $subVersion]" : $subVersion;
 
                # Look for a localized description
                if( isset( $descriptionMsg ) ) {
@@ -234,11 +472,19 @@ class SpecialVersion {
                        }
                }
 
-               return "<tr>
+               if ( $haveSubversion ) {
+               $extNameVer = "<tr>
                                <td><em>$extension $version</em></td>
-                               <td>$description</td>
-                               <td>" . $this->listToText( (array)$author ) . "</td>
-                       </tr>\n";
+                               <td><em>$subVersion</em></td>";
+               } else {
+               $extNameVer = "<tr>
+                               <td colspan=\"2\"><em>$extension $version</em></td>";
+               }
+               $extDescAuthor = "<td>$description</td>
+                                 <td>" . $this->listToText( (array)$author ) . "</td>
+                           </tr>\n";
+               return $ret = $extNameVer . $extDescAuthor;
+               return $ret;
        }
 
        /**
@@ -252,7 +498,7 @@ class SpecialVersion {
                        ksort( $myWgHooks );
 
                        $ret = Xml::element( 'h2', array( 'id' => 'mw-version-hooks' ), wfMsg( 'version-hooks' ) ) .
-                               Xml::openElement( 'table', array( 'id' => 'sv-hooks' ) ) .
+                               Xml::openElement( 'table', array( 'class' => 'wikitable', 'id' => 'sv-hooks' ) ) .
                                "<tr>
                                        <th>" . wfMsg( 'version-hook-name' ) . "</th>
                                        <th>" . wfMsg( 'version-hook-subscribedby' ) . "</th>
@@ -271,7 +517,7 @@ class SpecialVersion {
        }
 
        private function openExtType($text, $name = null) {
-               $opt = array( 'colspan' => 3 );
+               $opt = array( 'colspan' => 4 );
                $out = '';
 
                if(!$this->firstExtOpened) {
@@ -287,8 +533,6 @@ class SpecialVersion {
        }
 
        /**
-        * @static
-        *
         * @return string
         */
        function IPInfo() {
@@ -306,35 +550,34 @@ class SpecialVersion {
 
                if ( $cnt == 1 ) {
                        // Enforce always returning a string
-                       return (string)$this->arrayToString( $list[0] );
+                       return (string)self::arrayToString( $list[0] );
                } elseif ( $cnt == 0 ) {
                        return '';
                } else {
+                       global $wgLang;
                        sort( $list );
-                       $t = array_slice( $list, 0, $cnt - 1 );
-                       $one = array_map( array( &$this, 'arrayToString' ), $t );
-                       $two = $this->arrayToString( $list[$cnt - 1] );
-                       $and = wfMsg( 'and' );
-
-                       return implode( ', ', $one ) . " $and $two";
+                       return $wgLang->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) );
                }
        }
 
        /**
-        * @static
-        *
         * @param mixed $list Will convert an array to string if given and return
         *                    the paramater unaltered otherwise
         * @return mixed
         */
-       function arrayToString( $list ) {
+       static function arrayToString( $list ) {
+               if( is_array( $list ) && count( $list ) == 1 )
+                       $list = $list[0];
                if( is_object( $list ) ) {
                        $class = get_class( $list );
                        return "($class)";
-               } elseif ( ! is_array( $list ) ) {
+               } elseif ( !is_array( $list ) ) {
                        return $list;
                } else {
-                       $class = get_class( $list[0] );
+                       if( is_object( $list[0] ) )
+                               $class = get_class( $list[0] );
+                       else 
+                               $class = $list[0];
                        return "($class, {$list[1]})";
                }
        }
@@ -342,10 +585,16 @@ class SpecialVersion {
        /**
         * Retrieve the revision number of a Subversion working directory.
         *
-        * @param string $dir
-        * @return mixed revision number as int, or false if not a SVN checkout
+        * @param String $dir Directory of the svn checkout
+        * @param Boolean $coRev optional to return value whether is Last Modified
+        *                or Checkout revision number
+        * @param Boolean $extension optional to check the path whether is from
+        *                Wikimedia SVN server or not
+        * @param Boolean $relPath optional to get the end part of the checkout path
+        * @return mixed revision number as int, end part of the checkout path, 
+        *               or false if not a SVN checkout
         */
-       public static function getSvnRevision( $dir ) {
+       public static function getSvnRevision( $dir, $coRev = false, $extension = false, $relPath = false) {
                // http://svnbook.red-bean.com/nightly/en/svn.developer.insidewc.html
                $entries = $dir . '/.svn/entries';
 
@@ -380,12 +629,44 @@ class SpecialVersion {
                        }
                        return false;
                } else {
-                       // subversion is release 1.4
-                       return intval( $content[3] );
+                       // subversion is release 1.4 or above
+                       if ($relPath) {
+                               $endPath = strstr( $content[4], 'tags' );
+                               if (!$endPath) {
+                                       $endPath = strstr( $content[4], 'branches' );
+                                       if (!$endPath) {
+                                               $endPath = strstr( $content[4], 'trunk' );
+                                               if (!$endPath)
+                                                       return false;
+                                       }
+                               }
+                               $endPath = trim ( $endPath );
+                               if ($extension) {
+                                       $wmSvnPath = 'svn.wikimedia.org/svnroot/mediawiki';
+                                       $isWMSvn = strstr($content[5],$wmSvnPath);
+                                       if (!strcmp($isWMSvn,null)) {
+                                               return false;
+                                       } else {
+                                               $viewvcStart = 'http://svn.wikimedia.org/viewvc/mediawiki/';
+                                               if (strstr( $content[4], 'trunk' ))
+                                                       $viewvcEnd = '/?pathrev=';
+                                               else
+                                                       // Avoids 404 error using pathrev when it does not found
+                                                       $viewvcEnd = '/?revision=';
+                                               $viewvc = $viewvcStart . $endPath . $viewvcEnd;
+                                               return $viewvc;
+                                       }
+                               }
+                               return $endPath;
+                       }
+                       if ($coRev)
+                               // get the directory checkout revsion number
+                               return intval( $content[3]) ;
+                       else
+                               // get the directory last modified revision number
+                               return intval( $content[10] );
                }
        }
 
        /**#@-*/
 }
-
-/**#@-*/