X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=email.php;h=585f97fa93c5248622325fc330f101ad2cf77f77;hb=697d643083cb5829c96ed7854bd63309c8f325f3;hp=8140ded442fcdb499eb8ae2d6c6676644cde347e;hpb=22d5fb7ab7d4ee86bd59e194387dca268bd577a1;p=wfpl.git
diff --git a/email.php b/email.php
index 8140ded..585f97f 100644
--- a/email.php
+++ b/email.php
@@ -2,21 +2,18 @@
# Copyright (C) 2006 Jason Woofenden
#
-# This file is part of wfpl.
-#
-# wfpl is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 2.1 of the License, or (at your option)
-# any later version.
-#
-# wfpl 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 Lesser General Public License for
-# more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# 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 3 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, see .
@@ -35,7 +32,7 @@
# address fields (from, to, cc, bcc) can be in either of these formats:
# 1) me@foo.com 2) Me Who
# returns 0 on success
-function email($from, $to, $subject, $message, $cc = '', $bcc = '') {
+function email($from, $to, $subject, $message, $reply_to = '', $cc = '', $bcc = '') {
if(($from = email_header($from)) === false) { return 1; }
if(($to = email_header($to)) === false) { return 2; }
if(($cc = email_header($cc)) === false) { return 3; }
@@ -44,15 +41,21 @@ function email($from, $to, $subject, $message, $cc = '', $bcc = '') {
if($to == '') { return 2; }
#FIXME should allow many more characters here
- $subject = ereg_replace("[^a-zA-Z _'.-]", '_', $subject);
+ $subject = ereg_replace("[^a-zA-Z0-9 _'.:-]", '_', $subject);
$headers = "From: $from";
+ if($reply_to) {
+ $headers .= "\r\nReply-To: $reply_to";
+ }
if($cc) {
$headers .= "\r\nCC: $cc";
}
if($bcc) {
$headers .= "\r\nBCC: $bcc";
}
+ #header('Content-Type: text/plain');
+ #print_r(array($to, $subject, $message, $headers));
+ #exit();
if(mail($to, $subject, $message, $headers)) {
return 0;
} else {
@@ -74,9 +77,10 @@ function email_header($addr) {
if(ereg('<.*>$', $addr) !== false) {
# format 2
- list($name, $email) = split('<', $addr);
+ $div = strrpos($addr, '<');
+ $name = substr($addr, 0 , $div);
$name = rtrim($name);
- $email = substr($email, 0, -1); # get rid of the '>' at the end
+ $email = substr($addr, $div + 1, -1);
} else {
$email = $addr;
$name = ereg_replace('@.*', '', $addr);
@@ -87,7 +91,7 @@ function email_header($addr) {
}
#FIXME should allow many more characters here
- $name = ereg_replace("[^a-zA-Z _'-]", '_', $name);
+ $name = ereg_replace("[^a-zA-Z0-9 _'.-]", '_', $name);
return $name . ' <' . $email . '>';
}