X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=email.php;h=4f77bb0dac6eb6817a3194b8c15e07a942852860;hp=65c71c38f89725976eb7b7964e8521ff6e96ba27;hb=196deb2416748b09200f620247a344563dff4c38;hpb=26bad7e66d87374bed4f126c7f202133828e387c

diff --git a/email.php b/email.php
index 65c71c3..4f77bb0 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 = preg_replace("|[^a-z0-9 _/#'.:&,-]|i", '_', $subject);
 
 	$headers = "From: $from";
 	if($reply_to) {
@@ -74,7 +74,7 @@ function email_header($addr) {
 		return '';
 	}
 
-	if(ereg('<.*>$', $addr) !== false) {
+	if(preg_match('|<.*>$|', $addr) === 1) {
 		# format 2
 		$div = strrpos($addr, '<');
 		$name = substr($addr, 0 , $div);
@@ -82,7 +82,7 @@ function email_header($addr) {
 		$email = substr($addr, $div + 1, -1);
 	} else {
 		$email = $addr;
-		$name = ereg_replace('@.*', '', $addr);
+		$name = preg_replace('|@.*|', '', $addr);
 	}
 
 	if(!valid_email($email)) {
@@ -90,7 +90,7 @@ function email_header($addr) {
 	}
 
 	#FIXME should allow many more characters here
-	$name = ereg_replace("[^a-zA-Z0-9 _/'.-]", '_', $name);
+	$name = preg_replace("|[^a-z0-9 _/|i'.-]", '_', $name);
 
 	return $name . ' <' . $email . '>';
 }
@@ -99,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 preg_match('|^[0-9a-zA-Z_~.+-]+@[0-9a-zA-Z.-]+\.[a-z]+$|', $email) === 1;
 }