class SpecialVersion extends SpecialPage {
private $firstExtOpened = true;
+ static $viewvcUrls = array(
+ 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki' => 'http://svn.wikimedia.org/viewvc/mediawiki',
+ 'http://svn.wikimedia.org/svnroot/mediawiki' => 'http://svn.wikimedia.org/viewvc/mediawiki',
+ # Doesn't work at the time of writing but maybe some day:
+ 'https://svn.wikimedia.org/viewvc/mediawiki' => 'http://svn.wikimedia.org/viewvc/mediawiki',
+ );
+
function __construct(){
- parent::__construct( 'Version' );
+ parent::__construct( 'Version' );
}
/**
$this->setHeaders();
$this->outputHeader();
- if( $wgContLang->isRTL() ) {
- $wgOut->addHTML( '<div dir="rtl">' );
- } else {
- $wgOut->addHTML( '<div dir="ltr">' );
- }
+ $wgOut->addHTML( Xml::openElement( 'div',
+ array( 'dir' => $wgContLang->getDir() ) ) );
$text =
$this->MediaWikiCredits() .
$this->softwareInformation() .
$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
*/
$ret .= '<div dir="ltr">';
$ret .= "__NOTOC__
This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''',
- copyright © 2001-2009 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
+ copyright © 2001-2010 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, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber,
- Siebrand Mazeland and others.
+ Siebrand Mazeland, Chad Horohoe and others.
MediaWiki is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
* @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;
- global $wgUser, $wgSpecialVersionExtended;
$dbr = wfGetDB( DB_SLAVE );
// 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();
$software['[http://www.php.net/ PHP]'] = phpversion() . " (" . php_sapi_name() . ")";
$software[$dbr->getSoftwareLink()] = $dbr->getServerVersion();
- if( $wgSpecialVersionExtended || $wgUser->isAllowed( 'versiondetail' ) ) {
- // 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/';
- else if ( stristr( $serverSoftwareName, 'nginx' ) )
- $serverSoftwareURL = 'http://nginx.net/';
-
- // Get the version of the web server. If does not have one,
- // leave it as empty.
- if ( $serverSoftwareLine[1] != '' ) {
- $serverSoftwareVersion = $serverSoftwareLine[1];
- } else {
- $serverSoftwareVersion = '';
- }
-
- if ( isset( $serverSoftwareURL ) )
- $software["[$serverSoftwareURL $serverSoftwareName]"] = $serverSoftwareVersion;
- else
- $software[$serverSoftwareName] = $serverSoftwareVersion;
-
- // 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 ) );
*
* @return mixed
*/
- public static function getVersion( $flags = '' ) {
+ public static function getVersion( $flags = '' ) {
global $wgVersion, $IP;
wfProfileIn( __METHOD__ );
- $svn = self::getSvnRevision( $IP, false, false , false );
- $svnCo = self::getSvnRevision( $IP, true, false , false );
- if ( !$svn ) {
+
+ $info = self::getSvnInfo( $IP );
+ if ( !$info ) {
$version = $wgVersion;
} elseif( $flags === 'nodb' ) {
- $version = "$wgVersion (r$svnCo)";
+ $version = "$wgVersion (r{$info['checkout-rev']})";
} else {
- $version = $wgVersion . wfMsg( 'version-svn-revision', $svn, $svnCo );
+ $version = $wgVersion . ' ' .
+ wfMsg(
+ 'version-svn-revision',
+ isset( $info['directory-rev'] ) ? $info['directory-rev'] : '',
+ $info['checkout-rev']
+ );
}
+
wfProfileOut( __METHOD__ );
return $version;
}
/**
- * Return a string of the MediaWiki version with a link to SVN revision if
- * available
+ * Return a wikitext-formatted string of the MediaWiki version with a link to
+ * the SVN revision if available
*
* @return mixed
*/
public static function getVersionLinked() {
global $wgVersion, $IP;
wfProfileIn( __METHOD__ );
- $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;
+ $info = self::getSvnInfo( $IP );
+ if ( isset( $info['checkout-rev'] ) ) {
+ $linkText = wfMsg(
+ 'version-svn-revision',
+ isset( $info['directory-rev'] ) ? $info['directory-rev'] : '',
+ $info['checkout-rev']
+ );
+ if ( isset( $info['viewvc-url'] ) ) {
+ $version = "$wgVersion [{$info['viewvc-url']} $linkText]";
+ } else {
+ $version = "$wgVersion $linkText";
+ }
+ } else {
+ $version = $wgVersion;
+ }
wfProfileOut( __METHOD__ );
return $version;
}
foreach ( $extensionTypes as $type => $text ) {
if ( isset ( $wgExtensionCredits[$type] ) && count ( $wgExtensionCredits[$type] ) ) {
- $out .= $this->openExtType( $text );
+ $out .= $this->openExtType( $text, 'credits-' . $type );
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'];
- }
-
- $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'] : null
- );
+ $out .= $this->formatCredits( $extension );
}
}
}
if ( count( $wgExtensionFunctions ) ) {
- $out .= $this->openExtType( wfMsg( 'version-extension-functions' ) );
+ $out .= $this->openExtType( wfMsg( 'version-extension-functions' ), 'extension-functions' );
$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] = "<{$tags[$i]}>";
- $out .= $this->openExtType( wfMsg( 'version-parser-extensiontags' ) );
+ $out .= $this->openExtType( wfMsg( 'version-parser-extensiontags' ), 'parser-tags' );
$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 .= $this->openExtType( wfMsg( 'version-parser-function-hooks' ), 'parser-function-hooks' );
$out .= '<tr><td colspan="4">' . $this->listToText( $fhooks ) . "</td></tr>\n";
}
if ( count( $wgSkinExtensionFunctions ) ) {
- $out .= $this->openExtType( wfMsg( 'version-skin-extension-functions' ) );
+ $out .= $this->openExtType( wfMsg( 'version-skin-extension-functions' ), 'skin-extension-functions' );
$out .= '<tr><td colspan="4">' . $this->listToText( $wgSkinExtensionFunctions ) . "</td></tr>\n";
}
$out .= Xml::closeElement( 'table' );
}
}
- 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 ) : '';
- $subVersion = isset( $subVersion ) ? wfMsg( 'version-svn-revision', $subVersion, $subVersionCo ) : '';
- $subVersion = isset( $subVersionURL ) ? "[$subVersionURL $subVersion]" : $subVersion;
-
- # Look for a localized description
- if( isset( $descriptionMsg ) ) {
- $msg = wfMsg( $descriptionMsg );
- if ( !wfEmptyMsg( $descriptionMsg, $msg ) && $msg != '' ) {
- $description = $msg;
+ function formatCredits( $extension ) {
+ $name = isset( $extension['name'] ) ? $extension['name'] : '[no name]';
+ if ( isset( $extension['path'] ) ) {
+ $svnInfo = self::getSvnInfo( dirname($extension['path']) );
+ $directoryRev = isset( $svnInfo['directory-rev'] ) ? $svnInfo['directory-rev'] : null;
+ $checkoutRev = isset( $svnInfo['checkout-rev'] ) ? $svnInfo['checkout-rev'] : null;
+ $viewvcUrl = isset( $svnInfo['viewvc-url'] ) ? $svnInfo['viewvc-url'] : null;
+ } else {
+ $directoryRev = null;
+ $checkoutRev = null;
+ $viewvcUrl = null;
+ }
+
+ # Make main link (or just the name if there is no URL)
+ if ( isset( $extension['url'] ) ) {
+ $mainLink = "[{$extension['url']} $name]";
+ } else {
+ $mainLink = $name;
+ }
+ if ( isset( $extension['version'] ) ) {
+ $versionText = '<span class="mw-version-ext-version">' .
+ wfMsg( 'version-version', $extension['version'] ) .
+ '</span>';
+ } else {
+ $versionText = '';
+ }
+
+ # Make subversion text/link
+ if ( $checkoutRev ) {
+ $svnText = wfMsg( 'version-svn-revision', $directoryRev, $checkoutRev );
+ $svnText = isset( $viewvcUrl ) ? "[$viewvcUrl $svnText]" : $svnText;
+ } else {
+ $svnText = false;
+ }
+
+ # Make description text
+ $description = isset ( $extension['description'] ) ? $extension['description'] : '';
+ if( isset ( $extension['descriptionmsg'] ) ) {
+ # Look for a localized description
+ $descriptionMsg = $extension['descriptionmsg'];
+ if( is_array( $descriptionMsg ) ) {
+ $descriptionMsgKey = $descriptionMsg[0]; // Get the message key
+ array_shift( $descriptionMsg ); // Shift out the message key to get the parameters only
+ array_map( "htmlspecialchars", $descriptionMsg ); // For sanity
+ $msg = wfMsg( $descriptionMsgKey, $descriptionMsg );
+ } else {
+ $msg = wfMsg( $descriptionMsg );
}
+ if ( !wfEmptyMsg( $descriptionMsg, $msg ) && $msg != '' ) {
+ $description = $msg;
+ }
}
- if ( $haveSubversion ) {
- $extNameVer = "<tr>
- <td><em>$extension $version</em></td>
- <td><em>$subVersion</em></td>";
+ if ( $svnText !== false ) {
+ $extNameVer = "<tr>
+ <td><em>$mainLink $versionText</em></td>
+ <td><em>$svnText</em></td>";
} else {
- $extNameVer = "<tr>
- <td colspan=\"2\"><em>$extension $version</em></td>";
+ $extNameVer = "<tr>
+ <td colspan=\"2\"><em>$mainLink $versionText</em></td>";
}
+ $author = isset ( $extension['author'] ) ? $extension['author'] : array();
$extDescAuthor = "<td>$description</td>
- <td>" . $this->listToText( (array)$author ) . "</td>
- </tr>\n";
- return $ret = $extNameVer . $extDescAuthor;
- return $ret;
+ <td>" . $this->listToText( (array)$author, false ) . "</td>
+ </tr>\n";
+ return $extNameVer . $extDescAuthor;
}
/**
return '';
}
- private function openExtType($text, $name = null) {
+ private function openExtType( $text, $name = null ) {
$opt = array( 'colspan' => 4 );
$out = '';
- if(!$this->firstExtOpened) {
+ if( !$this->firstExtOpened ) {
// Insert a spacing line
$out .= '<tr class="sv-space">' . Xml::element( 'td', $opt ) . "</tr>\n";
}
$this->firstExtOpened = false;
- if($name) { $opt['id'] = "sv-$name"; }
+ if( $name )
+ $opt['id'] = "sv-$name";
- $out .= "<tr>" . Xml::element( 'th', $opt, $text) . "</tr>\n";
+ $out .= "<tr>" . Xml::element( 'th', $opt, $text ) . "</tr>\n";
return $out;
}
/**
* @param array $list
+ * @param bool $sort
* @return string
*/
- function listToText( $list ) {
+ function listToText( $list, $sort = true ) {
$cnt = count( $list );
if ( $cnt == 1 ) {
return '';
} else {
global $wgLang;
- sort( $list );
+ if ( $sort ) {
+ sort( $list );
+ }
return $wgLang->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) );
}
}
}
/**
- * Retrieve the revision number of a Subversion working directory.
+ * Get an associative array of information about a given path, from its .svn
+ * subdirectory. Returns false on error, such as if the directory was not
+ * checked out with subversion.
*
- * @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
+ * Returned keys are:
+ * Required:
+ * checkout-rev The revision which was checked out
+ * Optional:
+ * directory-rev The revision when the directory was last modified
+ * url The subversion URL of the directory
+ * repo-url The base URL of the repository
+ * viewvc-url A ViewVC URL pointing to the checked-out revision
*/
- public static function getSvnRevision( $dir, $coRev = false, $extension = false, $relPath = false) {
+ public static function getSvnInfo( $dir ) {
// http://svnbook.red-bean.com/nightly/en/svn.developer.insidewc.html
$entries = $dir . '/.svn/entries';
return false;
}
- $content = file( $entries );
+ $lines = file( $entries );
+ if ( !count( $lines ) ) {
+ return false;
+ }
// check if file is xml (subversion release <= 1.3) or not (subversion release = 1.4)
- if( preg_match( '/^<\?xml/', $content[0] ) ) {
+ if( preg_match( '/^<\?xml/', $lines[0] ) ) {
// subversion is release <= 1.3
if( !function_exists( 'simplexml_load_file' ) ) {
// We could fall back to expat... YUCK
if( $xml->entry[0]['name'] == '' ) {
// The directory entry should always have a revision marker.
if( $entry['revision'] ) {
- return intval( $entry['revision'] );
+ return array( 'checkout-rev' => intval( $entry['revision'] ) );
}
}
}
}
return false;
+ }
+
+ // subversion is release 1.4 or above
+ if ( count( $lines ) < 11 ) {
+ return false;
+ }
+ $info = array(
+ 'checkout-rev' => intval( trim( $lines[3] ) ),
+ 'url' => trim( $lines[4] ),
+ 'repo-url' => trim( $lines[5] ),
+ 'directory-rev' => intval( trim( $lines[10] ) )
+ );
+ if ( isset( self::$viewvcUrls[$info['repo-url']] ) ) {
+ $viewvc = str_replace(
+ $info['repo-url'],
+ self::$viewvcUrls[$info['repo-url']],
+ $info['url']
+ );
+ $pathRelativeToRepo = substr( $info['url'], strlen( $info['repo-url'] ) );
+ $viewvc .= '/?pathrev=';
+ $viewvc .= urlencode( $info['checkout-rev'] );
+ $info['viewvc-url'] = $viewvc;
+ }
+ return $info;
+ }
+
+ /**
+ * Retrieve the revision number of a Subversion working directory.
+ *
+ * @param String $dir Directory of the svn checkout
+ * @return int revision number as int
+ */
+ public static function getSvnRevision( $dir ) {
+ $info = self::getSvnInfo( $dir );
+ if ( $info === false ) {
+ return false;
+ } elseif ( isset( $info['checkout-rev'] ) ) {
+ return $info['checkout-rev'];
} else {
- // 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] );
+ return false;
}
}
dépôts / lhc / web / wiklou.git / blobdiff