golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve wp-mail utf8 support. Fixes #6788 props filosofo. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-12-02 18:40:16 +00:00
parent 6112842855
commit 84867318d6
1 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
wp-mail.php
View File

@ -1,75 +1,81 @@
<?php <?php
/** /**
* Gets the email message from the user's mailbox to add as * Gets the email message from the user's mailbox to add as
* a WordPress post. Will only run if this is setup and enabled. * a WordPress post. Mailbox connection information must be
* configured under Settings > Writing
* *
* @package WordPress * @package WordPress
*/ */
/** Make sure that the WordPress bootstrap has ran before continuing. */ /** Make sure that the WordPress bootstrap has run before continuing. */
require(dirname(__FILE__) . '/wp-load.php'); require(dirname(__FILE__) . '/wp-load.php');
/** Get the POP3 class for which to access the mailbox. */ /** Get the POP3 class with which to access the mailbox. */
require_once(ABSPATH.WPINC.'/class-pop3.php'); require_once( ABSPATH . WPINC . '/class-pop3.php' );
$time_difference = get_option('gmt_offset') * 3600; $time_difference = absint(get_option('gmt_offset')) * 3600;
$phone_delim = '::'; $phone_delim = '::';
$pop3 = new POP3(); $pop3 = new POP3();
if (!$pop3->connect(get_option('mailserver_url'), get_option('mailserver_port'))) if ( ! $pop3->connect(get_option('mailserver_url'), get_option('mailserver_port') ) ||
wp_die(wp_specialchars($pop3->ERROR)); ! $pop3->user(get_option('mailserver_login')) ||
( ! $count = $pop3->pass(get_option('mailserver_pass')) ) ) {
$pop3->quit();
wp_die( ( 0 === $count ) ? __("There doesn't seem to be any new mail.") : wp_specialchars($pop3->ERROR) );
}
if (!$pop3->user(get_option('mailserver_login'))) for ( $i = 1; $i <= $count; $i++ ) {
wp_die(wp_specialchars($pop3->ERROR));
$count = $pop3->pass(get_option('mailserver_pass'));
if (false === $count)
wp_die(wp_specialchars($pop3->ERROR));
if (0 == $count)
echo '<p>' . __("There doesn't seem to be any new mail.") . "</p>\n"; // will fall-through to end of for loop
for ($i=1; $i <= $count; $i++) :
$message = $pop3->get($i); $message = $pop3->get($i);
$bodysignal = false;
$boundary = '';
$charset = '';
$content = ''; $content = '';
$content_type = ''; $content_type = '';
$content_transfer_encoding = ''; $content_transfer_encoding = '';
$boundary = '';
$bodysignal = 0;
$post_author = 1; $post_author = 1;
$author_found = false; $author_found = false;
$dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
foreach ($message as $line) : foreach ($message as $line) {
if (strlen($line) < 3) $bodysignal = 1; // body signal
if ( strlen($line) < 3 )
if ($bodysignal) { $bodysignal = true;
if ( $bodysignal ) {
$content .= $line; $content .= $line;
} else { } else {
if (preg_match('/Content-Type: /i', $line)) { if ( preg_match('/Content-Type: /i', $line) ) {
$content_type = trim($line); $content_type = trim($line);
$content_type = substr($content_type, 14, strlen($content_type)-14); $content_type = substr($content_type, 14, strlen($content_type) - 14);
$content_type = explode(';', $content_type); $content_type = explode(';', $content_type);
if ( ! empty( $content_type[1] ) ) {
$charset = explode('=', $content_type[1]);
$charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : '';
}
$content_type = $content_type[0]; $content_type = $content_type[0];
} }
if (preg_match('/Content-Transfer-Encoding: /i', $line)) { if ( preg_match('/Content-Transfer-Encoding: /i', $line) ) {
$content_transfer_encoding = trim($line); $content_transfer_encoding = trim($line);
$content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding)-14); $content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding) - 27);
$content_transfer_encoding = explode(';', $content_transfer_encoding); $content_transfer_encoding = explode(';', $content_transfer_encoding);
$content_transfer_encoding = $content_transfer_encoding[0]; $content_transfer_encoding = $content_transfer_encoding[0];
} }
if (($content_type == 'multipart/alternative') && (false !== strpos($line, 'boundary="')) && ($boundary == '')) { if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos($line, 'boundary="') ) && ( '' == $boundary ) ) {
$boundary = trim($line); $boundary = trim($line);
$boundary = explode('"', $boundary); $boundary = explode('"', $boundary);
$boundary = $boundary[1]; $boundary = $boundary[1];
} }
if (preg_match('/Subject: /i', $line)) { if (preg_match('/Subject: /i', $line)) {
$subject = trim($line); $subject = trim($line);
$subject = substr($subject, 9, strlen($subject)-9); $subject = substr($subject, 9, strlen($subject) - 9);
$subject = wp_iso_descrambler($subject);
// Captures any text in the subject before $phone_delim as the subject // Captures any text in the subject before $phone_delim as the subject
if ( function_exists('iconv_mime_decode') ) {
$subject = iconv_mime_decode($subject, 2, get_option('blog_charset'));
} else {
$subject = wp_iso_descrambler($subject);
}
$subject = explode($phone_delim, $subject); $subject = explode($phone_delim, $subject);
$subject = $subject[0]; $subject = $subject[0];
} }
@ -83,17 +89,15 @@ for ($i=1; $i <= $count; $i++) :
$author = trim($line); $author = trim($line);
$author = sanitize_email($author); $author = sanitize_email($author);
if ( is_email($author) ) { if ( is_email($author) ) {
echo "Author = {$author} <p>"; echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
$userdata = get_user_by_email($author); $userdata = get_user_by_email($author);
if (!$userdata) { if ( empty($userdata) ) {
$post_author = 1;
$author_found = false; $author_found = false;
} else { } else {
$post_author = $userdata->ID; $post_author = $userdata->ID;
$author_found = true; $author_found = true;
} }
} else { } else {
$post_author = 1;
$author_found = false; $author_found = false;
} }
} }
@ -102,7 +106,7 @@ for ($i=1; $i <= $count; $i++) :
$ddate = trim($line); $ddate = trim($line);
$ddate = str_replace('Date: ', '', $ddate); $ddate = str_replace('Date: ', '', $ddate);
if (strpos($ddate, ',')) { if (strpos($ddate, ',')) {
$ddate = trim(substr($ddate, strpos($ddate, ',')+1, strlen($ddate))); $ddate = trim(substr($ddate, strpos($ddate, ',') + 1, strlen($ddate)));
} }
$date_arr = explode(' ', $ddate); $date_arr = explode(' ', $ddate);
$date_time = explode(':', $date_arr[3]); $date_time = explode(':', $date_arr[3]);
@ -114,8 +118,8 @@ for ($i=1; $i <= $count; $i++) :
$ddate_m = $date_arr[1]; $ddate_m = $date_arr[1];
$ddate_d = $date_arr[0]; $ddate_d = $date_arr[0];
$ddate_Y = $date_arr[2]; $ddate_Y = $date_arr[2];
for ($j=0; $j<12; $j++) { for ( $j = 0; $j < 12; $j++ ) {
if ($ddate_m == $dmonths[$j]) { if ( $ddate_m == $dmonths[$j] ) {
$ddate_m = $j+1; $ddate_m = $j+1;
} }
} }
@ -127,15 +131,12 @@ for ($i=1; $i <= $count; $i++) :
$post_date_gmt = gmdate('Y-m-d H:i:s', $ddate_U); $post_date_gmt = gmdate('Y-m-d H:i:s', $ddate_U);
} }
} }
endforeach; }
// Set $post_status based on $author_found and on author's publish_posts capability // Set $post_status based on $author_found and on author's publish_posts capability
if ($author_found) { if ( $author_found ) {
$user = new WP_User($post_author); $user = new WP_User($post_author);
if ($user->has_cap('publish_posts')) $post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
$post_status = 'publish';
else
$post_status = 'pending';
} else { } else {
// Author not found in DB, set status to pending. Author already set to admin. // Author not found in DB, set status to pending. Author already set to admin.
$post_status = 'pending'; $post_status = 'pending';
@ -143,21 +144,29 @@ for ($i=1; $i <= $count; $i++) :
$subject = trim($subject); $subject = trim($subject);
if ($content_type == 'multipart/alternative') { if ( $content_type == 'multipart/alternative' ) {
$content = explode('--'.$boundary, $content); $content = explode('--'.$boundary, $content);
$content = $content[2]; $content = $content[2];
$content = explode('Content-Transfer-Encoding: quoted-printable', $content); // match case-insensitive content-transfer-encoding
$content = strip_tags($content[1], '<img><p><br><i><b><u><em><strong><strike><font><span><div>'); if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
$content = explode($delim[0], $content);
$content = $content[1];
}
$content = strip_tags($content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>');
} }
$content = trim($content); $content = trim($content);
if (stripos($content_transfer_encoding, "quoted-printable") !== false) { if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) {
$content = quoted_printable_decode($content); $content = quoted_printable_decode($content);
} }
if ( function_exists('iconv') && ! empty( $charset ) ) {
$content = iconv($charset, get_option('blog_charset'), $content);
}
// Captures any text in the body after $phone_delim as the body // Captures any text in the body after $phone_delim as the body
$content = explode($phone_delim, $content); $content = explode($phone_delim, $content);
$content[1] ? $content = $content[1] : $content = $content[0]; $content = empty( $content[1] ) ? $content[0] : $content[1];
$content = trim($content); $content = trim($content);
@ -167,9 +176,7 @@ for ($i=1; $i <= $count; $i++) :
if ($post_title == '') $post_title = $subject; if ($post_title == '') $post_title = $subject;
if (empty($post_categories)) $post_categories[] = get_option('default_email_category'); $post_category = array(get_option('default_email_category'));
$post_category = $post_categories;
$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status'); $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
$post_data = add_magic_quotes($post_data); $post_data = add_magic_quotes($post_data);
@ -178,10 +185,9 @@ for ($i=1; $i <= $count; $i++) :
if ( is_wp_error( $post_ID ) ) if ( is_wp_error( $post_ID ) )
echo "\n" . $post_ID->get_error_message(); echo "\n" . $post_ID->get_error_message();
if (!$post_ID) { // We couldn't post, for whatever reason. Better move forward to the next email.
// we couldn't post, for whatever reason. better move forward to the next email if ( empty( $post_ID ) )
continue; continue;
}
do_action('publish_phone', $post_ID); do_action('publish_phone', $post_ID);
@ -196,7 +202,7 @@ for ($i=1; $i <= $count; $i++) :
echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>'; echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>';
} }
endfor; }
$pop3->quit(); $pop3->quit();