X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=email.php;h=c7ae44f84cf6681fb1f7a5a3186c8576fdd6fda1;hb=43012e4a2333ae92d2ac1b51b6b9c1e481a64ec0;hp=a7c841dd88f1ad5c5c1de49366479c9930f104c3;hpb=6e1e6239e46cb1c3059f4acd89cc53bf628cf99c;p=wfpl.git

diff --git a/email.php b/email.php
index a7c841d..c7ae44f 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 <http://www.gnu.org/licenses/>.
 
 
 
@@ -44,7 +41,7 @@ function email($from, $to, $subject, $message, $reply_to = '', $cc = '', $bcc =
 	if($to   == '') { return 2; }
 
 	#FIXME should allow many more characters here
-	$subject = ereg_replace("[^a-zA-Z0-9 _'.:-]", '_', $subject);
+	$subject = ereg_replace("[^a-zA-Z0-9 _#'.:&,-]", '_', $subject);
 
 	$headers = "From: $from";
 	if($reply_to) {