Merge branch 'develop' into trunk

Author: dkotter

.distignore

@@ -2,6 +2,7 @@
 /.git
 /.github
 /.wordpress-org
+/assets
 /config
 /tests
 /node_modules

.github/workflows/dependency-review.yml

@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v1

CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.1.0] - 2022-06-27
+### Added
+- Dependency security scanning (props [@jeffpaul](https://github.com/jeffpaul), [@Sidsector9](https://github.com/Sidsector9) via [#63](https://github.com/10up/Ad-Refresh-Control/pull/63)).
+
+### Changed
+- Bump WordPress version "tested up to" 6.0 (props [@cadic](https://github.com/cadic) via [#66](https://github.com/10up/Ad-Refresh-Control/issues/66)).
+
+### Fixed
+- PHP Warnings when pushing "Submit" on the settings page (props [@sksaju](https://github.com/sksaju), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#60](https://github.com/10up/Ad-Refresh-Control/pull/60)).
+- Error when saving settings for the first time of using the plugin (props [@cadic](https://github.com/cadic), [@faisal-alvi](https://github.com/faisal-alvi) via [#67](https://github.com/10up/Ad-Refresh-Control/pull/67)).
+
+### Security
+- Bump `color-string` from 1.5.3 to 1.5.5 (props [@dependabot](https://github.com/apps/dependabot) via [#51](https://github.com/10up/Ad-Refresh-Control/pull/51)).
+- Bump `path-parse` from 1.0.6 to 1.0.7 (props [@dependabot](https://github.com/apps/dependabot) via [#53](https://github.com/10up/Ad-Refresh-Control/pull/53)).
+- Bump `follow-redirects` from 1.7.0 to 1.14.8 (props [@dependabot](https://github.com/apps/dependabot) via [#55](https://github.com/10up/Ad-Refresh-Control/pull/55), [#57](https://github.com/10up/Ad-Refresh-Control/pull/57)).
+- Bump `ajv` from 6.10.0 to 6.12.6 (props [@dependabot](https://github.com/apps/dependabot) via [#56](https://github.com/10up/Ad-Refresh-Control/pull/56)).
+- Bump `tar` from 4.4.8 to 4.4.19 (props [@dependabot](https://github.com/apps/dependabot) via [#58](https://github.com/10up/Ad-Refresh-Control/pull/58)).
+
 ## [1.0.5] - 2021-06-23
 ### Added
 - `avc_refresh_interval_value` filter applied to default refresh interval value of 30 seconds (props [@10upsimon](https://github.com/10upsimon) via [#48](https://github.com/10up/Ad-Refresh-Control/pull/48)).
@@ -69,6 +87,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial public release! 🎉
 
 [Unreleased]: https://github.com/10up/Ad-Refresh-Control/compare/trunk...develop
+[1.1.0]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.5...1.1.0
 [1.0.5]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.4...1.0.5
 [1.0.4]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.3...1.0.4
 [1.0.3]: https://github.com/10up/Ad-Refresh-Control/compare/1.0.2...1.0.3

CREDITS.md

@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[10up (@10up)](https://github.com/10up), [Gary Thayer (@gthayer)](https://github.com/gthayer), [David Green (@davidrgreen)](https://github.com/davidrgreen), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabotg), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Daryll Doyle (@darylldoyle)](https://github.com/darylldoyle), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Simon Dowdles (@10upsimon)](https://github.com/10upsimon).
+[10up (@10up)](https://github.com/10up), [Gary Thayer (@gthayer)](https://github.com/gthayer), [David Green (@davidrgreen)](https://github.com/davidrgreen), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabotg), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Daryll Doyle (@darylldoyle)](https://github.com/darylldoyle), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Simon Dowdles (@10upsimon)](https://github.com/10upsimon), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Max Lyuchin (@cadic)](https://github.com/cadic), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi).
 
 ## Libraries
 

README.md

@@ -2,7 +2,7 @@
 
 > Enable Active View refresh for Google Ad Manager ads without needing to modify any code.
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/ad-refresh-control.svg)](https://github.com/10up/ad-refresh-control/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.7%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/ad-refresh-control.svg)](https://github.com/10up/ad-refresh-control/blob/develop/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/ad-refresh-control.svg)](https://github.com/10up/ad-refresh-control/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/ad-refresh-control?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/ad-refresh-control.svg)](https://github.com/10up/ad-refresh-control/blob/develop/LICENSE.md)
 
 ## Background & Purpose
 
@@ -40,7 +40,7 @@ A settings page will allow adjustments such as the time between refreshes, the m
 
 ### Hooks
 
-####`avc_refresh_interval_value` 
+#### `avc_refresh_interval_value` 
 - Filters the default refresh interval value of 30 seconds. This filter is applied to the value at storage and retrieval phases.
 - Since 1.0.5
 

ad-refresh-control.php

@@ -3,7 +3,7 @@
  * Plugin Name:       Ad Refresh Control
  * Plugin URI:        https://github.com/10up/Ad-Refresh-Control
  * Description:       Enable Active View refresh for Google Ad Manager ads without needing to modify any code.
- * Version:           1.0.5
+ * Version:           1.1.0
  * Requires at least: 4.9
  * Requires PHP:      7.0
  * Author:            10up
@@ -17,7 +17,7 @@
  */
 
 // Useful global constants.
-define( 'AD_REFRESH_CONTROL_VERSION', '1.0.5' );
+define( 'AD_REFRESH_CONTROL_VERSION', '1.1.0' );
 define( 'AD_REFRESH_CONTROL_URL', plugin_dir_url( __FILE__ ) );
 define( 'AD_REFRESH_CONTROL_PATH', plugin_dir_path( __FILE__ ) );
 define( 'AD_REFRESH_CONTROL_INC', AD_REFRESH_CONTROL_PATH . 'includes/' );

includes/settings.php

@@ -292,9 +292,13 @@ function sanitize_settings( $settings ) {
 
 	// advertiser_ids
 	$advertiser_ids_default = [];
-	if ( isset( $settings['advertiser_ids'] ) ) {
+	if ( ! empty( $settings['advertiser_ids'] ) ) {
 
-		$advertiser_ids = explode( ',', $settings['advertiser_ids'] );
+		if ( is_array( $settings['advertiser_ids'] ) ) {
+			$advertiser_ids = $settings['advertiser_ids'];
+		} else {
+			$advertiser_ids = explode( ',', $settings['advertiser_ids'] );
+		}
 
 		$advertiser_ids = array_filter(
 			$advertiser_ids,
@@ -316,9 +320,13 @@ function( $advertiser_id ) {
 
 	// Line item IDs.
 	$line_item_ids_default = [];
-	if ( isset( $settings['line_item_ids'] ) ) {
+	if ( ! empty( $settings['line_item_ids'] ) ) {
 
-		$line_item_ids = explode( ',', $settings['line_item_ids'] );
+		if ( is_array( $settings['line_item_ids'] ) ) {
+			$line_item_ids = $settings['line_item_ids'];
+		} else {
+			$line_item_ids = explode( ',', $settings['line_item_ids'] );
+		}
 
 		$line_item_ids = array_filter(
 			$line_item_ids,
@@ -340,7 +348,7 @@ function ( $line_item_id ) {
 
 	// Sizes.
 	$sizes_to_exclude_default = '';
-	if ( isset( $settings['sizes_to_exclude'] ) ) {
+	if ( ! empty( $settings['sizes_to_exclude'] ) ) {
 		$sizes                        = sanitize_text_field( $settings['sizes_to_exclude'] );
 		$settings['sizes_to_exclude'] = $sizes;
 	} else {
@@ -349,9 +357,13 @@ function ( $line_item_id ) {
 
 	// Slot IDs.
 	$slot_ids_to_exclude_default = [];
-	if ( isset( $settings['slot_ids_to_exclude'] ) ) {
+	if ( ! empty( $settings['slot_ids_to_exclude'] ) ) {
 
-		$slot_ids_to_exclude = explode( ',', $settings['slot_ids_to_exclude'] );
+		if ( is_array( $settings['slot_ids_to_exclude'] ) ) {
+			$slot_ids_to_exclude = $settings['slot_ids_to_exclude'];
+		} else {
+			$slot_ids_to_exclude = explode( ',', $settings['slot_ids_to_exclude'] );
+		}
 
 		$slot_ids_to_exclude = array_filter(
 			$slot_ids_to_exclude,