Changeset 2025

Timestamp:

11/01/2015 09:19:58 PM (11 years ago)

Author:

ocean90

Message:

Slack: Fix whitespace and indentation in the comment handler.

File:

• sites/trunk/common/includes/slack/trac/comment-handler.php (modified) (8 diffs)

sites/trunk/common/includes/slack/trac/comment-handler.php

@@ -30 +30 @@
         function process_message() {
                 $lines = array_map( 'rtrim', $this->lines );
-                
+
                 // Trim off headers.
                 while ( $lines && '' !== current( $lines ) ) {
@@ -39 +39 @@
                                 list( $ticket_url, $comment_id ) = explode( '#comment:', $comment_url );
                                 list( $trac_url, $ticket_id ) = explode( '/ticket/', $ticket_url );
-        
+
                                 $trac = Trac::get( $trac_url );
                                 if ( ! $trac ) {
                                         return false;
                                 }
-                        } elseif ( 0 === strpos( $line, 'Content-Transfer-Encoding: base64' ) ) {
-                                $base64 = true;
+                        } elseif ( 0 === strpos( $line, 'Content-Transfer-Encoding: base64' ) ) {
+                                $base64 = true;
                         }
                 }
 
-                if ( ! empty( $base64 ) ) {
-                        $lines = explode( "\n", base64_decode( implode( "\n", $lines ) ) );
-                }
+                if ( ! empty( $base64 ) ) {
+                        $lines = explode( "\n", base64_decode( implode( "\n", $lines ) ) );
+                }
 
                 // Remove empty line between headers and body.
                 array_shift( $lines );
-                
+
                 $title = '';
                 while ( $lines && 0 !== strpos( current( $lines ), '------' ) ) {
@@ -80 +80 @@
                 // Remove bottom border of table.
                 array_shift( $lines );
-                
+
                 // Remove empty line if present. (It is when it's a comment without changes.)
                 if ( current( $lines ) === '' ) {
                         array_shift( $lines );
                 }
-                
+
                 // Remove Trac email footer.
                 while ( $lines && end( $lines ) !== '--' ) {
@@ -94 +94 @@
                 // Remove empty line before footer.
                 array_pop( $lines );
-                
+
                 preg_match( '/^(Comment|Changes) \(by (.*)\):$/', array_shift( $lines ), $matches );
                 $has_changes = $matches[1] === 'Changes';
@@ -101 +101 @@
                 // Remove blank line after 'Comment|Changes (by author):'
                 array_shift( $lines );
-                
+
                 $changes = $comment = array();
                 if ( $has_changes ) {
@@ -108 +108 @@
                         }
                 }
-                
+
                 // Remove blank lines (should be two if it had changes).
                 while ( $lines && '' === current( $lines ) ) {
                         array_shift( $lines );
                 }
-                
+
                 // Next line should start with 'Comment' if there is one.
                 if ( $has_changes && 0 === strpos( current( $lines ), 'Comment' ) ) {
@@ -151 +151 @@
                 $this->send->set_icon( $this->trac->get_icon() );
                 $this->send->set_username( $this->trac->get_ticket_username() );
-                        
+
                 $comment         = $this->format_comment_for_slack();
                 $main_attachment = $this->changes ? implode( "\n", $this->changes ) : $comment;
@@ -164 +164 @@
                 );
 
-                // Ensure the comment uses a darker gray color, even when alone.        
+                // Ensure the comment uses a darker gray color, even when alone.
                 if ( ! $this->changes ) {
                         $attachment['color'] = '#999';