PageImages support for mode=gallery on non file pages

includes/Lister/GalleryList.php

@@ -3,6 +3,8 @@
 namespace MediaWiki\Extension\DynamicPageList3\Lister;
 
 use MediaWiki\Extension\DynamicPageList3\Article;
+use PageImages\PageImages;
+use ExtensionRegistry;
 
 class GalleryList extends Lister {
 	/**
@@ -50,12 +52,31 @@
 	public function formatItem( Article $article, $pageText = null ) {
 		$item = $article->mTitle;
 
-		if ( $pageText !== null ) {
-			// Include parsed/processed wiki markup content after each item before the closing tag.
-			$item .= $pageText;
+		// If PageImages is loaded and we are not in the file namespace, attempt to assemble a gallery of PageImages
+		if ( $article->mNamespace != NS_FILE && ExtensionRegistry::getInstance()->isLoaded( 'PageImages' ) ) {
+
+			$pageImage = $this->getPageImage( $article->mID ) ?: false;
+
+			if ( $pageImage ) {
+				// Successfully got a pageimage, wrapping it
+				$item = $this->getItemStart() . $pageImage . "| [[" . $item . "]]" . $this->itemEnd . "link=" . $item . "";
+			}
+			else {
+				// Failed to get a pageimage
+				$item = $this->getItemStart() . $item . $this->itemEnd . "[[" . $item . "]]";
+			}
+
 		}
+		else {
+
+			if ( $pageText !== null ) {
+				// Include parsed/processed wiki markup content after each item before the closing tag.
+				$item .= $pageText;
+			}
 
-		$item = $this->getItemStart() . $item . $this->itemEnd;
+			$item = $this->getItemStart() . $item . $this->itemEnd;
+
+		}
 
 		$item = $this->replaceTagParameters( $item, $article );
 

includes/Lister/Lister.php

@@ -7,6 +7,8 @@
 use MediaWiki\Extension\DynamicPageList3\Parameters;
 use MediaWiki\Extension\DynamicPageList3\UpdateArticle;
 use MediaWiki\MediaWikiServices;
+use PageImages\PageImages;
+use ExtensionRegistry;
 use Parser;
 use RequestContext;
 use Sanitizer;
@@ -970,6 +972,7 @@
 	 */
 	protected function parseImageUrlWithPath( $article ) {
 		$repoGroup = MediaWikiServices::getInstance()->getRepoGroup();
+		$pageImagesEnabled = ExtensionRegistry::getInstance()->isLoaded( 'PageImages' );
 
 		$imageUrl = '';
 		if ( $article instanceof Article ) {
@@ -984,6 +987,20 @@
 					$fileTitle = Title::makeTitleSafe( NS_FILE, $article->mTitle->getDBKey() );
 					$imageUrl = $repoGroup->getLocalRepo()->newFile( $fileTitle )->getPath();
 				}
+			} else if ( $pageImagesEnabled ) {
+
+				$pageImage = self::getPageImage( $article->mID ) ?: false;
+				if ( !$pageImage ) { 
+					return ""; 
+				}
+				$img = $repoGroup->findFile( Title::makeTitle( NS_FILE, $pageImage ) );
+				if ( $img && $img->exists() ) {
+					$imageUrl = $img->getURL();
+				} else {
+					$imageUrl = "";
+					//$fileTitle = Title::makeTitleSafe( NS_FILE, $article->mTitle->getDBKey() );
+					//$imageUrl = $repoGroup->getLocalRepo()->newFile( $fileTitle )->getPath();
+				}
 			}
 		} else {
 			$title = Title::newfromText( 'File:' . $article );
@@ -1301,4 +1318,24 @@
 	public function getRowCount() {
 		return $this->rowCount;
 	}
+
+
+	public function getPageImage( int $pageID ) {
+
+		$dbl = MediaWikiServices::getInstance()->getDBLoadBalancer();
+		$dbr = $dbl->getConnection( DB_REPLICA );
+		//in the future, a check could be made for page_image too, but page_image_free is the default, should do for now
+		$propValue = $dbr->selectField( 'page_props', // table to use
+					'pp_value', // Field to select
+					[ 'pp_page' => $pageID, 'pp_propname' => "page_image_free" ], // where conditions 
+					__METHOD__
+		);
+		if ( $propValue === false ) {
+					// No prop stored for this page
+					return false;
+		}
+
+		return $propValue;
+	}
+
 }