Changeset 3139434

Timestamp:

08/22/2024 05:47:25 AM (19 months ago)

Author:

mdawaffe

Message:

Simplify diff generation.

Some extra escaping.

Location:

email-post-changes/trunk

Files:

• class.email-post-changes.php (modified) (7 diffs)
• email-post-changes.php (modified) (1 diff)

email-post-changes/trunk/class.email-post-changes.php

@@ -190 +190 @@
 
             // HTML
-            $html_diff_head  = '<h2>' . sprintf( __( '%s changed' ), $post_type_label ) . "</h2>\n";
-            $html_diff_head .= '<p>' . sprintf( $head_sprintf,
+            $html_diff_head  = '<h2>' . sprintf( esc_html__( '%s changed' ), $post_type_label ) . "</h2>\n";
+            $html_diff_head .= '<p>' . sprintf( esc_html( $head_sprintf ),
                 esc_html( $the_author ),
                 "<a href='$the_permalink'>" . esc_html( $the_title ) . '</a>',
-                "<a href='$the_edit_link'>" . __( '[edit]' ) . '</a>',
-                $post_type_label,
-                $the_date
+                "<a href='$the_edit_link'>" . esc_html__( '[edit]' ) . '</a>',
+                esc_html( $post_type_label ),
+                esc_html( $the_date )
             ) . "</p>\n\n";
 
@@ -213 +213 @@
 
             // Replace classes with inline style
-            $html_diff = str_replace( "class='diff'", 'style="width: 100%; border-collapse: collapse; border: none; white-space: pre-wrap; word-wrap: break-word; font-family: Consolas,Monaco,Courier,monospace;"', $html_diff );
-            $html_diff = preg_replace( '#<col[^>]+/?>#i', '', $html_diff );
-            $html_diff = str_replace( "class='diff-deletedline'", 'style="padding: 5px; width: 50%; background-color: #fdd;"', $html_diff );
-            $html_diff = str_replace( "class='diff-addedline'", 'style="padding: 5px; width: 50%; background-color: #dfd;"', $html_diff );
-            $html_diff = str_replace( "class='diff-context'", 'style="padding: 5px; width: 50%;"', $html_diff );
-            $html_diff = str_replace( '<td>', '<td style="padding: 5px;">', $html_diff );
             $html_diff = str_replace( '<del>', '<del style="text-decoration: none; background-color: #f99;">', $html_diff );
             $html_diff = str_replace( '<ins>', '<ins style="text-decoration: none; background-color: #9f9;">', $html_diff );
@@ -316 +310 @@
         $return['enable'] = ( empty( $options['enable'] ) ) ? 0 : 1;
 
-        if ( empty( $options['users'] ) || !is_array( $options ) ) {
+        if ( empty( $options['users'] ) || ! is_array( $options['users'] ) ) {
             $return['users'] = $this->defaults['users'];
         } else {
@@ -358 +352 @@
         }
 
-        if ( empty( $options['post_types'] ) || !is_array( $options ) ) {
+        if ( empty( $options['post_types'] ) || ! is_array( $options['post_types'] ) ) {
             $return['post_types'] = $this->defaults['post_types'];
         } else {
@@ -380 +374 @@
                 sprintf(
                     /* Translators: Comma-separated list of invalid email addresses. */
-                    _n( 'Invalid Email: %s', 'Invalid Emails: %s', is_countable( $options['invalid_emails'] ) ? count( $options['invalid_emails'] ) : 0 ),
+                    esc_html( _n( 'Invalid Email: %s', 'Invalid Emails: %s', is_countable( $options['invalid_emails'] ) ? count( $options['invalid_emails'] ) : 0 ) ),
                     '<kbd>' . implode( '</kbd>, <kbd>', array_map( 'esc_html', $options['invalid_emails'] ) )
                 )
@@ -515 +509 @@
             return '';
 
-        $r  = "<table class='diff'>\n";
-        $r .= "<col class='ltype' /><col class='content' /><col class='ltype' /><col class='content' />";
+        $r  = "<table style='width: 100%; border-collapse: collapse; border: none; white-space: pre-wrap; word-wrap: break-word; font-family: Consolas,Monaco,Courier,monospace;'>\n";
 
         if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-            $r .= "<thead>";
+            $r .= "<thead>\n";
         if ( $args['title'] )
-            $r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+            $r .= "<tr class='diff-title'><th colspan='4'>" . esc_html( $args['title'] ) . "</th></tr>\n";
         if ( $args['title_left'] || $args['title_right'] ) {
             $r .= "<tr class='diff-sub-title'>\n";
-            $r .= "\t<td></td><th>$args[title_left]</th>\n";
-            $r .= "\t<td></td><th>$args[title_right]</th>\n";
+            $r .= "\t<td></td><th>" . esc_html( $args['title_left'] ) . "</th>\n";
+            $r .= "\t<td></td><th>" . esc_html( $args['title_right'] ) . "</th>\n";
             $r .= "</tr>\n";
         }
@@ -542 +535 @@
     var $_leading_context_lines  = 2;
     var $_trailing_context_lines = 2;
+
+    /**
+     * @ignore
+     *
+     * @param string $line HTML-escape the value.
+     * @return string
+     */
+    public function addedLine( $line ) {
+        return "<td style='padding: 5px; width: 1em; text-align: end;' aria-label='" . __( 'Added:' ) . "'><span aria-hidden='true'>+</span></td>"
+            . "<td style='padding: 5px; width: 50%; width: calc( 50% - 1em - 10px ); background-color: #dfd;'>{$line}</td>";
+    }
+
+    /**
+     * @ignore
+     *
+     * @param string $line HTML-escape the value.
+     * @return string
+     */
+    public function deletedLine( $line ) {
+        return "<td style='padding: 5px; width: 1em; text-align: end;' aria-label='" . __( 'Deleted:' ) . "'><span aria-hidden='true'>-</span></td>"
+            . "<td style='padding: 5px; width: 50%; width: calc( 50% - 1em - 10px ); background-color: #fdd;'>{$line}</td>";
+    }
+
+    /**
+     * @ignore
+     *
+     * @param string $line HTML-escape the value.
+     * @return string
+     */
+    public function contextLine( $line ) {
+        return "<td style='padding: 5px; width: 1em;' aria-label='" . __( 'Unchanged:' ) . "'><span aria-hidden='true'>&nbsp;</span></td>"
+            . "<td style='padding: 5px; width: 50%; width: calc( 50% - 1em - 10px );'>{$line}</td>";
+    }
+
+    /**
+     * @ignore
+     *
+     * @return string
+     */
+    public function emptyLine() {
+        return '<td colspan="2" style="padding: 5px;">&nbsp;</td>';
+    }
 }

email-post-changes/trunk/email-post-changes.php

@@ -5 +5 @@
 Description: Whenever a change to a post or page is made, those changes are emailed to the users and email addresses you specify.
 Plugin URI: http://wordpress.org/extend/plugins/email-post-changes/
-Version: 1.7.2
+Version: 1.8
 Author: Michael D Adams
 Author URI: http://blogwaffe.com/