X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=email.php;h=946edf2ec8626ac50e4491af0f7705833a39c015;hb=571c58fff7b139f590b5c4862761092bc1045436;hp=92cb6f0a5ba15e1a55d1dec87650e1b37d29b8db;hpb=554b3215eda9d33d86b8bd30df28e02eabb89ae7;p=wfpl.git

diff --git a/email.php b/email.php
index 92cb6f0..946edf2 100644
--- a/email.php
+++ b/email.php
@@ -41,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) {
@@ -53,9 +53,8 @@ function email($from, $to, $subject, $message, $reply_to = '', $cc = '', $bcc =
 	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 {
@@ -100,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;
 }