New: comply with WP Plugin Check standards

assets/css/debug-tools.css

@@ -1,6 +1,6 @@
 .wcpdf_debug_settings_sections,
 #debug-tools {
-	width: calc(100% - 4em);
+	width: 100%;
 	max-width: 50vw;
 }
 

assets/css/settings-styles.css

@@ -502,7 +502,8 @@ body.woocommerce_page_wpo_wcpdf_options_page {
 	font-size: 12px;
 }
 
-#wpo-wcpdf-settings .system-status-table {
+#wpo-wcpdf-settings .system-status-table,
+#wpo-wcpdf-settings .form-table {
 	margin-top: 2em;
 }
 

includes/Assets.php

@@ -19,25 +19,18 @@ public static function instance() {
 	}
 
 	public function __construct()	{
-		add_action( 'wp_enqueue_scripts', array( $this, 'frontend_scripts_styles' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'backend_scripts_styles' ) );
 	}
 
 	/**
 	 * Load styles & scripts
 	 */
-	public function frontend_scripts_styles ( $hook ) {
-		# none yet
-	}
-
-	/**
-	 * Load styles & scripts
-	 */
-	public function backend_scripts_styles ( $hook ) {
+	public function backend_scripts_styles( $hook ) {
 		$suffix        = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 		$pdfjs_version = '4.3.136';
 
 		global $wp_version;
+
 		if ( WPO_WCPDF()->admin->is_order_page() ) {
 
 			// STYLES
@@ -94,10 +87,10 @@ public function backend_scripts_styles ( $hook ) {
 
 		// only load on our own settings page
 		// maybe find a way to refer directly to WPO\IPS\Settings::$options_page_hook ?
-		if (
-			in_array( $hook, array( 'woocommerce_page_wpo_wcpdf_options_page', 'settings_page_wpo_wcpdf_options_page' ) ) ||
-			( isset( $_GET['page'] ) && 'wpo_wcpdf_options_page' === $_GET['page'] )
-		) {
+		if ( ! empty( $hook ) && false !== strpos( $hook, 'wpo_wcpdf_options_page' ) ) {
+			$tab = filter_input( INPUT_GET, 'tab', FILTER_DEFAULT );
+			$tab = sanitize_text_field( $tab );
+			
 			wp_enqueue_style(
 				'wpo-wcpdf-settings-styles',
 				WPO_WCPDF()->plugin_url() . '/assets/css/settings-styles'.$suffix.'.css',
@@ -208,6 +201,50 @@ public function backend_scripts_styles ( $hook ) {
 				WPO_WCPDF_VERSION
 			);
 
+			// status/debug page scripts
+			if ( 'debug' === $tab ) {
+				wp_enqueue_style(
+					'wpo-wcpdf-jquery-ui-styles',
+					WPO_WCPDF()->plugin_url() . '/assets/css/jquery-ui' . $suffix . '.css',
+					'1.14.0'
+				);
+
+				wp_enqueue_script( 'jquery-ui-datepicker' );
+
+				wp_enqueue_style(
+					'wpo-wcpdf-debug-tools-styles',
+					WPO_WCPDF()->plugin_url() . '/assets/css/debug-tools'.$suffix.'.css',
+					WPO_WCPDF_VERSION
+				);
+
+				wp_enqueue_script(
+					'wpo-wcpdf-debug',
+					WPO_WCPDF()->plugin_url() . '/assets/js/debug-script'.$suffix.'.js',
+					array( 'jquery', 'jquery-blockui', 'jquery-ui-datepicker' ),
+					WPO_WCPDF_VERSION
+				);
+
+				wp_localize_script(
+					'wpo-wcpdf-debug',
+					'wpo_wcpdf_debug',
+					array(
+						'ajaxurl'              => admin_url( 'admin-ajax.php' ),
+						'nonce'                => wp_create_nonce( 'wpo_wcpdf_debug_nonce' ),
+						'download_label'       => __( 'Download', 'woocommerce-pdf-invoices-packing-slips' ),
+						'confirm_reset'        => __( 'Are you sure you want to reset this settings? This cannot be undone.', 'woocommerce-pdf-invoices-packing-slips' ),
+						'select_document_type' => __( 'Please select a document type', 'woocommerce-pdf-invoices-packing-slips' ),
+						'danger_zone'          => array(
+							'enabled' => isset( WPO_WCPDF()->settings->debug_settings['enable_danger_zone_tools'] ) ? true : false,
+							'message' => sprintf(
+								/* translators: 1. open anchor tag, 2. close anchor tag */
+								__( '<strong>Enabled</strong>: %1$sclick here%2$s to start using the tools.', 'woocommerce-pdf-invoices-packing-slips' ),
+								'<a href="' . esc_url( add_query_arg( 'section', 'tools' ) ) . '#danger_zone">',
+								'</a>'
+							),
+						),
+					)
+				);
+			}
 		}
 
 		if (
@@ -230,51 +267,6 @@ public function backend_scripts_styles ( $hook ) {
 				)
 			);
 		}
-
-		// status/debug page scripts
-		if ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wpo_wcpdf_options_page' && isset( $_REQUEST['tab'] ) && $_REQUEST['tab'] == 'debug' ) {
-			wp_enqueue_style(
-				'wpo-wcpdf-jquery-ui-styles',
-				'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css'
-			);
-
-			wp_enqueue_script( 'jquery-ui-datepicker' );
-
-			wp_enqueue_style(
-				'wpo-wcpdf-debug-tools-styles',
-				WPO_WCPDF()->plugin_url() . '/assets/css/debug-tools'.$suffix.'.css',
-				WPO_WCPDF_VERSION
-			);
-
-			wp_enqueue_script(
-				'wpo-wcpdf-debug',
-				WPO_WCPDF()->plugin_url() . '/assets/js/debug-script'.$suffix.'.js',
-				array( 'jquery', 'jquery-blockui', 'jquery-ui-datepicker' ),
-				WPO_WCPDF_VERSION
-			);
-
-			wp_localize_script(
-				'wpo-wcpdf-debug',
-				'wpo_wcpdf_debug',
-				array(
-					'ajaxurl'              => admin_url( 'admin-ajax.php' ),
-					'nonce'                => wp_create_nonce( 'wpo_wcpdf_debug_nonce' ),
-					'download_label'       => __( 'Download', 'woocommerce-pdf-invoices-packing-slips' ),
-					'confirm_reset'        => __( 'Are you sure you want to reset this settings? This cannot be undone.', 'woocommerce-pdf-invoices-packing-slips' ),
-					'select_document_type' => __( 'Please select a document type', 'woocommerce-pdf-invoices-packing-slips' ),
-					'danger_zone'          => array(
-						'enabled' => isset( WPO_WCPDF()->settings->debug_settings['enable_danger_zone_tools'] ) ? true : false,
-						'message' => sprintf(
-							/* translators: 1. open anchor tag, 2. close anchor tag */
-							__( '<strong>Enabled</strong>: %1$sclick here%2$s to start using the tools.', 'woocommerce-pdf-invoices-packing-slips' ),
-							'<a href="' . esc_url( add_query_arg( 'section', 'tools' ) ) . '#danger_zone">',
-							'</a>'
-						),
-					),
-				)
-			);
-
-		}
 	}
 
 }

includes/Documents/BulkDocument.php

@@ -157,12 +157,12 @@ public function merge_documents( $html_content ) {
 	public function output_pdf( $output_mode = 'download' ) {
 		$pdf = $this->get_pdf();
 		wcpdf_pdf_headers( $this->get_filename(), $output_mode, $pdf );
-		echo $pdf;
+		echo $pdf; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		die();
 	}
 
 	public function output_html() {
-		echo $this->get_html();
+		echo $this->get_html(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		die();
 	}
 

includes/Documents/Invoice.php

@@ -203,6 +203,8 @@ public function init_settings() {
 	 * PDF settings fields
 	 */
 	public function get_pdf_settings_fields( $option_name ) {
+		$wp_filesystem = wpo_wcpdf_get_wp_filesystem();
+
 		$settings_fields = array(
 			array(
 				'type'			=> 'section',
@@ -232,7 +234,7 @@ public function get_pdf_settings_fields( $option_name ) {
 					'id'			  => 'attach_to_email_ids',
 					'fields_callback' => array( $this, 'get_wc_emails' ),
 					/* translators: directory path */
-					'description'	  => !is_writable( WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ) ? '<span class="wpo-warning">' . sprintf( __( 'It looks like the temp folder (<code>%s</code>) is not writable, check the permissions for this folder! Without having write access to this folder, the plugin will not be able to email invoices.', 'woocommerce-pdf-invoices-packing-slips' ), WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ).'</span>':'',
+					'description'	  => ! $wp_filesystem->is_writable( WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ) ? '<span class="wpo-warning">' . sprintf( __( 'It looks like the temp folder (<code>%s</code>) is not writable, check the permissions for this folder! Without having write access to this folder, the plugin will not be able to email invoices.', 'woocommerce-pdf-invoices-packing-slips' ), WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ).'</span>':'',
 				)
 			),
 			array(
@@ -570,6 +572,8 @@ public function get_pdf_settings_fields( $option_name ) {
 	 * UBL settings fields
 	 */
 	public function get_ubl_settings_fields( $option_name ) {
+		$wp_filesystem = wpo_wcpdf_get_wp_filesystem();
+
 		$settings_fields = array(
 			array(
 				'type'     => 'section',
@@ -599,7 +603,7 @@ public function get_ubl_settings_fields( $option_name ) {
 					'id'              => 'attach_to_email_ids',
 					'fields_callback' => array( $this, 'get_wc_emails' ),
 					/* translators: directory path */
-					'description'     => ! is_writable( WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ) ? '<span class="wpo-warning">' . sprintf( __( 'It looks like the temp folder (<code>%s</code>) is not writable, check the permissions for this folder! Without having write access to this folder, the plugin will not be able to email invoices.', 'woocommerce-pdf-invoices-packing-slips' ), WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ).'</span>':'',
+					'description'     => ! $wp_filesystem->is_writable( WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ) ? '<span class="wpo-warning">' . sprintf( __( 'It looks like the temp folder (<code>%s</code>) is not writable, check the permissions for this folder! Without having write access to this folder, the plugin will not be able to email invoices.', 'woocommerce-pdf-invoices-packing-slips' ), WPO_WCPDF()->main->get_tmp_path( 'attachments' ) ).'</span>':'',
 				)
 			),
 			array(