? cvs14update.log
? mw141_against_mw141enea.diff
? maintenance/archives/patch-email-authentication-changetype.sql
? maintenance/archives/patch-email-authentication.sql
? maintenance/archives/patch-email-notification-changetype.sql
? maintenance/archives/patch-email-notification-fornewpages.sql
? maintenance/archives/patch-email-notification.sql
? maintenance/archives/patch-last-visited-revision.sql
Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/wikipedia/phase3/RELEASE-NOTES,v
retrieving revision 1.40.2.227
diff -u -b -r1.40.2.227 RELEASE-NOTES
--- RELEASE-NOTES	18 Apr 2005 23:09:55 -0000	1.40.2.227
+++ RELEASE-NOTES	19 Apr 2005 06:07:57 -0000
@@ -3,6 +3,201 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+****** THIS IS ENOTIF/EAUTHENT *******
+
+ENotif (EN) + EAuthent (EA) V 3.09 for REL1_4 (1.4.2)
+(C) T. Gries 19.04.2005 <mail@tgries.de>
+
+Executive summary for the impatient reader:
+
+* Enotif adds e-mail notification to MediaWiki and
+  sends e-mails to watching users when a
+
+    - watch-listed page or
+    - user_talk page is changed or
+    - a new page is created
+
+  http://bugzilla.wikipedia.org/show_bug.cgi?id=454
+  Visit the complete documentation on http://meta.wikipedia.org/Enotif
+
+* Eauthent is a mechanism to use a temporary one-time password cycle
+  to check whether the email address a user has entered is a valid one.
+
+  http://bugzilla.wikipedia.org/show_bug.cgi?id=866
+  Visit the complete documentation on http://meta.wikipedia.org/Eauthent
+
+  It has many other enhancement bugzillas implemented;
+
+	< TO DO: ADD LIST OF THEM >
+	< non-comprehensive list: 1572, 1876, 1370, 536 >
+
+v3.09
+* bug fix: in SpecialPreferences, check settings before storing in db
+  (preventing form tampering)
+
+v3.08
+* new feature: e-mail notifications are sent when a new page is created.
+  user option; a switch in DefaultSettings determines, whether the option
+  is enabled for all or only enabled for Bureaucrats, Developers, Sysops.
+  A database schema change is required:
+  new field user_emailnotificationfornewpages is added to table user
+  run yourwiki/maintenance/> php update.php
+
+v3.07
+* When moving a page (which is watched), the existing watch properties
+  are taken into consideration for determining the watch properties
+  of the target page:
+  the subject and/or talk target pages are watched depending
+  on the old watchlist entries regardless of the check box status
+  "move talk page as well" !
+
+v3.06
+* Labels "(last)" changed to "(prev)"
+* New meaning of "(last)" is "difference between this an last seen
+  revision of this page"
+
+v3.05 for REL1_4
+* optimised program design
+  all ENotif calls are moved to module RecentChange.php
+  no tricks -- straightforward
+* Writing to an user_talk OR USER page both triggers the
+  "You have new messages" marker and - if enabled - sending an ENotif.
+  This feature can be disabled globally.
+* Both pages are automatically added to the watchlist of the user,
+  if someone leaves a message on one
+* When adding a watch to a page, the talk_page is also watched and
+  vice versa (standard behaviour of mediawiki is unchanged), but
+  new watchlist management in Special:Watchlist allows to remove
+  watched pages and their talk pages independently.
+  This feature can be disabled globally (compatibility)
+* The "You have new messages" marker has got direct links to the
+  _difference_ view between current and last seen revision
+* database schema has changed;
+  run php update.php or make a fresh installation
+  The datatype for EN and EA timestamps has been changed from
+  varchar(14) to datetime
+* removed EA minor bug in SpecialPreferences:
+  EA timestamp are now invalidated when user clears her password
+* email addresses of sysops, bureaucrats and developers are
+  automatically authenticated as they are entered in user preferences
+  (can be disabled, so that every address must be authenticated)
+
+Other features:
+* added (lvrd) links:
+  link for difference between current and last-visited revision
+  in recent-changes view
+* introducing tooltip texts for (cur), (last), (hist), (diff), (lvrd).
+  All texts can be disabled by clearing the strings cur_tooltiptext etc.
+  in LanguageXX.php
+* User option to suppress the listing of older revisions of pages in
+  recent changes view: show only the current revisions of pages
+
+== Version Enotif+Eauthent EN+EA v2.00/CVS, 14.12.2004 ==
+written by Thomas Gries, Berlin and Markus Arndt, Munich
+
+Executive summary for the impatient reader:
+
+Enotif adds e-mail notification to MediaWiki and sends e-mails
+to watching users when a watch-listed pageor user_talk page is changed
+http://bugzilla.wikipedia.org/show_bug.cgi?id=454
+Visit the complete documentation on http://meta.wikipedia.org/Enotif
+
+Eauthent is a mechanism to use a temporary one-time password cycle
+to check whether the email address a user has entered is a valid one.
+http://bugzilla.wikipedia.org/show_bug.cgi?id=866
+Visit the complete documentation on http://meta.wikipedia.org/Eauthent
+
+The current patch has only been checked for (see DefaultSettings.php):
+
+- php mail()
+  ( = not using PEAR:Mail() module --- I do not know anyone who uses that)
+  $wgSMTP = false;
+- MySQL database
+  ( = not using PostgreSQL --- I do not know anyone who uses that)
+  $wgDBtype = "mysql";
+  $wgSearchType = "MyISAM";
+
+- STILL TODO:
+  NEW (newpageletter) and CORR (minoreditletter) markers needs
+  corresponding "spacers"
+
+- table user_newtalk dropped; changes on usertalk pages and their
+  notifications are now fully handled via existing table watchlist
+  The user interface and behavious is unchanged to previous version.
+- updaters.inc for compatibility with older mediawiki tables:
+  the conversion script converts existing user_newtalk entries
+  watchlist table entries
+  (user_newtalk) id ==> (watchlist) NS_USER_TALK:namefromId(id) timestamp=1
+- minor bug fixes:
+  updated marker now correctly shown on watchlist page
+  watching users number display with enhanced RC view + RCUseModStyle
+- wfUrlencode() instead of rawurlencode() in enotif mails
+- duplicate enotif code moved from UserTalkUpdate.php and
+  merged into UserMailer.php and using usermailer() solely
+- fixed an enotif mail text error for user names with spaces
+- fixed missing part for suppressing watching user number
+
+v1.36:
+magic watchlist shows and counts now only the content page, notwithstanding
+the content and talk page are stored separately in watchlist.
+* bug fixed: rawurlencode for pagetitles in enotif mails
+* bug fixed: link to userpages of anonymous user are correct now
+
+* Enotif v1.34
+ bugs fixed regarding missing $oldid parameter
+
+* v1.33
+* Details:
+ Implements almost all enotif options as user preferences.
+ These are only shown on the user preference page, if they are globally
+ enabled by the corresponding admin option in DefaultSettings.php.
+ Added admin feature to let enotifs appear to come from the page editor.
+ This facilitates automatic mail sorting and anti-spam filtering; feature was
+ originally proposed by Nick Triantos, thank you !
+ Page editor's email address is however only shown, if this user enabled
+ the option "reveal my email address" in user preferences. Otherwise,
+ the enotifs appear to come from WikiAdmin as usual (tricky to program,
+ but simply trust the algorithm. or look into UserMailer.php and
+ UserTalkPage.php).
+
+* Changes from previous enotif versions
+* v1.31 is an improved version with many security and also cosmetic changes
+ applied after two first reviews by Brion Vibber. v1.31 is basically the same as
+ the older Enotif v1.30 and v1.22 versions.
+
+ Added UseMod style for recent changes view so that only the most recent
+ change of any page is listed. The (diff) and (hist) still allow to retrieve the
+ older versions at users' discretion, but the RC view is much cleaner for
+ trusted environments such as medium-size companies or family wikis.
+
+* Enotif v1.30 redesign after review by Brion Vibber 25.10.2003
+
+* v1.22 "updated (since my last visit)" also shown for users without stored
+ email address in preferences, so that they can see, what watched pages
+ have changed.
+* show "updated (since my last visit)" markers in RC, history and watchlist
+* Systemvariables to suppress updated marker in all views
+* show number of watching users in RC and on bottom of articles in
+ classic skin and in monobook skin
+* Systemvariables in DefaultSettings.php to enable or disable features
+* v1.21 now suppresses displaying the marker "updated (since my last visit)"
+ in recent changes view for the older (already visited) versions of watched
+ pages - i.e. page versions before the enotif was sent do not bear that
+ marker any longer.
+* enotif mails come with a link to the diff view between current and last
+ visited version of the watching user.
+*database structure is changed automatically when installing via the
+ recommended way (starting index.php and re-using the old database name).
+	run php /maintenance/update.php
+ OR see /maintenance/archives/patch-email-notification.sql and apply the
+ command
+	ALTER TABLE  watchlist
+	ADD (wl_notificationtimestamp varchar(14) binary NOT NULL default '0');
+ manually to your database, which does not harm the non notification versions
+
+*adding a page x to the watchlist does automatically add a watch
+  for the accompanying talk_page talk:x and vice versa;
+
 
 == MediaWiki 1.4.1 ==
 
Index: config/index.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/config/index.php,v
retrieving revision 1.85.2.8
diff -u -b -r1.85.2.8 index.php
--- config/index.php	17 Apr 2005 23:24:27 -0000	1.85.2.8
+++ config/index.php	19 Apr 2005 06:07:58 -0000
@@ -80,7 +80,7 @@
 
  <b><a href="http://www.mediawiki.org/">MediaWiki</a></b> is
  Copyright (C) 2001-2004 by Magnus Manske, Brion Vibber, Lee Daniel Crocker,
- Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
+ Tim Starling, Erik M&ouml;ller, Gabriel Wicke, Thomas Gries and others.</p>
 
  <ul>
  <li><a href="../README">Readme</a></li>
@@ -418,6 +418,12 @@
 	$errs["MCServers"] = "Please specify at least one server if you wish to use memcached";
 }
 
+/* default values for installation */
+$conf->Email	=importRequest("Email", "email_enabled");
+$conf->Emailuser=importRequest("Emailuser", "emailuser_enabled");
+$conf->Enotif	=importRequest("Enotif", "enotif_allpages");
+$conf->Eauthent	=importRequest("Eauthent", "eauthent_enabled");
+
 if( $conf->posted && ( 0 == count( $errs ) ) ) {
 	do { /* So we can 'continue' to end prematurely */
 		$conf->Root = ($conf->RootPW != "");
@@ -666,7 +672,8 @@
 	<dt>
 		This will be used as the return address for password reminders and
 		may be displayed in some error conditions so visitors can get in
-		touch with you.
+		touch with you. It is also be used as the default sender address of e-mail
+		notifications (enotifs).
 	</dt>
 
 	<dd>
@@ -763,6 +770,87 @@
 		use Turck shared memory if the wiki will be running on a single Apache server.
 	</dl>
 
+<h2>E-mail, e-mail notification and authentification setup</h2>
+
+	<dl class="setup">
+	<dd>
+		<label class='column'>E-mail (general)</label>
+		<div>Select one:</div>
+
+		<ul class="plain">
+		<li><?php aField( $conf, "Email", "enabled", "radio", "email_enabled" ); ?></li>
+		<li><?php aField( $conf, "Email", "disabled", "radio", "email_disabled" ); ?></li>
+		</ul>
+	</dd>
+	<dt>
+		Use this to disable all e-mail functions (send a password reminder, user-to-user e-mail and e-mail notification),
+		if sending e-mails on your server doesn't work.
+	</dt>
+	<dd>
+		<label class='column'>User-to-user e-mail</label>
+		<div>Select one:</div>
+
+		<ul class="plain">
+		<li><?php aField( $conf, "Emailuser", "enabled", "radio", "emailuser_enabled" ); ?></li>
+		<li><?php aField( $conf, "Emailuser", "disabled", "radio", "emailuser_disabled" ); ?></li>
+		</ul>
+	</dd>
+	<dt>
+		Use this to disable only the user-to-user e-mail function (EmailUser).
+	</dt>
+	<dd>
+		<label class='column'>E-mail notification</label>
+		<div>Select one:</div>
+
+		<ul class="plain">
+		<li><?php aField( $conf, "Enotif", "disabled", "radio", "enotif_disabled" ); ?></li>
+		<li><?php aField( $conf, "Enotif", "enabled for changes of watch-listed and user_talk pages (recommended for small wikis; perhaps not suited for large wikis)", "radio", "enotif_allpages" ); ?></li>
+		<li><?php aField( $conf, "Enotif", "enabled for changes of user_talk pages only (suited for small and large wikis)", "radio", "enotif_usertalk" ); ?></li>
+		</ul>
+	</dd>
+	<dt>
+		<p><?php
+			$ccEnotif = htmlspecialchars( 'http://meta.wikipedia.org/wiki/Enotif' );
+			print "<a href=\"$ccEnotif\">E-mail notification</a>";
+		?>
+		 sends a notification e-mail to a user, when the user_talk page is changed
+                and/or when watch-listed pages are changed, depending on the above settings.
+		When testing this feature, be reminded, that obviously an e-mail address must be present in your preferences
+		and that your own changes never trigger notifications to be sent to yourself.</p>
+
+		<p>Users get corresponding options to select or deselect in their users' preferences.
+		The user options are not shown on the preference page, if e-mail notification is disabled.</p>
+
+		<p>There are additional options for fine tuning in /includes/DefaultSettings.php .</p>
+	</dt>
+
+	<dd>
+		<label class='column'>E-mail address authentication</label>
+		<div>Select one:</div>
+
+		<ul class="plain">
+		<li><?php aField( $conf, "Eauthent", "disabled", "radio", "eauthent_disabled" ); ?></li>
+		<li><?php aField( $conf, "Eauthent", "enabled", "radio", "eauthent_enabled" ); ?></li>
+		</ul>
+	</dd>
+	<dt>
+		<p><?php
+			$ccEauthent = htmlspecialchars( 'http://meta.wikipedia.org/wiki/Eauthent' );
+			print "<a href=\"$ccEnotif\">E-mail address authentication</a>";
+		?>
+		 uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or who changes his/her stored e-mail address
+		gets a one-time temporary password mailed to that address. The user can use the original password as long as wanted, however, the stored e-mail address
+		is only authenticated at the moment when the user logs in with the one-time temporary password.<p>
+
+		<p>The e-mail address stays authenticated as long as the user does not change it; the time of authentication is indicated
+		on the user preference page.</p>
+
+		<p>If the option is enabled, only authenticated e-mail addresses can receive EmailUser mails and/or
+		e-mail notification mails.</p>
+	</dt>
+
+	</dl>
+
 <h2>Database config</h2>
 
 <dl class="setup">
@@ -883,6 +971,30 @@
 			$turck = '#';
 	}
 
+	if ( $conf->Email == 'email_enabled' ) {
+		$enableemail = 'true';
+		$enableuseremail = ( $conf->Emailuser == 'emailuser_enabled' ) ? 'true' : 'false' ;
+		$eauthent = ( $conf->Eauthent == 'eauthent_enabled' ) ? 'true' : 'false' ;
+		switch ( $conf->Enotif ) {
+			case 'enotif_usertalk':
+				$enotifusertalk = 'true';
+				$enotifwatchlist = 'false';
+				break;
+			case 'enotif_allpages':
+				$enotifusertalk = 'true';
+				$enotifwatchlist = 'true';
+				break;
+			default:
+				$enotifusertalk = 'false';
+				$enotifwatchlist = 'false';
+		}
+	} else {
+		$enableuseremail = 'false';
+		$enableemail = 'false';
+		$eauthent = 'false';
+		$enotifusertalk = 'false';
+		$enotifwatchlist = 'false';
+	}
 
 	$file = @fopen( "/dev/urandom", "r" );
 	if ( $file ) {
@@ -942,9 +1054,21 @@
 \$wgUploadPath       = \"\$wgScriptPath/images\";
 \$wgUploadDirectory  = \"\$IP/images\";
 
+\$wgEnableEmail = $enableemail;
+\$wgEnableUserEmail = $enableuseremail;
+
 \$wgEmergencyContact = \"{$slconf['EmergencyContact']}\";
 \$wgPasswordSender	= \"{$slconf['PasswordSender']}\";
 
+## For a detailed description of the following switches see
+## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent
+## There are many more options for fine tuning available see
+## /includes/DefaultSettings.php
+## UPO means: this is also a user preference option
+\$wgEmailNotificationForUserTalkPages = $enotifusertalk; # UPO
+\$wgEmailNotificationForWatchlistPages = $enotifwatchlist; # UPO
+\$wgEmailAuthentication = $eauthent;
+
 \$wgDBserver         = \"{$slconf['DBserver']}\";
 \$wgDBname           = \"{$slconf['DBname']}\";
 \$wgDBuser           = \"{$slconf['DBuser']}\";
Index: includes/Article.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Article.php,v
retrieving revision 1.248.2.24
diff -u -b -r1.248.2.24 Article.php
--- includes/Article.php	4 Apr 2005 22:55:17 -0000	1.248.2.24
+++ includes/Article.php	19 Apr 2005 06:07:59 -0000
@@ -875,7 +875,6 @@
 		$this->mTitle->resetArticleID( $newid );
 
 		Article::onArticleCreate( $this->mTitle );
-		RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
 
 		if ($watchthis) {
 			if(!$this->mTitle->userIsWatching()) $this->watch();
@@ -893,6 +892,7 @@
 		# standard deferred updates
 		$this->editUpdates( $text );
 
+		RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
 		$this->showArticle( $text, wfMsg( 'newarticle' ) );
 	}
 
@@ -1031,7 +1031,8 @@
 
 		$oldtext = $this->getContent( true );
 
-		if ( 0 != strcmp( $text, $oldtext ) ) {
+		if ( 0 != strcmp( $text, $oldtext )) {
+			$empty = false;
 			$this->mCountAdjustment = $this->isCountable( $text )
 			  - $this->isCountable( $oldtext );
 			$now = wfTimestampNow();
@@ -1082,13 +1083,10 @@
 				);
 
 				$oldid = $dbw->insertId();
-
 				$bot = (int)($wgUser->isBot() || $forceBot);
-				RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
-					$oldid, $this->getTimestamp(), $bot );
 				Article::onArticleEdit( $this->mTitle );
 			}
-		}
+		} else $empty = true;
 
 		if( !$wgDBtransactions ) {
 			ignore_user_abort( $userAbort );
@@ -1105,6 +1103,10 @@
 		# standard deferred updates
 		$this->editUpdates( $text );
 
+		if ($good && !$empty) {
+			RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
+					$oldid, $this->getTimestamp(), $bot );
+		}
 
 		$urls = array();
 		# Template namespace
@@ -1910,11 +1912,27 @@
 			}
 		}
 		
-		# Update newtalk status if user is reading their own
+		# Update newtalk status if user is reading her own
 		# talk page
 
 		global $wgUser;
+		global $wgShowNewtalkForUserOrUserTalkPage;
 		
+		if ( $wgShowNewtalkForUserOrUserTalkPage ) {
+			# We need to check both the user_talk and user page for pending updates
+			# If nothing is pending, then we clear the newtalk flag
+
+			if ( $this->mTitle->getText() == $wgUser->getName() ) {
+				if ( (	($this->mTitle->getNamespace() == NS_USER_TALK) &&
+					(!$wgUser->checkNotificationPendingForArticleOrTalk($this->mTitle, NS_USER, $lvr )) )
+					 ||
+				     (	($this->mTitle->getNamespace() == NS_USER) &&
+					(!$wgUser->checkNotificationPendingForArticleOrTalk($this->mTitle, NS_USER_TALK, $lvr)) ) ) {
+					$wgUser->setNewtalk(0);
+					$wgUser->saveNewtalk();
+				}
+			}
+		} else {
 		if ($this->mTitle->getNamespace() == NS_USER_TALK &&
 			$this->mTitle->getText() == $wgUser->getName())
 		{
@@ -1923,6 +1941,9 @@
 		}
 	}
 
+		$wgUser->clearNotification( $this->mTitle );
+	}
+
 	/**
 	 * Do standard deferred updates after page edit.
 	 * Every 1000th edit, prune the recent changes table.
@@ -1957,16 +1978,21 @@
 			$u = new SearchUpdate( $id, $title, $text );
 			array_push( $wgDeferredUpdateList, $u );
 
-			# If this is another user's talk page, save a
-			# newtalk notification for them
-			
-			if ($this->mTitle->getNamespace() == NS_USER_TALK &&
-				$shortTitle != $wgUser->getName())
-			{
+			# If this is another user's page or talk page,
+			# save a newtalk notification for them and
+			# create a watchlist entry for this page
+
+			global $wgShowNewtalkForUserOrUserTalkPage;
+			if ( ( ($this->mTitle->getNamespace() == NS_USER_TALK) ||
+				($wgShowNewtalkForUserOrUserTalkPage && ($this->mTitle->getNamespace() == NS_USER) ) ) &&
+				$shortTitle != $wgUser->getName() ) {
 				$other = User::newFromName($shortTitle);
+					if (!$other->getNewtalk()) {
+						$other->addWatch( $this->mTitle );
 				$other->setNewtalk(1);
 				$other->saveNewtalk();
 			}
+			}
 
 			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 				$wgMessageCache->replace( $shortTitle, $text );
Index: includes/ChangesList.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/ChangesList.php,v
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.6 ChangesList.php
--- includes/ChangesList.php	28 Mar 2005 05:25:14 -0000	1.2.2.6
+++ includes/ChangesList.php	19 Apr 2005 06:08:00 -0000
@@ -79,18 +79,31 @@
 		if ( $rcObj->watched ) $link = '<strong>'.$link.'</strong>' ;
 		$r .= $link ;
 
+		if ($rcObj->notificationtimestamp) {
+			$r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'updatedmarker' ),
+			  "diff=0&oldid={$rcObj->lastvisitedrevision}", '', '', '', wfMsg( 'updatedmarker_tooltiptext' ) );
+		}
+
 		# Diff
 		$r .= ' (' ;
 		$r .= $rcObj->difflink ;
+		if ($rcObj->lvrlink) {
+			$r .= "; ".$rcObj->lvrlink ;
+		}
+
 		$r .= '; ' ;
 
 		# Hist
-		$r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' );
+		$r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history', '', '','', wfMsg( 'hist_tooltiptext' ));
 
 		# User/talk
 		$r .= ') . . '.$rcObj->userlink ;
 		$r .= $rcObj->usertalklink ;
 
+		if ($rcObj->numberofWatchingusers > 0) {
+			$r .= wfMsg('number_of_watching_users_RCview',  $wgContLang->formatNum($rcObj->numberofWatchingusers));
+		}
+
 		# Comment
 		 if ( $rc_comment != '' && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
 			$rc_comment=$this->skin->formatComment($rc_comment, $rcObj->getTitle());
@@ -175,6 +188,11 @@
 		if ( $block[0]->watched ) $link = '<strong>'.$link.'</strong>' ;
 		$r .= $link ;
 
+		if ($block[0]->notificationtimestamp) {
+			$r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'updatedmarker' ),
+			  "diff=0&oldid={$rcObj->lastvisitedrevision}", '', '', '', wfMsg( 'updatedmarker_tooltiptext' ) );
+		}
+
 		$curIdEq = 'curid=' . $block[0]->mAttribs['rc_cur_id'];
 		if ( $block[0]->mAttribs['rc_type'] != RC_LOG ) {
 			# Changes
@@ -186,10 +204,16 @@
 
 			# History
 			$r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle(), wfMsg( 'history' ), $curIdEq.'&action=history' );
+			if ($block[0]->lvrlink) {
+				$r .= "; ".$block[0]->lvrlink;
+			}
 			$r .= ')' ;
 		}
 
 		$r .= $users ;
+		if ($block[0]->numberofWatchingusers > 0) {
+			$r .= wfMsg('number_of_watching_users_RCview', $wgContLang->formatNum($block[0]->numberofWatchingusers));
+		}
 		$r .= "<br />\n" ;
 
 		# Sub-entries
@@ -292,7 +316,8 @@
 
 		static $message;
 		if( !isset( $message ) ) {
-			foreach( explode(' ', 'diff hist minoreditletter newpageletter blocklink undo' ) as $msg ) {
+			foreach( explode(' ', 'diff diff_tooltiptext hist hist_tooltiptext minoreditletter newpageletter blocklink undo '.
+						'diff-to-lvr lvr diff-to-lvr_tooltiptext lvr_tooltiptext updatedmarker updatedmarker_tooltiptext ' ) as $msg ) {
 				$message[$msg] = wfMsg( $msg );
 			}
 		}
@@ -327,7 +352,7 @@
 				'&wpNewTitle=' . wfUrlencode( $movedFromTitle->getPrefixedDBkey() ) ) . ') (';
 
 			# Hist
-			$s .= $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), $message['hist'], 'action=history' ) .
+			$s .= $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), $message['hist'], 'action=history', '', '', '', $message['hist_tooltiptext'] ) .
 				') . . ';
 
 			# "[[x]] moved to [[y]]"
@@ -351,12 +376,24 @@
 					$rcidparam = "";
 				$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'],
 				  "{$curIdEq}&diff={$rc_this_oldid}&oldid={$rc_last_oldid}{$rcidparam}",
-				  '', '', ' tabindex="'.$rc->counter.'"');
+				  '', '', ' tabindex="'.$rc->counter.'"', $message['diff_tooltiptext'] );
 			}
-			$s .= '('.$diffLink.') (';
+
+			if ( $watched && $rc->lastvisitedrevision )  {
+				if ( $rc_this_oldid == $rc->lastvisitedrevision ) {
+					$lvrLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['lvr'],
+					  "diff={$rc_this_oldid}&oldid={$rc->lastvisitedrevision}", '','','', $message['lvr_tooltiptext']);
+				} else {
+					$lvrLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff-to-lvr'],
+					  "diff={$rc_this_oldid}&oldid={$rc->lastvisitedrevision}",'','','', $message['diff-to-lvr_tooltiptext'] );
+				}
+			} else {
+				$lvrLink = $message['diff-to-lvr'];
+			}
+			$s .= '('.$diffLink.') ('.$lvrLink.') (';
 
 			# History link
-			$s .= $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['hist'], $curIdEq.'&action=history' );
+			$s .= $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['hist'], $curIdEq.'&action=history', '', '', '', $message['hist_tooltiptext'] );
 			$s .= ') . . ';
 
 			# M, N and ! (minor, new and unpatrolled)
@@ -375,6 +412,10 @@
 			if ( $watched ) {
 				$articleLink = '<strong>'.$articleLink.'</strong>';
 			}
+			if ($rc->notificationtimestamp) {
+				$articleLink .= $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['updatedmarker'],
+				  "diff=0&oldid={$rc->lastvisitedrevision}",'','','', $message['updatedmarker_tooltiptext'] );
+			}
 			$s .= ' '.$articleLink;
 			wfProfileOut("$fname-page");
 		}
@@ -422,6 +463,9 @@
 			$rc_comment = $this->skin->formatComment($rc_comment,$rc->getTitle());
 			$s .= $wgContLang->emphasize(' (' . $rc_comment . ')');
 		}
+		if ($rc->numberofWatchingusers > 0) {
+			$s .= ' ' . wfMsg('number_of_watching_users_RCview', $wgContLang->formatNum($rc->numberofWatchingusers));
+		}
 		$s .= "</li>\n";
 
 		wfProfileOut( "$fname-rest" );
@@ -435,7 +479,8 @@
 		
 		static $message;
 		if( !isset( $message ) ) {
-			foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last blocklink undo' ) as $msg ) {
+			foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last blocklink undo diff-to-lvr '.
+				'diff-to-lvr_tooltiptext cur_tooltiptext diff_tooltiptext last_tooltiptext updatedmarker updatedmarker_tooltiptext ' ) as $msg ) {
 				$message[$msg] = wfMsg( $msg );
 			}
 		}
@@ -487,6 +532,9 @@
 		$rc->watched = $watched ;
 		$rc->link = $clink ;
 		$rc->timestamp = $time;
+		$rc->notificationtimestamp = $baseRC->notificationtimestamp;
+		$rc->numberofWatchingusers = $baseRC->numberofWatchingusers;
+		$rc->lastvisitedrevision = $baseRC->lastvisitedrevision;
 
 		# Make "cur" and "diff" links
 		$titleObj = $rc->getTitle();
@@ -509,8 +557,8 @@
 		} else {
 			$query = $curIdEq.'&diff=0&oldid='.$rc_this_oldid;
 			$aprops = ' tabindex="'.$baseRC->counter.'"';
-			$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $query, '' ,'' , $aprops );
-			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $query . $rcIdQuery, '' ,'' , $aprops );
+			$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $query, '', '', $aprops, $message['cur_tooltiptext'] );
+			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $query . $rcIdQuery, '', '', $aprops, $message['diff_tooltiptext'] );
 		}
 
 		# Make "last" link
@@ -518,7 +566,7 @@
 			$lastLink = $message['last'];
 		} else {
 			$lastLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['last'],
-			  $curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid . $rcIdQuery );
+			  $curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid . $rcIdQuery, '', '', '', $message['last_tooltiptext'] );
 		}
 
 		# Make user link (or user contributions for unregistered users)
@@ -530,7 +578,14 @@
 			$userPage =& Title::makeTitle( NS_USER, $rc_user_text );
 			$userLink = $this->skin->makeLinkObj( $userPage, $rc_user_text );
 		}
+		if ( $watched && $baseRC->lastvisitedrevision )  {
+			$lvrLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff-to-lvr'],
+			  "{$curIdEq}&diff=0&oldid={$baseRC->lastvisitedrevision}" , '', '', '', $message['diff-to-lvr_tooltiptext'] );
+		} else {
+			$lvrLink= '' ;
+		}
 
+		$rc->lvrlink = $lvrLink;
 		$rc->userlink = $userLink;
 		$rc->lastlink = $lastLink;
 		$rc->curlink  = $curLink;
Index: includes/Database.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Database.php,v
retrieving revision 1.71.2.12
diff -u -b -r1.71.2.12 Database.php
--- includes/Database.php	12 Apr 2005 03:13:49 -0000	1.71.2.12
+++ includes/Database.php	19 Apr 2005 06:08:01 -0000
@@ -1366,6 +1366,17 @@
 		return wfTimestamp(TS_MW,$ts);
 	}
 	
+	function TimestampNULL() {
+		return NULL;
+	}
+
+	/**
+	 * Returns a string to match in a database query for an undefined timestamp value
+	 */
+	function wl_notificationtimestampIsNULL() {
+		return 'wl_notificationtimestamp IS NULL';
+	}
+
 	/**
 	 * @todo document
 	 */
Index: includes/DefaultSettings.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/DefaultSettings.php,v
retrieving revision 1.215.2.41
diff -u -b -r1.215.2.41 DefaultSettings.php
--- includes/DefaultSettings.php	15 Apr 2005 22:03:50 -0000	1.215.2.41
+++ includes/DefaultSettings.php	19 Apr 2005 06:08:02 -0000
@@ -19,7 +19,7 @@
  * MediaWiki version number
  * @global string $wgVersion
  */
-$wgVersion			= '1.4.1';
+$wgVersion	= '1.4.2 + ENotif+EAuthent v3.09';
 
 /** 
  * Name of the site.
@@ -162,6 +162,13 @@
 $wgPasswordSender	= 'Wikipedia Mail <apache@' . $wgServerName . '>';
 
 /**
+ * dummy address which should be accepted during mail send action
+ * It might be necessay to adapt the address or to set it equal
+ * to the $wgEmergencyContact address
+ */
+$wgNoReplyAddress	= 'reply@not.possible';
+
+/**
  * Set to true to enable the e-mail basic features:
  * Password reminders, etc. If sending e-mail on your
  * server doesn't work, you might want to disable this.
@@ -174,7 +181,7 @@
  * This can potentially be abused, as it's hard to track.
  * @global bool $wgEnableUserEmail
  */
-$wgEnableUserEmail = false;
+$wgEnableUserEmail = true;
 
 /**
  * SMTP Mode
@@ -493,6 +500,52 @@
 # Requires zlib support enabled in PHP.
 $wgUseGzip = false;
 
+/**
+ * Program to run when the email is actually sent out. You might want to make
+ * your server beep for example. Usermailer.php will make a system() call with
+ * exactly that string as parameter.
+ */
+#$wgEmailNotificationSystembeep = '/usr/bin/beep -f 4000 -l 20 &';
+$wgEmailNotificationSystembeep	= '';
+
+/** For email notification on page changes */
+$wgPasswordSender = $wgEmergencyContact;
+
+# true: from PageEditor if s/he opted-in
+# false: Enotif mails appear to come from $wgEmergencyContact
+$wgEmailNotificationMailsSentFromPageEditor	= true;
+
+// TODO move UPO to preferences probably ?
+# If set to true, users get a corresponding option in their preferences and can choose to enable or disable at their discretion
+# If set to false, the corresponding input form on the user preference page is suppressed
+# It call this to be a "user-preferences-option (UPO)"
+$wgEmailAuthentication				= true;  # UPO (if this is set to false, texts referring to authentication are suppressed)
+$wgEmailAuthenticationRequiredForAll		= false; # false means: Sysops, Bureaucrats and Developers don't need to authenticate their email addresses
+$wgEmailNotificationForWatchlistPages		= true;  # UPO
+$wgEmailNotificationForUserTalkPages		= true;  # UPO
+$wgEmailNotificationRevealPageEditorAddress	= true;  # UPO; reply-to address may be filled with page editor's address (if user allowed this in the preferences)
+$wgEmailNotificationForMinorEdits		= true;	 # UPO; false: "minor edits" on pages do not trigger notification mails.
+#							 # Attention: _every_ change on a user_talk page trigger a notification mail (if the user is not yet notified)
+$wgEmailNotificationForNewPages			= true;  # show the option
+$wgEmailNotificationForNewPagesAllowedForAll	= true;  # false means: only Sysops, Bureaucrats and Developers see this option
+
+# Show only the current revision of pages in recent changes
+$wgRCShowCurrentRevisionOnly			= true; # UPO
+
+/** Show watching users in recent changes, watchlist and page history views */
+$wgRCShowWatchingUsers 				= true; # UPO
+/** Show watching users in Page views */
+$wgPageShowWatchingUsers 			= true;
+/**
+ * Show "Updated (since my last visit)" marker in RC view, watchlist and history
+ * view for watched pages with new changes */
+$wgShowUpdatedMarker 				= true; # UPO
+
+/* whether on SpecialWatchlist the both pages are deleted together or not */
+$wgRemoveWatchedArticleAndTalkPageTogether	= false;
+
+/* show the "You have new messages" for changes on both the user and usertalk page */
+$wgShowNewtalkForUserOrUserTalkPage		= true;
 
 $wgCookieExpiration = 2592000;
 
Index: includes/PageHistory.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/PageHistory.php,v
retrieving revision 1.51
diff -u -b -r1.51 PageHistory.php
--- includes/PageHistory.php	25 Nov 2004 13:41:33 -0000	1.51
+++ includes/PageHistory.php	19 Apr 2005 06:08:02 -0000
@@ -23,6 +23,7 @@
 
 	function history() {
 		global $wgUser, $wgOut, $wgLang;
+		global $wgShowUpdatedMarker;
 
 		# If page hasn't changed, client can cache this
 
@@ -59,8 +60,28 @@
 
 		$namespace = $this->mTitle->getNamespace();
 		$title = $this->mTitle->getText();
+		$uid = $wgUser->getID();
 
 		$db =& wfGetDB( DB_SLAVE );
+		if ($uid && $wgShowUpdatedMarker && $wgUser->getOption( 'showupdated' )) {
+			$s = $db->selectRow( 'watchlist',
+					array(	'wl_notificationtimestamp',
+						'wl_lastvisitedrevision'
+					),
+					array(	'wl_namespace' => $namespace,
+						'wl_title' => $this->mTitle->getDBkey(),
+						'wl_user' => $uid
+					), $fname );
+			if ( $s === false ) {
+				$notificationtimestamp = false;
+			} else {
+				$notificationtimestamp = $s->wl_notificationtimestamp;
+				$lastvisitedrevision = $s->wl_lastvisitedrevision;
+			}
+		} else {
+			$notificationtimestamp = false;
+		}
+
 		$use_index = $db->useIndexClause( 'name_title_timestamp' );
 		$oldtable = $db->tableName( 'old' );
 
@@ -103,6 +124,8 @@
 				$this->mArticle->getUserText(), $namespace,
 				$title, 0, $this->mArticle->getComment(),
 				( $this->mArticle->getMinorEdit() > 0 ),
+				$notificationtimestamp,
+				$lastvisitedrevision,
 				$counter++
 			);
 		}
@@ -112,6 +135,8 @@
 				$line->old_user_text, $namespace,
 				$title, $line->old_id,
 				$line->old_comment, ( $line->old_minor_edit > 0 ),
+				$notificationtimestamp,
+				$lastvisitedrevision,
 				$counter++
 			);
 		}
@@ -143,19 +168,20 @@
 		return $s;
 	}
 
-	function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '' ) {
+	function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $notificationtimestamp = false, $lastvisitedrevision = false, $counter = '' ) {
 		global $wgLang, $wgContLang;
 
 		static $message;
 		if( !isset( $message ) ) {
-			foreach( explode( ' ', 'cur last selectolderversionfordiff selectnewerversionfordiff minoreditletter' ) as $msg ) {
+			foreach( explode( ' ', 'cur last selectolderversionfordiff selectnewerversionfordiff minoreditletter '.
+						'updatedmarker updatedmarker_tooltiptext last_tooltiptext cur_tooltiptext ' ) as $msg ) {
 				$message[$msg] = wfMsg( $msg );
 			}
 		}
 		
 		if ( $oid && $this->lastline ) {
 			$ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLinkObj(
-			  $this->mTitle, $message['last'], "diff=\\1&oldid={$oid}",'' ,'' ,' tabindex="'.$counter.'"' ), $this->lastline );
+			  $this->mTitle, $message['last'], "diff=\\1&oldid={$oid}",'' ,'' ,' tabindex="'.$counter.'"', $message['last_tooltiptext'] ), $this->lastline );
 		} else {
 			$ret = '';
 		}
@@ -180,7 +206,7 @@
 		$s = '<li>';
 		if ( $oid ) {
 			$curlink = $this->mSkin->makeKnownLinkObj( $this->mTitle, $message['cur'],
-			  'diff=0&oldid='.$oid );
+			  'diff=0&oldid='.$oid, '', '', '', $message['cur_tooltiptext'] );
 		} else {
 			$curlink = $message['cur'];
 		}
@@ -206,6 +232,10 @@
 			$c = $this->mSkin->formatcomment( $c, $this->mTitle );
 			$s .= " <em>($c)</em>";
 		}
+		if ($notificationtimestamp && ($ts >= wfTimestamp(TS_MW, $notificationtimestamp))) {
+			$s .= $this->mSkin->makeKnownLinkObj( $this->mTitle, $message['updatedmarker'],
+			  "diff=0&oldid={$lastvisitedrevision}", '', '', '', $message['updatedmarker_tooltiptext'] );
+		}
 		$s .= '</li>';
 
 		$this->lastline = $s;
Index: includes/RecentChange.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/RecentChange.php,v
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.2 RecentChange.php
--- includes/RecentChange.php	19 Jan 2005 03:53:05 -0000	1.18.2.2
+++ includes/RecentChange.php	19 Apr 2005 06:08:02 -0000
@@ -40,6 +40,10 @@
  * 	lastTimestamp   timestamp of previous entry, used in WHERE clause during update
  * 	lang            the interwiki prefix, automatically set in save()
  * 
+ * temporary:		not stored in the database
+ *      notificationtimestamp
+ *      numberofWatchingusers
+ *
  * @todo document functions and variables
  * @package MediaWiki
  */
@@ -54,6 +58,8 @@
 	{
 		$rc = new RecentChange;
 		$rc->loadFromRow( $row );
+		$rc->notificationtimestamp = false;
+		$rc->numberofWatchingusers = false;
 		return $rc;
 	}
 
@@ -214,6 +220,10 @@
 			'lastTimestamp' => $lastTimestamp
 		);
 		$rc->save();
+
+		include_once( "UserMailer.php" );
+		$wgEnotif = new EmailNotification ();
+		$wgEnotif->NotifyOnPageChangeOrNewpage( $timestamp, $title, $minor, $user, $comment, $oldId );
 	}
 
 	# Makes an entry in the database corresponding to page creation
@@ -255,6 +265,10 @@
 			'lastTimestamp' => 0
 		);
 		$rc->save();
+
+		include_once( "UserMailer.php" );
+		$wgEnotif = new EmailNotification ();
+		$wgEnotif->NotifyOnPageChangeOrNewpage( $timestamp, $title, $minor, $user, $comment, 0);
 	}
 
 	# Makes an entry in the database corresponding to a rename
Index: includes/Skin.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Skin.php,v
retrieving revision 1.322.2.21
diff -u -b -r1.322.2.21 Skin.php
--- includes/Skin.php	10 Apr 2005 19:34:51 -0000	1.322.2.21
+++ includes/Skin.php	19 Apr 2005 06:08:03 -0000
@@ -343,7 +343,7 @@
 		return $r;
 	}
 
-	function getInternalLinkAttributes( $link, $text, $broken = false ) {
+	function getInternalLinkAttributes( $link, $text, $broken = false, $hovertext= '' ) {
 		$link = urldecode( $link );
 		$link = str_replace( '_', ' ', $link );
 		$link = htmlspecialchars( $link );
@@ -357,7 +357,7 @@
 		}
 
 		if( $this->mOptions['hover'] ) {
-			$r .= " title=\"{$link}\"";
+			$r .= ' title="' .$hovertext . $link.'"';
 		}
 		return $r;
 	}
@@ -365,7 +365,7 @@
 	/**
 	 * @param bool $broken
 	 */
-	function getInternalLinkAttributesObj( &$nt, $text, $broken = false ) {
+	function getInternalLinkAttributesObj( &$nt, $text, $broken = false, $hovertext= '' ) {
 		if( $broken == 'stub' ) {
 			$r = ' class="stub"';
 		} else if ( $broken == 'yes' ) {
@@ -375,7 +375,7 @@
 		}
 
 		if( $this->mOptions['hover'] ) {
-			$r .= ' title="' . $nt->getEscapedText() . '"';
+			$r .= ' title="' . $hovertext . $nt->getEscapedText() . '"';
 		}
 		return $r;
 	}
@@ -587,9 +587,48 @@
 		}
 
 		if ( $wgUser->getNewtalk() ) {
-		# do not show "You have new messages" text when we are viewing our
-		# own talk page
 
+		global $wgShowNewtalkForUserOrUserTalkPage;
+		if ( $wgShowNewtalkForUserOrUserTalkPage ) {
+			# do always show "You have new messages" text
+			# checks are difficult and must consider many cases
+				$username = $wgUser->getName();
+				$userpage = $wgContLang->getNsText( Namespace::getUser() ) . ":" . $username;
+				$usertitle = Title::newFromText( $userpage );
+
+				if ($wgUser->checkNotificationPendingForArticleOrTalk( $usertitle, NS_USER_TALK, $lvr )) {
+					$diff_oldid = ($lvr != 0) ? "diff=0&oldid={$lvr}" : '';
+					$ns_usertalk = $wgContLang->getNsText(Namespace::getTalk( Namespace::getUser() ) );
+					$newmsg_usertalklink = $this->makeKnownLink( $ns_usertalk . ':' . $username, wfMsg( 'newmsg_usertalk' ) );
+					$newmsg_usertalklvrlink = $this->makeKnownLink( $ns_usertalk . ':' . $username, wfMsg( 'diff-to-lvr' ),
+						$diff_oldid, '', '', '', wfMsg( 'diff-to-lvr_tooltiptext' ) );
+					$newmsg_usertalk = true;
+				};
+				if ($wgUser->checkNotificationPendingForArticleOrTalk( $usertitle, NS_USER, $lvr )) {
+					$diff_oldid = ($lvr != 0) ? "diff=0&oldid={$lvr}" : '';
+					$ns_user = $wgContLang->getNsText(Namespace::getSubject( Namespace::getUser() ) );
+					$newmsg_userlink = $this->makeKnownLink( $ns_user . ':' . $username, wfMsg( 'newmsg_user' ) );
+					$newmsg_userlvrlink = $this->makeKnownLink( $ns_user . ':' . $username, wfMsg( 'diff-to-lvr' ),
+						$diff_oldid, '', '', '', wfMsg( 'diff-to-lvr_tooltiptext' ) );
+					$newmsg_user = true;
+				}
+				switch (true) {
+				case ( $newmsg_user &&  $newmsg_usertalk): {
+					$str = $newmsg_userlink . ' (' . $newmsg_userlvrlink . ') ' . wfMsg('newmsg_and') . $newmsg_usertalklink . ' (' . $newmsg_usertalklvrlink;
+					break;
+					}
+				case (!$newmsg_user &&  $newmsg_usertalk): {
+					$str = $newmsg_usertalklink . ' (' . $newmsg_usertalklvrlink;
+					break;
+					}
+				case ( $newmsg_user && !$newmsg_usertalk): {
+					$str = $newmsg_userlink . ' (' . $newmsg_userlvrlink;
+					break;
+					}
+				}
+				$s .= ' | <strong>'. wfMsg( 'newmsg', $str . ') ' . wfMsg('newmsg_page') . '</strong>');
+		} else { /* OLD METHOD */
+			# do not show "You have new messages" text when we are viewing our own talk page
 			if(!(strcmp($wgTitle->getText(),$wgUser->getName()) == 0 &&
 						$wgTitle->getNamespace()==Namespace::getTalk(Namespace::getUser()))) {
 				$n =$wgUser->getName();
@@ -597,11 +636,12 @@
 							Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
 						wfMsg('newmessageslink') );
 				$s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
+			}
+		}
 				# disable caching
 				$wgOut->setSquidMaxage(0);
 				$wgOut->enableClientCache(false);
 			}
-		}
 
 		$undelete = $this->getUndeleteLink();
 		if( !empty( $undelete ) ) {
@@ -841,6 +881,8 @@
 	function pageStats() {
 		global $wgOut, $wgLang, $wgArticle, $wgRequest;
 		global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax;
+		global $wgTitle, $wgPageShowWatchingUsers;
+		global $wgUser;
 
 		extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 		if ( ! $wgOut->isArticle() ) { return ''; }
@@ -862,6 +904,17 @@
 		    $s .= $this->lastModified();
 		}
 
+		if ($wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+			$dbr =& wfGetDB( DB_SLAVE );
+			extract( $dbr->tableNames( 'watchlist' ) );
+			$sql = "SELECT COUNT(*) AS n FROM $watchlist
+				WHERE wl_title='" . $dbr->strencode($wgTitle->getDBKey()) .
+				"' AND  wl_namespace=" . $wgTitle->getNamespace() ;
+			$res = $dbr->query( $sql, 'Skin::pageStats');
+			$x = $dbr->fetchObject( $res );
+			$s .= ' ' . wfMsg('number_of_watching_users_pageview', $x->n );
+		}
+
 		return $s . ' ' .  $this->getCopyright();
 	}
 
@@ -923,7 +976,7 @@
 
 		$timestamp = $wgArticle->getTimestamp();
 		if ( $timestamp ) {
-			$d = $wgLang->timeanddate( $wgArticle->getTimestamp(), true );
+			$d = $wgLang->timeanddate( $timestamp, true );
 			$s = ' ' . wfMsg( 'lastmodified', $d );
 		} else {
 			$s = '';
@@ -1340,10 +1393,10 @@
 		return $result;
 	}
 
-	function makeKnownLink( $title, $text = '', $query = '', $trail = '', $prefix = '',$aprops = '') {
+	function makeKnownLink( $title, $text = '', $query = '', $trail = '', $prefix = '', $aprops = '', $hovertext = '') {
 		$nt = Title::newFromText( $title );
 		if ($nt) {
-			return $this->makeKnownLinkObj( Title::newFromText( $title ), $text, $query, $trail, $prefix , $aprops );
+			return $this->makeKnownLinkObj( Title::newFromText( $title ), $text, $query, $trail, $prefix , $aprops, $hovertext );
 		} else {
 			wfDebug( 'Invalid title passed to Skin::makeKnownLink(): "'.$title."\"\n" );
 			return $text == '' ? $title : $text;
@@ -1496,7 +1549,7 @@
 	/**
 	 * Pass a title object, not a title string
 	 */
-	function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '' ) {
+	function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $hovertext= '' ) {
 		global $wgOut, $wgTitle, $wgInputEncoding;
 
 		$fname = 'Skin::makeKnownLinkObj';
@@ -1525,7 +1578,7 @@
 		if ( '' == $text ) {
 			$text = htmlspecialchars( $nt->getPrefixedText() );
 		}
-		$style = $this->getInternalLinkAttributesObj( $nt, $text );
+		$style = $this->getInternalLinkAttributesObj( $nt, $text,'', $hovertext );
 
 		$inside = '';
 		if ( '' != $trail ) {
Index: includes/SkinTemplate.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SkinTemplate.php,v
retrieving revision 1.8.2.19
diff -u -b -r1.8.2.19 SkinTemplate.php
--- includes/SkinTemplate.php	27 Mar 2005 16:43:24 -0000	1.8.2.19
+++ includes/SkinTemplate.php	19 Apr 2005 06:08:04 -0000
@@ -148,6 +148,7 @@
 		global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
 		global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
 		global $wgMaxCredits, $wgShowCreditsIfMax, $wgSquidMaxage;
+		global $wgPageShowWatchingUsers;
 
 		$fname = 'SkinTemplate::outputPage';
 		wfProfileIn( $fname );
@@ -156,6 +157,9 @@
 
 		wfProfileIn( "$fname-init" );
 		$this->initPage( $out );
+		$this->mTitle = $wgTitle;
+		$this->mUser =& $wgUser;
+
 		$tpl =& $this->setupTemplate( $this->template, 'skins' );
 
 		#if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
@@ -251,23 +255,60 @@
 		} else {
 			$tpl->set('jsvarurl', false);
 		}
-		if( $wgUser->getNewtalk() ) {
+
+		if ( $wgUser->getNewtalk() ) {
+		global $wgShowNewtalkForUserOrUserTalkPage;
+		if ( $wgShowNewtalkForUserOrUserTalkPage ) {
+				$usertitle = Title::newFromText( $this->userpage );
+				if ($wgUser->checkNotificationPendingForArticleOrTalk( $usertitle, NS_USER_TALK, $lvr )) {
+					$diff_oldid = ($lvr != 0) ? "diff=0&oldid={$lvr}" : '';
+					$ns_usertalk = $wgContLang->getNsText(Namespace::getTalk( Namespace::getUser() ) );
+					$newmsg_usertalklink = $this->makeKnownLink( $ns_usertalk . ':' . $this->username, wfMsg( 'newmsg_usertalk' ) );
+					$newmsg_usertalklvrlink = $this->makeKnownLink( $ns_usertalk . ':' . $this->username, wfMsg( 'diff-to-lvr' ),
+						$diff_oldid, '', '', '', wfMsg( 'diff-to-lvr_tooltiptext' ) );
+					$newmsg_usertalk = true;
+				};
+				if ($wgUser->checkNotificationPendingForArticleOrTalk( $usertitle, NS_USER, $lvr )) {
+					$diff_oldid = ($lvr != 0) ? "diff=0&oldid={$lvr}" : '';
+					$ns_user = $wgContLang->getNsText(Namespace::getSubject( Namespace::getUser() ) );
+					$newmsg_userlink = $this->makeKnownLink( $ns_user . ':' . $this->username, wfMsg( 'newmsg_user' ) );
+					$newmsg_userlvrlink = $this->makeKnownLink( $ns_user . ':' . $this->username, wfMsg( 'diff-to-lvr' ),
+						$diff_oldid, '', '', '', wfMsg( 'diff-to-lvr_tooltiptext' ) );
+					$newmsg_user = true;
+				}
+				switch (true) {
+				case ( $newmsg_user &&  $newmsg_usertalk): {
+					$str = $newmsg_userlink . ' (' . $newmsg_userlvrlink . ') ' . wfMsg('newmsg_and') . $newmsg_usertalklink . ' (' . $newmsg_usertalklvrlink;
+					break;
+					}
+				case (!$newmsg_user &&  $newmsg_usertalk): {
+					$str = $newmsg_usertalklink . ' (' . $newmsg_usertalklvrlink;
+					break;
+					}
+				case ( $newmsg_user && !$newmsg_usertalk): {
+					$str = $newmsg_userlink . ' (' . $newmsg_userlvrlink;
+					break;
+					}
+				}
+				$ntl = wfMsg( 'newmsg', $str . ') ' . wfMsg('newmsg_page') );
+		} else { /* OLD METHOD */
 			$usertitle = Title::newFromText( $this->userpage );
 			$usertalktitle = $usertitle->getTalkPage();
 			if($usertalktitle->getPrefixedDbKey() != $this->thispage){
-
 				$ntl = wfMsg( 'newmessages',
 				$this->makeKnownLink(
 					$wgContLang->getNsText( Namespace::getTalk( Namespace::getUser() ) )
 					. ':' . $this->username,
 					wfMsg('newmessageslink') )
 				);
+			}
+		}
 				# Disable Cache
 				$wgOut->setSquidMaxage(0);
-			}
 		} else {
 			$ntl = '';
 		}
+
 		wfProfileOut( "$fname-stuff2" );
 
 		wfProfileIn( "$fname-stuff3" );
@@ -285,6 +326,25 @@
 			} else {
 				$tpl->set('viewcount', false);
 			}
+
+			if ($wgPageShowWatchingUsers) {
+				$dbr =& wfGetDB( DB_SLAVE );
+				extract( $dbr->tableNames( 'watchlist' ) );
+				$sql = "SELECT COUNT(*) AS n FROM $watchlist
+					WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBKey()) .
+					"' AND  wl_namespace=" . $this->mTitle->getNamespace() ;
+				$res = $dbr->query( $sql, 'SkinPHPTal::outputPage');
+				$x = $dbr->fetchObject( $res );
+				$numberofwatchingusers = $x->n;
+				if ($numberofwatchingusers > 0) {
+					$tpl->set('numberofwatchingusers', wfMsg('number_of_watching_users_pageview', $numberofwatchingusers));
+				} else {
+					$tpl->set('numberofwatchingusers', false);
+				}
+			} else {
+				$tpl->set('numberofwatchingusers', false);
+			}
+
 			$tpl->set('lastmod', $this->lastModified());
 			$tpl->set('copyright',$this->getCopyright());
 
@@ -302,11 +362,13 @@
 			$tpl->set('viewcount', false);
 			$tpl->set('lastmod', false);
 			$tpl->set('credits', false);
+			$tpl->set('numberofwatchingusers', false);
 		} else {
 			$tpl->set('copyright', false);
 			$tpl->set('viewcount', false);
 			$tpl->set('lastmod', false);
 			$tpl->set('credits', false);
+			$tpl->set('numberofwatchingusers', false);
 		}
 		wfProfileOut( "$fname-stuff3" );
 
Index: includes/SpecialEmailuser.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialEmailuser.php,v
retrieving revision 1.19.2.5
diff -u -b -r1.19.2.5 SpecialEmailuser.php
--- includes/SpecialEmailuser.php	17 Mar 2005 00:13:26 -0000	1.19.2.5
+++ includes/SpecialEmailuser.php	19 Apr 2005 06:08:04 -0000
@@ -18,8 +18,8 @@
 		return;
 	}
 	
-	if ( 0 == $wgUser->getID() ||
-		( false === strpos( $wgUser->getEmail(), "@" ) ) ) {
+	if ( $wgUser->isAnon() ||
+		( !$wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) ) {
 		$wgOut->errorpage( "mailnologin", "mailnologintext" );
 		return;
 	}
@@ -48,8 +48,9 @@
 
 	$address = $nu->getEmail();
 
-	if ( ( false === strpos( $address, "@" ) ) ||
-	  ( 1 == $nu->getOption( "disablemail" ) ) ) {
+	if ( ( !$nu->isValidEmailAddr( $address ) ) ||
+	     ( 1 == $nu->getOption( "disablemail" ) ) ||
+	     ( 0 == $nu->getEmailauthenticationtimestamp() ) ) {
 		$wgOut->errorpage( "noemailtitle", "noemailtext" );
 		return;
 	}
Index: includes/SpecialPreferences.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialPreferences.php,v
retrieving revision 1.76.2.12
diff -u -b -r1.76.2.12 SpecialPreferences.php
--- includes/SpecialPreferences.php	30 Mar 2005 19:49:42 -0000	1.76.2.12
+++ includes/SpecialPreferences.php	19 Apr 2005 06:08:04 -0000
@@ -33,6 +33,7 @@
 	var $mUserLanguage, $mUserVariant;
 	var $mSearch, $mRecent, $mHourDiff, $mSearchLines, $mSearchChars, $mAction;
 	var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize;
+	var $mEnotifNewPages;
 
 	/**
 	 * Constructor
@@ -54,6 +55,7 @@
 		$this->mUserEmail = $request->getVal( 'wpUserEmail' );
 		$this->mRealName = ($wgAllowRealName) ? $request->getVal( 'wpRealName' ) : '';
 		$this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 1 : 0;
+		$this->mEnotifNewPages = $request->getCheck( 'wpEnotifNewPages' ) ? 1 : 0;
 		$this->mNick = $request->getVal( 'wpNick' );
 		$this->mUserLanguage = $request->getVal( 'wpUserLanguage' );
         $this->mUserVariant = $request->getVal( 'wpUserVariant' );
@@ -173,6 +175,8 @@
 	 */
 	function savePreferences() {
 		global $wgUser, $wgLang, $wgOut;
+		global $wgEmailAuthentication, $wgEnableEmail, $wgEnableUserEmail;
+		global $wgEmailNotificationForNewPages,$wgEmailNotificationForNewPagesAllowedForAll;
 
 		if ( '' != $this->mNewpass ) {
 			if ( $this->mNewpass != $this->mRetypePass ) {
@@ -186,10 +190,6 @@
 			}
 			$wgUser->setPassword( $this->mNewpass );
 		}
-		global $wgEnableEmail;
-		if( $wgEnableEmail ) {
-			$wgUser->setEmail( $this->mUserEmail );
-		}
 		$wgUser->setRealName( $this->mRealName );
 		$wgUser->setOption( 'language', $this->mUserLanguage );
         $wgUser->setOption( 'variant', $this->mUserVariant );
@@ -213,7 +213,6 @@
 			$wgUser->setOption( "searchNs{$i}", $value );
 		}
 		
-		global $wgEnableUserEmail;
 		if( $wgEnableEmail && $wgEnableUserEmail ) {
 			$wgUser->setOption( 'disablemail', $this->mEmailFlag );
 		}
@@ -222,9 +221,55 @@
 		foreach ( $this->mToggles as $tname => $tvalue ) {
 			$wgUser->setOption( $tname, $tvalue );
 		}
+
+		if ( $wgEmailNotificationForNewPages &&
+			( $wgEmailNotificationForNewPagesAllowedForAll || $wgUser->isBureaucratOrDeveloperOrSysop() ) ) {
+			$wgUser->setEmailNotificationForNewPages( $this->mEnotifNewPages );
+		} else {
+			$wgUser->setEmailNotificationForNewPages( false );
+		}
 		$wgUser->setCookies();
+		$wgUser->saveSettings();
+
+		if( $wgEnableEmail ) {
+			$newadr = strtolower( $this->mUserEmail );
+			$oldadr = strtolower($wgUser->getEmail());
+			if (($newadr <> '') && ($newadr <> $oldadr)) { # the user has supplied a new email address on the login page
+				# prepare for authentication and mail a temporary password to newadr
+				require_once( 'SpecialUserlogin.php' );
+				if ( !$wgUser->isValidEmailAddr( $newadr ) ) {
+					$this->mainPrefsForm( wfMsg( 'invalidemailaddress' ) );
+					/* here we do intentionally *not* invalidate the stored and perhaps already
+					   authenticated e-mail address */
+					return;
+				}
+				$wgUser->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
 		
+				global $wgEmailAuthenticationRequiredForAll;
+				if ( !$wgEmailAuthenticationRequiredForAll && $wgUser->isBureaucratOrDeveloperOrSysop() ) {
+					$wgUser->mEmailAuthenticationtimestamp = wfTimestampNow();
+ 					$wgUser->saveSettings();
+				} else {
+					$wgUser->mEmailAuthenticationtimestamp = Database::TimestampNULL(); # but flag as "dirty" = unauthenticated
+ 					$wgUser->saveSettings();
+					if ($wgEmailAuthentication) {
+						# mail a temporary password to the dirty address
+						# on "save options", this user will be logged-out automatically
+						$error = LoginForm::mailPasswordInternal( $wgUser, true, $dummy );
+						if ($error === '') {
+							return LoginForm::mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $wgUser->getName() ) );
+						} else {
+							return LoginForm::mainLoginForm( wfMsg( 'mailerror', $error ) );
+						}
+						# if user returns, that new email address gets authenticated in checkpassword()
+					}
+				}
+			} else {
+				$wgUser->setEmail( strtolower($this->mUserEmail) );
+				$wgUser->setCookies();
 		$wgUser->saveSettings();
+			}
+		}
 
 		$wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
 		$po = ParserOptions::newFromUser( $wgUser );
@@ -239,6 +284,8 @@
 
 		$this->mOldpass = $this->mNewpass = $this->mRetypePass = '';
 		$this->mUserEmail = $wgUser->getEmail();
+		$this->mUserEmailAuthenticationtimestamp = $wgUser->getEmailAuthenticationtimestamp();
+		$this->mEnotifNewPages = $wgUser->getEmailNotificationForNewPages();
 		$this->mRealName = ($wgAllowRealName) ? $wgUser->getRealName() : '';
 		$this->mUserLanguage = $wgUser->getOption( 'language' );
 		if( empty( $this->mUserLanguage ) ) {
@@ -313,7 +360,7 @@
 	}
 
 
-	function getToggle( $tname ) {
+	function getToggle( $tname, $trailer = false) {
 		global $wgUser, $wgLang;
 		
 		$this->mUsedToggles[$tname] = true;
@@ -324,8 +371,9 @@
 		} else {
 			$checked = '';
 		}		
+		$trailer =($trailer) ? $trailer : '';
 		return "<div><input type='checkbox' value=\"1\" "
-		  . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label></div>\n";
+		  . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label>$trailer</div>\n";
 	}
 
 	/**
@@ -336,6 +384,10 @@
 		global $wgAllowRealName, $wgImageLimits;
 		global $wgLanguageNames, $wgDisableLangConversion;
 		global $wgContLanguageCode, $wgSkipSkin;
+		global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForUserTalkPages,$wgEmailNotificationForMinorEdits;
+		global $wgRCShowCurrentRevisionOnly, $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
+		global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
+		global $wgEmailNotificationForNewPages,$wgEmailNotificationForNewPagesAllowedForAll;
 		$wgOut->setPageTitle( wfMsg( 'preferences' ) );
 		$wgOut->setArticleRelated( false );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
@@ -400,24 +452,65 @@
 		$this->mUserEmail = htmlspecialchars( $this->mUserEmail );
 		$this->mRealName = htmlspecialchars( $this->mRealName );
 		$this->mNick = htmlspecialchars( $this->mNick );
-		if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
-		else { $emfc = ''; }
+
+		/* The use of $wgUser->getEmail() allows us to show the last authenticated address.
+		   This gives the user the chance to re-use the last authenticated address
+		   w/o going again through an authentication cycle */
+		if ($wgEmailAuthentication && ($wgUser->getEmail() != '') ) {
+			if ($wgUser->getEmailAuthenticationtimestamp() != Database::TimestampNULL()) {
+				$emailauthenticated = wfMsg('emailauthenticated', $wgUser->getEmail(), $wgLang->timeanddate($wgUser->getEmailAuthenticationtimestamp(), true ) ).'<br />';
+				$disabled = '';
+			} else {
+				$emailauthenticated = wfMsg('emailnotauthenticated').'<br />';
+				$disabled = ' '.wfMsg('disableduntilauthent');
+			}
+		} else {
+			$emailauthenticated = '';
+		}
+
+		if ($this->mUserEmail == '') {
+			$disabled = ' '.wfMsg('disablednoemail');
+		}
 
 		$ps = $this->namespacesCheckboxes();
 
+		$enotifwatchlistpages = ($wgEmailNotificationForWatchlistPages) ? $this->getToggle( 'enotifwatchlistpages', $disabled) : '';
+		$enotifusertalkpages = ($wgEmailNotificationForUserTalkPages) ? $this->getToggle( 'enotifusertalkpages', $disabled) : '';
+		$enotifminoredits = ($wgEmailNotificationForMinorEdits) ? $this->getToggle( 'enotifminoredits', $disabled) : '';
+		$enotifrevealaddr = ($wgEmailNotificationRevealPageEditorAddress) ? $this->getToggle( 'enotifrevealaddr', $disabled) : '';
+		if ( $wgEmailNotificationForNewPages &&
+			( $wgEmailNotificationForNewPagesAllowedForAll || $wgUser->isBureaucratOrDeveloperOrSysop() ) ) {
+			if ( $this->mEnotifNewPages ) { $enotifnewpagec = 'checked="checked"'; }
+			else { $enotifnewpagec = ''; }
+			$enotifnewpages = "<div><label><input type='checkbox' $enotifnewpagec value=\"1\" name=\"wpEnotifNewPages\" />".
+						wfMsg( 'enotifnewpages' ).$disabled."</label></div>";
+		} else {
+			$enotifnewpages = '';
+		}
+		$prefs_help_email_enotif = ( $wgEmailNotificationForWatchlistPages || $wgEmailNotificationForUserTalkPages) ? ' ' . wfMsg('prefs-help-email-enotif') : '';
+		$prefs_help_realname = '';
+
 		$wgOut->addHTML( "<fieldset>
 		<legend>".wfMsg('prefs-personal')."</legend>");
 			if ($wgAllowRealName) {
 			$wgOut->addHTML("<div><label>$yrn: <input type='text' name=\"wpRealName\" value=\"{$this->mRealName}\" size='20' /></label></div>");
+			$prefs_help_realname = wfMsg('prefs-help-realname').'<br />';
 		}
 		
-		global $wgEnableEmail, $wgEnableUserEmail;
 		if( $wgEnableEmail ) {
 			$wgOut->addHTML("
 			<div><label>$yem: <input type='text' name=\"wpUserEmail\" value=\"{$this->mUserEmail}\" size='20' /></label></div>" );
 			if( $wgEnableUserEmail ) {
-				$wgOut->addHTML("
-				<div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf</label></div>" );
+				if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
+				else { $emfc = ''; }
+				$wgOut->addHTML(
+				$emailauthenticated.
+				$enotifrevealaddr.
+				$enotifwatchlistpages.
+				$enotifusertalkpages.
+				$enotifnewpages.
+				$enotifminoredits.
+				"<div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf.$disabled</label></div>" );
 			}
 		}
 		
@@ -483,7 +576,7 @@
 	<div><label>$rpw: <input type='password' name=\"wpRetypePass\" value=\"{$this->mRetypePass}\" size='20' /></label></div>
 	" . $this->getToggle( "rememberpassword" ) . "
 	</fieldset>
-	<div class='prefsectiontip'>".wfMsg('prefs-help-userdata')."</div>\n</fieldset>\n" );
+	<div class='prefsectiontip'>".$prefs_help_realname.wfMsg('prefs-help-email').$prefs_help_email_enotif."</div>\n</fieldset>\n" );
 
 	
 		# Quickbar setting
@@ -580,12 +673,15 @@
 		<div class='prefsectiontip'>* {$tzt}</div>
 	</fieldset>\n\n" );
 
+		$shownumberswatching = ($wgRCShowWatchingUsers) ? $this->getToggle('shownumberswatching') : '';
+		$rccurrevonly = ($wgRCShowCurrentRevisionOnly) ? $this->getToggle('rccurrevonly') : '';
+
 		$wgOut->addHTML( "
 	<fieldset><legend>".wfMsg('prefs-rc')."</legend>
-		<div><label>$rcc: <input type='text' name=\"wpRecent\" value=\"$this->mRecent\" size='6' /></label></div>
-		" . $this->getToggle( "hideminor" ) .
-		$this->getToggle( "usenewrc" ) . "
-		<div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
+		<div><label>$rcc: <input type='text' name=\"wpRecent\" value=\"$this->mRecent\" size='6' /></label></div>" .
+		$this->getToggle( "hideminor" ) . $shownumberswatching .
+		$this->getToggle( "usenewrc" ) . $rccurrevonly . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
+		"<div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
                 <div><label>".wfMsg('imagemaxsize')."<select name=\"wpImageSize\">");
 		
 		$imageLimitOptions='';
Index: includes/SpecialRecentchanges.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialRecentchanges.php,v
retrieving revision 1.50.2.4
diff -u -b -r1.50.2.4 SpecialRecentchanges.php
--- includes/SpecialRecentchanges.php	27 Mar 2005 22:24:09 -0000	1.50.2.4
+++ includes/SpecialRecentchanges.php	19 Apr 2005 06:08:05 -0000
@@ -18,6 +18,7 @@
 	global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
 	global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
 	global $wgFeedClasses, $wgUseRCPatrol;
+	global $wgRCShowCurrentRevisionOnly, $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
 	$fname = 'wfSpecialRecentchanges';
 
 	# Get query parameters
@@ -115,10 +116,13 @@
 	$patrLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
 	  $showhide[1-$hidepatrolled], wfArrayToCGI( array( 'hidepatrolled' => 1-$hidepatrolled ), $urlparams ) );
 
+	$currevonly = ($wgRCShowCurrentRevisionOnly && $wgUser->getOption('rccurrevonly')) ? 'AND rc_this_oldid=0 ' : '' ;
+
 	$uid = $wgUser->getID();
-	$sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user" : "") . " FROM $recentchanges " .
-	  ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace & 65534 " : "") .
-	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
+	# Patch for showing "updated since last visit" marker
+	$sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user,wl_notificationtimestamp,wl_lastvisitedrevision" : "") . " FROM $recentchanges " .
+	  ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
+	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " . $currevonly .
 	  "ORDER BY rc_timestamp DESC LIMIT {$limit}";
 
 	$res = $dbr->query( $sql2, $fname );
@@ -161,7 +165,26 @@
 			     ! ( $hidepatrolled && $obj->rc_patrolled ) ) {
 				$rc = RecentChange::newFromRow( $obj );
 				$rc->counter = $counter++;
-				$s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
+
+				if ($wgShowUpdatedMarker
+					&& $wgUser->getOption( 'showupdated' )
+					&& ( $obj->wl_notificationtimestamp != $dbr->TimestampNULL() )
+					&& ( $obj->rc_timestamp >= wfTimestamp(TS_MW, $obj->wl_notificationtimestamp) ) ) {
+						$rc->notificationtimestamp = true;
+				} else {
+					$rc->notificationtimestamp = false;
+				}
+
+				if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+					$sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" . $dbr->strencode($obj->rc_title) ."' AND wl_namespace=$obj->rc_namespace" ;
+					$res3 = $dbr->query( $sql3, 'wfSpecialRecentChanges');
+					$x = $dbr->fetchObject( $res3 );
+					$rc->numberofWatchingusers = $x->n;
+				} else {
+					$rc->numberofWatchingusers = 0;
+				}
+				$rc->lastvisitedrevision = $obj->wl_lastvisitedrevision;
+				$s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user) );
 				--$limit;
 			}
 		}
Index: includes/SpecialUserlogin.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialUserlogin.php,v
retrieving revision 1.58.2.7
diff -u -b -r1.58.2.7 SpecialUserlogin.php
--- includes/SpecialUserlogin.php	17 Mar 2005 00:13:26 -0000	1.58.2.7
+++ includes/SpecialUserlogin.php	19 Apr 2005 06:08:05 -0000
@@ -92,6 +92,7 @@
 	 */
 	function addNewAccountMailPassword() {
 		global $wgOut;
+		global $wgEmailAuthentication;
 		
 		if ('' == $this->mEmail) {
 			$this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
@@ -104,20 +105,40 @@
 			return;
 		}
 
-		$u->saveSettings();
-		$error = $this->mailPasswordInternal($u);
+		$newadr = strtolower($this->mEmail);
+
+		# prepare for authentication and mail a temporary password to newadr
+		if ( !$u->isValidEmailAddr( $newadr ) ) {
+			return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+		}
+		$u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+		$u->mEmailAuthenticationtimestamp = Database::TimestampNULL(); # but flag as "dirty" = unauthenticated
+
+		if ($wgEmailAuthentication) {
+			$error = $this->mailPasswordInternal( $u, true, $dummy ); # mail a temporary password to the dirty address
+		}
 
 		$wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 		$wgOut->setArticleRelated( false );
 	
-		if ( $error === '' ) {
-			$wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
-			$wgOut->returnToMain( false );
+		if ($wgEmailAuthentication) {
+			if ($error === '') {
+				return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) );
 		} else {
+				return $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+			}
+			# if user returns, that new email address gets authenticated in checkpassword()
 			$this->mainLoginForm( wfMsg( 'mailerror', $error ) );
 		}
 
+#		if ( $error === '' ) {
+#			$wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
+#			$wgOut->returnToMain( false );
+#		} else {
+#			$this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+#		}
+
 		$u = 0;
 	}
 
@@ -127,6 +148,7 @@
 	 */
 	function addNewAccount() {
 		global $wgUser, $wgOut;
+		global $wgEmailAuthentication;
 
 		$u = $this->addNewAccountInternal();
 
@@ -134,6 +156,27 @@
 			return;
 		}
 
+		$newadr = strtolower($this->mEmail);
+		if ($newadr != '') {		# prepare for authentication and mail a temporary password to newadr
+			if ( !$u->isValidEmailAddr( $newadr ) ) {
+				return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+			}
+			$u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+			$u->mEmailAuthenticationtimestamp = Database::TimestampNULL(); # but flag as "dirty" = unauthenticated
+
+			if ($wgEmailAuthentication) {
+				# mail a temporary password to the dirty address
+
+				$error = $this->mailPasswordInternal( $u, true, $dummy );
+				if ($error === '') {
+					return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) );
+				} else {
+					return $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
+				}
+				# if user returns, that new email address gets authenticated in checkpassword()
+			}
+		}
+
 		$wgUser = $u;
 		$wgUser->setCookies();
 
@@ -168,8 +211,8 @@
 		$u = User::newFromName( $name );
 		if ( is_null( $u ) ||
 		  ( '' == $name ) ||
-		  preg_match( "/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}/", $name ) ||
-		  (strpos( $name, "/" ) !== false) ||
+		  $wgUser->isIP( $name ) ||
+		  (strpos( $name, '/' ) !== false) ||
 		  (strlen( $name ) > $wgMaxNameChars) ||
                   ($wgUseLatin1 && preg_match( "/[\x80-\xA0]/", $name )) ||
 		  ucFirst($name) != $u->getName() ) 
@@ -232,6 +275,7 @@
 	 */
 	function processLogin() {
 		global $wgUser;
+		global $wgLang, $wgEmailAuthentication;
 
 		if ( '' == $this->mName ) {
 			$this->mainLoginForm( wfMsg( 'noname' ) );
@@ -263,6 +307,15 @@
 		} else {
 			$u->loadFromDatabase();
 		}
+
+		# store temporarily the status before the password check is performed
+		$mailmsg = '';
+		$oldadr = strtolower($u->getEmail());
+		$newadr = strtolower($this->mEmail);
+		$alreadyauthenticated = (( $u->mEmailAuthenticationtimestamp != Database::TimestampNULL() ) || ($oldadr == '')) ;
+
+		# checkPassword sets EmailAuthenticationtimestamp, if the newPassword is used
+
 		if (!$u->checkPassword( $this->mPassword )) {
 			$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
 			return;
@@ -277,13 +330,54 @@
 		}
 		$u->setOption( 'rememberpassword', $r );
 
+		/* check if user with correct password has entered a new email address */
+		if (($newadr <> '') && ($newadr <> $oldadr)) { # the user supplied a new email address on the login page
+
+			# prepare for authentication and mail a temporary password to newadr
+			if ( !$u->isValidEmailAddr( $newadr ) ) {
+				return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) );
+			}
+			$u->mEmail = $newadr; # new behaviour: store this new emailaddr from login-page now into user database record ...
+			$u->mEmailAuthenticationtimestamp = Database::TimestampNULL(); # ... but flag the address as "dirty" (unauthenticated)
+			$alreadyauthenticated = false;
+
+			if ($wgEmailAuthentication) {
+
+				# mail a temporary one-time password to the dirty address and return here to complete the user login
+				# if the user returns now or later using this temp. password, then the new email address $newadr
+				# - which is already stored in his user record - gets authenticated in checkpassword()
+
+				$error = $this->mailPasswordInternal( $u, false, $newpassword_temp);
+				$u->mNewpassword = $newpassword_temp;
+
+				#	The temporary password is mailed. The user is logged-in as he entered his correct password
+				#	This appears to be more intuitive than alternative 2.
+
+				if ($error === '') {
+					$mailmsg = '<br />' . wfMsg( 'passwordsentforemailauthentication', $u->getName() );
+				} else {
+					$mailmsg = '<br />' . wfMsg( 'mailerror', $error ) ;
+				}
+			}
+		}
+
 		$wgUser = $u;
 		$wgUser->setCookies();
 
+		# save all settings (incl. new email address and/or temporary password, if applicable)
 		$wgUser->saveSettings();
 		
+		if ( !$wgEmailAuthentication || $alreadyauthenticated ) {
+			$authenticated = '';
+			$mailmsg = '';
+		} elseif ($u->mEmailAuthenticationtimestamp != Database::TimestampNULL()) {
+				$authenticated = ' ' . wfMsg( 'emailauthenticated', $wgUser->getEmail(), $wgLang->timeanddate( $u->mEmailAuthenticationtimestamp, true ) );
+			} else {
+				$authenticated = ' ' . wfMsg( 'emailnotauthenticated' );
+			}
+
 		if( $this->hasSessionCookie() ) {
-			return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
+			return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) . $authenticated .  $mailmsg );
 		} else {
 			return $this->cookieRedirectCheck( 'login' );
 		}
@@ -312,20 +406,21 @@
 
 		$u->loadFromDatabase();
 
-		$error = $this->mailPasswordInternal( $u );
+		$error = $this->mailPasswordInternal( $u, true, $dummy );
 		if ($error === '') {
 			$this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
 		} else {
 			$this->mainLoginForm( wfMsg( 'mailerror', $error ) );
 		}
 
+		return;
 	}
 
 
 	/**
 	 * @access private
 	 */
-	function mailPasswordInternal( $u ) {
+	function mailPasswordInternal( $u, $savesettings = true, &$newpassword_out ) {
 		global $wgDeferredUpdateList, $wgOutputEncoding;
 		global $wgPasswordSender, $wgDBname, $wgIP;
 		global $wgCookiePath, $wgCookieDomain;
@@ -333,18 +428,28 @@
 		if ( '' == $u->getEmail() ) {
 			return wfMsg( 'noemail', $u->getName() );
 		}
-		$np = User::randomPassword();
+		$np = $u->randomPassword();
 		$u->setNewpassword( $np );
 
+		# we want to store this new password together with other values in the calling function
+		$newpassword_out = $u->mNewpassword;
+
+		# WHY IS THIS HERE ? SHOULDN'T IT BE User::setcookie ???
 		setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
+
+		if ($savesettings) {
+	 		$u->saveSettings();
+		}
+
 		$u->saveSettings();
 
 		$ip = $wgIP;
 		if ( '' == $ip ) { $ip = '(Unknown)'; }
 
-		$m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
+		$m = wfMsg( 'passwordremindermailbody', $ip, $u->getName(), wfUrlencode($u->getName()), $np );
 
-		$error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindertitle' ), $m );
+		require_once('UserMailer.php');
+		$error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindermailsubject' ), $m );
 		
 		return htmlspecialchars( $error );
 	}
@@ -370,7 +475,7 @@
 	}
 
 	function userNotPrivilegedMessage() {
-		global $wgOut, $wgUser, $wgLang;
+		global $wgOut;
 		
 		$wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
@@ -387,6 +492,7 @@
 	function mainLoginForm( $err ) {
 		global $wgUser, $wgOut, $wgLang;
 		global $wgDBname, $wgAllowRealName, $wgEnableEmail;
+		global $wgEmailAuthentication;
 
 		if ( '' == $this->mName ) {
 			if ( 0 != $wgUser->getID() ) {
@@ -418,6 +524,7 @@
 		$template->set( 'createemail', $wgEnableEmail && $wgUser->getID() != 0 );
 		$template->set( 'userealname', $wgAllowRealName );
 		$template->set( 'useemail', $wgEnableEmail );
+		$template->set( 'useemailauthent', $wgEmailAuthentication );
 		$template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) );
 		
 		$wgOut->setPageTitle( wfMsg( 'userlogin' ) );
Index: includes/SpecialVersion.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialVersion.php,v
retrieving revision 1.9.4.2
diff -u -b -r1.9.4.2 SpecialVersion.php
--- includes/SpecialVersion.php	6 Mar 2005 12:47:51 -0000	1.9.4.2
+++ includes/SpecialVersion.php	19 Apr 2005 06:08:05 -0000
@@ -20,7 +20,7 @@
 	$wgOut->addHTML( '
  <p>This wiki is powered by <b><a href="http://www.mediawiki.org/">MediaWiki</a></b>,  
  copyright (C) 2001-2005 by Magnus Manske, Brion Vibber, Lee Daniel Crocker,
- Tim Starling, Erik M&ouml;ller, Gabriel Wicke, and others.</p>
+ Tim Starling, Erik M&ouml;ller, Gabriel Wicke, Thomas Gries, and others.</p>
  
  <p>MediaWiki is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
Index: includes/SpecialWatchlist.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialWatchlist.php,v
retrieving revision 1.39.2.2
diff -u -b -r1.39.2.2 SpecialWatchlist.php
--- includes/SpecialWatchlist.php	27 Mar 2005 19:01:39 -0000	1.39.2.2
+++ includes/SpecialWatchlist.php	19 Apr 2005 06:08:05 -0000
@@ -17,6 +17,9 @@
 function wfSpecialWatchlist() {
 	global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc, $wgRequest;
 	global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
+	global $wgShowUpdatedMarker, $wgRCShowWatchingUsers;
+	global $wgRemoveWatchedArticleAndTalkPageTogether;
+
 	$fname = "wfSpecialWatchlist";
 
 	$wgOut->setPagetitle( wfMsg( "watchlist" ) );
@@ -38,12 +41,30 @@
 	$remove = $wgRequest->getVal( 'remove' );
 	$id = $wgRequest->getVal( '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' ) {
+		$wgUser->clearAllNotifications( $uid );
+	}
+
 	if(($action == "submit") && isset($remove) && is_array($id)) {
 		$wgOut->addHTML( wfMsg( "removingchecked" ) );
 		foreach($id as $one) {
 			$t = Title::newFromURL( $one );
 			if($t->getDBkey() != "") {
 				$wl = WatchedItem::fromUserTitle( $wgUser, $t );
+
+# TO-DO, but not urgent		if ($wgRemoveWatchedArticleAndTalkPageTogether)
+# 11.04.2005 <mail@tgries.de>
 				if( $wl->removeWatch() === false ) {
 					$wgOut->addHTML( "<br />\n" . wfMsg( "couldntremove", htmlspecialchars($one) ) );
 				} else {
@@ -72,6 +93,9 @@
 	$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 = $s->n / 2;
 	$nitems = $s->n;
 	if($nitems == 0) {
         $wgOut->addHTML( wfMsg( "nowatchlist" ) );
@@ -117,6 +141,9 @@
 			$specialTitle->escapeLocalUrl( "action=submit" ) .
 			"' method='post'>\n" .
 			"<ul>\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 FROM $watchlist WHERE wl_user=$uid";
 		$res = $dbr->query( $sql, $fname );
 		$sk = $wgUser->getSkin();
@@ -149,11 +176,15 @@
 	if( $cutoff && ( $nitems*1.15 > $npages ) ) {
 		$x = "cur_timestamp";
 		$y = wfMsg( "watchmethod-recent" );
-		$z = "wl_namespace=cur_namespace&65534";
+		# ENotif patch: here we treat pages and their talk pages separately
+		# $z = "wl_namespace=cur_namespace & ~1";
+		$z = 'wl_namespace=cur_namespace';
 	} else {
 		$x = "name_title_timestamp";
 		$y = wfMsg( "watchmethod-list" );
-		$z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
+		# ENotif patch: here we treat pages and their talk pages separately
+		# $z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
+		$z = 'wl_namespace=cur_namespace';
 	}
 
 
@@ -164,7 +195,7 @@
 	$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
+  cur_user,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new,wl_notificationtimestamp,wl_lastvisitedrevision
   FROM $watchlist,$cur $use_index
   WHERE wl_user=$uid
   AND $z
@@ -198,6 +229,21 @@
 		# Make fake RC entry
 		$rc = RecentChange::newFromCurRow( $obj );
 		$rc->counter = $counter++;
+
+		if ($wgShowUpdatedMarker && $wgUser->getOption( 'showupdated' )) {
+			$ts = $obj->wl_notificationtimestamp ;
+			$rc->notificationtimestamp = ($ts != $dbr->TimestampNULL()) ? $ts : false;
+		}
+
+		if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+			$sql3 = "SELECT COUNT(*) AS nr FROM $watchlist WHERE wl_title='" .wfStrencode($obj->cur_title). "' AND wl_namespace='{$obj->cur_namespace}'" ;
+			$res3 = $dbr->query( $sql3, DB_READ, $fname );
+			$x = $dbr->fetchObject( $res3 );
+			$rc->numberofWatchingusers = $x->nr;
+		} else {
+			$rc->numberofWatchingusers = 0;
+		}
+		$rc->lastvisitedrevision = $obj->wl_lastvisitedrevision;
 		$s .= $list->recentChangesLine( $rc, true );
 	}
 	$s .= $list->endRecentChangesList();
Index: includes/Title.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Title.php,v
retrieving revision 1.150.2.15
diff -u -b -r1.150.2.15 Title.php
--- includes/Title.php	12 Apr 2005 03:52:44 -0000	1.150.2.15
+++ includes/Title.php	19 Apr 2005 06:08:06 -0000
@@ -1408,9 +1408,9 @@
 		$dbw->query( $sql, 'SpecialMovepage::doSubmit' );
 
 		# Update watchlists
-		
-		$oldnamespace = $this->getNamespace() & ~1;
-		$newnamespace = $nt->getNamespace() & ~1;
+		# Talkpage have now their own entries with ENotif patch
+		$oldnamespace = $this->getNamespace();
+		$newnamespace = $nt->getNamespace();
 		$oldtitle = $this->getDBkey();
 		$newtitle = $nt->getDBkey();
 
Index: includes/User.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/User.php,v
retrieving revision 1.104.2.16
diff -u -b -r1.104.2.16 User.php
--- includes/User.php	30 Mar 2005 10:23:43 -0000	1.104.2.16
+++ includes/User.php	19 Apr 2005 06:08:07 -0000
@@ -22,6 +22,8 @@
 	 * @access private
 	 */
 	var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
+	var $mEmailAuthenticationtimestamp;
+	var $mEmailNotificationForNewPages;
 	var $mRights, $mOptions;
 	var $mDataLoaded, $mNewpassword;
 	var $mSkin;
@@ -116,6 +118,15 @@
 	}
 
 	/**
+	 * does the string match roughly an email address ?
+	 * @param string $addr email address
+	 * @static
+	 */
+	function isValidEmailAddr ( $addr ) {
+		return preg_match( '/^([a-z0-9_.-]+([a-z0-9_.-]+)*\@[a-z0-9_-]+([a-z0-9_.-]+)*([a-z.]{2,})+)$/', strtolower($addr));
+	}
+
+	/**
 	 * probably return a random password
 	 * @return string probably a random password
 	 * @static
@@ -150,6 +161,8 @@
 		$this->mNewtalk = -1;
 		$this->mName = $wgIP;
 		$this->mRealName = $this->mEmail = '';
+		$this->mEmailAuthenticationtimestamp = database::TimestampNULL();
+		$this->mEmailNotificationForNewPages = 0;
 		$this->mPassword = $this->mNewpassword = '';
 		$this->mRights = array();
 		
@@ -433,8 +446,9 @@
 		
 		$dbr =& wfGetDB( DB_SLAVE );
 		extract( $dbr->tableNames( 'user', 'user_rights' ) );
-		$sql = "SELECT user_name,user_password,user_newpassword,user_email,user_real_name," .
-		  "user_options,user_touched,user_token,ur_rights " .
+		$sql = "SELECT user_name,user_password,user_newpassword,user_email,".
+			"user_emailauthenticationtimestamp,user_emailnotificationfornewpages,".
+			"user_real_name,user_options,user_touched,user_token,ur_rights " .
 		  "FROM $user LEFT JOIN $user_rights ON user_id=ur_user WHERE user_id={$this->mId}";
 		$res = $dbr->query( $sql );
 		if ( $res ) {
@@ -447,6 +461,8 @@
 		if ( $s !== false ) {
 			$this->mName = $s->user_name;
 			$this->mEmail = $s->user_email;
+			$this->mEmailAuthenticationtimestamp = $s->user_emailauthenticationtimestamp;
+			$this->mEmailNotificationForNewPages = $s->user_emailnotificationfornewpages;
 			$this->mRealName = $s->user_real_name;
 			$this->mPassword = $s->user_password;
 			$this->mNewpassword = $s->user_newpassword;
@@ -490,7 +506,6 @@
 			$dbr =& wfGetDB( DB_SLAVE );
 			if($this->mId) {
 				$res = $dbr->select( 'user_newtalk', 1, array( 'user_id' => $this->mId ), $fname );
-
 				if ( $dbr->numRows($res)>0 ) {
 					$this->mNewtalk= 1;
 				}
@@ -598,6 +613,21 @@
 		return $this->mEmail;
 	}
 
+	function getEmailAuthenticationtimestamp() {
+		$this->loadFromDatabase();
+		return $this->mEmailAuthenticationtimestamp;
+	}
+
+	function getEmailNotificationForNewPages() {
+		$this->loadFromDatabase();
+		return $this->mEmailNotificationForNewPages;
+	}
+
+	function setEmailNotificationForNewPages( $val ) {
+		$this->loadFromDatabase();
+		$this->mEmailNotificationForNewPages = $val;
+	}
+
 	function setEmail( $str ) {
 		$this->loadFromDatabase();
 		$this->mEmail = $str;
@@ -644,6 +674,38 @@
 	}
 
 	/**
+	 * A more legible check for non-anonymousness.
+	 * Returns true if the user is not an anonymous visitor.
+	 *
+	 * @return bool
+	 */
+	function isLoggedIn() {
+		return( $this->getID() != 0 );
+	}
+
+	/**
+	 * A more legible check for anonymousness.
+	 * Returns true if the user is an anonymous visitor.
+	 *
+	 * @return bool
+	 */
+	function isAnon() {
+		return !$this->isLoggedIn();
+	}
+
+	/**
+	 * Check if a user is bureaucrat, developer, sysop
+	 */
+	function isBureaucratOrDeveloperOrSysop() {
+		$this->loadFromDatabase();
+		if ( 0 == $this->mId ) { return false; }
+
+		return ( in_array( 'sysop', $this->mRights ) ||
+			 in_array( 'developer', $this->mRights ) ||
+			 in_array( 'bureaucrat', $this->mRights ) );
+	}
+
+	/**
 	 * Check if a user is sysop
 	 */
 	function isSysop() {
@@ -811,6 +873,86 @@
 	}
 	/**#@-*/
 
+
+	/**
+	 * Check the user's notification timestamp for the given title and Namespace
+	 *
+	 * returns:	status of pending notification 		false, true
+	 * out: 	lvr 					id of last visited revsion
+	 */
+	function checkNotificationPendingForArticleOrTalk( $title, $Ns, &$lvr ) {
+		$userid = $this->getId();
+		if ($userid==0)
+			return;
+
+		$dbr =& wfGetDB( DB_MASTER );
+		$s = $dbr->selectRow( 'watchlist',
+				array(
+					'wl_notificationtimestamp',
+					'wl_lastvisitedrevision'
+				), array( /* WHERE */
+					'wl_title' => $title->getDBkey(),
+					'wl_namespace' => $Ns,
+					'wl_user' => $this->getId()
+				), 'User::clearNotification'
+		);
+		if ( $s === false ) {
+			return false;
+		} else {
+			$lvr = $s->wl_lastvisitedrevision;
+			return ($s->wl_notificationtimestamp != $dbr->TimestampNULL() );
+		}
+	}
+
+	/**
+	 * Clear the user's notification timestamp for the given title.
+	 * If e-notif e-mails are on, they will receive notification mails on
+	 * the next change of the page if it's watched etc.
+	 */
+	function clearNotification( $title ) {
+		$userid = $this->getId();
+		if ($userid==0)
+			return;
+		$dbw =& wfGetDB( DB_MASTER );
+		$success = $dbw->update( 'watchlist',
+				array( /* SET */
+					'wl_notificationtimestamp' => $dbw->TimestampNULL(),
+					'wl_lastvisitedrevision' => NULL
+				), array( /* WHERE */
+					'wl_title' => $title->getDBkey(),
+					'wl_namespace' => $title->getNamespace(),
+					'wl_user' => $this->getId()
+				), 'User::clearNotification'
+		);
+	}
+
+	/**#@-*/
+
+ 	/**
+	 * Resets all of the given user's page-change notification timestamps.
+	 * If e-notif e-mails are on, they will receive notification mails on
+	 * the next change of any watched page.
+	 *
+	 * @param int $currentUser user ID number
+	 * @access public
+	 */
+	function clearAllNotifications( $currentUser ) {
+		if( $currentUser != 0 )  {
+
+			$dbw =& wfGetDB( DB_MASTER );
+			$success = $dbw->update( 'watchlist',
+				array( /* SET */
+					'wl_notificationtimestamp' => $dbw->TimestampNULL(),
+					'wl_lastvisitedrevision' => NULL
+				), array( /* WHERE */
+					'wl_user' => $currentUser
+				), 'User::clearAllNotifications'
+			);
+		}
+		$this->setnewtalk(0);
+		$this->saveNewtalk();
+	}
+
 	/**
 	 * @access private
 	 * @return string Encoding options
@@ -895,6 +1037,8 @@
 				'user_newpassword' => $this->mNewpassword,
 				'user_real_name' => $this->mRealName,
 		 		'user_email' => $this->mEmail,
+		 		'user_emailauthenticationtimestamp' => $this->mEmailAuthenticationtimestamp,
+		 		'user_emailnotificationfornewpages' => $this->mEmailNotificationForNewPages,
 				'user_options' => $this->encodeOptions(),
 				'user_touched' => $dbw->timestamp($this->mTouched),
 				'user_token' => $this->mToken
@@ -930,8 +1074,7 @@
 		$dbr =& wfGetDB( DB_SLAVE );
 		$dbw =& wfGetDB( DB_MASTER );
 
-		$res = $dbr->selectField('user_newtalk', $field,
-								 array($field => $value), $fname);
+		$res = $dbr->selectField('user_newtalk', $field, array($field => $value), $fname);
 
 		if ($res !== false && $this->mNewtalk == 0) {
 			$dbw->delete('user_newtalk', array($field => $value), $fname);
@@ -974,6 +1117,8 @@
 				'user_password' => $this->mPassword,
 				'user_newpassword' => $this->mNewpassword,
 				'user_email' => $this->mEmail,
+		 		'user_emailauthenticationtimestamp' => $this->mEmailAuthenticationtimestamp,
+		 		'user_emailnotificationfornewpages' => $this->mEmailNotificationForNewPages,
 				'user_real_name' => $this->mRealName,
 				'user_options' => $this->encodeOptions(),
 				'user_token' => $this->mToken
@@ -1120,7 +1265,10 @@
 		$ep = $this->encryptPassword( $password );
 		if ( 0 == strcmp( $ep, $this->mPassword ) ) {
 			return true;
-		} elseif ( 0 == strcmp( $ep, $this->mNewpassword ) ) {
+		} elseif ( ($this->mNewpassword != '') && (0 == strcmp( $ep, $this->mNewpassword )) ) {
+			$this->mEmailAuthenticationtimestamp = wfTimestampNow();
+			$this->mNewpassword = ''; # use the temporary one-time password only once: clear it now !
+			$this->saveSettings();
 			return true;
 		} elseif ( function_exists( 'iconv' ) ) {
 			# Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted
Index: includes/UserMailer.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/UserMailer.php,v
retrieving revision 1.11
diff -u -b -r1.11 UserMailer.php
--- includes/UserMailer.php	3 Sep 2004 23:00:00 -0000	1.11
+++ includes/UserMailer.php	19 Apr 2005 06:08:07 -0000
@@ -1,11 +1,64 @@
 <?php
 /**
- * Provide mail capabilities
+ * UserMailer.php
+ *  Copyright (C) 2004 Thomas Gries <mail@tgries.de>
+ * http://www.mediawiki.org/
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @author <brion@pobox.com>
+ * @author <mail@tgries.de>
  *
  * @package MediaWiki
  */
 
 /**
+ * Provide mail capabilities
+ * @param string $string ????
+ *
+ * The function takes formats like "name <emailaddr>" into account, for which
+ * the partial string "name" will be quoted-printable converted but not
+ * "<emailaddr>".
+ *
+ * The php mail() function does not accept the email address partial string to
+ * be quotedprintable, it does not accept inputs as
+ *  quotedprintable("name <emailaddr>") .
+ *
+ * case 1:
+ * input:	"name <emailaddr> rest"
+ * output:	"quoted-printable(name) <emailaddr>"
+ * 
+ * case 2: (should not happen)
+ * input:	"<emailaddr> rest"
+ * output:	"<emailaddr>"
+ * 
+ * case 3:	(should not happen)
+ * input:	"name"
+ * output:	"quoted-printable(name)"
+ */
+function wfQuotedPrintable_name_and_emailaddr( $string ) {
+
+	/* do not quote printable for email address string <emailaddr>, but only for the (leading) string, usually the name */
+	preg_match( '/^([^<]*)?(<([A-z0-9_.-]+([A-z0-9_.-]+)*\@[A-z0-9_-]+([A-z0-9_.-]+)*([A-z.]{2,})+)>)?$/', $string, $part );
+	if ( !isset($part[1]) ) return $part[2];
+	if ( !isset($part[2]) ) return wfQuotedprintable($part[1]);
+	return wfQuotedprintable($part[1]) . $part[2] ;
+}
+
+/**
  * This function will perform a direct (authenticated) login to
  * a SMTP Server to use for mail relaying if 'wgSMTP' specifies an
  * array of parameters. It requires PEAR:Mail to do that.
@@ -15,14 +68,14 @@
  * @param string $from sender's email
  * @param string $subject email's subject
  * @param string $body email's text
+ * @param string $replyto optional reply-to email (default : false)
  */
-function userMailer( $to, $from, $subject, $body ) {
-	global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString;
+function userMailer( $to, $from, $subject, $body, $replyto=false ) {
+	global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEmergencyContact;
 	
-  	$qto = wfQuotedPrintable( $to );
+  	$qto = wfQuotedPrintable_name_and_emailaddr( $to );
 	
-	if (is_array( $wgSMTP ))
-	{
+	if (is_array( $wgSMTP )) {
 		require_once( 'Mail.php' );
 		
 		$timestamp = time();
@@ -30,13 +83,16 @@
 		$headers['From'] = $from;
 /* removing to: field as it should be set by the send() function below
    UNTESTED - Hashar */
-//		$headers["To"] = $qto;
+//		$headers['To'] = $qto;
+/* Reply-To:
+   UNTESTED - Tom Gries */
+		$headers['Reply-To'] = $replyto;
 		$headers['Subject'] = $subject;
 		$headers['MIME-Version'] = '1.0';
 		$headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
 		$headers['Content-transfer-encoding'] = '8bit';
 		$headers['Message-ID'] = "<{$timestamp}" . $wgUser->getName() . '@' . $wgSMTP['IDHost'] . '>';
-		$headers['X-Mailer'] = 'MediaWiki interuser e-mailer';
+		$headers['X-Mailer'] = 'MediaWiki mailer';
 	
 		// Create the mail object using the Mail::factory method
 		$mail_object =& Mail::factory('smtp', $wgSMTP);
@@ -50,20 +106,23 @@
 			return $mailResult->getMessage();
 		else
 			return 'Mail object return unknown error.';
-	}
-	
-	else
-	{
+	} else	{
+		# In the following $headers = expression we removed "Reply-To: {$from}\r\n" , because it is treated differently
+		# (fifth parameter of the PHP mail function, see some lines below)
 		$headers =
 			"MIME-Version: 1.0\n" .
 			"Content-type: text/plain; charset={$wgOutputEncoding}\n" .
-			"Content-transfer-encoding: 8bit\n" .
-			"From: {$from}\n" .
-			"X-Mailer: MediaWiki interuser e-mailer";
+			"Content-Transfer-Encoding: 8bit\n" .
+			"X-Mailer: MediaWiki mailer\n".
+			'From:' . wfQuotedPrintable_name_and_emailaddr($from) . "\n";
+		if ($replyto) {
+			$headers .= 'Reply-To: '.wfQuotedPrintable_name_and_emailaddr($replyto)."\n";
+		}
 
 		$wgErrorString = '';
 		set_error_handler( 'mailErrorHandler' );
-		mail( $to, $subject, $body, $headers );
+		# added -f parameter, see PHP manual for the fifth parameter when using the mail function
+		mail( wfQuotedPrintable_name_and_emailaddr($to), $subject, $body, $headers, "-f{$wgEmergencyContact}\n");
 		restore_error_handler();
 
 		return $wgErrorString;
@@ -71,10 +130,316 @@
 }
 
 /**
- *
+ * @todo document
  */
 function mailErrorHandler( $code, $string ) {
 	global $wgErrorString;
 	$wgErrorString = preg_replace( "/^mail\(\): /", "", $string );
 }
+
+
+/**
+ * This module processes the email notifications when the current page is
+ * changed. It looks up the table watchlist to find out which users are watching
+ * that page.
+ *
+ * The current implementation sends independent emails to each watching user for
+ * the following reason:
+ *
+ * - Each watching user will be notified about the page edit time expressed in
+ * his/her local time (UTC is shown additionally). To achieve this, we need to
+ * find the individual timeoffset of each watching user from the preferences..
+ *
+ * Suggested improvement to slack down the number of sent emails: We could think
+ * of sending out bulk mails (bcc:user1,user2...) for all these users having the
+ * same timeoffset in their preferences.
+ *
+ * Visit the documentation pages under http://meta.wikipedia.com/Enotif
+ *
+ * @package MediaWiki
+ *
+ */
+class EmailNotification {
+	/**#@+
+	 * @access private
+	 */
+	var $to, $subject, $body, $replyto, $from;
+	/**#@-*/
+
+	/**
+	 * @todo document
+	 * @param $currentUser
+	 * @param $currentPage
+	 * @param $currentNs
+	 * @param $timestamp
+	 * @param $currentSummary
+	 * @param $currentMinorEdit
+	 * @param $oldid (default: false)
+	 */
+	function NotifyOnPageChangeOrNewpage($timestamp, $currentTitleObj, $currentMinorEdit, $pageeditorUserObj, $currentSummary, $oldid=false) {
+
+		# we use $wgEmergencyContact as sender's address
+		global $wgLang, $wgEmergencyContact;
+		global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForMinorEdits;
+		global $wgEmailNotificationSystembeep, $wgEmailNotificationForUserTalkPages;
+		global $wgEmailNotificationForNewPages;
+		global $wgEmailNotificationRevealPageEditorAddress;
+		global $wgEmailNotificationMailsSentFromPageEditor;
+		global $wgEmailAuthentication;
+		global $beeped;
+
+		$currentPage = $currentTitleObj->getDBKey();
+		$currentNs = $currentTitleObj->getNamespace();
+
+		$initialised = false;
+
+		# The following code is only run, if several conditions are met:
+		# 1. EmailNotification for pages (other than user_talk pages) must be enabled
+		# 2. minor edits (changes) are only regarded if the global flag indicates so
+
+		$isUserTalkPage = ($currentNs == NS_USER_TALK);
+		$enotifusertalkpage = ($isUserTalkPage && $wgEmailNotificationForUserTalkPages);
+		$enotifwatchlistpage = (!$isUserTalkPage && $wgEmailNotificationForWatchlistPages);
+
+		if ( ($enotifusertalkpage || $enotifwatchlistpage)
+			&& (!$currentMinorEdit || $wgEmailNotificationForMinorEdits) ) {
+
+			$dbr =& wfGetDB( DB_MASTER );
+			$res = $dbr->select( 'watchlist',
+					'wl_user',
+					"wl_title ='".$dbr->strencode($currentPage).
+					"' AND wl_namespace ='".$currentNs.
+					"' AND wl_user <>".$pageeditorUserObj->getID().
+					" AND ".$dbr->wl_notificationtimestampIsNULL(),
+					'UserMailer::NotifyOnPageChangeOrNewpage');
+
+			# if anyone is watching ... set up the email message text which is
+			# common for all recipients ...
+			if ( $dbr->numRows( $res ) > 0 ) {
+
+				# This is a switch for one beep on the server when sending notification mails
+				$beeped = false;
+
+				$article->mTimestamp = $timestamp;
+				$article->mSummary = $currentSummary;
+				$article->mMinorEdit = $currentMinorEdit;
+				$article->mNamespace = $currentNs;
+				$article->mTitle = $currentPage;
+				$article->mOldid = $oldid;
+
+				$mail = $this->composeCommonMailtext( $pageeditorUserObj, $article );
+				$watchingUserObj = new User();
+				$initialised = true;
+
+				# ... now do for all watching users ... if the options fit
+				for ($i = 1; $i <= $dbr->numRows( $res ); $i++) {
+
+					$wuser = $dbr->fetchObject( $res );
+					$watchingUserObj->setID($wuser->wl_user);
+					if ( ( $enotifwatchlistpage && $watchingUserObj->getOption('enotifwatchlistpages') ) ||
+						( $enotifusertalkpage && $watchingUserObj->getOption('enotifusertalkpages') )
+					&& (!$currentMinorEdit || ($wgEmailNotificationForMinorEdits && $watchingUserObj->getOption('enotifminoredits') ) )
+					&& ($watchingUserObj->getEmail() != '')
+					&& (!$wgEmailAuthentication || ($watchingUserObj->getEmailAuthenticationtimestamp() != 0 ) ) ) {
+						# ... adjust remaining text and page edit time placeholders
+						# which needs to be personalized for each user
+						$sent = $this->composeAndSendPersonalisedMail( $watchingUserObj, $mail, $article );
+						/* the beep here beeps once when a watched-listed page is changed */
+						if ($sent && !$beeped && ($wgEmailNotificationSystembeep != '') ) {
+							$last_line = system($wgEmailNotificationSystembeep);
+							$beeped=true;
+						}
+					} # if the watching user has an email address in the preferences
+					# mark the changed watch-listed page with a timestamp, so that the page is listed with an "updated since your last visit" icon in the watch list, ...
+					# ... no matter, if the watching user has or has not indicated an email address in his/her preferences.
+					# We memorise the event of sending out a notification and use this as a flag to suppress further mails for changes on the same page for that watching user
+					# save also the last seen revision of that page for (lvr) links
+					$dbw =& wfGetDB( DB_MASTER );
+					$succes = $dbw->update( 'watchlist',
+						array( /* SET */
+							'wl_notificationtimestamp' => wfTimestamp(TS_DB, $article->mTimestamp),
+							'wl_lastvisitedrevision' => $oldid
+						), array( /* WHERE */
+							'wl_title' => $currentPage,
+							'wl_namespace' => $currentNs,
+							'wl_user' => $wuser->wl_user
+						), 'UserMailer::NotifyOnPageChangeOrNewpage'
+					);
+				} # for every watching user
+			} # if anyone is watching
+		} # if $wgEmailNotificationForWatchlistPages = true
+
+		if ( $wgEmailNotificationForNewPages && isset($oldid) && $oldid==0 ) {
+			$dbr =& wfGetDB( DB_MASTER );
+			$res = $dbr->select( 'user',
+					'user_id',
+					'user_emailnotificationfornewpages=1 AND user_id<>'.$pageeditorUserObj->getID(),
+					'UserMailer::NotifyOnPageChangeOrNewpage' );
+
+			for ($i = 1; $i <= $dbr->numRows( $res ); $i++) {
+				if (!$initialised) { # initialise if not yet done
+					$article->mTimestamp = $timestamp;
+					$article->mSummary = $currentSummary;
+					$article->mMinorEdit = $currentMinorEdit;
+					$article->mNamespace = $currentNs;
+					$article->mTitle = $currentPage;
+					$article->mOldid = $oldid;
+					$mail = $this->composeCommonMailtext( $pageeditorUserObj, $article );
+					$watchingUserObj = new User();
+				}
+
+			$wuser = $dbr->fetchObject( $res );
+			$watchingUserObj->setID($wuser->user_id);
+			$sent = $this->composeAndSendPersonalisedMail( $watchingUserObj, $mail, $article );
+			}
+		} # notifications for a new page
+
+	} # function NotifyOnChange
+
+	/**
+	 * @param User $pageeditorUser
+	 * @param Article $article
+	 * @access private
+	 */
+	function composeCommonMailtext( $pageeditorUserObj, $article ) {
+		global $wgLang, $wgEmergencyContact;
+		global $wgEmailNotificationRevealPageEditorAddress;
+		global $wgEmailNotificationMailsSentFromPageEditor;
+		global $wgNoReplyAddress;
+
+		$summary = ($article->mSummary == '') ? ' - ' : $article->mSummary;
+		$medit   = ($article->mMinorEdit) ? wfMsg( 'minoredit' ) : '';
+
+		# You as the WikiAdmin and Sysops can make use of plenty of
+		# named variables when composing your notification emails while
+		# simply editing the Meta pages
+
+		$to      = wfMsg( 'email_notification_to' );
+		$subject = wfMsg( 'email_notification_subject' );
+		$body    = wfMsg( 'email_notification_body' );
+		$from    = ''; /* fail safe */
+		$replyto = ''; /* fail safe */
+		$keys    = array();
+
+		# regarding the use of oldid as an indicator for the last visited version, see also
+		# http://bugzilla.wikipeda.org/show_bug.cgi?id=603 "Delete + undelete cycle doesn't preserve old_id"
+		# However, in the case of a new page which is already watched, we have no previous version to compare
+
+		if( $article->mOldid ) {
+			$keys['$NEWPAGE'] = wfMsg( 'email_notification_lastvisitedrevisiontext' );
+			$keys['$OLDID']   = $article->mOldid;
+			$keys['$CHANGEDORCREATED'] = wfMsg( 'changed' );
+		} else {
+			$keys['$NEWPAGE'] = wfMsg( 'email_notification_newpagetext' );
+			# clear $OLDID placeholder in the message template
+			$keys['$OLDID']   = '';
+			$keys['$CHANGEDORCREATED'] = wfMsg( 'created' );
+		}
+
+		$subject = strtr( $subject, $keys );
+		$body = strtr( $body, $keys );
+
+		$pagetitle = $article->mTitle;
+		if( $article->mNamespace != NS_MAIN ) {
+			$pagetitle = $wgLang->getNsText( $article->mNamespace ) . ':' . $pagetitle;
+		}
+		$subject = str_replace( '$PAGETITLE', str_replace( '_', ' ', $pagetitle ) , $subject);
+		$keys['%24PAGETITLE_RAWURL'] = wfUrlencode( $pagetitle );
+		$keys['$PAGETITLE_RAWURL']   = wfUrlencode( $pagetitle );
+		$keys['%24PAGETITLE']        = $pagetitle; # needed for the {{localurl:$PAGETITLE}} in the messagetext, "$" appears here as "%24"
+		$keys['$PAGETITLE']          = $pagetitle;
+		$keys['$PAGETIMESTAMP']      = $article->mTimestamp;	# this is the raw internal timestamp - can be useful, too
+		$keys['$PAGEEDITDATEUTC']    = $wgLang->timeanddate( $article->mTimestamp, false, false, false, true );
+		$keys['$PAGEMINOREDIT']      = $medit;
+		$keys['$PAGESUMMARY']        = $summary;
+
+		# Reveal the page editor's address as REPLY-TO address only if
+		# the user has not opted-out and the option is enabled at the
+		# global configuration level.
+		$name    = $pageeditorUserObj->getName();
+		$adminAddress = 'WikiAdmin <' . $wgEmergencyContact . '>';
+		$editorAddress = $name . ' <' . $pageeditorUserObj->getEmail() . '>';
+		if( $wgEmailNotificationRevealPageEditorAddress
+		    && ( $pageeditorUserObj->getEmail() != '' )
+		    && $pageeditorUserObj->getOption( 'enotifrevealaddr' ) ) {
+			if( $wgEmailNotificationMailsSentFromPageEditor ) {
+				$from    = $editorAddress;
+			} else {
+				$from    = $adminAddress;
+				$replyto = $editorAddress;
+			}
+			$keys['$PAGEEDITORNAMEANDEMAILADDR'] = $editorAddress;
+		} else {
+			$from    = $adminAddress;
+			$replyto = $wgNoReplyAddress;
+			$keys['$PAGEEDITORNAMEANDEMAILADDR'] = $replyto;
+		}
+
+		if( $pageeditorUserObj->isIP( $name ) ) {
+			#real anon (user:xxx.xxx.xxx.xxx)
+			$anon    = $name . ' (anonymous user)';
+			$anonUrl = wfUrlencode( $name ) . ' (anonymous user)';
+			$subject = str_replace('$PAGEEDITOR', 'anonymous user '. $name, $subject);
+
+			$keys['$PAGEEDITOR_RAWURL']   = $anonUrl;
+			$keys['%24PAGEEDITOR_RAWURL'] = $anonUrl;
+			$keys['%24PAGEEDITORE']       = $anon;
+			$keys['$PAGEEDITORE']         = $anon;
+			$keys['$PAGEEDITOR']          = 'anonymous user ' . $name;
+		} else {
+			$subject = str_replace('$PAGEEDITOR', $name, $subject);
+			$keys['$PAGEEDITOR_RAWURL']   = wfUrlencode( $name );
+			$keys['%24PAGEEDITOR_RAWURL'] = wfUrlencode( $name );
+			$keys['%24PAGEEDITORE']       = $pageeditorUserObj->getName();
+			$keys['$PAGEEDITORE']         = $pageeditorUserObj->getName();
+			$keys['$PAGEEDITOR']          = $name;
+		}
+		$body = strtr( $body, $keys );
+
+		# now save this as the constant user-independent part of the message
+		$this->to      = $to;
+		$this->from    = $from;
+		$this->replyto = $replyto;
+		$this->subject = wfQuotedprintable($subject);
+		$this->body    = $body;
+		return $this;
+	}
+
+
+
+	/**
+	 * Does the per-user customizations to a notification e-mail (name,
+	 * timestamp in proper timezone, etc) and sends it out.
+	 * Returns true if the mail was sent successfully.
+	 *
+	 * @param User $watchingUserObj
+	 * @param object $mail
+	 * @param Article $article
+	 * @return bool
+	 * @access private
+	 */
+	function composeAndSendPersonalisedMail( $watchingUserObj, $mail, $article ) {
+		global $wgLang;
+
+		$to = $watchingUserObj->getName() . ' <' . $watchingUserObj->getEmail() . '>';
+		$body = str_replace( '$WATCHINGUSERNAME', $watchingUserObj->getName() , $mail->body );
+		$body = str_replace( '$WATCHINGUSEREMAILADDR', $watchingUserObj->getEmail(), $body );
+
+		$timecorrection = $watchingUserObj->getOption( 'timecorrection' );
+		if( !$timecorrection ) {
+			# fail safe - I prefer it. TomGries
+			$timecorrection = '00:00';
+		}
+		# $PAGEEDITDATE is the time and date of the page change
+		# expressed in terms of individual local time of the notification
+		# recipient, i.e. watching user
+		$body = str_replace('$PAGEEDITDATE',
+			$wgLang->timeanddate( $article->mTimestamp, true, false, $timecorrection, true),
+			$body);
+
+		$error = userMailer( $to, $mail->from, $mail->subject, $body, $mail->replyto );
+		return ($error == '');
+	}
+
+} # end of class EmailNotification
 ?>
Index: includes/WatchedItem.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/WatchedItem.php,v
retrieving revision 1.14
diff -u -b -r1.14 WatchedItem.php
--- includes/WatchedItem.php	3 Sep 2004 23:00:00 -0000	1.14
+++ includes/WatchedItem.php	19 Apr 2005 06:08:07 -0000
@@ -17,7 +17,11 @@
 		$wl->mUser =& $user;
 		$wl->mTitle =& $title;
 		$wl->id = $user->getId();
-		$wl->ns = $title->getNamespace() & ~1;
+# Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004
+# 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
+#		$wl->ns = $title->getNamespace() & ~1;
+		$wl->ns = $title->getNamespace();
 		$wl->ti = $title->getDBkey();
 		return $wl;
 	}
@@ -57,11 +61,25 @@
 		# REPLACE instead of INSERT because occasionally someone
 		# accidentally reloads a watch-add operation.
 		$dbw =& wfGetDB( DB_MASTER );
-		$dbw->replace( 'watchlist', array(array('wl_user', 'wl_namespace', 'wl_title')),
+		$dbw->replace( 'watchlist', array(array('wl_user', 'wl_namespace', 'wl_title', 'wl_notificationtimestamp', 'wl_lastvisitedrevision' )),
 		  array( 
 		    'wl_user' => $this->id,
-			'wl_namespace' => $this->ns,
+			'wl_namespace' => ($this->ns & ~1),
+			'wl_title' => $this->ti,
+			'wl_notificationtimestamp' => $dbw->TimestampNULL(),
+			'wl_lastvisitedrevision' => 0
+		  ), $fname );
+
+		# the following code compensates the new behaviour, introduced by the enotif patch,
+		# that every single watched page needs now to be listed in watchlist
+		# namespace:page and namespace_talk:page need separate entries: create them
+		$dbw->replace( 'watchlist', array(array('wl_user', 'wl_namespace', 'wl_title', 'wl_notificationtimestamp', 'wl_lastvisitedrevision' )),
+		  array(
+			'wl_user' => $this->id,
+			'wl_namespace' => ($this->ns | 1 ),
 			'wl_title' => $this->ti,
+			'wl_notificationtimestamp' => $dbw->TimestampNULL(),
+			'wl_lastvisitedrevision' => 0
 		  ), $fname );
 
 		global $wgMemc;
@@ -70,8 +88,32 @@
 	}
 
 	function removeWatch() {
+		global $wgRemoveWatchedArticleAndTalkPageTogether;
+
 		$fname = 'WatchedItem::removeWatch';
 
+		if ($wgRemoveWatchedArticleAndTalkPageTogether) {
+			$dbw =& wfGetDB( DB_MASTER );
+			$dbw->delete( 'watchlist',
+				array(
+					'wl_user' => $this->id,
+					'wl_namespace' => ($this->ns & ~1),
+					'wl_title' => $this->ti
+				), $fname
+			);
+
+			# the following code compensates the new behaviour, introduced by the
+			# enotif patch, that every single watched page needs now to be listed
+			# in watchlist namespace:page and namespace_talk:page had separate
+			# entries: clear them
+			$dbw->delete( 'watchlist',
+				array(
+					'wl_user' => $this->id,
+					'wl_namespace' => ($this->ns | 1),
+					'wl_title' => $this->ti
+				), $fname
+			);
+		} else {
 		$dbw =& wfGetDB( DB_MASTER );
 		$dbw->delete( 'watchlist', 
 			array( 
@@ -80,6 +122,7 @@
 				'wl_title' => $this->ti
 			), $fname
 		);
+		}
 		
 		if ( $dbw->affectedRows() ) {
 			global $wgMemc;
@@ -93,39 +136,61 @@
 	/**
 	 * @static
 	 */
-	function duplicateEntries( $ot, $nt ) {
-		$fname = "WatchedItem::duplicateEntries";
+	function duplicateEntriesNs( $ot, $nt, $talkns ) {
+		$fname = "WatchedItem::duplicateEntriesNs";
 		global $wgMemc, $wgDBname;
+
+		if ( $talkns ) {
+			$oldnamespace = $ot->getNamespace() | 1;
+			$newnamespace = $nt->getNamespace() | 1;
+		} else {
 		$oldnamespace = $ot->getNamespace() & ~1;
 		$newnamespace = $nt->getNamespace() & ~1;
+		}
 		$oldtitle = $ot->getDBkey();
 		$newtitle = $nt->getDBkey();
 
 		$dbw =& wfGetDB( DB_MASTER );
 		$watchlist = $dbw->tableName( 'watchlist' );
 		
-		$res = $dbw->select( 'watchlist', 'wl_user', 
-			array( 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ),
+		$res = $dbw->select( 'watchlist',
+				array(	'wl_user',
+					'wl_notificationtimestamp',
+					'wl_lastvisitedrevision'
+				),
+				array(	'wl_namespace' => $oldnamespace,
+					'wl_title' => $oldtitle
+				),
 			$fname, 'FOR UPDATE'
 		);
 		# Construct array to replace into the watchlist
 		$values = array();
-		while ( $s = $dbw->fetchObject( $res ) ) {
+		if ( $s = $dbw->fetchObject( $res ) ) {
 			$values[] = array(
 				'wl_user' => $s->wl_user,
 				'wl_namespace' => $newnamespace,
-				'wl_title' => $newtitle
+				'wl_title' => $newtitle,
+				'wl_notificationtimestamp' => $s->wl_notificationtimestamp,
+				'wl_lastvisitedrevision' => $s->wl_lastvisitedrevision
 			);
-		}
+
 		$dbw->freeResult( $res );
 
 		# Perform replace
 		# Note that multi-row replace is very efficient for MySQL but may be inefficient for
 		# some other DBMSes, mostly due to poor simulation by us
-		$dbw->replace( 'watchlist', array(array( 'wl_user', 'wl_namespace', 'wl_title')), $values, $fname );
+			$dbw->replace( 'watchlist', array(array( 'wl_user', 'wl_namespace', 'wl_title' )), $values, $fname );
+		}
 		return true;
 	}
 
+	function duplicateEntries( $ot, $nt ) {
+	# duplicate watchlist entries for the target page
+	# When using ENotif, talkpages have distinct watchlist entries
+	# existing talkpage entries in the watchlist will be moved, too
+		WatchedItem::duplicateEntriesNs( $ot, $nt, false );
+		WatchedItem::duplicateEntriesNs( $ot, $nt, true );
+	}
 
 }
 
Index: includes/templates/Userlogin.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/templates/Userlogin.php,v
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.6 Userlogin.php
--- includes/templates/Userlogin.php	27 Mar 2005 16:11:26 -0000	1.2.2.6
+++ includes/templates/Userlogin.php	19 Apr 2005 06:08:07 -0000
@@ -94,7 +94,11 @@
 				<p>
 					<?php $this->msgHtml( 'emailforlost' ) ?><br />
 					<input tabindex='10' type='submit' name="wpMailmypassword"
-						value="<?php $this->msg('mailmypassword') ?>" />
+						value="<?php if ( $this->data['useemailauthent'] ) {
+								$this->msg('mailmypasswordauthent') ?>" />
+							<?php } else {
+								$this->msg('mailmypassword') ?>" />
+							<?php } ?>
 				</p>
 			</td>
 		</tr>
Index: languages/Language.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/languages/Language.php,v
retrieving revision 1.390.2.47
diff -u -b -r1.390.2.47 Language.php
--- languages/Language.php	18 Apr 2005 23:04:42 -0000	1.390.2.47
+++ languages/Language.php	19 Apr 2005 06:08:09 -0000
@@ -51,14 +51,35 @@
 }
 
 /* private */ $wgDefaultUserOptionsEn = array(
-	'quickbar' => 1, 'underline' => 1, 'hover' => 1,
-	'cols' => 80, 'rows' => 25, 'searchlimit' => 20,
-	'contextlines' => 5, 'contextchars' => 50,
-	'skin' => $wgDefaultSkin, 'math' => 1, 'rcdays' => 7, 'rclimit' => 50,
-	'highlightbroken' => 1, 'stubthreshold' => 0,
-	'previewontop' => 1, 'editsection'=>1,'editsectiononrightclick'=>0, 'showtoc'=>1,
+	'quickbar' => 1,
+	'underline' => 1,
+	'hover' => 1,
+	'cols' => 80,
+	'rows' => 25,
+	'searchlimit' => 20,
+	'contextlines' => 5,
+	'contextchars' => 50,
+	'skin' => $wgDefaultSkin,
+	'math' => 1,
+	'rcdays' => 7,
+	'rclimit' => 50,
+	'highlightbroken' => 1,
+	'stubthreshold' => 0,
+	'previewontop' => 1,
+	'editsection'=>1,
+	'editsectiononrightclick'=>0,
+	'showtoc'=>1,
 	'showtoolbar' =>1,
-	'date' => 0, 'imagesize' => 2,
+	'date' => 0,
+	'imagesize' => 2,
+	'rememberpassword' 	=> 0,
+	'enotifwatchlistpages' 	=> 1,
+	'enotifusertalkpages' 	=> 1,
+	'enotifminoredits' 	=> 0,
+	'enotifrevealaddr' 	=> 0,
+	'shownumberswatching' 	=> 1,
+	'rccurrevonly'		=> 1,
+	'showupdated'		=> 1,
 	'fancysig' => 0,
 );
 
@@ -127,6 +148,13 @@
 	'previewontop',
 	'previewonfirst',
 	'nocache',
+	'enotifwatchlistpages',
+	'enotifusertalkpages',
+	'enotifminoredits',
+	'enotifrevealaddr',
+	'shownumberswatching',
+	'rccurrevonly',
+	'showupdated',
 	'fancysig'
 );
 
@@ -237,8 +265,8 @@
 'tog-showtoolbar'=>'Show edit toolbar',
 'tog-editondblclick' => 'Edit pages on double click (JavaScript)',
 'tog-editsection'=>'Enable section editing via [edit] links',
-'tog-editsectiononrightclick'=>'Enable section editing by right clicking<br /> on section titles (JavaScript)',
-'tog-showtoc'=>'Show table of contents<br />(for pages with more than 3 headings)',
+'tog-editsectiononrightclick'=>'Enable section editing by right clicking on section titles (JavaScript)',
+'tog-showtoc'=>'Show table of contents (for pages with more than 3 headings)',
 'tog-rememberpassword' => 'Remember password across sessions',
 'tog-editwidth' => 'Edit box has full width',
 'tog-watchdefault' => 'Add pages you edit to your watchlist',
@@ -246,6 +274,13 @@
 'tog-previewontop' => 'Show preview before edit box and not after it',
 'tog-previewonfirst' => 'Show preview on first edit',
 'tog-nocache' => 'Disable page caching',
+'tog-enotifwatchlistpages' 	=> 'Send me an email on page changes (remark: existing notification flags need to be cleared manually in the watchlist)',
+'tog-enotifusertalkpages' 	=> 'Send me an email when my user talk page is changed (remark: existing notification flags need to be cleared manually in the watchlist)',
+'tog-enotifminoredits' 		=> 'Send me an email also for minor edits of pages (which usually do not trigger notification mails)',
+'tog-enotifrevealaddr' 		=> 'Reveal my email address in notification mails (when I change a page, it allows watching users to reply quickly to me)',
+'tog-shownumberswatching' 	=> 'Show the number of watching users (in recent changes view, watchlist and article page footers)',
+'tog-rccurrevonly' 		=> 'Show only the current revision of pages in recent changes view.',
+'tog-showupdated'		=> 'Show update marker ',
 'tog-fancysig' => 'Raw signatures (without automatic link)',
 
 # dates
@@ -402,6 +437,11 @@
 'retrievedfrom' => "Retrieved from \"$1\"",
 'newmessages' => "You have $1.",
 'newmessageslink' => 'new messages',
+'newmsg' => 'You have new messages on your $1.',
+'newmsg_user' => 'user',
+'newmsg_usertalk' => 'discussion',
+'newmsg_page' => ' page',
+'newmsg_and' => ' and ',
 'editsection'=>'edit',
 'toc' => 'Table of contents',
 'showtoc' => 'show',
@@ -533,13 +573,17 @@
 'createaccountmail'	=> 'by email',
 'badretype'		=> 'The passwords you entered do not match.',
 'userexists'	=> 'The user name you entered is already in use. Please choose a different name.',
-'youremail'		=> 'Your email*',
+'youremail'		=> 'Your email**',
 'yourrealname'		=> 'Your real name*',
 'yourlanguage'	=> 'Interface language',
 'yourvariant'  => 'Language variant',
 'yournick'		=> 'Your nickname (for signatures)',
-'emailforlost'	=> "Fields marked with a star (*) are optional.  Storing an email address enables people to contact you through the website without you having to reveal your
+'emailforlost'		=> "Fields marked with stars (*, **) are optional.  Storing an email address enables people to contact you through the website without you having to reveal your
 email address to them, and it can be used to send you a new password if you forget it.<br /><br />Your real name, if you choose to provide it, will be used for giving you attribution for your work.",
+'prefs-help-email' 	=> '** <strong>Email</strong> (optional): Enables others to contact you through your user or user_talk page without the need of revealing your
+email address. It also allows the wiki to sent you a temporary password in case you forgot your current one.',
+'prefs-help-email-enotif' => 'This address is also used to send you email notifications if you enabled the options.',
+'prefs-help-realname' 	=> '* <strong>Real name</strong> (optional): if you choose to provide it this will be used for giving you attribution for your work.',
 'prefs-help-userdata' => '* <strong>Real name</strong> (optional): if you choose to provide it this will be used for giving you attribution for your work.<br />
 * <strong>Email</strong> (optional): Enables people to contact you through the website without you having to reveal your
 email address to them, and it can be used to send you a new password if you forget it.',
@@ -552,20 +596,37 @@
 'nosuchuser'	=> "There is no user by the name \"$1\".
 Check your spelling, or use the form below to create a new user account.",
 'nosuchusershort'	=> "There is no user by the name \"$1\". Check your spelling.",
-'wrongpassword'	=> 'The password you entered is incorrect. Please try again.',
-'mailmypassword' => 'Mail me a new password',
-'passwordremindertitle' => "Password reminder from {{SITENAME}}",
-'passwordremindertext' => "Someone (probably you, from IP address $1)
-requested that we send you a new {{SITENAME}} login password.
-The password for user \"$2\" is now \"$3\".
-You should log in and change your password now.",
+'wrongpassword'		=> 'The password you entered is incorrect (or missing). Please try again.',
+'mailmypassword' 	=> 'Mail me a temporary password',
+'mailmypasswordauthent'	=> 'Mail me a temporary password',
+'passwordremindermailsubject' => "Email address authentication and temporary login password from {{SITENAME}}",
+'passwordremindermailbody' 	=> "Someone, probably you from IP address $1,
+requested that we send you a temporary one-time login password for {{SITENAME}}.
+
+This mail is also be sent for the purpose of authentication of your email address.
+The password for user \"$2\" is now \"$4\".
+
+You can now log in with this temporary password, which is valid for only one login.
+You may wish to keep using your old password if you remember it or to set a new one.
+
+{{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}",
 'noemail'		=> "There is no e-mail address recorded for user \"$1\".",
-'passwordsent'	=> "A new password has been sent to the e-mail address
+'passwordsent'		=> "A temporary password has been sent to the e-mail address
 registered for \"$1\".
 Please log in again after you receive it.",
+'passwordsentforemailauthentication'
+			=>  "A temporary password has been sent to the e-mail address newly
+registered for \"$1\".
+Please re-login with that for authentication purposes.",
 'loginend'		=> '&nbsp;',
 'mailerror' => "Error sending mail: $1",
 'acct_creation_throttle_hit' => 'Sorry, you have already created $1 accounts. You can\'t make any more.',
+'emailauthenticated' 	=> 'Your email address $1 was authenticated on $2.',
+'emailnotauthenticated'	=> 'Your email address is <strong>not yet authenticated</strong> and the advanced email features are disabled until authentication <strong>(d.u.a.)</strong>.<br />
+To authenticate, please login in with the temporary password which has been mailed to you, or request a new one on the login page.',
+'invalidemailaddress'	=> 'The email address cannot be accepted as it appears to have an invalid format. Please enter a well-formatted address or empty that field.',
+'disableduntilauthent'	=> '<strong>(d.u.a.)</strong>',
+'disablednoemail'	=> '<strong>(disabled; no email address)</strong>',
 
 # Edit page toolbar
 'bold_sample'=>'Bold text',
@@ -596,7 +657,7 @@
 #
 'summary'		=> 'Summary',
 'subject'		=> 'Subject/headline',
-'minoredit'		=> 'This is a minor edit',
+'minoredit'		=> 'This is a minor edit.',
 'watchthis'		=> 'Watch this page',
 'savearticle'	=> 'Save page',
 'preview'		=> 'Preview',
@@ -696,12 +757,14 @@
 'nextrevision'		=> 'Newer revision&rarr;',
 'currentrevisionlink'   => 'view current revision',
 'cur'			=> 'cur',
+'cur_tooltiptext'	=> 'Show difference between this and current version of ',
 'next'			=> 'next',
-'last'			=> 'last',
+'last'			=> 'prev',
+'last_tooltiptext'	=> 'Show difference between this and preceding version of ',
 'orig'			=> 'orig',
 'histlegend'	=> 'Diff selection: mark the radio boxes of the versions to compare and hit enter or the button at the bottom.<br />
 Legend: (cur) = difference with current version,
-(last) = difference with preceding version, M = minor edit.',
+(prev) = difference with preceding version, M = minor edit.',
 'history_copyright'    => '-',
 
 # Diffs
@@ -826,6 +889,7 @@
 'servertime'	=> 'Server time is now',
 'guesstimezone' => 'Fill in from browser',
 'emailflag'		=> 'Disable e-mail from other users',
+'enotifnewpages'	=> 'Send me an email when a new page is created',
 'defaultns'		=> 'Search in these namespaces by default:',
 'default'		=> 'default',
 
@@ -871,7 +935,13 @@
 'rchide'		=> "in $4 form; $1 minor edits; $2 secondary namespaces; $3 multiple edits.",
 'rcliu'			=> "; $1 edits from logged in users",
 'diff'			=> 'diff',
+'diff_tooltiptext'	=> 'Show difference between this revision and the previous revision of ',
+'diff-to-lvr'		=> 'last',
+'diff-to-lvr_tooltiptext' => 'Show difference between this revision and the last visited revision of ',
+'lvr'			=> '<span class=\'updatedmarker\'>lvrd</span>',
+'lvr_tooltiptext'  	=> 'This is the last visited revision of ',
 'hist'			=> 'hist',
+'hist_tooltiptext'	=> 'Show history of ',
 'hide'			=> 'hide',
 'show'			=> 'show',
 'tableform'		=> 'table',
@@ -881,6 +951,8 @@
 'newpageletter' => 'N',
 'sectionlink' => '&rarr;',
 'undo'          => 'undo',
+'number_of_watching_users_RCview' 	=> '[$1]',
+'number_of_watching_users_pageview' 	=> '[$1 watching user/s]',
 
 # Upload
 #
@@ -1160,9 +1232,8 @@
 'removechecked' 	=> 'Remove checked items from watchlist',
 'watchlistcontains' => "Your watchlist contains $1 pages.",
 'watcheditlist'		=> 'Here\'s an alphabetical list of your
-watched pages. Check the boxes of pages you want to remove
-from your watchlist and click the \'remove checked\' button
-at the bottom of the screen.',
+watched content pages. Check the boxes of pages you want to remove from your watchlist and click the \'remove checked\' button
+at the bottom of the screen (deleting a content page also deletes the accompanying talk page and vice versa).',
 'removingchecked' 	=> 'Removing requested items from watchlist...',
 'couldntremove' 	=> "Couldn't remove item '$1'...",
 'iteminvalidname' 	=> "Problem with item '$1', invalid name...",
@@ -1170,6 +1241,41 @@
 'wlshowlast' 		=> "Show last $1 hours $2 days $3",
 'wlsaved'			=> 'This is a saved version of your watchlist.',
 
+'updatedmarker'		=> '<span class=\'updatedmarker\'>&nbsp;updated (since my last visit)&nbsp;</span>',
+'updatedmarker_tooltiptext' => 'Show difference between the current and the last visited revision of ',
+'email_notification_mailer' 		=> '{{SITENAME}} Notification Mailer',
+'email_notification_infotext' 		=> "'''Email notification is on.'''
+You will be notified by email when someone changes a page which is listed in your watchlist.",
+'email_notification_reset'			=> 'Reset all notification flags (set their status to "visited")',
+'email_notification_newpagetext'=> 'This is a new page.',
+'email_notification_to' 	=> '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>',
+'email_notification_subject' 	=> '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR',
+'changed' 			=> 'changed',
+'created' 			=> 'created',
+'email_notification_lastvisitedrevisiontext' => 'See {{SERVER}}{{localurl:$PAGETITLE_RAWURL|diff=0&oldid=$OLDID}} for all changes since your last visit.',
+'email_notification_body' => 'Dear $WATCHINGUSERNAME,
+
+the {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR,
+see {{SERVER}}{{localurl:$PAGETITLE_RAWURL}} for the current version.
+
+$NEWPAGE
+
+Editor\'s summary: $PAGESUMMARY $PAGEMINOREDIT
+Contact the editor:
+mail {{SERVER}}{{localurl:Special:Emailuser|target=$PAGEEDITOR_RAWURL}}
+wiki {{SERVER}}{{localurl:User:$PAGEEDITOR_RAWURL}}
+
+There will be no other notifications in case of further changes unless you visit this page.
+You could also reset the notification flags for all your watched pages on your watchlist.
+
+             Your friendly {{SITENAME}} notification system
+
+---
+To change your watchlist settings, visit
+{{SERVER}}{{localurl:Special:Watchlist|magic=yes}}
+
+Feedback and further assistance:
+{{SERVER}}{{localurl:WikiHelpdesk}}',
 
 # Delete/protect/revert
 #
@@ -1822,9 +1928,13 @@
 			return wfMsgUTF8($wgWeekdayNamesEn[$key-1]);
 	}
 
-	function userAdjust( $ts ) {
+	function userAdjust( $ts, $tz = false )	{
 		global $wgUser, $wgLocalTZoffset;
 
+		if (!$tz) {
+ 			$tz = $wgUser->getOption( 'timecorrection' );
+		}
+
 		$tz = $wgUser->getOption( 'timecorrection' );
 		if ( $tz === '' ) {
 			$hrDiff = isset( $wgLocalTZoffset ) ? $wgLocalTZoffset : 0;
@@ -1848,11 +1958,11 @@
 		return date( 'YmdHis', $t );
 	}
 
-	function date( $ts, $adj = false, $format = MW_DATE_USER_FORMAT ) {
+	function date( $ts, $adj = false, $format = MW_DATE_USER_FORMAT, $timecorrection = false ) {
 		global $wgAmericanDates, $wgUser, $wgUseDynamicDates;
 
 		$ts=wfTimestamp(TS_MW,$ts);
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
 		if ( $wgUseDynamicDates ) {
 			if ( $format == MW_DATE_USER_FORMAT ) {
 				$datePreference = $wgUser->getOption( 'date' );
@@ -1878,10 +1988,10 @@
 		}
 	}
 
-	function time( $ts, $adj = false, $seconds = false ) {
+	function time( $ts, $adj = false, $seconds = false, $timecorrection = false ) {
 		$ts=wfTimestamp(TS_MW,$ts);
 
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
 
 		$t = substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 );
 		if ( $seconds ) {
@@ -1890,10 +2000,10 @@
 		return $this->formatNum( $t );
 	}
 
-	function timeanddate( $ts, $adj = false, $format = MW_DATE_USER_FORMAT ) {
+	function timeanddate( $ts, $adj = false, $format = MW_DATE_USER_FORMAT, $timecorrection = false, $dateandtime = false) {
 		$ts=wfTimestamp(TS_MW,$ts);
 
-		return $this->time( $ts, $adj ) . ', ' . $this->date( $ts, $adj, $format );
+		return $this->time( $ts, $adj, $timecorrection ) . ', ' . $this->date( $ts, $adj, $format, $timecorrection );
 	}
 
 	function rfc1123( $ts ) {
Index: maintenance/tables.sql
===================================================================
RCS file: /cvsroot/wikipedia/phase3/maintenance/tables.sql,v
retrieving revision 1.39.2.4
diff -u -b -r1.39.2.4 tables.sql
--- maintenance/tables.sql	11 Mar 2005 01:19:31 -0000	1.39.2.4
+++ maintenance/tables.sql	19 Apr 2005 06:08:10 -0000
@@ -11,6 +11,8 @@
   user_password tinyblob NOT NULL default '',
   user_newpassword tinyblob NOT NULL default '',
   user_email tinytext NOT NULL default '',
+  user_emailauthenticationtimestamp datetime,
+  user_emailnotificationfornewpages tinyint(1) NOT NULL default '0',
   user_options blob NOT NULL default '',
   user_touched char(14) binary NOT NULL default '',
   user_token char(32) binary NOT NULL default '',
@@ -25,6 +27,9 @@
   UNIQUE KEY ur_user (ur_user)
 );
 
+-- Entries for newtalk on user_talk page are
+-- handled in table user_newtalk for efficient memcaching
+-- but are also handled as entries in the watchlist table for email notifications
 CREATE TABLE /*$wgDBprefix*/user_newtalk (
   user_id int(5) NOT NULL default '0',
   user_ip varchar(40) NOT NULL default '',
@@ -241,6 +246,8 @@
   wl_user int(5) unsigned NOT NULL,
   wl_namespace tinyint(2) unsigned NOT NULL default '0',
   wl_title varchar(255) binary NOT NULL default '',
+  wl_notificationtimestamp datetime,
+  wl_lastvisitedrevision int(10) unsigned NOT NULL default '0',
   UNIQUE KEY (wl_user, wl_namespace, wl_title),
   KEY namespace_title (wl_namespace,wl_title)
 );
Index: maintenance/updaters.inc
===================================================================
RCS file: /cvsroot/wikipedia/phase3/maintenance/updaters.inc,v
retrieving revision 1.24.2.6
diff -u -b -r1.24.2.6 updaters.inc
--- maintenance/updaters.inc	21 Mar 2005 01:51:39 -0000	1.24.2.6
+++ maintenance/updaters.inc	19 Apr 2005 06:08:10 -0000
@@ -174,6 +174,103 @@
 	}
 }
 
+function do_watchlist_update() {
+ 	global $wgDatabase;
+	if( $wgDatabase->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) {
+		$meta = $wgDatabase->fieldInfo( 'watchlist', 'wl_notificationtimestamp' );
+		if ($meta->type != 'datetime') {
+			echo "ENOTIF: Converting wl_notificationtimestamp field to datetime datatype.\n";
+			dbsource( "maintenance/archives/patch-email-notification-changetype.sql", $wgDatabase );
+			echo "ok\n";
+		} else {
+			echo "ENOTIF: The watchlist table is already set up for email notification.\n";
+		}
+	} else {
+		echo "ENOTIF: Adding wl_notificationtimestamp field for email notification management.\n";
+		/* ALTER TABLE watchlist ADD (wl_notificationtimestamp datetime WAS: char(14) binary NOT NULL default '0'); */
+		dbsource( "maintenance/archives/patch-email-notification.sql", $wgDatabase );
+		echo "ok\n";
+	}
+	if( $wgDatabase->fieldExists( 'watchlist', 'wl_lastvisitedrevision' ) ) {
+		echo "ENOTIF: The watchlist table is already set up for last-visited-revision (lvr) management.\n";
+	} else {
+		echo "ENOTIF: Adding wl_lastvisitedrevision field for last-visited-revision (lvr) management.\n";
+		dbsource( "maintenance/archives/patch-last-visited-revision.sql", $wgDatabase );
+		echo "ok\n";
+	}
+}
+
+function do_copy_newtalk_to_watchlist() {
+	global $wgDatabase;
+	global $wgCommandLineMode;	# this needs to be saved while getID() and getName() are called
+
+	if ( $wgDatabase->tableExists( 'user_newtalk' ) ) {
+		$res = $wgDatabase->safeQuery( 'SELECT user_id, user_ip FROM !',
+			$wgDatabase->tableName( 'user_newtalk' ) );
+		$num_newtalks=$wgDatabase->numRows($res);
+		echo "ENOTIF: Now converting ".$num_newtalks." user_newtalk entries to watchlist table entries ...\n";
+
+		$user = new User();
+		for ( $i = 1; $i <= $num_newtalks; $i++ ) {
+			$wluser = $wgDatabase->fetchObject( $res );
+			echo 'ENOTIF: <= user_newtalk: user_id='.$wluser->user_id.' user_ip='.$wluser->user_ip."\n";
+			if ($wluser->user_id == 0) { # anonymous users ... have IP numbers as "names"
+				if ($user->isIP($wluser->user_ip)) { # do only if it really looks like an IP number (double checked)
+					$wgDatabase->replace( 'watchlist',
+						array(array('wl_user','wl_namespace', 'wl_title', 'wl_notificationtimestamp' )),
+						  array('wl_user' 			=> 0,
+							'wl_namespace' 			=> NS_USER_TALK,
+							'wl_title' 			=> $wluser->user_ip,
+							'wl_notificationtimestamp' 	=> '19700101000000'
+							), 'updaters.inc::do_watchlist_update2'
+						);
+					echo 'ENOTIF: ====> watchlist: user_id=0 '.$wluser->user_ip."\n";
+				}
+			} else { # normal users ... have user_ids
+				$user->setID($wluser->user_id);
+				$wgDatabase->replace( 'watchlist',
+					array(array('wl_user','wl_namespace', 'wl_title', 'wl_notificationtimestamp' )),
+					  array('wl_user' 			=> $user->getID(),
+						'wl_namespace' 			=> NS_USER_TALK,
+						'wl_title' 			=> $user->getName(),
+						'wl_notificationtimestamp' 	=> '19700101000000'
+						), 'updaters.inc::do_watchlist_update3'
+					);
+				echo 'ENOTIF: ====> watchlist: user_id='.$user->getID().' '.$user->getName()."\n";
+			}
+		}
+		echo "ENOTIF: The watchlist table has got the former user_newtalk entries.\n";
+	} else {
+		echo "ENOTIF: No user_newtalk table found. Nothing to convert to watchlist table entries.\n";
+	}
+}
+
+
+function do_user_update() {
+	global $wgDatabase;
+	if( $wgDatabase->fieldExists( 'user', 'user_emailauthenticationtimestamp' ) ) {
+		$meta = $wgDatabase->fieldInfo( 'user', 'user_emailauthenticationtimestamp' );
+		if ($meta->type != 'datetime') {
+			echo "EAUTHENT: Converting user_emailauthenticationtimestamp field to datetime datatype.\n";
+			dbsource( "maintenance/archives/patch-email-authentication-changetype.sql", $wgDatabase );
+			echo "ok\n";
+		} else {
+			echo "EAUTHENT: The user table is already set up for email authentication.\n";
+		}
+	} else {
+		echo "EAUTHENT: Adding user_emailauthenticationtimestamp field for email authentication management.\n";
+		/* ALTER TABLE user ADD (user_emailauthenticationtimestamp datetime . WAS: varchar(14) binary NOT NULL default '0'); */
+		dbsource( "maintenance/archives/patch-email-authentication.sql", $wgDatabase );
+		echo "ok\n";
+	}
+	if( $wgDatabase->fieldExists( 'user', 'user_emailnotificationfornewpages' ) ) {
+		echo "ENOTIF: The user table is already set up for email notification for new pages.\n";
+	} else {
+		echo "ENOTIF: Adding user_emailnotificationfornewpages field.";
+		dbsource( "maintenance/archives/patch-email-notification-fornewpages.sql", $wgDatabase );
+		echo "ok\n";
+	}
+}
 
 function do_all_updates() {
 	global $wgNewTables, $wgNewFields;
@@ -198,6 +295,9 @@
 	do_linkscc_1_3_update(); flush();
 	convertLinks(); flush();
 	do_image_name_unique_update(); flush();
+	do_watchlist_update(); flush();
+	do_user_update(); flush();
+	do_copy_newtalk_to_watchlist(); flush();
 
 	do_logging_encoding(); flush();
 
Index: skins/MonoBook.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/skins/MonoBook.php,v
retrieving revision 1.10.2.13
diff -u -b -r1.10.2.13 MonoBook.php
--- skins/MonoBook.php	22 Jan 2005 12:30:31 -0000	1.10.2.13
+++ skins/MonoBook.php	19 Apr 2005 06:08:10 -0000
@@ -185,10 +185,12 @@
 	<ul id="f-list">
 	  <?php if($this->data['lastmod'   ]) { ?><li id="f-lastmod"><?php    $this->html('lastmod')    ?></li><?php } ?>
 	  <?php if($this->data['viewcount' ]) { ?><li id="f-viewcount"><?php  $this->html('viewcount')  ?></li><?php } ?>
+	  <?php if($this->data['numberofwatchingusers' ]) { ?><li id="f-numberofwatchingusers"><?php  $this->html('numberofwatchingusers') ?></li><?php } ?>
 	  <?php if($this->data['credits'   ]) { ?><li id="f-credits"><?php    $this->html('credits')    ?></li><?php } ?>
 	  <?php if($this->data['copyright' ]) { ?><li id="f-copyright"><?php  $this->html('copyright')  ?></li><?php } ?>
 	  <?php if($this->data['about'     ]) { ?><li id="f-about"><?php      $this->html('about')      ?></li><?php } ?>
 	  <?php if($this->data['disclaimer']) { ?><li id="f-disclaimer"><?php $this->html('disclaimer') ?></li><?php } ?>
+	  <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?>
 	</ul>
       </div>
     </div>