cvs: php-master-web /manage user-notes.php
| From: | Gabor Hojtsy | Date: | Sat, 14 Aug 2004 21:57:45 +0000 |
| Subject: | cvs: php-master-web /manage user-notes.php | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-25808@lists.php.net to get a copy of this message | ||
goba Sat Aug 14 17:57:45 2004 EDT
Modified files:
/php-master-web/manage user-notes.php
Log:
safe printing of email addresses when user note removal is initiated
http://cvs.php.net/diff.php/php-master-web/manage/user-notes.php?r1=1.50&r2=1.51&ty=u
Index: php-master-web/manage/user-notes.php
diff -u php-master-web/manage/user-notes.php:1.50 php-master-web/manage/user-notes.php:1.51
--- php-master-web/manage/user-notes.php:1.50 Tue Jul 6 17:46:20 2004
+++ php-master-web/manage/user-notes.php Sat Aug 14 17:57:45 2004
@@ -1,5 +1,5 @@
<?php
-// $Id: user-notes.php,v 1.50 2004/07/06 21:46:20 didou Exp $
+// $Id: user-notes.php,v 1.51 2004/08/14 21:57:45 goba Exp $
// Force login before action can be taken
include_once 'login.inc';
@@ -233,7 +233,7 @@
$user,
$id,
"note {$row['id']} $action_taken from {$row['sect']} by
$user",
- "Note Submitter:
{$row['user']}\n\n----\n\n{$row['note']}"
+ "Note Submitter: " . safe_email($row['user']) .
"\n\n----\n\n{$row['note']}"
);
if ($action == 'reject') {
note_mail_user($row['user'], "note $row[id] rejected and deleted from
$row[sect] by notes editor $user",$reject_text."\n\n----- Copy of your note below
-----\n\n".$row['note']);
@@ -431,4 +431,16 @@
) {
return TRUE;
} else { return FALSE; }
+}
+
+// Return safe to print version of email address
+function safe_email($mail)
+{
+ if (in_array($mail, array("php-general@lists.php.net",
"user@example.com"))) {
+ return '';
+ }
+ elseif (preg_match("!(.+)@(.+)\.(.+)!", $mail)) {
+ return str_replace(array('@', '.'), array(' at ', ' dot
'), $mail);
+ }
+ return $mail;
}