Changeset 2885658

Timestamp:

03/23/2023 12:51:20 PM (3 years ago)

Author:

wpsocio

Message:

Update to version 4.0.9 from GitHub

Location:

wptelegram

Files:

• tags/4.0.9 (copied) (copied from wptelegram/trunk)
• tags/4.0.9/README.txt (modified) (2 diffs)
• tags/4.0.9/changelog.md (modified) (1 diff)
• tags/4.0.9/includes/TemplateGuard.php (added)
• tags/4.0.9/includes/Utils.php (modified) (2 diffs)
• tags/4.0.9/includes/format-text/src/Converter/LinkConverter.php (modified) (1 diff)
• tags/4.0.9/includes/format-text/src/HtmlConverter.php (modified) (2 diffs)
• tags/4.0.9/languages/wptelegram.pot (modified) (1 diff)
• tags/4.0.9/modules/notify/NotifySender.php (modified) (1 diff)
• tags/4.0.9/modules/p2tg/PostData.php (modified) (1 diff)
• tags/4.0.9/wptelegram.php (modified) (2 diffs)
• trunk/README.txt (modified) (2 diffs)
• trunk/changelog.md (modified) (1 diff)
• trunk/includes/TemplateGuard.php (added)
• trunk/includes/Utils.php (modified) (2 diffs)
• trunk/includes/format-text/src/Converter/LinkConverter.php (modified) (1 diff)
• trunk/includes/format-text/src/HtmlConverter.php (modified) (2 diffs)
• trunk/languages/wptelegram.pot (modified) (1 diff)
• trunk/modules/notify/NotifySender.php (modified) (1 diff)
• trunk/modules/p2tg/PostData.php (modified) (1 diff)
• trunk/wptelegram.php (modified) (2 diffs)

wptelegram/tags/4.0.9/README.txt

@@ -1 +1 @@
 === WP Telegram (Auto Post and Notifications) ===
 Contributors: wpsocio, irshadahmad21
-Donate link: https://wpsocio.com
+Donate link: https://wpsocio.com/donate
 Tags: telegram, notifications, posts, channel, group
 Requires at least: 5.8
 Requires PHP: 7.2
 Tested up to: 6.1.1
-Stable tag: 4.0.8
+Stable tag: 4.0.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -206 +206 @@
 == Changelog ==
 
+= 4.0.9 =
+- Improved message template sanitization to prevent breaking the markup
+- Added a new filter `wptelegram_p2tg_post_data_plain_excerpt` to allow sending plain text excerpt
+- Fixed the links added in parenthesis when "Formatting" is set to "None"
+
 = 4.0.8 =
 - Fixed the broken hyperlinks in Message Template when using custom field link

wptelegram/tags/4.0.9/changelog.md

@@ -4 +4 @@
 
 ## Unreleased
+
+## [4.0.9 - 2023-03-23](https://github.com/wpsocio/wptelegram/releases/tag/v4.0.9)
+
+### Enhancements
+
+- Improved message template sanitization to prevent breaking the markup
+- Added a new filter `wptelegram_p2tg_post_data_plain_excerpt` to allow sending plain text excerpt
+
+### Bug fixes
+
+- Fixed the links added in parenthesis when "Formatting" is set to "None"
 
 ## [4.0.8 - 2023-03-12](https://github.com/wpsocio/wptelegram/releases/tag/v4.0.8)

wptelegram/tags/4.0.9/includes/Utils.php

@@ -269 +269 @@
             return '';
         }
-
-        $filtered = wp_check_invalid_utf8( (string) $value );
-
-        $allowed_protocols = [];
-
-        // If the Message Template contains a link with {cf: field as the href,
-        // We need to allow "{cf" as a protocol to avoid wp_kses() stripping the link.
-        if ( preg_match( '/<a[^>]href=["\']{cf:/', $filtered ) ) {
-            $allowed_protocols = array_merge( wp_allowed_protocols(), [ '{cf' ] );
-        }
-
-        $allowed_protocols = apply_filters( 'wptelegram_message_template_allowed_protocols', $allowed_protocols, $filtered );
-
-        $filtered = trim( wp_kses( $filtered, self::SUPPORTED_HTML_TAGS, $allowed_protocols ) );
+        $value = (string) $value;
+
+        $guard = new TemplateGuard();
+
+        $value = $guard->safeguard_macros( $value );
+
+        $filtered = wp_check_invalid_utf8( $value );
+
+        $filtered = trim( wp_kses( $filtered, self::SUPPORTED_HTML_TAGS ) );
+
+        // Restore the macros with the original values.
+        $filtered = $guard->restore_macros( $filtered );
 
         if ( $json_encode ) {
@@ -496 +494 @@
 
         $defaults = [
-            'elipsis'      => '…',
-            'format_to'    => 'text',
-            'id'           => 'default',
-            'limit'        => 55,
-            'limit_by'     => 'words',
-            'preserve_eol' => true,
+            'elipsis'         => '…',
+            'format_to'       => 'text',
+            'id'              => 'default',
+            'limit'           => 55,
+            'limit_by'        => 'words',
+            'text_hyperlinks' => 'strip',
+            'preserve_eol'    => true,
         ];
 

wptelegram/tags/4.0.9/includes/format-text/src/Converter/LinkConverter.php

@@ -44 +44 @@
         }
 
-        $retainHyperlinks = $this->config->getOption( 'retain_hyperlinks', true );
+        $textHyperlinks = $this->config->getOption( 'text_hyperlinks', 'retain' );
 
-        $format = $retainHyperlinks ? '%1$s (%2$s)' : '%1$s';
+        $format = 'retain' === $textHyperlinks ? '%1$s (%2$s)' : '%1$s';
 
         return sprintf( $format, $text, $href );

wptelegram/tags/4.0.9/includes/format-text/src/HtmlConverter.php

@@ -65 +65 @@
                 // Set to false to keep display:none elements.
                 'remove_display_none' => true,
-                // Set to false to remove hyperlinks being added in parentheses when formatting to 'text'.
-                'retain_hyperlinks'   => true,
                 // A callable to determine if a node should be converted.
                 'should_convert_cb'   => null,
@@ -77 +75 @@
                 // Set the default separator for each <tr>.
                 'table_row_sep'       => "\n" . str_repeat( '-', 20 ) . "\n",
+                // Set to 'strip' to remove hyperlinks being added in parentheses when formatting to 'text'.
+                'text_hyperlinks'     => 'retain',
                 // Whether to throw an exception when document parsing fails.
                 'throw_on_doc_error'  => false,

wptelegram/tags/4.0.9/languages/wptelegram.pot

@@ -5 +5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/wpsocio/wptelegram\n"
-"POT-Creation-Date: 2023-03-12 17:29:13+00:00\n"
+"POT-Creation-Date: 2023-03-23 12:50:29+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2023-03-12 17:290\n"
+"PO-Revision-Date: 2023-03-23 12:500\n"
 "Last-Translator: WP Telegram\n"
 "Language-Team: WP Telegram\n"

wptelegram/tags/4.0.9/modules/notify/NotifySender.php

@@ -294 +294 @@
             'limit'           => $limit,
             'limit_by'        => 'chars',
+            'text_hyperlinks' => 'retain',
             'images_in_links' => [
                 'title_or_alt'    => 'retain',

wptelegram/tags/4.0.9/modules/p2tg/PostData.php

@@ -192 +192 @@
                     ]
                 );
+
+                $plain_excerpt = apply_filters( 'wptelegram_p2tg_post_data_plain_excerpt', false, $value, $excerpt, $this->post, $options );
+
+                if ( $plain_excerpt ) {
+                    $value = trim( wp_strip_all_tags( $value ) );
+                }
+
                 // If the excerpt is not empty.
                 if ( $value ) {

wptelegram/tags/4.0.9/wptelegram.php

@@ -11 +11 @@
  * Plugin URI:        https://t.me/WPTelegram
  * Description:       Integrate your WordPress website perfectly with Telegram. Send posts automatically to Telegram when published or updated, whether to a Telegram Channel, Group or private chat, with full control. Get your email notifications on Telegram.
- * Version:           4.0.8
+ * Version:           4.0.9
  * Requires at least: 5.8
  * Requires PHP:      7.2
@@ -27 +27 @@
 }
 
-define( 'WPTELEGRAM_VER', '4.0.8' );
+define( 'WPTELEGRAM_VER', '4.0.9' );
 
 defined( 'WPTELEGRAM_MAIN_FILE' ) || define( 'WPTELEGRAM_MAIN_FILE', __FILE__ );

wptelegram/trunk/README.txt

@@ -1 +1 @@
 === WP Telegram (Auto Post and Notifications) ===
 Contributors: wpsocio, irshadahmad21
-Donate link: https://wpsocio.com
+Donate link: https://wpsocio.com/donate
 Tags: telegram, notifications, posts, channel, group
 Requires at least: 5.8
 Requires PHP: 7.2
 Tested up to: 6.1.1
-Stable tag: 4.0.8
+Stable tag: 4.0.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -206 +206 @@
 == Changelog ==
 
+= 4.0.9 =
+- Improved message template sanitization to prevent breaking the markup
+- Added a new filter `wptelegram_p2tg_post_data_plain_excerpt` to allow sending plain text excerpt
+- Fixed the links added in parenthesis when "Formatting" is set to "None"
+
 = 4.0.8 =
 - Fixed the broken hyperlinks in Message Template when using custom field link

wptelegram/trunk/changelog.md

@@ -4 +4 @@
 
 ## Unreleased
+
+## [4.0.9 - 2023-03-23](https://github.com/wpsocio/wptelegram/releases/tag/v4.0.9)
+
+### Enhancements
+
+- Improved message template sanitization to prevent breaking the markup
+- Added a new filter `wptelegram_p2tg_post_data_plain_excerpt` to allow sending plain text excerpt
+
+### Bug fixes
+
+- Fixed the links added in parenthesis when "Formatting" is set to "None"
 
 ## [4.0.8 - 2023-03-12](https://github.com/wpsocio/wptelegram/releases/tag/v4.0.8)

wptelegram/trunk/includes/Utils.php

@@ -269 +269 @@
             return '';
         }
-
-        $filtered = wp_check_invalid_utf8( (string) $value );
-
-        $allowed_protocols = [];
-
-        // If the Message Template contains a link with {cf: field as the href,
-        // We need to allow "{cf" as a protocol to avoid wp_kses() stripping the link.
-        if ( preg_match( '/<a[^>]href=["\']{cf:/', $filtered ) ) {
-            $allowed_protocols = array_merge( wp_allowed_protocols(), [ '{cf' ] );
-        }
-
-        $allowed_protocols = apply_filters( 'wptelegram_message_template_allowed_protocols', $allowed_protocols, $filtered );
-
-        $filtered = trim( wp_kses( $filtered, self::SUPPORTED_HTML_TAGS, $allowed_protocols ) );
+        $value = (string) $value;
+
+        $guard = new TemplateGuard();
+
+        $value = $guard->safeguard_macros( $value );
+
+        $filtered = wp_check_invalid_utf8( $value );
+
+        $filtered = trim( wp_kses( $filtered, self::SUPPORTED_HTML_TAGS ) );
+
+        // Restore the macros with the original values.
+        $filtered = $guard->restore_macros( $filtered );
 
         if ( $json_encode ) {
@@ -496 +494 @@
 
         $defaults = [
-            'elipsis'      => '…',
-            'format_to'    => 'text',
-            'id'           => 'default',
-            'limit'        => 55,
-            'limit_by'     => 'words',
-            'preserve_eol' => true,
+            'elipsis'         => '…',
+            'format_to'       => 'text',
+            'id'              => 'default',
+            'limit'           => 55,
+            'limit_by'        => 'words',
+            'text_hyperlinks' => 'strip',
+            'preserve_eol'    => true,
         ];
 

wptelegram/trunk/includes/format-text/src/Converter/LinkConverter.php

@@ -44 +44 @@
         }
 
-        $retainHyperlinks = $this->config->getOption( 'retain_hyperlinks', true );
+        $textHyperlinks = $this->config->getOption( 'text_hyperlinks', 'retain' );
 
-        $format = $retainHyperlinks ? '%1$s (%2$s)' : '%1$s';
+        $format = 'retain' === $textHyperlinks ? '%1$s (%2$s)' : '%1$s';
 
         return sprintf( $format, $text, $href );

wptelegram/trunk/includes/format-text/src/HtmlConverter.php

@@ -65 +65 @@
                 // Set to false to keep display:none elements.
                 'remove_display_none' => true,
-                // Set to false to remove hyperlinks being added in parentheses when formatting to 'text'.
-                'retain_hyperlinks'   => true,
                 // A callable to determine if a node should be converted.
                 'should_convert_cb'   => null,
@@ -77 +75 @@
                 // Set the default separator for each <tr>.
                 'table_row_sep'       => "\n" . str_repeat( '-', 20 ) . "\n",
+                // Set to 'strip' to remove hyperlinks being added in parentheses when formatting to 'text'.
+                'text_hyperlinks'     => 'retain',
                 // Whether to throw an exception when document parsing fails.
                 'throw_on_doc_error'  => false,

wptelegram/trunk/languages/wptelegram.pot

@@ -5 +5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/wpsocio/wptelegram\n"
-"POT-Creation-Date: 2023-03-12 17:29:13+00:00\n"
+"POT-Creation-Date: 2023-03-23 12:50:29+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2023-03-12 17:290\n"
+"PO-Revision-Date: 2023-03-23 12:500\n"
 "Last-Translator: WP Telegram\n"
 "Language-Team: WP Telegram\n"

wptelegram/trunk/modules/notify/NotifySender.php

@@ -294 +294 @@
             'limit'           => $limit,
             'limit_by'        => 'chars',
+            'text_hyperlinks' => 'retain',
             'images_in_links' => [
                 'title_or_alt'    => 'retain',

wptelegram/trunk/modules/p2tg/PostData.php

@@ -192 +192 @@
                     ]
                 );
+
+                $plain_excerpt = apply_filters( 'wptelegram_p2tg_post_data_plain_excerpt', false, $value, $excerpt, $this->post, $options );
+
+                if ( $plain_excerpt ) {
+                    $value = trim( wp_strip_all_tags( $value ) );
+                }
+
                 // If the excerpt is not empty.
                 if ( $value ) {

wptelegram/trunk/wptelegram.php

@@ -11 +11 @@
  * Plugin URI:        https://t.me/WPTelegram
  * Description:       Integrate your WordPress website perfectly with Telegram. Send posts automatically to Telegram when published or updated, whether to a Telegram Channel, Group or private chat, with full control. Get your email notifications on Telegram.
- * Version:           4.0.8
+ * Version:           4.0.9
  * Requires at least: 5.8
  * Requires PHP:      7.2
@@ -27 +27 @@
 }
 
-define( 'WPTELEGRAM_VER', '4.0.8' );
+define( 'WPTELEGRAM_VER', '4.0.9' );
 
 defined( 'WPTELEGRAM_MAIN_FILE' ) || define( 'WPTELEGRAM_MAIN_FILE', __FILE__ );