* (bug 6701) Kazakh language variants in MessagesEn.php
[lhc/web/wiklou.git] / includes / SpecialWatchlist.php
index b80dd24..e02250f 100644 (file)
 <?php
-require_once( "SpecialRecentchanges.php" );
-require_once( "WatchedItem.php" );
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 
-function wfSpecialWatchlist()
-{
-       global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc;
+/**
+ *
+ */
+require_once( 'SpecialRecentchanges.php' );
+
+/**
+ * Constructor
+ * @todo Document $par parameter.
+ * @param $par String: FIXME
+ */
+function wfSpecialWatchlist( $par ) {
+       global $wgUser, $wgOut, $wgLang, $wgMemc, $wgRequest, $wgContLang;
        global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
-       global $days, $limit, $target; # From query string
-       $fname = "wfSpecialWatchlist";
+       global $wgRCShowWatchingUsers, $wgEnotifWatchlist, $wgShowUpdatedMarker;
+       global $wgEnotifWatchlist;
+       $fname = 'wfSpecialWatchlist';
 
-       $wgOut->setPagetitle( wfMsg( "watchlist" ) );
-       $sub = wfMsg( "watchlistsub", $wgUser->getName() );
-       $wgOut->setSubtitle( $sub );
-       $wgOut->setRobotpolicy( "noindex,nofollow" );
+       $skin =& $wgUser->getSkin();
+       $specialTitle = Title::makeTitle( NS_SPECIAL, 'Watchlist' );
+       $wgOut->setRobotPolicy( 'noindex,nofollow' );
 
-       $specialTitle = Title::makeTitle( NS_SPECIAL, "Watchlist" );
+       # Anons don't get a watchlist
+       if( $wgUser->isAnon() ) {
+               $wgOut->setPageTitle( wfMsg( 'watchnologin' ) );
+               $llink = $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Userlogin' ), wfMsgHtml( 'loginreqlink' ), 'returnto=' . $specialTitle->getPrefixedUrl() );
+               $wgOut->addHtml( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
+               return;
+       } else {
+               $wgOut->setPageTitle( wfMsg( 'watchlist' ) );
+               $wgOut->setSubtitle( wfMsgWikiHtml( 'watchlistfor', htmlspecialchars( $wgUser->getName() ) ) );
+       }
+
+       if( wlHandleClear( $wgOut, $wgRequest, $par ) ) {
+               return;
+       }
+
+       $defaults = array(
+       /* float */ 'days' => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */
+       /* bool  */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ),
+       /* bool  */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ),
+       /* ?     */ 'namespace' => 'all',
+       );
+
+       extract($defaults);
+
+       # Extract variables from the request, falling back to user preferences or
+       # other default values if these don't exist
+       $prefs['days'    ] = floatval( $wgUser->getOption( 'watchlistdays' ) );
+       $prefs['hideown' ] = $wgUser->getBoolOption( 'watchlisthideown' );
+       $prefs['hidebots'] = $wgUser->getBoolOption( 'watchlisthidebots' );
+
+       # Get query variables
+       $days = $wgRequest->getVal( 'days', $prefs['days'] );
+       $hideOwn = $wgRequest->getBool( 'hideOwn', $prefs['hideown'] );
+       $hideBots = $wgRequest->getBool( 'hideBots', $prefs['hidebots'] );
        
+       # Get namespace value, if supplied, and prepare a WHERE fragment
+       $nameSpace = $wgRequest->getIntOrNull( 'namespace' );
+       if( !is_null( $nameSpace ) ) {
+               $nameSpace = intval( $nameSpace );
+               $nameSpaceClause = " AND rc_namespace = $nameSpace";
+       } else {
+               $nameSpace = '';
+               $nameSpaceClause = '';
+       }
+
+       # Watchlist editing
+       $action = $wgRequest->getVal( 'action' );
+       $remove = $wgRequest->getVal( 'remove' );
+       $id = $wgRequest->getArray( 'id' );
+
        $uid = $wgUser->getID();
-       if( $uid == 0 ) {
-               $wgOut->addHTML( wfMsg( "nowatchlist" ) );
-               return;
+       if( $wgEnotifWatchlist && $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
+               $wgUser->clearAllNotifications( $uid );
        }
 
-       global $action,$remove,$id;
-       if(($action == "submit") && isset($remove) && is_array($id)) {
-               $wgOut->addHTML( wfMsg( "removingchecked" ) );
+  # 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($t->getDBkey() != "") {
+                       if( !is_null( $t ) ) {
                                $wl = WatchedItem::fromUserTitle( $wgUser, $t );
                                if( $wl->removeWatch() === false ) {
-                                       $wgOut->addHTML( "<br />\n" . wfMsg( "couldntremove", htmlspecialchars($one) ) );
+                                       $wgOut->addHTML( "<br />\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );
                                } else {
-                                       $wgOut->addHTML( " (" . htmlspecialchars($one) . ")" );
+                                       wfRunHooks('UnwatchArticle', array(&$wgUser, new Article($t)));
+                                       $wgOut->addHTML( ' (' . htmlspecialchars($one) . ')' );
                                }
                        } else {
-                               $wgOut->addHTML( "<br />\n" . wfMsg( "iteminvalidname", htmlspecialchars($one) ) );
+                               $wgOut->addHTML( "<br />\n" . wfMsg( 'iteminvalidname', htmlspecialchars($one) ) );
                        }
                }
-               $wgOut->addHTML( "done.\n<p>" );
+               $wgOut->addHTML( "<br />\n" . wfMsg( 'wldone' ) . "</p>\n" );
        }
 
        if ( $wgUseWatchlistCache ) {
                $memckey = "$wgDBname:watchlist:id:" . $wgUser->getId();
                $cache_s = @$wgMemc->get( $memckey );
                if( $cache_s ){
-                       $wgOut->addHTML( wfMsg("wlsaved") );
+                       $wgOut->addWikiText( wfMsg('wlsaved') );
                        $wgOut->addHTML( $cache_s );
                        return;
                }
        }
-       
+
        $dbr =& wfGetDB( DB_SLAVE );
-       extract( $dbr->tableNames( 'cur', 'watchlist', 'recentchanges' ) );
+       extract( $dbr->tableNames( 'page', 'revision', 'watchlist', 'recentchanges' ) );
 
        $sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
-       $res = $dbr->query( $sql );
+       $res = $dbr->query( $sql, $fname );
        $s = $dbr->fetchObject( $res );
-       $nitems = $s->n;
+       
+#      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->addHTML( wfMsg( "nowatchlist" ) );
-        return;
+               $wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
+               return;
        }
-       
-       if ( ! isset( $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( 'namespace', $nameSpace, $defaults, $nondefaults );
+
        if ( $days <= 0 ) {
                $docutoff = '';
                $cutoff = false;
-               $npages = wfMsg( "all" );
+               $npages = wfMsg( 'watchlistall1' );
        } else {
-               $docutoff = "AND cur_timestamp > '" .
-                 ( $cutoff = wfUnix2Timestamp( time() - intval( $days * 86400 ) ) )
+               $docutoff = "AND rev_timestamp > '" .
+                 ( $cutoff = $dbr->timestamp( time() - intval( $days * 86400 ) ) )
                  . "'";
-               $sql = "SELECT COUNT(*) AS n FROM $cur WHERE cur_timestamp>'$cutoff'";
-               $res = $dbr->query( $sql );
-               $s = $dbr->fetchObject( $res );
-               $npages = $s->n;
-               
+                 /*
+                 $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;
+
        }
-       
-       if(isset($_REQUEST['magic'])) {
-               $wgOut->addHTML( wfMsg( "watchlistcontains", $wgLang->formatNum( $nitems ) ) .
-                       "<p>" . wfMsg( "watcheditlist" ) . "</p>\n" );
+
+       /* 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";
+
+               $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!
                
-               $wgOut->addHTML( "<form action='" .
-                       $specialTitle->escapeLocalUrl( "action=submit" ) .
-                       "' method='post'>\n" .
-                       "<ul>\n" );
-               $sql = "SELECT wl_namespace,wl_title FROM $watchlist WHERE wl_user=$uid";
-               $res = $dbr->query( $sql );
-               global $wgUser, $wgLang;
                $sk = $wgUser->getSkin();
+
+               $list = array();
                while( $s = $dbr->fetchObject( $res ) ) {
-                       $t = Title::makeTitle( $s->wl_namespace, $s->wl_title );
-                       if( is_null( $t ) ) {
-                               $wgOut->addHTML( '<!-- bad title "' . htmlspecialchars( $s->wl_title ) . '" in namespace ' . IntVal( $s->wl_namespace ) . " -->\n" );
-                       } else {
-                               $t = $t->getPrefixedText();
-                               $wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\" />" .
-                                       $sk->makeKnownLink( $t, $t ) .
-                                       "</li>\n" );
+                       $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() ? '&rlm;' : '&lrm;' );
+                                       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( "</ul>\n" .
-                       "<input type='submit' name='remove' value='" .
-                       wfMsg( "removechecked" ) . "' />\n" .
-                       "</form>\n" );
-               
+               $wgOut->addHTML(
+                       wfSubmitButton( wfMsg('removechecked'), array('name' => 'remove') ) .
+                       "\n</form>\n"
+               );
+
                return;
        }
-       
+
        # If the watchlist is relatively short, it's simplest to zip
        # down its entirety and then sort the results.
-       
+
        # If it's relatively long, it may be worth our while to zip
        # 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 = "cur_timestamp";
-               $y = wfMsg( "watchmethod-recent" );
-               $z = "wl_namespace=cur_namespace&65534";
+
+       # Toggles
+       $andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
+       $andHideBots = $hideBots ? "AND (rc_bot = 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 = "name_title_timestamp";
-               $y = wfMsg( "watchmethod-list" );
-               $z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
+               $andLatest= 'AND rc_this_oldid=page_latest';
+               $limitWatchlist = '';
        }
 
-       
-       $wgOut->addHTML( "<i>" . wfMsg( "watchdetails",
-               $wgLang->formatNum( $nitems ), $wgLang->formatNum( $npages ), $y,
-               $specialTitle->escapeLocalUrl( "magic=yes" ) ) . "</i><br />\n" );
-        
-       $use_index = $dbr->useIndexClause( $x );
-       $sql = "SELECT
-  cur_namespace,cur_title,cur_comment, cur_id,
-  cur_user,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new
-  FROM $watchlist,$cur $use_index
-  WHERE wl_user=$uid
-  AND $z
-  AND wl_title=cur_title
-  $docutoff
-  ORDER BY cur_timestamp DESC";
+       # TODO: Consider removing the third parameter
+       $header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems ),
+               $wgLang->formatNum( $npages ), '',
+               $specialTitle->getFullUrl( 'edit=yes' ) );
+       $wgOut->addWikiText( $header );
+
+       if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
+               $wgOut->addHTML( '<form action="' .
+                       $specialTitle->escapeLocalUrl() .
+                       '" method="post"><input type="submit" name="dummy" value="' .
+                       htmlspecialchars( wfMsg( 'enotif_reset' ) ) .
+                       '" /><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_id, rc_patrolled,
+         rc_new AS page_is_new,wl_notificationtimestamp
+         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
+         $andLatest
+         $andHideOwn
+         $andHideBots
+         $nameSpaceClause
+         ORDER BY rc_timestamp DESC
+         $limitWatchlist";
 
        $res = $dbr->query( $sql, $fname );
+       $numRows = $dbr->numRows( $res );
+
+       /* Start bottom header */
+       $wgOut->addHTML( "<hr />\n" );
 
-       if($days >= 1)
-               $note = wfMsg( "rcnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( $days ) );
-       elseif($days > 0)
-               $note = wfMsg( "wlnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( round($days*24) ) );
-       else
-               $note = "";
-       $wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
-       $note = wlCutoffLinks( $days, $limit );
-       $wgOut->addHTML( "{$note}\n" );
-
-       if ( $dbr->numRows( $res ) == 0 ) {
-               $wgOut->addHTML( "<p><i>" . wfMsg( "watchnochange" ) . "</i></p>" );
+       if($days >= 1) {
+               $wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ),
+                       $wgLang->formatNum( $days ), $wgLang->timeAndDate( wfTimestampNow(), true ) ) . '<br />' , false );
+       } elseif($days > 0) {
+               $wgOut->addWikiText( wfMsg( 'wlnote', $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' );
+       $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' );
+       $linkBits = wfArrayToCGI( array( 'hideOwn' => 1 - (int)$hideOwn ), $nondefaults );
+       $link = $skin->makeKnownLinkObj( $thisTitle, $label, $linkBits );
+       $links[] = wfMsgHtml( 'wlhideshowown', $link );
+
+       $wgOut->addHTML( implode( ' | ', $links ) );
+
+       # Form for namespace filtering
+       $wgOut->addHTML( "\n" .
+               wfOpenElement( 'form', array(
+                               'method' => 'post',
+                               'action' => $thisTitle->getLocalURL(),
+                       ) ) .
+               wfMsgExt( 'namespace', array( 'parseinline') ) .
+               HTMLnamespaceselector( $nameSpace, '' ) . "\n" .
+               ( $hideOwn ? wfHidden('hideown', 1)."\n" : '' ) .
+               ( $hideBots ? wfHidden('hidebots', 1)."\n" : '' ) .
+               wfHidden( 'days', $days ) . "\n" .
+               wfSubmitButton( wfMsgExt( 'allpagessubmit', array( 'escape') ) ) . "\n" .
+               wfCloseElement( 'form' ) . "\n"
+       );
+
+       if ( $numRows == 0 ) {
+               $wgOut->addWikitext( "<br />" . wfMsg( 'watchnochange' ), false );
                return;
        }
 
-       $sk = $wgUser->getSkin();
-       $s = $sk->beginRecentChangesList();
+       /* End bottom header */
+
+       $list = ChangesList::newFromUser( $wgUser );
+
+       $s = $list->beginRecentChangesList();
        $counter = 1;
        while ( $obj = $dbr->fetchObject( $res ) ) {
                # Make fake RC entry
-               $rc = RecentChange::newFromCurRow( $obj );
+               $rc = RecentChange::newFromCurRow( $obj, $obj->rc_last_oldid );
                $rc->counter = $counter++;
-               $s .= $sk->recentChangesLine( $rc, true );
+
+               if ( $wgShowUpdatedMarker ) {
+                       $updated = $obj->wl_notificationtimestamp;
+               } else {
+                       // 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->page_title). "' AND wl_namespace='{$obj->page_namespace}'" ;
+                       $res3 = $dbr->query( $sql3, DB_READ, $fname );
+                       $x = $dbr->fetchObject( $res3 );
+                       $rc->numberofWatchingusers = $x->n;
+               } else {
+                       $rc->numberofWatchingusers = 0;
+               }
+
+               $s .= $list->recentChangesLine( $rc, $updated );
        }
-       $s .= $sk->endRecentChangesList();
+       $s .= $list->endRecentChangesList();
 
        $dbr->freeResult( $res );
        $wgOut->addHTML( $s );
@@ -189,47 +399,117 @@ function wfSpecialWatchlist()
        if ( $wgUseWatchlistCache ) {
                $wgMemc->set( $memckey, $s, $wgWLCacheTimeout);
        }
-       
-}
 
+}
 
-function wlHoursLink( $h, $page ) {
-       global $wgUser, $wgLang;
+function wlHoursLink( $h, $page, $options = array() ) {
+       global $wgUser, $wgLang, $wgContLang;
        $sk = $wgUser->getSkin();
        $s = $sk->makeKnownLink(
-         $wgLang->specialPage( $page ),
+         $wgContLang->specialPage( $page ),
          $wgLang->formatNum( $h ),
-         "days=" . ($h / 24.0) );
+         wfArrayToCGI( array('days' => ($h / 24.0)), $options ) );
        return $s;
 }
 
-
-function wlDaysLink( $d, $page ) {
-       global $wgUser, $wgLang;
+function wlDaysLink( $d, $page, $options = array() ) {
+       global $wgUser, $wgLang, $wgContLang;
        $sk = $wgUser->getSkin();
        $s = $sk->makeKnownLink(
-         $wgLang->specialPage( $page ),
-         ($d ? $wgLang->formatNum( $d ) : wfMsg( "all" ) ), "days=$d" );
+         $wgContLang->specialPage( $page ),
+         ($d ? $wgLang->formatNum( $d ) : wfMsgHtml( 'watchlistall2' ) ),
+         wfArrayToCGI( array('days' => $d), $options ) );
        return $s;
 }
 
-function wlCutoffLinks( $days, $limit, $page = "Watchlist" )
-{
+/**
+ * Returns html
+ */
+function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
        $hours = array( 1, 2, 6, 12 );
        $days = array( 1, 3, 7 );
-       $cl = "";
+       $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",
-               implode(" | ", $hours),
-               implode(" | ", $days),
-               wlDaysLink( 0, $page ) );
+       return wfMsgExt('wlshowlast',
+               array('parseinline', 'replaceafter'),
+               implode(' | ', $hours),
+               implode(' | ', $days),
+               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 );
+       
+       # 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(
+                                       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 );
+       }
+}
 ?>