X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMetadata.php;h=4b1c6bcd541f29368619db90eb181e6de6736dd5;hb=ec5fffe8ed64e3110f2a1bbdd2d734de44c9a397;hp=f9df5393aa6d83febe8d33e8420bfb48e29d3aa8;hpb=93b09379fb68515596bd3228d6efa168d14ddbae;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Metadata.php b/includes/Metadata.php index f9df5393aa..4b1c6bcd54 100644 --- a/includes/Metadata.php +++ b/includes/Metadata.php @@ -1,5 +1,6 @@ . * * This program is free software; you can redistribute it and/or modify @@ -15,9 +16,15 @@ * 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 + * @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) { @@ -60,7 +67,10 @@ function wfCreativeCommonsRdf($article) { ccEpilogue(); } -/* private */ function rdfSetup() { +/** + * @private + */ +function rdfSetup() { global $wgOut, $wgRdfMimeType, $_SERVER; $rdftype = wfNegotiateType(wfAcceptToPrefs($_SERVER['HTTP_ACCEPT']), wfAcceptToPrefs(RDF_TYPE_PREFS)); @@ -76,7 +86,10 @@ function wfCreativeCommonsRdf($article) { } } -/* private */ function dcPrologue($url) { +/** + * @private + */ +function dcPrologue($url) { global $wgOutputEncoding; $url = htmlspecialchars( $url ); @@ -90,14 +103,20 @@ function wfCreativeCommonsRdf($article) { "; } -/* private */ function dcEpilogue() { +/** + * @private + */ +function dcEpilogue() { print " "; } -/* private */ function dcBasics($article) { +/** + * @private + */ +function dcBasics($article) { global $wgLanguageCode, $wgSitename; dcElement('title', $article->mTitle->getText()); @@ -107,18 +126,29 @@ function wfCreativeCommonsRdf($article) { dcElement('format', 'text/html'); dcElement('identifier', dcReallyFullUrl($article->mTitle)); dcElement('date', dcDate($article->getTimestamp())); - dcPerson('creator', $article->getUser()); - - $contributors = dcContributors($article); + + $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_name => $cid) { - dcPerson('contributor', $cid, $user_name); + foreach ($contributors as $user_parts) { + dcPerson('contributor', $user_parts[0], $user_parts[1], $user_parts[2]); } dcRights($article); } -/* private */ function ccPrologue() { +/** + * @private + */ +function ccPrologue() { global $wgOutputEncoding; echo "<" . "?xml version='1.0' encoding='{$wgOutputEncoding}' ?" . "> @@ -129,63 +159,90 @@ function wfCreativeCommonsRdf($article) { "; } -/* private */ function ccSubPrologue($type, $url) { +/** + * @private + */ +function ccSubPrologue($type, $url) { $url = htmlspecialchars( $url ); echo " \n"; } -/* private */ function ccSubEpilogue($type) { +/** + * @private + */ +function ccSubEpilogue($type) { echo " \n"; } -/* private */ function ccLicense($terms) { +/** + * @private + */ +function ccLicense($terms) { foreach ($terms as $term) { switch ($term) { case 're': - ccTerm('permits', "Reproduction"); break; + ccTerm('permits', 'Reproduction'); break; case 'di': - ccTerm('permits', "Distribution"); break; + ccTerm('permits', 'Distribution'); break; case 'de': - ccTerm('permits', "DerivativeWorks"); break; + ccTerm('permits', 'DerivativeWorks'); break; case 'nc': - ccTerm('prohibits', "CommercialUse"); break; + ccTerm('prohibits', 'CommercialUse'); break; case 'no': - ccTerm('requires', "Notice"); break; + ccTerm('requires', 'Notice'); break; case 'by': - ccTerm('requires', "Attribution"); break; + ccTerm('requires', 'Attribution'); break; case 'sa': - ccTerm('requires', "ShareAlike"); break; + ccTerm('requires', 'ShareAlike'); break; case 'sc': - ccTerm('requires', "SourceCode"); break; + ccTerm('requires', 'SourceCode'); break; } } } -/* private */ function ccTerm($term, $name) { +/** + * @private + */ +function ccTerm($term, $name) { print " \n"; } -/* private */ function ccEpilogue() { +/** + * @private + */ +function ccEpilogue() { echo "\n"; } -/* private */ function dcElement($name, $value) { +/** + * @private + */ +function dcElement($name, $value) { $value = htmlspecialchars( $value ); print " {$value}\n"; } -/* private */ function dcDate($timestamp) { - return substr($timestamp, 0, 4) . "-" - . substr($timestamp, 4, 2) . "-" +/** + * @private + */ +function dcDate($timestamp) { + return substr($timestamp, 0, 4) . '-' + . substr($timestamp, 4, 2) . '-' . substr($timestamp, 6, 2); } -/* private */ function dcReallyFullUrl($title) { +/** + * @private + */ +function dcReallyFullUrl($title) { return $title->getFullURL(); } -/* private */ function dcPageOrString($name, $page, $str) { +/** + * @private + */ +function dcPageOrString($name, $page, $str) { $nt = Title::newFromText($page); if (!$nt || $nt->getArticleID() == 0) { @@ -195,64 +252,46 @@ function wfCreativeCommonsRdf($article) { } } -/* private */ function dcPage($name, $title) { +/** + * @private + */ +function dcPage($name, $title) { dcUrl($name, dcReallyFullUrl($title)); } -/* private */ function dcUrl($name, $url) { +/** + * @private + */ +function dcUrl($name, $url) { $url = htmlspecialchars( $url ); print " \n"; } -/* private */ function dcPerson($name, $id, $user_name="") { +/** + * @private + */ +function dcPerson($name, $id, $user_name='', $user_real_name='') { global $wgLang; 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, $wgLang->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. */ - -/* private */ function dcRights($article) { +/** + * Takes an arg, for future enhancement with different rights for + * different pages. + * @private + */ +function dcRights($article) { global $wgRightsPage, $wgRightsUrl, $wgRightsText; @@ -267,7 +306,10 @@ function wfCreativeCommonsRdf($article) { } } -/* private */ function ccGetTerms($url) { +/** + * @private + */ +function ccGetTerms($url) { global $wgLicenseTerms; if (isset($wgLicenseTerms)) { @@ -278,32 +320,40 @@ function wfCreativeCommonsRdf($article) { } } -/* private */ function getKnownLicenses() { +/** + * @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'); - + '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/"] = + $knownLicenses['http://creativecommons.org/licenses/GPL/2.0/'] = array('de', 're', 'di', 'no', 'sa', 'sc'); - $knownLicenses["http://creativecommons.org/licenses/LGPL/2.1/"] = + $knownLicenses['http://creativecommons.org/licenses/LGPL/2.1/'] = array('de', 're', 'di', 'no', 'sa', 'sc'); - $knownLicenses["http://www.gnu.org/copyleft/fdl.html"] = + $knownLicenses['http://www.gnu.org/copyleft/fdl.html'] = array('de', 're', 'di', 'no', 'sa', 'sc'); return $knownLicenses;