<!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>[2235] 2013/codebykat/post-by-email/trunk: refactored admin stuff into its own class</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/2235">2235</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-08-26 05:10:26 +0000 (Mon, 26 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>refactored admin stuff into its own class</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="#2013codebykatpostbyemailtrunkpostbyemailphp">2013/codebykat/post-by-email/trunk/post-by-email.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkreadmetxt">2013/codebykat/post-by-email/trunk/readme.txt</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailadminphp">2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailadminphp"></a>
<div class="addfile"><h4>Added: 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php (0 => 2235)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php (rev 0)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-08-26 05:10:26 UTC (rev 2235)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+<?php
+/**
+ * Plugin admin class.
+ *
+ * @package PostByEmail
+ * @author Kat Hagan <kat@codebykat.com>
+ */
+class Post_By_Email_Admin {
+ protected static $instance = null;
+
+ private function __construct() {
+ // Add the options page and menu item.
+ add_action( 'admin_init', array( $this, 'add_plugin_settings' ) );
+ add_action( 'admin_menu', array( $this, 'add_plugin_admin_menu' ) );
+
+ // disable post by email settings on Settings->Writing page
+ add_filter( 'enable_post_by_email_configuration', '__return_false' );
+ }
+
+ public static function get_instance() {
+
+ // If the single instance hasn't been set, set it now.
+ if ( null == self::$instance ) {
+ self::$instance = new self;
+ }
+
+ return self::$instance;
+ }
+
+ /**
+ * Register the settings.
+ *
+ * @since 0.9.0
+ */
+ public function add_plugin_settings() {
+ register_setting( 'post_by_email_options', 'post_by_email_options', array( $this, 'post_by_email_validate' ) );
+ }
+
+ public function post_by_email_validate($input) {
+ // load all the options so we don't wipe out the log
+ $options = get_option( 'post_by_email_options' );
+
+ $options['mailserver_url'] = trim( $input['mailserver_url'] );
+
+ // port must be numeric and 16 digits max
+ $options['mailserver_port'] = trim( $input['mailserver_port'] );
+ if( ! preg_match('/^[1-9][0-9]{0,15}$/', $options['mailserver_port'] ) ) {
+ $options['mailserver_port'] = '';
+ }
+
+ $options['mailserver_login'] = trim( $input['mailserver_login'] );
+ $options['mailserver_pass'] = trim( $input['mailserver_pass'] );
+
+ // default email category must be the ID of a real category
+ $options['default_email_category'] = $input['default_email_category'];
+ if( ! get_category( $options['default_email_category'] ) ) {
+ $options['default_email_category'] = '';
+ }
+
+ return $options;
+ }
+
+ /**
+ * Register the administration menu for this plugin into the WordPress Dashboard menu.
+ *
+ * @since 0.9.0
+ */
+ public function add_plugin_admin_menu() {
+ $this->plugin_screen_hook_suffix = add_management_page(
+ __( 'Post By Email', 'post-by-email' ),
+ __( 'Post By Email', 'post-by-email' ),
+ 'read',
+ 'post-by-email',
+ array( $this, 'display_plugin_admin_page' )
+ );
+ }
+
+ /**
+ * Render the settings page for this plugin.
+ *
+ * @since 0.9.0
+ */
+ public function display_plugin_admin_page() {
+ include_once( plugin_dir_path( __FILE__ ) . 'views/admin.php' );
+ }
+
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2234 => 2235)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-08-26 04:04:00 UTC (rev 2234)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-08-26 05:10:26 UTC (rev 2235)
</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 = '0.9.5';
</del><ins>+ protected $version = '0.9.6';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Unique identifier for your plugin.
</span><span class="lines">@@ -56,16 +56,8 @@
</span><span class="cx"> // Load plugin text domain
</span><span class="cx"> add_action( 'plugins_loaded', array( $this, 'load_plugin_textdomain' ) );
</span><span class="cx">
</span><del>- // Add the options page and menu item.
- add_action( 'admin_init', array( $this, 'add_plugin_settings' ) );
- add_action( 'admin_menu', array( $this, 'add_plugin_admin_menu' ) );
-
</del><span class="cx"> // add hook to check for mail
</span><span class="cx"> add_action( 'wp-mail.php', array( 'Post_By_Email', 'check_email' ) );
</span><del>-
- // disable post by email settings on Settings->Writing page
- // NOTE: this requires the check be removed from wp-mail.php
- add_filter( 'enable_post_by_email_configuration', '__return_false' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -133,64 +125,8 @@
</span><span class="cx"> load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * Register the settings.
- *
- * @since 0.9.0
- */
- public function add_plugin_settings() {
- register_setting( 'post_by_email_options', 'post_by_email_options', array( $this, 'post_by_email_validate' ) );
- }
</del><span class="cx">
</span><del>- public function post_by_email_validate($input) {
- // load all the options so we don't wipe out the log
- $options = get_option( 'post_by_email_options' );
-
- $options['mailserver_url'] = trim( $input['mailserver_url'] );
-
- // port must be numeric and 16 digits max
- $options['mailserver_port'] = trim( $input['mailserver_port'] );
- if( ! preg_match('/^[1-9][0-9]{0,15}$/', $options['mailserver_port'] ) ) {
- $options['mailserver_port'] = '';
- }
-
- $options['mailserver_login'] = trim( $input['mailserver_login'] );
- $options['mailserver_pass'] = trim( $input['mailserver_pass'] );
-
- // default email category must be the ID of a real category
- $options['default_email_category'] = $input['default_email_category'];
- if( ! get_category( $options['default_email_category'] ) ) {
- $options['default_email_category'] = '';
- }
-
- return $options;
- }
-
</del><span class="cx"> /**
</span><del>- * Register the administration menu for this plugin into the WordPress Dashboard menu.
- *
- * @since 0.9.0
- */
- public function add_plugin_admin_menu() {
- $this->plugin_screen_hook_suffix = add_management_page(
- __( 'Post By Email', 'post-by-email' ),
- __( 'Post By Email', 'post-by-email' ),
- 'read',
- $this->plugin_slug,
- array( $this, 'display_plugin_admin_page' )
- );
- }
-
- /**
- * Render the settings page for this plugin.
- *
- * @since 0.9.0
- */
- public function display_plugin_admin_page() {
- include_once( plugin_dir_path( __FILE__ ) . 'views/admin.php' );
- }
-
- /**
</del><span class="cx"> * Check for new messages and post them to the blog.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.9.0
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkpostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/post-by-email.php (2234 => 2235)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/post-by-email.php 2013-08-26 04:04:00 UTC (rev 2234)
+++ 2013/codebykat/post-by-email/trunk/post-by-email.php 2013-08-26 05:10:26 UTC (rev 2235)
</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: Gets email messages from the user's mailbox to add as WordPress posts.
</span><del>- * Version: 0.9.5
</del><ins>+ * Version: 0.9.6
</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 class="lines">@@ -41,4 +41,9 @@
</span><span class="cx">
</span><span class="cx"> register_activation_hook( __FILE__, array( 'Post_By_Email', 'activate' ) );
</span><span class="cx">
</span><ins>+if( is_admin() ) {
+ require_once( plugin_dir_path( __FILE__ ) . 'class-post-by-email-admin.php' );
+ Post_By_Email_Admin::get_instance();
+}
+
</ins><span class="cx"> Post_By_Email::get_instance();
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkreadmetxt"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/readme.txt (2234 => 2235)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/readme.txt 2013-08-26 04:04:00 UTC (rev 2234)
+++ 2013/codebykat/post-by-email/trunk/readme.txt 2013-08-26 05:10:26 UTC (rev 2235)
</span><span class="lines">@@ -20,6 +20,10 @@
</span><span class="cx">
</span><span class="cx"> == Changelog ==
</span><span class="cx">
</span><ins>+= 0.9.6 =
+* Added workarounds to support PHP 5.2.
+* Moved admin functions into a separate class.
+
</ins><span class="cx"> = 0.9.5 =
</span><span class="cx"> * Using Horde IMAP library instead of old SquirrelMail class (still assumes POP3 server). This fixes a
</span><span class="cx"> bug where post content was blank, and also lays some groundwork for later SSL/IMAP support.
</span></span></pre>
</div>
</div>
</body>
</html>