X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=email.php;h=65c71c38f89725976eb7b7964e8521ff6e96ba27;hp=c7ae44f84cf6681fb1f7a5a3186c8576fdd6fda1;hb=15459c86d0996ab3037b1738a8be6efd378c1258;hpb=848c24fee95383e6dfb37ecf62f656c5da694125

diff --git a/email.php b/email.php
index c7ae44f..65c71c3 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 {
@@ -91,7 +90,7 @@ function email_header($addr) {
 	}
 
 	#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 . '>';
 }
@@ -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;
 }