# 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/>.
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) {
if($bcc) {
$headers .= "\r\nBCC: $bcc";
}
- #header('Content-Type: text/plain');
- #print_r(array($to, $subject, $message, $headers));
- #exit();
+ $headers .= "\r\nContent-type: text/plain; charset=UTF-8";
+
if(mail($to, $subject, $message, $headers)) {
return 0;
} else {
}
#FIXME should allow many more characters here
- $name = ereg_replace("[^a-zA-Z0-9 _'.-]", '_', $name);
+ $name = ereg_replace("[^a-zA-Z0-9 _/'.-]", '_', $name);
return $name . ' <' . $email . '>';
}
# 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;
}