<?php
/**
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
*/
/**
*
*/
-require_once( 'SpecialRecentchanges.php' );
-require_once( 'WatchedItem.php' );
+require_once( dirname(__FILE__) . '/SpecialRecentchanges.php' );
/**
- * constructor
+ * Constructor
+ *
+ * @param $par Parameter passed to the page
*/
function wfSpecialWatchlist( $par ) {
- global $wgUser, $wgOut, $wgLang, $wgMemc, $wgRequest, $wgContLang;
- global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
+ global $wgUser, $wgOut, $wgLang, $wgRequest;
global $wgRCShowWatchingUsers, $wgEnotifWatchlist, $wgShowUpdatedMarker;
global $wgEnotifWatchlist;
$fname = 'wfSpecialWatchlist';
- $wgOut->setPagetitle( wfMsg( 'watchlist' ) );
- $sub = htmlspecialchars( wfMsg( 'watchlistsub', $wgUser->getName() ) );
- $wgOut->setSubtitle( $sub );
- $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
- $specialTitle = Title::makeTitle( NS_SPECIAL, 'Watchlist' );
+ $skin = $wgUser->getSkin();
+ $specialTitle = SpecialPage::getTitleFor( 'Watchlist' );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ # Anons don't get a watchlist
if( $wgUser->isAnon() ) {
- $wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
+ $wgOut->setPageTitle( wfMsg( 'watchnologin' ) );
+ $llink = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogin' ), wfMsgHtml( 'loginreqlink' ), 'returnto=' . $specialTitle->getPrefixedUrl() );
+ $wgOut->addHtml( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
return;
}
+
+ $wgOut->setPageTitle( wfMsg( 'watchlist' ) );
+
+ $sub = wfMsgExt( 'watchlistfor', 'parseinline', $wgUser->getName() );
+ $sub .= '<br />' . WatchlistEditor::buildTools( $wgUser->getSkin() );
+ $wgOut->setSubtitle( $sub );
- if( wlHandleClear( $wgOut, $wgRequest, $par ) ) {
+ if( ( $mode = WatchlistEditor::getMode( $wgRequest, $par ) ) !== false ) {
+ $editor = new WatchlistEditor();
+ $editor->execute( $wgUser, $wgOut, $wgRequest, $mode );
+ return;
+ }
+
+ $uid = $wgUser->getId();
+ if( $wgEnotifWatchlist && $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
+ $wgUser->clearAllNotifications( $uid );
+ $wgOut->redirect( $specialTitle->getFullUrl() );
return;
}
$defaults = array(
/* float */ 'days' => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */
- /* bool */ 'hideOwn' => $wgUser->getBoolOption( 'watchlisthideown' ),
- /* bool */ 'hideBots' => $wgUser->getBoolOption( 'watchlisthidebots' ),
- 'namespace' => 'all',
+ /* bool */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ),
+ /* bool */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ),
+ /* bool */ 'hideMinor' => (int)$wgUser->getBoolOption( 'watchlisthideminor' ),
+ /* ? */ 'namespace' => 'all',
);
extract($defaults);
$prefs['days' ] = floatval( $wgUser->getOption( 'watchlistdays' ) );
$prefs['hideown' ] = $wgUser->getBoolOption( 'watchlisthideown' );
$prefs['hidebots'] = $wgUser->getBoolOption( 'watchlisthidebots' );
+ $prefs['hideminor'] = $wgUser->getBoolOption( 'watchlisthideminor' );
# Get query variables
- $days = $wgRequest->getVal( 'days', $prefs['days'] );
- $hideOwn = $wgRequest->getBool( 'hideOwn', $prefs['hideown'] );
+ $days = $wgRequest->getVal( 'days', $prefs['days'] );
+ $hideOwn = $wgRequest->getBool( 'hideOwn', $prefs['hideown'] );
$hideBots = $wgRequest->getBool( 'hideBots', $prefs['hidebots'] );
-
+ $hideMinor = $wgRequest->getBool( 'hideMinor', $prefs['hideminor'] );
+
# Get namespace value, if supplied, and prepare a WHERE fragment
$nameSpace = $wgRequest->getIntOrNull( 'namespace' );
if( !is_null( $nameSpace ) ) {
$nameSpaceClause = '';
}
- # Watchlist editing
- $action = $wgRequest->getVal( 'action' );
- $remove = $wgRequest->getVal( 'remove' );
- $id = $wgRequest->getArray( 'id' );
-
- $uid = $wgUser->getID();
- if( $wgEnotifWatchlist && $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
- $wgUser->clearAllNotifications( $uid );
- }
-
- # Deleting items from watchlist
- if(($action == 'submit') && isset($remove) && is_array($id)) {
- $wgOut->addWikiText( wfMsg( 'removingchecked' ) );
- $wgOut->addHTML( '<p>' );
- foreach($id as $one) {
- $t = Title::newFromURL( $one );
- if( !is_null( $t ) ) {
- $wl = WatchedItem::fromUserTitle( $wgUser, $t );
- if( $wl->removeWatch() === false ) {
- $wgOut->addHTML( "<br />\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );
- } else {
- $wgOut->addHTML( ' (' . htmlspecialchars($one) . ')' );
- }
- } else {
- $wgOut->addHTML( "<br />\n" . wfMsg( 'iteminvalidname', htmlspecialchars($one) ) );
- }
- }
- $wgOut->addHTML( "done.</p>\n" );
- }
-
- if ( $wgUseWatchlistCache ) {
- $memckey = "$wgDBname:watchlist:id:" . $wgUser->getId();
- $cache_s = @$wgMemc->get( $memckey );
- if( $cache_s ){
- $wgOut->addWikiText( wfMsg('wlsaved') );
- $wgOut->addHTML( $cache_s );
- return;
- }
- }
+ $dbr = wfGetDB( DB_SLAVE, 'watchlist' );
+ list( $page, $watchlist, $recentchanges ) = $dbr->tableNamesN( 'page', 'watchlist', 'recentchanges' );
- $dbr =& wfGetDB( DB_SLAVE );
- extract( $dbr->tableNames( 'page', 'revision', 'watchlist', 'recentchanges' ) );
-
- $sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
- $res = $dbr->query( $sql, $fname );
- $s = $dbr->fetchObject( $res );
-
-# Patch *** A1 *** (see A2 below)
-# adjust for page X, talk:page X, which are both stored separately, but treated together
- $nitems = floor($s->n / 2);
-# $nitems = $s->n;
-
- if($nitems == 0) {
- $wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
- return;
- }
+ $watchlistCount = $dbr->selectField( 'watchlist', 'COUNT(*)',
+ array( 'wl_user' => $uid ), __METHOD__ );
+ // Adjust for page X, talk:page X, which are both stored separately,
+ // but treated together
+ $nitems = floor($watchlistCount / 2);
if( is_null($days) || !is_numeric($days) ) {
$big = 1000; /* The magical big */
// Dump everything here
$nondefaults = array();
- wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
- wfAppendToArrayIfNotDefault( 'hideOwn', $hideOwn, $defaults, $nondefaults);
- wfAppendToArrayIfNotDefault( 'hideBots', $hideBots, $defaults, $nondefaults);
- wfAppendToArrayIfNotDefault( 'namespace', $nameSpace, $defaults, $nondefaults );
-
- if ( $days <= 0 ) {
- $docutoff = '';
- $cutoff = false;
- $npages = wfMsg( 'watchlistall1' );
- } else {
- $docutoff = "AND rev_timestamp > '" .
- ( $cutoff = $dbr->timestamp( time() - intval( $days * 86400 ) ) )
- . "'";
- /*
- $sql = "SELECT COUNT(*) AS n FROM $page, $revision WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
- $res = $dbr->query( $sql, $fname );
- $s = $dbr->fetchObject( $res );
- $npages = $s->n;
- */
- $npages = 40000 * $days;
+ wfAppendToArrayIfNotDefault('days' , $days , $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault('hideOwn' , (int)$hideOwn , $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault('hideBots' , (int)$hideBots, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'hideMinor', (int)$hideMinor, $defaults, $nondefaults );
+ wfAppendToArrayIfNotDefault('namespace', $nameSpace , $defaults, $nondefaults);
+ $hookSql = "";
+ if( ! wfRunHooks('BeforeWatchlist', array($nondefaults, $wgUser, &$hookSql)) ) {
+ return;
+ }
+
+ if($nitems == 0) {
+ $wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
+ return;
}
- /* Edit watchlist form */
- if($wgRequest->getBool('edit') || $par == 'edit' ) {
- $wgOut->addWikiText( wfMsg( 'watchlistcontains', $wgLang->formatNum( $nitems ) ) .
- "\n\n" . wfMsg( 'watcheditlist' ) );
-
- $wgOut->addHTML( '<form action=\'' .
- $specialTitle->escapeLocalUrl( 'action=submit' ) .
- "' method='post'>\n" );
-
-# Patch A2
-# The following was proposed by KTurner 07.11.2004 to T.Gries
-# $sql = "SELECT distinct (wl_namespace & ~1),wl_title FROM $watchlist WHERE wl_user=$uid";
- $sql = "SELECT wl_namespace, wl_title, page_is_redirect FROM $watchlist LEFT JOIN $page ON wl_namespace = page_namespace AND wl_title = page_title WHERE wl_user=$uid";
-
+ if ( $days <= 0 ) {
+ $andcutoff = '';
+ } else {
+ $andcutoff = "AND rc_timestamp > '".$dbr->timestamp( time() - intval( $days * 86400 ) )."'";
+ /*
+ $sql = "SELECT COUNT(*) AS n FROM $page, $revision WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
$res = $dbr->query( $sql, $fname );
-
- # Batch existence check
- $linkBatch = new LinkBatch();
- while( $row = $dbr->fetchObject( $res ) )
- $linkBatch->addObj( Title::makeTitleSafe( $row->wl_namespace, $row->wl_title ) );
- $linkBatch->execute();
- if( $dbr->numRows( $res ) > 0 )
- $dbr->dataSeek( $res, 0 ); # Let's do the time warp again!
-
- $sk = $wgUser->getSkin();
-
- $list = array();
- while( $s = $dbr->fetchObject( $res ) ) {
- $list[$s->wl_namespace][$s->wl_title] = $s->page_is_redirect;
- }
-
- // TODO: Display a TOC
- foreach($list as $ns => $titles) {
- if (Namespace::isTalk($ns))
- continue;
- if ($ns != NS_MAIN)
- $wgOut->addHTML( '<h2>' . $wgContLang->getFormattedNsText( $ns ) . '</h2>' );
- $wgOut->addHTML( '<ul>' );
- foreach( $titles as $title => $redir ) {
- $titleObj = Title::makeTitle( $ns, $title );
- if( is_null( $titleObj ) ) {
- $wgOut->addHTML(
- '<!-- bad title "' .
- htmlspecialchars( $s->wl_title ) . '" in namespace ' . $s->wl_namespace . " -->\n"
- );
- } else {
- global $wgContLang;
- $toolLinks = array();
- $titleText = $titleObj->getPrefixedText();
- $pageLink = $sk->makeLinkObj( $titleObj );
- $toolLinks[] = $sk->makeLinkObj( $titleObj->getTalkPage(), $wgLang->getNsText( NS_TALK ) );
- if( $titleObj->exists() )
- $toolLinks[] = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml( 'history_short' ), 'action=history' );
- $toolLinks = '(' . implode( ' | ', $toolLinks ) . ')';
- $checkbox = '<input type="checkbox" name="id[]" value="' . htmlspecialchars( $titleObj->getPrefixedText() ) . '" /> ' . ( $wgContLang->isRTL() ? '‏' : '‎' );
- if( $redir ) {
- $spanopen = '<span class="watchlistredir">';
- $spanclosed = '</span>';
- } else {
- $spanopen = $spanclosed = '';
- }
-
- $wgOut->addHTML( "<li>{$checkbox}{$spanopen}{$pageLink}{$spanclosed} {$toolLinks}</li>\n" );
- }
- }
- $wgOut->addHTML( '</ul>' );
- }
- $wgOut->addHTML(
- "<input type='submit' name='remove' value=\"" .
- htmlspecialchars( wfMsg( "removechecked" ) ) . "\" />\n" .
- "</form>\n"
- );
-
- return;
+ $s = $dbr->fetchObject( $res );
+ $npages = $s->n;
+ */
}
# If the watchlist is relatively short, it's simplest to zip
# Toggles
$andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
$andHideBots = $hideBots ? "AND (rc_bot = 0)" : '';
+ $andHideMinor = $hideMinor ? 'AND rc_minor = 0' : '';
# Show watchlist header
$header = '';
$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
}
- # TODO: Consider removing the third parameter
- $header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems ),
- $wgLang->formatNum( $npages ), '',
- $specialTitle->getFullUrl( 'edit=yes' ) );
+ # Toggle watchlist content (all recent edits or just the latest)
+ if( $wgUser->getOption( 'extendwatchlist' )) {
+ $andLatest='';
+ $limitWatchlist = 'LIMIT ' . intval( $wgUser->getOption( 'wllimit' ) );
+ } else {
+ $andLatest= 'AND rc_this_oldid=page_latest';
+ $limitWatchlist = '';
+ }
+
+ $header .= wfMsgExt( 'watchlist-details', array( 'parsemag' ), $wgLang->formatNum( $nitems ) );
$wgOut->addWikiText( $header );
+ # Show a message about slave lag, if applicable
+ if( ( $lag = $dbr->getLag() ) > 0 )
+ $wgOut->showLagWarning( $lag );
+
if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
$wgOut->addHTML( '<form action="' .
$specialTitle->escapeLocalUrl() .
'" /><input type="hidden" name="reset" value="all" /></form>' .
"\n\n" );
}
-
- $sql = "SELECT
- rc_namespace AS page_namespace, rc_title AS page_title,
- rc_comment AS rev_comment, rc_cur_id AS page_id,
- rc_user AS rev_user, rc_user_text AS rev_user_text,
- rc_timestamp AS rev_timestamp, rc_minor AS rev_minor_edit,
- rc_this_oldid AS rev_id,
- rc_last_oldid,
- rc_new AS page_is_new,wl_notificationtimestamp
+ if ( $wgShowUpdatedMarker ) {
+ $wltsfield=", ${watchlist}.wl_notificationtimestamp ";
+ }
+ $sql = "SELECT ${recentchanges}.* ${wltsfield}
FROM $watchlist,$recentchanges,$page
WHERE wl_user=$uid
AND wl_namespace=rc_namespace
AND wl_title=rc_title
- AND rc_timestamp > '$cutoff'
AND rc_cur_id=page_id
+ $andcutoff
+ $andLatest
$andHideOwn
$andHideBots
+ $andHideMinor
$nameSpaceClause
- ORDER BY rc_timestamp DESC";
+ $hookSql
+ ORDER BY rc_timestamp DESC
+ $limitWatchlist";
$res = $dbr->query( $sql, $fname );
$numRows = $dbr->numRows( $res );
/* Start bottom header */
- $wgOut->addHTML( "<hr />\n<p>" );
+ $wgOut->addHTML( "<hr />\n" );
- if($days >= 1)
- $wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ),
- $wgLang->formatNum( $days ) ) . '<br />' , false );
- elseif($days > 0)
- $wgOut->addWikiText( wfMsg( 'wlnote', $wgLang->formatNum( $numRows ),
+ if($days >= 1) {
+ $wgOut->addWikiText( wfMsgExt( 'rcnote', array( 'parseinline' ), $wgLang->formatNum( $numRows ),
+ $wgLang->formatNum( $days ), $wgLang->timeAndDate( wfTimestampNow(), true ) ) . '<br />' , false );
+ } elseif($days > 0) {
+ $wgOut->addWikiText( wfMsgExt( 'wlnote', array( 'parseinline' ), $wgLang->formatNum( $numRows ),
$wgLang->formatNum( round($days*24) ) ) . '<br />' , false );
+ }
$wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" );
# Spit out some control panel links
- $thisTitle = Title::makeTitle( NS_SPECIAL, 'Watchlist' );
+ $thisTitle = SpecialPage::getTitleFor( 'Watchlist' );
$skin = $wgUser->getSkin();
- $linkElements = array( 'hideOwn' => 'wlhideshowown', 'hideBots' => 'wlhideshowbots' );
-
- # Problems encountered using the fancier method
- $label = $hideBots ? wfMsgHtml( 'show' ) : wfMsgHtml( 'hide' );
- $linkBits = wfArrayToCGI( array( 'hideBots' => 1 - (int)$hideBots ), $nondefaults );
- $link = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
- $links[] = wfMsgHtml( 'wlhideshowbots', $link );
- $label = $hideOwn ? wfMsgHtml( 'show' ) : wfMsgHtml( 'hide' );
+ # Hide/show bot edits
+ $label = $hideBots ? wfMsgHtml( 'watchlist-show-bots' ) : wfMsgHtml( 'watchlist-hide-bots' );
+ $linkBits = wfArrayToCGI( array( 'hideBots' => 1 - (int)$hideBots ), $nondefaults );
+ $links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
+
+ # Hide/show own edits
+ $label = $hideOwn ? wfMsgHtml( 'watchlist-show-own' ) : wfMsgHtml( 'watchlist-hide-own' );
$linkBits = wfArrayToCGI( array( 'hideOwn' => 1 - (int)$hideOwn ), $nondefaults );
- $link = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
- $links[] = wfMsgHtml( 'wlhideshowown', $link );
+ $links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
+
+ # Hide/show minor edits
+ $label = $hideMinor ? wfMsgHtml( 'watchlist-show-minor' ) : wfMsgHtml( 'watchlist-hide-minor' );
+ $linkBits = wfArrayToCGI( array( 'hideMinor' => 1 - (int)$hideMinor ), $nondefaults );
+ $links[] = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
$wgOut->addHTML( implode( ' | ', $links ) );
# Form for namespace filtering
- $thisAction = $thisTitle->escapeLocalUrl();
- $nsForm = "<form method=\"post\" action=\"{$thisAction}\">\n";
- $nsForm .= "<label for=\"namespace\">" . wfMsg( 'namespace' ) . "</label> ";
- $nsForm .= HTMLnamespaceselector( $nameSpace, '' ) . "\n";
- $nsForm .= ( $hideOwn ? "<input type=\"hidden\" name=\"hideown\" value=\"1\" />\n" : "" );
- $nsForm .= ( $hideBots ? "<input type=\"hidden\" name=\"hidebots\" value=\"1\" />\n" : "" );
- $nsForm .= "<input type=\"hidden\" name=\"days\" value=\"" . $days . "\" />\n";
- $nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
- $nsForm .= "</form>\n";
- $wgOut->addHTML( $nsForm );
-
- if ( $numRows == 0 ) {
- $wgOut->addWikitext( "<br />" . wfMsg( 'watchnochange' ), false );
- $wgOut->addHTML( "</p>\n" );
+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
+ $form .= '<p>';
+ $form .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ';
+ $form .= Xml::namespaceSelector( $nameSpace, '' ) . ' ';
+ $form .= Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . '</p>';
+ $form .= Xml::hidden( 'days', $days );
+ if( $hideOwn )
+ $form .= Xml::hidden( 'hideOwn', 1 );
+ if( $hideBots )
+ $form .= Xml::hidden( 'hideBots', 1 );
+ if( $hideMinor )
+ $form .= Xml::hidden( 'hideMinor', 1 );
+ $form .= Xml::closeElement( 'form' );
+ $wgOut->addHtml( $form );
+
+ # If there's nothing to show, stop here
+ if( $numRows == 0 ) {
+ $wgOut->addWikiText( wfMsgNoTrans( 'watchnochange' ) );
return;
}
- $wgOut->addHTML( "</p>\n" );
/* End bottom header */
+ /* Do link batch query */
+ $linkBatch = new LinkBatch;
+ while ( $row = $dbr->fetchObject( $res ) ) {
+ $userNameUnderscored = str_replace( ' ', '_', $row->rc_user_text );
+ if ( $row->rc_user != 0 ) {
+ $linkBatch->add( NS_USER, $userNameUnderscored );
+ }
+ $linkBatch->add( NS_USER_TALK, $userNameUnderscored );
+ }
+ $linkBatch->execute();
+ $dbr->dataSeek( $res, 0 );
+
$list = ChangesList::newFromUser( $wgUser );
$s = $list->beginRecentChangesList();
$counter = 1;
while ( $obj = $dbr->fetchObject( $res ) ) {
- # Make fake RC entry
- $rc = RecentChange::newFromCurRow( $obj, $obj->rc_last_oldid );
+ # Make RC entry
+ $rc = RecentChange::newFromRow( $obj );
$rc->counter = $counter++;
if ( $wgShowUpdatedMarker ) {
}
if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
- $sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" .wfStrencode($obj->page_title). "' AND wl_namespace='{$obj->page_namespace}'" ;
- $res3 = $dbr->query( $sql3, DB_READ, $fname );
- $x = $dbr->fetchObject( $res3 );
- $rc->numberofWatchingusers = $x->n;
+ $rc->numberofWatchingusers = $dbr->selectField( 'watchlist',
+ 'COUNT(*)',
+ array(
+ 'wl_namespace' => $obj->rc_namespace,
+ 'wl_title' => $obj->rc_title,
+ ),
+ __METHOD__ );
} else {
$rc->numberofWatchingusers = 0;
}
$dbr->freeResult( $res );
$wgOut->addHTML( $s );
- if ( $wgUseWatchlistCache ) {
- $wgMemc->set( $memckey, $s, $wgWLCacheTimeout);
- }
-
}
function wlHoursLink( $h, $page, $options = array() ) {
return $s;
}
+/**
+ * Returns html
+ */
function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
$hours = array( 1, 2, 6, 12 );
$days = array( 1, 3, 7 );
- $cl = '';
$i = 0;
foreach( $hours as $h ) {
$hours[$i++] = wlHoursLink( $h, $page, $options );
foreach( $days as $d ) {
$days[$i++] = wlDaysLink( $d, $page, $options );
}
- return wfMsg ('wlshowlast',
+ return wfMsgExt('wlshowlast',
+ array('parseinline', 'replaceafter'),
implode(' | ', $hours),
implode(' | ', $days),
wlDaysLink( 0, $page, $options ) );
* @return integer
*/
function wlCountItems( &$user, $talk = true ) {
- $dbr =& wfGetDB( DB_SLAVE );
-
+ $dbr = wfGetDB( DB_SLAVE, 'watchlist' );
+
# Fetch the raw count
$res = $dbr->select( 'watchlist', 'COUNT(*) AS count', array( 'wl_user' => $user->mId ), 'wlCountItems' );
$row = $dbr->fetchObject( $res );
$count = $row->count;
$dbr->freeResult( $res );
-
+
# Halve to remove talk pages if needed
if( !$talk )
$count = floor( $count / 2 );
-
- return( $count );
-}
-/**
- * Allow the user to clear their watchlist
- *
- * @param $out Output object
- * @param $request Request object
- * @param $par Parameters passed to the watchlist page
- * @return bool True if it's been taken care of; false indicates the watchlist
- * code needs to do something further
- */
-function wlHandleClear( &$out, &$request, $par ) {
- # Check this function has something to do
- if( $request->getText( 'action' ) == 'clear' || $par == 'clear' ) {
- global $wgUser;
- $out->setPageTitle( wfMsgHtml( 'clearwatchlist' ) );
- $count = wlCountItems( $wgUser );
- if( $count > 0 ) {
- # See if we're clearing or confirming
- if( $request->wasPosted() && $wgUser->matchEditToken( $request->getText( 'token' ), 'clearwatchlist' ) ) {
- # Clearing, so do it and report the result
- $dbw =& wfGetDB( DB_MASTER );
- $dbw->delete( 'watchlist', array( 'wl_user' => $wgUser->mId ), 'wlHandleClear' );
- $out->addWikiText( wfMsg( 'watchlistcleardone', $count ) );
- $out->returnToMain();
- } else {
- # Confirming, so show a form
- $wlTitle = Title::makeTitle( NS_SPECIAL, 'Watchlist' );
- $out->addHTML( wfElement( 'form', array( 'method' => 'post', 'action' => $wlTitle->getLocalUrl( 'action=clear' ) ), NULL ) );
- $out->addWikiText( wfMsg( 'watchlistcount', $count ) );
- $out->addWikiText( wfMsg( 'watchlistcleartext' ) );
- $out->addHTML( wfElement( 'input', array( 'type' => 'hidden', 'name' => 'token', 'value' => $wgUser->editToken( 'clearwatchlist' ) ), '' ) );
- $out->addHTML( wfElement( 'input', array( 'type' => 'submit', 'name' => 'submit', 'value' => wfMsgHtml( 'watchlistclearbutton' ) ), '' ) );
- $out->addHTML( wfCloseElement( 'form' ) );
- }
- return( true );
- } else {
- # Nothing on the watchlist; nothing to do here
- $out->addWikiText( wfMsg( 'nowatchlist' ) );
- $out->returnToMain();
- return( true );
- }
- } else {
- return( false );
- }
+ return( $count );
}
-
-?>
dépôts / lhc / web / wiklou.git / blobdiff