HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code is Poetry.

Browse Source 
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.


Built from https://develop.svn.wordpress.org/trunk@42343


git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast
2017-11-30 23:11:00 +00:00
parent 62be7ad218
commit aaf99e6913
610 changed files with 55731 additions and 43711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
wp-mail.php
View File

@@ -8,11 +8,12 @@
*/
/** Make sure that the WordPress bootstrap has run before continuing. */
require(dirname(__FILE__) . '/wp-load.php');
require( dirname( __FILE__ ) . '/wp-load.php' );
/** This filter is documented in wp-admin/options.php */
if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) {
wp_die( __( 'This action has been disabled by the administrator.' ), 403 );
}
$mailserver_url = get_option( 'mailserver_url' );
@@ -31,85 +32,90 @@ do_action( 'wp-mail.php' );
require_once( ABSPATH . WPINC . '/class-pop3.php' );
/** Only check at this interval for new messages. */
if ( !defined('WP_MAIL_INTERVAL') )
define('WP_MAIL_INTERVAL', 300); // 5 minutes
if ( ! defined( 'WP_MAIL_INTERVAL' ) ) {
define( 'WP_MAIL_INTERVAL', 300 ); // 5 minutes
}
$last_checked = get_transient('mailserver_last_checked');
$last_checked = get_transient( 'mailserver_last_checked' );
if ( $last_checked )
wp_die(__('Slow down cowboy, no need to check for new mails so often!'));
if ( $last_checked ) {
wp_die( __( 'Slow down cowboy, no need to check for new mails so often!' ) );
}
set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
set_transient( 'mailserver_last_checked', true, WP_MAIL_INTERVAL );
$time_difference = get_option('gmt_offset') * HOUR_IN_SECONDS;
$time_difference = get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
$phone_delim = '::';
$pop3 = new POP3();
if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
if ( ! $pop3->connect( get_option( 'mailserver_url' ), get_option( 'mailserver_port' ) ) || ! $pop3->user( get_option( 'mailserver_login' ) ) ) {
wp_die( esc_html( $pop3->ERROR ) );
}
$count = $pop3->pass( get_option('mailserver_pass') );
$count = $pop3->pass( get_option( 'mailserver_pass' ) );
if( false === $count )
if ( false === $count ) {
wp_die( esc_html( $pop3->ERROR ) );
}
if( 0 === $count ) {
if ( 0 === $count ) {
$pop3->quit();
wp_die( __('There doesn’t seem to be any new mail.') );
wp_die( __( 'There doesn’t seem to be any new mail.' ) );
}
for ( $i = 1; $i <= $count; $i++ ) {
$message = $pop3->get($i);
$message = $pop3->get( $i );
$bodysignal = false;
$boundary = '';
$charset = '';
$content = '';
$content_type = '';
$bodysignal = false;
$boundary = '';
$charset = '';
$content = '';
$content_type = '';
$content_transfer_encoding = '';
$post_author = 1;
$author_found = false;
foreach ($message as $line) {
$post_author = 1;
$author_found = false;
foreach ( $message as $line ) {
// Body signal.
if ( strlen($line) < 3 )
if ( strlen( $line ) < 3 ) {
$bodysignal = true;
}
if ( $bodysignal ) {
$content .= $line;
} else {
if ( preg_match('/Content-Type: /i', $line) ) {
$content_type = trim($line);
$content_type = substr($content_type, 14, strlen($content_type) - 14);
$content_type = explode(';', $content_type);
if ( preg_match( '/Content-Type: /i', $line ) ) {
$content_type = trim( $line );
$content_type = substr( $content_type, 14, strlen( $content_type ) - 14 );
$content_type = explode( ';', $content_type );
if ( ! empty( $content_type[1] ) ) {
$charset = explode('=', $content_type[1]);
$charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : '';
$charset = explode( '=', $content_type[1] );
$charset = ( ! empty( $charset[1] ) ) ? trim( $charset[1] ) : '';
}
$content_type = $content_type[0];
}
if ( preg_match('/Content-Transfer-Encoding: /i', $line) ) {
$content_transfer_encoding = trim($line);
$content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding) - 27);
$content_transfer_encoding = explode(';', $content_transfer_encoding);
if ( preg_match( '/Content-Transfer-Encoding: /i', $line ) ) {
$content_transfer_encoding = trim( $line );
$content_transfer_encoding = substr( $content_transfer_encoding, 27, strlen( $content_transfer_encoding ) - 27 );
$content_transfer_encoding = explode( ';', $content_transfer_encoding );
$content_transfer_encoding = $content_transfer_encoding[0];
}
if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos($line, 'boundary="') ) && ( '' == $boundary ) ) {
$boundary = trim($line);
$boundary = explode('"', $boundary);
if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) {
$boundary = trim( $line );
$boundary = explode( '"', $boundary );
$boundary = $boundary[1];
}
if (preg_match('/Subject: /i', $line)) {
$subject = trim($line);
$subject = substr($subject, 9, strlen($subject) - 9);
if ( preg_match( '/Subject: /i', $line ) ) {
$subject = trim( $line );
$subject = substr( $subject, 9, strlen( $subject ) - 9 );
// 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'));
if ( function_exists( 'iconv_mime_decode' ) ) {
$subject = iconv_mime_decode( $subject, 2, get_option( 'blog_charset' ) );
} else {
$subject = wp_iso_descrambler($subject);
$subject = wp_iso_descrambler( $subject );
}
$subject = explode($phone_delim, $subject);
$subject = explode( $phone_delim, $subject );
$subject = $subject[0];
}
@@ -118,27 +124,28 @@ for ( $i = 1; $i <= $count; $i++ ) {
* otherwise use the site admin.
*/
if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
if ( preg_match( '|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches ) ) {
$author = $matches[0];
else
$author = trim($line);
$author = sanitize_email($author);
if ( is_email($author) ) {
} else {
$author = trim( $line );
}
$author = sanitize_email( $author );
if ( is_email( $author ) ) {
/* translators: Post author email address */
echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
$userdata = get_user_by('email', $author);
echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
$userdata = get_user_by( 'email', $author );
if ( ! empty( $userdata ) ) {
$post_author = $userdata->ID;
$post_author = $userdata->ID;
$author_found = true;
}
}
}
if ( preg_match( '/Date: /i', $line ) ) { // of the form '20 Mar 2002 20:32:37 +0100'
$ddate = str_replace( 'Date: ', '', trim( $line ) );
$ddate = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime
$ddate_U = strtotime( $ddate );
$post_date = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference );
$ddate = str_replace( 'Date: ', '', trim( $line ) );
$ddate = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime
$ddate_U = strtotime( $ddate );
$post_date = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference );
$post_date_gmt = gmdate( 'Y-m-d H:i:s', $ddate_U );
}
}
@@ -146,27 +153,27 @@ for ( $i = 1; $i <= $count; $i++ ) {
// Set $post_status based on $author_found and on author's publish_posts capability
if ( $author_found ) {
$user = new WP_User($post_author);
$post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
$user = new WP_User( $post_author );
$post_status = ( $user->has_cap( 'publish_posts' ) ) ? 'publish' : 'pending';
} else {
// Author not found in DB, set status to pending. Author already set to admin.
$post_status = 'pending';
}
$subject = trim($subject);
$subject = trim( $subject );
if ( $content_type == 'multipart/alternative' ) {
$content = explode('--'.$boundary, $content);
$content = explode( '--' . $boundary, $content );
$content = $content[2];
// Match case-insensitive content-transfer-encoding.
if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
$content = explode($delim[0], $content);
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 = strip_tags( $content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>' );
}
$content = trim($content);
$content = trim( $content );
/**
* Filters the original content of the email.
@@ -180,19 +187,19 @@ for ( $i = 1; $i <= $count; $i++ ) {
*/
$content = apply_filters( 'wp_mail_original_content', $content );
if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) {
$content = quoted_printable_decode($content);
if ( false !== stripos( $content_transfer_encoding, 'quoted-printable' ) ) {
$content = quoted_printable_decode( $content );
}
if ( function_exists('iconv') && ! empty( $charset ) ) {
$content = iconv($charset, get_option('blog_charset'), $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
$content = explode($phone_delim, $content);
$content = explode( $phone_delim, $content );
$content = empty( $content[1] ) ? $content[0] : $content[1];
$content = trim($content);
$content = trim( $content );
/**
* Filters the content of the post submitted by email before saving.
@@ -203,22 +210,26 @@ for ( $i = 1; $i <= $count; $i++ ) {
*/
$post_content = apply_filters( 'phone_content', $content );
$post_title = xmlrpc_getposttitle($content);
$post_title = xmlrpc_getposttitle( $content );
if ($post_title == '') $post_title = $subject;
if ( $post_title == '' ) {
$post_title = $subject;
}
$post_category = array(get_option('default_email_category'));
$post_category = array( get_option( 'default_email_category' ) );
$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
$post_data = wp_slash($post_data);
$post_data = compact( 'post_content', 'post_title', 'post_date', 'post_date_gmt', 'post_author', 'post_category', 'post_status' );
$post_data = wp_slash( $post_data );
$post_ID = wp_insert_post($post_data);
if ( is_wp_error( $post_ID ) )
$post_ID = wp_insert_post( $post_data );
if ( is_wp_error( $post_ID ) ) {
echo "\n" . $post_ID->get_error_message();
}
// We couldn't post, for whatever reason. Better move forward to the next email.
if ( empty( $post_ID ) )
if ( empty( $post_ID ) ) {
continue;
}
/**
* Fires after a post submitted by email is published.
@@ -232,7 +243,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
echo "\n<p><strong>" . __( 'Author:' ) . '</strong> ' . esc_html( $post_author ) . '</p>';
echo "\n<p><strong>" . __( 'Posted title:' ) . '</strong> ' . esc_html( $post_title ) . '</p>';
if(!$pop3->delete($i)) {
if ( ! $pop3->delete( $i ) ) {
echo '<p>' . sprintf(
/* translators: %s: POP3 error */
__( 'Oops: %s' ),
@@ -247,7 +258,6 @@ for ( $i = 1; $i <= $count; $i++ ) {
'<strong>' . $i . '</strong>'
) . '</p>';
}
}
$pop3->quit();