From 396b28f3d881f5debd888ba9bb9b47c2d478a76f Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 15 Dec 2008 18:02:47 +0100 Subject: update to Mediawiki 1.13.3; some cleanups --- includes/SpecialNewimages.php | 207 ------------------------------------------ 1 file changed, 207 deletions(-) delete mode 100644 includes/SpecialNewimages.php (limited to 'includes/SpecialNewimages.php') diff --git a/includes/SpecialNewimages.php b/includes/SpecialNewimages.php deleted file mode 100644 index 013b0986..00000000 --- a/includes/SpecialNewimages.php +++ /dev/null @@ -1,207 +0,0 @@ -getText( 'wpIlMatch' ); - $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, $ts); - - /** Hardcode this for now. */ - $limit = 48; - - if ( $parval = intval( $par ) ) { - if ( $parval <= $limit && $parval > 0 ) { - $limit = $parval; - } - } - - $where = array(); - $searchpar = ''; - if ( $wpIlMatch != '' && !$wgMiserMode) { - $nt = Title::newFromUrl( $wpIlMatch ); - if($nt ) { - $m = $dbr->strencode( strtolower( $nt->getDBkey() ) ); - $m = str_replace( '%', "\\%", $m ); - $m = str_replace( '_', "\\_", $m ); - $where[] = "LOWER(img_name) LIKE '%{$m}%'"; - $searchpar = '&wpIlMatch=' . urlencode( $wpIlMatch ); - } - } - - $invertSort = false; - if( $until = $wgRequest->getVal( 'until' ) ) { - $where[] = "img_timestamp < '" . $dbr->timestamp( $until ) . "'"; - } - if( $from = $wgRequest->getVal( '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.=' LIMIT '.($limit+1); - $res = $dbr->query($sql, 'wfSpecialNewImages'); - - /** - * We have to flip things around to get the last N after a certain date - */ - $images = array(); - while ( $s = $dbr->fetchObject( $res ) ) { - if( $invertSort ) { - array_unshift( $images, $s ); - } else { - array_push( $images, $s ); - } - } - $dbr->freeResult( $res ); - - $gallery = new ImageGallery(); - $firstTimestamp = null; - $lastTimestamp = null; - $shownImages = 0; - foreach( $images as $s ) { - if( ++$shownImages > $limit ) { - # One extra just to test for whether to show a page link; - # don't actually show it. - break; - } - - $name = $s->img_name; - $ut = $s->img_user_text; - - $nt = Title::newFromText( $name, NS_IMAGE ); - $ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut ); - - $gallery->add( $nt, "$ul
\n".$wgLang->timeanddate( $s->img_timestamp, true )."
\n" ); - - $timestamp = wfTimestamp( TS_MW, $s->img_timestamp ); - if( empty( $firstTimestamp ) ) { - $firstTimestamp = $timestamp; - } - $lastTimestamp = $timestamp; - } - - $bydate = wfMsg( 'bydate' ); - $lt = $wgLang->formatNum( min( $shownImages, $limit ) ); - if ($shownav) { - $text = wfMsgExt( 'imagelisttext', array('parse'), $lt, $bydate ); - $wgOut->addHTML( $text . "\n" ); - } - - $sub = wfMsg( 'ilsubmit' ); - $titleObj = SpecialPage::getTitleFor( 'Newimages' ); - $action = $titleObj->escapeLocalURL( $hidebots ? '' : 'hidebots=0' ); - if ($shownav && !$wgMiserMode) { - $wgOut->addHTML( "
" . - Xml::input( 'wpIlMatch', 20, $wpIlMatch ) . ' ' . - Xml::submitButton( $sub, array( 'name' => 'wpIlSubmit' ) ) . - "
" ); - } - - /** - * 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, 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 . $botpar . $searchpar ); - } - - $nextLink = wfMsgHtml( 'nextn', $wgLang->formatNum( $limit ) ); - if( $shownImages > $limit && $lastTimestamp ) { - $nextLink = $sk->makeKnownLinkObj( $titleObj, $nextLink, 'until=' . $lastTimestamp.$botpar.$searchpar ); - } - - $prevnext = '

' . $botLink . ' '. wfMsgHtml( 'viewprevnext', $prevLink, $nextLink, $dateLink ) .'

'; - - if ($shownav) - $wgOut->addHTML( $prevnext ); - - if( count( $images ) ) { - $wgOut->addHTML( $gallery->toHTML() ); - if ($shownav) - $wgOut->addHTML( $prevnext ); - } else { - $wgOut->addWikiMsg( 'noimages' ); - } -} - - -- cgit v1.2.2