<?php
/**
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
*/
-/** */
-require_once( 'ImageGallery.php' );
-
/**
*
*/
-function wfSpecialNewimages() {
- global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest;
-
+function wfSpecialNewimages( $par, $specialPage ) {
+ global $wgUser, $wgOut, $wgLang, $wgRequest, $wgGroupPermissions;
+
$wpIlMatch = $wgRequest->getText( 'wpIlMatch' );
- $dbr =& wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_SLAVE );
$sk = $wgUser->getSkin();
+ $shownav = !$specialPage->including();
+ $hidebots = $wgRequest->getBool('hidebots',1);
+
+ $hidebotsql = '';
+ if ($hidebots) {
+
+ /** Make a list of group names which have the 'bot' flag
+ set.
+ */
+ $botconds=array();
+ foreach ($wgGroupPermissions as $groupname=>$perms) {
+ if(array_key_exists('bot',$perms) && $perms['bot']) {
+ $botconds[]="ug_group='$groupname'";
+ }
+ }
+
+ /* If not bot groups, do not set $hidebotsql */
+ if ($botconds) {
+ $isbotmember=$dbr->makeList($botconds, LIST_OR);
+
+ /** This join, in conjunction with WHERE ug_group
+ IS NULL, returns only those rows from IMAGE
+ where the uploading user is not a member of
+ a group which has the 'bot' permission set.
+ */
+ $ug = $dbr->tableName('user_groups');
+ $hidebotsql = " LEFT OUTER JOIN $ug ON img_user=ug_user AND ($isbotmember)";
+ }
+ }
+
+ $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 LIMIT 1';
+ $res = $dbr->query($sql, 'wfSpecialNewImages');
+ $row = $dbr->fetchRow($res);
+ if($row!==false) {
+ $ts=$row[0];
+ } else {
+ $ts=false;
+ }
+ $dbr->freeResult($res);
+ $sql='';
/** If we were clever, we'd use this to cache. */
- $latestTimestamp = wfTimestamp( TS_MW, $dbr->selectField(
- 'image', 'img_timestamp',
- '', 'wfSpecialNewimages',
- array( 'ORDER BY' => 'img_timestamp DESC',
- 'LIMIT' => 1 ) ) );
-
+ $latestTimestamp = wfTimestamp( TS_MW, $ts);
+
/** Hardcode this for now. */
$limit = 48;
-
+
+ if ( $parval = intval( $par ) ) {
+ if ( $parval <= $limit && $parval > 0 ) {
+ $limit = $parval;
+ }
+ }
+
$where = array();
- if ( !empty( $wpIlMatch ) ) {
+ $searchpar = '';
+ if ( $wpIlMatch != '' ) {
$nt = Title::newFromUrl( $wpIlMatch );
if($nt ) {
$m = $dbr->strencode( strtolower( $nt->getDBkey() ) );
$m = str_replace( '%', "\\%", $m );
$m = str_replace( '_', "\\_", $m );
$where[] = "LCASE(img_name) LIKE '%{$m}%'";
+ $searchpar = '&wpIlMatch=' . urlencode( $wpIlMatch );
}
- }
-
+ }
+
$invertSort = false;
if( $until = $wgRequest->getVal( 'until' ) ) {
$where[] = 'img_timestamp < ' . $dbr->timestamp( $until );
$where[] = 'img_timestamp >= ' . $dbr->timestamp( $from );
$invertSort = true;
}
-
- $res = $dbr->select( 'image',
- array( 'img_size', 'img_name', 'img_user', 'img_user_text',
- 'img_description', 'img_timestamp' ),
- $where,
- 'wfSpecialNewimages',
- array( 'LIMIT' => $limit + 1,
- 'ORDER BY' => 'img_timestamp' . ( $invertSort ? '' : ' DESC' ) )
- );
+ $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.=' LIMIT '.($limit+1);
+ $res = $dbr->query($sql, 'wfSpecialNewImages');
/**
* We have to flip things around to get the last N after a certain date
}
}
$dbr->freeResult( $res );
-
+
$gallery = new ImageGallery();
$firstTimestamp = null;
$lastTimestamp = null;
# don't actually show it.
break;
}
-
+
$name = $s->img_name;
$ut = $s->img_user_text;
$nt = Title::newFromText( $name, NS_IMAGE );
- $img = Image::newFromTitle( $nt );
+ $img = new Image( $nt );
$ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut );
- $gallery->add( $img, $ul.'<br /><i>'.$wgLang->timeanddate( $s->img_timestamp, true ).'</i><br />' );
-
- $timestamp = wfTImestamp( TS_MW, $s->img_timestamp );
+ $gallery->add( $img, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" );
+
+ $timestamp = wfTimestamp( TS_MW, $s->img_timestamp );
if( empty( $firstTimestamp ) ) {
$firstTimestamp = $timestamp;
}
$lastTimestamp = $timestamp;
}
-
+
$bydate = wfMsg( 'bydate' );
$lt = $wgLang->formatNum( min( $shownImages, $limit ) );
- $text = wfMsg( "imagelisttext",
- "<strong>{$lt}</strong>", "<strong>{$bydate}</strong>" );
- $wgOut->addHTML( "<p>{$text}\n</p>" );
+ if ($shownav) {
+ $text = wfMsgExt( 'imagelisttext', array('parse'), $lt, $bydate );
+ $wgOut->addHTML( $text . "\n" );
+ }
- $cap = wfMsg( 'ilshowmatch' );
$sub = wfMsg( 'ilsubmit' );
- $titleObj = Title::makeTitle( NS_SPECIAL, 'Newimages' );
- $action = $titleObj->escapeLocalURL( "limit={$limit}" );
-
- $wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
- "{$action}\">" .
- "{$cap}: <input type='text' size='8' name=\"wpIlMatch\" value=\"" .
- htmlspecialchars( $wpIlMatch ) . "\" /> " .
- "<input type='submit' name=\"wpIlSubmit\" value=\"{$sub}\" /></form>" );
- $here = $wgContLang->specialPage( 'Newimages' );
+ $titleObj = SpecialPage::getTitleFor( 'Newimages' );
+ $action = $titleObj->escapeLocalURL( $hidebots ? '' : 'hidebots=0' );
+ if ($shownav) {
+ $wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
+ "{$action}\">" .
+ Xml::input( 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
+ Xml::submitButton( $sub, array( 'name' => 'wpIlSubmit' ) ) .
+ "</form>" );
+ }
/**
* Paging controls...
*/
+
+ # If we change bot visibility, this needs to be carried along.
+ if(!$hidebots) {
+ $botpar='&hidebots=0';
+ } else {
+ $botpar='';
+ }
$now = wfTimestampNow();
- $date = $wgLang->timeanddate( $now );
- $dateLink = $sk->makeKnownLinkObj( $titleObj, wfMsg( 'rclistfrom', $date ), 'from=' . $now );
-
- $prevLink = wfMsg( 'prevn', $wgLang->formatNum( $limit ) );
+ $date = $wgLang->timeanddate( $now, true );
+ $dateLink = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml( 'sp-newimages-showfrom', $date ), 'from='.$now.$botpar.$searchpar );
+
+ $botLink = $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'showhidebots', ($hidebots ? wfMsgHtml('show') : wfMsgHtml('hide'))),'hidebots='.($hidebots ? '0' : '1').$searchpar);
+
+ $prevLink = wfMsgHtml( 'prevn', $wgLang->formatNum( $limit ) );
if( $firstTimestamp && $firstTimestamp != $latestTimestamp ) {
- $prevLink = $sk->makeKnownLinkObj( $titleObj, $prevLink, 'from=' . $firstTimestamp );
+ $prevLink = $sk->makeKnownLinkObj( $titleObj, $prevLink, 'from=' . $firstTimestamp . $botpar . $searchpar );
}
-
- $nextLink = wfMsg( 'nextn', $wgLang->formatNum( $limit ) );
+
+ $nextLink = wfMsgHtml( 'nextn', $wgLang->formatNum( $limit ) );
if( $shownImages > $limit && $lastTimestamp ) {
- $nextLink = $sk->makeKnownLinkObj( $titleObj, $nextLink, 'until=' . $lastTimestamp );
+ $nextLink = $sk->makeKnownLinkObj( $titleObj, $nextLink, 'until=' . $lastTimestamp.$botpar.$searchpar );
}
-
- $prevnext = '<p>' . wfMsg( 'viewprevnext', $prevLink, $nextLink, $dateLink ) . '</p>';
- $wgOut->addHTML( $prevnext );
-
+
+ $prevnext = '<p>' . $botLink . ' '. wfMsgHtml( 'viewprevnext', $prevLink, $nextLink, $dateLink ) .'</p>';
+
+ if ($shownav)
+ $wgOut->addHTML( $prevnext );
+
if( count( $images ) ) {
$wgOut->addHTML( $gallery->toHTML() );
- $wgOut->addHTML( $prevnext );
+ if ($shownav)
+ $wgOut->addHTML( $prevnext );
} else {
$wgOut->addWikiText( wfMsg( 'noimages' ) );
}
dépôts / lhc / web / wiklou.git / blobdiff