<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2113] 2013/codebykat/post-by-email/trunk: added basic logging and status info on settings page</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2113">2113</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-07-12 08:30:41 +0000 (Fri, 12 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>added basic logging and status info on settings page</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailphp">2013/codebykat/post-by-email/trunk/class-post-by-email.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkviewsadminphp">2013/codebykat/post-by-email/trunk/views/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2112 => 2113)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-07-12 03:45:21 UTC (rev 2112)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-07-12 08:30:41 UTC (rev 2113)
</span><span class="lines">@@ -206,6 +206,10 @@
</span><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><span class="cx"> /* TODO validate that options are set */
</span><span class="cx">
</span><ins>+ $log = array();
+ $log['last_checked'] = current_time( 'mysql' );
+ $log['messages'] = array();
+
</ins><span class="cx"> $time_difference = get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
</span><span class="cx">
</span><span class="cx"> $phone_delim = '::';
</span><span class="lines">@@ -213,16 +217,16 @@
</span><span class="cx"> $pop3 = new POP3();
</span><span class="cx">
</span><span class="cx"> if ( ! $pop3->connect( $options['mailserver_url'], $options['mailserver_port'] ) || ! $pop3->user( $options['mailserver_login'] ) )
</span><del>- wp_die( esc_html( $pop3->ERROR ) );
</del><ins>+ self::save_log_and_die( __( 'An error occurred: ') . esc_html( $pop3->ERROR ), $log );
</ins><span class="cx">
</span><span class="cx"> $count = $pop3->pass( $options['mailserver_pass'] );
</span><span class="cx">
</span><span class="cx"> if( false === $count )
</span><del>- wp_die( esc_html( $pop3->ERROR ) );
</del><ins>+ self::save_log_and_die( __( 'An error occurred: ') . esc_html( $pop3->ERROR ), $log );
</ins><span class="cx">
</span><span class="cx"> if( 0 === $count ) {
</span><span class="cx"> $pop3->quit();
</span><del>- wp_die( __( 'There doesn’t seem to be any new mail.' ) );
</del><ins>+ self::save_log_and_die( __( 'There doesn’t seem to be any new mail.' ), $log );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for ( $i = 1; $i <= $count; $i++ ) {
</span><span class="lines">@@ -249,6 +253,7 @@
</span><span class="cx"> $content_type = trim( $line );
</span><span class="cx"> $content_type = substr( $content_type, 14, strlen( $content_type ) - 14 );
</span><span class="cx"> $content_type = explode( ';', $content_type );
</span><ins>+ print_r($content_type);
</ins><span class="cx"> if ( ! empty( $content_type[1] ) ) {
</span><span class="cx"> $charset = explode( '=', $content_type[1] );
</span><span class="cx"> $charset = ( ! empty( $charset[1] ) ) ? trim( $charset[1] ) : '';
</span><span class="lines">@@ -288,7 +293,7 @@
</span><span class="cx"> $author = trim( $line );
</span><span class="cx"> $author = sanitize_email( $author );
</span><span class="cx"> if ( is_email( $author ) ) {
</span><del>- echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
</del><ins>+ $log['messages'][] = '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
</ins><span class="cx"> $userdata = get_user_by( 'email', $author );
</span><span class="cx"> if ( ! empty( $userdata ) ) {
</span><span class="cx"> $post_author = $userdata->ID;
</span><span class="lines">@@ -347,6 +352,10 @@
</span><span class="cx"> $content = explode( $delim[0], $content );
</span><span class="cx"> $content = $content[1];
</span><span class="cx"> }
</span><ins>+ if ( preg_match( '/Content-Transfer-Encoding: 7bit/i', $content, $delim ) ) {
+ $content = explode( $delim[0], $content );
+ $content = $content[1];
+ }
</ins><span class="cx"> $content = strip_tags( $content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>' );
</span><span class="cx"> }
</span><span class="cx"> $content = trim( $content );
</span><span class="lines">@@ -359,9 +368,9 @@
</span><span class="cx"> $content = quoted_printable_decode( $content );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( function_exists( 'iconv' ) && ! empty( $charset ) ) {
- $content = iconv( $charset, get_option( 'blog_charset' ), $content );
- }
</del><ins>+ // if ( function_exists( 'iconv' ) && ! empty( $charset ) ) {
+ // $content = iconv( $charset, get_option( 'blog_charset' ), $content );
+ // }
</ins><span class="cx">
</span><span class="cx"> // Captures any text in the body after $phone_delim as the body
</span><span class="cx"> $content = explode( $phone_delim, $content );
</span><span class="lines">@@ -383,7 +392,7 @@
</span><span class="cx">
</span><span class="cx"> $post_ID = wp_insert_post( $post_data );
</span><span class="cx"> if ( is_wp_error( $post_ID ) )
</span><del>- echo "\n" . $post_ID->get_error_message();
</del><ins>+ $log['messages'][] = "\n" . $post_ID->get_error_message();
</ins><span class="cx">
</span><span class="cx"> // We couldn't post, for whatever reason. Better move forward to the next email.
</span><span class="cx"> if ( empty( $post_ID ) )
</span><span class="lines">@@ -391,19 +400,28 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'publish_phone', $post_ID );
</span><span class="cx">
</span><del>- echo "\n<p>" . sprintf( __( '<strong>Author:</strong> %s' ), esc_html( $post_author ) ) . '</p>';
- echo "\n<p>" . sprintf( __( '<strong>Posted title:</strong> %s' ), esc_html( $post_title ) ) . '</p>';
</del><ins>+ $log['messages'][] = "\n<p>" . sprintf( __( '<strong>Author:</strong> %s' ), esc_html( $post_author ) ) . '</p>';
+ $log['messages'][] = "\n<p>" . sprintf( __( '<strong>Posted title:</strong> %s' ), esc_html( $post_title ) ) . '</p>';
</ins><span class="cx">
</span><span class="cx"> if( ! $pop3->delete( $i ) ) {
</span><del>- echo '<p>' . sprintf( __( 'Oops: %s' ), esc_html( $pop3->ERROR ) ) . '</p>';
</del><ins>+ $log['messages'][] = '<p>' . sprintf( __( 'Oops: %s' ), esc_html( $pop3->ERROR ) ) . '</p>';
</ins><span class="cx"> $pop3->reset();
</span><span class="cx"> exit;
</span><span class="cx"> } else {
</span><del>- echo '<p>' . sprintf( __( 'Mission complete. Message <strong>%s</strong> deleted.' ), $i ) . '</p>';
</del><ins>+ $log['messages'][] = '<p>' . sprintf( __( 'Mission complete. Message <strong>%s</strong> deleted.' ), $i ) . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+ $pop3->quit();
</ins><span class="cx">
</span><del>- $pop3->quit();
</del><ins>+ foreach( $log['messages'] as $message ) { echo $message; }
+ update_option( 'post_by_email_log', $log );
</ins><span class="cx"> }
</span><ins>+
+ protected function save_log_and_die( $error, $log ) {
+ $messages[] = $error;
+ $log['messages'] = $messages;
+ update_option( 'post_by_email_log', $log );
+ wp_die( $status );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkviewsadminphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/views/admin.php (2112 => 2113)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/views/admin.php 2013-07-12 03:45:21 UTC (rev 2112)
+++ 2013/codebykat/post-by-email/trunk/views/admin.php 2013-07-12 08:30:41 UTC (rev 2113)
</span><span class="lines">@@ -91,4 +91,15 @@
</span><span class="cx">
</span><span class="cx"> <?php submit_button(); ?>
</span><span class="cx"> </form>
</span><ins>+
+ <h2>Activity Log</h2>
+ <?php $log = get_option( 'post_by_email_log' ); ?>
+ <p>Last checked: <?php echo $log ? $log['last_checked'] : "Never"; ?></p>
+ <p><a href="<?php echo site_url('wp-mail.php'); ?>">Check now</a></p>
+ <?php if( $log['messages'] ) : ?>
+ And the plugin had this to say about it:
+ <?php foreach($log['messages'] as $message) : ?>
+ <li><?php echo $message; ?></li>
+ <?php endforeach; ?>
+ <?php endif; ?>
</ins><span class="cx"> </div>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>