diff options
Diffstat (limited to 'includes/api/ApiFeedWatchlist.php')
-rw-r--r-- | includes/api/ApiFeedWatchlist.php | 104 |
1 files changed, 59 insertions, 45 deletions
diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index 03d12800..e1ba61f6 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -1,11 +1,10 @@ <?php - -/* - * Created on Oct 13, 2006 - * +/** * API for MediaWiki 1.8+ * - * Copyright (C) 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com + * Created on Oct 13, 2006 + * + * Copyright © 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,13 +18,15 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html + * + * @file */ if ( !defined( 'MEDIAWIKI' ) ) { // Eclipse helper - will be ignored in production - require_once ( "ApiBase.php" ); + require_once( "ApiBase.php" ); } /** @@ -38,7 +39,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { class ApiFeedWatchlist extends ApiBase { public function __construct( $main, $action ) { - parent :: __construct( $main, $action ); + parent::__construct( $main, $action ); } /** @@ -48,13 +49,14 @@ class ApiFeedWatchlist extends ApiBase { return new ApiFormatFeedWrapper( $this->getMain() ); } + private $linkToDiffs = false; + /** * Make a nested call to the API to request watchlist items in the last $hours. * Wrap the result as an RSS/Atom feed. */ public function execute() { - - global $wgFeedClasses, $wgFeedLimit, $wgSitename, $wgContLanguageCode; + global $wgFeedClasses, $wgFeedLimit, $wgSitename, $wgLanguageCode; try { $params = $this->extractRequestParams(); @@ -62,16 +64,15 @@ class ApiFeedWatchlist extends ApiBase { // limit to the number of hours going from now back $endTime = wfTimestamp( TS_MW, time() - intval( $params['hours'] * 60 * 60 ) ); - $dbr = wfGetDB( DB_SLAVE ); // Prepare parameters for nested request - $fauxReqArr = array ( + $fauxReqArr = array( 'action' => 'query', 'meta' => 'siteinfo', 'siprop' => 'general', 'list' => 'watchlist', 'wlprop' => 'title|user|comment|timestamp', - 'wldir' => 'older', // reverse order - from newest to oldest - 'wlend' => $dbr->timestamp( $endTime ), // stop at this time + 'wldir' => 'older', // reverse order - from newest to oldest + 'wlend' => $endTime, // stop at this time 'wllimit' => ( 50 > $wgFeedLimit ) ? $wgFeedLimit : 50 ); @@ -82,13 +83,19 @@ class ApiFeedWatchlist extends ApiBase { $fauxReqArr['wltoken'] = $params['wltoken']; } + // Support linking to diffs instead of article + if ( $params['linktodiffs'] ) { + $this->linkToDiffs = true; + $fauxReqArr['wlprop'] .= '|ids'; + } + // Check for 'allrev' parameter, and if found, show all revisions to each page on wl. - if ( !is_null ( $params['allrev'] ) ) { + if ( !is_null( $params['allrev'] ) ) { $fauxReqArr['wlallrev'] = ''; } // Create the request - $fauxReq = new FauxRequest ( $fauxReqArr ); + $fauxReq = new FauxRequest( $fauxReqArr ); // Execute $module = new ApiMain( $fauxReq ); @@ -102,20 +109,20 @@ class ApiFeedWatchlist extends ApiBase { $feedItems[] = $this->createFeedItem( $info ); } - $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgContLanguageCode . ']'; - $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullUrl(); + $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgLanguageCode . ']'; + $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullURL(); $feed = new $wgFeedClasses[$params['feedformat']] ( $feedTitle, htmlspecialchars( wfMsgForContent( 'watchlist' ) ), $feedUrl ); - ApiFormatFeedWrapper :: setResult( $this->getResult(), $feed, $feedItems ); + ApiFormatFeedWrapper::setResult( $this->getResult(), $feed, $feedItems ); } catch ( Exception $e ) { // Error results should not be cached $this->getMain()->setCacheMaxAge( 0 ); - $feedTitle = $wgSitename . ' - Error - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgContLanguageCode . ']'; - $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullUrl(); + $feedTitle = $wgSitename . ' - Error - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgLanguageCode . ']'; + $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullURL(); $feedFormat = isset( $params['feedformat'] ) ? $params['feedformat'] : 'rss'; $feed = new $wgFeedClasses[$feedFormat] ( $feedTitle, htmlspecialchars( wfMsgForContent( 'watchlist' ) ), $feedUrl ); @@ -128,15 +135,19 @@ class ApiFeedWatchlist extends ApiBase { } $errorText = $e->getMessage(); - $feedItems[] = new FeedItem( "Error ($errorCode)", $errorText, "", "", "" ); - ApiFormatFeedWrapper :: setResult( $this->getResult(), $feed, $feedItems ); + $feedItems[] = new FeedItem( "Error ($errorCode)", $errorText, '', '', '' ); + ApiFormatFeedWrapper::setResult( $this->getResult(), $feed, $feedItems ); } } private function createFeedItem( $info ) { $titleStr = $info['title']; - $title = Title :: newFromText( $titleStr ); - $titleUrl = $title->getFullUrl(); + $title = Title::newFromText( $titleStr ); + if ( $this->linkToDiffs && isset( $info['revid'] ) ) { + $titleUrl = $title->getFullURL( array( 'diff' => $info['revid'] ) ); + } else { + $titleUrl = $title->getFullURL(); + } $comment = isset( $info['comment'] ) ? $info['comment'] : null; $timestamp = $info['timestamp']; $user = $info['user']; @@ -150,33 +161,35 @@ class ApiFeedWatchlist extends ApiBase { global $wgFeedClasses; $feedFormatNames = array_keys( $wgFeedClasses ); return array ( - 'feedformat' => array ( - ApiBase :: PARAM_DFLT => 'rss', - ApiBase :: PARAM_TYPE => $feedFormatNames + 'feedformat' => array( + ApiBase::PARAM_DFLT => 'rss', + ApiBase::PARAM_TYPE => $feedFormatNames ), - 'hours' => array ( - ApiBase :: PARAM_DFLT => 24, - ApiBase :: PARAM_TYPE => 'integer', - ApiBase :: PARAM_MIN => 1, - ApiBase :: PARAM_MAX => 72, + 'hours' => array( + ApiBase::PARAM_DFLT => 24, + ApiBase::PARAM_TYPE => 'integer', + ApiBase::PARAM_MIN => 1, + ApiBase::PARAM_MAX => 72, ), 'allrev' => null, - 'wlowner' => array ( - ApiBase :: PARAM_TYPE => 'user' + 'wlowner' => array( + ApiBase::PARAM_TYPE => 'user' ), - 'wltoken' => array ( - ApiBase :: PARAM_TYPE => 'string' - ) + 'wltoken' => array( + ApiBase::PARAM_TYPE => 'string' + ), + 'linktodiffs' => false, ); } public function getParamDescription() { - return array ( + return array( 'feedformat' => 'The format of the feed', 'hours' => 'List pages modified within this many hours from now', - 'allrev' => 'Include multiple revisions of the same page within given timeframe.', - 'wlowner' => "The user whose watchlist you want (must be accompanied by wltoken if it's not you)", - 'wltoken' => 'Security token that requested user set in their preferences' + 'allrev' => 'Include multiple revisions of the same page within given timeframe', + 'wlowner' => "The user whose watchlist you want (must be accompanied by {$this->getModulePrefix()}token if it's not you)", + 'wltoken' => 'Security token that requested user set in their preferences', + 'linktodiffs'=> 'Link to change differences instead of article pages' ); } @@ -185,12 +198,13 @@ class ApiFeedWatchlist extends ApiBase { } protected function getExamples() { - return array ( - 'api.php?action=feedwatchlist' + return array( + 'api.php?action=feedwatchlist', + 'api.php?action=feedwatchlist&allrev=allrev&linktodiffs=&hours=6' ); } public function getVersion() { - return __CLASS__ . ': $Id: ApiFeedWatchlist.php 69357 2010-07-14 22:39:23Z mah $'; + return __CLASS__ . ': $Id: ApiFeedWatchlist.php 77674 2010-12-03 19:47:22Z catrope $'; } } |