Merge pull request #638 from ProgressPlanner/ari/code-review

aristath · web-flow · commit ef8a14e75f97 · 2025-09-26T07:28:07.000+03:00
code review tweaks
diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -558,4 +558,3 @@ button.prpl-info-icon {
 		transform: rotate(360deg);
 	}
 }
-
diff --git a/views/admin-page-header.php b/views/admin-page-header.php
@@ -10,11 +10,6 @@
 	exit;
 }
 
-// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-$progress_planner_active_range = isset( $_GET['range'] ) ? \sanitize_text_field( \wp_unslash( $_GET['range'] ) ) : '-6 months';
-// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-$progress_planner_active_frequency = isset( $_GET['frequency'] ) ? \sanitize_text_field( \wp_unslash( $_GET['frequency'] ) ) : 'monthly';
-
 \do_action( 'progress_planner_admin_page_header_before' );
 ?>
 <div class="prpl-header">
@@ -55,7 +50,7 @@
 					\printf(
 						'<option value="%1$s" %2$s>%3$s</option>',
 						\esc_attr( $progress_planner_range ),
-						\selected( $progress_planner_active_range, $progress_planner_range, false ),
+						\selected( isset( $_GET['range'] ) ? \sanitize_text_field( \wp_unslash( $_GET['range'] ) ) : '-6 months', $progress_planner_range, false ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 						\esc_html( $progress_planner_label )
 					);
 				}
@@ -73,7 +68,7 @@
 					\printf(
 						'<option value="%1$s" %2$s>%3$s</option>',
 						\esc_attr( $progress_planner_frequency ),
-						\selected( $progress_planner_active_frequency, $progress_planner_frequency, false ),
+						\selected( isset( $_GET['frequency'] ) ? \sanitize_text_field( \wp_unslash( $_GET['frequency'] ) ) : 'monthly', $progress_planner_frequency, false ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 						\esc_html( $progress_planner_label )
 					);
 				}
diff --git a/views/admin-page.php b/views/admin-page.php
@@ -11,7 +11,6 @@
 }
 
 $prpl_privacy_policy_accepted = \progress_planner()->is_privacy_policy_accepted();
-$prpl_wrapper_class           = '';
 
 if ( 0 !== (int) \progress_planner()->get_ui__branding()->get_branding_id() ) {
 	$prpl_license_key = \progress_planner()->get_utils__onboard()->make_remote_onboarding_request();
@@ -20,13 +19,9 @@
 		$prpl_privacy_policy_accepted = true;
 	}
 }
-
-if ( ! $prpl_privacy_policy_accepted ) {
-	$prpl_wrapper_class = 'prpl-pp-not-accepted';
-}
 ?>
 
-<div class="wrap prpl-wrap <?php echo \esc_attr( $prpl_wrapper_class ); ?>">
+<div class="wrap prpl-wrap <?php echo \esc_attr( $prpl_privacy_policy_accepted ? '' : 'prpl-pp-not-accepted' ); ?>">
 	<?php if ( true === $prpl_privacy_policy_accepted ) : ?>
 		<h1 class="screen-reader-text"><?php \esc_html_e( 'Progress Planner', 'progress-planner' ); ?></h1>
 		<?php \progress_planner()->the_view( 'admin-page-header.php' ); ?>
diff --git a/views/page-widgets/content-activity.php b/views/page-widgets/content-activity.php
@@ -97,9 +97,7 @@ function ( $activity ) use ( $prpl_tracked_post_types ) {
 	);
 	?>
 </h2>
-<p>
-	<?php \esc_html_e( 'Here are the updates you made to your content last week. Whether you published something new, updated an existing post, or removed outdated content, it all helps you stay on top of your site!', 'progress-planner' ); ?>
-</p>
+<p><?php \esc_html_e( 'Here are the updates you made to your content last week. Whether you published something new, updated an existing post, or removed outdated content, it all helps you stay on top of your site!', 'progress-planner' ); ?></p>
 
 <prpl-big-counter
 	number="<?php echo \esc_html( \number_format_i18n( (int) $prpl_activities_count['all'] ) ); ?>"
diff --git a/views/page-widgets/latest-badge.php b/views/page-widgets/latest-badge.php
@@ -25,17 +25,17 @@
 	<p><?php \esc_html_e( 'You haven\'t unlocked any badges yet. Hang on, you\'ll get there!', 'progress-planner' ); ?></p>
 <?php else : ?>
 	<p>
-		<?php if ( \str_starts_with( $prpl_latest_badge->get_id(), 'monthly-' ) ) : ?>
-			<?php \esc_html_e( 'Wooohoooo! Congratulations! You have earned a new badge.', 'progress-planner' ); ?>
-		<?php else : ?>
-			<?php
+		<?php
+		if ( \str_starts_with( $prpl_latest_badge->get_id(), 'monthly-' ) ) {
+			\esc_html_e( 'Wooohoooo! Congratulations! You have earned a new badge.', 'progress-planner' );
+		} else {
 			\printf(
 				/* translators: %s: The badge name. */
 				\esc_html__( 'Wooohoooo! Congratulations! You have earned a new badge. You are now a %s.', 'progress-planner' ),
 				'<strong>' . \esc_html( $prpl_latest_badge->get_name() ) . '</strong>'
 			);
-			?>
-		<?php endif; ?>
+		}
+		?>
 	</p>
 	<img
 		src="<?php echo \esc_url( \progress_planner()->get_admin__widgets__latest_badge()->endpoint . $prpl_latest_badge->get_id() ); ?>"
diff --git a/views/page-widgets/monthly-badges.php b/views/page-widgets/monthly-badges.php
@@ -54,34 +54,15 @@
 	<hr>
 <?php endif; ?>
 
-
-
 <div class="prpl-widget-content">
-	<?php if ( 2024 === (int) \gmdate( 'Y' ) ) : ?>
-		<?php
-		\progress_planner()->the_view(
-			'page-widgets/parts/monthly-badges-2024.php',
-			[
-				'title_tag' => 'h2',
-			]
-		);
-		?>
-	<?php else : ?>
-
-		<?php
-		\progress_planner()->the_view(
-			'page-widgets/parts/monthly-badges.php',
-			[
-				'title_year' => 2025,
-			]
-		);
-		?>
-	<?php endif; ?>
 	<?php
-	\progress_planner()->get_ui__popover()->the_popover( 'monthly-badges' )->render_button(
-		'',
-		\esc_html__( 'Show all badges', 'progress-planner' )
-	);
+	if ( 2024 === (int) \gmdate( 'Y' ) ) {
+		\progress_planner()->the_view( 'page-widgets/parts/monthly-badges-2024.php', [ 'title_tag' => 'h2' ] );
+	} else {
+		\progress_planner()->the_view( 'page-widgets/parts/monthly-badges.php', [ 'title_year' => 2025 ] );
+	}
+
+	\progress_planner()->get_ui__popover()->the_popover( 'monthly-badges' )->render_button( '', \esc_html__( 'Show all badges', 'progress-planner' ) );
 	\progress_planner()->get_ui__popover()->the_popover( 'monthly-badges' )->render();
 	?>
 </div>
diff --git a/views/page-widgets/suggested-tasks.php b/views/page-widgets/suggested-tasks.php
@@ -38,10 +38,8 @@
 	<p class="prpl-suggested-tasks-loading">
 		<?php \esc_html_e( 'Loading tasks...', 'progress-planner' ); ?>
 	</p>
-	<?php
-	// Check if the request URI contains the parameter 'prpl_show_all_recommendations'.
-	$prpl_request_uri = isset( $_SERVER['REQUEST_URI'] ) ? \sanitize_text_field( \wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
-	?>
+	<?php // Check if the request URI contains the parameter 'prpl_show_all_recommendations'. ?>
+	<?php $prpl_request_uri = isset( $_SERVER['REQUEST_URI'] ) ? \sanitize_text_field( \wp_unslash( $_SERVER['REQUEST_URI'] ) ) : ''; ?>
 	<p class="prpl-show-all-tasks">
 		<?php if ( false === strpos( $prpl_request_uri, 'prpl_show_all_recommendations' ) ) : ?>
 			<a href="<?php echo \esc_url( \add_query_arg( 'prpl_show_all_recommendations', '', \admin_url( 'admin.php?page=progress-planner&prpl_show_all_recommendations' ) ) ); ?>">
diff --git a/views/popovers/email-sending.php b/views/popovers/email-sending.php
@@ -21,7 +21,7 @@
 		<div class="prpl-column prpl-column-content">
 			<h2 class="prpl-interactive-task-title"><?php \esc_html_e( 'Test if your site can send emails', 'progress-planner' ); ?></h2>
 			<p class="prpl-interactive-task-description"><?php \esc_html_e( 'Your WordPress site sometimes needs to send emails. For example, to reset a password, send a comment notification, or warn you when something breaks. Contact forms also use email.', 'progress-planner' ); ?></p>
-			<p class="prpl-interactive-task-description"><?php \esc_html_e( 'It’s important to check if these emails are actually sent. Enter your email address on the right to get a test email.', 'progress-planner' ); ?></p>
+			<p class="prpl-interactive-task-description"><?php \esc_html_e( 'It is important to check if these emails are actually sent. Enter your email address on the right to get a test email.', 'progress-planner' ); ?></p>
 		</div>
 		<div class="prpl-column">
 			<p><?php \esc_html_e( 'Where should we send the test email?', 'progress-planner' ); ?></p>
@@ -38,10 +38,8 @@
 
 				<div class="prpl-steps-nav-wrapper">
 					<button class="prpl-button" data-action="showResults" type="submit">
-						<?php
-						/* translators: %s is a forward arrow icon. */
-						\printf( \esc_html__( 'Next step %s', 'progress-planner' ), '<span class="dashicons dashicons-arrow-right-alt2"></span>' );
-						?>
+						<?php /* translators: %s is a forward arrow icon. */ ?>
+						<?php \printf( \esc_html__( 'Next step %s', 'progress-planner' ), '<span class="dashicons dashicons-arrow-right-alt2"></span>' ); ?>
 					</button>
 				</div>
 			</form>
@@ -72,7 +70,7 @@
 				<span class="prpl-note-text" data-email-message="
 					<?php
 						/* translators: %s is the error message. */
-						\printf( \esc_attr__( 'The test email didn’t work. The error message was: [ERROR_MESSAGE]', 'progress-planner' ), \esc_attr( $prpl_email_error ) );
+						\printf( \esc_attr__( 'The test email did not work. The error message was: [ERROR_MESSAGE]', 'progress-planner' ), \esc_attr( $prpl_email_error ) );
 					?>
 				">
 				</span>
@@ -82,7 +80,7 @@
 				<?php
 				\printf(
 					/* translators: %s is a link to the troubleshooting guide. */
-					\esc_html__( 'There are a few common reasons why your email might not be sending. Check the %s to find out what’s causing the issue and how to fix it.', 'progress-planner' ),
+					\esc_html__( 'There are a few common reasons why your email might not be sending. Check the %s to find out what is causing the issue and how to fix it.', 'progress-planner' ),
 					'<a href="' . \esc_url( $prpl_troubleshooting_guide_url ) . '" target="_blank">' . \esc_html__( 'troubleshooting guide', 'progress-planner' ) . '</a>'
 				);
 				?>
@@ -184,7 +182,8 @@
 			<p class="prpl-interactive-task-description">
 				<?php \esc_html_e( 'We\'re sorry to hear you did not receive our confirmation email yet. On some websites, it make take up to a few hours to send email. That\'s why we strongly advise you to check back in a few hours from now.', 'progress-planner' ); ?>
 			</p>
-			<p class="prpl-interactive-task-description"><?php \esc_html_e( 'If you already waited a couple of hours and you still didn\'t get our email, your email might not be working well.', 'progress-planner' ); ?>
+			<p class="prpl-interactive-task-description">
+				<?php \esc_html_e( 'If you already waited a couple of hours and you still didn\'t get our email, your email might not be working well.', 'progress-planner' ); ?>
 			</p>
 		</div>
 
diff --git a/views/popovers/monthly-badges.php b/views/popovers/monthly-badges.php
@@ -52,16 +52,13 @@
 					<?php $prpl_group_badges = \progress_planner()->get_badges()->get_badges( $prpl_badge_group ); ?>
 					<div class="progress-wrapper badge-group-<?php echo \esc_attr( $prpl_badge_group ); ?>">
 						<?php foreach ( $prpl_group_badges as $prpl_badge ) : ?>
-							<?php
-							$prpl_badge_progress  = $prpl_badge->get_progress();
-							$prpl_badge_completed = 100 === (int) $prpl_badge_progress['progress'];
-							?>
+							<?php $prpl_badge_progress = $prpl_badge->get_progress(); ?>
 							<span
 								class="prpl-badge"
 								data-value="<?php echo \esc_attr( $prpl_badge_progress['progress'] ); ?>"
 							>
 								<prpl-badge
-									complete="<?php echo $prpl_badge_completed ? 'true' : 'false'; ?>"
+									complete="<?php echo 100 === (int) $prpl_badge_progress['progress'] ? 'true' : 'false'; ?>"
 									badge-id="<?php echo \esc_attr( $prpl_badge->get_id() ); ?>"
 									badge-name="<?php echo \esc_attr( $prpl_badge->get_name() ); ?>"
 									branding-id="<?php echo (int) \progress_planner()->get_ui__branding()->get_branding_id(); ?>"
diff --git a/views/popovers/subscribe-form.php b/views/popovers/subscribe-form.php
@@ -17,13 +17,13 @@
 
 <form id="prpl-settings-license-form">
 	<p>
-	<?php
-	\printf(
-		/* translators: %s: progressplanner.com link */
-		\esc_html__( 'We can send you weekly emails with your own to-do’s, your activity stats and nudges to keep you working on your site. To do this, we’ll create an account for you on %s.', 'progress-planner' ),
-		'<a href="' . \esc_url( \progress_planner()->get_ui__branding()->get_url( 'https://prpl.fyi/home' ) ) . '" target="_blank">progressplanner.com</a>'
-	)
-	?>
+		<?php
+		\printf(
+			/* translators: %s: progressplanner.com link */
+			\esc_html__( 'We can send you weekly emails with your own to-dos, your activity stats and nudges to keep you working on your site. To do this, we’ll create an account for you on %s.', 'progress-planner' ),
+			'<a href="' . \esc_url( \progress_planner()->get_ui__branding()->get_url( 'https://prpl.fyi/home' ) ) . '" target="_blank">progressplanner.com</a>'
+		)
+		?>
 	</p>
 	<div class="prpl-form-fields">
 		<label>
diff --git a/views/setting/page-select.php b/views/setting/page-select.php
@@ -12,14 +12,9 @@
 
 $prpl_setting_value = isset( $prpl_setting['value'] ) ? $prpl_setting['value'] : '';
 
-// Default values.
-$prpl_select_value = 0;
-$prpl_radio_value  = ( '_no_page_needed' === $prpl_setting_value ) ? 'not-applicable' : 'no';
-
-if ( \is_numeric( $prpl_setting_value ) && 0 < $prpl_setting_value ) {
-	$prpl_radio_value  = 'yes';
-	$prpl_select_value = (int) $prpl_setting_value;
-}
+// Default value for the radio button.
+$prpl_radio_value = '_no_page_needed' === $prpl_setting_value ? 'not-applicable' : 'no';
+$prpl_radio_value = \is_numeric( $prpl_setting_value ) && 0 < $prpl_setting_value ? 'yes' : $prpl_radio_value;
 
 ?>
 <div
@@ -50,16 +45,14 @@ class="prpl-pages-item prpl-pages-item-<?php echo \esc_attr( $prpl_setting['page
 					'not-applicable' => \esc_html__( 'My site doesn\'t need this page', 'progress-planner' ),
 				] as $prpl_r_value => $prpl_r_label ) :
 					$prpl_radio_checked = ( 'no' === $prpl_r_value && 'no' === $prpl_setting['isset'] );
-					if ( ! $prpl_radio_checked ) {
-						$prpl_radio_checked = ( $prpl_radio_value === $prpl_r_value );
-					}
+					$prpl_radio_checked = ! $prpl_radio_checked ? $prpl_radio_value === $prpl_r_value : $prpl_radio_checked;
 					?>
 					<div class="prpl-radio-wrapper">
 						<label>
 							<input
-							type="radio"
-							id="<?php echo \esc_attr( 'pages[' . \esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>"
-							name="<?php echo \esc_attr( 'pages[' . \esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>"
+								type="radio"
+								id="<?php echo \esc_attr( 'pages[' . \esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>"
+								name="<?php echo \esc_attr( 'pages[' . \esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>"
 								value="<?php echo \esc_attr( $prpl_r_value ); ?>"
 								data-page="<?php echo \esc_attr( $prpl_setting['page'] ); ?>"
 								<?php echo $prpl_radio_checked ? ' checked' : ''; ?>
diff --git a/views/welcome.php b/views/welcome.php
@@ -37,28 +37,22 @@
 					<strong class="prpl-form-notice-title"><?php \esc_html_e( 'Stay on track with weekly updates', 'progress-planner' ); ?></strong>
 					<ul>
 						<li>
-						<?php
-						/* translators: %s: <strong> tag */
-						\printf( \esc_html__( '%1$s Personalized to-do’s %2$s to keep your site in great shape.', 'progress-planner' ), '<strong>', '</strong>' );
-						?>
+							<?php /* translators: %1$s: <strong> tag, %2$s: </strong> tag */ ?>
+							<?php \printf( \esc_html__( '%1$s Personalized to-dos %2$s to keep your site in great shape.', 'progress-planner' ), '<strong>', '</strong>' ); ?>
 						</li>
 						<li>
-						<?php
-						/* translators: %s: <strong> tag */
-						\printf( \esc_html__( '%1$s Activity stats %2$s so you can track your progress.', 'progress-planner' ), '<strong>', '</strong>' );
-						?>
+							<?php /* translators: %1$s: <strong> tag, %2$s: </strong> tag */ ?>
+							<?php \printf( \esc_html__( '%1$s Activity stats %2$s so you can track your progress.', 'progress-planner' ), '<strong>', '</strong>' ); ?>
 						</li>
 						<li>
-						<?php
-						/* translators: %s: <strong> tag */
-						\printf( \esc_html__( '%1$s Helpful nudges %2$s to stay consistent with your website goals.', 'progress-planner' ), '<strong>', '</strong>' );
-						?>
+							<?php /* translators: %1$s: <strong> tag, %2$s: </strong> tag */ ?>
+							<?php \printf( \esc_html__( '%1$s Helpful nudges %2$s to stay consistent with your website goals.', 'progress-planner' ), '<strong>', '</strong>' ); ?>
 						</li>
 					</ul>
 					<?php
 					\printf(
 						/* translators: %s: progressplanner.com link */
-						\esc_html__( 'To send these updates, we’ll create an account for you on %s.', 'progress-planner' ),
+						\esc_html__( 'To send these updates, we will create an account for you on %s.', 'progress-planner' ),
 						'<a href="' . \esc_url( \progress_planner()->get_ui__branding()->get_url( 'https://prpl.fyi/home' ) ) . '" target="_blank">progressplanner.com</a>'
 					)
 					?>
@@ -75,7 +69,7 @@
 					<label>
 						<input type="radio" name="with-email" value="no">
 						<span class="prpl-label-content">
-							<?php \esc_html_e( 'No, I don’t want emails right now.', 'progress-planner' ); ?>
+							<?php \esc_html_e( 'No, I do not want emails right now.', 'progress-planner' ); ?>
 						</span>
 					</label>
 				</div>
@@ -128,7 +122,7 @@ class="prpl-input"
 						>
 						<?php
 						\printf(
-						/* translators: %s: progressplanner.com/privacy-policy link */
+							/* translators: %s: progressplanner.com/privacy-policy link */
 							\esc_html__( 'I agree to the %s.', 'progress-planner' ),
 							'<a href="' . \esc_url( \progress_planner()->get_ui__branding()->get_url( 'https://progressplanner.com/privacy-policy/#h-plugin-privacy-policy' ) ) . '" target="_blank">Privacy policy</a>'
 						);
@@ -165,11 +159,7 @@ class="prpl-button-secondary prpl-button-secondary--no-email prpl-hidden"
 					?>
 				</p>
 				<p id="prpl-account-not-created-message" style="display:none;">
-					<?php
-					\printf(
-						\esc_html__( 'Success! Enjoy using the Progress Planner plugin!', 'progress-planner' ),
-					);
-					?>
+					<?php \esc_html_e( 'Success! Enjoy using the Progress Planner plugin!', 'progress-planner' ); ?>
 				</p>
 
 				<?php \progress_planner()->the_view( 'popovers/parts/upgrade-tasks.php', [ 'context' => 'onboarding' ] ); ?>

Original file line number	Diff line number	Diff line change
`@@ -558,4 +558,3 @@ button.prpl-info-icon {`
`558`	`558`	`transform: rotate(360deg);`
`559`	`559`	`}`
`560`	`560`	`}`
`561`		`-`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`$prpl_privacy_policy_accepted = \progress_planner()->is_privacy_policy_accepted();`
`14`		`-$prpl_wrapper_class = '';`
`15`	`14`
`16`	`15`	`if ( 0 !== (int) \progress_planner()->get_ui__branding()->get_branding_id() ) {`
`17`	`16`	`$prpl_license_key = \progress_planner()->get_utils__onboard()->make_remote_onboarding_request();`
`@@ -20,13 +19,9 @@`
`20`	`19`	`$prpl_privacy_policy_accepted = true;`
`21`	`20`	`}`
`22`	`21`	`}`
`23`		`-`
`24`		`-if ( ! $prpl_privacy_policy_accepted ) {`
`25`		`- $prpl_wrapper_class = 'prpl-pp-not-accepted';`
`26`		`-}`
`27`	`22`	`?>`
`28`	`23`
`29`		`-<div class="wrap prpl-wrap <?php echo \esc_attr( $prpl_wrapper_class ); ?>">`
	`24`	`+<div class="wrap prpl-wrap <?php echo \esc_attr( $prpl_privacy_policy_accepted ? '' : 'prpl-pp-not-accepted' ); ?>">`
`30`	`25`	`<?php if ( true === $prpl_privacy_policy_accepted ) : ?>`
`31`	`26`	`<h1 class="screen-reader-text"><?php \esc_html_e( 'Progress Planner', 'progress-planner' ); ?></h1>`
`32`	`27`	`<?php \progress_planner()->the_view( 'admin-page-header.php' ); ?>`