http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88875
Revision: 88875
Author: reedy
Date: 2011-05-26 00:44:02 +0000 (Thu, 26 May 2011)
Log Message:
-----------
Kill code from CreativeCommonsRdf_body.php that should've been removed in r88873
Add URL, add one description
Fix class name of CreativeCommonsRdf
Modified Paths:
--------------
trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php
trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
trunk/extensions/DublinCoreRdf/DublinCoreRdf.php
Modified: trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php
===================================================================
--- trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php 2011-05-26
00:11:16 UTC (rev 88874)
+++ trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php 2011-05-26
00:44:02 UTC (rev 88875)
@@ -3,15 +3,16 @@
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'CreativeCoreRdf',
- 'url' => '',
+ 'url' => 'http://www.mediawiki.org/wiki/Extension:CreativeCoreRdf',
'author' => 'Evan Prodromou',
+ 'descriptionmsg' => "CreativeCommons RDF-metadata"
);
-$wgHooks['MediaWikiPerformAction'][] = 'efCreativeCoreRdfPreformAction';
+$wgHooks['MediaWikiPerformAction'][] = 'efCreativeCommonsRdfPreformAction';
-$wgAutoloadClasses['CreativeCoreRdf'] = $dir . 'CreativeCoreRdf_body.php';
+$wgAutoloadClasses['CreativeCommonsRdf'] = $dir .
'CreativeCommonsRdf_body.php';
-function efCreativeCoreRdfPreformAction( $output, $article, $title, $user,
$request, $mediaWiki ) {
+function efCreativeCommonsRdfPreformAction( $output, $article, $title, $user,
$request, $mediaWiki ) {
if ( $mediaWiki->getAction() !== 'creativecommons' ) {
return true;
}
Modified: trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
===================================================================
--- trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
2011-05-26 00:11:16 UTC (rev 88874)
+++ trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
2011-05-26 00:44:02 UTC (rev 88875)
@@ -22,182 +22,6 @@
* @file
*/
-abstract class RdfMetaData {
- const RDF_TYPE_PREFS =
'application/rdf+xml,text/xml;q=0.7,application/xml;q=0.5,text/rdf;q=0.1';
-
- /**
- * Constructor
- * @param $article Article object
- */
- public function __construct( Article $article ) {
- $this->mArticle = $article;
- }
-
- public abstract function show();
-
- /**
- *
- */
- protected function setup() {
- global $wgOut, $wgRequest;
-
- $httpaccept = isset( $_SERVER['HTTP_ACCEPT'] ) ?
$_SERVER['HTTP_ACCEPT'] : null;
- $rdftype = wfNegotiateType( wfAcceptToPrefs( $httpaccept ),
wfAcceptToPrefs( self::RDF_TYPE_PREFS ) );
-
- if( !$rdftype ){
- wfHttpError( 406, 'Not Acceptable', wfMsg(
'notacceptable' ) );
- return false;
- } else {
- $wgOut->disable();
- $wgRequest->response()->header( "Content-type:
{$rdftype}; charset=utf-8" );
- $wgOut->sendCacheControl();
- return true;
- }
- }
-
- /**
- *
- */
- protected function reallyFullUrl() {
- return $this->mArticle->getTitle()->getFullURL();
- }
-
- protected function basics() {
- global $wgLanguageCode, $wgSitename;
-
- $this->element( 'title', $this->mArticle->mTitle->getText() );
- $this->pageOrString( 'publisher', wfMsg( 'aboutpage' ),
$wgSitename );
- $this->element( 'language', $wgLanguageCode );
- $this->element( 'type', 'Text' );
- $this->element( 'format', 'text/html' );
- $this->element( 'identifier', $this->reallyFullUrl() );
- $this->element( 'date', $this->date(
$this->mArticle->getTimestamp() ) );
-
- $lastEditor = User::newFromId( $this->mArticle->getUser() );
- $this->person( 'creator', $lastEditor );
-
- foreach( $this->mArticle->getContributors() as $user ){
- $this->person( 'contributor', $user );
- }
-
- $this->rights();
- }
-
- protected function element( $name, $value ) {
- $value = htmlspecialchars( $value );
- print "\t\t<dc:{$name}>{$value}</dc:{$name}>\n";
- }
-
- protected function date($timestamp) {
- return substr($timestamp, 0, 4) . '-'
- . substr($timestamp, 4, 2) . '-'
- . substr($timestamp, 6, 2);
- }
-
- protected function pageOrString( $name, $page, $str ) {
- if( $page instanceof Title )
- $nt = $page;
- else
- $nt = Title::newFromText( $page );
-
- if( !$nt || $nt->getArticleID() == 0 ){
- $this->element( $name, $str );
- } else {
- $this->page( $name, $nt );
- }
- }
-
- protected function page( $name, $title ) {
- $this->url( $name, $title->getFullUrl() );
- }
-
- protected function url($name, $url) {
- $url = htmlspecialchars( $url );
- print "\t\t<dc:{$name} rdf:resource=\"{$url}\" />\n";
- }
-
- protected function person( $name, User $user ) {
- if( $user->isAnon() ){
- $this->element( $name, wfMsgExt( 'anonymous', array(
'parsemag' ), 1 ) );
- } else {
- $real = $user->getRealName();
- if( $real ) {
- $this->element( $name, $real );
- } else {
- $userName = $user->getName();
- $this->pageOrString( $name,
$user->getUserPage(), wfMsgExt( 'siteuser', 'parsemag', $userName, $userName )
);
- }
- }
- }
-
- /**
- * Takes an arg, for future enhancement with different rights for
- * different pages.
- */
- protected function rights() {
- global $wgRightsPage, $wgRightsUrl, $wgRightsText;
-
- if( $wgRightsPage && ( $nt = Title::newFromText( $wgRightsPage
) )
- && ($nt->getArticleID() != 0)) {
- $this->page('rights', $nt);
- } else if( $wgRightsUrl ){
- $this->url('rights', $wgRightsUrl);
- } else if( $wgRightsText ){
- $this->element( 'rights', $wgRightsText );
- }
- }
-
- protected function getTerms( $url ){
- global $wgLicenseTerms;
-
- if( $wgLicenseTerms ){
- return $wgLicenseTerms;
- } else {
- $known = $this->getKnownLicenses();
- if( isset( $known[$url] ) ) {
- return $known[$url];
- } else {
- return array();
- }
- }
- }
-
- protected function getKnownLicenses() {
- $ccLicenses = array('by', 'by-nd', 'by-nd-nc', 'by-nc',
- 'by-nc-sa', 'by-sa');
- $ccVersions = array('1.0', '2.0');
- $knownLicenses = array();
-
- foreach ($ccVersions as $version) {
- foreach ($ccLicenses as $license) {
- if( $version == '2.0' && substr( $license, 0,
2) != 'by' ) {
- # 2.0 dropped the non-attribs licenses
- continue;
- }
- $lurl =
"http://creativecommons.org/licenses/{$license}/{$version}/";;
- $knownLicenses[$lurl] = explode('-', $license);
- $knownLicenses[$lurl][] = 're';
- $knownLicenses[$lurl][] = 'di';
- $knownLicenses[$lurl][] = 'no';
- if (!in_array('nd', $knownLicenses[$lurl])) {
- $knownLicenses[$lurl][] = 'de';
- }
- }
- }
-
- /* Handle the GPL and LGPL, too. */
-
- $knownLicenses['http://creativecommons.org/licenses/GPL/2.0/'] =
- array('de', 're', 'di', 'no', 'sa', 'sc');
- $knownLicenses['http://creativecommons.org/licenses/LGPL/2.1/']
=
- array('de', 're', 'di', 'no', 'sa', 'sc');
- $knownLicenses['http://www.gnu.org/copyleft/fdl.html'] =
- array('de', 're', 'di', 'no', 'sa', 'sc');
-
- return $knownLicenses;
- }
-}
-
class CreativeCommonsRdf extends RdfMetaData {
public function show(){
Modified: trunk/extensions/DublinCoreRdf/DublinCoreRdf.php
===================================================================
--- trunk/extensions/DublinCoreRdf/DublinCoreRdf.php 2011-05-26 00:11:16 UTC
(rev 88874)
+++ trunk/extensions/DublinCoreRdf/DublinCoreRdf.php 2011-05-26 00:44:02 UTC
(rev 88875)
@@ -3,8 +3,9 @@
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'DublinCoreRdf',
- 'url' => '',
+ 'url' => 'http://www.mediawiki.org/wiki/Extension:DublinCoreRdf',
'author' => 'Evan Prodromou',
+ 'descriptionmsg' => "Dublin Core RDF-metadata"
);
$wgHooks['MediaWikiPerformAction'][] = 'efDublinCorePerformAction';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
