<!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>[2271] 2013/codebykat/post-by-email/trunk: admin notices/errors, better logging</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/2271">2271</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-10 20:03:13 +0000 (Tue, 10 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>admin notices/errors, better logging</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailadminphp">2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailphp">2013/codebykat/post-by-email/trunk/class-post-by-email.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkpostbyemailphp">2013/codebykat/post-by-email/trunk/post-by-email.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkreadmemd">2013/codebykat/post-by-email/trunk/readme.md</a></li>
<li><a href="#2013codebykatpostbyemailtrunkreadmetxt">2013/codebykat/post-by-email/trunk/readme.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailadminphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php (2270 => 2271)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-10 20:03:11 UTC (rev 2270)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-10 20:03:13 UTC (rev 2271)
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx">
</span><span class="cx"> if( $options['mailserver_url'] && $options['mailserver_port']
</span><span class="cx"> && $options['mailserver_login'] && $options['mailserver_pass'] ) {
</span><del>- $options['status'] = 'ready';
</del><span class="cx">
</span><del>- // clear the transient if options have been updated
</del><ins>+ // clear the transient and any error conditions if options have been updated
</ins><span class="cx"> delete_transient( 'mailserver_last_checked' );
</span><ins>+ $options['status'] = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $options;
</span><span class="lines">@@ -166,12 +166,12 @@
</span><span class="cx"> $settings_url = admin_url( 'tools.php?page=post-by-email' );
</span><span class="cx"> if( ! $options || ! isset( $options['status'] ) || $options['status'] == 'unconfigured' ) {
</span><span class="cx"> echo "<div class='error'><p>";
</span><del>- _e( "Notice: Post by Email is currently disabled. To post to your blog via email, please <a href='$settings_url'>configure your settings now</a>.", 'post-by-email' );
</del><ins>+ _e( "Notice: Post By Email is currently disabled. To post to your blog via email, please <a href='$settings_url'>configure your settings now</a>.", 'post-by-email' );
</ins><span class="cx"> echo "</p></div>";
</span><span class="cx"> }
</span><span class="cx"> elseif( $options['status'] == 'error' ) {
</span><span class="cx"> echo "<div class='error'><p>";
</span><del>- _e( "Post via Email encountered an error. Please double-check <a href='$settings_url'>the settings</a>.", 'post-by-email' );
</del><ins>+ _e( "Post By Email encountered an error. <a href='$settings_url&tab=log'>View the log</a> for details.", 'post-by-email' );
</ins><span class="cx"> echo "</p></div>";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2270 => 2271)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-10 20:03:11 UTC (rev 2270)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-10 20:03:13 UTC (rev 2271)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- protected $version = '1.0.0';
</del><ins>+ protected $version = '1.0.1';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Unique identifier for the plugin.
</span><span class="lines">@@ -231,6 +231,7 @@
</span><span class="cx">
</span><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><span class="cx"> $options['last_checked'] = current_time( 'timestamp' );
</span><ins>+ $options['status'] = '';
</ins><span class="cx"> update_option( 'post_by_email_options', $options );
</span><span class="cx">
</span><span class="cx"> // if options aren't set, there's nothing to do, move along
</span><span class="lines">@@ -327,7 +328,7 @@
</span><span class="cx"> $post_ID = wp_insert_post( $post_data );
</span><span class="cx"> if ( is_wp_error( $post_ID ) ) {
</span><span class="cx"> $log_message .= "\n" . $post_ID->get_error_message();
</span><del>- $this->save_log_message( $log_message );
</del><ins>+ $this->save_error_message( $log_message );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We couldn't post, for whatever reason. Better move forward to the next email.
</span><span class="lines">@@ -336,10 +337,17 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'publish_phone', $post_ID );
</span><span class="cx">
</span><del>- // $log_message .= "\n<p>" . sprintf( __( 'Author: %s', 'post-by-email' ), esc_html( $post_author ) ) . '</p>';
- // $log_message .= "\n<p>" . sprintf( __( 'Posted title: %s', 'post-by-email' ), esc_html( $post_title ) ) . '</p>';
- $log_message .= "<br />" . __( 'Posted:', 'post-by-email') . ' <a href="' . get_permalink( $post_ID ) . '">' . esc_html( $post_title ) . '</a>';
</del><ins>+ if( '' == $post_title ) {
+ $post_title = __( '(no title)', 'post-by-email' );
+ }
</ins><span class="cx">
</span><ins>+ $pending = '';
+ if( 'pending' == $post_status ) {
+ $pending = __( ' (pending)', 'post-by-email' );
+ }
+
+ $log_message .= "<br />" . __( 'Posted:', 'post-by-email') . ' <a href="' . get_permalink( $post_ID ) . '">' . esc_html( $post_title ) . '</a>' . $pending;
+
</ins><span class="cx"> } // end foreach
</span><span class="cx">
</span><span class="cx"> $this->save_log_message( $log_message );
</span><span class="lines">@@ -381,7 +389,7 @@
</span><span class="cx"> $connection->login();
</span><span class="cx"> }
</span><span class="cx"> catch( Horde_Imap_Client_Exception $e ) {
</span><del>- $this->save_log_message( __( 'An error occurred: ', 'post-by-email') . $e->getMessage() );
</del><ins>+ $this->save_error_message( __( 'An error occurred: ', 'post-by-email') . $e->getMessage() );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -412,7 +420,7 @@
</span><span class="cx"> $uids = $test['match'];
</span><span class="cx"> }
</span><span class="cx"> catch( Horde_Imap_Client_Exception $e ) {
</span><del>- $this->save_log_message( __( 'An error occurred: ', 'post-by-email' ) . $e->getMessage() );
</del><ins>+ $this->save_error_message( __( 'An error occurred: ', 'post-by-email' ) . $e->getMessage() );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return $uids;
</span><span class="lines">@@ -580,23 +588,40 @@
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx"> catch ( Horde_Imap_Client_Exception $e ) {
</span><del>- $this->save_log_message( __( 'An error occurred: ', 'post-by-email' ) . $e->getMessage() );
</del><ins>+ $this->save_error_message( __( 'An error occurred: ', 'post-by-email' ) . $e->getMessage() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Save an error message to the log file.
+ *
+ * @since 0.9.9
+ *
+ * @param string $message Error to save to the log.
+ */
+ protected function save_error_message( $message ) {
+ $this->save_log_message( $message, true );
+ }
+
+ /**
</ins><span class="cx"> * Save a message to the log file.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.9.9
</span><span class="cx"> *
</span><del>- * @param string $message Error message to save to the log.
</del><ins>+ * @param string $message Message to save to the log.
</ins><span class="cx"> */
</span><del>- protected function save_log_message( $message ) {
</del><ins>+ protected function save_log_message( $message, $error=false ) {
</ins><span class="cx"> $log = get_option( 'post_by_email_log', array() );
</span><span class="cx">
</span><span class="cx"> array_unshift( $log, array( 'timestamp'=>current_time( 'timestamp' ), 'message'=>$message ) );
</span><span class="cx">
</span><span class="cx"> update_option( 'post_by_email_log', $log );
</span><ins>+
+ if( $error ) {
+ $options = get_option( 'post_by_email_options' );
+ $options['status'] = 'error';
+ update_option( 'post_by_email_options', $options );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkpostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/post-by-email.php (2270 => 2271)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/post-by-email.php 2013-09-10 20:03:11 UTC (rev 2270)
+++ 2013/codebykat/post-by-email/trunk/post-by-email.php 2013-09-10 20:03:13 UTC (rev 2271)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> * Plugin Name: Post By Email
</span><span class="cx"> * Plugin URI: http://codebykat.wordpress.com
</span><span class="cx"> * Description: Create new posts on your WordPress blog by sending email to a specific email address.
</span><del>- * Version: 1.0.0
</del><ins>+ * Version: 1.0.1
</ins><span class="cx"> * Author: Kat Hagan
</span><span class="cx"> * Author URI: http://profiles.wordpress.org/codebykat
</span><span class="cx"> * Text Domain: post-by-email
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkreadmemd"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/readme.md (2270 => 2271)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/readme.md 2013-09-10 20:03:11 UTC (rev 2270)
+++ 2013/codebykat/post-by-email/trunk/readme.md 2013-09-10 20:03:13 UTC (rev 2271)
</span><span class="lines">@@ -39,6 +39,11 @@
</span><span class="cx">
</span><span class="cx"> ## Changelog ##
</span><span class="cx">
</span><ins>+### 1.0.1 ###
+* Added tabs and additional options to options panel.
+* Admin banners for notices & errors.
+* Plugin is now disabled until user has configured the settings.
+
</ins><span class="cx"> ### 1.0.0 ###
</span><span class="cx"> * Added SSL and IMAP support.
</span><span class="cx"> * Added option to mark emails "read" instead of deleting them after processing.
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkreadmetxt"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/readme.txt (2270 => 2271)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/readme.txt 2013-09-10 20:03:11 UTC (rev 2270)
+++ 2013/codebykat/post-by-email/trunk/readme.txt 2013-09-10 20:03:13 UTC (rev 2271)
</span><span class="lines">@@ -39,6 +39,11 @@
</span><span class="cx">
</span><span class="cx"> == Changelog ==
</span><span class="cx">
</span><ins>+= 1.0.1 =
+* Added tabs and additional options to options panel.
+* Admin banners for notices & errors.
+* Plugin is now disabled until user has configured the settings.
+
</ins><span class="cx"> = 1.0.0 =
</span><span class="cx"> * Added SSL and IMAP support.
</span><span class="cx"> * Added option to mark emails "read" instead of deleting them after processing.
</span></span></pre>
</div>
</div>
</body>
</html>