/**
* constructor
*/
-function wfSpecialWatchlist() {
- global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc, $wgRequest, $wgContLang;;
+function wfSpecialWatchlist( $par ) {
+ global $wgUser, $wgOut, $wgLang, $wgMemc, $wgRequest, $wgContLang;
global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
- global $wgEnotif, $wgShowUpdatedMarker, $wgRCShowWatchingUsers;
+ global $wgRCShowWatchingUsers, $wgEnotifWatchlist, $wgShowUpdatedMarker;
+ global $wgEnotifWatchlist, $wgFilterRobotsWL;
$fname = 'wfSpecialWatchlist';
$wgOut->setPagetitle( wfMsg( 'watchlist' ) );
- $sub = wfMsg( 'watchlistsub', $wgUser->getName() );
+ $sub = htmlspecialchars( wfMsg( 'watchlistsub', $wgUser->getName() ) );
$wgOut->setSubtitle( $sub );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
return;
}
+ $defaults = array(
+ /* float */ 'days' => 3.0, /* or 0.5, watch further below */
+ /* bool */ 'hideOwn' => false,
+ /* bool */ 'hideBots' => false,
+ );
+
+ extract($defaults);
+
# Get query variables
$days = $wgRequest->getVal( 'days' );
+ $hideOwn = $wgRequest->getBool( 'hideOwn' );
+ $hideBots = $wgRequest->getBool( 'hideBots' );
+
+ # Watchlist editing
$action = $wgRequest->getVal( 'action' );
$remove = $wgRequest->getVal( 'remove' );
- $hideOwn = $wgRequest->getVal( 'hideOwn' );
$id = $wgRequest->getArray( 'id' );
- if( $wgUser->getOption( 'enotifwatchlistpages' ) ) {
- $wgOut->addHTML( "<div class='enotifinfo'>\n" );
-
- $wgOut->addWikiText( wfMsg( 'email_notification_infotext' ) );
-
- $wgOut->addHTML( '<form action="' .
- $specialTitle->escapeLocalUrl( 'action=submit&magic=yes' ) .
- '" method="post"><input type="submit" name="dummy" value="' .
- htmlspecialchars( wfMsg( 'email_notification_reset' ) ) .
- '" /><input type="hidden" name="reset" value="all" /></form>' .
- "</div>\n\n" );
- }
-
$uid = $wgUser->getID();
- if( $wgRequest->getVal( 'reset' ) == 'all' ) {
+ 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($t->getDBkey() != '') {
+ if( !is_null( $t ) ) {
$wl = WatchedItem::fromUserTitle( $wgUser, $t );
if( $wl->removeWatch() === false ) {
$wgOut->addHTML( "<br />\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );
$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 );
+ $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)
+ # 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', $hideOwn, $defaults, $nondefaults);
+ wfAppendToArrayIfNotDefault( 'hideBots', $hideBots, $defaults, $nondefaults);
+
if ( $days <= 0 ) {
$docutoff = '';
$cutoff = false;
$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;
+ /*
+ $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 ( is_null( $hideOwn ) ) {
- # default is false (don't hide own edits)
- $hideOwn = 0;
- }
- if(isset($_REQUEST['magic'])) {
+ /* Edit watchlist form */
+ if($wgRequest->getBool('edit') || $par == 'edit' ) {
$wgOut->addWikiText( wfMsg( 'watchlistcontains', $wgLang->formatNum( $nitems ) ) .
- '<p>' . wfMsg( 'watcheditlist' ) . "</p>\n" );
+ "\n\n" . wfMsg( 'watcheditlist' ) );
$wgOut->addHTML( '<form action=\'' .
$specialTitle->escapeLocalUrl( 'action=submit' ) .
- "' method='post'>\n" .
- "<ul>\n" );
+ "' method='post'>\n" );
# Patch A2
# The following was proposed by KTurner 07.11.2004 to T.Gries
$res = $dbr->query( $sql, $fname );
$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->makeLink( $t, $t ) .
- "</li>\n" );
+ $list[$s->wl_namespace][] = $s->wl_title;
+ }
+
+ // 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) {
+ $t = Title::makeTitle( $ns, $title );
+ if( is_null( $t ) ) {
+ $wgOut->addHTML(
+ '<!-- bad title "' .
+ htmlspecialchars( $s->wl_title ) . '" in namespace ' . $s->wl_namespace . " -->\n"
+ );
+ } else {
+ $t = $t->getPrefixedText();
+ $wgOut->addHTML(
+ '<li><input type="checkbox" name="id[]" value="' . htmlspecialchars($t) . '" />' .
+ $sk->makeLink( $t, $t ) .
+ "</li>\n"
+ );
+ }
}
+ $wgOut->addHTML( '</ul>' );
}
- $wgOut->addHTML( "</ul>\n" .
+ $wgOut->addHTML(
"<input type='submit' name='remove' value=\"" .
htmlspecialchars( wfMsg( "removechecked" ) ) . "\" />\n" .
- "</form>\n" );
+ "</form>\n"
+ );
return;
}
# 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';
+
+ $andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
+ if( $wgFilterRobotsWL ) {
+ $andHideBotsOptional = $hideBots ? "AND (rc_bot = 0)" : '';
} 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';
+ $andHideBotsOptional = "AND rc_this_oldid=page_latest";
}
-
- if ( 0 == $hideOwn )
- $andHideOwn = '';
- else
- $andHideOwn = "AND (rev_user <> $uid)";
- $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
- page_namespace,page_title,rev_comment, page_id,
- rev_user,rev_user_text,rev_timestamp,rev_minor_edit,page_is_new,wl_notificationtimestamp
- FROM $watchlist,$page,$revision $use_index
- WHERE wl_user=$uid
- $andHideOwn
- AND $z
- AND wl_title=page_title
- AND page_latest=rev_id
- $docutoff
- ORDER BY rev_timestamp DESC";
+ # Show watchlist header
+ $header = '';
+ if( $wgUser->getOption( 'enotifwatchlistpages' ) && $wgEnotifWatchlist) {
+ $header .= wfMsg( 'wlheader-enotif' ) . "\n";
+ }
+ if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
+ $header .= wfMsg( 'wlheader-showupdated' ) . "\n";
+ }
+
+ # 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 page_namespace,rc_title page_title,
+ rc_comment rev_comment, rc_cur_id page_id,
+ rc_user rev_user,rc_user_text rev_user_text,
+ rc_timestamp rev_timestamp,rc_minor rev_minor_edit,
+ rc_this_oldid rev_id,
+ rc_last_oldid,
+ rc_new 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
+ $andHideOwn
+ $andHideBotsOptional
+ ORDER BY rc_timestamp DESC";
$res = $dbr->query( $sql, $fname );
$numRows = $dbr->numRows( $res );
+
+ /* Start bottom header */
+ $wgOut->addHTML( "<hr />\n<p>" );
+
if($days >= 1)
- $note = wfMsg( 'rcnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( $days ) );
+ $wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ),
+ $wgLang->formatNum( $days ) ) . '<br />' , false );
elseif($days > 0)
- $note = wfMsg( 'wlnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( round($days*24) ) );
- else
- $note = '';
- $wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
- $note = wlCutoffLinks( $days );
- $wgOut->addHTML( "{$note}\n" );
+ $wgOut->addWikiText( wfMsg( 'wlnote', $wgLang->formatNum( $numRows ),
+ $wgLang->formatNum( round($days*24) ) ) . '<br />' , false );
+
+ $wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" );
$sk = $wgUser->getSkin();
$s = $sk->makeKnownLink(
$wgContLang->specialPage( 'Watchlist' ),
- (0 == $hideOwn) ? wfMsg( 'wlhide' ) : wfMsg( 'wlshow' ),
- 'hideOwn=' . $wgLang->formatNum( 1-$hideOwn ) );
-
- $note = wfMsg( "wlhideshowown", $s );
- $wgOut->addHTML( "\n<br />{$note}\n<br />" );
+ (0 == $hideOwn) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
+ wfArrayToCGI( array('hideOwn' => 1-$hideOwn ), $nondefaults ) );
+ $wgOut->addHTML( wfMsgHtml( "wlhideshowown", $s ) );
+
+ if( $wgFilterRobotsWL ) {
+ $s = $sk->makeKnownLink(
+ $wgContLang->specialPage( 'Watchlist' ),
+ (0 == $hideBots) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
+ wfArrayToCGI( array('hideBots' => 1-$hideBots ), $nondefaults ) );
+ $wgOut->addHTML( wfMsgHtml( "wlhideshowbots", " $s" ) );
+ }
if ( $numRows == 0 ) {
- $wgOut->addHTML( '<p><i>' . wfMsg( 'watchnochange' ) . '</i></p>' );
+ $wgOut->addWikitext( "<br />" . wfMsg( 'watchnochange' ), false );
+ $wgOut->addHTML( "</p>\n" );
return;
}
- $sk = $wgUser->getSkin();
- $list =& new ChangesList( $sk );
+ $wgOut->addHTML( "</p>\n" );
+ /* 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++;
- 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}'" ;
+ $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 = 0;
}
- $s .= $list->recentChangesLine( $rc, true);
+ $s .= $list->recentChangesLine( $rc, $updated );
}
$s .= $list->endRecentChangesList();
}
-
-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( 'watchlistall2' ) ), "days=$d" );
+ ($d ? $wgLang->formatNum( $d ) : wfMsgHtml( 'watchlistall2' ) ),
+ wfArrayToCGI( array('days' => $d), $options ) );
return $s;
}
-function wlCutoffLinks( $days, $page = 'Watchlist' )
-{
+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',
implode(' | ', $hours),
implode(' | ', $days),
- wlDaysLink( 0, $page ) );
+ wlDaysLink( 0, $page, $options ) );
}
?>
dépôts / lhc / web / wiklou.git / blobdiff