X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMetadata.php;h=3a939d171360cbcfdf1025f95f87083fcd4bd182;hb=fcd1cdeb930e1779af77b3747b7c60338d4e81d7;hp=f9df5393aa6d83febe8d33e8420bfb48e29d3aa8;hpb=93b09379fb68515596bd3228d6efa168d14ddbae;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Metadata.php b/includes/Metadata.php
index f9df5393aa..3a939d1713 100644
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -1,7 +1,8 @@
 <?php
-/* Metadata.php -- provides DublinCore and CreativeCommons metadata
+/**
+ * Metadata.php -- provides DublinCore and CreativeCommons metadata
  * Copyright 2004, Evan Prodromou <evan@wikitravel.org>.
- * 
+ *
  *  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
@@ -15,14 +16,20 @@
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @author Evan Prodromou <evan@wikitravel.org>
+ * @package MediaWiki
  */
 
-define("RDF_TYPE_PREFS", "application/rdf+xml,text/xml;q=0.7,application/xml;q=0.5,text/rdf;q=0.1");
+/**
+ *
+ */
+define('RDF_TYPE_PREFS', "application/rdf+xml,text/xml;q=0.7,application/xml;q=0.5,text/rdf;q=0.1");
 
 function wfDublinCoreRdf($article) {
-	
+
 	$url = dcReallyFullUrl($article->mTitle);
-	
+
 	if (rdfSetup()) {
 		dcPrologue($url);
 		dcBasics($article);
@@ -31,12 +38,12 @@ function wfDublinCoreRdf($article) {
 }
 
 function wfCreativeCommonsRdf($article) {
-	
+
 	if (rdfSetup()) {
 		global $wgRightsUrl;
-		
+
 		$url = dcReallyFullUrl($article->mTitle);
-		
+
 		ccPrologue();
 		ccSubPrologue('Work', $url);
 		dcBasics($article);
@@ -44,9 +51,9 @@ function wfCreativeCommonsRdf($article) {
 			$url = htmlspecialchars( $wgRightsUrl );
 			print "    <cc:license rdf:resource=\"$url\" />\n";
 		}
-		
+
 		ccSubEpilogue('Work');
-		
+
 		if (isset($wgRightsUrl)) {
 			$terms = ccGetTerms($wgRightsUrl);
 			if ($terms) {
@@ -56,15 +63,18 @@ function wfCreativeCommonsRdf($article) {
 			}
 		}
 	}
-	
+
 	ccEpilogue();
 }
 
-/* private */ function rdfSetup() {
-	global $wgOut, $wgRdfMimeType, $_SERVER;
-	
+/**
+ * @access private
+ */
+function rdfSetup() {
+	global $wgOut, $_SERVER;
+
 	$rdftype = wfNegotiateType(wfAcceptToPrefs($_SERVER['HTTP_ACCEPT']), wfAcceptToPrefs(RDF_TYPE_PREFS));
-	
+
 	if (!$rdftype) {
 		wfHttpError(406, "Not Acceptable", wfMsg("notacceptable"));
 		return false;
@@ -76,118 +86,165 @@ function wfCreativeCommonsRdf($article) {
 	}
 }
 
-/* private */ function dcPrologue($url) {
+/**
+ * @access private
+ */
+function dcPrologue($url) {
 	global $wgOutputEncoding;
-	
+
 	$url = htmlspecialchars( $url );
 	print "<" . "?xml version=\"1.0\" encoding=\"{$wgOutputEncoding}\" ?" . ">
-			
-<!DOCTYPE rdf:RDF PUBLIC \"-//DUBLIN CORE//DCMES DTD 2002/07/31//EN\" \"http://dublincore.org/documents/2002/07/31/dcmes-xml/dcmes-xml-dtd.dtd\">
-			
-<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"
-         xmlns:dc=\"http://purl.org/dc/elements/1.1/\">
-  <rdf:Description rdf:about=\"$url\">
-";
+
+																			  <!DOCTYPE rdf:RDF PUBLIC \"-//DUBLIN CORE//DCMES DTD 2002/07/31//EN\" \"http://dublincore.org/documents/2002/07/31/dcmes-xml/dcmes-xml-dtd.dtd\">
+
+																			  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"
+																			  xmlns:dc=\"http://purl.org/dc/elements/1.1/\">
+																			  <rdf:Description rdf:about=\"$url\">
+																			  ";
 }
 
-/* private */ function dcEpilogue() {
+/**
+ * @access private
+ */
+function dcEpilogue() {
 	print "
-  </rdf:Description>
-</rdf:RDF>
-";
+			</rdf:Description>
+			</rdf:RDF>
+			";
 }
 
-/* private */ function dcBasics($article) {
-	global $wgLanguageCode, $wgSitename;
-	
+/**
+ * @access private
+ */
+function dcBasics($article) {
+	global $wgContLanguageCode, $wgSitename;
+
 	dcElement('title', $article->mTitle->getText());
 	dcPageOrString('publisher', wfMsg('aboutpage'), $wgSitename);
-	dcElement('language', $wgLanguageCode);
+	dcElement('language', $wgContLanguageCode);
 	dcElement('type', 'Text');
 	dcElement('format', 'text/html');
 	dcElement('identifier', dcReallyFullUrl($article->mTitle));
 	dcElement('date', dcDate($article->getTimestamp()));
-	dcPerson('creator', $article->getUser());
-	
-	$contributors = dcContributors($article);
-	
-	foreach ($contributors as $user_name => $cid) {
-		dcPerson('contributor', $cid, $user_name);
+
+	$last_editor = $article->getUser();
+
+	if ($last_editor == 0) {
+		dcPerson('creator', 0);
+	} else {
+		dcPerson('creator', $last_editor, $article->getUserText(),
+				 User::whoIsReal($last_editor));
 	}
-	
+
+	$contributors = $article->getContributors();
+
+	foreach ($contributors as $user_parts) {
+		dcPerson('contributor', $user_parts[0], $user_parts[1], $user_parts[2]);
+	}
+
 	dcRights($article);
 }
 
-/* private */ function ccPrologue() {
+/**
+ * @access private
+ */
+function ccPrologue() {
 	global $wgOutputEncoding;
-	
+
 	echo "<" . "?xml version='1.0'  encoding='{$wgOutputEncoding}' ?" . ">
-	   
-<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#\">
-";
-}  
-
-/* private */ function ccSubPrologue($type, $url) {
+
+																		  <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#\">
+																		  ";
+}
+
+/**
+ * @access private
+ */
+function ccSubPrologue($type, $url) {
 	$url = htmlspecialchars( $url );
 	echo "  <cc:{$type} rdf:about=\"{$url}\">\n";
-}  
+}
 
-/* private */ function ccSubEpilogue($type) {
+/**
+ * @access private
+ */
+function ccSubEpilogue($type) {
 	echo "  </cc:{$type}>\n";
-}  
+}
+
+/**
+ * @access private
+ */
+function ccLicense($terms) {
 
-/* private */ function ccLicense($terms) {
-	
 	foreach ($terms as $term) {
 		switch ($term) {
-		case 're':
-			ccTerm('permits', "Reproduction"); break;
-		case 'di':
-			ccTerm('permits', "Distribution"); break;
-		case 'de':
-			ccTerm('permits', "DerivativeWorks"); break;
-		case 'nc':
-			ccTerm('prohibits', "CommercialUse"); break;
-		case 'no':
-			ccTerm('requires', "Notice"); break;
-		case 'by':
-			ccTerm('requires', "Attribution"); break;
-		case 'sa':
-			ccTerm('requires', "ShareAlike"); break;
-		case 'sc':
-			ccTerm('requires', "SourceCode"); break;		
+		 case 're':
+			ccTerm('permits', 'Reproduction'); break;
+		 case 'di':
+			ccTerm('permits', 'Distribution'); break;
+		 case 'de':
+			ccTerm('permits', 'DerivativeWorks'); break;
+		 case 'nc':
+			ccTerm('prohibits', 'CommercialUse'); break;
+		 case 'no':
+			ccTerm('requires', 'Notice'); break;
+		 case 'by':
+			ccTerm('requires', 'Attribution'); break;
+		 case 'sa':
+			ccTerm('requires', 'ShareAlike'); break;
+		 case 'sc':
+			ccTerm('requires', 'SourceCode'); break;
 		}
 	}
 }
 
-/* private */ function ccTerm($term, $name) {
+/**
+ * @access private
+ */
+function ccTerm($term, $name) {
 	print "    <cc:{$term} rdf:resource=\"http://web.resource.org/cc/{$name}\" />\n";
 }
 
-/* private */ function ccEpilogue() {
+/**
+ * @access private
+ */
+function ccEpilogue() {
 	echo "</rdf:RDF>\n";
 }
 
-/* private */ function dcElement($name, $value) {
+/**
+ * @access private
+ */
+function dcElement($name, $value) {
 	$value = htmlspecialchars( $value );
 	print "    <dc:{$name}>{$value}</dc:{$name}>\n";
 }
 
-/* private */ function dcDate($timestamp) {
-	return substr($timestamp, 0, 4) . "-" 
-		. substr($timestamp, 4, 2) . "-" 
-		. substr($timestamp, 6, 2);
+/**
+ * @access private
+ */
+function dcDate($timestamp) {
+	return substr($timestamp, 0, 4) . '-'
+	  . substr($timestamp, 4, 2) . '-'
+	  . substr($timestamp, 6, 2);
 }
 
-/* private */ function dcReallyFullUrl($title) {
+/**
+ * @access private
+ */
+function dcReallyFullUrl($title) {
 	return $title->getFullURL();
 }
 
-/* private */ function dcPageOrString($name, $page, $str) {
+/**
+ * @access private
+ */
+function dcPageOrString($name, $page, $str) {
 	$nt = Title::newFromText($page);
-	
+
 	if (!$nt || $nt->getArticleID() == 0) {
 		dcElement($name, $str);
 	} else {
@@ -195,67 +252,49 @@ function wfCreativeCommonsRdf($article) {
 	}
 }
 
-/* private */ function dcPage($name, $title) {
+/**
+ * @access private
+ */
+function dcPage($name, $title) {
 	dcUrl($name, dcReallyFullUrl($title));
 }
 
-/* private */ function dcUrl($name, $url) {
+/**
+ * @access private
+ */
+function dcUrl($name, $url) {
 	$url = htmlspecialchars( $url );
 	print "    <dc:{$name} rdf:resource=\"{$url}\" />\n";
 }
 
-/* private */ function dcPerson($name, $id, $user_name="") {
-	global $wgLang;
+/**
+ * @access private
+ */
+function dcPerson($name, $id, $user_name='', $user_real_name='') {
+	global $wgContLang;
 
 	if ($id == 0) {
-		dcElement($name, wfMsg("anonymous"));
+		dcElement($name, wfMsg('anonymous'));
+	} else if ( !empty($user_real_name) ) {
+		dcElement($name, $user_real_name);
 	} else {
+		# XXX: This shouldn't happen.
 		if( empty( $user_name ) ) {
 			$user_name = User::whoIs($id);
 		}
-		dcPageOrString($name, $wgLang->getNsText(NS_USER) . ":" . $user_name, $user_name);
+		dcPageOrString($name, $wgContLang->getNsText(NS_USER) . ':' . $user_name, wfMsg('siteuser', $user_name));
 	}
 }
 
-/* private */ function dcContributors($article) {
-
-        $title = $article->mTitle;
-
-	$contribs = array();
-	
-	$res = wfQuery("SELECT DISTINCT old_user,old_user_text" .
-	               " FROM old " .
-	               " WHERE old_namespace = " . $title->getNamespace() .
-	               " AND old_title = '" . $title->getDBkey() . "'" .
-                       " AND old_user != 0 " .
-                       " AND old_user != " . $article->getUser(), DB_READ);
-	
-	while ( $line = wfFetchObject( $res ) ) {
-		$contribs[$line->old_user_text] = $line->old_user;
-	}    
-
-        # Count anonymous users
-
-	$res = wfQuery("SELECT COUNT(*) AS cnt " .
-	               " FROM old " .
-	               " WHERE old_namespace = " . $title->getNamespace() .
-	               " AND old_title = '" . $title->getDBkey() . "'" .
-                       " AND old_user = 0 ", DB_READ);
-
-	while ( $line = wfFetchObject( $res ) ) {
-                $contribs[$line->cnt] = 0;
-	}    
-
-	return $contribs;
-}
-
-/* Takes an arg, for future enhancement with different rights for
- different pages. */
+/**
+ * Takes an arg, for future enhancement with different rights for
+ * different pages.
+ * @access private
+ */
+function dcRights($article) {
 
-/* private */ function dcRights($article) {
-	
 	global $wgRightsPage, $wgRightsUrl, $wgRightsText;
-	
+
 	if (isset($wgRightsPage) &&
 		($nt = Title::newFromText($wgRightsPage))
 		&& ($nt->getArticleID() != 0)) {
@@ -267,9 +306,12 @@ function wfCreativeCommonsRdf($article) {
 	}
 }
 
-/* private */ function ccGetTerms($url) {
+/**
+ * @access private
+ */
+function ccGetTerms($url) {
 	global $wgLicenseTerms;
-	
+
 	if (isset($wgLicenseTerms)) {
 		return $wgLicenseTerms;
 	} else {
@@ -278,34 +320,42 @@ function wfCreativeCommonsRdf($article) {
 	}
 }
 
-/* private */ function getKnownLicenses() {
-	
-	$ccLicenses = array('by', 'by-nd', 'by-nd-nc', 'by-nc', 
-	                    'by-nc-sa', 'by-sa', 'nd', 'nd-nc',
-	                    'nc', 'nc-sa', 'sa');
-	
+/**
+ * @access private
+ */
+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 ($ccLicenses as $license) {
-		$lurl = "http://creativecommons.org/licenses/{$license}/1.0/";
-		$knownLicenses[$lurl] = explode('-', $license);
-		$knownLicenses[$lurl][] = 're';
-		$knownLicenses[$lurl][] = 'di';
-		$knownLicenses[$lurl][] = 'no';
-		if (!in_array('nd', $knownLicenses[$lurl])) {
-			$knownLicenses[$lurl][] = 'de';
+
+	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');
-	
+
+	$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;
 }