Merge pull request #332 from Codeinwp/development

Scrub item titles for HTML entities Fix widget to use all settings configured Fix issue with saving description length
Codeinwp · Nov 30, 2019 · 6e26cd4 · 6e26cd4
2 parents d770c93 + 0f355cc
commit 6e26cd4
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 14 deletions.
diff --git a/css/feedzy-rss-feeds.css b/css/feedzy-rss-feeds.css
@@ -2,7 +2,7 @@
  * feedzy-rss-feeds.css
  * Feedzy RSS Feed
  * Copyright: (c) 2016 Themeisle, themeisle.com
- * Version: 3.3.12
+ * Version: 3.3.13
  * Plugin Name: FEEDZY RSS Feeds
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
  * Author: Themeisle

diff --git a/cypress.json b/cypress.json
@@ -2,6 +2,6 @@
   "env": {
     "shortcode": "[feedzy-rss feeds='https://s3.amazonaws.com/downloads.themeisle.com/sample-feed.xml' max='10' feed_title='yes' refresh='1_hours' meta='yes' summary='yes' price='yes' mapping='price=im:price' thumb='yes' keywords_title='God, Mendes, Cyrus' keywords_ban='Cyrus' template='style1']"
   },
-  "projectId": "vj4ftg",
-  "videoUploadOnPasses": false
+  "videoUploadOnPasses": false,
+  "projectId": "frqcxp"
 }
diff --git a/feedzy-rss-feed.php b/feedzy-rss-feed.php
@@ -15,7 +15,7 @@
  * Plugin Name:       Feedzy RSS Feeds Lite
  * Plugin URI:        https://themeisle.com/plugins/feedzy-rss-feeds-lite/
  * Description:       A small and lightweight RSS aggregator plugin. Fast and very easy to use, it allows you to aggregate multiple RSS feeds into your WordPress site through fully customizable shortcodes & widgets.
- * Version:           3.3.12
+ * Version:           3.3.13
  * Author:            Themeisle
  * Author URI:        http://themeisle.com
  * License:           GPL-2.0+

diff --git a/form/form.php b/form/form.php
@@ -21,7 +21,12 @@
 	<meta http-equiv="cache-control" content="no-cache"/>
 	<meta http-equiv="expires" content="0"/>
 	<meta http-equiv="pragma" content="no-cache"/>
-	<link rel="stylesheet" href="<?php echo FEEDZY_ABSURL . 'css/form.css?h=' . date( 'dmYHis' ); ?>" type="text/css" media="all"/>
+	<link rel="stylesheet" href="
+	<?php
+	// phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
+	echo FEEDZY_ABSURL . 'css/form.css?h=' . date( 'dmYHis' );
+	?>
+	" type="text/css" media="all"/>
 </head>
 <body>
 <div class="feedzy-popup-form container">

diff --git a/includes/abstract/feedzy-rss-feeds-admin-abstract.php b/includes/abstract/feedzy-rss-feeds-admin-abstract.php
@@ -714,7 +714,7 @@ public function sanitize_attr( $sc, $feed_url ) {
 			$sc['keywords_ban'] = rtrim( $sc['keywords_ban'], ',' );
 			$sc['keywords_ban'] = array_map( 'trim', explode( ',', $sc['keywords_ban'] ) );
 		}
-		if ( ! empty( $sc['summarylength'] ) && ! ctype_digit( $sc['summarylength'] ) ) {
+		if ( ! empty( $sc['summarylength'] ) && ( ! ctype_digit( $sc['summarylength'] ) && ! is_numeric( $sc['summarylength'] ) ) ) {
 			$sc['summarylength'] = '';
 		}
 		if ( empty( $sc['default'] ) ) {
@@ -934,7 +934,7 @@ private function get_feed_item_filter( $sc, $sizes, $item, $feed_url, $index ) {
 			}
 			$content_thumb = apply_filters( 'feedzy_thumb_output', $content_thumb, $feed_url, $sizes, $item );
 		}
-		$content_title = $item->get_title();
+		$content_title = html_entity_decode( $item->get_title(), ENT_QUOTES, 'UTF-8' );
 		if ( is_numeric( $sc['title'] ) ) {
 			$length = intval( $sc['title'] );
 			if ( $length > 0 && strlen( $content_title ) > $length ) {

diff --git a/includes/admin/feedzy-wp-widget.php b/includes/admin/feedzy-wp-widget.php
@@ -242,6 +242,10 @@ public function widget( $args, $instance ) {
 			'keywords_title' => $instance['keywords_title'],
 			'keywords_ban' => $instance['keywords_ban'],
 			'error_empty' => $instance['error_empty'],
+			'sort' => $instance['sort'],
+			'refresh' => $instance['refresh'],
+			'follow' => $instance['follow'],
+			'http' => $instance['http'],
 		);
 		$feedzy_widget_shortcode_attributes = apply_filters( 'feedzy_widget_shortcode_attributes_filter', $feedzy_widget_shortcode_attributes, $args, $instance );
 

diff --git a/includes/feedzy-rss-feeds.php b/includes/feedzy-rss-feeds.php
@@ -104,7 +104,7 @@ public static function instance() {
 	 */
 	public function init() {
 		self::$plugin_name = 'feedzy-rss-feeds';
-		self::$version = '3.3.12';
+		self::$version = '3.3.13';
 		self::$instance->load_dependencies();
 		self::$instance->set_locale();
 		self::$instance->define_admin_hooks();

diff --git a/includes/gutenberg/build/block.js b/includes/gutenberg/build/block.js
diff --git a/includes/gutenberg/src/block.js b/includes/gutenberg/src/block.js
@@ -62,7 +62,7 @@ export default registerBlockType( 'feedzy-rss-feeds/feedzy-block', {
 			props.setAttributes( { target: value } );
 		};
 		const onTitle = value => {
-			props.setAttributes( { title: value } );
+			props.setAttributes( { title: Number( value ) } );
 		};
 		const changeMeta = value => {
 			props.setAttributes( { metafields: value } );
@@ -71,7 +71,7 @@ export default registerBlockType( 'feedzy-rss-feeds/feedzy-block', {
 			props.setAttributes( { summary: ! props.attributes.summary } );
 		};
 		const onSummaryLength = value => {
-			props.setAttributes( { summarylength: value } );
+			props.setAttributes( { summarylength: Number( value ) } );
 		};
 		const onKeywordsTitle = value => {
 			props.setAttributes( { keywords_title: value } );
@@ -86,7 +86,7 @@ export default registerBlockType( 'feedzy-rss-feeds/feedzy-block', {
 			props.setAttributes( { default: value } );
 		};
 		const onSize = value => {
-			props.setAttributes( { size: value } );
+			props.setAttributes( { size: Number( value ) } );
 		};
 		const onReferralURL = value => {
 			props.setAttributes( { referral_url: value } );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "feedzy-rss-feeds",
-  "version": "3.3.12",
+  "version": "3.3.13",
   "description": "Feedzy RSS Feeds - lite version",
   "repository": {
     "type": "git",