<!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>[2256] 2013/codebykat/post-by-email/trunk: moved log out into its own option, autoload false</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/2256">2256</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-06 08:00:18 +0000 (Fri, 06 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>moved log out into its own option, autoload false
added contextual help to settings page
properly checking ajax_referer nonce for clear_log</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 (2255 => 2256)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-04 05:46:42 UTC (rev 2255)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-06 08:00:18 UTC (rev 2256)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> * @param array $input Form fields submitted from the settings page.
</span><span class="cx"> */
</span><span class="cx"> public function post_by_email_validate($input) {
</span><del>- // load all the options so we don't wipe out the log
</del><ins>+ // load all the options so we don't wipe out pre-existing stuff
</ins><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><span class="cx">
</span><span class="cx"> $options['mailserver_url'] = trim( $input['mailserver_url'] );
</span><span class="lines">@@ -78,10 +78,6 @@
</span><span class="cx"> $options['default_email_category'] = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // TODO this is a hack because validate is getting called
- // when i call update_option from clear_log. need to figure out why.
- $options['log'] = $input['log'];
-
</del><span class="cx"> return $options;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,6 +94,11 @@
</span><span class="cx"> 'post-by-email',
</span><span class="cx"> array( $this, 'display_plugin_admin_page' )
</span><span class="cx"> );
</span><ins>+ WP_Screen::get($this->plugin_screen_hook_suffix)->add_help_tab( array(
+ 'id' => 'options-postemail',
+ 'title' => __( 'Post Via Email' ),
+ 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -115,11 +116,9 @@
</span><span class="cx"> * @since 0.9.9
</span><span class="cx"> */
</span><span class="cx"> public function clear_log() {
</span><del>- // TODO: check_ajax_referer()
</del><ins>+ check_ajax_referer( 'post-by-email-clear-log', 'security' );
</ins><span class="cx"> if( current_user_can( 'manage_options' ) ) {
</span><del>- $options = get_option( 'post_by_email_options' );
- $options['log'] = array();
- update_option( 'post_by_email_options', $options );
</del><ins>+ delete_option( 'post_by_email_log' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> die();
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2255 => 2256)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-04 05:46:42 UTC (rev 2255)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-06 08:00:18 UTC (rev 2256)
</span><span class="lines">@@ -418,20 +418,15 @@
</span><span class="cx"> * @since 0.9.9
</span><span class="cx"> *
</span><span class="cx"> * @param string $error Error message to save to the log.
</span><del>- * @param array $log The log file to save back to the plugin options.
</del><span class="cx"> */
</span><span class="cx"> protected function save_log_message( $message ) {
</span><del>- $options = get_option( 'post_by_email_options' );
</del><ins>+ $log = get_option( 'post_by_email_log', array() );
</ins><span class="cx">
</span><del>- $log = array();
- if( isset( $options['log'] ) ) {
- $log = $options['log'];
- }
-
</del><span class="cx"> array_unshift( $log, array( 'timestamp'=>current_time( 'timestamp' ), 'message'=>$message ) );
</span><span class="cx">
</span><del>- $options['log'] = $log;
- update_option( 'post_by_email_options', $options );
</del><ins>+ if( ! add_option( 'post_by_email_log', $log, '', 'no' ) ) {
+ update_option( 'post_by_email_log', $log );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkviewsadminphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/views/admin.php (2255 => 2256)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/views/admin.php 2013-09-04 05:46:42 UTC (rev 2255)
+++ 2013/codebykat/post-by-email/trunk/views/admin.php 2013-09-06 08:00:18 UTC (rev 2256)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Represents the view for the administration dashboard.
</del><ins>+ * The view for the administration dashboard.
</ins><span class="cx"> *
</span><del>- * This includes the header, options, and other information that should provide
- * The User Interface to the end user.
</del><ins>+ * This includes the options, log messages, and button to check for new mail.
</ins><span class="cx"> *
</span><span class="cx"> * @package PostByEmail
</span><span class="cx"> * @author Kat Hagan <kat@codebykat.com>
</span><span class="lines">@@ -96,6 +95,7 @@
</span><span class="cx"> <h3><?php _e( 'Activity Log', 'post-by-email' ) ?></h3>
</span><span class="cx"> <?php
</span><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><ins>+ $log = get_option( 'post_by_email_log' );
</ins><span class="cx"> ?>
</span><span class="cx"> <p>
</span><span class="cx"> <?php _e( 'Last checked for new mail:', 'post-by-email' ) ?>
</span><span class="lines">@@ -120,9 +120,8 @@
</span><span class="cx"> <?php _e( 'Check now', 'post-by-email' ) ?>
</span><span class="cx"> </a>
</span><span class="cx"> </p>
</span><ins>+ <?php if( $log && sizeof($log) > 0 ) : ?>
</ins><span class="cx">
</span><del>- <?php if( isset( $options['log'] ) && $options['log'] != array() ) : ?>
-
</del><span class="cx"> <p>
</span><span class="cx"> <a href="" id="clearLog" ><?php _e('Clear Log', 'post-by-email' ); ?></a>
</span><span class="cx">
</span><span class="lines">@@ -130,7 +129,8 @@
</span><span class="cx"> jQuery('a#clearLog').click(function(e) {
</span><span class="cx">
</span><span class="cx"> var data = {
</span><del>- action: 'post_by_email_clear_log'
</del><ins>+ action: 'post_by_email_clear_log',
+ security: '<?php echo wp_create_nonce("post-by-email-clear-log"); ?>'
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> jQuery.post(ajaxurl, data, function(response) {
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx"> <tbody>
</span><del>- <?php foreach( ($options['log']) as $entry ) : ?>
</del><ins>+ <?php foreach( $log as $entry ) : ?>
</ins><span class="cx"> <tr class="alternate">
</span><span class="cx"> <td><?php echo date_i18n( "$date_format, $time_format", $entry['timestamp'] ); ?></td>
</span><span class="cx"> <td><?php echo $entry['message']; ?></td>
</span></span></pre>
</div>
</div>
</body>
</html>