Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 108 insertions, 200 deletions

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index cecd7dfd..ea20c2f7 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -20,244 +20,152 @@
  * @file
  * @ingroup SpecialPage
  */
+class SpecialNewFiles extends IncludableSpecialPage {
 
-/**
- * @todo FIXME: this code is crap, should use Pager and Database::select().
- */
-function wfSpecialNewimages( $par, $specialPage ) {
-	global $wgUser, $wgOut, $wgLang, $wgRequest, $wgMiserMode;
-
-	$wpIlMatch = $wgRequest->getText( 'wpIlMatch' );
-	$dbr = wfGetDB( DB_SLAVE );
-	$sk = $wgUser->getSkin();
-	$shownav = !$specialPage->including();
-	$hidebots = $wgRequest->getBool( 'hidebots' , 1 );
+	public function __construct(){
+		parent::__construct( 'Newimages' );
+	}
 
-	$hidebotsql = '';
-	if ( $hidebots ) {
-		# Make a list of group names which have the 'bot' flag set.
-		$botconds = array();
-		foreach ( User::getGroupsWithPermission('bot') as $groupname ) {
-			$botconds[] = 'ug_group = ' . $dbr->addQuotes( $groupname );
-		}
+	public function execute( $par ){
+		$this->setHeaders();
+		$this->outputHeader();
 
-		# If not bot groups, do not set $hidebotsql
-		if ( $botconds ) {
-			$isbotmember = $dbr->makeList( $botconds, LIST_OR );
+		$pager = new NewFilesPager( $par );
 
-			# This join, in conjunction with WHERE ug_group IS NULL, returns
-			# only those rows from IMAGE where the uploading user is not a mem-
-			# ber of a group which has the 'bot' permission set.
-			$ug = $dbr->tableName( 'user_groups' );
-			$hidebotsql = " LEFT JOIN $ug ON img_user=ug_user AND ($isbotmember)";
+		if ( !$this->including() ) {
+			$form = $pager->getForm();
+			$form->prepareForm();
+			$form->displayForm( '' );
+		}
+		$this->getOutput()->addHTML( $pager->getBody() );
+		if ( !$this->including() ) {
+			$this->getOutput()->addHTML( $pager->getNavigationBar() );
 		}
 	}
+}
 
-	$image = $dbr->tableName( 'image' );
 
-	$sql = "SELECT img_timestamp from $image";
-	if ($hidebotsql) {
-		$sql .= "$hidebotsql WHERE ug_group IS NULL";
-	}
-	$sql .= ' ORDER BY img_timestamp DESC';
-	$sql = $dbr->limitResult($sql, 1, false);
-	$res = $dbr->query( $sql, __FUNCTION__ );
-	$row = $dbr->fetchRow( $res );
-	if( $row !== false ) {
-		$ts = $row[0];
-	} else {
-		$ts = false;
-	}
+/**
+ * @ingroup SpecialPage Pager
+ */
+class NewFilesPager extends ReverseChronologicalPager {
 
-	# If we were clever, we'd use this to cache.
-	$latestTimestamp = wfTimestamp( TS_MW, $ts );
+	function __construct( $par = null ) {
+		global $wgRequest;
 
-	# Hardcode this for now.
-	$limit = 48;
-	$parval = intval( $par );
-	if ( $parval ) {
-		if ( $parval <= $limit && $parval > 0 ) {
-			$limit = $parval;
-		}
-	}
+		$this->like = $wgRequest->getText( 'like' );
+		$this->showbots = $wgRequest->getBool( 'showbots' , 0 );
+		$this->skin = $this->getSkin();
 
-	$where = array();
-	$searchpar = array();
-	if ( $wpIlMatch != '' && !$wgMiserMode) {
-		$nt = Title::newFromURL( $wpIlMatch );
-		if( $nt ) {
-			$where[] = 'LOWER(img_name) ' .  $dbr->buildLike( $dbr->anyString(), strtolower( $nt->getDBkey() ), $dbr->anyString() );
-			$searchpar['wpIlMatch'] = $wpIlMatch;
-		}
+		parent::__construct();
 	}
 
-	$invertSort = false;
-	$until = $wgRequest->getVal( 'until' );
-	if( $until ) {
-		$where[] = "img_timestamp < '" . $dbr->timestamp( $until ) . "'";
+	function getTitle() {
+		return SpecialPage::getTitleFor( 'Newimages' );
 	}
-	$from = $wgRequest->getVal( 'from' );
-	if( $from ) {
-		$where[] = "img_timestamp >= '" . $dbr->timestamp( $from ) . "'";
-		$invertSort = true;
-	}
-	$sql = 'SELECT img_size, img_name, img_user, img_user_text,'.
-	     "img_description,img_timestamp FROM $image";
 
-	if( $hidebotsql ) {
-		$sql .= $hidebotsql;
-		$where[] = 'ug_group IS NULL';
-	}
-	if( count( $where ) ) {
-		$sql .= ' WHERE ' . $dbr->makeList( $where, LIST_AND );
-	}
-	$sql.=' ORDER BY img_timestamp '. ( $invertSort ? '' : ' DESC' );
-	$sql = $dbr->limitResult($sql, ( $limit + 1 ), false);
-	$res = $dbr->query( $sql, __FUNCTION__ );
+	function getQueryInfo() {
+		global $wgMiserMode;
+		$conds = $jconds = array();
+		$tables = array( 'image' );
 
-	/**
-	 * We have to flip things around to get the last N after a certain date
-	 */
-	$images = array();
-	foreach ( $res as $s ) {
-		if( $invertSort ) {
-			array_unshift( $images, $s );
-		} else {
-			array_push( $images, $s );
+		if( !$this->showbots ) {
+			$tables[] = 'user_groups';
+			$conds[] = 'ug_group IS NULL';
+			$jconds['user_groups'] = array(
+				'LEFT JOIN',
+				array(
+					'ug_group' => User::getGroupsWithPermission( 'bot' ),
+					'ug_user = img_user'
+				)
+			);
 		}
-	}
 
-	$gallery = new ImageGallery();
-	$firstTimestamp = null;
-	$lastTimestamp = null;
-	$shownImages = 0;
-	foreach( $images as $s ) {
-		$shownImages++;
-		if( $shownImages > $limit ) {
-			# One extra just to test for whether to show a page link;
-			# don't actually show it.
-			break;
+		if( !$wgMiserMode && $this->like !== null ){
+			$dbr = wfGetDB( DB_SLAVE );
+			$likeObj = Title::newFromURL( $this->like );
+			if( $likeObj instanceof Title ){
+				$like = $dbr->buildLike( $dbr->anyString(), strtolower( $likeObj->getDBkey() ), $dbr->anyString() );
+				$conds[] = "LOWER(img_name) $like";
+			}
 		}
 
-		$name = $s->img_name;
-		$ut = $s->img_user_text;
-
-		$nt = Title::newFromText( $name, NS_FILE );
-		$ul = $sk->link( Title::makeTitle( NS_USER, $ut ), $ut );
-
-		$gallery->add( $nt, "$ul<br />\n<i>".htmlspecialchars($wgLang->timeanddate( $s->img_timestamp, true ))."</i><br />\n" );
+		$query = array(
+			'tables' => $tables,
+			'fields' => '*',
+			'join_conds' => $jconds,
+			'conds' => $conds
+		);
 
-		$timestamp = wfTimestamp( TS_MW, $s->img_timestamp );
-		if( empty( $firstTimestamp ) ) {
-			$firstTimestamp = $timestamp;
-		}
-		$lastTimestamp = $timestamp;
+		return $query;
 	}
 
-	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
-	$action = $titleObj->getLocalURL( $hidebots ? '' : 'hidebots=0' );
-	if ( $shownav && !$wgMiserMode ) {
-		$wgOut->addHTML(
-			Xml::openElement( 'form', array( 'action' => $action, 'method' => 'post', 'id' => 'imagesearch' ) ) .
-			Xml::fieldset( wfMsg( 'newimages-legend' ) ) .
-			Xml::inputLabel( wfMsg( 'newimages-label' ), 'wpIlMatch', 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
-			Xml::submitButton( wfMsg( 'ilsubmit' ), array( 'name' => 'wpIlSubmit' ) ) .
-			Xml::closeElement( 'fieldset' ) .
-			Xml::closeElement( 'form' )
-		 );
+	function getIndexField(){
+		return 'img_timestamp';
 	}
 
-	$bydate = wfMsg( 'bydate' );
-	$lt = $wgLang->formatNum( min( $shownImages, $limit ) );
-	if ( $shownav ) {
-		$text = wfMsgExt( 'imagelisttext', array('parse'), $lt, $bydate );
-		$wgOut->addHTML( $text . "\n" );
+	function getStartBody(){
+		$this->gallery = new ImageGallery();
 	}
 
-	/**
-	 * Paging controls...
-	 */
-
-	# If we change bot visibility, this needs to be carried along.
-	if( !$hidebots ) {
-		$botpar = array( 'hidebots' => 0 );
-	} else {
-		$botpar = array();
+	function getEndBody(){
+		return $this->gallery->toHTML();
 	}
-	$now = wfTimestampNow();
-	$d = $wgLang->date( $now, true );
-	$t = $wgLang->time( $now, true );
-	$query = array_merge(
-		array( 'from' => $now ),
-		$botpar,
-		$searchpar
-	);
-
-	$dateLink = $sk->linkKnown(
-		$titleObj,
-		htmlspecialchars( wfMsg( 'sp-newimages-showfrom', $d, $t ) ),
-		array(),
-		$query
-	);
 
-	$query = array_merge(
-		array( 'hidebots' => ( $hidebots ? 0 : 1 ) ),
-		$searchpar
-	);
+	function formatRow( $row ) {
+		global $wgLang;
 
-	$showhide = $hidebots ? wfMsg( 'show' ) : wfMsg( 'hide' );
+		$name = $row->img_name;
+		$user = User::newFromId( $row->img_user );
 
-	$botLink = $sk->linkKnown(
-		$titleObj,
-		htmlspecialchars( wfMsg( 'showhidebots', $showhide ) ),
-		array(),
-		$query
-	);
+		$title = Title::makeTitle( NS_FILE, $name );
+		$ul = $this->skin->link( $user->getUserpage(), $user->getName() );
 
-	$opts = array( 'parsemag', 'escapenoentities' );
-	$prevLink = wfMsgExt( 'pager-newer-n', $opts, $wgLang->formatNum( $limit ) );
-	if( $firstTimestamp && $firstTimestamp != $latestTimestamp ) {
-		$query = array_merge(
-			array( 'from' => $firstTimestamp ),
-			$botpar,
-			$searchpar
-		);
-
-		$prevLink = $sk->linkKnown(
-			$titleObj,
-			$prevLink,
-			array(),
-			$query
+		$this->gallery->add(
+			$title,
+			"$ul<br />\n<i>"
+				. htmlspecialchars( $wgLang->timeanddate( $row->img_timestamp, true ) )
+				. "</i><br />\n"
 		);
 	}
 
-	$nextLink = wfMsgExt( 'pager-older-n', $opts, $wgLang->formatNum( $limit ) );
-	if( $invertSort || ( $shownImages > $limit && $lastTimestamp ) ) {
-		$query = array_merge(
-			array( 'until' => ( $lastTimestamp ? $lastTimestamp : "" ) ),
-			$botpar,
-			$searchpar
-		);
-
-		$nextLink = $sk->linkKnown(
-			$titleObj,
-			$nextLink,
-			array(),
-			$query
+	function getForm() {
+		global $wgRequest, $wgMiserMode;
+
+		$fields = array(
+			'like' => array(
+				'type' => 'text',
+				'label-message' => 'newimages-label',
+				'name' => 'like',
+			),
+			'showbots' => array(
+				'type' => 'check',
+				'label' => wfMessage( 'showhidebots', wfMsg( 'show' ) ),
+				'name' => 'showbots',
+			#	'default' => $wgRequest->getBool( 'showbots', 0 ),
+			),
+			'limit' => array(
+				'type' => 'hidden',
+				'default' => $wgRequest->getText( 'limit' ),
+				'name' => 'limit',
+			),
+			'offset' => array(
+				'type' => 'hidden',
+				'default' => $wgRequest->getText( 'offset' ),
+				'name' => 'offset',
+			),
 		);
 
-	}
-
-	$prevnext = '<p>' . $botLink . ' '. wfMsgHtml( 'viewprevnext', $prevLink, $nextLink, $dateLink ) .'</p>';
+		if( $wgMiserMode ){
+			unset( $fields['like'] );
+		}
 
-	if ($shownav)
-		$wgOut->addHTML( $prevnext );
+		$form = new HTMLForm( $fields );
+		$form->setTitle( $this->getTitle() );
+		$form->setSubmitText( wfMsg( 'ilsubmit' ) );
+		$form->setMethod( 'get' );
+		$form->setWrapperLegend( wfMsg( 'newimages-legend' ) );
 
-	if( count( $images ) ) {
-		$wgOut->addHTML( $gallery->toHTML() );
-		if ($shownav)
-			$wgOut->addHTML( $prevnext );
-	} else {
-		$wgOut->addWikiMsg( 'noimages' );
+		return $form;
 	}
 }