http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88873
Revision: 88873
Author: reedy
Date: 2011-05-26 00:08:16 +0000 (Thu, 26 May 2011)
Log Message:
-----------
* (bug 29144) Move action=dublincore and action=creativecommons to extensions
Moved CreativeCommonsRDF out to extension
Modified Paths:
--------------
trunk/extensions/DublinCoreRdf/DublinCoreRdf.php
trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/Metadata.php
trunk/phase3/includes/OutputPage.php
trunk/phase3/includes/Wiki.php
trunk/phase3/maintenance/language/messages.inc
Added Paths:
-----------
trunk/extensions/CreativeCommonsRdf/
trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php
trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
Added: trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php
===================================================================
--- trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php
(rev 0)
+++ trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php 2011-05-26
00:08:16 UTC (rev 88873)
@@ -0,0 +1,22 @@
+<?php
+
+$wgExtensionCredits['other'][] = array(
+ 'path' => __FILE__,
+ 'name' => 'CreativeCoreRdf',
+ 'url' => '',
+ 'author' => 'Evan Prodromou',
+);
+
+$wgHooks['MediaWikiPerformAction'][] = 'efCreativeCoreRdfPreformAction';
+
+$wgAutoloadClasses['CreativeCoreRdf'] = $dir . 'CreativeCoreRdf_body.php';
+
+function efCreativeCoreRdfPreformAction( $output, $article, $title, $user,
$request, $mediaWiki ) {
+ if ( $mediaWiki->getAction() !== 'creativecommons' ) {
+ return true;
+ }
+
+ $rdf = new CreativeCommonsRdf( $article );
+ $rdf->show();
+ return false;
+}
\ No newline at end of file
Property changes on: trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf.php
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php (from
rev 88868, trunk/phase3/includes/Metadata.php)
===================================================================
--- trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
(rev 0)
+++ trunk/extensions/CreativeCommonsRdf/CreativeCommonsRdf_body.php
2011-05-26 00:08:16 UTC (rev 88873)
@@ -0,0 +1,283 @@
+<?php
+/**
+ * Provides CreativeCommons metadata
+ *
+ * Copyright 2004, Evan Prodromou <[email protected]>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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
+ *
+ * @author Evan Prodromou <[email protected]>
+ * @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(){
+ if( $this->setup() ){
+ global $wgRightsUrl;
+
+ $url = $this->reallyFullUrl();
+
+ $this->prologue();
+ $this->subPrologue('Work', $url);
+
+ $this->basics();
+ if( $wgRightsUrl ){
+ $url = htmlspecialchars( $wgRightsUrl );
+ print "\t\t<cc:license rdf:resource=\"$url\"
/>\n";
+ }
+
+ $this->subEpilogue('Work');
+
+ if( $wgRightsUrl ){
+ $terms = $this->getTerms( $wgRightsUrl );
+ if( $terms ){
+ $this->subPrologue( 'License',
$wgRightsUrl );
+ $this->license( $terms );
+ $this->subEpilogue( 'License' );
+ }
+ }
+ }
+
+ $this->epilogue();
+ }
+
+ protected function prologue() {
+ echo <<<PROLOGUE
+<?xml version='1.0' encoding="UTF-8" ?>
+<rdf:RDF xmlns:cc="http://web.resource.org/cc/";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+
+PROLOGUE;
+ }
+
+ protected function subPrologue( $type, $url ){
+ $url = htmlspecialchars( $url );
+ echo "\t<cc:{$type} rdf:about=\"{$url}\">\n";
+ }
+
+ protected function subEpilogue($type) {
+ echo "\t</cc:{$type}>\n";
+ }
+
+ protected function license($terms) {
+
+ foreach( $terms as $term ){
+ switch( $term ) {
+ case 're':
+ $this->term('permits', 'Reproduction'); break;
+ case 'di':
+ $this->term('permits', 'Distribution'); break;
+ case 'de':
+ $this->term('permits', 'DerivativeWorks');
break;
+ case 'nc':
+ $this->term('prohibits', 'CommercialUse');
break;
+ case 'no':
+ $this->term('requires', 'Notice'); break;
+ case 'by':
+ $this->term('requires', 'Attribution'); break;
+ case 'sa':
+ $this->term('requires', 'ShareAlike'); break;
+ case 'sc':
+ $this->term('requires', 'SourceCode'); break;
+ }
+ }
+ }
+
+ protected function term( $term, $name ){
+ print "\t\t<cc:{$term}
rdf:resource=\"http://web.resource.org/cc/{$name}\"; />\n";
+ }
+
+ protected function epilogue() {
+ echo "</rdf:RDF>\n";
+ }
+}
Modified: trunk/extensions/DublinCoreRdf/DublinCoreRdf.php
===================================================================
--- trunk/extensions/DublinCoreRdf/DublinCoreRdf.php 2011-05-26 00:01:33 UTC
(rev 88872)
+++ trunk/extensions/DublinCoreRdf/DublinCoreRdf.php 2011-05-26 00:08:16 UTC
(rev 88873)
@@ -2,16 +2,16 @@
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
- 'name' => 'DublinCore',
+ 'name' => 'DublinCoreRdf',
'url' => '',
'author' => 'Evan Prodromou',
);
-$wgHooks['MediaWikiPerformAction'][] = 'efDublinCorePreformAction';
+$wgHooks['MediaWikiPerformAction'][] = 'efDublinCorePerformAction';
$wgAutoloadClasses['DublinCoreRdf'] = $dir . 'DublinCoreRdf_body.php';
-function efDublinCorePreformAction( $output, $article, $title, $user,
$request, $mediaWiki ) {
+function efDublinCorePerformAction( $output, $article, $title, $user,
$request, $mediaWiki ) {
if ( $mediaWiki->getAction() !== 'dublincore' ) {
return true;
}
Modified: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
===================================================================
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
2011-05-26 00:01:33 UTC (rev 88872)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
2011-05-26 00:08:16 UTC (rev 88873)
@@ -65,6 +65,8 @@
/**
* Register parser hook
+ *
+ * @param $parser Parser
*/
function efSyntaxHighlight_GeSHiSetup( &$parser ) {
$parser->setHook( 'source', array( 'SyntaxHighlight_GeSHi',
'parserHook' ) );
Modified: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php 2011-05-26 00:01:33 UTC (rev
88872)
+++ trunk/phase3/includes/AutoLoader.php 2011-05-26 00:08:16 UTC (rev
88873)
@@ -49,7 +49,6 @@
'ConfEditorToken' => 'includes/ConfEditor.php',
'Cookie' => 'includes/Cookie.php',
'CookieJar' => 'includes/Cookie.php',
- 'CreativeCommonsRdf' => 'includes/Metadata.php',
'DiffHistoryBlob' => 'includes/HistoryBlob.php',
'DjVuImage' => 'includes/DjVuImage.php',
'DoubleReplacer' => 'includes/StringUtils.php',
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2011-05-26 00:01:33 UTC (rev
88872)
+++ trunk/phase3/includes/DefaultSettings.php 2011-05-26 00:08:16 UTC (rev
88873)
@@ -4406,9 +4406,6 @@
* @{
*/
-/** RDF metadata toggles */
-$wgEnableCreativeCommonsRdf = false;
-
/** Override for copyright metadata.
* TODO: these options need documentation
*/
Modified: trunk/phase3/includes/Metadata.php
===================================================================
--- trunk/phase3/includes/Metadata.php 2011-05-26 00:01:33 UTC (rev 88872)
+++ trunk/phase3/includes/Metadata.php 2011-05-26 00:08:16 UTC (rev 88873)
@@ -198,86 +198,3 @@
}
}
-class CreativeCommonsRdf extends RdfMetaData {
-
- public function show(){
- if( $this->setup() ){
- global $wgRightsUrl;
-
- $url = $this->reallyFullUrl();
-
- $this->prologue();
- $this->subPrologue('Work', $url);
-
- $this->basics();
- if( $wgRightsUrl ){
- $url = htmlspecialchars( $wgRightsUrl );
- print "\t\t<cc:license rdf:resource=\"$url\"
/>\n";
- }
-
- $this->subEpilogue('Work');
-
- if( $wgRightsUrl ){
- $terms = $this->getTerms( $wgRightsUrl );
- if( $terms ){
- $this->subPrologue( 'License',
$wgRightsUrl );
- $this->license( $terms );
- $this->subEpilogue( 'License' );
- }
- }
- }
-
- $this->epilogue();
- }
-
- protected function prologue() {
- echo <<<PROLOGUE
-<?xml version='1.0' encoding="UTF-8" ?>
-<rdf:RDF xmlns:cc="http://web.resource.org/cc/";
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-
-PROLOGUE;
- }
-
- protected function subPrologue( $type, $url ){
- $url = htmlspecialchars( $url );
- echo "\t<cc:{$type} rdf:about=\"{$url}\">\n";
- }
-
- protected function subEpilogue($type) {
- echo "\t</cc:{$type}>\n";
- }
-
- protected function license($terms) {
-
- foreach( $terms as $term ){
- switch( $term ) {
- case 're':
- $this->term('permits', 'Reproduction'); break;
- case 'di':
- $this->term('permits', 'Distribution'); break;
- case 'de':
- $this->term('permits', 'DerivativeWorks');
break;
- case 'nc':
- $this->term('prohibits', 'CommercialUse');
break;
- case 'no':
- $this->term('requires', 'Notice'); break;
- case 'by':
- $this->term('requires', 'Attribution'); break;
- case 'sa':
- $this->term('requires', 'ShareAlike'); break;
- case 'sc':
- $this->term('requires', 'SourceCode'); break;
- }
- }
- }
-
- protected function term( $term, $name ){
- print "\t\t<cc:{$term}
rdf:resource=\"http://web.resource.org/cc/{$name}\"; />\n";
- }
-
- protected function epilogue() {
- echo "</rdf:RDF>\n";
- }
-}
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2011-05-26 00:01:33 UTC (rev
88872)
+++ trunk/phase3/includes/OutputPage.php 2011-05-26 00:08:16 UTC (rev
88873)
@@ -2703,7 +2703,6 @@
global $wgUniversalEditButton, $wgFavicon, $wgAppleTouchIcon,
$wgEnableAPI,
$wgSitename, $wgVersion, $wgHtml5, $wgMimeType,
$wgFeed, $wgOverrideSiteFeed, $wgAdvertisedFeedTypes,
- $wgEnableCreativeCommonsRdf,
$wgDisableLangConversion, $wgCanonicalLanguageLinks,
$wgContLang,
$wgRightsPage, $wgRightsUrl;
@@ -2828,24 +2827,6 @@
) );
}
- # Metadata links
- # - Creative Commons
- # See http://wiki.creativecommons.org/Extend_Metadata.
- # - Dublin Core
- # Use hreflang to specify canonical and alternate links
- # See
http://www.google.com/support/webmasters/bin/answer.py?answer=189077
- if ( $this->isArticleRelated() ) {
- # note: buggy CC software only reads first "meta" link
- if ( $wgEnableCreativeCommonsRdf ) {
- $tags[] = Html::element( 'link', array(
- 'rel' => $this->getMetadataAttribute(),
- 'title' => 'Creative Commons',
- 'type' => 'application/rdf+xml',
- 'href' =>
$this->getTitle()->getLocalURL( 'action=creativecommons' ) )
- );
- }
- }
-
# Language variants
if ( !$wgDisableLangConversion && $wgCanonicalLanguageLinks
&& $wgContLang->hasVariants() ) {
Modified: trunk/phase3/includes/Wiki.php
===================================================================
--- trunk/phase3/includes/Wiki.php 2011-05-26 00:01:33 UTC (rev 88872)
+++ trunk/phase3/includes/Wiki.php 2011-05-26 00:08:16 UTC (rev 88873)
@@ -406,8 +406,7 @@
* @param $article Article
*/
private function performAction( $article ) {
- global $wgSquidMaxage, $wgUseExternalEditor,
- $wgEnableCreativeCommonsRdf;
+ global $wgSquidMaxage, $wgUseExternalEditor;
wfProfileIn( __METHOD__ );
@@ -450,14 +449,6 @@
case 'deletetrackback':
$article->$act();
break;
- case 'creativecommons':
- if ( !$wgEnableCreativeCommonsRdf ) {
- wfHttpError( 403, 'Forbidden', wfMsg(
'nocreativecommons' ) );
- } else {
- $rdf = new CreativeCommonsRdf( $article
);
- $rdf->show();
- }
- break;
case 'submit':
if ( session_id() == '' ) {
// Send a cookie so anons get talk
message notifications
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2011-05-26 00:01:33 UTC
(rev 88872)
+++ trunk/phase3/maintenance/language/messages.inc 2011-05-26 00:08:16 UTC
(rev 88873)
@@ -2489,7 +2489,6 @@
'group-bureaucrat.js',
),
'metadata_cc' => array(
- 'nocreativecommons',
'notacceptable',
),
'attribution' => array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
