<!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>[2320] 2013/codebykat/post-by-email/trunk: fixed option validation and detection of unconfigured/error states</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/2320">2320</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-16 02:12:18 +0000 (Mon, 16 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixed option validation and detection of unconfigured/error states</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="#2013codebykatpostbyemailtrunkviewsadminphp">2013/codebykat/post-by-email/trunk/views/admin.php</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 (2319 => 2320)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-16 02:12:11 UTC (rev 2319)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-16 02:12:18 UTC (rev 2320)
</span><span class="lines">@@ -83,13 +83,10 @@
</span><span class="cx">
</span><span class="cx"> $default_options = Post_By_Email::$default_options;
</span><span class="cx">
</span><del>- $mailserver_url = trim( $input['mailserver_url'] );
- if ( $mailserver_url != $default_options['mailserver_url'] ) {
- $options['mailserver_url'] = $mailserver_url;
- }
</del><ins>+ $options['mailserver_url'] = trim( $input['mailserver_url'] );
</ins><span class="cx">
</span><span class="cx"> $mailserver_protocol = trim( $input['mailserver_protocol'] );
</span><del>- if ( in_array( $options['mailserver_protocol'], array( 'POP3', 'IMAP' ) ) ) {
</del><ins>+ if ( in_array( $mailserver_protocol, array( 'POP3', 'IMAP' ) ) ) {
</ins><span class="cx"> $options['mailserver_protocol'] = $mailserver_protocol;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -99,16 +96,9 @@
</span><span class="cx"> $options['mailserver_port'] = $mailserver_port;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $mailserver_login = trim( $input['mailserver_login'] );
- if ( $mailserver_login != $default_options['mailserver_login'] ) {
- $options['mailserver_login'] = $mailserver_login;
- }
</del><ins>+ $options['mailserver_login'] = trim( $input['mailserver_login'] );
+ $options['mailserver_pass'] = trim( $input['mailserver_pass'] );
</ins><span class="cx">
</span><del>- $mailserver_pass = trim( $input['mailserver_pass'] );
- if ( '' != $mailserver_pass ) {
- $options['mailserver_pass'] = $mailserver_pass;
- }
-
</del><span class="cx"> // default email category must be the ID of a real category
</span><span class="cx"> $default_email_category = $input['default_email_category'];
</span><span class="cx"> if ( get_category( $default_email_category ) ) {
</span><span class="lines">@@ -118,17 +108,31 @@
</span><span class="cx"> $options['ssl'] = isset( $input['ssl'] ) && '' != $input['ssl'];
</span><span class="cx"> $options['delete_messages'] = isset( $input['delete_messages'] ) && '' != $input['delete_messages'];
</span><span class="cx">
</span><del>- if ( $options['mailserver_url'] && $options['mailserver_port']
- && $options['mailserver_login'] && $options['mailserver_pass'] ) {
</del><ins>+ $options['pin_required'] = isset( $input['pin_required'] ) && '' != $input['pin_required'];
+ $options['pin'] = trim( $input['pin'] );
</ins><span class="cx">
</span><del>- // clear the transient and any error conditions if options have been updated
</del><ins>+ // this is ridiculous
+ if ( isset ( $input['status'] ) && in_array( $input['status'], array( 'unconfigured', 'error', '') ) ) {
+ // maintain saved state
+ $options['status'] = $input['status'];
+ }
+ elseif ( ( $options['mailserver_url'] == $default_options['mailserver_url'] )
+ || ( '' == $options['mailserver_url'] )
+ || ( $options['mailserver_login'] == $default_options['mailserver_login'] )
+ || ( '' == $options['mailserver_login'] )
+ || ( '' == $options['mailserver_pass'] )
+ || ( '' == $options['mailserver_port'] )
+ || ( '' == $options['mailserver_protocol' ] )
+ ) {
+ // detect if settings are blank or defaults
+ $options['status'] = 'unconfigured';
+ }
+ else {
+ // clear the transient and any error conditions if we have good options now
</ins><span class="cx"> delete_transient( 'mailserver_last_checked' );
</span><span class="cx"> $options['status'] = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $options['pin_required'] = isset( $input['pin_required'] ) && '' != $input['pin_required'];
- $options['pin'] = trim( $input['pin'] );
-
</del><span class="cx"> return $options;
</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 (2319 => 2320)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-16 02:12:11 UTC (rev 2319)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-16 02:12:18 UTC (rev 2320)
</span><span class="lines">@@ -235,15 +235,16 @@
</span><span class="cx"> set_transient( 'mailserver_last_checked', true, WP_MAIL_INTERVAL );
</span><span class="cx">
</span><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><del>- $options['last_checked'] = current_time( 'timestamp' );
- $options['status'] = '';
- update_option( 'post_by_email_options', $options );
</del><span class="cx">
</span><span class="cx"> // if options aren't set, there's nothing to do, move along
</span><span class="cx"> if ( 'unconfigured' == $options['status'] ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $options['last_checked'] = current_time( 'timestamp' );
+ $options['status'] = '';
+ update_option( 'post_by_email_options', $options );
+
</ins><span class="cx"> $this->connection = $this->open_mailbox_connection( $options );
</span><span class="cx">
</span><span class="cx"> if (! $this->connection ) {
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkviewsadminphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/views/admin.php (2319 => 2320)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/views/admin.php 2013-09-16 02:12:11 UTC (rev 2319)
+++ 2013/codebykat/post-by-email/trunk/views/admin.php 2013-09-16 02:12:18 UTC (rev 2320)
</span><span class="lines">@@ -241,7 +241,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>- <a href="<?php echo add_query_arg( 'check_mail', true ); ?>" class="button-secondary">
</del><ins>+ <a href="<?php echo add_query_arg( 'check_mail', true ); ?>" class="button-secondary"
+ <?php if ( 'unconfigured' == $options['status'] ) { echo 'disabled'; } ?> >
</ins><span class="cx"> <?php _e( 'Check now', 'post-by-email' ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </p>
</span></span></pre>
</div>
</div>
</body>
</html>