From 60f368054e30f098976bef9be035f569a8fb554c Mon Sep 17 00:00:00 2001
From: "Soare Robert Daniel (Mac 2023)" <soare.robert.daniel@protonmail.com>
Date: Wed, 28 Feb 2024 15:44:50 +0200
Subject: [PATCH 1/4] fix: prevent jobs from stopping the cron loop

---
 includes/admin/feedzy-rss-feeds-import.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php
index 8d63c40b..cbb5d579 100644
--- a/includes/admin/feedzy-rss-feeds-import.php
+++ b/includes/admin/feedzy-rss-feeds-import.php
@@ -1187,13 +1187,20 @@ public function run_cron( $max = 100 ) {
 			'post_status' => 'publish',
 			'numberposts' => 99,
 		);
+
 		$feedzy_imports = get_posts( $args );
 		foreach ( $feedzy_imports as $job ) {
-			$result = $this->run_job( $job, $max );
-			if ( empty( $result ) ) {
-				$this->run_job( $job, $max );
+			try {
+				$result = $this->run_job( $job, $max );
+				if ( empty( $result ) ) {
+					$this->run_job( $job, $max );
+				}
+				do_action( 'feedzy_run_cron_extra', $job );
+			} catch ( Exception $e ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					error_log( '[Feedzy Run Cron][Post title: ' . ( ! empty( $job->post_title ) ? $job->post_title : '' ) . '] Error: ' . $e->getMessage() );
+				}
 			}
-			do_action( 'feedzy_run_cron_extra', $job );
 		}
 	}
 

From 92855c50dd911c4ff33c1637df49b311ae6919f9 Mon Sep 17 00:00:00 2001
From: "Soare Robert Daniel (Mac 2023)" <soare.robert.daniel@protonmail.com>
Date: Mon, 4 Mar 2024 11:27:47 +0200
Subject: [PATCH 2/4] fix: pro feature img fetch crash free users on Cron

---
 includes/admin/feedzy-rss-feeds-import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/admin/feedzy-rss-feeds-import.php b/includes/admin/feedzy-rss-feeds-import.php
index cbb5d579..402d5a12 100644
--- a/includes/admin/feedzy-rss-feeds-import.php
+++ b/includes/admin/feedzy-rss-feeds-import.php
@@ -1782,7 +1782,7 @@ function( $term ) {
 				}
 
 				// Fetch image from graby.
-				if ( empty( $image_url ) && ( wp_doing_cron() || defined( 'FEEDZY_PRO_FETCH_ITEM_IMG_URL' ) ) ) {
+				if ( empty( $image_url ) && ( wp_doing_cron() && defined( 'FEEDZY_PRO_FETCH_ITEM_IMG_URL' ) ) ) {
 					// if license does not exist, use the site url
 					// this should obviously never happen unless on dev instances.
 					$license = apply_filters( 'product_feedzy_license_key', sprintf( 'n/a - %s', get_site_url() ) );

From a7ec5e05455eebc7f3b634fd1743cfd638a0bdc1 Mon Sep 17 00:00:00 2001
From: "Soare Robert Daniel (Mac 2023)" <soare.robert.daniel@protonmail.com>
Date: Thu, 7 Mar 2024 09:56:54 +0200
Subject: [PATCH 3/4] fix: css name conflict for `.right` class name

---
 css/metabox-settings.css               | 16 ++---
 css/settings.css                       | 19 +++---
 includes/layouts/feedzy-improve.php    |  4 +-
 includes/views/import-metabox-edit.php | 84 +++++++++++++-------------
 4 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/css/metabox-settings.css b/css/metabox-settings.css
index dfec6926..fae7c4c5 100644
--- a/css/metabox-settings.css
+++ b/css/metabox-settings.css
@@ -42,16 +42,16 @@
 	.fz-input-group{flex-wrap: wrap;}
 	.fz-input-group .fz-input-group-right{width: 100%; padding-left: 0; padding-top: 8px;}
 	.fz-input-group .fz-input-group-right .btn.dropdown-toggle{width: 100%;}
-	.fz-form-wrap .form-block.form-block-two-column .left{width: 100%; padding-right: 0; padding-bottom: 24px;}
-	.fz-form-wrap .form-block.form-block-two-column .right{width: 100%;}
-	.fz-form-action .left{width: 100%; padding-bottom: 16px;}
-	.fz-form-action .left .btn{width: 100%; display: block; text-align: center;}
-	.fz-form-action .right{width: 100%; flex-direction: column;}
-	.fz-form-action .right .btn + .btn{margin-left: 0; margin-top: 8px;}
+	.fz-form-wrap .form-block.form-block-two-column .fz-left{width: 100%; padding-right: 0; padding-bottom: 24px;}
+	.fz-form-wrap .form-block.form-block-two-column .fz-right{width: 100%;}
+	.fz-form-action .fz-left{width: 100%; padding-bottom: 16px;}
+	.fz-form-action .fz-left .btn{width: 100%; display: block; text-align: center;}
+	.fz-form-action .fz-right{width: 100%; flex-direction: column;}
+	.fz-form-action .fz-right .btn + .btn{margin-left: 0; margin-top: 8px;}
 	.fz-form-row .fz-form-col-6, .fz-form-row .fz-form-col-4, .fz-form-row .fz-form-col-8{width: 100%;}
 	.fz-document-list > ul > li{width: 100%;}
-	.fz-help-improve-box .left{width: 100%;}
-	.fz-help-improve-box .right{width: 100%;}
+	.fz-help-improve-box .fz-left{width: 100%;}
+	.fz-help-improve-box .fz-right{width: 100%;}
 	.fz-tabs-menu ul {flex-wrap: wrap;}
 	.fz-tabs-menu ul li{flex-shrink: 0; width: 50%;}
 	.fz-tabs-menu ul li a{padding: 0px; border: 1px solid transparent;}
diff --git a/css/settings.css b/css/settings.css
index 15c775ee..b5e637c1 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -350,14 +350,15 @@ fieldset[disabled] .form-control {
 	display: flex;
 	flex-wrap: wrap;
 }
-.fz-form-wrap .form-block.form-block-two-column .left{
+.fz-form-wrap .form-block.form-block-two-column .fz-left{
 	width: 285px;
 	padding-right: 24px;
 }
-.fz-form-wrap .form-block.form-block-two-column .right{
+.fz-form-wrap .form-block.form-block-two-column .fz-right{
 	width: calc(100% - 285px);
+	text-align: left;
 }
-.fz-form-wrap .form-block.form-block-two-column .right .upgrade-alert{
+.fz-form-wrap .form-block.form-block-two-column .fz-right .upgrade-alert{
 	margin-top: 20px;
 }
 .fz-form-wrap .form-block .only-pro-content{
@@ -666,14 +667,14 @@ input.fz-switch-toggle[type=checkbox]:checked:before{
 	flex-wrap: wrap;
 	justify-content: space-between;
 }
-.fz-form-action .right{
+.fz-form-action .fz-right{
 	display: flex;
 	flex-wrap: wrap;
 }
-.fz-form-action .right .btn{
+.fz-form-action .fz-right .btn{
 	margin-bottom: 8px;
 }
-.fz-form-action .right .btn + .btn{
+.fz-form-action .fz-right .btn + .btn{
 	margin-left: 16px;
 }
 
@@ -1310,18 +1311,18 @@ input.fz-switch-toggle[type=checkbox]:checked:before{
 	flex-direction: row-reverse;
 	border: 1px solid #D9D9D9;
 }
-.fz-help-improve-box .left{
+.fz-help-improve-box .fz-left{
 	width: calc(100% - 320px);
 	padding: 30px;
 }
-.fz-help-improve-box .left p{
+.fz-help-improve-box .fz-left p{
 	font-size: 16px;
 	line-height: 24px;
 	color: #050505;
 	margin-bottom: 24px;
 	max-width: 710px;
 }
-.fz-help-improve-box .right{
+.fz-help-improve-box .fz-right{
 	width: 320px;
 	padding: 18px;
 	background-color: #F5F7F9;
diff --git a/includes/layouts/feedzy-improve.php b/includes/layouts/feedzy-improve.php
index f90a4cf2..97468f48 100644
--- a/includes/layouts/feedzy-improve.php
+++ b/includes/layouts/feedzy-improve.php
@@ -1,10 +1,10 @@
 <div id="fz-feedback-modal"></div>
 <div class="fz-help-improve-wrap">
 	<div class="fz-help-improve-box">
-		<div class="right">
+		<div class="fz-right">
 			<img src="<?php echo esc_url( FEEDZY_ABSURL . 'img/improve-feedzy.png' ); ?>" alt="">
 		</div>
-		<div class="left">
+		<div class="fz-left">
 			<h3 class="h3 pb-16">Answer a few questions to help us improve Feedzy</h3>
 			<p>We're always looking for suggestions to further improve Feedzy.
 			<?php if ( ! feedzy_is_pro() ) { ?>
diff --git a/includes/views/import-metabox-edit.php b/includes/views/import-metabox-edit.php
index 03d3d8fb..ecf69cc4 100644
--- a/includes/views/import-metabox-edit.php
+++ b/includes/views/import-metabox-edit.php
@@ -126,7 +126,7 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 				<div class="fz-form-wrap">
 					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'filter-keyword', 'import' ) ); ?>
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Filter by Keyword(s)', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 							<div class="form-block-pro-text">
 								<?php
@@ -140,7 +140,7 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 								<a href="https://docs.themeisle.com/article/1154-how-to-use-feed-to-post-feature-in-feedzy#filters" target="_blank"><?php esc_html_e( 'Learn More', 'feedzy-rss-feeds' ); ?></a>
 							</div>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="fz-form-group">
 								<label class="form-label"><?php esc_html_e( 'Display item only if the selected field contains specific keyword(s)', 'feedzy-rss-feeds' ); ?></label>
 								<div class="fz-input-group">
@@ -180,10 +180,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 
 					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'exclude-items', 'import' ) ); ?>
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Exclude Items', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="fz-form-group">
 								<label class="form-label"><?php esc_html_e( 'Exclude item if the selected field contains specific keyword(s)', 'feedzy-rss-feeds' ); ?></label>
 								<div class="fz-input-group">
@@ -223,10 +223,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 
 					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'filter-time-range', 'import' ) ); ?>
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Filter by Time Range', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="date-range-group">
 								<div class="fz-form-group">
 									<label class="form-label"
@@ -286,10 +286,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 					<div class="fz-tab-content" id="fz-general">
 						<div class="fz-form-wrap">
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Type', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The post type you want to use for the generated post.', 'feedzy-rss-feeds' ); ?></label>
 										<div class="mx-320">
@@ -310,10 +310,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Taxonomy', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'Assigns the post to a Category', 'feedzy-rss-feeds' ); ?></label>
 										<div class="mx-320">
@@ -342,10 +342,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Status', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The post status for the imported posts.', 'feedzy-rss-feeds' ); ?></label>
 										<div class="mx-320">
@@ -370,10 +370,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Title', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The title for the generated post.', 'feedzy-rss-feeds' ); ?></label>
 										<div class="fz-input-group">
@@ -405,10 +405,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Date', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The date for the generated post. ', 'feedzy-rss-feeds' ); ?></label>
 										<div class="fz-input-group">
@@ -441,10 +441,10 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Content', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The content for the generated post', 'feedzy-rss-feeds' ); ?></label>
 										<div class="fz-input-group">
@@ -484,10 +484,10 @@ class="form-control fz-textarea-tagify"><?php echo esc_html( feedzy_custom_tag_e
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Featured image', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The Featured image for the generated post.', 'feedzy-rss-feeds' ); ?></label>
 										<div class="fz-input-group">
@@ -523,10 +523,10 @@ class="form-control fz-textarea-tagify"><?php echo esc_html( feedzy_custom_tag_e
 					<div class="fz-tab-content" id="fz-advanced-options">
 						<div class="fz-form-wrap">
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'External image', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<div class="fz-form-switch">
 											<input id="use-external-image" name="feedzy_meta_data[import_use_external_image]"
@@ -543,10 +543,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 
 							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'post-author', 'import' ) ); ?>
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Author', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<div class="fz-form-switch">
 											<input id="feedzy-toggle_author_admin" name="feedzy_meta_data[import_link_author_admin]"
@@ -578,10 +578,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 							</div>
 
 							<div class="form-block form-block-two-column">
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Post Excerpt', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'The Post Excerpt for the generated post', 'feedzy-rss-feeds' ); ?></label>
 										<div class="fz-input-group">
@@ -622,14 +622,14 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 
 							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'custom-fields', 'import' ) ); ?>
-								<div class="left">
+								<div class="fz-left">
 									<h4 class="h4"><?php esc_html_e( 'Custom Fields', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 									<div class="form-block-pro-text">
 									<?php esc_html_e( 'This feature is only for Pro users.', 'feedzy-rss-feeds' ); ?><br>
 										<a href="https://docs.themeisle.com/article/977-how-do-i-extract-values-from-custom-tags-in-feedzy" target="_blank"><?php esc_html_e( 'Learn More', 'feedzy-rss-feeds' ); ?></a>
 									</div>
 								</div>
-								<div class="right">
+								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label pb-16"><?php esc_html_e( 'Customizable fields to fetch custom values such as date updated, rating, etc.', 'feedzy-rss-feeds' ); ?></label>
 										<div class="custom_fields">
@@ -690,10 +690,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 				<div class="fz-form-wrap">
 					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'auto-delete', 'import' ) ); ?>
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Auto-Delete', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="fz-form-group">
 								<label class="form-label"><?php esc_html_e( 'Delete the posts created for this import after a number of days', 'feedzy-rss-feeds' ); ?></label>
 								<input type="number" min="0" max="9999" id="feedzy_delete_days" name="feedzy_meta_data[import_feed_delete_days]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_delete_days ); ?>" />
@@ -705,10 +705,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 					</div>
 
 					<div class="form-block form-block-two-column">
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Remove Duplicates', 'feedzy-rss-feeds' ); ?></h4>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="fz-form-group">
 								<div class="fz-form-switch">
 									<input id="remove-duplicates" name="feedzy_meta_data[import_remove_duplicates]"
@@ -725,10 +725,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 					</div>
 
 					<div class="form-block form-block-two-column">
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Items Count', 'feedzy-rss-feeds' ); ?></h4>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="fz-form-group">
 								<label class="form-label"><?php esc_html_e( 'How many feed items to import from the source?', 'feedzy-rss-feeds' ); ?></label>
 								<input type="number" min="0" max="9999" id="feedzy_item_limit" name="feedzy_meta_data[import_feed_limit]" class="form-control" value="<?php echo esc_attr( (int) $import_feed_limit ); ?>" />
@@ -740,10 +740,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 					</div>
 					<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
 						<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-imaget', 'import' ) ); ?>
-						<div class="left">
+						<div class="fz-left">
 							<h4 class="h4"><?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 						</div>
-						<div class="right">
+						<div class="fz-right">
 							<div class="fz-form-group">
 								<label class="form-label"><?php esc_html_e( 'Select an image to be the fallback featured image.', 'feedzy-rss-feeds' ); ?></label>
 								<?php
@@ -768,7 +768,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 					</div>
 					<?php if ( function_exists( 'icl_get_languages' ) ) : ?>
 						<div class="form-block form-block-two-column">
-							<div class="left">
+							<div class="fz-left">
 								<h4 class="h4"><?php esc_html_e( 'Assign Language', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
 								<?php if ( ! feedzy_is_pro() ) : ?>
 									<div class="form-block-pro-text">
@@ -777,7 +777,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 									</div>
 								<?php endif; ?>
 							</div>
-							<div class="right">
+							<div class="fz-right">
 								<div class="fz-form-group">
 									<label class="form-label"><?php esc_html_e( 'Content Language after import', 'feedzy-rss-feeds' ); ?></label>
 									<div class="mx-320">
@@ -1020,13 +1020,13 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 						$target_lang = apply_filters( 'feedzy_available_automatically_translation_language', $target_lang );
 						?>
 						<div class="form-block form-block-two-column">
-							<div class="left">
+							<div class="fz-left">
 								<h4 class="h4"><?php esc_html_e( 'Enable automatic translation?', 'feedzy-rss-feeds' ); ?></h4>
 									<div class="form-block-pro-text">
 										<?php esc_html_e( 'Enable and select the language to translate the text automatically. Enable this only if you used the Translate magic tags. The default is English', 'feedzy-rss-feeds' ); ?>
 									</div>
 							</div>
-							<div class="right">
+							<div class="fz-right">
 								<div class="fz-form-group">
 									<div style="margin-bottom: 5px;">
 										<input id="feedzy-auto-translation" name="feedzy_meta_data[import_auto_translation]" class="fz-switch-toggle" type="checkbox" value="yes" <?php echo esc_attr( $import_auto_translation ); ?>>
@@ -1056,7 +1056,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 
 	<input type="hidden" id="custom_post_status" name="custom_post_status" value="draft" />
 	<div class="fz-form-action">
-		<div class="left">
+		<div class="fz-left">
 			<?php
 				$clone_url = wp_nonce_url(
 					add_query_arg(
@@ -1072,7 +1072,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 				?>
 			<a href="<?php echo esc_url( $clone_url ); ?>" class="btn btn-ghost"><?php esc_html_e( 'Clone Import', 'feedzy-rss-feeds' ); ?></a>
 		</div>
-		<div class="right">
+		<div class="fz-right">
 			<button type="button" id="preflight" name="check" class="btn btn-ghost" value="Check"
 			title="<?php esc_html_e( 'Click to see what items will be imported from the source, according to the filters specified', 'feedzy-rss-feeds' ); ?>"><?php esc_html_e( 'Preview  Import', 'feedzy-rss-feeds' ); ?></button>
 			<?php

From 2533ef6def925c453bf9ea4c18f75db26f718653 Mon Sep 17 00:00:00 2001
From: Bogdan Preda <bogdan.preda@themeisle.com>
Date: Wed, 13 Mar 2024 17:24:57 +0200
Subject: [PATCH 4/4] [skip ci] add checklist and improve doc

---
 .github/PULL_REQUEST_TEMPLATE.md   |  27 +++
 .github/workflows/pr-checklist.yml |  26 +++
 CONTRIBUTING.md                    | 295 ++++++++++++++++++++++++++++-
 3 files changed, 347 insertions(+), 1 deletion(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/workflows/pr-checklist.yml

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..c4b39a78
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,27 @@
+### Summary
+<!-- Please describe the changes you made. -->
+
+### Will affect visual aspect of the product
+<!-- It includes visual changes? -->
+YES/NO
+
+### Screenshots <!-- if applicable -->
+
+### Test instructions
+<!-- Describe how this pull request can be tested. -->
+
+- 
+- 
+
+## Check before Pull Request is ready:
+
+* [ ] I have [written a test](CONTRIBUTING.md#writing-an-acceptance-test) and included it in this PR
+* [ ] I have [run all tests](CONTRIBUTING.md#run-tests) and they pass
+* [ ] The code passes when [running the PHP CodeSniffer](CONTRIBUTING.md#run-php-codesniffer)
+* [ ] Code meets [WordPress Coding Standards](CONTRIBUTING.md#coding-standards) for PHP, HTML, CSS and JS
+* [ ] [Security and Sanitization](CONTRIBUTING.md#security-and-sanitization) requirements have been followed
+* [ ] I have assigned a reviewer or two to review this PR (if you're not sure who to assign, we can do this step for you)
+
+<!-- Issues that this pull request closes. -->
+Closes #.
+<!-- Should look like this: `Closes #1, #2, #3.` . -->
diff --git a/.github/workflows/pr-checklist.yml b/.github/workflows/pr-checklist.yml
new file mode 100644
index 00000000..a6e9ba7f
--- /dev/null
+++ b/.github/workflows/pr-checklist.yml
@@ -0,0 +1,26 @@
+name: Add labels to pull request based on checklist
+
+on:
+  pull_request:
+    types: [ opened, edited, synchronize, labeled, unlabeled ]
+    branches-ignore:
+      - 'master'
+      - 'update_dependencies'
+
+permissions: write-all
+
+jobs:
+  add-labels:
+    runs-on: ubuntu-latest
+    name: Label PR based on checklist
+    if: github.event.pull_request.draft == false && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && github.actor != 'dependabot[bot]'
+    steps:
+      - name: Check if checklist items are completed
+        uses: Codeinwp/gha-pr-check-helper@master
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          requireChecklist: true
+          onlyCheckBody: true
+          completedLabel: "pr-checklist-complete"
+          incompleteLabel: "pr-checklist-incomplete"
+          skipLabel: "pr-checklist-skip"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 36b5b5b1..661b81a5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,4 +10,297 @@ How to release a new version:
     - `release: <release short description>` - for patch release
     - `release(minor): <release short description>` - for minor release
     - `release(major): <release short description>` - for major release
-      The release notes will inherit the body of the commit message which triggered the release. For more details check the [simple-preset](https://github.com/Codeinwp/conventional-changelog-simple-preset) that we use.
\ No newline at end of file
+      The release notes will inherit the body of the commit message which triggered the release. For more details check the [simple-preset](https://github.com/Codeinwp/conventional-changelog-simple-preset) that we use.
+
+# CONTRIBUTING GUIDELINES
++ [Setup Guide](#setup-guide)
++ [Development Guide](#development-guide)
++ [Testing Guide](#testing-guide)
+
+# Setup Guide
+
+This document describes how to set up your development environment, so that it is ready to run, develop and test this WordPress Plugin or Theme.
+
+Suggestions are provided for the LAMP/LEMP stack and Git client are for those who prefer the UI over a command line and/or are less familiar with
+WordPress, PHP, MySQL and Git - but you're free to use your preferred software.
+
+## Setup
+
+### LAMP/LEMP stack
+
+Any Apache/nginx, PHP 7.x+ and MySQL 5.8+ stack running WordPress.  For example, but not limited to:
+- Valet (recommended)
+- Local by Flywheel
+- Docker
+- MAMP
+- WAMP
+
+### Composer
+
+If [Composer](https://getcomposer.org) is not installed on your local environment, enter the following commands at the command line to install it:
+
+```bash
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+php -r "if (hash_file('sha384', 'composer-setup.php') === '906a84df04cea2aa72f40b5f787e49f22d4c2f19492ac310e8cba5b96ac8b64115ac402c8cd292b8a03482574915d1a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+php composer-setup.php
+php -r "unlink('composer-setup.php');"
+sudo mv composer.phar /usr/local/bin/composer
+```
+
+Confirm that installation was successful by entering the `composer --version` command at the command line
+
+### Clone Repository
+
+Using your preferred Git client or command line, clone this repository into the `wp-content/plugins/` folder of your local WordPress installation.
+
+If you prefer to clone the repository elsewhere, and them symlink it to your local WordPress installation, that will work as well.
+
+If you're new to this, use [GitHub Desktop](https://desktop.github.com/) or [Tower](https://www.git-tower.com/mac)
+
+For Plugins the cloned folder should be under `wp-content/plugins/` and for Themes under `wp-content/themes/`.
+
+### Install Dependencies for PHP and JS
+
+In the cloned repository's directory, at the command line, run `composer install`.
+This will install the development dependencies. If you want to install just the production dependencies, run `composer install --no-dev`.
+
+The development dependencies include:
+- PHPStan
+- PHPUnit
+- PHP_CodeSniffer
+- WordPress Coding Standards
+- WordPress PHPUnit Polyfills
+
+For the JS dependencies, run `npm install`.
+To watch for changes in the JS files, run `npm run dev` if present or `npm run dist` to build a new version.
+
+### PHP_CodeSniffer
+
+To run PHP_CodeSniffer, run `composer lint`. This will run the WordPress Coding Standards checks.
+To fix automatically fixable issues, run `composer format`.
+
+### PHPUnit
+
+To run PHPUnit, run `phpunit` or `./vendor/bin/phpunit` if it is not configured globally.
+
+### E2E Tests
+If the folder `e2e-tests` is present, you can run the E2E tests by following the instructions in the [E2E testing](./e2e-tests/README.md).
+
+### Next Steps
+
+With your development environment setup, you'll probably want to start development, which is covered bellow in the **Development Guide**.
+
+
+
+# Development Guide
+
+This document describes the high level workflow used when working on a WordPress Plugin or Theme.
+
+You're free to use your preferred IDE and Git client. We recommend PHPStorm or Visual Studio Code, and GitHub CLI.
+
+## Prerequisites
+
+If you haven't yet set up your local development environment with a WordPress Plugin repository installed, refer to the [Setup Guide](#setup-guide).
+
+his is for a new feature that does not have a GitHub Issue number, enter a short descriptive name for the branch, relative to what you're working on
+- If this is for a feature/bug that has a GitHub Issue number, enter feat/issue_name or fix/issue_name, where issue_name is a descriptive name for the issue
+
+Once done, make sure you've switched to your new branch, and begin making the necessary code additions/changes/deletions.
+
+## Coding Standards
+
+Code must follow [WordPress Coding standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/), which is checked
+when running tests (more on this below).
+
+## Security and Sanitization
+
+When [outputting data](https://developer.wordpress.org/plugins/security/securing-output/), escape it using WordPress' escaping functions such as `esc_html()`, `esc_attr__()`, `wp_kses()`, `wp_kses_post()`.
+
+When reading [user input](https://developer.wordpress.org/plugins/security/securing-input/), sanitize it using WordPress' sanitization functions such as `sanitize_text_field()`, `sanitize_textarea_field()`.
+
+When writing to the database, prepare database queries using ``$wpdb->prepare()``
+
+Never trust user input. Sanitize it.
+
+Make use of [WordPress nonces](https://codex.wordpress.org/WordPress_Nonces) for saving form submitted data.
+
+Coding standards will catch any sanitization, escaping or database queries that aren't prepared.
+
+## Composer Packages
+
+We use Composer for package management.  A package can be added to one of two sections of the `composer.json` file: `require` or `require-dev`.
+
+### "require"
+
+Packages listed in the "require" directive are packages that the Plugin needs in order to function for end users.
+
+These packages are included when the Plugin is deployed to WordPress.org
+
+Typically, packages listed in this section would be libraries that the Plugin uses.
+
+### "require-dev"
+
+Packages listed in the "require-dev" directive are packages that the Plugin **does not** need in order to function for end users.
+
+These packages are **not** included when the Plugin is deployed to wordpress.org
+
+Typically, packages listed in this section would be internal development tools for testing, such as:
+- Coding Standards
+- PHPStan
+- PHPUnit
+
+## Committing Work
+
+Remember to commit your changes to your branch relatively frequently, with a meaningful, short summary that explains what the change(s) do.
+This helps anyone looking at the commit history in the future to find what they might be looking for.
+
+If it's a particularly large commit, be sure to include more information in the commit description.
+
+## Next Steps
+
+Once you've finished your feature or issue, you must write/amend tests for it.  Refer to the [Testing Guide](#testing-guide) for a detailed walkthrough
+on how to write a test.
+
+
+
+# Testing Guide
+
+This document describes how to:
+- create and run tests for your development work,
+- ensure code meets PHP and WordPress Coding Standards, for best practices and security,
+- ensure code passes static analysis, to catch potential errors that tests might miss
+
+If you're new to creating and running tests, this guide will walk you through how to do this.
+
+For those more experienced with creating and running tests, our tests are written in TS for [Playwright](https://playwright.dev/) used for End-to-End testing,
+and in PHP for [PHPUnit](https://phpunit.de/).
+
+A PHPUnit guide for WordPress can be found [here](https://make.wordpress.org/core/handbook/testing/automated-testing/phpunit/).
+
+## Prerequisites
+
+If you haven't yet set up your local development environment with this Plugin repository installed, refer to the [Setup Guide](#setup-guide).
+
+If you haven't yet created a branch and made any code changes to the Plugin or Theme, refer to the [Development Guide](#development-guide)
+
+## Write (or modify) a test
+
+If your work creates new functionality, write a test.
+
+If your work fixes existing functionality, check if a test exists. Either update that test, or create a new test if one doesn't exist.
+
+Tests are written in TS using [Playwright](https://playwright.dev/) and PHP using [PHPUnit](https://phpunit.de/).
+
+## Types of Test
+
+There are different types of tests that can be written:
+- Acceptance Tests: Test as a non-technical user in the web browser.
+- Functional Tests: Test the framework (WordPress).
+- Integration Tests: Test code modules in the context of a WordPress website.
+- Unit Tests: Test single PHP classes or functions in isolation.
+- WordPress Unit Tests: Test single PHP classes or functions in isolation, with WordPress functions and classes loaded.
+
+There is no definitive / hard guide, as a test can typically overlap into different types (such as Acceptance and Functional).
+
+The most important thing is that you have a test for *something*.  If in doubt, an Acceptance Test will suffice.
+
+### Writing an Acceptance Test
+
+An acceptance test is a test that simulates a user interacting with the Plugin or Theme in a web browser.
+Refer to Writing an End-to-End Test below.
+
+### Writing an End-to-End Test
+
+To write an End-to-End test, create a new file under `e2e-tests/specs` with the name of the spec or functionality you are testing, and add `.spec.test` to the file name.
+
+E.g. for `e2e-tests/specs/checkout.spec.test.js`, the test file should be `checkout.spec.test.js`.
+
+For more information on writing End-to-End tests, refer to the [Playwright documentation](https://playwright.dev/docs/test-intro).
+
+You can check End-to-End [README](./e2e-tests/README.md) for more details.
+
+## Writing a WordPress Unit Test
+
+WordPress Unit tests provide testing of Plugin/Theme specific functions and/or classes, typically to assert that they perform as expected
+by a developer.  This is primarily useful for testing our API class, and confirming that any Plugin registered filters return
+the correct data.
+
+To create a new WordPress Unit Test, create a new file under `tests/php/unit` with the name of the class you are testing, and the suffix `Test`.
+The filename should be in `lower-case-with-dash`, and the class name should be in `CamelCase`.
+
+E.g. for `tests/php/unit/class-api-test.php`, the test class should be `class APITest extends \PHPUnit\Framework\TestCase`.
+
+```php
+<?php
+class APITest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \WpunitTester
+     */
+    protected $tester;
+    
+    public function setUp(): void
+    {
+        // Before...
+        parent::setUp();
+        // Your set up methods here.
+    }
+    public function tearDown(): void
+    {
+        // Your tear down methods here.
+        // Then...
+        parent::tearDown();
+    }
+    // Tests
+    public function test_it_works()
+    {
+        $post = static::factory()->post->create_and_get();
+        
+        $this->assertInstanceOf(\WP_Post::class, $post);
+    }
+}
+```
+
+## Run PHPUnit Tests
+
+Once you have written your code and test(s), run the tests to make sure there are no errors.
+
+```bash
+./vendor/bin/phpunit tests/php/unit/class-api-test.php
+```
+
+Any errors should be corrected by making applicable code or test changes.
+
+## Run PHP CodeSniffer
+
+In the Plugin's or Theme's directory, run the following command to run PHP_CodeSniffer, which will check the code meets Coding Standards
+as defined in the `phpcs.tests.xml` configuration:
+
+```bash
+composer run lint 
+```
+
+`--standard=phpcs.tests.xml` tells PHP CodeSniffer to use the Coding Standards rules / configuration defined in `phpcs.tests.xml`.
+These differ slightly from WordPress' Coding Standards, to ensure that writing tests isn't a laborious task, whilst maintain consistency
+in test coding style.
+`-v` produces verbose output
+`-s` specifies the precise rule that failed
+
+Any errors should be corrected by either:
+- making applicable code changes
+- running `composer run format` to automatically fix coding standards
+
+Need to change the PHP or WordPress coding standard rules applied?  Either:
+- ignore a rule in the affected code, by adding `phpcs:ignore {rule}`, where {rule} is the given rule that failed in the above output.
+- edit the [phpcs.tests.xml](phpcs.tests.xml) file.
+
+## Next Steps
+
+Once your test(s) are written and successfully run locally, submit your branch via a new **Pull Request**.
+
+It's best to create a Pull Request in draft mode, as this will trigger all tests to run as a GitHub Action, allowing you to
+double-check all tests pass.
+
+If the PR tests fail, you can make code changes as necessary, pushing to the same branch.  This will trigger the tests to run again.
+
+If the PR tests pass, you can publish the PR, assigning some reviewers.