<!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>[2315] 2013/codebykat/post-by-email/trunk: switched manual check to a trigger for do_action and disabled wp-mail.php entirely</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/2315">2315</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-16 02:11:13 +0000 (Mon, 16 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>switched manual check to a trigger for do_action and disabled wp-mail.php entirely</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 (2314 => 2315)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-16 02:11:06 UTC (rev 2314)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-16 02:11:13 UTC (rev 2315)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx"> add_action( 'admin_notices', array( $this, 'admin_notices' ) );
</span><span class="cx">
</span><span class="cx"> add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
</span><ins>+
+ // allow for manual trigger of the wp-mail.php action hook
+ add_action( 'admin_init', array( $this, 'maybe_check_mail' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -57,6 +60,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Initiate manual check for new mail.
+ *
+ * @since 1.0.3
+ */
+ public function maybe_check_mail() {
+ if ( isset( $_GET['check_mail'] ) ) {
+ do_action( 'wp-mail.php' );
+ }
+ }
+
+ /**
</ins><span class="cx"> * Validate saved options.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.9.5
</span><span class="lines">@@ -168,7 +182,7 @@
</span><span class="cx"> */
</span><span class="cx"> public function admin_notices() {
</span><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><del>- $settings_url = admin_url( 'tools.php?page=post-by-email' );
</del><ins>+ $settings_url = add_query_arg( 'page', 'post-by-email', admin_url( 'tools.php' ) );
</ins><span class="cx"> if ( ! $options || ! isset( $options['status'] ) || 'unconfigured' == $options['status'] ) {
</span><span class="cx"> echo "<div class='error'><p>";
</span><span class="cx"> _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' );
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2314 => 2315)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-16 02:11:06 UTC (rev 2314)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-16 02:11:13 UTC (rev 2315)
</span><span class="lines">@@ -110,6 +110,9 @@
</span><span class="cx"> // add hooks to check for mail
</span><span class="cx"> add_action( 'wp-mail.php', array( $this, 'manual_check_email' ) );
</span><span class="cx"> add_action( 'post-by-email-wp-mail.php', array( $this, 'check_email' ) );
</span><ins>+
+ // disable wp-mail.php
+ add_filter( 'enable_post_by_email_configuration', '__return_false' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -207,7 +210,8 @@
</span><span class="cx">
</span><span class="cx"> $this->check_email();
</span><span class="cx">
</span><del>- wp_safe_redirect( admin_url( 'tools.php?page=post-by-email&tab=log' ) );
</del><ins>+ $args = array( 'page' => 'post-by-email', 'tab' => 'log' );
+ wp_safe_redirect( add_query_arg( $args, admin_url( 'tools.php' ) ) );
</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 (2314 => 2315)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/views/admin.php 2013-09-16 02:11:06 UTC (rev 2314)
+++ 2013/codebykat/post-by-email/trunk/views/admin.php 2013-09-16 02:11:13 UTC (rev 2315)
</span><span class="lines">@@ -25,16 +25,16 @@
</span><span class="cx"> <?php $tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'main'; ?>
</span><span class="cx">
</span><span class="cx"> <h2 class="nav-tab-wrapper">
</span><del>- <a id="nav-main" href="<?php echo admin_url('tools.php?page='.$_GET['page']); ?>" class="nav-tab <?php if ( 'main' == $tab ) { echo 'nav-tab-active'; } ?>">
</del><ins>+ <a id="nav-main" href="<?php echo add_query_arg( 'tab', false ); ?>" class="nav-tab <?php if ( 'main' == $tab ) { echo 'nav-tab-active'; } ?>">
</ins><span class="cx"> <?php _e( 'Basic Settings', 'post-by-email' ); ?>
</span><span class="cx"> </a>
</span><del>- <a id="nav-connection" href="<?php echo admin_url('tools.php?page='.$_GET['page'].'&tab=connection'); ?>" class="nav-tab <?php if ( 'connection' == $tab ) { echo 'nav-tab-active'; } ?>">
</del><ins>+ <a id="nav-connection" href="<?php echo add_query_arg( 'tab', 'connection' ); ?>" class="nav-tab <?php if ( 'connection' == $tab ) { echo 'nav-tab-active'; } ?>">
</ins><span class="cx"> <?php _e( 'Mailbox Details', 'post-by-email' ); ?>
</span><span class="cx"> </a>
</span><del>- <a id="nav-security" href="<?php echo admin_url('tools.php?page='.$_GET['page'].'&tab=security'); ?>" class="nav-tab <?php if ( 'security' == $tab ) { echo 'nav-tab-active'; } ?>">
</del><ins>+ <a id="nav-security" href="<?php echo add_query_arg( 'tab', 'security' ); ?>" class="nav-tab <?php if ( 'security' == $tab ) { echo 'nav-tab-active'; } ?>">
</ins><span class="cx"> <?php _e( 'Security', 'post-by-email' ); ?>
</span><span class="cx"> </a>
</span><del>- <a id="nav-log" href="<?php echo admin_url('tools.php?page='.$_GET['page'].'&tab=log'); ?>" class="nav-tab <?php if ( 'log' == $tab ) { echo 'nav-tab-active'; } ?>">
</del><ins>+ <a id="nav-log" href="<?php echo add_query_arg( 'tab', 'log' ); ?>" class="nav-tab <?php if ( 'log' == $tab ) { echo 'nav-tab-active'; } ?>">
</ins><span class="cx"> <?php _e( 'Activity Log', 'post-by-email' ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </h2>
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>- <a href="<?php echo site_url( 'wp-mail.php' ); ?>" class="button-secondary">
</del><ins>+ <a href="<?php echo add_query_arg( 'check_mail', true ); ?>" class="button-secondary">
</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>