X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMetadata.php;h=ea89f524bbfdb93a94b38ed99303dfbf9a365ded;hb=bcb8fee4a9524cb0e47e8334c1963ac9e721d963;hp=0b8014a7b4277f5ac6d14f5ebe497ee6a4b24cd2;hpb=88066420004931111290ed42ce9ee8f6e3a76c90;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Metadata.php b/includes/Metadata.php
index 0b8014a7b4..ea89f524bb 100644
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -28,10 +28,10 @@ abstract class RdfMetaData {
 
 	/**
 	 * Constructor
-	 * @param $article Article object
+	 * @param Page $page
 	 */
-	public function __construct( Page $article ) {
-		$this->mArticle = $article;
+	public function __construct( Page $page ) {
+		$this->mArticle = $page;
 	}
 
 	abstract public function show();
@@ -40,9 +40,12 @@ abstract class RdfMetaData {
 		global $wgOut, $wgRequest;
 
 		$httpaccept = isset( $_SERVER['HTTP_ACCEPT'] ) ? $_SERVER['HTTP_ACCEPT'] : null;
-		$rdftype = wfNegotiateType( wfAcceptToPrefs( $httpaccept ), wfAcceptToPrefs( self::RDF_TYPE_PREFS ) );
+		$rdftype = wfNegotiateType(
+			wfAcceptToPrefs( $httpaccept ),
+			wfAcceptToPrefs( self::RDF_TYPE_PREFS )
+		);
 
-		if( !$rdftype ) {
+		if ( !$rdftype ) {
 			throw new HttpError( 406, wfMessage( 'notacceptable' ) );
 		}
 
@@ -70,7 +73,7 @@ abstract class RdfMetaData {
 		$lastEditor = User::newFromId( $this->mArticle->getUser() );
 		$this->person( 'creator', $lastEditor );
 
-		foreach( $this->mArticle->getContributors() as $user ) {
+		foreach ( $this->mArticle->getContributors() as $user ) {
 			$this->person( 'contributor', $user );
 		}
 
@@ -89,13 +92,13 @@ abstract class RdfMetaData {
 	}
 
 	protected function pageOrString( $name, $page, $str ) {
-		if( $page instanceof Title ) {
+		if ( $page instanceof Title ) {
 			$nt = $page;
 		} else {
 			$nt = Title::newFromText( $page );
 		}
 
-		if( !$nt || $nt->getArticleID() == 0 ) {
+		if ( !$nt || $nt->getArticleID() == 0 ) {
 			$this->element( $name, $str );
 		} else {
 			$this->page( $name, $nt );
@@ -103,11 +106,11 @@ abstract class RdfMetaData {
 	}
 
 	/**
-	 * @param $name string
-	 * @param $title Title
+	 * @param string $name
+	 * @param Title $title
 	 */
 	protected function page( $name, $title ) {
-		$this->url( $name, $title->getFullUrl() );
+		$this->url( $name, $title->getFullURL() );
 	}
 
 	protected function url( $name, $url ) {
@@ -116,11 +119,13 @@ abstract class RdfMetaData {
 	}
 
 	protected function person( $name, User $user ) {
-		if( $user->isAnon() ) {
+		global $wgHiddenPrefs;
+
+		if ( $user->isAnon() ) {
 			$this->element( $name, wfMessage( 'anonymous' )->numParams( 1 )->text() );
 		} else {
 			$real = $user->getRealName();
-			if( $real ) {
+			if ( $real && !in_array( 'realname', $wgHiddenPrefs ) ) {
 				$this->element( $name, $real );
 			} else {
 				$userName = $user->getName();
@@ -140,12 +145,12 @@ abstract class RdfMetaData {
 	protected function rights() {
 		global $wgRightsPage, $wgRightsUrl, $wgRightsText;
 
-		if( $wgRightsPage && ( $nt = Title::newFromText( $wgRightsPage ) )
+		if ( $wgRightsPage && ( $nt = Title::newFromText( $wgRightsPage ) )
 			&& ( $nt->getArticleID() != 0 ) ) {
 			$this->page( 'rights', $nt );
-		} elseif( $wgRightsUrl ) {
+		} elseif ( $wgRightsUrl ) {
 			$this->url( 'rights', $wgRightsUrl );
-		} elseif( $wgRightsText ) {
+		} elseif ( $wgRightsText ) {
 			$this->element( 'rights', $wgRightsText );
 		}
 	}
@@ -153,11 +158,11 @@ abstract class RdfMetaData {
 	protected function getTerms( $url ) {
 		global $wgLicenseTerms;
 
-		if( $wgLicenseTerms ) {
+		if ( $wgLicenseTerms ) {
 			return $wgLicenseTerms;
 		} else {
 			$known = $this->getKnownLicenses();
-			if( isset( $known[$url] ) ) {
+			if ( isset( $known[$url] ) ) {
 				return $known[$url];
 			} else {
 				return array();
@@ -173,7 +178,7 @@ abstract class RdfMetaData {
 
 		foreach ( $ccVersions as $version ) {
 			foreach ( $ccLicenses as $license ) {
-				if( $version == '2.0' && substr( $license, 0, 2 ) != 'by' ) {
+				if ( $version == '2.0' && substr( $license, 0, 2 ) != 'by' ) {
 					# 2.0 dropped the non-attribs licenses
 					continue;
 				}