X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=email.php;h=65c71c38f89725976eb7b7964e8521ff6e96ba27;hb=b5400a0c7808da6bae095ff54f6d45591c74948f;hp=abd02e8cfe976065d61b4242f600c4ebbbd4d912;hpb=a4e42e7c89f4c256ff2512902fb539a2279785ce;p=wfpl.git
diff --git a/email.php b/email.php
index abd02e8..65c71c3 100644
--- a/email.php
+++ b/email.php
@@ -2,22 +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 General Public License as published by
-# the Free Software Foundation; either version 2, 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
-# General Public License for more details.
-#
+# 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 wfpl; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA.
+# along with this program. If not, see .
@@ -36,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; }
@@ -45,15 +41,20 @@ 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";
}
+ $headers .= "\r\nContent-type: text/plain; charset=UTF-8";
+
if(mail($to, $subject, $message, $headers)) {
return 0;
} else {
@@ -75,9 +76,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);
@@ -88,7 +90,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 . '>';
}
@@ -97,5 +99,5 @@ function email_header($addr) {
# return true if e-mail is formatted like a valid email address
function valid_email($email) {
- return ereg('^[0-9a-zA-Z_~.-]+@[0-9a-zA-Z.-]+\.[a-z]+$', $email) !== false;
+ return ereg('^[0-9a-zA-Z_~.+-]+@[0-9a-zA-Z.-]+\.[a-z]+$', $email) !== false;
}