<!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>[2025] sites/trunk/common/includes/slack/trac/comment-handler.php: Slack: Fix whitespace and indentation in the comment handler.</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" 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/2025">2025</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/2025","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-01 21:19:58 +0000 (Sun, 01 Nov 2015)</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'>Slack: Fix whitespace and indentation in the comment handler.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludesslacktraccommenthandlerphp">sites/trunk/common/includes/slack/trac/comment-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkcommonincludesslacktraccommenthandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/slack/trac/comment-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/trac/comment-handler.php 2015-11-01 20:39:57 UTC (rev 2024)
+++ sites/trunk/common/includes/slack/trac/comment-handler.php 2015-11-01 21:19:58 UTC (rev 2025)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function process_message() {
</span><span class="cx" style="display: block; padding: 0 10px"> $lines = array_map( 'rtrim', $this->lines );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Trim off headers.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $lines && '' !== current( $lines ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $line = array_shift( $lines );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,23 +38,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list( , $comment_url ) = explode( ': ', $line );
</span><span class="cx" style="display: block; padding: 0 10px"> list( $ticket_url, $comment_id ) = explode( '#comment:', $comment_url );
</span><span class="cx" style="display: block; padding: 0 10px"> list( $trac_url, $ticket_id ) = explode( '/ticket/', $ticket_url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $trac = Trac::get( $trac_url );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $trac ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 0 === strpos( $line, 'Content-Transfer-Encoding: base64' ) ) {
- $base64 = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 === strpos( $line, 'Content-Transfer-Encoding: base64' ) ) {
+ $base64 = true;
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $base64 ) ) {
- $lines = explode( "\n", base64_decode( implode( "\n", $lines ) ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $base64 ) ) {
+ $lines = explode( "\n", base64_decode( implode( "\n", $lines ) ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove empty line between headers and body.
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $lines );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = '';
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $lines && 0 !== strpos( current( $lines ), '------' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $title ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,12 +79,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove bottom border of table.
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $lines );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove empty line if present. (It is when it's a comment without changes.)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current( $lines ) === '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $lines );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove Trac email footer.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $lines && end( $lines ) !== '--' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $lines );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,26 +93,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $lines );
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove empty line before footer.
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $lines );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match( '/^(Comment|Changes) \(by (.*)\):$/', array_shift( $lines ), $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_changes = $matches[1] === 'Changes';
</span><span class="cx" style="display: block; padding: 0 10px"> $author = $matches[2];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove blank line after 'Comment|Changes (by author):'
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $lines );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $changes = $comment = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $has_changes ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $lines && '' !== current( $lines ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $changes[] = preg_replace( '~^ \* (.*?): ~', '_*$1:*_ ', array_shift( $lines ) );
</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">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove blank lines (should be two if it had changes).
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $lines && '' === current( $lines ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $lines );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Next line should start with 'Comment' if there is one.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $has_changes && 0 === strpos( current( $lines ), 'Comment' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $lines ); // Remove 'Comment'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function generate_payload() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->send->set_icon( $this->trac->get_icon() );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->send->set_username( $this->trac->get_ticket_username() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment = $this->format_comment_for_slack();
</span><span class="cx" style="display: block; padding: 0 10px"> $main_attachment = $this->changes ? implode( "\n", $this->changes ) : $comment;
</span><span class="cx" style="display: block; padding: 0 10px"> $pretext = sprintf( '*%s updated <%s|#%s %s>*', $this->author, $this->comment_url, $this->ticket_id, htmlspecialchars( $this->title, ENT_NOQUOTES ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'mrkdwn_in' => array( 'pretext', 'fallback', 'text' ),
</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">- // Ensure the comment uses a darker gray color, even when alone.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ensure the comment uses a darker gray color, even when alone.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->changes ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment['color'] = '#999';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>