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

diff --git a/email.php b/email.php
index 5d119fc..8140ded 100644
--- a/email.php
+++ b/email.php
@@ -4,28 +4,32 @@
 #
 #  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)
+#  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
-#  General Public License for more details.
+#  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 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.
+#  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 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:
@@ -40,7 +44,7 @@ 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-Z _'.-]", '_', $subject);
 
 	$headers = "From: $from";
 	if($cc) {