<!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>[8952] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php: Make/meetings: adapt the meeting_time shortcode so it can be used on all Make sites.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8952">8952</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8952","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-06-14 05:59:45 +0000 (Fri, 14 Jun 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Make/meetings: adapt the meeting_time shortcode so it can be used on all Make sites.
Adds several parameters so it can be used in a sidebar. For example, to list all meetings for the Meta team:
[meeting_time team="meta" before="" more=0 limit=-1 /]
See <a href="http://meta.trac.wordpress.org/ticket/3078">#3078</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgmeetingposttypewporgmeetingposttypephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgmeetingposttypewporgmeetingposttypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php 2019-06-13 22:32:34 UTC (rev 8951)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php 2019-06-14 05:59:45 UTC (rev 8952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => __( 'meetings', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_post_type( 'meeting', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_post_type( 'meeting', $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_meta_boxes() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,6 +427,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function meeting_time_shortcode( $attr, $content = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attr = shortcode_atts( array(
+ 'team' => null,
+ 'limit' => 1,
+ 'before' => __( 'Next meeting: ', 'wporg' ),
+ 'titletag' => 'strong',
+ 'more' => true,
+ ), $attr );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attr['team'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,15 +443,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attr['team'] = 'Docs';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! has_action( 'wp_footer', array( $this, 'time_conversion_script' ) ) ) {
+ add_action( 'wp_footer', array( $this, 'time_conversion_script' ), 999 );
+ }
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // meta query to eliminate expired meetings from query
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_meta_sql', function ($sql) {
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( "'CURDATE()'", 'CURDATE()', $sql );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_to_blog( get_main_site_id() );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'meeting',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nopaging' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'posts_per_page' => $attr['limit'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,25 +471,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $query->posts ) > 0 ) {
-
- $post = $query->posts[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out = '';
+ foreach ( $query->posts as $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $next_meeting_datestring = $post->next_date;
</span><span class="cx" style="display: block; padding: 0 10px"> $utc_time = strftime( '%H:%M:%S', strtotime( $post->time ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_meeting_iso = $next_meeting_datestring . 'T' . $utc_time . '+00:00';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $next_meeeting_timestamp = strtotime( $next_meeting_datestring . $utc_time );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $next_meeting_timestamp = strtotime( $next_meeting_datestring . ' '. $utc_time );
+ $next_meeting_display = strftime( '%c %Z', $next_meeting_timestamp );
+
+ $slack_channel = null;
+ if ( $post->location && preg_match( '/^#([-\w]+)$/', trim( $post->location ), $match ) ) {
+ $slack_channel = sanitize_title( $match[1] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out = '<p>';
- $out .= 'Next meeting: ' . __( $post->post_title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out .= '<p>';
+ $out .= esc_html( $attr['before'] );
+ $out .= '<strong class="meeting-title">' . esc_html( $post->post_title ) . '</strong>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $display_count = count( $query->posts ) - 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_count ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $attr['more'] ) {
+ $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_count ) . '</a>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $out .= '</br>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out .= '<time class="date" date-time="' . esc_attr( $next_meeting_iso ) . '" title="' . esc_attr( $next_meeting_iso ) . '">' . $next_meeting_iso . '</time> ';
- $out .= sprintf( __( '(%s from now)' ), human_time_diff( $next_meeeting_timestamp, current_time('timestamp') ) );
- $out .= empty( $post->location ) ? '' : ' ' . sprintf( __('at %s on Slack'), $post->location );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out .= '<time class="date" date-time="' . esc_attr( $next_meeting_iso ) . '" title="' . esc_attr( $next_meeting_iso ) . '">' . $next_meeting_display . '</time> ';
+ $out .= sprintf( esc_html__( '(%s from now)' ), human_time_diff( $next_meeting_timestamp, current_time('timestamp') ) );
+ if ( $post->location && $slack_channel ) {
+ $out .= ' ' . sprintf( wp_kses( __('at <a href="%s">%s</a> on Slack'), array( 'a' => array( 'href' => array() ) ) ), 'https://wordpress.slack.com/messages/' . $slack_channel, $post->location );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $out .= '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restore_current_blog();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,6 +546,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function time_conversion_script() {
+ echo <<<EOF
+<script type="text/javascript">
+
+ var parse_date = function (text) {
+ var m = /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\+00:00$/.exec(text);
+ var d = new Date();
+ d.setUTCFullYear(+m[1]);
+ d.setUTCDate(+m[3]);
+ d.setUTCMonth(+m[2]-1);
+ d.setUTCHours(+m[4]);
+ d.setUTCMinutes(+m[5]);
+ d.setUTCSeconds(+m[6]);
+ return d;
+ }
+ var format_time = function (d) {
+ return d.toLocaleTimeString(navigator.language, {weekday: 'long', hour: '2-digit', minute: '2-digit', timeZoneName: 'short'});
+ }
+
+ var nodes = document.getElementsByTagName('time');
+ for (var i=0; i<nodes.length; ++i) {
+ var node = nodes[i];
+ if (node.className === 'date') {
+ var d = parse_date(node.getAttribute('date-time'));
+ if (d) {
+ node.textContent = format_time(d);
+ }
+ }
+ }
+</script>
+EOF;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // fire it up
</span></span></pre>
</div>
</div>
</body>
</html>