X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=email.php;h=4f77bb0dac6eb6817a3194b8c15e07a942852860;hp=5d119fc438ce65d4a98c686875b9a59a1d17cf2f;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=3bec0ef771d741361c6c4c4c1ff069398f6e37a0

diff --git a/email.php b/email.php
index 5d119fc..4f77bb0 100644
--- a/email.php
+++ b/email.php
@@ -2,36 +2,37 @@
 
 #  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 <http://www.gnu.org/licenses/>.
 
 
 
 # This function will SAFELY send e-mail (ie you can pass parameters to it
 # that you got from a form and not worry about header injection.) Weird
 # characters are stripped from the $subject and from the real names, but e-mail
-# addresses are not modified at all. If an e-mail address is invalid this
-# function will return non-zero.
+# addresses are not modified at all.
+
+# RETURN values:
+#     0: e-mail successfully accepted for delivery
+#     1: badly formatted "from" address
+#     2: badly formatted "to" address
+#     5: message rejected by mail() (reason unknown)
 
 # You cannot pass more than one address to any parameter
 # address fields (from, to, cc, bcc) can be in either of these formats:
 # 1) me@foo.com  2) Me Who <me@foo.com>
 # 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; }
@@ -40,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 = preg_replace("|[^a-z0-9 _/#'.:&,-]|i", '_', $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 {
@@ -68,14 +74,15 @@ function email_header($addr) {
 		return '';
 	}
 
-	if(ereg('<.*>$', $addr) !== false) {
+	if(preg_match('|<.*>$|', $addr) === 1) {
 		# 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);
+		$name = preg_replace('|@.*|', '', $addr);
 	}
 
 	if(!valid_email($email)) {
@@ -83,7 +90,7 @@ function email_header($addr) {
 	}
 
 	#FIXME should allow many more characters here
-	$name = ereg_replace("[^a-zA-Z _'-]", '_', $name);
+	$name = preg_replace("|[^a-z0-9 _/|i'.-]", '_', $name);
 
 	return $name . ' <' . $email . '>';
 }
@@ -92,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 preg_match('|^[0-9a-zA-Z_~.+-]+@[0-9a-zA-Z.-]+\.[a-z]+$|', $email) === 1;
 }