releases: fixes

New Features
- New action to modify links.

Improvements
- Enhanced visibility for automatic translation.
- Support for all default WP HTML tags in import content.
- Additional strings available for translation.

Fixes
- Fixed issue with preview import data.
- Resolved UI issue with legacy magic tags in post title dropdown.
- Fixed prompt content text attachment to rephrased text.

Author: Soare-Robert-Daniel

.github/workflows/test-php.yml

@@ -5,7 +5,7 @@ concurrency:
 on:
   push:
     branches-ignore:
-      - 'master'
+      - "master"
 
 jobs:
   phplint:
@@ -15,7 +15,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: "7.4"
           extensions: simplexml
       - name: Checkout source code
         uses: actions/checkout@v2
@@ -51,7 +51,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: "7.4"
           extensions: simplexml, mysql
           tools: phpunit-polyfills
       - name: Checkout source code

composer.lock

@@ -1719,6 +1719,7 @@ span.error-message .components-external-link .components-visually-hidden{
 	margin-left: auto;
 	padding: 0;
 	height: auto;
+	box-shadow: none !important;
 }
 .fz-action-btn button {
     display: flex;
@@ -1765,7 +1766,7 @@ span.error-message .components-external-link .components-visually-hidden{
 	position: relative;
 }
 .popover-action-list{
-	width: 250px;
+	width: 270px;
 	position: absolute;
 	left: 100%;
 	bottom: 0;
@@ -2020,7 +2021,8 @@ li.draggable-item .components-panel__body-toggle.components-button{
 .fz-action-panel .fz-chat-cpt-action .components-notice {
 	width: 100%;
 }
-.fz-action-panel .fz-chat-cpt-action .components-panel__row {
+.fz-action-panel .fz-chat-cpt-action .components-panel__row,
+.fz-action-panel .fz-modify-links .components-panel__row {
 	display: block;
 }
 .fz-action-panel .fz-upgrade-notice {
@@ -2090,7 +2092,8 @@ li.draggable-item .components-panel__body-toggle.components-button{
 	cursor: not-allowed !important;
 }
 
-.fz-action-panel .fz-chat-cpt-action .fz-notice-wrap {
+.fz-action-panel .fz-chat-cpt-action .fz-notice-wrap,
+.fz-action-panel .fz-modify-links .fz-notice-wrap {
 	padding: 0;
 }
 

css/settings.css

@@ -161,7 +161,7 @@ function() {
 				'location'         => 'feedzy-admin-menu',
 				'has_upgrade_menu' => ! feedzy_is_pro(),
 				'upgrade_text'     => esc_html__( 'Upgrade to Pro', 'feedzy-rss-feeds' ),
-				'upgrade_link'     => tsdk_utmify( FEEDZY_UPSELL_LINK, 'aboutUsPage' ),
+				'upgrade_link'     => tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'aboutUsPage' ), 'query' ),
 			);
 		}
 	);
@@ -217,8 +217,8 @@ function feedzy_themeisle_log_event( $name, $msg, $type, $file, $line ) {
 			'primary_color'      => '#4268CF',
 			'pages'              => array( 'feedzy_imports', 'edit-feedzy_imports', 'edit-feedzy_categories', 'feedzy_page_feedzy-settings', 'feedzy_page_feedzy-support' ),
 			'has_upgrade_menu'   => ! feedzy_is_pro(),
-			'upgrade_link'       => tsdk_utmify( FEEDZY_UPSELL_LINK, 'floatWidget' ),
-			'documentation_link' => tsdk_utmify( 'https://docs.themeisle.com/collection/1569-feedzy-rss-feeds', 'floatWidget' ),
+			'upgrade_link'       => tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'floatWidget' ), 'query' ),
+			'documentation_link' => tsdk_translate_link( tsdk_utmify( 'https://docs.themeisle.com/collection/1569-feedzy-rss-feeds', 'floatWidget' ), 'query' ),
 			'wizard_link'        => ! feedzy_is_pro() && ! empty( get_option( 'feedzy_fresh_install', false ) ) ? admin_url( 'admin.php?page=feedzy-setup-wizard&tab#step-1' ) : '',
 		);
 	}

feedzy-rss-feed.php

@@ -32,17 +32,16 @@
 			$output .= '<div class="container feedzy_' . $item . '">';
 			$output .= '<h5>' . $section['title'] . '</h5>';
 			if ( ! feedzy_is_pro() && 'section_feed' === $item ) {
-				$upsell_url = add_query_arg(
-					array(
-						'utm_source'   => 'wpadmin',
-						'utm_medium'   => 'classiceditorshortcode',
-						'utm_campaign' => 'amazonproductadvertising',
-						'utm_content'  => 'feedzy-rss-feeds',
-					),
-					FEEDZY_UPSELL_LINK
-				);
+				$upsell_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'amazonproductadvertising', 'classiceditorshortcode' ), 'query' );
+
 				$output .= '<div class="upgrade-alert">';
-				$output .= wp_sprintf( __( '<strong>NEW! </strong>Enable Amazon Product Advertising feeds to generate affiliate revenue by <a href="%s" target="_blank">upgrading to Feedzy Pro.</a>', 'feedzy-rss-feeds' ), esc_url_raw( $upsell_url ) );
+				$output .= '<strong>' . __( 'NEW!', 'feedzy-rss-feeds' ) . '</strong>';
+				$output .= wp_sprintf(
+					// translators: %1$s: opening anchor tag, %2$s: closing anchor tag
+					__( 'Enable Amazon Product Advertising feeds to generate affiliate revenue by %1$s upgrading to Feedzy Pro. %2$s', 'feedzy-rss-feeds' ),
+					'<a target="_blank" href="' . esc_url( $upsell_url ) . '" >',
+					'</a>'
+				);
 				$output .= '</div>';
 			}
 			if ( isset( $section['description'] ) ) {

form/form.php

@@ -208,9 +208,13 @@ public function feedzy_default_error_notice( $errors, $feed, $feed_url ) {
 		$final_msg = '';
 
 		if ( $show_error ) {
-			$final_msg = '<div id="message" class="error"><p>' . sprintf( __( 'Sorry, some part of this feed is currently unavailable or does not exist anymore. The detailed error is %s', 'feedzy-rss-feeds' ), '<p style="font-weight: bold">' . wp_strip_all_tags( $error_msg ) . '</p>' );
+			$final_msg = '<div id="message" class="error"><p>' . sprintf(
+				// translators: %s: Detailed error message.
+				__( 'Sorry, some part of this feed is currently unavailable or does not exist anymore. The detailed error is %s', 'feedzy-rss-feeds' ),
+				'<p style="font-weight: bold">' . wp_strip_all_tags( $error_msg ) . '</p>'
+			);
 			if ( ! is_admin() ) {
-				$final_msg .= sprintf( __( '%1$s(Only you are seeing this detailed error because you are the creator of this post. Other users will see the error message as below.)%2$s', 'feedzy-rss-feeds' ), '<small>', '</small>' );
+				$final_msg .= '<small>(' . __( 'Only you are seeing this detailed error because you are the creator of this post. Other users will see the error message as below.', 'feedzy-rss-feeds' ) . ')</small>';
 			}
 			$final_msg .= '</p></div>';
 		} else {
@@ -989,7 +993,13 @@ protected function get_valid_source_urls( $feed_url, $cache, $echo = true ) {
 					$valid_feed_url[] = $url;
 				} else {
 					if ( $echo ) {
-						echo wp_kses_post( sprintf( __( 'Feed URL: %s not valid and removed from fetch.', 'feedzy-rss-feeds' ), '<b>' . esc_url( $url ) . '</b>' ) );
+						echo wp_kses_post(
+							sprintf(
+							// translators: %s: Feed URL.
+								__( 'Feed URL: %s not valid and removed from fetch.', 'feedzy-rss-feeds' ),
+								'<b>' . esc_url( $url ) . '</b>'
+							)
+						);
 					}
 				}
 			}
@@ -1005,7 +1015,13 @@ protected function get_valid_source_urls( $feed_url, $cache, $echo = true ) {
 				$valid_feed_url[] = $feed_url;
 			} else {
 				if ( $echo ) {
-					echo wp_kses_post( sprintf( __( 'Feed URL: %s not valid and removed from fetch.', 'feedzy-rss-feeds' ), '<b>' . esc_url( $feed_url ) . '</b>' ) );
+					echo wp_kses_post(
+						sprintf(
+							// translators: %s: Feed URL.
+							__( 'Feed URL: %s not valid and removed from fetch.', 'feedzy-rss-feeds' ),
+							'<b>' . esc_url( $feed_url ) . '</b>'
+						)
+					);
 				}
 			}
 		}
@@ -1245,7 +1261,11 @@ private function get_dry_run_results( $sc, $item ) {
 			if ( ! empty( $item['full_content_error'] ) ) {
 				$statuses[] = array(
 					'success' => false,
-					'msg'     => sprintf( __( 'Full content: %s', 'feedzy-rss-feeds' ), $item['full_content_error'] ),
+					'msg'     => sprintf(
+						// translators: %s: Error message for full content extraction.
+						__( 'Full content: %s', 'feedzy-rss-feeds' ),
+						$item['full_content_error']
+					),
 				);
 			} elseif ( isset( $item['item_full_content'] ) ) {
 				if ( ! empty( $item['item_full_content'] ) ) {
@@ -1740,6 +1760,11 @@ public function feedzy_retrieve_image( $item, $sc = null ) {
 		}
 
 		$the_thumbnail = html_entity_decode( $the_thumbnail, ENT_QUOTES, 'UTF-8' );
+
+		if ( isset( $sc['_dryrun_'] ) && 'yes' === $sc['_dryrun_'] ) {
+			return $the_thumbnail;
+		}
+
 		if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) {
 			$feed_url      = $this->normalize_urls( $sc['feeds'] );
 			$the_thumbnail = ! empty( $the_thumbnail ) ? $the_thumbnail : apply_filters( 'feedzy_default_image', $sc['default'], $feed_url );

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

@@ -313,6 +313,8 @@ public function action_process() {
 					return $this->summarize_content();
 				case 'fz_image':
 					return $this->generate_image();
+				case 'modify_links':
+					return $this->modify_links();
 				default:
 					return $this->default_content();
 			}
@@ -457,16 +459,21 @@ private function default_content() {
 		 * @return string
 		 */
 		private function chat_gpt_rewrite() {
-			$content = call_user_func( array( $this, $this->current_job->tag ) );
-			$content = wp_strip_all_tags( $content );
-			$content = substr( $content, 0, apply_filters( 'feedzy_chat_gpt_content_limit', 3000 ) );
-			$content = str_replace( array( '{content}' ), array( $content ), $this->current_job->data->ChatGPT );
+			// Return prompt content if openAI class doesn't exist.
 			if ( ! class_exists( '\Feedzy_Rss_Feeds_Pro_Openai' ) ) {
-				return $content;
+				return $this->current_job->data->ChatGPT;
 			}
-			$openai  = new \Feedzy_Rss_Feeds_Pro_Openai();
-			$content = $openai->call_api( $this->settings, $content, '', array() );
-			return $content;
+
+			$content         = call_user_func( array( $this, $this->current_job->tag ) );
+			$content         = wp_strip_all_tags( $content );
+			$content         = substr( $content, 0, apply_filters( 'feedzy_chat_gpt_content_limit', 3000 ) );
+			$prompt_content  = $this->current_job->data->ChatGPT;
+			$content         = str_replace( array( '{content}' ), array( $content ), $prompt_content );
+			$openai          = new \Feedzy_Rss_Feeds_Pro_Openai();
+			$rewrite_content = $openai->call_api( $this->settings, $content, '', array() );
+			// Replace prompt content string for specific cases.
+			$rewrite_content = str_replace( explode( '{content}', $prompt_content ), '', $rewrite_content );
+			return $rewrite_content;
 		}
 
 		/**
@@ -505,5 +512,55 @@ private function generate_image() {
 			$openai = new \Feedzy_Rss_Feeds_Pro_Openai();
 			return $openai->call_api( $this->settings, $prompt, 'image', array() );
 		}
+
+		/**
+		 * Modify links.
+		 *
+		 * @return string Item content.
+		 */
+		private function modify_links() {
+			$content = call_user_func( array( $this, $this->current_job->tag ) );
+			// Returns item content because it has no HTML tags
+			if ( $content === wp_strip_all_tags( $content ) ) {
+				return $content;
+			}
+			// Pro version is required to perform this action.
+			if ( ! feedzy_is_pro() ) {
+				return $content;
+			}
+			// converts all special characters to utf-8.
+			$content = mb_convert_encoding( $content, 'HTML-ENTITIES', 'UTF-8' );
+
+			$dom = new DOMDocument( '1.0', 'utf-8' );
+			libxml_use_internal_errors( true );
+			$dom->loadHTML( $content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD );
+			$xpath = new DOMXPath( $dom );
+			libxml_clear_errors();
+			// Get all anchors tags.
+			$nodes = $xpath->query( '//a' );
+
+			foreach ( $nodes as $node ) {
+				if ( ! empty( $this->current_job->data->remove_links ) ) {
+					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					$node->parentNode->removeChild( $node );
+					continue;
+				}
+				if ( ! empty( $this->current_job->data->target ) ) {
+					$node->setAttribute( 'target', $this->current_job->data->target );
+				}
+				if ( ! empty( $this->current_job->data->follow ) && 'yes' === $this->current_job->data->follow ) {
+					$node->setAttribute( 'rel', 'nofollow' );
+				}
+			}
+			if ( ! empty( $this->current_job->data->follow ) && 'yes' === $this->current_job->data->follow ) {
+				add_filter(
+					'wp_targeted_link_rel',
+					function() {
+						return 'nofollow';
+					}
+				);
+			}
+			return $dom->saveHTML();
+		}
 	}
 }

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

@@ -369,7 +369,7 @@ public function render_upsell_rn() {
 			<li>- Translate content</li>
 			<li>- Elementor Templates support</li>
 		</ul>';
-		echo '<a class="button button-primary  " href="' . tsdk_utmify( FEEDZY_UPSELL_LINK, 'metabox', 'new-category' ) . '" target="_blank">View more details</a>';
+		echo '<a class="button button-primary  " href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'metabox', 'new-category' ), 'query' ) ) . '" target="_blank">View more details</a>';
 
 	}
 
@@ -389,10 +389,17 @@ public function feedzy_category_feed() {
 
 		$output = '
             <input type="hidden" name="feedzy_category_meta_noncename" id="feedzy_category_meta_noncename" value="' . $nonce . '" />
-			<strong>' . sprintf( __( 'Please be aware that multiple feeds, when mashed together, may sometimes not work as expected as explained %1$shere%2$s.', 'feedzy-rss-feeds' ), '<a href="http://simplepie.org/wiki/faq/typical_multifeed_gotchas" target="_blank">', '</a>' ) . '</strong><br/><br/>'
+			<strong>' .
+			sprintf(
+				// translators: %1$s and %2$s are placeholders for HTML anchor tags.
+				__( 'Please be aware that multiple feeds, when mashed together, may sometimes not work as expected as explained %1$s here %2$s.', 'feedzy-rss-feeds' ),
+				'<a href="' . esc_url( 'https://simplepie.org/wiki/faq/typical_multifeed_gotchas' ) . '" target="_blank">',
+				'</a>'
+			)
+			. '</strong><br/><br/>'
 			. $invalid
 			. '<textarea name="feedzy_category_feed" rows="15" class="widefat" placeholder="' . __( 'Place your URL\'s here followed by a comma.', 'feedzy-rss-feeds' ) . '" >' . $feed . '</textarea>
-			<p><a href="https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation#categories" target="_blank">' . __( 'Learn how to organize feeds in Categories', 'feedzy-rss-feeds' ) . '</a></p>
+			<p><a href="' . esc_url( 'https://docs.themeisle.com/article/1119-feedzy-rss-feeds-documentation#categories' ) . '" target="_blank">' . __( 'Learn how to organize feeds in Categories', 'feedzy-rss-feeds' ) . '</a></p>
         ';
 		echo wp_kses( $output, apply_filters( 'feedzy_wp_kses_allowed_html', array() ) );
 	}
@@ -540,9 +547,9 @@ public function feedzy_filter_plugin_row_meta( $links, $file ) {
 			$new_links['doc'] = '<a href="https://docs.themeisle.com/article/658-feedzy-rss-feeds" target="_blank" title="' . __( 'Documentation and examples', 'feedzy-rss-feeds' ) . '">' . __( 'Documentation and examples', 'feedzy-rss-feeds' ) . '</a>';
 
 			if ( ! feedzy_is_pro() ) {
-				$new_links['more_features'] = '<a href="' . tsdk_utmify( FEEDZY_UPSELL_LINK, 'rowmeta', 'plugins' ) . '" target="_blank" title="' . __( 'More Features', 'feedzy-rss-feeds' ) . '">' . __( 'Upgrade to Pro', 'feedzy-rss-feeds' ) . '<i style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;" class="dashicons dashicons-unlock more-features-icon"></i></a>';
+				$new_links['more_features'] = '<a href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'rowmeta', 'plugins' ), 'query' ) ) . '" target="_blank" title="' . __( 'More Features', 'feedzy-rss-feeds' ) . '">' . __( 'Upgrade to Pro', 'feedzy-rss-feeds' ) . '<i style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;" class="dashicons dashicons-unlock more-features-icon"></i></a>';
 			} elseif ( false === apply_filters( 'feedzy_is_license_of_type', false, 'agency' ) ) {
-				$new_links['more_features'] = '<a href="' . tsdk_utmify( FEEDZY_UPSELL_LINK, 'rowmetamore', 'plugins' ) . '" target="_blank" title="' . __( 'More Features', 'feedzy-rss-feeds' ) . '">' . __( 'Upgrade your license', 'feedzy-rss-feeds' ) . '<i style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;" class="dashicons dashicons-unlock more-features-icon"></i></a>';
+				$new_links['more_features'] = '<a href="' . esc_url( tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'rowmetamore', 'plugins' ), 'query' ) ) . '" target="_blank" title="' . __( 'More Features', 'feedzy-rss-feeds' ) . '">' . __( 'Upgrade your license', 'feedzy-rss-feeds' ) . '<i style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;" class="dashicons dashicons-unlock more-features-icon"></i></a>';
 			}
 			$links = array_merge( $links, $new_links );
 		}