Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enc_htmlbrtab: don't double spaces
[wfpl.git]
/
email.php
diff --git
a/email.php
b/email.php
index
585f97f
..
a1e501a
100644
(file)
--- 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
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) {
$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";
}
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 {
if(mail($to, $subject, $message, $headers)) {
return 0;
} else {
@@
-75,7
+74,7
@@
function email_header($addr) {
return '';
}
return '';
}
- if(ereg('<.*>$', $addr) !== false) {
+ if(preg_match('|<.*>$|', $addr) === 1) {
# format 2
$div = strrpos($addr, '<');
$name = substr($addr, 0 , $div);
# format 2
$div = strrpos($addr, '<');
$name = substr($addr, 0 , $div);
@@
-83,7
+82,7
@@
function email_header($addr) {
$email = substr($addr, $div + 1, -1);
} else {
$email = $addr;
$email = substr($addr, $div + 1, -1);
} else {
$email = $addr;
- $name = ereg_replace('@.*', '', $addr);
+ $name = preg_replace('|@.*|', '', $addr);
}
if(!valid_email($email)) {
}
if(!valid_email($email)) {
@@
-91,7
+90,7
@@
function email_header($addr) {
}
#FIXME should allow many more characters here
}
#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 . '>';
}
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 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;
}
}