' );
foreach($id as $one) {
$t = Title::newFromURL( $one );
- if($t->getDBkey() != '') {
+ if( !is_null( $t ) ) {
$wl = WatchedItem::fromUserTitle( $wgUser, $t );
if( $wl->removeWatch() === false ) {
- $wgOut->addHTML( "
\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );
+ $wgOut->addHTML( wfMsg( 'couldntremove', htmlspecialchars($one) ) . "
\n" );
} else {
- $wgOut->addHTML( ' (' . htmlspecialchars($one) . ')' );
+ wfRunHooks('UnwatchArticle', array(&$wgUser, new Article($t)));
+ $wgOut->addHTML( '(' . htmlspecialchars($one) . ')
' );
}
} else {
- $wgOut->addHTML( "
\n" . wfMsg( 'iteminvalidname', htmlspecialchars($one) ) );
+ $wgOut->addHTML( wfMsg( 'iteminvalidname', htmlspecialchars($one) ) . "
\n" );
}
}
- $wgOut->addHTML( "done.
" . wfMsg( 'wldone' ) . "
\n" ); } - $dbr =& wfGetDB( DB_SLAVE ); - extract( $dbr->tableNames( 'page', 'revision', 'watchlist', 'recentchanges' ) ); + $dbr = wfGetDB( DB_SLAVE, 'watchlist' ); + list( $page, $watchlist, $recentchanges ) = $dbr->tableNamesN( 'page', 'watchlist', 'recentchanges' ); $sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid"; $res = $dbr->query( $sql, $fname ); @@ -96,76 +112,120 @@ function wfSpecialWatchlist() { # Patch *** A1 *** (see A2 below) # adjust for page X, talk:page X, which are both stored separately, but treated together -# $nitems = $s->n / 2; - $nitems = $s->n; + $nitems = floor($s->n / 2); +# $nitems = $s->n; if($nitems == 0) { - $wgOut->addWikiText( wfMsg( 'nowatchlist' ) ); - return; + $wgOut->addWikiText( wfMsg( 'nowatchlist' ) ); + return; } - - if ( is_null( $days ) ) { - $big = 1000; + + if( is_null($days) || !is_numeric($days) ) { + $big = 1000; /* The magical big */ if($nitems > $big) { # Set default cutoff shorter - $days = (12.0 / 24.0); # 12 hours... + $days = $defaults['days'] = (12.0 / 24.0); # 12 hours... } else { - $days = 3; # longer cutoff for shortlisters + $days = $defaults['days']; # default cutoff for shortlisters } } else { $days = floatval($days); } + // Dump everything here + $nondefaults = array(); + + 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); + if ( $days <= 0 ) { - $docutoff = ''; - $cutoff = false; - $npages = wfMsg( 'all' ); + $andcutoff = ''; + $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"; + $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 ); $s = $dbr->fetchObject( $res ); $npages = $s->n; - - } - if ( is_null( $hideOwn ) ) { - # default is false (don't hide own edits) - $hideOwn = 0; + */ + $npages = 40000 * $days; } - if(isset($_REQUEST['magic'])) { + /* Edit watchlist form */ + if($wgRequest->getBool('edit') || $par == 'edit' ) { $wgOut->addWikiText( wfMsg( 'watchlistcontains', $wgLang->formatNum( $nitems ) ) . - '' . wfMsg( 'watcheditlist' ) . "
\n" ); + "\n\n" . wfMsg( 'watcheditlist' ) ); $wgOut->addHTML( '\n" ); + $wgOut->addHTML( + wfSubmitButton( wfMsg('removechecked'), array('name' => 'remove') ) . + "\n\n" + ); return; } @@ -177,147 +237,276 @@ function wfSpecialWatchlist() { # through the time-sorted page list checking for watched items. # Up estimate of watched items by 15% to compensate for talk pages... - if( $cutoff && ( $nitems*1.15 > $npages ) ) { - $x = 'rev_timestamp'; - $y = wfMsg( 'watchmethod-recent' ); - # TG patch: here we do not consider pages and their talk pages equivalent - why should we ? - # The change results in talk-pages not automatically included in watchlists, when their parent page is included - # $z = "wl_namespace=cur_namespace & ~1"; - $z = 'wl_namespace=page_namespace'; + + # Toggles + $andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : ''; + $andHideBots = $hideBots ? "AND (rc_bot = 0)" : ''; + $andHideMinor = $hideMinor ? 'AND rc_minor = 0' : ''; + + # Show watchlist header + $header = ''; + if( $wgUser->getOption( 'enotifwatchlistpages' ) && $wgEnotifWatchlist) { + $header .= wfMsg( 'wlheader-enotif' ) . "\n"; + } + if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) { + $header .= wfMsg( 'wlheader-showupdated' ) . "\n"; + } + + # Toggle watchlist content (all recent edits or just the latest) + if( $wgUser->getOption( 'extendwatchlist' )) { + $andLatest=''; + $limitWatchlist = 'LIMIT ' . intval( $wgUser->getOption( 'wllimit' ) ); } else { - $x = 'page_timestamp'; - $y = wfMsg( 'watchmethod-list' ); - # TG patch: here we do not consider pages and their talk pages equivalent - why should we ? - # The change results in talk-pages not automatically included in watchlists, when their parent page is included - # $z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)"; - $z = 'wl_namespace=page_namespace'; + $andLatest= 'AND rc_this_oldid=page_latest'; + $limitWatchlist = ''; } - if ( 0 == $hideOwn ) - $andHideOwn = ''; - else - $andHideOwn = "AND (rev_user <> $uid)"; - - - $wgOut->addHTML( '' . wfMsg( 'watchdetails', - $wgLang->formatNum( $nitems ), $wgLang->formatNum( $npages ), $y, - $specialTitle->escapeLocalUrl( 'magic=yes' ) ) . "' . wfMsg( 'watchnochange' ) . '
' ); + # Hide/show own edits + $label = $hideOwn ? wfMsgHtml( 'watchlist-show-own' ) : wfMsgHtml( 'watchlist-hide-own' ); + $linkBits = wfArrayToCGI( array( 'hideOwn' => 1 - (int)$hideOwn ), $nondefaults ); + $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 + $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) ); + $form .= ''; + $form .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' '; + $form .= Xml::namespaceSelector( $nameSpace, '' ) . ' '; + $form .= Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . '
'; + $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; } - $sk = $wgUser->getSkin(); - $list =& new ChangesList( $sk ); + /* 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 ); + # Make RC entry + $rc = RecentChange::newFromRow( $obj ); $rc->counter = $counter++; - if ($wgShowUpdatedMarker && $wgUser->getOption( 'showupdated' )) { - $rc->notificationtimestamp = $obj->wl_notificationtimestamp; + if ( $wgShowUpdatedMarker ) { + $updated = $obj->wl_notificationtimestamp; } else { - $rc->notificationtimestamp = false; + // Same visual appearance as MW 1.4 + $updated = true; } if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) { - $sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" .wfStrencode($obj->cur_title). "' AND wl_namespace='{$obj->cur_namespace}'" ; - $res3 = $dbr->query( $sql3, DB_READ, $fname ); + $sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" .$dbr->strencode($obj->page_title). "' AND wl_namespace='{$obj->page_namespace}'" ; + $res3 = $dbr->query( $sql3, $fname ); $x = $dbr->fetchObject( $res3 ); $rc->numberofWatchingusers = $x->n; } else { $rc->numberofWatchingusers = 0; } - $s .= $list->recentChangesLine( $rc, true); + $s .= $list->recentChangesLine( $rc, $updated ); } $s .= $list->endRecentChangesList(); $dbr->freeResult( $res ); $wgOut->addHTML( $s ); - if ( $wgUseWatchlistCache ) { - $wgMemc->set( $memckey, $s, $wgWLCacheTimeout); - } - } - -function wlHoursLink( $h, $page ) { +function wlHoursLink( $h, $page, $options = array() ) { global $wgUser, $wgLang, $wgContLang; $sk = $wgUser->getSkin(); $s = $sk->makeKnownLink( $wgContLang->specialPage( $page ), $wgLang->formatNum( $h ), - 'days=' . ($h / 24.0) ); + wfArrayToCGI( array('days' => ($h / 24.0)), $options ) ); return $s; } - -function wlDaysLink( $d, $page ) { +function wlDaysLink( $d, $page, $options = array() ) { global $wgUser, $wgLang, $wgContLang; $sk = $wgUser->getSkin(); $s = $sk->makeKnownLink( $wgContLang->specialPage( $page ), - ($d ? $wgLang->formatNum( $d ) : wfMsg( 'all' ) ), "days=$d" ); + ($d ? $wgLang->formatNum( $d ) : wfMsgHtml( 'watchlistall2' ) ), + wfArrayToCGI( array('days' => $d), $options ) ); return $s; } -function wlCutoffLinks( $days, $page = 'Watchlist' ) -{ +/** + * 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 ); + $hours[$i++] = wlHoursLink( $h, $page, $options ); } $i = 0; foreach( $days as $d ) { - $days[$i++] = wlDaysLink( $d, $page ); + $days[$i++] = wlDaysLink( $d, $page, $options ); } - return wfMsg ('wlshowlast', + return wfMsgExt('wlshowlast', + array('parseinline', 'replaceafter'), implode(' | ', $hours), implode(' | ', $days), - wlDaysLink( 0, $page ) ); + wlDaysLink( 0, $page, $options ) ); +} + +/** + * Count the number of items on a user's watchlist + * + * @param $talk Include talk pages + * @return integer + */ +function wlCountItems( &$user, $talk = true ) { + $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 ) { + global $wgLang; + + # 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( wfMsgExt( 'watchlistcleardone', array( 'parsemag', 'escape'), $wgLang->formatNum( $count ) ) ); + $out->returnToMain(); + } else { + # Confirming, so show a form + $wlTitle = SpecialPage::getTitleFor( 'Watchlist' ); + $out->addHTML( wfElement( 'form', array( 'method' => 'post', 'action' => $wlTitle->getLocalUrl( 'action=clear' ) ), NULL ) ); + $out->addWikiText( wfMsgExt( 'watchlistcount', array( 'parsemag', 'escape'), $wgLang->formatNum( $count ) ) ); + $out->addWikiText( wfMsg( 'watchlistcleartext' ) ); + $out->addHTML( + wfHidden( 'token', $wgUser->editToken( 'clearwatchlist' ) ) . + wfElement( 'input', array( 'type' => 'submit', 'name' => 'submit', 'value' => wfMsgHtml( 'watchlistclearbutton' ) ), '' ) . + wfCloseElement( 'form' ) + ); + } + return( true ); + } else { + # Nothing on the watchlist; nothing to do here + $out->addWikiText( wfMsg( 'nowatchlist' ) ); + $out->returnToMain(); + return( true ); + } + } else { + return( false ); + } +} ?>