X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUnusedimages.php;h=52aa19d26b9f0e42041ca7ffafd4772820c6b238;hb=16ed0301cdf7443b79d93e5005b81b9934e58eb8;hp=77bce4d9047e3861121c042eba4f3ecd1302c704;hpb=377bc40965a25e294f54608b3097973d68038c4f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialUnusedimages.php b/includes/SpecialUnusedimages.php
index 77bce4d904..52aa19d26b 100644
--- a/includes/SpecialUnusedimages.php
+++ b/includes/SpecialUnusedimages.php
@@ -1,56 +1,44 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/** */
-require_once("QueryPage.php");
-
 /**
- *
+ * implements Special:Unusedimages
+ * @addtogroup SpecialPage
  */
-class UnusedimagesPage extends QueryPage {
+class UnusedimagesPage extends ImageQueryPage {
 
 	function getName() {
 		return 'Unusedimages';
 	}
-	
+
 	function sortDescending() {
 		return false;
 	}
+	function isSyndicated() { return false; }
 
 	function getSQL() {
-		$dbr =& wfGetDB( DB_SLAVE );
-		extract( $dbr->tableNames( 'image','imagelinks' ) );
-		
-		return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description' .
-		      ' FROM '.$image.' LEFT JOIN '.$imagelinks.' ON img_name=il_to WHERE il_to IS NULL ';
-	}
-	
-	function formatResult( $skin, $result ) {
-		global $wgLang;
-		$title = Title::makeTitle( NS_IMAGE, $result->title );
-		$ins = $wgLang->getNsText(NS_IMAGE);
-		
-		$return =
-		# The 'desc' linking to the image page
-		'('.$skin->makeKnownLink( $ins.':'.$result->title, wfMsg('imgdesc') ).') '
-		# Link to the image itself
-		. '<a href="'.Image::wfImageUrl($title->getText()).'">'.$title->getText().'</a>'
-		# Last modified date
-		. ' . . '.$wgLang->timeanddate($result->value)
-		# Link to username
-		. ' . . '.$skin->makeLink($wgLang->getNsText(NS_USER).':'.$result->img_user_text,$result->img_user_text);
-		
-		# If there is a description, show it
-		if($result->img_description != '') {
-			$return .= ' <em>('.$result->img_description.')</em>';
+		global $wgCountCategorizedImagesAsUsed;
+		$dbr = wfGetDB( DB_SLAVE );
+
+		if ( $wgCountCategorizedImagesAsUsed ) {
+			list( $page, $image, $imagelinks, $categorylinks ) = $dbr->tableNamesN( 'page', 'image', 'imagelinks', 'categorylinks' );
+
+			return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description
+					FROM ((('.$page.' AS I LEFT JOIN '.$categorylinks.' AS L ON I.page_id = L.cl_from)
+						LEFT JOIN '.$imagelinks.' AS P ON I.page_title = P.il_to)
+						INNER JOIN '.$image.' AS G ON I.page_title = G.img_name)
+					WHERE I.page_namespace = '.NS_IMAGE.' AND L.cl_from IS NULL AND P.il_to IS NULL';
+		} else {
+			list( $image, $imagelinks ) = $dbr->tableNamesN( 'image','imagelinks' );
+
+			return 'SELECT img_name as title, img_user, img_user_text, img_timestamp as value, img_description' .
+			' FROM '.$image.' LEFT JOIN '.$imagelinks.' ON img_name=il_to WHERE il_to IS NULL ';
 		}
-		return $return;
 	}
-	
+
 	function getPageHeader() {
 		return wfMsg( "unusedimagestext" );
 	}
@@ -66,4 +54,4 @@ function wfSpecialUnusedimages() {
 
 	return $uip->doQuery( $offset, $limit );
 }
-?>
+