<!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>[2324] 2013/codebykat/post-by-email/trunk/class-post-by-email.php: add shortcode to support custom taxonomy terms</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/2324">2324</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-16 02:12:41 +0000 (Mon, 16 Sep 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>add shortcode to support custom taxonomy terms</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailphp">2013/codebykat/post-by-email/trunk/class-post-by-email.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2323 => 2324)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php       2013-09-16 02:12:34 UTC (rev 2323)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php  2013-09-16 02:12:41 UTC (rev 2324)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">                  }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-                       /* categories */
</del><ins>+                        /* shortcode: categories. [category cat1 cat2...] */
</ins><span class="cx"> 
</span><span class="cx">                  $shortcode_categories = $this->find_shortcode( 'category', $post_content );
</span><span class="cx">                  $post_category = array();
</span><span class="lines">@@ -356,10 +356,11 @@
</span><span class="cx">                          }
</span><span class="cx">                  }
</span><span class="cx"> 
</span><del>-                       /* get tags from shortcode */
</del><ins>+                        /* shortcode: tags. [tag tag1 tag2...] */
+
</ins><span class="cx">                   $tags_input = $this->find_shortcode( 'tag', $post_content );
</span><span class="cx"> 
</span><del>-
</del><ins>+                        $original_post_content = $post_content;
</ins><span class="cx">                   $post_content = $this->filter_valid_shortcodes( $post_content );
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -380,6 +381,28 @@
</span><span class="cx">                  // save original message sender as post_meta, in case we want it later
</span><span class="cx">                  add_post_meta( $post_ID, 'original_author', $from_email );
</span><span class="cx"> 
</span><ins>+
+                       /* shortcode: custom taxonomies.  [taxname term1 term2 ...] */
+                       $tax_input = array();
+
+                       // get all registered custom taxonomies
+                       $args = array(
+                               'public'   => true,
+                               '_builtin' => false
+                       );
+                       $registered_taxonomies = get_taxonomies( $args, 'names', 'and' ); 
+
+                       if ( $registered_taxonomies ) {
+                               foreach ( $registered_taxonomies as $taxonomy_name ) {
+                                       $tax_shortcodes = $this->find_shortcode( $taxonomy_name, $original_post_content );
+                                       if ( count( $tax_shortcodes ) > 0 ) {
+                                               // pending bug fix: http://core.trac.wordpress.org/ticket/19373
+                                               //$tax_input[] = array( $taxonomy_name => $tax_shortcodes );
+                                               wp_set_post_terms( $post_ID, $tax_shortcodes, $taxonomy_name );
+                                       }
+                               }
+                       }
+
</ins><span class="cx">                   /* attachments */
</span><span class="cx">                  $attachment_count = $this->save_attachments( $uid, $post_ID );
</span><span class="cx">                  if ( $attachment_count > 0 ) {
</span><span class="lines">@@ -767,7 +790,22 @@
</span><span class="cx">   * @return   string    $text         Filtered text
</span><span class="cx">   */
</span><span class="cx">  protected function filter_valid_shortcodes( $text ) {
</span><del>-               foreach ( array( 'tag', 'category', 'pin' ) as $shortcode ) {
</del><ins>+                $valid_shortcodes = array( 'tag', 'category', 'pin' );
+
+               // get all registered custom taxonomies
+               $args = array(
+                       'public'   => true,
+                       '_builtin' => false
+               );
+               $registered_taxonomies = get_taxonomies( $args, 'names', 'and' );
+
+               if ( $registered_taxonomies ) {
+                       foreach ( $registered_taxonomies as $taxonomy ) {
+                               $valid_shortcodes[] = $taxonomy;
+                       }
+               }
+
+               foreach ( $valid_shortcodes as $shortcode ) {
</ins><span class="cx">                   $text = preg_replace( "/\[$shortcode\s(.*?)\]/i", '', $text );        
</span><span class="cx">          }
</span><span class="cx">          return $text;
</span></span></pre>
</div>
</div>

</body>
</html>