<!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>[118] sites/trunk/wordpress.org/public_html/wp-content/plugins/p2-new-post-categories/p2-new-post-categories.php: New version of p2 plugin for make/community.</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://meta.trac.wordpress.org/changeset/118">118</a></dd>
<dt>Author</dt> <dd>Otto42</dd>
<dt>Date</dt> <dd>2013-11-14 19:44:26 +0000 (Thu, 14 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>New version of p2 plugin for make/community. props iandunn. see <a href="http://meta.trac.wordpress.org/ticket/187">#187</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsp2newpostcategoriesp2newpostcategoriesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/p2-new-post-categories/p2-new-post-categories.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsp2newpostcategoriesp2newpostcategoriesphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/p2-new-post-categories/p2-new-post-categories.php (117 => 118)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/p2-new-post-categories/p2-new-post-categories.php 2013-11-11 22:57:48 UTC (rev 117)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/p2-new-post-categories/p2-new-post-categories.php 2013-11-14 19:44:26 UTC (rev 118)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> /*
</span><span class="cx"> Plugin Name: P2 New Post Categories
</span><span class="cx"> Description: Adds a category dropdown to P2s new post form.
</span><del>-Version: 0.1
</del><ins>+Version: 0.2
</ins><span class="cx"> License: GPLv2 or Later
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -12,20 +12,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class P2NewPostCategories {
</span><del>- protected $new_category;
- const VERSION = '0.1';
- const REGEX_CATEGORY_IN_TAG_LIST = '/\[category=(.*)\]/i';
</del><ins>+ const VERSION = '0.2';
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Register hook callbacks
</span><span class="cx"> */
</span><span class="cx"> public function __construct() {
</span><del>- add_action( 'wp_head', array( $this, 'print_css' ) );
- add_action( 'wp_footer', array( $this, 'print_javascript' ) );
</del><ins>+ add_action( 'wp_head', array( $this, 'print_css' ) );
+ add_action( 'wp_footer', array( $this, 'print_javascript' ) );
</ins><span class="cx">
</span><del>- add_action( 'p2_post_form', array( $this, 'add_new_post_category_dropdown' ) );
- add_action( 'p2_ajax', array( $this, 'parse_new_post_category' ) );
- add_action( 'wp_insert_post', array( $this, 'assign_new_post_to_category' ) );
</del><ins>+ add_action( 'p2_post_form', array( $this, 'add_new_post_category_dropdown' ) );
+ add_action( 'wp_ajax_p2npc_assign_category', array( $this, 'assign_category_to_post' ) );
+ add_action( 'wp_ajax_nopriv_p2npc_assign_category', array( $this, 'assign_category_to_post' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -68,34 +66,30 @@
</span><span class="cx"> * Initialization
</span><span class="cx"> */
</span><span class="cx"> construct : function() {
</span><del>- $( '#p2-new-post-category' ).change( this.appendCategoryToTagList );
</del><ins>+ P2NewPostCategories.dropdown = $( '#p2-new-post-category' );
+ P2NewPostCategories.dropdown_default = P2NewPostCategories.dropdown.val();
+
+ $( document ).on( 'p2_new_post_submit_success', P2NewPostCategories.new_post );
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- /*
- * Adds the name of the selected category to the #tags input field
- * See the comments in parse_new_post_category() for details.
</del><ins>+ /**
+ * Assign the selected category to the new post
+ * @param object event
+ * @param object data
</ins><span class="cx"> */
</span><del>- appendCategoryToTagList : function( event ) {
- var optionalComma = '',
- tags = $( '#tags' ).val(),
- category = $( this ).children( 'option:selected' ).text();
</del><ins>+ new_post : function( event, data ) {
+ $.post(
+ ajaxUrl.replace( '?p2ajax=true', '' ), {
+ 'action' : 'p2npc_assign_category',
+ 'post_id' : parseInt( data.post_id ),
+ 'category_id' : parseInt( P2NewPostCategories.dropdown.val() ),
+ 'p2npc_assign_category_nonce' : $( '#p2npc_assign_category_nonce' ).val()
+ }
+ );
</ins><span class="cx">
</span><del>- tags = tags.replace( /Tag it,?/, '' ).replace( /,?\[category=(.*)\]/, '' );
- if ( tags.length > 0 && ',' != tags.slice( -1 ) ) {
- optionalComma = ',';
- }
-
- if ( 'Uncategorized' != category ) {
- tags += optionalComma + '[category=' + category + ']';
- }
-
- if ( ',' == tags.substring( 0, 1 ) ) {
- tags = tags.substring( 1, tags.length );
- }
-
- $( '#tags' ).val( tags );
</del><ins>+ P2NewPostCategories.dropdown.val( parseInt( P2NewPostCategories.dropdown_default ) ).change();
</ins><span class="cx"> }
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> P2NewPostCategories.construct();
</span><span class="cx">
</span><span class="lines">@@ -115,30 +109,28 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> wp_dropdown_categories( $params );
</span><ins>+ wp_nonce_field( 'p2npc_assign_category', 'p2npc_assign_category_nonce' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Since we can't hook into p2.posts.submit() and add a category parameter to the $.ajax() call,
- * we append the category to the tags list and then parse it out before P2 processes it.
</del><ins>+ * Assign a category to a post
+ * This is an AJAX handler.
</ins><span class="cx"> */
</span><del>- public function parse_new_post_category( $action ) {
- if ( 'new_post' == $action ) {
- if ( preg_match( self::REGEX_CATEGORY_IN_TAG_LIST, $_POST['tags'], $matches ) ) {
- $this->new_category = get_term_by( 'name', $matches[1], 'category' );
- $_POST['tags'] = preg_replace( self::REGEX_CATEGORY_IN_TAG_LIST, '', $_POST['tags'] );
- }
</del><ins>+ public function assign_category_to_post() {
+ $assigned = false;
+ $post_id = absint( $_REQUEST['post_id'] );
+ $category_id = absint( $_REQUEST['category_id'] );
+
+ check_ajax_referer( 'p2npc_assign_category', 'p2npc_assign_category_nonce' );
+
+ if ( current_user_can( 'edit_post', $post_id ) ) {
+ $assigned = wp_set_object_terms( $post_id, $category_id, 'category' );
+ $assigned = is_array( $assigned ) && ! empty( $assigned );
</ins><span class="cx"> }
</span><ins>+
+ wp_die( $assigned );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- /*
- * When the new post is being saved, we assign the category that we parsed out in parse_new_post_category()
- */
- public function assign_new_post_to_category( $post_id ) {
- if ( isset( $this->new_category->term_id ) && $this->new_category->term_id ) {
- wp_set_object_terms( $post_id, $this->new_category->slug, 'category' );
- }
- }
-
</del><span class="cx"> } // end P2NewPostCategories
</span><span class="cx">
</span><span class="cx"> $GLOBALS['P2NewPostCategories'] = new P2NewPostCategories();
</span></span></pre>
</div>
</div>
</body>
</html>