release: fixes

- Fix Feedzy RSS feed cache not working on the widgets.
- Remove legacy elementor widget for new users
- Fix external image support on import for some websites
- Enter key on feed fields should load the feed automatically

Author: selul

composer.lock

@@ -95,7 +95,7 @@
 .fz-light-mode.fz-pro-notice p{
   color: #6D7882;
 }
-.docs-btn a{
+.docs-btn a.fz-upgrade-link{
   display: inline-block;
   background: #4268CF;
   padding: 6px 12px;
@@ -106,8 +106,8 @@
   text-transform: uppercase;
   color: #FFFFFF;
 }
-.docs-btn a:hover,
-.docs-btn a:focus{  
+.docs-btn a.fz-upgrade-link:hover,
+.docs-btn a.fz-upgrade-link:focus{  
   color: #FFFFFF;
 }
 .docs-btn span{
@@ -119,6 +119,9 @@
   color: #757575;
   padding-top: 8px;
 }
+.docs-btn span a {
+  color: #757575;
+}
 .fz-light-mode .docs-btn span {
   color: #757575;
 }

css/feedzy-elementor-widget.css

@@ -777,6 +777,7 @@ private function init_feed( $feed_url, $cache, $sc, $allow_https = FEEDZY_ALLOW_
 		if ( false === apply_filters( 'feedzy_disable_db_cache', false, $feed_url ) ) {
 			SimplePie_Cache::register( 'wp_transient', 'WP_Feed_Cache_Transient' );
 			$feed->set_cache_location( 'wp_transient' );
+			$feed->set_cache_duration( $cache_time );
 			add_filter(
 				'wp_feed_cache_transient_lifetime',
 				function( $time ) use ( $cache_time ) {
@@ -1472,6 +1473,8 @@ private function get_feed_item_filter( $sc, $sizes, $item, $feed_url, $index, $i
 			$item_content = esc_html__( 'Post Content', 'feedzy-rss-feeds' );
 		}
 		$item_array = array(
+			'feed_url'            => $item->get_feed()->subscribe_url(),
+			'item_unique_hash'    => wp_hash( $item->get_permalink() ),
 			'item_img_class'      => 'rss_image',
 			'item_img_style'      => 'width:' . $sizes['width'] . 'px; height:' . $sizes['height'] . 'px;',
 			'item_url'            => $new_link,

includes/abstract/feedzy-rss-feeds-admin-abstract.php

@@ -851,4 +851,37 @@ public function ajax() {
 	public function feedzy_remove_elementor_feature( $manager_object, $experimental_data ) {
 		$manager_object->remove_feature( 'e_hidden_wordpress_widgets' );
 	}
+
+	/**
+	 * Remove legacy widget.
+	 *
+	 * @param array $list Black list widgets.
+	 * @return array
+	 */
+	public function feedzy_remove_elementor_widgets( $list ) {
+		global $post;
+
+		if ( ! defined( 'ELEMENTOR_PATH' ) || ! class_exists( '\Elementor\Plugin', false ) ) {
+			return $list;
+		}
+
+		if ( ! method_exists( \Elementor\Plugin::$instance->documents, 'get' ) ) {
+			return $list;
+		}
+
+		$black_list = array( 'feedzy_wp_widget' );
+		$data       = \Elementor\Plugin::$instance->documents->get( $post->ID )->get_elements_data();
+
+		if ( ! empty( $data ) ) {
+			\Elementor\Plugin::$instance->db->iterate_data(
+				$data,
+				function ( $element ) use ( &$black_list ) {
+					if ( ! empty( $element['widgetType'] ) && 'wp-widget-feedzy_wp_widget' === $element['widgetType'] ) {
+						$black_list = array();
+					}
+				}
+			);
+		}
+		return array_merge( $list, $black_list );
+	}
 }

includes/admin/feedzy-rss-feeds-admin.php

@@ -1300,7 +1300,16 @@ private function run_job( $job, $max ) {
 
 		$duplicates       = $items_found = array();
 		$found_duplicates = array();
-		foreach ( $result as $item ) {
+		foreach ( $result as $key => $item ) {
+			$item_obj = $item;
+			// find item index key when import full content.
+			if ( ! empty( $xml_results ) ) {
+				$item_unique_hash = array_column( $xml_results['items'], 'item_unique_hash' );
+				$real_index_key   = array_search( $item['item_unique_hash'], $item_unique_hash, true );
+				if ( isset( $xml_results['items'][ $real_index_key ] ) ) {
+					$item_obj = $xml_results['items'][ $real_index_key ];
+				}
+			}
 			$item_hash                        = $use_new_hash ? $item['item_id'] : hash( 'sha256', $item['item_url'] . '_' . $item['item_date'] );
 			$is_duplicate                     = $use_new_hash ? in_array( $item_hash, $imported_items_new, true ) : in_array( $item_hash, $imported_items_old, true );
 			$items_found[ $item['item_url'] ] = $item['item_title'];
@@ -1367,8 +1376,8 @@ private function run_job( $job, $max ) {
 				$import_title
 			);
 
-			if ( $this->feedzy_is_business() || $this->feedzy_is_personal() ) {
-				$post_title = apply_filters( 'feedzy_parse_custom_tags', $post_title, ! empty( $xml_results ) ? $xml_results['feed'] : $results['feed'], $item['item_index'] );
+			if ( $this->feedzy_is_business() ) {
+				$post_title = apply_filters( 'feedzy_parse_custom_tags', $post_title, $item_obj );
 			}
 
 			$post_title = apply_filters( 'feedzy_invoke_services', $post_title, 'title', $item['item_title'], $job );
@@ -1458,8 +1467,8 @@ private function run_job( $job, $max ) {
 				$post_content = apply_filters( 'feedzy_invoke_services', $post_content, 'full_content', $full_content, $job );
 			}
 
-			if ( $this->feedzy_is_business() || $this->feedzy_is_personal() ) {
-				$post_content = apply_filters( 'feedzy_parse_custom_tags', $post_content, ! empty( $xml_results ) ? $xml_results['feed'] : $results['feed'], $item['item_index'] );
+			if ( $this->feedzy_is_business() ) {
+				$post_content = apply_filters( 'feedzy_parse_custom_tags', $post_content, $item_obj );
 			}
 
 			$post_content = apply_filters( 'feedzy_invoke_services', $post_content, 'content', $item['item_description'], $job );
@@ -1525,8 +1534,8 @@ private function run_job( $job, $max ) {
 				$post_excerpt
 			);
 
-			if ( $this->feedzy_is_business() || $this->feedzy_is_personal() ) {
-				$item_post_excerpt = apply_filters( 'feedzy_parse_custom_tags', $item_post_excerpt, ! empty( $xml_results ) ? $xml_results['feed'] : $results['feed'], $item['item_index'] );
+			if ( $this->feedzy_is_business() ) {
+				$item_post_excerpt = apply_filters( 'feedzy_parse_custom_tags', $item_post_excerpt, $item_obj );
 			}
 
 			$new_post = apply_filters(
@@ -1571,8 +1580,9 @@ private function run_job( $job, $max ) {
 				} elseif ( strpos( $import_featured_img, '[#item_custom' ) !== false ) {
 					// custom image tag
 					if ( $this->feedzy_is_business() || $this->feedzy_is_personal() ) {
-						$value = apply_filters( 'feedzy_parse_custom_tags', $import_featured_img, $results['feed'], $index );
+						$value = apply_filters( 'feedzy_parse_custom_tags', $import_featured_img, $item_obj );
 					}
+
 					if ( ! empty( $value ) && strpos( $value, '[#item_custom' ) === false ) {
 						$image_url = $value;
 					} else {
@@ -1647,7 +1657,7 @@ private function run_job( $job, $max ) {
 				}
 			}
 
-			do_action( 'feedzy_import_extra', $job, ! empty( $xml_results ) ? $xml_results : $results, $new_post_id, $index, $item['item_index'], $import_errors, $import_info );
+			do_action( 'feedzy_import_extra', $job, $item_obj, $new_post_id, $import_errors, $import_info );
 
 			if ( ! empty( $import_featured_img ) && 'attachment' !== $import_post_type ) {
 				$image_url   = '';
@@ -1664,7 +1674,7 @@ private function run_job( $job, $max ) {
 				} elseif ( strpos( $import_featured_img, '[#item_custom' ) !== false ) {
 					// custom image tag
 					if ( $this->feedzy_is_business() || $this->feedzy_is_personal() ) {
-						$value = apply_filters( 'feedzy_parse_custom_tags', $import_featured_img, ! empty( $xml_results ) ? $xml_results['feed'] : $results['feed'], $index );
+						$value = apply_filters( 'feedzy_parse_custom_tags', $import_featured_img, $item_obj );
 					}
 					if ( ! empty( $value ) && strpos( $value, '[#item_custom' ) === false ) {
 						$image_url = $value;

includes/admin/feedzy-rss-feeds-import.php

@@ -40,8 +40,8 @@ public function enqueue() {
 			<h3>' . esc_html__( 'Discover Feedzy Pro', 'feedzy-rss-feeds' ) . '</h3>
 			<p>' . esc_html__( 'With Feedzy Pro you get more features, like Custom Templates, Magic Tags, Keywords filters and much more.', 'feedzy-rss-feeds' ) . '</p>
 			<div class="docs-btn">
-				<a href="' . esc_url( 'https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation' ) . '" target="_blank">' . esc_html__( 'Learn more', 'feedzy-rss-feeds' ) . '</a>
-				<span>' . esc_html__( 'Open Feedzy docs', 'feedzy-rss-feeds' ) . '</span>
+				<a href="' . FEEDZY_UPSELL_LINK . '" target="_blank" class="fz-upgrade-link">' . esc_html__( 'Learn more', 'feedzy-rss-feeds' ) . '</a>
+				<span><a href="' . esc_url( 'https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation' ) . '" target="_blank">' . esc_html__( 'Open Feedzy docs', 'feedzy-rss-feeds' ) . '</a></span>
 			</div>
 		</div>';
 		}

includes/elementor/controls/template-layout.php

@@ -78,6 +78,9 @@ function display_external_post_image( $html, $post_id, $post_thumbnail_id, $size
 		$alt  = get_the_title( $post_id );
 		$attr['alt'] = $alt;
 		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, '', '' );
+		if ( isset( $attr['style'] ) ) {
+			unset( $attr['style'] );
+		}
 		$attr = array_map( 'esc_attr', $attr );
 		$html = sprintf( '<img src="%s"', esc_url( $url ) );
 		foreach ( $attr as $name => $value ) {

includes/feedzy-rss-feeds-feed-tweaks.php

@@ -277,7 +277,8 @@ private function define_admin_hooks() {
 			self::$instance->loader->add_action( 'admin_notices', $plugin_import, 'feedzy_import_clone_success_notice' );
 			// Remove elementor feature.
 			self::$instance->loader->add_action( 'elementor/experiments/feature-registered', self::$instance->admin, 'feedzy_remove_elementor_feature', 10, 2 );
-
+			// Remove widget.
+			self::$instance->loader->add_filter( 'elementor/widgets/black_list', self::$instance->admin, 'feedzy_remove_elementor_widgets' );
 			// Register elementor widget.
 			$plugin_elementor_widget = new Feedzy_Rss_Feeds_Elementor();
 			$this->loader->add_action( 'elementor/widgets/register', $plugin_elementor_widget, 'feedzy_elementor_widgets_registered' );