diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-02 16:00:05 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-02 16:00:05 +0000 |
| commit | 1503e05616c295e6f980134dc341fa1a66dc9672 (patch) | |
| tree | b0a7dc356affec0059670603f1cb990da7dbc026 /wp-mail.php | |
| parent | c65d51fec1d641efd1ec8a44c046cd54d588fe3b (diff) | |
| download | wordpress-mu-1503e05616c295e6f980134dc341fa1a66dc9672.tar.gz wordpress-mu-1503e05616c295e6f980134dc341fa1a66dc9672.tar.xz wordpress-mu-1503e05616c295e6f980134dc341fa1a66dc9672.zip | |
Merge with WP 2.3.2
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1172 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-mail.php')
| -rw-r--r-- | wp-mail.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/wp-mail.php b/wp-mail.php index e510055..ab9ae84 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -12,7 +12,7 @@ $phone_delim = '::'; $pop3 = new POP3(); if (!$pop3->connect(get_option('mailserver_url'), get_option('mailserver_port'))) - wp_die($pop3->ERROR); + wp_die(wp_specialchars($pop3->ERROR)); $count = $pop3->login(get_option('mailserver_login'), get_option('mailserver_pass')); if (0 == $count) wp_die(__('There doesn’t seem to be any new mail.')); @@ -129,9 +129,6 @@ for ($i=1; $i <= $count; $i++) : $content = explode($phone_delim, $content); $content[1] ? $content = $content[1] : $content = $content[0]; - echo "<p><b>Content-type:</b> $content_type, <b>Content-Transfer-Encoding:</b> $content_transfer_encoding, <b>boundary:</b> $boundary</p>\n"; - echo "<p><b>Raw content:</b><br /><pre>".$content.'</pre></p>'; - $content = trim($content); $post_content = apply_filters('phone_content', $content); @@ -161,12 +158,11 @@ for ($i=1; $i <= $count; $i++) : do_action('publish_phone', $post_ID); - echo "\n<p><b>Author:</b> $post_author</p>"; - echo "\n<p><b>Posted title:</b> $post_title<br />"; - echo "\n<b>Posted content:</b><br /><pre>".$content.'</pre></p>'; + echo "\n<p><b>Author:</b> " . wp_specialchars($post_author) . "</p>"; + echo "\n<p><b>Posted title:</b> " . wp_specialchars($post_title) . "<br />"; if(!$pop3->delete($i)) { - echo '<p>Oops '.$pop3->ERROR.'</p></div>'; + echo '<p>Oops '.wp_specialchars($pop3->ERROR).'</p></div>'; $pop3->reset(); exit; } else { |