From cada81e1efb630df341bb5c877f280c4e2ff917a Mon Sep 17 00:00:00 2001
From: jim winstead <jimw@php.net>
Date: Wed, 25 Apr 2001 21:01:27 +0000
Subject: [PATCH] use user@example.com as example email address, but don't pass
 it through to the database or display it

---
 include/shared-manual.inc |  2 +-
 manual/add-note.php       | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/shared-manual.inc b/include/shared-manual.inc
index 3198cc0de..fd3ed5eda 100644
--- a/include/shared-manual.inc
+++ b/include/shared-manual.inc
@@ -140,7 +140,7 @@ function makeEntry($date,$name,$blurb,$id=0) {
 	$name = htmlspecialchars($name);
         if (ereg("(.+)@(.+)\.(.+)",$name)) {
                 echo "<a href=\"mailto:".$name."\">".$name."</a><br>\n";
-        } else {
+        } elseif ($name && $name != "php-general@lists.php.net" && $name != "user@example.com") {
                 echo "<b>".$name."</b><br>\n";
         }
         echo date("d-M-Y h:i",$date);
diff --git a/manual/add-note.php b/manual/add-note.php
index 49c68c5af..ee4f40b6c 100644
--- a/manual/add-note.php
+++ b/manual/add-note.php
@@ -33,10 +33,9 @@ commonHeader("Manual Notes");
 $user = trim($user);
 $note = trim($note);
 
-/* plug in general email address for blank email addresses
-on notes */
-if ($user == "") {
-    $user = "php-general@lists.php.net";
+/* don't pass through example username */
+if ($user == "user@example.com") {
+    $user = "";
 }
 
 if ($note == "") {
@@ -63,6 +62,8 @@ if (isset($note) && isset($action) && strtolower($action) != "preview"):
 <?		$new_id = mysql_insert_id();	
 		$msg = stripslashes($note);
 		$msg .= "\n\n $redirect \n";
+                # make sure we have a return address.
+                if (!$user) $user = "php-general@lists.php.net";
 		mail("php-notes@lists.php.net","note $new_id added to $sect",$msg,"From: $user");
 	else:
 		// mail it.
@@ -120,6 +121,7 @@ and add it here!)</p>
 <a href="http://bugs.php.net/">Click here to request a feature.</a>
 </p>
 <?      endif;
+	if (!$user) $user = "user@example.com";
         if (!isset($sect)):?>
 <p><b>To add a note, you must click on the 'Add Note' button
 on the bottom of a manual page so we know where to add the note!</b></p>