From 086ae52d12011746a75f5588e877347bc0457352 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 21 Mar 2008 11:49:34 +0100 Subject: Update auf MediaWiki 1.12.0 --- includes/SpecialVersion.php | 165 +++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 64 deletions(-) (limited to 'includes/SpecialVersion.php') diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php index a6a132e0..70203832 100644 --- a/includes/SpecialVersion.php +++ b/includes/SpecialVersion.php @@ -24,11 +24,13 @@ class SpecialVersion { * main() */ function execute() { - global $wgOut; + global $wgOut, $wgMessageCache; + $wgMessageCache->loadAllMessages(); $wgOut->addHTML( '
' ); $wgOut->addWikiText( $this->MediaWikiCredits() . + $this->softwareInformation() . $this->extensionCredits() . $this->wgHooks() ); @@ -41,18 +43,13 @@ class SpecialVersion { */ /** - * Return wiki text showing the licence information and third party - * software versions (apache, php, mysql). - * @static + * @return wiki text showing the license information */ - function MediaWikiCredits() { - $version = self::getVersion(); - $dbr = wfGetDB( DB_SLAVE ); - - $ret = + static function MediaWikiCredits() { + $ret = Xml::element( 'h2', array( 'id' => 'mw-version-license' ), wfMsg( 'version-license' ) ) . "__NOTOC__ This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''', - copyright (C) 2001-2007 Magnus Manske, Brion Vibber, Lee Daniel Crocker, + copyright (C) 2001-2008 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 and others. @@ -68,40 +65,68 @@ class SpecialVersion { You should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public License] along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - or [http://www.gnu.org/copyleft/gpl.html read it online] - - * [http://www.mediawiki.org/ MediaWiki]: $version - * [http://www.php.net/ PHP]: " . phpversion() . " (" . php_sapi_name() . ") - * " . $dbr->getSoftwareLink() . ": " . $dbr->getServerVersion(); + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + or [http://www.gnu.org/copyleft/gpl.html read it online]. + "; return str_replace( "\t\t", '', $ret ) . "\n"; } + /** + * @return wiki text showing the third party software versions (apache, php, mysql). + */ + static function softwareInformation() { + $dbr = wfGetDB( DB_SLAVE ); + + return Xml::element( 'h2', array( 'id' => 'mw-version-software' ), wfMsg( 'version-software' ) ) . + Xml::openElement( 'table', array( 'id' => 'sv-software' ) ) . + " + " . wfMsg( 'version-software-product' ) . " + " . wfMsg( 'version-software-version' ) . " + \n + + [http://www.mediawiki.org/ MediaWiki] + " . self::getVersion() . " + \n + + [http://www.php.net/ PHP] + " . phpversion() . " (" . php_sapi_name() . ") + \n + + " . $dbr->getSoftwareLink() . " + " . $dbr->getServerVersion() . " + \n" . + Xml::closeElement( 'table' ); + } + /** Return a string of the MediaWiki version with SVN revision if available */ public static function getVersion() { global $wgVersion, $IP; + wfProfileIn( __METHOD__ ); $svn = self::getSvnRevision( $IP ); - return $svn ? "$wgVersion (r$svn)" : $wgVersion; + $version = $svn ? "$wgVersion (r$svn)" : $wgVersion; + wfProfileOut( __METHOD__ ); + return $version; } /** Generate wikitext showing extensions name, URL, author and description */ function extensionCredits() { - global $wgExtensionCredits, $wgExtensionFunctions, $wgParser, $wgSkinExtensionFunction; + global $wgExtensionCredits, $wgExtensionFunctions, $wgParser, $wgSkinExtensionFunctions; - if ( ! count( $wgExtensionCredits ) && ! count( $wgExtensionFunctions ) && ! count( $wgSkinExtensionFunction ) ) + if ( ! count( $wgExtensionCredits ) && ! count( $wgExtensionFunctions ) && ! count( $wgSkinExtensionFunctions ) ) return ''; $extensionTypes = array( - 'specialpage' => 'Special pages', - 'parserhook' => 'Parser hooks', - 'variable' => 'Variables', - 'other' => 'Other', + 'specialpage' => wfMsg( 'version-specialpages' ), + 'parserhook' => wfMsg( 'version-parserhooks' ), + 'variable' => wfMsg( 'version-variables' ), + 'media' => wfMsg( 'version-mediahandlers' ), + 'other' => wfMsg( 'version-other' ), ); wfRunHooks( 'SpecialVersionExtensionTypes', array( &$this, &$extensionTypes ) ); - $out = "

Extensions

\n"; - $out .= wfOpenElement('table', array('id' => 'sv-ext') ); + $out = Xml::element( 'h2', array( 'id' => 'mw-version-ext' ), wfMsg( 'version-extensions' ) ) . + Xml::openElement( 'table', array( 'id' => 'sv-ext' ) ); foreach ( $extensionTypes as $type => $text ) { if ( isset ( $wgExtensionCredits[$type] ) && count ( $wgExtensionCredits[$type] ) ) { @@ -111,38 +136,39 @@ class SpecialVersion { foreach ( $wgExtensionCredits[$type] as $extension ) { $out .= $this->formatCredits( - isset ( $extension['name'] ) ? $extension['name'] : '', - isset ( $extension['version'] ) ? $extension['version'] : null, - isset ( $extension['author'] ) ? $extension['author'] : '', - isset ( $extension['url'] ) ? $extension['url'] : null, - isset ( $extension['description'] ) ? $extension['description'] : '' + isset ( $extension['name'] ) ? $extension['name'] : '', + isset ( $extension['version'] ) ? $extension['version'] : null, + isset ( $extension['author'] ) ? $extension['author'] : '', + isset ( $extension['url'] ) ? $extension['url'] : null, + isset ( $extension['description'] ) ? $extension['description'] : '', + isset ( $extension['descriptionmsg'] ) ? $extension['descriptionmsg'] : '' ); } } } if ( count( $wgExtensionFunctions ) ) { - $out .= $this->openExtType('Extension functions'); + $out .= $this->openExtType( wfMsg( 'version-extension-functions' ) ); $out .= '' . $this->listToText( $wgExtensionFunctions ) . "\n"; } if ( $cnt = count( $tags = $wgParser->getTags() ) ) { for ( $i = 0; $i < $cnt; ++$i ) $tags[$i] = "<{$tags[$i]}>"; - $out .= $this->openExtType('Parser extension tags'); + $out .= $this->openExtType( wfMsg( 'version-parser-extensiontags' ) ); $out .= '' . $this->listToText( $tags ). "\n"; } if( $cnt = count( $fhooks = $wgParser->getFunctionHooks() ) ) { - $out .= $this->openExtType('Parser function hooks'); + $out .= $this->openExtType( wfMsg( 'version-parser-function-hooks' ) ); $out .= '' . $this->listToText( $fhooks ) . "\n"; } - if ( count( $wgSkinExtensionFunction ) ) { - $out .= $this->openExtType('Skin extension functions'); - $out .= '' . $this->listToText( $wgSkinExtensionFunction ) . "\n"; + if ( count( $wgSkinExtensionFunctions ) ) { + $out .= $this->openExtType( wfMsg( 'version-skin-extension-functions' ) ); + $out .= '' . $this->listToText( $wgSkinExtensionFunctions ) . "\n"; } - $out .= wfCloseElement( 'table' ); + $out .= Xml::closeElement( 'table' ); return $out; } @@ -158,21 +184,23 @@ class SpecialVersion { } } - function formatCredits( $name, $version = null, $author = null, $url = null, $description = null) { - $ret = ''; - if ( isset( $url ) ) - $ret .= "[$url "; - $ret .= "''$name"; - if ( isset( $version ) ) - $ret .= " (version $version)"; - $ret .= "''"; - if ( isset( $url ) ) - $ret .= ']'; - $ret .= ''; - $ret .= "$description"; - $ret .= "" . $this->listToText( (array)$author ) . ""; - $ret .= ''; - return "$ret\n"; + function formatCredits( $name, $version = null, $author = null, $url = null, $description = null, $descriptionMsg = null ) { + $extension = isset( $url ) ? "[$url $name]" : $name; + $version = isset( $version ) ? "(" . wfMsg( 'version-version' ) . " $version)" : ''; + + # Look for a localized description + if( isset( $descriptionMsg ) ) { + $msg = wfMsg( $descriptionMsg ); + if ( !wfEmptyMsg( $descriptionMsg, $msg ) && $msg != '' ) { + $description = $msg; + } + } + + return " + $extension $version + $description + " . $this->listToText( (array)$author ) . " + \n"; } /** @@ -185,14 +213,20 @@ class SpecialVersion { $myWgHooks = $wgHooks; ksort( $myWgHooks ); - $ret = "

Hooks

\n" - . wfOpenElement('table', array('id' => 'sv-hooks') ) - . "Hook nameSubscribed by\n"; + $ret = Xml::element( 'h2', array( 'id' => 'mw-version-hooks' ), wfMsg( 'version-hooks' ) ) . + Xml::openElement( 'table', array( 'id' => 'sv-hooks' ) ) . + " + " . wfMsg( 'version-hook-name' ) . " + " . wfMsg( 'version-hook-subscribedby' ) . " + \n"; - foreach ($myWgHooks as $hook => $hooks) - $ret .= "$hook" . $this->listToText( $hooks ) . "\n"; + foreach ( $myWgHooks as $hook => $hooks ) + $ret .= " + $hook + " . $this->listToText( $hooks ) . " + \n"; - $ret .= ''; + $ret .= Xml::closeElement( 'table' ); return $ret; } else return ''; @@ -204,13 +238,13 @@ class SpecialVersion { if(!$this->firstExtOpened) { // Insert a spacing line - $out .= '' . wfElement( 'td', $opt ) . "\n"; + $out .= '' . Xml::element( 'td', $opt ) . "\n"; } $this->firstExtOpened = false; if($name) { $opt['id'] = "sv-$name"; } - $out .= "" . wfElement( 'th', $opt, $text) . "\n"; + $out .= "" . Xml::element( 'th', $opt, $text) . "\n"; return $out; } @@ -232,18 +266,20 @@ class SpecialVersion { function listToText( $list ) { $cnt = count( $list ); - if ( $cnt == 1 ) { + if ( $cnt == 1 ) { // Enforce always returning a string return (string)$this->arrayToString( $list[0] ); - } elseif ( $cnt == 0 ) { + } elseif ( $cnt == 0 ) { return ''; } else { + 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 implode( ', ', $one ) . " $and $two"; + } } /** @@ -316,3 +352,4 @@ class SpecialVersion { /**#@-*/ + -- cgit v1.2.3-54-g00ecf