reduxframework / redux-framework

redux-core/inc/lib/image-filters/class-redux-image-filters.php

Indentation +175 added lines, -175 removed lines

@@ -11,179 +11,179 @@
 
 if ( ! class_exists( 'Redux_Image_Filters' ) ) {
 
-	/**
-	 * Class Redux_Image_Filters
-	 */
-	class Redux_Image_Filters {
-
-		/**
-		 * Render preview.
-		 *
-		 * @param array $data Data.
-		 *
-		 * @return string
-		 */
-		public static function render( array $data ): string {
-			extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
-
-			$output = '';
-
-			$filter_arr = array(
-				'grayscale',
-				'blur',
-				'sepia',
-				'saturate',
-				'opacity',
-				'brightness',
-				'contrast',
-				'hue-rotate',
-				'invert',
-			);
-
-			// Make an array of in use filters.
-			$in_use_filters = array();
-
-			foreach ( $filter_arr as $filter ) {
-				if ( $field['filter'][ $filter ] ) {
-					$in_use_filters[] = $filter;
-				}
-			}
-
-			$filters = rawurlencode( wp_json_encode( $in_use_filters ) );
-
-			$output .= '<div class="redux-' . $mode . '-filter-container" data-filters="' . $filters . '">';
-			$output .= '<div class="container-label">' . esc_html__( 'Filters', 'redux-framework' ) . '</div>';
-
-			foreach ( $in_use_filters as $filter ) {
-				$step = 1;
-				$unit = self::get_filter_unit( $filter );
-
-				if ( 'grayscale' === $filter || 'invert' === $filter ) {
-					$min = 0;
-					$max = 100;
-				} elseif ( 'blur' === $filter ) {
-					$min = 0;
-					$max = 30;
-				} elseif ( 'sepia' === $filter || 'saturate' === $filter || 'opacity' === $filter ) {
-					$min  = 0;
-					$max  = 1;
-					$step = .01;
-				} elseif ( 'brightness' === $filter || 'contrast' === $filter ) {
-					$min = 0;
-					$max = 200;
-				} elseif ( 'hue-rotate' === $filter ) {
-					$min = 0;
-					$max = 360;
-				}
-
-				$disabled = 'filters-disabled';
-				if ( $value['filter'][ $filter ]['checked'] ) {
-					$disabled = '';
-				}
-
-				$output .= '<div class="filter filter-' . $filter . '">';
-				$output .= '<label for="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="' . $disabled . '">';
-				$output .= '<input type="checkbox" id="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="checkbox" value="1"' . checked( $value['filter'][ $filter ]['checked'], '1', false ) . '/>';
-				$output .= '<input type="hidden" data-val="1" value="' . esc_attr( $value['filter'][ $filter ]['checked'] ) . '" class="checkbox-check" name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][checked]"/>';
-				$output .= ucfirst( $filter ) . ': ';
-				$output .= '<span class="filter-value"><strong>' . $value['filter'][ $filter ]['value'] . $unit . '</strong></span>';
-				$output .= '</label>';
-
-				$output .= '<div ';
-				$output .= 'class="redux-' . $mode . '-slider redux-' . $mode . '-filter redux-filter redux-filter-' . $filter . esc_attr( $field['class'] ) . '"';
-				$output .= 'id="' . esc_attr( $field['id'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] . '-' . $filter ) . '"';
-				$output .= 'data-min="' . $min . '"';
-				$output .= 'data-max="' . $max . '"';
-				$output .= 'data-step="' . $step . '"';
-				$output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
-				$output .= 'data-unit="' . $unit . '"';
-				$output .= 'data-default = "' . esc_attr( $value['filter'][ $filter ]['value'] ) . '" ';
-				$output .= disabled( filter_var( $value['filter'][ $filter ]['checked'], FILTER_VALIDATE_BOOLEAN ), false, false );
-				$output .= '>';
-				$output .= '</div>';
-
-				if ( '&deg;' === $unit ) {
-					$unit = 'deg';
-				}
-
-				$output .= '<input ';
-				$output .= 'type="hidden"';
-				$output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-' . $filter . '"';
-				$output .= 'class="' . $mode . '-filter-' . $filter . '"';
-				$output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][value]"';
-				$output .= 'value="' . esc_attr( $value['filter'][ $filter ]['value'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
-				$output .= 'data-unit="' . $unit . '"';
-				$output .= '/>';
-				$output .= '</div>';
-			}
-
-			$output .= '</div>';
-
-			return $output;
-		}
-
-		/**
-		 * Get filter unit.
-		 *
-		 * @param string $filter Filter type.
-		 *
-		 * @return string
-		 */
-		public static function get_filter_unit( string $filter ): string {
-			if ( 'grayscale' === $filter || 'invert' === $filter || 'brightness' === $filter || 'contrast' === $filter ) {
-				return '%';
-			} elseif ( 'blur' === $filter ) {
-				return 'px';
-			} elseif ( 'hue-rotate' === $filter ) {
-				return '&deg;';
-			} else {
-				return '';
-			}
-		}
-
-		/**
-		 * Enqueue support files.
-		 *
-		 * @param bool $filters_enabled Filtered enabled bit.
-		 */
-		public static function enqueue( bool $filters_enabled ) {
-			$min = Redux_Functions::is_min();
-
-			if ( $filters_enabled ) {
-				if ( ! wp_style_is( 'redux-nouislider' ) ) {
-					wp_enqueue_style(
-						'redux-nouislider',
-						Redux_Core::$url . 'assets/css/vendor/nouislider/redux.jquery.nouislider.css',
-						array(),
-						'5.0.0'
-					);
-
-					wp_enqueue_script(
-						'redux-nouislider',
-						Redux_Core::$url . 'assets/js/vendor/nouislider/redux.jquery.nouislider' . $min . '.js',
-						array( 'jquery' ),
-						'5.0.0',
-						true
-					);
-				}
-
-				wp_enqueue_script(
-					'redux-image-filters',
-					Redux_Core::$url . 'inc/lib/image-filters/image-filters' . $min . '.js',
-					array( 'jquery' ),
-					Redux_Core::$version,
-					true
-				);
-
-				wp_enqueue_style(
-					'redux-image-filters',
-					Redux_Core::$url . 'inc/lib/image-filters/image-filters.css',
-					array(),
-					Redux_Core::$version
-				);
-			}
-		}
-	}
+    /**
+     * Class Redux_Image_Filters
+     */
+    class Redux_Image_Filters {
+
+        /**
+         * Render preview.
+         *
+         * @param array $data Data.
+         *
+         * @return string
+         */
+        public static function render( array $data ): string {
+            extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
+
+            $output = '';
+
+            $filter_arr = array(
+                'grayscale',
+                'blur',
+                'sepia',
+                'saturate',
+                'opacity',
+                'brightness',
+                'contrast',
+                'hue-rotate',
+                'invert',
+            );
+
+            // Make an array of in use filters.
+            $in_use_filters = array();
+
+            foreach ( $filter_arr as $filter ) {
+                if ( $field['filter'][ $filter ] ) {
+                    $in_use_filters[] = $filter;
+                }
+            }
+
+            $filters = rawurlencode( wp_json_encode( $in_use_filters ) );
+
+            $output .= '<div class="redux-' . $mode . '-filter-container" data-filters="' . $filters . '">';
+            $output .= '<div class="container-label">' . esc_html__( 'Filters', 'redux-framework' ) . '</div>';
+
+            foreach ( $in_use_filters as $filter ) {
+                $step = 1;
+                $unit = self::get_filter_unit( $filter );
+
+                if ( 'grayscale' === $filter || 'invert' === $filter ) {
+                    $min = 0;
+                    $max = 100;
+                } elseif ( 'blur' === $filter ) {
+                    $min = 0;
+                    $max = 30;
+                } elseif ( 'sepia' === $filter || 'saturate' === $filter || 'opacity' === $filter ) {
+                    $min  = 0;
+                    $max  = 1;
+                    $step = .01;
+                } elseif ( 'brightness' === $filter || 'contrast' === $filter ) {
+                    $min = 0;
+                    $max = 200;
+                } elseif ( 'hue-rotate' === $filter ) {
+                    $min = 0;
+                    $max = 360;
+                }
+
+                $disabled = 'filters-disabled';
+                if ( $value['filter'][ $filter ]['checked'] ) {
+                    $disabled = '';
+                }
+
+                $output .= '<div class="filter filter-' . $filter . '">';
+                $output .= '<label for="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="' . $disabled . '">';
+                $output .= '<input type="checkbox" id="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="checkbox" value="1"' . checked( $value['filter'][ $filter ]['checked'], '1', false ) . '/>';
+                $output .= '<input type="hidden" data-val="1" value="' . esc_attr( $value['filter'][ $filter ]['checked'] ) . '" class="checkbox-check" name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][checked]"/>';
+                $output .= ucfirst( $filter ) . ': ';
+                $output .= '<span class="filter-value"><strong>' . $value['filter'][ $filter ]['value'] . $unit . '</strong></span>';
+                $output .= '</label>';
+
+                $output .= '<div ';
+                $output .= 'class="redux-' . $mode . '-slider redux-' . $mode . '-filter redux-filter redux-filter-' . $filter . esc_attr( $field['class'] ) . '"';
+                $output .= 'id="' . esc_attr( $field['id'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] . '-' . $filter ) . '"';
+                $output .= 'data-min="' . $min . '"';
+                $output .= 'data-max="' . $max . '"';
+                $output .= 'data-step="' . $step . '"';
+                $output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
+                $output .= 'data-unit="' . $unit . '"';
+                $output .= 'data-default = "' . esc_attr( $value['filter'][ $filter ]['value'] ) . '" ';
+                $output .= disabled( filter_var( $value['filter'][ $filter ]['checked'], FILTER_VALIDATE_BOOLEAN ), false, false );
+                $output .= '>';
+                $output .= '</div>';
+
+                if ( '&deg;' === $unit ) {
+                    $unit = 'deg';
+                }
+
+                $output .= '<input ';
+                $output .= 'type="hidden"';
+                $output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-' . $filter . '"';
+                $output .= 'class="' . $mode . '-filter-' . $filter . '"';
+                $output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][value]"';
+                $output .= 'value="' . esc_attr( $value['filter'][ $filter ]['value'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
+                $output .= 'data-unit="' . $unit . '"';
+                $output .= '/>';
+                $output .= '</div>';
+            }
+
+            $output .= '</div>';
+
+            return $output;
+        }
+
+        /**
+         * Get filter unit.
+         *
+         * @param string $filter Filter type.
+         *
+         * @return string
+         */
+        public static function get_filter_unit( string $filter ): string {
+            if ( 'grayscale' === $filter || 'invert' === $filter || 'brightness' === $filter || 'contrast' === $filter ) {
+                return '%';
+            } elseif ( 'blur' === $filter ) {
+                return 'px';
+            } elseif ( 'hue-rotate' === $filter ) {
+                return '&deg;';
+            } else {
+                return '';
+            }
+        }
+
+        /**
+         * Enqueue support files.
+         *
+         * @param bool $filters_enabled Filtered enabled bit.
+         */
+        public static function enqueue( bool $filters_enabled ) {
+            $min = Redux_Functions::is_min();
+
+            if ( $filters_enabled ) {
+                if ( ! wp_style_is( 'redux-nouislider' ) ) {
+                    wp_enqueue_style(
+                        'redux-nouislider',
+                        Redux_Core::$url . 'assets/css/vendor/nouislider/redux.jquery.nouislider.css',
+                        array(),
+                        '5.0.0'
+                    );
+
+                    wp_enqueue_script(
+                        'redux-nouislider',
+                        Redux_Core::$url . 'assets/js/vendor/nouislider/redux.jquery.nouislider' . $min . '.js',
+                        array( 'jquery' ),
+                        '5.0.0',
+                        true
+                    );
+                }
+
+                wp_enqueue_script(
+                    'redux-image-filters',
+                    Redux_Core::$url . 'inc/lib/image-filters/image-filters' . $min . '.js',
+                    array( 'jquery' ),
+                    Redux_Core::$version,
+                    true
+                );
+
+                wp_enqueue_style(
+                    'redux-image-filters',
+                    Redux_Core::$url . 'inc/lib/image-filters/image-filters.css',
+                    array(),
+                    Redux_Core::$version
+                );
+            }
+        }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -44,7 +44,7 @@ 
 			$in_use_filters = array();
 
 			foreach ( $filter_arr as $filter ) {
-				if ( $field['filter'][ $filter ] ) {
+				if ( $field['filter'][$filter] ) {
 					$in_use_filters[] = $filter;
 				}
 			}
@@ -77,16 +77,16 @@ 
 				}
 
 				$disabled = 'filters-disabled';
-				if ( $value['filter'][ $filter ]['checked'] ) {
+				if ( $value['filter'][$filter]['checked'] ) {
 					$disabled = '';
 				}
 
 				$output .= '<div class="filter filter-' . $filter . '">';
 				$output .= '<label for="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="' . $disabled . '">';
-				$output .= '<input type="checkbox" id="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="checkbox" value="1"' . checked( $value['filter'][ $filter ]['checked'], '1', false ) . '/>';
-				$output .= '<input type="hidden" data-val="1" value="' . esc_attr( $value['filter'][ $filter ]['checked'] ) . '" class="checkbox-check" name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][checked]"/>';
+				$output .= '<input type="checkbox" id="' . esc_attr( $field['id'] ) . '-' . $filter . '" class="checkbox" value="1"' . checked( $value['filter'][$filter]['checked'], '1', false ) . '/>';
+				$output .= '<input type="hidden" data-val="1" value="' . esc_attr( $value['filter'][$filter]['checked'] ) . '" class="checkbox-check" name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][checked]"/>';
 				$output .= ucfirst( $filter ) . ': ';
-				$output .= '<span class="filter-value"><strong>' . $value['filter'][ $filter ]['value'] . $unit . '</strong></span>';
+				$output .= '<span class="filter-value"><strong>' . $value['filter'][$filter]['value'] . $unit . '</strong></span>';
 				$output .= '</label>';
 
 				$output .= '<div ';
@@ -98,8 +98,8 @@ 
 				$output .= 'data-step="' . $step . '"';
 				$output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
 				$output .= 'data-unit="' . $unit . '"';
-				$output .= 'data-default = "' . esc_attr( $value['filter'][ $filter ]['value'] ) . '" ';
-				$output .= disabled( filter_var( $value['filter'][ $filter ]['checked'], FILTER_VALIDATE_BOOLEAN ), false, false );
+				$output .= 'data-default = "' . esc_attr( $value['filter'][$filter]['value'] ) . '" ';
+				$output .= disabled( filter_var( $value['filter'][$filter]['checked'], FILTER_VALIDATE_BOOLEAN ), false, false );
 				$output .= '>';
 				$output .= '</div>';
 
@@ -112,7 +112,7 @@ 
 				$output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-' . $filter . '"';
 				$output .= 'class="' . $mode . '-filter-' . $filter . '"';
 				$output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[filter][' . $filter . '][value]"';
-				$output .= 'value="' . esc_attr( $value['filter'][ $filter ]['value'] ) . '"';
+				$output .= 'value="' . esc_attr( $value['filter'][$filter]['value'] ) . '"';
 				$output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
 				$output .= 'data-unit="' . $unit . '"';
 				$output .= '/>';

redux-core/inc/extensions/social_profiles/social_profiles/class-redux-social-profiles.php

Spacing +7 added lines, -7 removed lines

@@ -69,12 +69,12 @@ 
 				foreach ( $settings as $a ) {
 					if ( isset( $a['data'] ) ) {
 						$a['data'] = rawurldecode( $a['data'] );
-						$a         = (array) json_decode( $a['data'] );
+						$a         = ( array ) json_decode( $a['data'] );
 					}
 
 					if ( $default_id === $a['id'] ) {
 						$search_default    = false;
-						$fixed_arr[ $key ] = $a;
+						$fixed_arr[$key] = $a;
 						break;
 					}
 				}
@@ -87,7 +87,7 @@ 
 
 					foreach ( $stock as $def_arr ) {
 						if ( $default_id === $def_arr['id'] ) {
-							$fixed_arr[ $key ] = $def_arr;
+							$fixed_arr[$key] = $def_arr;
 							break;
 						}
 					}
@@ -113,7 +113,7 @@ 
 			global $pagenow, $post;
 
 			$redux_settings = get_option( $this->opt_name );
-			$settings       = $redux_settings[ $this->field_id ] ?? array();
+			$settings       = $redux_settings[$this->field_id] ?? array();
 
 			if ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) {
 				$post_settings = get_post_meta( $post->ID, $this->field_id, true );
@@ -151,7 +151,7 @@ 
 			$settings = $this->rebuild_setttings( $settings );
 
 			foreach ( $this->defaults as $key => $social_provider_default ) {
-				$social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[ $key ] : null;
+				$social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[$key] : null;
 
 				$icon    = ( $social_provider_option && array_key_exists( 'icon', $social_provider_option ) && $social_provider_option['icon'] ) ? $social_provider_option['icon'] : $social_provider_default['icon'];
 				$name    = ( $social_provider_option && array_key_exists( 'name', $social_provider_option ) && $social_provider_option['name'] ) ? $social_provider_option['name'] : $social_provider_default['name'];
@@ -174,7 +174,7 @@ 
 				echo '<li id="redux-social-item-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" style="display: none;">';
 				echo '<div class="redux-social-item-container">';
 
-				$social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[ $key ] : null;
+				$social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[$key] : null;
 				$icon                   = ( $social_provider_option && array_key_exists( 'icon', $social_provider_option ) && $social_provider_option['icon'] ) ? $social_provider_option['icon'] : $social_provider_default['icon'];
 				$id                     = ( $social_provider_option && array_key_exists( 'id', $social_provider_option ) && $social_provider_option['id'] ) ? $social_provider_option['id'] : $social_provider_default['id'];
 				$enabled                = ( $social_provider_option && array_key_exists( 'enabled', $social_provider_option ) && $social_provider_option['enabled'] ) ? $social_provider_option['enabled'] : $social_provider_default['enabled'];
@@ -310,7 +310,7 @@ 
 					// For customizer.
 					if ( isset( $arr['data'] ) ) {
 						$arr = rawurldecode( $arr['data'] );
-						$arr = (array) json_decode( $arr );
+						$arr = ( array ) json_decode( $arr );
 					}
 
 					if ( $arr['enabled'] ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement

Indentation +294 added lines, -294 removed lines

@@ -11,355 +11,355 @@
 
 if ( ! class_exists( 'Redux_Social_Profiles' ) ) {
 
-	/**
-	 * Main Redux_Social_Profiles class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Social_Profiles extends Redux_Field {
-
-		/**
-		 * Field ID.
-		 *
-		 * @var null|string
-		 */
-		public ?string $field_id;
-
-		/**
-		 * Panel opt_name.
-		 *
-		 * @var null|string
-		 */
-		public ?string $opt_name;
-
-		/**
-		 * Defaults array.
-		 *
-		 * @var null|array
-		 */
-
-		private ?array $defaults = array();
-
-		/**
-		 * Set defaults.
-		 */
-		public function set_defaults() {
-			$this->opt_name = $this->parent->args['opt_name'];
-			$this->field_id = $this->field['id'];
-
-			$this->defaults = Redux_Social_Profiles_Functions::get_default_data();
-		}
-
-		/**
-		 * Rebuild Settings.
-		 *
-		 * @param array $settings Settings array.
-		 *
-		 * @return array
-		 */
-		private function rebuild_setttings( array $settings ): array {
-			$fixed_arr = array();
-			$stock     = '';
-
-			foreach ( $this->defaults as $key => $arr ) {
-				$search_default = true;
-
-				$default_id = $arr['id'];
-
-				foreach ( $settings as $a ) {
-					if ( isset( $a['data'] ) ) {
-						$a['data'] = rawurldecode( $a['data'] );
-						$a         = (array) json_decode( $a['data'] );
-					}
-
-					if ( $default_id === $a['id'] ) {
-						$search_default    = false;
-						$fixed_arr[ $key ] = $a;
-						break;
-					}
-				}
-
-				if ( $search_default ) {
-					if ( '' === $stock ) {
-						$stock = Redux_Social_Profiles_Defaults::get_social_media_defaults();
-						$stock = Redux_Social_Profiles_Functions::add_extra_icons( $stock );
-					}
-
-					foreach ( $stock as $def_arr ) {
-						if ( $default_id === $def_arr['id'] ) {
-							$fixed_arr[ $key ] = $def_arr;
-							break;
-						}
-					}
-				}
-			}
-
-			return $fixed_arr;
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			if ( empty( $this->field ) ) {
-				return;
-			}
-
-			global $pagenow, $post;
-
-			$redux_settings = get_option( $this->opt_name );
-			$settings       = $redux_settings[ $this->field_id ] ?? array();
-
-			if ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) {
-				$post_settings = get_post_meta( $post->ID, $this->field_id, true );
-
-				if ( ! empty( $post_settings ) ) {
-					$settings = $post_settings;
-				}
-			}
-
-			$color_pickers = $this->field['color_pickers'] ?? true;
-
-			// Icon container.
-			echo '<div
+    /**
+     * Main Redux_Social_Profiles class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Social_Profiles extends Redux_Field {
+
+        /**
+         * Field ID.
+         *
+         * @var null|string
+         */
+        public ?string $field_id;
+
+        /**
+         * Panel opt_name.
+         *
+         * @var null|string
+         */
+        public ?string $opt_name;
+
+        /**
+         * Defaults array.
+         *
+         * @var null|array
+         */
+
+        private ?array $defaults = array();
+
+        /**
+         * Set defaults.
+         */
+        public function set_defaults() {
+            $this->opt_name = $this->parent->args['opt_name'];
+            $this->field_id = $this->field['id'];
+
+            $this->defaults = Redux_Social_Profiles_Functions::get_default_data();
+        }
+
+        /**
+         * Rebuild Settings.
+         *
+         * @param array $settings Settings array.
+         *
+         * @return array
+         */
+        private function rebuild_setttings( array $settings ): array {
+            $fixed_arr = array();
+            $stock     = '';
+
+            foreach ( $this->defaults as $key => $arr ) {
+                $search_default = true;
+
+                $default_id = $arr['id'];
+
+                foreach ( $settings as $a ) {
+                    if ( isset( $a['data'] ) ) {
+                        $a['data'] = rawurldecode( $a['data'] );
+                        $a         = (array) json_decode( $a['data'] );
+                    }
+
+                    if ( $default_id === $a['id'] ) {
+                        $search_default    = false;
+                        $fixed_arr[ $key ] = $a;
+                        break;
+                    }
+                }
+
+                if ( $search_default ) {
+                    if ( '' === $stock ) {
+                        $stock = Redux_Social_Profiles_Defaults::get_social_media_defaults();
+                        $stock = Redux_Social_Profiles_Functions::add_extra_icons( $stock );
+                    }
+
+                    foreach ( $stock as $def_arr ) {
+                        if ( $default_id === $def_arr['id'] ) {
+                            $fixed_arr[ $key ] = $def_arr;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return $fixed_arr;
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            if ( empty( $this->field ) ) {
+                return;
+            }
+
+            global $pagenow, $post;
+
+            $redux_settings = get_option( $this->opt_name );
+            $settings       = $redux_settings[ $this->field_id ] ?? array();
+
+            if ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) {
+                $post_settings = get_post_meta( $post->ID, $this->field_id, true );
+
+                if ( ! empty( $post_settings ) ) {
+                    $settings = $post_settings;
+                }
+            }
+
+            $color_pickers = $this->field['color_pickers'] ?? true;
+
+            // Icon container.
+            echo '<div
                     class="redux-social-profiles-container ' . esc_attr( $this->field['class'] ) . '"
                     data-opt-name="' . esc_attr( $this->opt_name ) . '"
                     data-id="' . esc_attr( $this->field_id ) . '"
                   >';
 
-			$show_msg = $this->field['hide_widget_msg'] ?? true;
+            $show_msg = $this->field['hide_widget_msg'] ?? true;
 
-			// translators: %1$s: Widget page HTML/URL. %s: widget admin URL.
-			$def_msg = sprintf( esc_html__( 'Go to the %1$s page to add the Redux Social Widget to any active widget area.', 'redux-framework' ), sprintf( '<a href="%s">' . esc_html__( 'Widgets', 'redux-framework' ) . '</a> ', admin_url( 'widgets.php' ) ) );
+            // translators: %1$s: Widget page HTML/URL. %s: widget admin URL.
+            $def_msg = sprintf( esc_html__( 'Go to the %1$s page to add the Redux Social Widget to any active widget area.', 'redux-framework' ), sprintf( '<a href="%s">' . esc_html__( 'Widgets', 'redux-framework' ) . '</a> ', admin_url( 'widgets.php' ) ) );
 
-			$msg = $this->field['widget_msg'] ?? $def_msg;
+            $msg = $this->field['widget_msg'] ?? $def_msg;
 
-			if ( ! $show_msg ) {
-				echo '<div class="redux-social-profiles-header">';
-				echo $msg; // phpcs:ignore WordPress.Security.EscapeOutput
-				echo '</div>';
-			}
+            if ( ! $show_msg ) {
+                echo '<div class="redux-social-profiles-header">';
+                echo $msg; // phpcs:ignore WordPress.Security.EscapeOutput
+                echo '</div>';
+            }
 
-			echo '<div class="redux-social-profiles-selector-container">';
-			echo '<ul id="redux-social-profiles-selector-list">';
+            echo '<div class="redux-social-profiles-selector-container">';
+            echo '<ul id="redux-social-profiles-selector-list">';
 
-			$settings = $this->rebuild_setttings( $settings );
+            $settings = $this->rebuild_setttings( $settings );
 
-			foreach ( $this->defaults as $key => $social_provider_default ) {
-				$social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[ $key ] : null;
+            foreach ( $this->defaults as $key => $social_provider_default ) {
+                $social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[ $key ] : null;
 
-				$icon    = ( $social_provider_option && array_key_exists( 'icon', $social_provider_option ) && $social_provider_option['icon'] ) ? $social_provider_option['icon'] : $social_provider_default['icon'];
-				$name    = ( $social_provider_option && array_key_exists( 'name', $social_provider_option ) && $social_provider_option['name'] ) ? $social_provider_option['name'] : $social_provider_default['name'];
-				$order   = ( $social_provider_option && array_key_exists( 'order', $social_provider_option ) ) ? $social_provider_option['order'] : $key;
-				$order   = intval( $order );
-				$enabled = ( $social_provider_option && array_key_exists( 'enabled', $social_provider_option ) && $social_provider_option['enabled'] ) ? $social_provider_option['enabled'] : $social_provider_default['enabled'];
-				$display = ( $enabled ) ? 'enabled' : '';
+                $icon    = ( $social_provider_option && array_key_exists( 'icon', $social_provider_option ) && $social_provider_option['icon'] ) ? $social_provider_option['icon'] : $social_provider_default['icon'];
+                $name    = ( $social_provider_option && array_key_exists( 'name', $social_provider_option ) && $social_provider_option['name'] ) ? $social_provider_option['name'] : $social_provider_default['name'];
+                $order   = ( $social_provider_option && array_key_exists( 'order', $social_provider_option ) ) ? $social_provider_option['order'] : $key;
+                $order   = intval( $order );
+                $enabled = ( $social_provider_option && array_key_exists( 'enabled', $social_provider_option ) && $social_provider_option['enabled'] ) ? $social_provider_option['enabled'] : $social_provider_default['enabled'];
+                $display = ( $enabled ) ? 'enabled' : '';
 
-				echo '<li class="redux-social-profiles-item-enable ' . esc_attr( $display ) . '" id="redux-social-profiles-item-enable-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" data-order="' . esc_attr( $order ) . '">';
-				Redux_Social_Profiles_Functions::render_icon( $icon, '', '', $name );
-				echo '</li>';
-			}
+                echo '<li class="redux-social-profiles-item-enable ' . esc_attr( $display ) . '" id="redux-social-profiles-item-enable-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" data-order="' . esc_attr( $order ) . '">';
+                Redux_Social_Profiles_Functions::render_icon( $icon, '', '', $name );
+                echo '</li>';
+            }
 
-			echo '</ul>';
-			echo '</div>';
+            echo '</ul>';
+            echo '</div>';
 
-			echo '<ul id="redux-social-profiles-list">';
+            echo '<ul id="redux-social-profiles-list">';
 
-			foreach ( $this->defaults as $key => $social_provider_default ) {
-				echo '<li id="redux-social-item-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" style="display: none;">';
-				echo '<div class="redux-social-item-container">';
+            foreach ( $this->defaults as $key => $social_provider_default ) {
+                echo '<li id="redux-social-item-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" style="display: none;">';
+                echo '<div class="redux-social-item-container">';
 
-				$social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[ $key ] : null;
-				$icon                   = ( $social_provider_option && array_key_exists( 'icon', $social_provider_option ) && $social_provider_option['icon'] ) ? $social_provider_option['icon'] : $social_provider_default['icon'];
-				$id                     = ( $social_provider_option && array_key_exists( 'id', $social_provider_option ) && $social_provider_option['id'] ) ? $social_provider_option['id'] : $social_provider_default['id'];
-				$enabled                = ( $social_provider_option && array_key_exists( 'enabled', $social_provider_option ) && $social_provider_option['enabled'] ) ? $social_provider_option['enabled'] : $social_provider_default['enabled'];
-				$name                   = ( $social_provider_option && array_key_exists( 'name', $social_provider_option ) && $social_provider_option['name'] ) ? $social_provider_option['name'] : $social_provider_default['name'];
+                $social_provider_option = ( $settings && is_array( $settings ) && array_key_exists( $key, $settings ) ) ? $settings[ $key ] : null;
+                $icon                   = ( $social_provider_option && array_key_exists( 'icon', $social_provider_option ) && $social_provider_option['icon'] ) ? $social_provider_option['icon'] : $social_provider_default['icon'];
+                $id                     = ( $social_provider_option && array_key_exists( 'id', $social_provider_option ) && $social_provider_option['id'] ) ? $social_provider_option['id'] : $social_provider_default['id'];
+                $enabled                = ( $social_provider_option && array_key_exists( 'enabled', $social_provider_option ) && $social_provider_option['enabled'] ) ? $social_provider_option['enabled'] : $social_provider_default['enabled'];
+                $name                   = ( $social_provider_option && array_key_exists( 'name', $social_provider_option ) && $social_provider_option['name'] ) ? $social_provider_option['name'] : $social_provider_default['name'];
 
-				$label = ( $social_provider_option && array_key_exists( 'label', $social_provider_option ) && $social_provider_option['label'] ) ? $social_provider_option['label'] : __( 'Link URL', 'redux-framework' );
+                $label = ( $social_provider_option && array_key_exists( 'label', $social_provider_option ) && $social_provider_option['label'] ) ? $social_provider_option['label'] : __( 'Link URL', 'redux-framework' );
 
-				$color = ( $social_provider_option && array_key_exists( 'color', $social_provider_option ) ) ? $social_provider_option['color'] : $social_provider_default['color'];
-				$color = esc_attr( $color );
+                $color = ( $social_provider_option && array_key_exists( 'color', $social_provider_option ) ) ? $social_provider_option['color'] : $social_provider_default['color'];
+                $color = esc_attr( $color );
 
-				$background = ( $social_provider_option && array_key_exists( 'background', $social_provider_option ) ) ? $social_provider_option['background'] : $social_provider_default['background'];
-				$background = esc_attr( $background );
+                $background = ( $social_provider_option && array_key_exists( 'background', $social_provider_option ) ) ? $social_provider_option['background'] : $social_provider_default['background'];
+                $background = esc_attr( $background );
 
-				$order = ( $social_provider_option && array_key_exists( 'order', $social_provider_option ) ) ? $social_provider_option['order'] : $key;
-				$order = intval( $order );
+                $order = ( $social_provider_option && array_key_exists( 'order', $social_provider_option ) ) ? $social_provider_option['order'] : $key;
+                $order = intval( $order );
 
-				$url = ( $social_provider_option && array_key_exists( 'url', $social_provider_option ) ) ? $social_provider_option['url'] : $social_provider_default['url'];
-				$url = esc_attr( $url );
+                $url = ( $social_provider_option && array_key_exists( 'url', $social_provider_option ) ) ? $social_provider_option['url'] : $social_provider_default['url'];
+                $url = esc_attr( $url );
 
-				$profile_data = array(
-					'id'         => $id,
-					'icon'       => $icon,
-					'enabled'    => $enabled,
-					'url'        => $url,
-					'color'      => $color,
-					'background' => $background,
-					'order'      => $order,
-					'name'       => $name,
-					'label'      => $label,
-				);
+                $profile_data = array(
+                    'id'         => $id,
+                    'icon'       => $icon,
+                    'enabled'    => $enabled,
+                    'url'        => $url,
+                    'color'      => $color,
+                    'background' => $background,
+                    'order'      => $order,
+                    'name'       => $name,
+                    'label'      => $label,
+                );
 
-				$profile_data = rawurlencode( wp_json_encode( $profile_data ) );
+                $profile_data = rawurlencode( wp_json_encode( $profile_data ) );
 
-				echo '<input
+                echo '<input
 	                    type="hidden"
 	                    class="redux-social-profiles-hidden-data-' . esc_attr( $key ) . '"
 	                    id="' . esc_attr( $this->field_id ) . '-' . esc_attr( $id ) . '-data"
 	                    name="' . esc_attr( $this->field['name'] ) . esc_attr( $this->field['name_suffix'] ) . '[' . esc_attr( $key ) . '][data]"
 	                    value="' . $profile_data . '" />'; // phpcs:ignore WordPress.Security.EscapeOutput
 
-				echo '<div class="redux-icon-preview">';
-				Redux_Social_Profiles_Functions::render_icon( $icon, $color, $background, $name );
-				echo '&nbsp;</div>';
+                echo '<div class="redux-icon-preview">';
+                Redux_Social_Profiles_Functions::render_icon( $icon, $color, $background, $name );
+                echo '&nbsp;</div>';
 
-				echo '<div class="redux-social-profiles-item-name">';
-				echo esc_html( $name );
-				echo '</div>';
+                echo '<div class="redux-social-profiles-item-name">';
+                echo esc_html( $name );
+                echo '</div>';
 
-				echo '<div class="redux-social-profiles-item-enabled">';
-				$checked = ( $enabled ) ? 'checked' : '';
-				echo '<input type="checkbox" id="' . esc_attr( $this->field['id'] ) . '-checkbox-' . esc_attr( $key ) . '" class="checkbox-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" value="1" ' . esc_attr( $checked ) . '/>';
-				esc_html_e( 'Enabled', 'redux-framework' );
-				echo '</div>';
+                echo '<div class="redux-social-profiles-item-enabled">';
+                $checked = ( $enabled ) ? 'checked' : '';
+                echo '<input type="checkbox" id="' . esc_attr( $this->field['id'] ) . '-checkbox-' . esc_attr( $key ) . '" class="checkbox-' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" value="1" ' . esc_attr( $checked ) . '/>';
+                esc_html_e( 'Enabled', 'redux-framework' );
+                echo '</div>';
 
-				$color_class = $color_pickers ? '' : ' no-color-pickers';
+                $color_class = $color_pickers ? '' : ' no-color-pickers';
 
-				echo '<div class="redux-social-profiles-link-url input_wrapper' . esc_attr( $color_class ) . '">';
-				echo '<label for="redux-social-profiles-url-' . esc_attr( $key ) . '-text" class="redux-text-url-label">' . esc_html( $label ) . '</label>';
-				echo '<input id="redux-social-profiles-url-' . esc_attr( $key ) . '-text" class="redux-social-profiles-url-text" data-key="' . esc_attr( $key ) . '" type="text" value="' . esc_url( $url ) . '" />';
-				echo '</div>';
+                echo '<div class="redux-social-profiles-link-url input_wrapper' . esc_attr( $color_class ) . '">';
+                echo '<label for="redux-social-profiles-url-' . esc_attr( $key ) . '-text" class="redux-text-url-label">' . esc_html( $label ) . '</label>';
+                echo '<input id="redux-social-profiles-url-' . esc_attr( $key ) . '-text" class="redux-social-profiles-url-text" data-key="' . esc_attr( $key ) . '" type="text" value="' . esc_url( $url ) . '" />';
+                echo '</div>';
 
-				$reset_text = __( 'Reset', 'redux-framework' );
-				echo '<div class="redux-social-profiles-item-reset">';
-				echo '<a class="button" data-value="' . esc_attr( $key ) . '" value="' . esc_attr( $reset_text ) . '" />' . esc_html( $reset_text ) . '</a>';
-				echo '</div>';
+                $reset_text = __( 'Reset', 'redux-framework' );
+                echo '<div class="redux-social-profiles-item-reset">';
+                echo '<a class="button" data-value="' . esc_attr( $key ) . '" value="' . esc_attr( $reset_text ) . '" />' . esc_html( $reset_text ) . '</a>';
+                echo '</div>';
 
-				if ( $color_pickers ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$label = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/color_picker/text', esc_html__( 'Text', 'redux-framework' ) );
+                if ( $color_pickers ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $label = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/color_picker/text', esc_html__( 'Text', 'redux-framework' ) );
 
-					echo '<div class="redux-social-profiles-text-color picker_wrapper" >';
-					echo '<label for="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' text" class="redux-text-color-label">' . esc_html( $label ) . '</label>';
-					echo '<input
+                    echo '<div class="redux-social-profiles-text-color picker_wrapper" >';
+                    echo '<label for="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' text" class="redux-text-color-label">' . esc_html( $label ) . '</label>';
+                    echo '<input
                             class="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' text"
                             id="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' text"
                             type="text"
                             value="' . esc_attr( $color ) . '"
                             data-key="' . esc_attr( $key ) . '"
                         />';
-					echo '</div>';
+                    echo '</div>';
 
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$label = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/color_picker/background', esc_html__( 'Background', 'redux-framework' ) );
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $label = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/color_picker/background', esc_html__( 'Background', 'redux-framework' ) );
 
-					echo '<div class="redux-social-profiles-background-color picker_wrapper">';
-					echo '<label for="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' background" class="redux-background-color-label" for="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' background">' . esc_html( $label ) . '</label>';
-					echo '<input
+                    echo '<div class="redux-social-profiles-background-color picker_wrapper">';
+                    echo '<label for="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' background" class="redux-background-color-label" for="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' background">' . esc_html( $label ) . '</label>';
+                    echo '<input
                             class="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' background"
                             id="redux-social-profiles-color-picker-' . esc_attr( $key ) . ' background"
                             type="text"
                             value="' . esc_attr( $background ) . '"
                             data-key="' . esc_attr( $key ) . '"
                         />';
-					echo '</div>';
-				}
+                    echo '</div>';
+                }
 
-				echo '<div class="redux-social-profiles-item-order">';
-				echo '<input
+                echo '<div class="redux-social-profiles-item-order">';
+                echo '<input
 				        id="' . esc_attr( $this->field['id'] ) . '-item-order-' . esc_attr( $key ) . '"
                         type="hidden"
                         value="' . esc_attr( $order ) . '"
                     />';
-				echo '</div>';
-
-				echo '</div>';
-				echo '</li>';
-			}
-
-			echo '</ul>';
-			echo '</div>';
-		}
-
-		/**
-		 * This function is unused, but necessary to trigger output.
-		 *
-		 * @param mixed $data CSS data.
-		 *
-		 * @return mixed|string|void
-		 */
-		public function css_style( $data ) {
-			return $data;
-		}
-
-		/**
-		 * Used to enqueue to the front-end
-		 *
-		 * @param string|null|array $style Style.
-		 */
-		public function output( $style = '' ) {
-			if ( ! empty( $this->value ) ) {
-				foreach ( $this->value as $arr ) {
-
-					// For customizer.
-					if ( isset( $arr['data'] ) ) {
-						$arr = rawurldecode( $arr['data'] );
-						$arr = (array) json_decode( $arr );
-					}
-
-					if ( $arr['enabled'] ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-						Redux_Functions_Ex::enqueue_font_awesome();
-					}
-				}
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			if ( empty( $this->field ) ) {
-				return;
-			}
-
-			$min = Redux_Functions::isMin();
-
-			Redux_Functions_Ex::enqueue_font_awesome();
-
-			// Field dependent JS.
-			wp_enqueue_script(
-				'redux-field-social-profiles',
-				$this->url . 'redux-social-profiles' . $min . '.js',
-				array( 'jquery', 'jquery-ui-sortable', 'redux-spectrum-js', 'redux-js' ),
-				Redux_Extension_Social_Profiles::$version,
-				true
-			);
-
-			wp_localize_script(
-				'redux-field-social-profiles',
-				'reduxSocialDefaults',
-				$this->defaults
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-social-profiles',
-					$this->url . 'redux-social-profiles.css',
-					array( 'redux-spectrum-css' ),
-					Redux_Extension_Social_Profiles::$version
-				);
-			}
-		}
-	}
+                echo '</div>';
+
+                echo '</div>';
+                echo '</li>';
+            }
+
+            echo '</ul>';
+            echo '</div>';
+        }
+
+        /**
+         * This function is unused, but necessary to trigger output.
+         *
+         * @param mixed $data CSS data.
+         *
+         * @return mixed|string|void
+         */
+        public function css_style( $data ) {
+            return $data;
+        }
+
+        /**
+         * Used to enqueue to the front-end
+         *
+         * @param string|null|array $style Style.
+         */
+        public function output( $style = '' ) {
+            if ( ! empty( $this->value ) ) {
+                foreach ( $this->value as $arr ) {
+
+                    // For customizer.
+                    if ( isset( $arr['data'] ) ) {
+                        $arr = rawurldecode( $arr['data'] );
+                        $arr = (array) json_decode( $arr );
+                    }
+
+                    if ( $arr['enabled'] ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+                        Redux_Functions_Ex::enqueue_font_awesome();
+                    }
+                }
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( empty( $this->field ) ) {
+                return;
+            }
+
+            $min = Redux_Functions::isMin();
+
+            Redux_Functions_Ex::enqueue_font_awesome();
+
+            // Field dependent JS.
+            wp_enqueue_script(
+                'redux-field-social-profiles',
+                $this->url . 'redux-social-profiles' . $min . '.js',
+                array( 'jquery', 'jquery-ui-sortable', 'redux-spectrum-js', 'redux-js' ),
+                Redux_Extension_Social_Profiles::$version,
+                true
+            );
+
+            wp_localize_script(
+                'redux-field-social-profiles',
+                'reduxSocialDefaults',
+                $this->defaults
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-social-profiles',
+                    $this->url . 'redux-social-profiles.css',
+                    array( 'redux-spectrum-css' ),
+                    Redux_Extension_Social_Profiles::$version
+                );
+            }
+        }
+    }
 }

redux-core/inc/classes/class-redux-filesystem.php

Spacing +2 added lines, -2 removed lines

@@ -542,7 +542,7 @@ 
 				}
 			}
 
-			return (bool) $return;
+			return ( bool ) $return;
 		}
 
 		/**
@@ -942,7 +942,7 @@ 
 					}
 				}
 
-				$ret[ $struc['name'] ] = $struc;
+				$ret[$struc['name']] = $struc;
 			}
 
 			$dir->close();

Indentation +1068 added lines, -1068 removed lines

@@ -13,1072 +13,1072 @@
 
 if ( ! class_exists( 'Redux_Filesystem', false ) ) {
 
-	/**
-	 * Class Redux_Filesystem
-	 */
-	class Redux_Filesystem {
-
-		/**
-		 * Instance of this class.
-		 *
-		 * @since    1.0.0
-		 * @var      null|Redux_Filesystem
-		 */
-		protected static ?Redux_Filesystem $instance = null;
-
-		/**
-		 * WP Filesystem object.
-		 *
-		 * @var null|WP_Filesystem_Direct
-		 */
-		protected static ?WP_Filesystem_Direct $direct = null;
-
-		/**
-		 * File system credentials.
-		 *
-		 * @var array|bool|null
-		 */
-		private $creds;
-
-		/**
-		 * ReduxFramework object pointer.
-		 *
-		 * @var null|ReduxFramework
-		 */
-		public ?ReduxFramework $parent = null;
-
-		/**
-		 * Instance of WP_Filesystem
-		 *
-		 * @var WP_Filesystem_Base|null
-		 */
-		private ?WP_Filesystem_Base $wp_filesystem = null;
-
-		/**
-		 * If DBI_Filesystem should attempt to use the WP_Filesystem class.
-		 *
-		 * @var bool
-		 */
-		private bool $use_filesystem = false;
-
-		/**
-		 * Default chmod octal value for directories.
-		 *
-		 * @var int
-		 */
-		private int $chmod_dir;
-
-		/**
-		 * Default chmod octal value for files.
-		 *
-		 * @var int
-		 */
-		private int $chmod_file;
-
-		/**
-		 * Default cache folder.
-		 *
-		 * @var string
-		 */
-		public string $cache_folder;
-
-		/**
-		 * Kill switch.
-		 *
-		 * @var bool
-		 */
-		public bool $killswitch = false;
-
-		/**
-		 * FTP Form HTML.
-		 *
-		 * @var string
-		 */
-		public string $ftp_form;
-
-		/**
-		 * Pass `true` when instantiating to skip using WP_Filesystem.
-		 *
-		 * @param bool $force_no_fs Force no use of the filesystem.
-		 */
-		public function __construct( bool $force_no_fs = false ) {
-
-			// This little number fixes some issues with certain filesystem setups.
-
-			if ( ! function_exists( 'request_filesystem_credentials' ) ) {
-				require_once ABSPATH . '/wp-admin/includes/template.php';
-				require_once ABSPATH . '/wp-includes/pluggable.php';
-				require_once ABSPATH . '/wp-admin/includes/file.php';
-			}
-
-			// Set default permissions.
-			if ( defined( 'FS_CHMOD_DIR' ) ) {
-				$this->chmod_dir = FS_CHMOD_DIR;
-			} else {
-				$this->chmod_dir = ( fileperms( ABSPATH ) & 0777 | 0755 );
-			}
-
-			if ( defined( 'FS_CHMOD_FILE' ) ) {
-				$this->chmod_file = FS_CHMOD_FILE;
-			} else {
-				$this->chmod_file = ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
-			}
-
-			if ( ! $force_no_fs && function_exists( 'request_filesystem_credentials' ) ) {
-				if ( ( defined( 'WPMDB_WP_FILESYSTEM' ) && WPMDB_WP_FILESYSTEM ) || ! defined( 'WPMDB_WP_FILESYSTEM' ) ) {
-					$this->maybe_init_wp_filesystem();
-				}
-			}
-
-			$uploads_dir        = wp_upload_dir();
-			$this->cache_folder = trailingslashit( $uploads_dir['basedir'] ) . 'redux/';
-			if ( ! $this->file_exists( $this->cache_folder ) ) {
-				$this->mkdir( $this->cache_folder );
-			}
-		}
-
-		/**
-		 * Return an instance of this class.
-		 *
-		 * @param ReduxFramework|null $me ReduxFramework pointer.
-		 *
-		 * @return    object    A single instance of this class.
-		 * @since     1.0.0
-		 */
-		public static function get_instance( ?ReduxFramework $me = null ): ?object {
-
-			// If the single instance hasn't been set, set it now.
-			if ( null === self::$instance ) {
-				self::$instance = new self();
-			}
-
-			if ( null !== $me ) {
-				self::$instance->parent = $me;
-			}
-
-			return self::$instance;
-		}
-
-		/**
-		 * Build an FTP form.
-		 */
-		public function ftp_form() {
-			if ( isset( $this->ftp_form ) && ! empty( $this->ftp_form ) ) {
-				echo '<div class="wrap">';
-				echo '<div class="error">';
-				echo '<p>';
-				// translators: %1$s: Upload URL.  %2$s: Codex URL.
-				echo '<strong>' . esc_html__( 'File Permission Issues', 'redux-framework' ) . '</strong><br/>' . sprintf( esc_html__( 'We were unable to modify required files. Please ensure that %1$s has the proper read-write permissions, or modify your wp-config.php file to contain your FTP login credentials as %2$s.', 'redux-framework' ), '<code>' . esc_url( Redux_Functions_Ex::wp_normalize_path( trailingslashit( WP_CONTENT_DIR ) ) . '/uploads/' ) . '</code>', ' <a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">' . esc_html__( 'outlined here', 'redux-framework' ) . '</a>' );
-				echo '</p>';
-				echo '</div>';
-				echo '<h2></h2>';
-				echo '</div>';
-			}
-		}
-
-		/**
-		 * Attempt to initiate WP_Filesystem
-		 * If this fails, $use_filesystem is set to false and all methods in this class should use native php fallbacks
-		 * Thwarts `request_filesystem_credentials()` attempt to display a form for obtaining creds from users
-		 * TODO: provide notice and input in wp-admin for users when this fails
-		 */
-		public function maybe_init_wp_filesystem() {
-			// Set up the filesystem with creds.
-			require_once ABSPATH . '/wp-admin/includes/template.php';
-			require_once ABSPATH . '/wp-includes/pluggable.php';
-			require_once ABSPATH . '/wp-admin/includes/file.php';
-
-			ob_start();
-			$credentials = request_filesystem_credentials( '', '', false, false );
-			$ob_contents = ob_get_contents();
-			ob_end_clean();
-
-			if ( @wp_filesystem( $credentials ) ) { // phpcs:ignore WordPress.PHP.NoSilencedErrors
-				global $wp_filesystem;
-				$this->wp_filesystem  = $wp_filesystem;
-				$this->use_filesystem = true;
-				$this->generate_default_files();
-			}
-		}
-
-		/**
-		 * Init WO Filesystem.
-		 *
-		 * @param string $form_url Form URL.
-		 * @param string $method   Connect method.
-		 * @param bool   $context  Context.
-		 *
-		 * @return bool
-		 */
-		public function advanced_filesystem_init( string $form_url, string $method = '', bool $context = false ): bool {
-			if ( ! empty( $this->wp_filesystem ) && $this->use_filesystem ) {
-				return true;
-			}
-
-			if ( ! empty( $this->creds ) ) {
-				return true;
-			}
-
-			ob_start();
-
-			$this->creds = request_filesystem_credentials( $form_url, $method, false, $context );
-
-			/* first attempt to get credentials */
-			if ( false === $this->creds ) {
-				$this->creds    = array();
-				$this->ftp_form = ob_get_contents();
-				ob_end_clean();
-
-				/**
-				 * If we come here, we don't have credentials
-				 * so the request for them is displaying
-				 * no need for further processing
-				 * */
-				return false;
-			}
-
-			/* now we got some credentials - try to use them */
-			if ( ! @wp_filesystem( $this->creds ) ) { // phpcs:ignore WordPress.PHP.NoSilencedErrors
-				$this->creds = array();
-				/* incorrect connection data - ask for credentials again, now with an error message */
-				request_filesystem_credentials( $form_url, '', true, $context );
-				$this->ftp_form = ob_get_contents();
-				ob_end_clean();
-
-				return false;
-			}
-
-			global $wp_filesystem;
-			$this->wp_filesystem  = $wp_filesystem;
-			$this->use_filesystem = true;
-			$this->generate_default_files();
-
-			return true;
-		}
-
-		/**
-		 * Load WP filesystem directly.
-		 */
-		public static function load_direct() {
-			if ( null === self::$direct ) {
-				require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-base.php';
-				require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-direct.php';
-
-				self::$direct = new WP_Filesystem_Direct( array() );
-			}
-		}
-
-		/**
-		 * Execute filesystem request.
-		 *
-		 * @param string $action Action to perform.
-		 * @param string $file File to perform upon.
-		 * @param array  $params Argument for action.
-		 *
-		 * @return bool|void
-		 */
-		public function execute( string $action, string $file = '', array $params = array() ) {
-			if ( empty( $this->parent->args ) ) {
-				return;
-			}
-
-			if ( ! empty( $params ) ) {
-				// phpcs:ignore WordPress.PHP.DontExtract
-				extract( $params );
-			}
-
-			if ( empty( $this->wp_filesystem ) ) {
-				if ( 'submenu' === $this->parent->args['menu_type'] ) {
-					$page_parent = $this->parent->args['page_parent'];
-					$base        = $page_parent . '?page=' . $this->parent->args['page_slug'];
-				} else {
-					$base = 'admin.php?page=' . $this->parent->args['page_slug'];
-				}
-
-				$url = wp_nonce_url( $base, 'redux-options' );
-				$this->advanced_filesystem_init( $url, 'direct', dirname( $file ) );
-			}
-
-			return $this->do_action( $action, $file, $params );
-		}
-
-
-		/**
-		 * Generates the default Redux cache folder.
-		 *
-		 * @return void
-		 */
-		private function generate_default_files() {
-			if ( ! $this->is_dir( Redux_Core::$upload_dir ) ) {
-				$this->mkdir( Redux_Core::$upload_dir );
-			}
-		}
-
-		/**
-		 * Do request filesystem action.
-		 *
-		 * @param string $action Requested action.
-		 * @param string $file File to perform action upon.
-		 * @param array  $params Action arguments.
-		 *
-		 * @return bool|void
-		 */
-		public function do_action( string $action, string $file = '', array $params = array() ) {
-			$destination = '';
-			$overwrite   = '';
-			$content     = '';
-
-			if ( ! empty( $params ) ) {
-
-				// phpcs:ignore WordPress.PHP.DontExtract
-				extract( $params );
-			}
-
-			global $wp_filesystem;
-
-			if ( defined( 'FS_CHMOD_FILE' ) ) {
-				$chmod = FS_CHMOD_FILE;
-			} else {
-				$chmod = 0644;
-			}
-
-			if ( isset( $params['chmod'] ) && ! empty( $params['chmod'] ) ) {
-				$chmod = $params['chmod'];
-			}
-			$res = false;
-			if ( ! isset( $recursive ) ) {
-				$recursive = false;
-			}
-
-			// Do unique stuff.
-			if ( 'mkdir' === $action ) {
-				$chmod = null;
-				if ( isset( $params['chmod'] ) && ! empty( $params['chmod'] ) ) {
-					$chmod = $params['chmod'];
-				}
-				$res = $this->mkdir( $file, $chmod );
-			} elseif ( 'rmdir' === $action ) {
-				$res = $this->rmdir( $file, $recursive );
-			} elseif ( 'copy' === $action && false === $this->killswitch ) {
-				$res = $this->copy( $file, $destination, $overwrite, $chmod );
-			} elseif ( 'move' === $action && false === $this->killswitch ) {
-				$res = $this->move( $file, $destination, $overwrite );
-			} elseif ( 'delete' === $action ) {
-				if ( $this->is_dir( $file ) ) {
-					$res = $this->rmdir( $file, $recursive );
-				} else {
-					$res = $this->unlink( $file );
-				}
-			} elseif ( 'dirlist' === $action ) {
-				if ( ! isset( $include_hidden ) ) {
-					$include_hidden = true;
-				}
-				$res = $this->scandir( $file, $include_hidden, $recursive );
-			} elseif ( 'put_contents' === $action && false === $this->killswitch ) {
-				// Write a string to a file.
-				if ( isset( $this->ftp_form ) && ! empty( $this->ftp_form ) ) {
-					self::load_direct();
-					$res = self::$direct->put_contents( $file, $content, $chmod );
-				} else {
-					$res = $this->put_contents( $file, $content, $chmod );
-				}
-			} elseif ( 'chown' === $action ) {
-				// Changes the file owner.
-				if ( isset( $owner ) && ! empty( $owner ) ) {
-					$res = $wp_filesystem->chmod( $file, $chmod, $recursive );
-				}
-			} elseif ( 'owner' === $action ) {
-				// Gets the file owner.
-				$res = $this->wp_filesystem->owner( $file );
-			} elseif ( 'chmod' === $action ) {
-				if ( ! isset( $params['chmod'] ) || ( empty( $params['chmod'] ) ) ) {
-					$chmod = false;
-				}
-
-				$res = $this->chmod( $file, $chmod );
-			} elseif ( 'get_contents' === $action ) {
-				// Reads entire file into a string.
-				if ( isset( $this->ftp_form ) && ! empty( $this->ftp_form ) ) {
-					self::load_direct();
-					$res = self::$direct->get_contents( $file );
-				} else {
-					$res = $this->get_contents( $file );
-				}
-			} elseif ( 'get_contents_array' === $action ) {
-				// Reads entire file into an array.
-				$res = $this->wp_filesystem->get_contents_array( $file );
-			} elseif ( 'object' === $action ) {
-				$res = $this->wp_filesystem;
-			} elseif ( 'unzip' === $action ) {
-				$unzipfile = unzip_file( $file, $destination );
-				if ( $unzipfile ) {
-					$res = true;
-				}
-			}
-
-			if ( ! $res ) {
-				if ( 'dirlist' === $action ) {
-					if ( empty( $res ) ) {
-						return;
-					}
-
-					if ( ! is_array( $res ) ) {
-						if ( count( glob( "$file*" ) ) === 0 ) {
-							return;
-						}
-					}
-				}
-
-				$this->killswitch = true;
-
-				// translators: %1$s: Upload URL.  %2$s: Codex URL.
-				$msg = '<strong>' . esc_html__( 'File Permission Issues', 'redux-framework' ) . '</strong><br/>' . sprintf( esc_html__( 'We were unable to modify required files. Please ensure that %1$s has the proper read-write permissions, or modify your wp-config.php file to contain your FTP login credentials as %2$s.', 'redux-framework' ), '<code>' . esc_url( Redux_Functions_Ex::wp_normalize_path( trailingslashit( WP_CONTENT_DIR ) ) ) . '/uploads/</code>', '<a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">' . esc_html__( 'outlined here', 'redux-framework' ) . '</a>' );
-
-				$data = array(
-					'parent'  => self::$instance->parent,
-					'type'    => 'error',
-					'msg'     => $msg,
-					'id'      => 'redux-wp-login',
-					'dismiss' => false,
-				);
-
-				Redux_Admin_Notices::set_notice( $data );
-			}
-
-			return $res;
-		}
-
-
-		/**
-		 * Getter for the instantiated WP_Filesystem. This should be used carefully since $wp_filesystem won't always have a value.
-		 *
-		 * @return WP_Filesystem_Base|false
-		 */
-		public function get_wp_filesystem() {
-			if ( $this->use_filesystem ) {
-				return $this->wp_filesystem;
-			} else {
-				return false;
-			}
-		}
-
-		/**
-		 * Check if WP_Filesystem being used.
-		 *
-		 * @return bool
-		 */
-		public function using_wp_filesystem(): bool {
-			return $this->use_filesystem;
-		}
-
-		/**
-		 * Attempts to use the correct path for the FS method being used.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return string
-		 */
-		public function get_sanitized_path( string $abs_path ): string {
-			if ( $this->using_wp_filesystem() ) {
-				return str_replace( ABSPATH, $this->wp_filesystem->abspath(), $abs_path );
-			}
-
-			return $abs_path;
-		}
-
-		/**
-		 * Create file if not exists then set mtime and atime on file
-		 *
-		 * @param string $abs_path Absolute path.
-		 * @param int    $time Time.
-		 * @param int    $atime Altered time.
-		 *
-		 * @return bool
-		 */
-		public function touch( string $abs_path, int $time = 0, int $atime = 0 ): bool {
-			if ( 0 === $time ) {
-				$time = time();
-			}
-
-			if ( 0 === $atime ) {
-				$atime = time();
-			}
-
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP
-			$return = @touch( $abs_path, $time, $atime );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->touch( $abs_path, $time, $atime );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Calls file_put_contents with chmod.
-		 *
-		 * @param string      $abs_path Absolute path.
-		 * @param string      $contents Content to write to the file.
-		 * @param string|null $perms    Default permissions value.
-		 *
-		 * @return bool
-		 */
-		public function put_contents( string $abs_path, string $contents, ?string $perms = null ): bool {
-			$return = false;
-
-			if ( ! $this->is_dir( dirname( $abs_path ) ) ) {
-				$this->mkdir( dirname( $abs_path ) );
-			}
-
-			if ( $this->is_writable( dirname( $abs_path ) ) ) {
-				// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents, WordPress.PHP.NoSilencedErrors.Discouraged
-				$return = @file_put_contents( $abs_path, $contents );
-				$this->chmod( $abs_path );
-
-				if ( null === $perms ) {
-					$perms = $this->chmod_file;
-				}
-			}
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_is_writable, WordPress.WP.AlternativeFunctions.file_system_operations_is_writable
-				if ( $this->is_writable( dirname( $abs_path ) ) ) {
-					$return = $this->wp_filesystem->put_contents( $abs_path, $contents, $perms );
-				}
-			}
-
-			return (bool) $return;
-		}
-
-		/**
-		 * Does the specified file or dir exist?
-		 *
-		 * @param string $abs_path Absolute path.
-		 * @return bool
-		 */
-		public function file_exists( string $abs_path ): bool {
-			$return = file_exists( $abs_path );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->exists( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Get a file's size.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return int
-		 */
-		public function filesize( string $abs_path ): int {
-			$return = filesize( $abs_path );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->size( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Get the contents of a file as a string.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return string
-		 */
-		public function get_local_file_contents( string $abs_path ): string {
-
-			try {
-				$contents = '';
-
-				if ( $this->file_exists( $abs_path ) && is_file( $abs_path ) ) {
-					if ( $this->is_writable( $abs_path ) ) { // phpcs:ignore WordPress.WP.AlternativeFunctions
-						ob_start();
-
-						include_once $abs_path;
-
-						$contents = ob_get_clean();
-					}
-				}
-			} catch ( Exception $e ) {
-				// This means that ob_start has been disabled on the system. Lets fallback to good old file_get_contents.
-				$contents = file_get_contents( $abs_path ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-			}
-
-			return $contents;
-		}
-
-		/**
-		 * Get the contents of a file as a string.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return string
-		 */
-		public function get_contents( string $abs_path ): string {
-			$abs_path = $this->get_sanitized_path( $abs_path );
-			$return   = '';
-			if ( $this->use_filesystem ) {
-				$return = $this->wp_filesystem->get_contents( $abs_path );
-			}
-			if ( empty( $return ) ) {
-				$return = $this->get_local_file_contents( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Delete a file.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return bool
-		 */
-		public function unlink( string $abs_path ): bool {
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
-			$return = @unlink( $abs_path );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->delete( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Chmod a file.
-		 *
-		 * @param string   $abs_path Absolute path.
-		 * @param int|null $perms    Permission value, if not provided, defaults to WP standards.
-		 *
-		 * @return bool
-		 */
-		public function chmod( string $abs_path, ?int $perms = null ): bool {
-			if ( ! $this->file_exists( $abs_path ) ) {
-				return false;
-			}
-			if ( is_null( $perms ) ) {
-				$perms = $this->is_file( $abs_path ) ? $this->chmod_file : $this->chmod_dir;
-			}
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
-			$return = @chmod( $abs_path, $perms );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->chmod( $abs_path, $perms );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Check if this path is a directory.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return bool
-		 */
-		public function is_dir( string $abs_path ): bool {
-			$return = is_dir( $abs_path );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->is_dir( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Check if the specified path is a file.
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return bool
-		 */
-		public function is_file( string $abs_path ): bool {
-			$return = is_file( $abs_path );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->is_file( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Is the specified path readable?
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return bool
-		 */
-		public function is_readable( string $abs_path ): bool {
-			$return = is_readable( $abs_path );
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->is_readable( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Is the specified path writable?
-		 *
-		 * @param string $abs_path Absolute path.
-		 *
-		 * @return bool
-		 */
-		public function is_writable( string $abs_path ): bool {
-			$return = is_writable( $abs_path ); // phpcs:ignore WordPress.WP.AlternativeFunctions
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-				$return   = $this->wp_filesystem->is_writable( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Create an index file at the given path.
-		 *
-		 * @param string $path Directory to add the index to.
-		 */
-		private function create_index( string $path ) {
-			$index_path = trailingslashit( $path ) . 'index.php';
-			if ( ! $this->file_exists( $index_path ) ) {
-				$this->put_contents( $index_path, "<?php\n//Silence is golden" );
-			}
-		}
-
-		/**
-		 * Recursive mkdir.
-		 *
-		 * @param string   $abs_path Absolute path.
-		 * @param int|null $perms    Permissions, if default not required.
-		 *
-		 * @return bool
-		 */
-		public function mkdir( string $abs_path, ?int $perms = null ): bool {
-			if ( is_null( $perms ) ) {
-				$perms = $this->chmod_dir;
-			}
-
-			if ( $this->is_dir( $abs_path ) ) {
-				$this->chmod( $abs_path, $perms );
-				$this->create_index( $abs_path );
-
-				return true;
-			}
-
-			try {
-				$mkdirp = wp_mkdir_p( $abs_path );
-			} catch ( Exception $e ) {
-				$mkdirp = false;
-			}
-
-			if ( $mkdirp ) {
-				$this->chmod( $abs_path, $perms );
-				$this->create_index( $abs_path );
-
-				return true;
-			}
-
-			$return = false;
-
-			if ( $this->is_writable( dirname( $abs_path ) ) ) {
-				// phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions, WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_is_writable
-				$return = @mkdir( $abs_path, $perms, true );
-			}
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-
-				if ( $this->is_dir( $abs_path ) ) {
-					$this->create_index( $abs_path );
-
-					return true;
-				}
-
-				// WP_Filesystem doesn't offer a recursive mkdir().
-				$abs_path = str_replace( '//', '/', $abs_path );
-				$abs_path = rtrim( $abs_path, '/' );
-				if ( empty( $abs_path ) ) {
-					$abs_path = '/';
-				}
-
-				$dirs        = explode( '/', ltrim( $abs_path, '/' ) );
-				$current_dir = '';
-
-				foreach ( $dirs as $dir ) {
-					$current_dir .= '/' . $dir;
-
-					// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_is_writable, WordPress.WP.AlternativeFunctions.file_system_operations_is_writable
-					if ( ! $this->is_dir( $current_dir ) && $this->is_writable( dirname( $current_dir ) ) ) {
-						$this->wp_filesystem->mkdir( $current_dir, $perms );
-					}
-				}
-
-				$return = $this->is_dir( $abs_path );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Delete a directory.
-		 *
-		 * @param string $abs_path  Absolute path.
-		 * @param bool   $recursive Set to recursively create.
-		 *
-		 * @return bool
-		 */
-		public function rmdir( string $abs_path, bool $recursive = false ): bool {
-			if ( ! $this->is_dir( $abs_path ) ) {
-				return false;
-			}
-
-			// Taken from WP_Filesystem_Direct.
-			if ( ! $recursive ) {
-				// phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
-				$return = @rmdir( $abs_path );
-			} else {
-
-				// At this point, it's a folder, and we're in recursive mode.
-				$abs_path = trailingslashit( $abs_path );
-				$filelist = $this->scandir( $abs_path );
-
-				$return = true;
-				if ( is_array( $filelist ) ) {
-					foreach ( $filelist as $filename => $fileinfo ) {
-
-						if ( 'd' === $fileinfo['type'] ) {
-							$return = $this->rmdir( $abs_path . $filename, $recursive );
-						} else {
-							$return = $this->unlink( $abs_path . $filename );
-						}
-					}
-				}
-				// phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
-				if ( file_exists( $abs_path ) && ! @rmdir( $abs_path ) ) {
-					$return = false;
-				}
-			}
-
-			if ( ! $return && $this->use_filesystem ) {
-				$abs_path = $this->get_sanitized_path( $abs_path );
-
-				return $this->wp_filesystem->rmdir( $abs_path, $recursive );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Get a list of files/folders under the specified directory.
-		 *
-		 * @param string $abs_path       Absolute path.
-		 * @param bool   $include_hidden Include hidden files, defaults to true.
-		 * @param bool   $recursive      Recursive search, defaults to false.
-		 *
-		 * @return array|bool
-		 */
-		public function scandir( string $abs_path, bool $include_hidden = true, bool $recursive = false ) {
-			if ( $this->is_file( $abs_path ) ) {
-				$limit_file = basename( $abs_path );
-				$abs_path   = dirname( $abs_path );
-			} else {
-				$limit_file = false;
-			}
-
-			if ( ! $this->is_dir( $abs_path ) || ! $this->is_readable( $abs_path ) ) {
-				return false;
-			}
-
-			$dir = dir( $abs_path );
-
-			if ( false === $dir ) {
-				if ( $this->use_filesystem ) {
-					$abs_path = $this->get_sanitized_path( $abs_path );
-
-					return $this->wp_filesystem->dirlist( $abs_path, $include_hidden, $recursive );
-				}
-
-				return false;
-			}
-
-			$ret = array();
-
-			while ( false !== ( $entry = $dir->read() ) ) {
-				$struc         = array();
-				$struc['name'] = $entry;
-
-				if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
-					continue;
-				}
-
-				if ( ! $include_hidden && '.' === $struc['name'][0] ) {
-					continue;
-				}
-
-				if ( $limit_file && $struc['name'] !== $limit_file ) {
-					continue;
-				}
-
-				$struc['type'] = $this->is_dir( $abs_path . '/' . $entry ) ? 'd' : 'f';
-
-				if ( 'd' === $struc['type'] ) {
-					if ( $recursive ) {
-						$struc['files'] = $this->scandir( $abs_path . '/' . $struc['name'], $include_hidden, $recursive );
-					} else {
-						$struc['files'] = array();
-					}
-				}
-
-				$ret[ $struc['name'] ] = $struc;
-			}
-
-			$dir->close();
-
-			unset( $dir );
-
-			return $ret;
-		}
-
-		/**
-		 * Light wrapper for move_uploaded_file with chmod.
-		 *
-		 * @param string   $file        Source file.
-		 * @param string   $destination File destination.
-		 * @param int|null $perms       Permission value.
-		 *
-		 * @return bool
-		 */
-		public function move_uploaded_file( string $file, string $destination, ?int $perms = null ): bool {
-			// TODO: look into replicating more functionality from wp_handle_upload().
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors
-			$return = @move_uploaded_file( $file, $destination );
-
-			if ( $return ) {
-				$this->chmod( $destination, $perms );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Copy a file.
-		 *
-		 * @param string $source_abs_path Source path.
-		 * @param string $destination_abs_path Destination path.
-		 * @param bool   $overwrite Overwrite file.
-		 * @param mixed  $perms Permission value.
-		 * @return bool
-		 * Taken from WP_Filesystem_Direct
-		 */
-		public function copy( string $source_abs_path, string $destination_abs_path, bool $overwrite = true, $perms = false ): bool {
-
-			// Error if source file doesn't exist.
-			if ( ! $this->file_exists( $source_abs_path ) ) {
-				return false;
-			}
-
-			if ( ! $overwrite && $this->file_exists( $destination_abs_path ) ) {
-				return false;
-			}
-			if ( ! $this->is_dir( dirname( $destination_abs_path ) ) ) {
-				$this->mkdir( dirname( $destination_abs_path ) );
-			}
-
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors
-			$return = @copy( $source_abs_path, $destination_abs_path );
-			if ( $perms && $return ) {
-				$this->chmod( $destination_abs_path, $perms );
-			}
-
-			if ( ! $return && $this->use_filesystem ) {
-				$source_abs_path      = $this->get_sanitized_path( $source_abs_path );
-				$destination_abs_path = $this->get_sanitized_path( $destination_abs_path );
-				$return               = $this->wp_filesystem->copy(
-					$source_abs_path,
-					$destination_abs_path,
-					$overwrite,
-					$perms
-				);
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Move a file.
-		 *
-		 * @param string $source_abs_path Source absolute path.
-		 * @param string $destination_abs_path Destination absolute path.
-		 * @param bool   $overwrite Overwrite if file exists.
-		 * @return bool
-		 */
-		public function move( string $source_abs_path, string $destination_abs_path, bool $overwrite = true ): bool {
-
-			// Error if source file doesn't exist.
-			if ( ! $this->file_exists( $source_abs_path ) ) {
-				return false;
-			}
-
-			// Try using rename first.
-			// If that fails (for example, the source is read only) try copy.
-			// Taken in part from WP_Filesystem_Direct.
-			if ( ! $overwrite && $this->file_exists( $destination_abs_path ) ) {
-				return false;
-			} elseif ( @rename( $source_abs_path, $destination_abs_path ) ) { // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
-				return true;
-			} elseif ( $this->copy( $source_abs_path, $destination_abs_path, $overwrite ) && $this->file_exists(
-				$destination_abs_path
-			) ) {
-
-					$this->unlink( $source_abs_path );
-
-					return true;
-			} else {
-				$return = false;
-			}
-
-			if ( $this->use_filesystem ) {
-				$source_abs_path      = $this->get_sanitized_path( $source_abs_path );
-				$destination_abs_path = $this->get_sanitized_path( $destination_abs_path );
-
-				$return = $this->wp_filesystem->move( $source_abs_path, $destination_abs_path, $overwrite );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Shim: get_template.
-		 *
-		 * @param string $file Template name.
-		 *
-		 * @return void Path to template file.
-		 */
-		public function get_template( string $file ) {
-			$panel = new Redux_Panel( $this );
-			$panel->get_template( $file );
-		}
-	}
-
-	Redux_Filesystem::get_instance();
+    /**
+     * Class Redux_Filesystem
+     */
+    class Redux_Filesystem {
+
+        /**
+         * Instance of this class.
+         *
+         * @since    1.0.0
+         * @var      null|Redux_Filesystem
+         */
+        protected static ?Redux_Filesystem $instance = null;
+
+        /**
+         * WP Filesystem object.
+         *
+         * @var null|WP_Filesystem_Direct
+         */
+        protected static ?WP_Filesystem_Direct $direct = null;
+
+        /**
+         * File system credentials.
+         *
+         * @var array|bool|null
+         */
+        private $creds;
+
+        /**
+         * ReduxFramework object pointer.
+         *
+         * @var null|ReduxFramework
+         */
+        public ?ReduxFramework $parent = null;
+
+        /**
+         * Instance of WP_Filesystem
+         *
+         * @var WP_Filesystem_Base|null
+         */
+        private ?WP_Filesystem_Base $wp_filesystem = null;
+
+        /**
+         * If DBI_Filesystem should attempt to use the WP_Filesystem class.
+         *
+         * @var bool
+         */
+        private bool $use_filesystem = false;
+
+        /**
+         * Default chmod octal value for directories.
+         *
+         * @var int
+         */
+        private int $chmod_dir;
+
+        /**
+         * Default chmod octal value for files.
+         *
+         * @var int
+         */
+        private int $chmod_file;
+
+        /**
+         * Default cache folder.
+         *
+         * @var string
+         */
+        public string $cache_folder;
+
+        /**
+         * Kill switch.
+         *
+         * @var bool
+         */
+        public bool $killswitch = false;
+
+        /**
+         * FTP Form HTML.
+         *
+         * @var string
+         */
+        public string $ftp_form;
+
+        /**
+         * Pass `true` when instantiating to skip using WP_Filesystem.
+         *
+         * @param bool $force_no_fs Force no use of the filesystem.
+         */
+        public function __construct( bool $force_no_fs = false ) {
+
+            // This little number fixes some issues with certain filesystem setups.
+
+            if ( ! function_exists( 'request_filesystem_credentials' ) ) {
+                require_once ABSPATH . '/wp-admin/includes/template.php';
+                require_once ABSPATH . '/wp-includes/pluggable.php';
+                require_once ABSPATH . '/wp-admin/includes/file.php';
+            }
+
+            // Set default permissions.
+            if ( defined( 'FS_CHMOD_DIR' ) ) {
+                $this->chmod_dir = FS_CHMOD_DIR;
+            } else {
+                $this->chmod_dir = ( fileperms( ABSPATH ) & 0777 | 0755 );
+            }
+
+            if ( defined( 'FS_CHMOD_FILE' ) ) {
+                $this->chmod_file = FS_CHMOD_FILE;
+            } else {
+                $this->chmod_file = ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+            }
+
+            if ( ! $force_no_fs && function_exists( 'request_filesystem_credentials' ) ) {
+                if ( ( defined( 'WPMDB_WP_FILESYSTEM' ) && WPMDB_WP_FILESYSTEM ) || ! defined( 'WPMDB_WP_FILESYSTEM' ) ) {
+                    $this->maybe_init_wp_filesystem();
+                }
+            }
+
+            $uploads_dir        = wp_upload_dir();
+            $this->cache_folder = trailingslashit( $uploads_dir['basedir'] ) . 'redux/';
+            if ( ! $this->file_exists( $this->cache_folder ) ) {
+                $this->mkdir( $this->cache_folder );
+            }
+        }
+
+        /**
+         * Return an instance of this class.
+         *
+         * @param ReduxFramework|null $me ReduxFramework pointer.
+         *
+         * @return    object    A single instance of this class.
+         * @since     1.0.0
+         */
+        public static function get_instance( ?ReduxFramework $me = null ): ?object {
+
+            // If the single instance hasn't been set, set it now.
+            if ( null === self::$instance ) {
+                self::$instance = new self();
+            }
+
+            if ( null !== $me ) {
+                self::$instance->parent = $me;
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Build an FTP form.
+         */
+        public function ftp_form() {
+            if ( isset( $this->ftp_form ) && ! empty( $this->ftp_form ) ) {
+                echo '<div class="wrap">';
+                echo '<div class="error">';
+                echo '<p>';
+                // translators: %1$s: Upload URL.  %2$s: Codex URL.
+                echo '<strong>' . esc_html__( 'File Permission Issues', 'redux-framework' ) . '</strong><br/>' . sprintf( esc_html__( 'We were unable to modify required files. Please ensure that %1$s has the proper read-write permissions, or modify your wp-config.php file to contain your FTP login credentials as %2$s.', 'redux-framework' ), '<code>' . esc_url( Redux_Functions_Ex::wp_normalize_path( trailingslashit( WP_CONTENT_DIR ) ) . '/uploads/' ) . '</code>', ' <a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">' . esc_html__( 'outlined here', 'redux-framework' ) . '</a>' );
+                echo '</p>';
+                echo '</div>';
+                echo '<h2></h2>';
+                echo '</div>';
+            }
+        }
+
+        /**
+         * Attempt to initiate WP_Filesystem
+         * If this fails, $use_filesystem is set to false and all methods in this class should use native php fallbacks
+         * Thwarts `request_filesystem_credentials()` attempt to display a form for obtaining creds from users
+         * TODO: provide notice and input in wp-admin for users when this fails
+         */
+        public function maybe_init_wp_filesystem() {
+            // Set up the filesystem with creds.
+            require_once ABSPATH . '/wp-admin/includes/template.php';
+            require_once ABSPATH . '/wp-includes/pluggable.php';
+            require_once ABSPATH . '/wp-admin/includes/file.php';
+
+            ob_start();
+            $credentials = request_filesystem_credentials( '', '', false, false );
+            $ob_contents = ob_get_contents();
+            ob_end_clean();
+
+            if ( @wp_filesystem( $credentials ) ) { // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                global $wp_filesystem;
+                $this->wp_filesystem  = $wp_filesystem;
+                $this->use_filesystem = true;
+                $this->generate_default_files();
+            }
+        }
+
+        /**
+         * Init WO Filesystem.
+         *
+         * @param string $form_url Form URL.
+         * @param string $method   Connect method.
+         * @param bool   $context  Context.
+         *
+         * @return bool
+         */
+        public function advanced_filesystem_init( string $form_url, string $method = '', bool $context = false ): bool {
+            if ( ! empty( $this->wp_filesystem ) && $this->use_filesystem ) {
+                return true;
+            }
+
+            if ( ! empty( $this->creds ) ) {
+                return true;
+            }
+
+            ob_start();
+
+            $this->creds = request_filesystem_credentials( $form_url, $method, false, $context );
+
+            /* first attempt to get credentials */
+            if ( false === $this->creds ) {
+                $this->creds    = array();
+                $this->ftp_form = ob_get_contents();
+                ob_end_clean();
+
+                /**
+                 * If we come here, we don't have credentials
+                 * so the request for them is displaying
+                 * no need for further processing
+                 * */
+                return false;
+            }
+
+            /* now we got some credentials - try to use them */
+            if ( ! @wp_filesystem( $this->creds ) ) { // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                $this->creds = array();
+                /* incorrect connection data - ask for credentials again, now with an error message */
+                request_filesystem_credentials( $form_url, '', true, $context );
+                $this->ftp_form = ob_get_contents();
+                ob_end_clean();
+
+                return false;
+            }
+
+            global $wp_filesystem;
+            $this->wp_filesystem  = $wp_filesystem;
+            $this->use_filesystem = true;
+            $this->generate_default_files();
+
+            return true;
+        }
+
+        /**
+         * Load WP filesystem directly.
+         */
+        public static function load_direct() {
+            if ( null === self::$direct ) {
+                require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-base.php';
+                require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-direct.php';
+
+                self::$direct = new WP_Filesystem_Direct( array() );
+            }
+        }
+
+        /**
+         * Execute filesystem request.
+         *
+         * @param string $action Action to perform.
+         * @param string $file File to perform upon.
+         * @param array  $params Argument for action.
+         *
+         * @return bool|void
+         */
+        public function execute( string $action, string $file = '', array $params = array() ) {
+            if ( empty( $this->parent->args ) ) {
+                return;
+            }
+
+            if ( ! empty( $params ) ) {
+                // phpcs:ignore WordPress.PHP.DontExtract
+                extract( $params );
+            }
+
+            if ( empty( $this->wp_filesystem ) ) {
+                if ( 'submenu' === $this->parent->args['menu_type'] ) {
+                    $page_parent = $this->parent->args['page_parent'];
+                    $base        = $page_parent . '?page=' . $this->parent->args['page_slug'];
+                } else {
+                    $base = 'admin.php?page=' . $this->parent->args['page_slug'];
+                }
+
+                $url = wp_nonce_url( $base, 'redux-options' );
+                $this->advanced_filesystem_init( $url, 'direct', dirname( $file ) );
+            }
+
+            return $this->do_action( $action, $file, $params );
+        }
+
+
+        /**
+         * Generates the default Redux cache folder.
+         *
+         * @return void
+         */
+        private function generate_default_files() {
+            if ( ! $this->is_dir( Redux_Core::$upload_dir ) ) {
+                $this->mkdir( Redux_Core::$upload_dir );
+            }
+        }
+
+        /**
+         * Do request filesystem action.
+         *
+         * @param string $action Requested action.
+         * @param string $file File to perform action upon.
+         * @param array  $params Action arguments.
+         *
+         * @return bool|void
+         */
+        public function do_action( string $action, string $file = '', array $params = array() ) {
+            $destination = '';
+            $overwrite   = '';
+            $content     = '';
+
+            if ( ! empty( $params ) ) {
+
+                // phpcs:ignore WordPress.PHP.DontExtract
+                extract( $params );
+            }
+
+            global $wp_filesystem;
+
+            if ( defined( 'FS_CHMOD_FILE' ) ) {
+                $chmod = FS_CHMOD_FILE;
+            } else {
+                $chmod = 0644;
+            }
+
+            if ( isset( $params['chmod'] ) && ! empty( $params['chmod'] ) ) {
+                $chmod = $params['chmod'];
+            }
+            $res = false;
+            if ( ! isset( $recursive ) ) {
+                $recursive = false;
+            }
+
+            // Do unique stuff.
+            if ( 'mkdir' === $action ) {
+                $chmod = null;
+                if ( isset( $params['chmod'] ) && ! empty( $params['chmod'] ) ) {
+                    $chmod = $params['chmod'];
+                }
+                $res = $this->mkdir( $file, $chmod );
+            } elseif ( 'rmdir' === $action ) {
+                $res = $this->rmdir( $file, $recursive );
+            } elseif ( 'copy' === $action && false === $this->killswitch ) {
+                $res = $this->copy( $file, $destination, $overwrite, $chmod );
+            } elseif ( 'move' === $action && false === $this->killswitch ) {
+                $res = $this->move( $file, $destination, $overwrite );
+            } elseif ( 'delete' === $action ) {
+                if ( $this->is_dir( $file ) ) {
+                    $res = $this->rmdir( $file, $recursive );
+                } else {
+                    $res = $this->unlink( $file );
+                }
+            } elseif ( 'dirlist' === $action ) {
+                if ( ! isset( $include_hidden ) ) {
+                    $include_hidden = true;
+                }
+                $res = $this->scandir( $file, $include_hidden, $recursive );
+            } elseif ( 'put_contents' === $action && false === $this->killswitch ) {
+                // Write a string to a file.
+                if ( isset( $this->ftp_form ) && ! empty( $this->ftp_form ) ) {
+                    self::load_direct();
+                    $res = self::$direct->put_contents( $file, $content, $chmod );
+                } else {
+                    $res = $this->put_contents( $file, $content, $chmod );
+                }
+            } elseif ( 'chown' === $action ) {
+                // Changes the file owner.
+                if ( isset( $owner ) && ! empty( $owner ) ) {
+                    $res = $wp_filesystem->chmod( $file, $chmod, $recursive );
+                }
+            } elseif ( 'owner' === $action ) {
+                // Gets the file owner.
+                $res = $this->wp_filesystem->owner( $file );
+            } elseif ( 'chmod' === $action ) {
+                if ( ! isset( $params['chmod'] ) || ( empty( $params['chmod'] ) ) ) {
+                    $chmod = false;
+                }
+
+                $res = $this->chmod( $file, $chmod );
+            } elseif ( 'get_contents' === $action ) {
+                // Reads entire file into a string.
+                if ( isset( $this->ftp_form ) && ! empty( $this->ftp_form ) ) {
+                    self::load_direct();
+                    $res = self::$direct->get_contents( $file );
+                } else {
+                    $res = $this->get_contents( $file );
+                }
+            } elseif ( 'get_contents_array' === $action ) {
+                // Reads entire file into an array.
+                $res = $this->wp_filesystem->get_contents_array( $file );
+            } elseif ( 'object' === $action ) {
+                $res = $this->wp_filesystem;
+            } elseif ( 'unzip' === $action ) {
+                $unzipfile = unzip_file( $file, $destination );
+                if ( $unzipfile ) {
+                    $res = true;
+                }
+            }
+
+            if ( ! $res ) {
+                if ( 'dirlist' === $action ) {
+                    if ( empty( $res ) ) {
+                        return;
+                    }
+
+                    if ( ! is_array( $res ) ) {
+                        if ( count( glob( "$file*" ) ) === 0 ) {
+                            return;
+                        }
+                    }
+                }
+
+                $this->killswitch = true;
+
+                // translators: %1$s: Upload URL.  %2$s: Codex URL.
+                $msg = '<strong>' . esc_html__( 'File Permission Issues', 'redux-framework' ) . '</strong><br/>' . sprintf( esc_html__( 'We were unable to modify required files. Please ensure that %1$s has the proper read-write permissions, or modify your wp-config.php file to contain your FTP login credentials as %2$s.', 'redux-framework' ), '<code>' . esc_url( Redux_Functions_Ex::wp_normalize_path( trailingslashit( WP_CONTENT_DIR ) ) ) . '/uploads/</code>', '<a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">' . esc_html__( 'outlined here', 'redux-framework' ) . '</a>' );
+
+                $data = array(
+                    'parent'  => self::$instance->parent,
+                    'type'    => 'error',
+                    'msg'     => $msg,
+                    'id'      => 'redux-wp-login',
+                    'dismiss' => false,
+                );
+
+                Redux_Admin_Notices::set_notice( $data );
+            }
+
+            return $res;
+        }
+
+
+        /**
+         * Getter for the instantiated WP_Filesystem. This should be used carefully since $wp_filesystem won't always have a value.
+         *
+         * @return WP_Filesystem_Base|false
+         */
+        public function get_wp_filesystem() {
+            if ( $this->use_filesystem ) {
+                return $this->wp_filesystem;
+            } else {
+                return false;
+            }
+        }
+
+        /**
+         * Check if WP_Filesystem being used.
+         *
+         * @return bool
+         */
+        public function using_wp_filesystem(): bool {
+            return $this->use_filesystem;
+        }
+
+        /**
+         * Attempts to use the correct path for the FS method being used.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return string
+         */
+        public function get_sanitized_path( string $abs_path ): string {
+            if ( $this->using_wp_filesystem() ) {
+                return str_replace( ABSPATH, $this->wp_filesystem->abspath(), $abs_path );
+            }
+
+            return $abs_path;
+        }
+
+        /**
+         * Create file if not exists then set mtime and atime on file
+         *
+         * @param string $abs_path Absolute path.
+         * @param int    $time Time.
+         * @param int    $atime Altered time.
+         *
+         * @return bool
+         */
+        public function touch( string $abs_path, int $time = 0, int $atime = 0 ): bool {
+            if ( 0 === $time ) {
+                $time = time();
+            }
+
+            if ( 0 === $atime ) {
+                $atime = time();
+            }
+
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP
+            $return = @touch( $abs_path, $time, $atime );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->touch( $abs_path, $time, $atime );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Calls file_put_contents with chmod.
+         *
+         * @param string      $abs_path Absolute path.
+         * @param string      $contents Content to write to the file.
+         * @param string|null $perms    Default permissions value.
+         *
+         * @return bool
+         */
+        public function put_contents( string $abs_path, string $contents, ?string $perms = null ): bool {
+            $return = false;
+
+            if ( ! $this->is_dir( dirname( $abs_path ) ) ) {
+                $this->mkdir( dirname( $abs_path ) );
+            }
+
+            if ( $this->is_writable( dirname( $abs_path ) ) ) {
+                // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents, WordPress.PHP.NoSilencedErrors.Discouraged
+                $return = @file_put_contents( $abs_path, $contents );
+                $this->chmod( $abs_path );
+
+                if ( null === $perms ) {
+                    $perms = $this->chmod_file;
+                }
+            }
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_is_writable, WordPress.WP.AlternativeFunctions.file_system_operations_is_writable
+                if ( $this->is_writable( dirname( $abs_path ) ) ) {
+                    $return = $this->wp_filesystem->put_contents( $abs_path, $contents, $perms );
+                }
+            }
+
+            return (bool) $return;
+        }
+
+        /**
+         * Does the specified file or dir exist?
+         *
+         * @param string $abs_path Absolute path.
+         * @return bool
+         */
+        public function file_exists( string $abs_path ): bool {
+            $return = file_exists( $abs_path );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->exists( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Get a file's size.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return int
+         */
+        public function filesize( string $abs_path ): int {
+            $return = filesize( $abs_path );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->size( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Get the contents of a file as a string.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return string
+         */
+        public function get_local_file_contents( string $abs_path ): string {
+
+            try {
+                $contents = '';
+
+                if ( $this->file_exists( $abs_path ) && is_file( $abs_path ) ) {
+                    if ( $this->is_writable( $abs_path ) ) { // phpcs:ignore WordPress.WP.AlternativeFunctions
+                        ob_start();
+
+                        include_once $abs_path;
+
+                        $contents = ob_get_clean();
+                    }
+                }
+            } catch ( Exception $e ) {
+                // This means that ob_start has been disabled on the system. Lets fallback to good old file_get_contents.
+                $contents = file_get_contents( $abs_path ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+            }
+
+            return $contents;
+        }
+
+        /**
+         * Get the contents of a file as a string.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return string
+         */
+        public function get_contents( string $abs_path ): string {
+            $abs_path = $this->get_sanitized_path( $abs_path );
+            $return   = '';
+            if ( $this->use_filesystem ) {
+                $return = $this->wp_filesystem->get_contents( $abs_path );
+            }
+            if ( empty( $return ) ) {
+                $return = $this->get_local_file_contents( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Delete a file.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return bool
+         */
+        public function unlink( string $abs_path ): bool {
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
+            $return = @unlink( $abs_path );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->delete( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Chmod a file.
+         *
+         * @param string   $abs_path Absolute path.
+         * @param int|null $perms    Permission value, if not provided, defaults to WP standards.
+         *
+         * @return bool
+         */
+        public function chmod( string $abs_path, ?int $perms = null ): bool {
+            if ( ! $this->file_exists( $abs_path ) ) {
+                return false;
+            }
+            if ( is_null( $perms ) ) {
+                $perms = $this->is_file( $abs_path ) ? $this->chmod_file : $this->chmod_dir;
+            }
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
+            $return = @chmod( $abs_path, $perms );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->chmod( $abs_path, $perms );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Check if this path is a directory.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return bool
+         */
+        public function is_dir( string $abs_path ): bool {
+            $return = is_dir( $abs_path );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->is_dir( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Check if the specified path is a file.
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return bool
+         */
+        public function is_file( string $abs_path ): bool {
+            $return = is_file( $abs_path );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->is_file( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Is the specified path readable?
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return bool
+         */
+        public function is_readable( string $abs_path ): bool {
+            $return = is_readable( $abs_path );
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->is_readable( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Is the specified path writable?
+         *
+         * @param string $abs_path Absolute path.
+         *
+         * @return bool
+         */
+        public function is_writable( string $abs_path ): bool {
+            $return = is_writable( $abs_path ); // phpcs:ignore WordPress.WP.AlternativeFunctions
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+                $return   = $this->wp_filesystem->is_writable( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Create an index file at the given path.
+         *
+         * @param string $path Directory to add the index to.
+         */
+        private function create_index( string $path ) {
+            $index_path = trailingslashit( $path ) . 'index.php';
+            if ( ! $this->file_exists( $index_path ) ) {
+                $this->put_contents( $index_path, "<?php\n//Silence is golden" );
+            }
+        }
+
+        /**
+         * Recursive mkdir.
+         *
+         * @param string   $abs_path Absolute path.
+         * @param int|null $perms    Permissions, if default not required.
+         *
+         * @return bool
+         */
+        public function mkdir( string $abs_path, ?int $perms = null ): bool {
+            if ( is_null( $perms ) ) {
+                $perms = $this->chmod_dir;
+            }
+
+            if ( $this->is_dir( $abs_path ) ) {
+                $this->chmod( $abs_path, $perms );
+                $this->create_index( $abs_path );
+
+                return true;
+            }
+
+            try {
+                $mkdirp = wp_mkdir_p( $abs_path );
+            } catch ( Exception $e ) {
+                $mkdirp = false;
+            }
+
+            if ( $mkdirp ) {
+                $this->chmod( $abs_path, $perms );
+                $this->create_index( $abs_path );
+
+                return true;
+            }
+
+            $return = false;
+
+            if ( $this->is_writable( dirname( $abs_path ) ) ) {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions, WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_is_writable
+                $return = @mkdir( $abs_path, $perms, true );
+            }
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+
+                if ( $this->is_dir( $abs_path ) ) {
+                    $this->create_index( $abs_path );
+
+                    return true;
+                }
+
+                // WP_Filesystem doesn't offer a recursive mkdir().
+                $abs_path = str_replace( '//', '/', $abs_path );
+                $abs_path = rtrim( $abs_path, '/' );
+                if ( empty( $abs_path ) ) {
+                    $abs_path = '/';
+                }
+
+                $dirs        = explode( '/', ltrim( $abs_path, '/' ) );
+                $current_dir = '';
+
+                foreach ( $dirs as $dir ) {
+                    $current_dir .= '/' . $dir;
+
+                    // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_is_writable, WordPress.WP.AlternativeFunctions.file_system_operations_is_writable
+                    if ( ! $this->is_dir( $current_dir ) && $this->is_writable( dirname( $current_dir ) ) ) {
+                        $this->wp_filesystem->mkdir( $current_dir, $perms );
+                    }
+                }
+
+                $return = $this->is_dir( $abs_path );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Delete a directory.
+         *
+         * @param string $abs_path  Absolute path.
+         * @param bool   $recursive Set to recursively create.
+         *
+         * @return bool
+         */
+        public function rmdir( string $abs_path, bool $recursive = false ): bool {
+            if ( ! $this->is_dir( $abs_path ) ) {
+                return false;
+            }
+
+            // Taken from WP_Filesystem_Direct.
+            if ( ! $recursive ) {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
+                $return = @rmdir( $abs_path );
+            } else {
+
+                // At this point, it's a folder, and we're in recursive mode.
+                $abs_path = trailingslashit( $abs_path );
+                $filelist = $this->scandir( $abs_path );
+
+                $return = true;
+                if ( is_array( $filelist ) ) {
+                    foreach ( $filelist as $filename => $fileinfo ) {
+
+                        if ( 'd' === $fileinfo['type'] ) {
+                            $return = $this->rmdir( $abs_path . $filename, $recursive );
+                        } else {
+                            $return = $this->unlink( $abs_path . $filename );
+                        }
+                    }
+                }
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
+                if ( file_exists( $abs_path ) && ! @rmdir( $abs_path ) ) {
+                    $return = false;
+                }
+            }
+
+            if ( ! $return && $this->use_filesystem ) {
+                $abs_path = $this->get_sanitized_path( $abs_path );
+
+                return $this->wp_filesystem->rmdir( $abs_path, $recursive );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Get a list of files/folders under the specified directory.
+         *
+         * @param string $abs_path       Absolute path.
+         * @param bool   $include_hidden Include hidden files, defaults to true.
+         * @param bool   $recursive      Recursive search, defaults to false.
+         *
+         * @return array|bool
+         */
+        public function scandir( string $abs_path, bool $include_hidden = true, bool $recursive = false ) {
+            if ( $this->is_file( $abs_path ) ) {
+                $limit_file = basename( $abs_path );
+                $abs_path   = dirname( $abs_path );
+            } else {
+                $limit_file = false;
+            }
+
+            if ( ! $this->is_dir( $abs_path ) || ! $this->is_readable( $abs_path ) ) {
+                return false;
+            }
+
+            $dir = dir( $abs_path );
+
+            if ( false === $dir ) {
+                if ( $this->use_filesystem ) {
+                    $abs_path = $this->get_sanitized_path( $abs_path );
+
+                    return $this->wp_filesystem->dirlist( $abs_path, $include_hidden, $recursive );
+                }
+
+                return false;
+            }
+
+            $ret = array();
+
+            while ( false !== ( $entry = $dir->read() ) ) {
+                $struc         = array();
+                $struc['name'] = $entry;
+
+                if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
+                    continue;
+                }
+
+                if ( ! $include_hidden && '.' === $struc['name'][0] ) {
+                    continue;
+                }
+
+                if ( $limit_file && $struc['name'] !== $limit_file ) {
+                    continue;
+                }
+
+                $struc['type'] = $this->is_dir( $abs_path . '/' . $entry ) ? 'd' : 'f';
+
+                if ( 'd' === $struc['type'] ) {
+                    if ( $recursive ) {
+                        $struc['files'] = $this->scandir( $abs_path . '/' . $struc['name'], $include_hidden, $recursive );
+                    } else {
+                        $struc['files'] = array();
+                    }
+                }
+
+                $ret[ $struc['name'] ] = $struc;
+            }
+
+            $dir->close();
+
+            unset( $dir );
+
+            return $ret;
+        }
+
+        /**
+         * Light wrapper for move_uploaded_file with chmod.
+         *
+         * @param string   $file        Source file.
+         * @param string   $destination File destination.
+         * @param int|null $perms       Permission value.
+         *
+         * @return bool
+         */
+        public function move_uploaded_file( string $file, string $destination, ?int $perms = null ): bool {
+            // TODO: look into replicating more functionality from wp_handle_upload().
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors
+            $return = @move_uploaded_file( $file, $destination );
+
+            if ( $return ) {
+                $this->chmod( $destination, $perms );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Copy a file.
+         *
+         * @param string $source_abs_path Source path.
+         * @param string $destination_abs_path Destination path.
+         * @param bool   $overwrite Overwrite file.
+         * @param mixed  $perms Permission value.
+         * @return bool
+         * Taken from WP_Filesystem_Direct
+         */
+        public function copy( string $source_abs_path, string $destination_abs_path, bool $overwrite = true, $perms = false ): bool {
+
+            // Error if source file doesn't exist.
+            if ( ! $this->file_exists( $source_abs_path ) ) {
+                return false;
+            }
+
+            if ( ! $overwrite && $this->file_exists( $destination_abs_path ) ) {
+                return false;
+            }
+            if ( ! $this->is_dir( dirname( $destination_abs_path ) ) ) {
+                $this->mkdir( dirname( $destination_abs_path ) );
+            }
+
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors
+            $return = @copy( $source_abs_path, $destination_abs_path );
+            if ( $perms && $return ) {
+                $this->chmod( $destination_abs_path, $perms );
+            }
+
+            if ( ! $return && $this->use_filesystem ) {
+                $source_abs_path      = $this->get_sanitized_path( $source_abs_path );
+                $destination_abs_path = $this->get_sanitized_path( $destination_abs_path );
+                $return               = $this->wp_filesystem->copy(
+                    $source_abs_path,
+                    $destination_abs_path,
+                    $overwrite,
+                    $perms
+                );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Move a file.
+         *
+         * @param string $source_abs_path Source absolute path.
+         * @param string $destination_abs_path Destination absolute path.
+         * @param bool   $overwrite Overwrite if file exists.
+         * @return bool
+         */
+        public function move( string $source_abs_path, string $destination_abs_path, bool $overwrite = true ): bool {
+
+            // Error if source file doesn't exist.
+            if ( ! $this->file_exists( $source_abs_path ) ) {
+                return false;
+            }
+
+            // Try using rename first.
+            // If that fails (for example, the source is read only) try copy.
+            // Taken in part from WP_Filesystem_Direct.
+            if ( ! $overwrite && $this->file_exists( $destination_abs_path ) ) {
+                return false;
+            } elseif ( @rename( $source_abs_path, $destination_abs_path ) ) { // phpcs:ignore WordPress.PHP.NoSilencedErrors, WordPress.WP.AlternativeFunctions
+                return true;
+            } elseif ( $this->copy( $source_abs_path, $destination_abs_path, $overwrite ) && $this->file_exists(
+                $destination_abs_path
+            ) ) {
+
+                    $this->unlink( $source_abs_path );
+
+                    return true;
+            } else {
+                $return = false;
+            }
+
+            if ( $this->use_filesystem ) {
+                $source_abs_path      = $this->get_sanitized_path( $source_abs_path );
+                $destination_abs_path = $this->get_sanitized_path( $destination_abs_path );
+
+                $return = $this->wp_filesystem->move( $source_abs_path, $destination_abs_path, $overwrite );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Shim: get_template.
+         *
+         * @param string $file Template name.
+         *
+         * @return void Path to template file.
+         */
+        public function get_template( string $file ) {
+            $panel = new Redux_Panel( $this );
+            $panel->get_template( $file );
+        }
+    }
+
+    Redux_Filesystem::get_instance();
 }

redux-core/inc/extensions/tabbed/tabbed/class-redux-tabbed.php

Indentation +203 added lines, -203 removed lines

@@ -11,210 +11,210 @@
 
 if ( ! class_exists( 'Redux_Tabbed', false ) ) {
 
-	/**
-	 * Class Redux_Tabbed
-	 */
-	class Redux_Tabbed extends Redux_Field {
+    /**
+     * Class Redux_Tabbed
+     */
+    class Redux_Tabbed extends Redux_Field {
 
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'icon' => '',
-			);
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'icon' => '',
+            );
 
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 0.0.4
-		 */
-		public function render() {
-			$unallowed = array( 'tabbed', 'social_profiles', 'color_schemes', 'repeater' );
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 0.0.4
+         */
+        public function render() {
+            $unallowed = array( 'tabbed', 'social_profiles', 'color_schemes', 'repeater' );
 
-			echo '<div id="' . esc_attr( $this->field['id'] ) . '-tabbed" class="redux-tabbed" rel="' . esc_attr( $this->field['id'] ) . '">';
-			echo '<div class="redux-tabbed-nav" data-id="' . esc_attr( $this->field['id'] ) . '">';
-			foreach ( $this->field['tabs'] as $key => $tab ) {
-
-				$tabbed_icon   = ( ! empty( $tab['icon'] ) ) ? '<i class="redux-tab-icon ' . esc_attr( $tab['icon'] ) . '"></i>' : '';
-				$tabbed_active = ( empty( $key ) ) ? 'redux-tabbed-active' : '';
-
-				// Output HTML escaped above.
-				// phpcs:ignore WordPress.Security.EscapeOutput
-				echo '<a href="#" class="' . esc_attr( $tabbed_active ) . '"">' . $tabbed_icon . esc_attr( $tab['title'] ) . '</a>';
-
-			}
-			echo '</div>';
-
-			echo '<div class="redux-tabbed-contents">';
-			foreach ( $this->field['tabs'] as $key => $tab ) {
-
-				$tabbed_hidden = ( ! empty( $key ) ) ? ' hidden' : '';
-
-				echo '<div class="redux-tabbed-content' . esc_attr( $tabbed_hidden ) . '">';
-
-				foreach ( $tab['fields'] as $field ) {
-
-					if ( in_array( $field['type'], $unallowed, true ) ) {
-						echo esc_html__( 'The', 'redux-framework' ) . ' <code>' . esc_html( $field['type'] ) . '</code> ' . esc_html__( 'field is not supported within the Tabbed field.', 'redux-framework' );
-					} else {
-						$this->output_field( $field );
-					}
-				}
-
-				echo '</div>';
-			}
-
-			echo '</div>';
-			echo '</div>';
-		}
-
-		/**
-		 * Output field.
-		 *
-		 * @param array $field Field array.
-		 */
-		public function output_field( array $field ) {
-			$this->enqueue_dependencies( $field );
-
-			if ( ! isset( $field['class'] ) ) {
-				$field['class'] = '';
-			}
-
-			$field['class'] .= ' tabbed';
-
-			echo '<div class="redux-tab-field">';
-
-			if ( ! empty( $field['title'] ) ) {
-				echo '<div class="redux-field-title">';
-				echo '<h4>' . wp_kses_post( $field['title'] ) . '</h4>';
-
-				if ( ! empty( $field['subtitle'] ) ) {
-					echo '<div class="redux-field-subtitle">' . wp_kses_post( $field['subtitle'] ) . '</div>';
-				}
-
-				echo '</div>';
-			}
-
-			$orig_field_id = $field['id'];
-
-			$field['name']   = $this->parent->args['opt_name'] . '[' . $orig_field_id . ']';
-			$field['class'] .= ' in-tabbed';
-
-			if ( isset( $field['options'] ) ) {
-
-				// Sorter data filter.
-				if ( 'sorter' === $field['type'] && ! empty( $field['data'] ) && is_array( $field['data'] ) ) {
-					if ( ! isset( $field['args'] ) ) {
-						$field['args'] = array();
-					}
-
-					foreach ( $field['data'] as $key => $data ) {
-						if ( ! isset( $field['args'][ $key ] ) ) {
-							$field['args'][ $key ] = array();
-						}
-						$field['options'][ $key ] = $this->parent->get_wordpress_data( $data, $field['args'][ $key ] );
-					}
-				}
-			}
-
-			$default = $field['default'] ?? null;
-
-			// phpcs:ignore Squiz.PHP.CommentedOutCode.Found
-			// $value = isset( $this->parent->options[ $orig_field_id ] ) && 0 !== (int) $this->parent->options[ $orig_field_id ] ? $this->parent->options[ $orig_field_id ] : $default;
-			$value = $this->parent->options[ $orig_field_id ] ?? $default;
-
-			$this->parent->render_class->field_input( $field, $value );
-
-			echo '<div class="clear"></div>';
-			echo '</div>';
-		}
-
-		/**
-		 * Localize.
-		 *
-		 * @param array  $field Field.
-		 * @param string $value Value.
-		 *
-		 * @return void
-		 */
-		public function localize( array $field, string $value = '' ) {
-			ob_start();
-
-			foreach ( $field['tabs'] as $f ) {
-				foreach ( $f['fields'] as $field ) {
-					$this->output_field( $field );
-				}
-			}
-
-			ob_end_clean();
-		}
-
-		/**
-		 * Enqueue Deps.
-		 *
-		 * @param array $field Field.
-		 */
-		private function enqueue_dependencies( array $field ) {
-			$field_type = $field['type'];
-
-			$field_class = 'Redux_' . $field_type;
-
-			if ( ! class_exists( $field_class ) ) {
-				$field_type = str_replace( '_', '-', $field_type );
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$class_file = apply_filters( 'redux-typeclass-load', ReduxFramework::$_dir . 'inc/fields/' . $field_type . '/class-redux-' . $field_type . '.php', $field_class );
-
-				if ( file_exists( $class_file ) ) {
-					require_once $class_file;
-				}
-			}
-
-			if ( class_exists( $field_class ) && method_exists( $field_class, 'enqueue' ) ) {
-				$enqueue = new $field_class( '', '', $this->parent );
-				$enqueue->enqueue();
-			}
-
-			if ( class_exists( $field_class ) && method_exists( $field_class, 'localize' ) ) {
-
-				$enqueue = new $field_class( '', '', $this->parent );
-
-				$data = $enqueue->localize( $field );
-
-				$this->parent->enqueue_class->localize_data[ $field['type'] ][ $field['id'] ] = $data;
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 0.0.4
-		 */
-		public function enqueue() {
-			wp_print_styles( 'editor-buttons' );
-
-			wp_enqueue_script(
-				'redux-field-tabbed',
-				Redux_Core::$url . 'inc/extensions/tabbed/tabbed/redux-tabbed' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				Redux_Extension_Tabbed::$version,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-tabbed',
-					Redux_Core::$url . 'inc/extensions/tabbed/tabbed/redux-tabbed.css',
-					array(),
-					Redux_Extension_Tabbed::$version
-				);
-			}
-		}
-	}
+            echo '<div id="' . esc_attr( $this->field['id'] ) . '-tabbed" class="redux-tabbed" rel="' . esc_attr( $this->field['id'] ) . '">';
+            echo '<div class="redux-tabbed-nav" data-id="' . esc_attr( $this->field['id'] ) . '">';
+            foreach ( $this->field['tabs'] as $key => $tab ) {
+
+                $tabbed_icon   = ( ! empty( $tab['icon'] ) ) ? '<i class="redux-tab-icon ' . esc_attr( $tab['icon'] ) . '"></i>' : '';
+                $tabbed_active = ( empty( $key ) ) ? 'redux-tabbed-active' : '';
+
+                // Output HTML escaped above.
+                // phpcs:ignore WordPress.Security.EscapeOutput
+                echo '<a href="#" class="' . esc_attr( $tabbed_active ) . '"">' . $tabbed_icon . esc_attr( $tab['title'] ) . '</a>';
+
+            }
+            echo '</div>';
+
+            echo '<div class="redux-tabbed-contents">';
+            foreach ( $this->field['tabs'] as $key => $tab ) {
+
+                $tabbed_hidden = ( ! empty( $key ) ) ? ' hidden' : '';
+
+                echo '<div class="redux-tabbed-content' . esc_attr( $tabbed_hidden ) . '">';
+
+                foreach ( $tab['fields'] as $field ) {
+
+                    if ( in_array( $field['type'], $unallowed, true ) ) {
+                        echo esc_html__( 'The', 'redux-framework' ) . ' <code>' . esc_html( $field['type'] ) . '</code> ' . esc_html__( 'field is not supported within the Tabbed field.', 'redux-framework' );
+                    } else {
+                        $this->output_field( $field );
+                    }
+                }
+
+                echo '</div>';
+            }
+
+            echo '</div>';
+            echo '</div>';
+        }
+
+        /**
+         * Output field.
+         *
+         * @param array $field Field array.
+         */
+        public function output_field( array $field ) {
+            $this->enqueue_dependencies( $field );
+
+            if ( ! isset( $field['class'] ) ) {
+                $field['class'] = '';
+            }
+
+            $field['class'] .= ' tabbed';
+
+            echo '<div class="redux-tab-field">';
+
+            if ( ! empty( $field['title'] ) ) {
+                echo '<div class="redux-field-title">';
+                echo '<h4>' . wp_kses_post( $field['title'] ) . '</h4>';
+
+                if ( ! empty( $field['subtitle'] ) ) {
+                    echo '<div class="redux-field-subtitle">' . wp_kses_post( $field['subtitle'] ) . '</div>';
+                }
+
+                echo '</div>';
+            }
+
+            $orig_field_id = $field['id'];
+
+            $field['name']   = $this->parent->args['opt_name'] . '[' . $orig_field_id . ']';
+            $field['class'] .= ' in-tabbed';
+
+            if ( isset( $field['options'] ) ) {
+
+                // Sorter data filter.
+                if ( 'sorter' === $field['type'] && ! empty( $field['data'] ) && is_array( $field['data'] ) ) {
+                    if ( ! isset( $field['args'] ) ) {
+                        $field['args'] = array();
+                    }
+
+                    foreach ( $field['data'] as $key => $data ) {
+                        if ( ! isset( $field['args'][ $key ] ) ) {
+                            $field['args'][ $key ] = array();
+                        }
+                        $field['options'][ $key ] = $this->parent->get_wordpress_data( $data, $field['args'][ $key ] );
+                    }
+                }
+            }
+
+            $default = $field['default'] ?? null;
+
+            // phpcs:ignore Squiz.PHP.CommentedOutCode.Found
+            // $value = isset( $this->parent->options[ $orig_field_id ] ) && 0 !== (int) $this->parent->options[ $orig_field_id ] ? $this->parent->options[ $orig_field_id ] : $default;
+            $value = $this->parent->options[ $orig_field_id ] ?? $default;
+
+            $this->parent->render_class->field_input( $field, $value );
+
+            echo '<div class="clear"></div>';
+            echo '</div>';
+        }
+
+        /**
+         * Localize.
+         *
+         * @param array  $field Field.
+         * @param string $value Value.
+         *
+         * @return void
+         */
+        public function localize( array $field, string $value = '' ) {
+            ob_start();
+
+            foreach ( $field['tabs'] as $f ) {
+                foreach ( $f['fields'] as $field ) {
+                    $this->output_field( $field );
+                }
+            }
+
+            ob_end_clean();
+        }
+
+        /**
+         * Enqueue Deps.
+         *
+         * @param array $field Field.
+         */
+        private function enqueue_dependencies( array $field ) {
+            $field_type = $field['type'];
+
+            $field_class = 'Redux_' . $field_type;
+
+            if ( ! class_exists( $field_class ) ) {
+                $field_type = str_replace( '_', '-', $field_type );
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $class_file = apply_filters( 'redux-typeclass-load', ReduxFramework::$_dir . 'inc/fields/' . $field_type . '/class-redux-' . $field_type . '.php', $field_class );
+
+                if ( file_exists( $class_file ) ) {
+                    require_once $class_file;
+                }
+            }
+
+            if ( class_exists( $field_class ) && method_exists( $field_class, 'enqueue' ) ) {
+                $enqueue = new $field_class( '', '', $this->parent );
+                $enqueue->enqueue();
+            }
+
+            if ( class_exists( $field_class ) && method_exists( $field_class, 'localize' ) ) {
+
+                $enqueue = new $field_class( '', '', $this->parent );
+
+                $data = $enqueue->localize( $field );
+
+                $this->parent->enqueue_class->localize_data[ $field['type'] ][ $field['id'] ] = $data;
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 0.0.4
+         */
+        public function enqueue() {
+            wp_print_styles( 'editor-buttons' );
+
+            wp_enqueue_script(
+                'redux-field-tabbed',
+                Redux_Core::$url . 'inc/extensions/tabbed/tabbed/redux-tabbed' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                Redux_Extension_Tabbed::$version,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-tabbed',
+                    Redux_Core::$url . 'inc/extensions/tabbed/tabbed/redux-tabbed.css',
+                    array(),
+                    Redux_Extension_Tabbed::$version
+                );
+            }
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -114,10 +114,10 @@ 
 					}
 
 					foreach ( $field['data'] as $key => $data ) {
-						if ( ! isset( $field['args'][ $key ] ) ) {
-							$field['args'][ $key ] = array();
+						if ( ! isset( $field['args'][$key] ) ) {
+							$field['args'][$key] = array();
 						}
-						$field['options'][ $key ] = $this->parent->get_wordpress_data( $data, $field['args'][ $key ] );
+						$field['options'][$key] = $this->parent->get_wordpress_data( $data, $field['args'][$key] );
 					}
 				}
 			}
@@ -126,7 +126,7 @@ 
 
 			// phpcs:ignore Squiz.PHP.CommentedOutCode.Found
 			// $value = isset( $this->parent->options[ $orig_field_id ] ) && 0 !== (int) $this->parent->options[ $orig_field_id ] ? $this->parent->options[ $orig_field_id ] : $default;
-			$value = $this->parent->options[ $orig_field_id ] ?? $default;
+			$value = $this->parent->options[$orig_field_id] ?? $default;
 
 			$this->parent->render_class->field_input( $field, $value );
 
@@ -186,7 +186,7 @@ 
 
 				$data = $enqueue->localize( $field );
 
-				$this->parent->enqueue_class->localize_data[ $field['type'] ][ $field['id'] ] = $data;
+				$this->parent->enqueue_class->localize_data[$field['type']][$field['id']] = $data;
 			}
 		}
 

redux-core/inc/classes/class-redux-wordpress-data.php

Indentation +673 added lines, -673 removed lines

@@ -11,677 +11,677 @@
 
 if ( ! class_exists( 'Redux_WordPress_Data', false ) ) {
 
-	/**
-	 * Class Redux_WordPress_Data
-	 */
-	class Redux_WordPress_Data extends Redux_Class {
-
-		/**
-		 * Holds WordPress data.
-		 *
-		 * @var null
-		 */
-		private $wp_data = null;
-
-		/**
-		 * Redux_WordPress_Data constructor.
-		 *
-		 * @param mixed $redux ReduxFramework pointer or opt_name.
-		 */
-		public function __construct( $redux = null ) {
-			if ( is_string( $redux ) ) {
-				$this->opt_name = $redux;
-			} else {
-				parent::__construct( $redux );
-			}
-		}
-
-		/**
-		 * Get the data.
-		 *
-		 * @param string|array $type          Type.
-		 * @param array|string $args          Args.
-		 * @param string       $opt_name      Opt name.
-		 * @param string|int   $current_value Current value.
-		 * @param bool         $ajax          Tells if this is an AJAX call.
-		 *
-		 * @return array|mixed|string
-		 */
-		public function get( $type, $args = array(), string $opt_name = '', $current_value = '', bool $ajax = false ) {
-			if ( '' === $opt_name ) {
-				$opt_name = $this->opt_name;
-			}
-
-			// We don't want to run this, it's not a string value. Send it back!
-			if ( is_array( $type ) ) {
-				return $type;
-			}
-
-			/**
-			 * Filter 'redux/options/{opt_name}/pre_data/{type}'
-			 *
-			 * @param string $data
-			 */
-			$pre_data = apply_filters( "redux/options/$opt_name/pre_data/$type", null ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
-			if ( null !== $pre_data || empty( $type ) ) {
-				return $pre_data;
-			}
-
-			if ( isset( $args['data_sortby'] ) && in_array( $args['data_sortby'], array( 'value', 'key' ), true ) ) {
-				$data_sort = $args['data_sortby'];
-				unset( $args['data_sortby'] );
-			} else {
-				$data_sort = 'value';
-			}
-			if ( isset( $args['data_order'] ) && in_array( $args['data_order'], array( 'asc', 'desc' ), true ) ) {
-				$data_order = $args['data_order'];
-				unset( $args['data_order'] );
-			} else {
-				$data_order = 'asc';
-			}
-
-			$this->maybe_get_translation( $type, $current_value, $args );
-
-			$current_data = array();
-			if ( empty( $current_value ) && ! Redux_Helpers::is_integer( $current_value ) ) {
-				$current_value = null;
-			} else {
-				// Get the args to grab the current data.
-				$current_data_args = $this->get_current_data_args( $type, $args, $current_value );
-
-				// Let's make a unique key for this arg array.
-				$current_data_args_key = md5( maybe_serialize( $current_data_args ) );
-
-				// Check to make sure we haven't already run this call before.
-				$current_data = $this->wp_data[ $type . $current_data_args_key ] ?? $this->get_data( $type, $current_data_args, $current_value );
-			}
-
-			// If ajax is enabled AND $current_data is empty, set a dummy value for the init.
-			if ( $ajax && ! wp_doing_ajax() ) {
-				// Dummy is necessary otherwise empty.
-				if ( empty( $current_data ) ) {
-					$current_data = array(
-						'dummy' => '',
-					);
-				}
-
-				return $current_data;
-			}
-
-			// phpcs:ignore Squiz.PHP.CommentedOutCode
-			$args_key = md5( maybe_serialize( $args ) );
-
-			// Data caching.
-			if ( isset( $this->wp_data[ $type . $args_key ] ) ) {
-				$data = $this->wp_data[ $type . $args_key ];
-			} else {
-				/**
-				 * Use data from WordPress to populate an option array.
-				 * */
-				$data = $this->get_data( $type, $args, $current_value );
-			}
-
-			if ( ! empty( $current_data ) ) {
-				$data += $current_data;
-			}
-
-			if ( ! empty( $data ) ) {
-				$data                               = $this->order_data( $data, $data_sort, $data_order );
-				$this->wp_data[ $type . $args_key ] = $data;
-			}
-
-			/**
-			 * Filter 'redux/options/{opt_name}/data/{type}'
-			 *
-			 * @param string $data
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			return apply_filters( "redux/options/$opt_name/data/$type", $data );
-		}
-
-
-		/**
-		 * Process the results into a proper array, fetching the data elements needed for each data type.
-		 *
-		 * @param array|WP_Error $results       Results to process in the data array.
-		 * @param string|bool    $id_key        Key on object/array that represents the ID.
-		 * @param string|bool    $name_key      Key on object/array that represents the name/text.
-		 * @param bool           $add_key       If true, the display key will appear in the text.
-		 * @param string|bool    $secondary_key If a data type, you'd rather display a different ID as the display key.
-		 *
-		 * @return array
-		 */
-		private function process_results( $results = array(), $id_key = '', $name_key = '', bool $add_key = true, $secondary_key = 'slug' ): array {
-			$data = array();
-			if ( ! empty( $results ) && ! is_a( $results, 'WP_Error' ) ) {
-				foreach ( $results as $k => $v ) {
-					if ( empty( $id_key ) ) {
-						$key = $k;
-					} else {
-						if ( is_object( $v ) ) {
-							$key = $v->$id_key;
-						} elseif ( is_array( $v ) ) {
-							$key = $v[ $id_key ];
-						} else {
-							$key = $k;
-						}
-					}
-
-					if ( empty( $name_key ) ) {
-						$value = $v;
-					} else {
-						if ( is_object( $v ) ) {
-							$value = $v->$name_key;
-						} elseif ( is_array( $v ) ) {
-							$value = $v[ $name_key ];
-						} else {
-							$value = $v;
-						}
-					}
-
-					$display_key = $key;
-
-					if ( is_object( $v ) && isset( $v->$secondary_key ) ) {
-						$display_key = $v->$secondary_key;
-					} elseif ( ! is_object( $v ) && isset( $v[ $secondary_key ] ) ) {
-						$display_key = $v[ $secondary_key ];
-					}
-					$data[ $key ] = $value;
-					if ( $display_key !== $value && $add_key ) {
-						$data[ $key ] = $data[ $key ] . ' [' . $display_key . ']';
-					}
-				}
-			}
-
-			return $data;
-		}
-
-		/**
-		 * Order / Sort the data.
-		 *
-		 * @param array  $data  Data to sort.
-		 * @param string $sort  Way to sort. Accepts: key|value.
-		 * @param string $order Order of the sort. Accepts: asc|desc.
-		 *
-		 * @return array
-		 */
-		private function order_data( array $data = array(), string $sort = 'value', string $order = 'asc' ): array {
-			if ( 'key' === $sort ) {
-				if ( 'asc' === $order ) {
-					ksort( $data );
-				} else {
-					krsort( $data );
-				}
-			} elseif ( 'value' === $sort ) {
-				if ( 'asc' === $order ) {
-					asort( $data );
-				} else {
-					arsort( $data );
-				}
-			}
-
-			return $data;
-		}
-
-		/**
-		 * Fetch the data for a given type.
-		 *
-		 * @param string       $type          The data type we're fetching.
-		 * @param array|string $args          Arguments to pass.
-		 * @param mixed|array  $current_value If a current value already set in the database.
-		 *
-		 * @return array|null|string
-		 */
-		private function get_data( string $type, $args, $current_value ) {
-			$args = $this->get_arg_defaults( $type, $args );
-
-			$opt_name = $this->opt_name;
-			if ( empty( $args ) ) {
-				$args = array();
-			}
-
-			$data = array();
-			if ( isset( $args['args'] ) && empty( $args['args'] ) ) {
-				unset( $args['args'] );
-			}
-
-			$display_keys = false;
-			if ( isset( $args['display_keys'] ) ) {
-				$display_keys = true;
-				unset( $args['display_keys'] );
-			}
-
-			$secondary_key = 'slug';
-			if ( isset( $args['secondary_key'] ) ) {
-				$secondary_key = $args['secondary_key'];
-				unset( $args['secondary_key'] );
-			}
-
-			switch ( $type ) {
-				case 'categories':
-				case 'category':
-				case 'terms':
-				case 'term':
-					if ( isset( $args['taxonomies'] ) ) {
-						$args['taxonomy'] = $args['taxonomies'];
-						unset( $args['taxonomies'] );
-					}
-					$results = get_terms( $args );
-					$data    = $this->process_results( $results, 'term_id', 'name', $display_keys, $secondary_key );
-					break;
-
-				case 'pages':
-				case 'page':
-					$results = get_pages( $args );
-					$data    = $this->process_results( $results, 'ID', 'post_title', $display_keys, $secondary_key );
-					break;
-
-				case 'tags':
-				case 'tag':
-					$results = get_tags( $args );
-					$data    = $this->process_results( $results, 'term_id', 'name', $display_keys, $secondary_key );
-					break;
-
-				case 'menus':
-				case 'menu':
-					$results = wp_get_nav_menus( $args );
-					$data    = $this->process_results( $results, 'term_id', 'name', $display_keys, $secondary_key );
-					break;
-
-				case 'posts':
-				case 'post':
-					$results = get_posts( $args );
-					$data    = $this->process_results( $results, 'ID', 'post_title', $display_keys, $secondary_key );
-					break;
-
-				case 'users':
-				case 'user':
-					$results = get_users( $args );
-					$data    = $this->process_results( $results, 'ID', 'display_name', $display_keys, $secondary_key );
-					break;
-
-				case 'sites':
-				case 'site':
-					$sites = get_sites();
-
-					if ( isset( $sites ) ) {
-						$results = array();
-						foreach ( $sites as $site ) {
-							$site = (array) $site;
-							$k    = $site['blog_id'];
-							$v    = $site['domain'] . $site['path'];
-							$name = get_blog_option( $k, 'blogname' );
-							if ( ! empty( $name ) ) {
-								$v .= ' - [' . $name . ']';
-							}
-							$results[ $k ] = $v;
-						}
-						$data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
-					}
-
-					break;
-
-				case 'taxonomies':
-				case 'taxonomy':
-				case 'tax':
-					$results = get_taxonomies( $args );
-					$data    = $this->process_results( $results, '', '', $display_keys, $secondary_key );
-					break;
-
-				case 'post_types':
-				case 'post_type':
-					global $wp_post_types;
-
-					$output = $args['output'];
-					unset( $args['output'] );
-					$operator = $args['operator'];
-					unset( $args['operator'] );
-
-					$post_types = get_post_types( $args, $output, $operator );
-
-					foreach ( $post_types as $name => $title ) {
-						if ( isset( $wp_post_types[ $name ]->labels->menu_name ) ) {
-							$data[ $name ] = $wp_post_types[ $name ]->labels->menu_name;
-						} else {
-							$data[ $name ] = ucfirst( $name );
-						}
-					}
-					break;
-
-				case 'menu_locations':
-				case 'menu_location':
-					global $_wp_registered_nav_menus;
-					foreach ( $_wp_registered_nav_menus as $k => $v ) {
-						$data[ $k ] = $v;
-						if ( ! has_nav_menu( $k ) ) {
-							$data[ $k ] .= ' ' . __( '[unassigned]', 'redux-framework' );
-						}
-					}
-					break;
-
-				case 'image_sizes':
-				case 'image_size':
-					global $_wp_additional_image_sizes;
-					$results = array();
-					foreach ( $_wp_additional_image_sizes as $size_name => $size_attrs ) {
-						$results[ $size_name ] = $size_name . ' - ' . $size_attrs['width'] . ' x ' . $size_attrs['height'];
-					}
-					$data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
-
-					break;
-
-				case 'elusive-icons':
-				case 'elusive-icon':
-				case 'elusive':
-				case 'icons':
-				case 'font-icon':
-				case 'font-icons':
-					$fs    = Redux_Filesystem::get_instance();
-					$fonts = $fs->get_contents( Redux_Core::$dir . 'assets/css/vendor/elusive-icons.css' );
-					if ( ! empty( $fonts ) ) {
-						preg_match_all( '@\.el-(\w+)::before@', $fonts, $matches );
-						foreach ( $matches[1] as $item ) {
-							if ( 'before' === $item ) {
-								continue;
-							}
-							$data[ 'el el-' . $item ] = $item;
-						}
-					}
-
-					/**
-					 * Filter 'redux/font-icons'
-					 *
-					 * @param array $font_icons array of elusive icon classes
-					 *
-					 * @deprecated
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$font_icons = apply_filters_deprecated( 'redux/font-icons', array( $data ), '4.3', 'redux/$opt_name/field/font/icons' );
-
-					/**
-					 * Filter 'redux/{opt_name}/field/font/icons'
-					 *
-					 * @param array $font_icons array of elusive icon classes
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$data = apply_filters( "redux/$opt_name/field/font/icons", $font_icons );
-
-					break;
-
-				case 'dashicons':
-				case 'dashicon':
-				case 'dash':
-					$fs    = Redux_Filesystem::get_instance();
-					$fonts = $fs->get_contents( ABSPATH . WPINC . '/css/dashicons.css' );
-					if ( ! empty( $fonts ) ) {
-						preg_match_all( '@\.dashicons-(\w+):before@', $fonts, $matches );
-						foreach ( $matches[1] as $item ) {
-							if ( 'before' === $item ) {
-								continue;
-							}
-							$data[ 'dashicons dashicons-' . $item ] = $item;
-						}
-					}
-					break;
-
-				case 'roles':
-				case 'role':
-					global $wp_roles;
-					$results = $wp_roles->get_names();
-					$data    = $this->process_results( $results, '', '', $display_keys, $secondary_key );
-
-					break;
-
-				case 'sidebars':
-				case 'sidebar':
-					global $wp_registered_sidebars;
-					$data = $this->process_results( $wp_registered_sidebars, '', 'name', $display_keys, $secondary_key );
-					break;
-				case 'capabilities':
-				case 'capability':
-					global $wp_roles;
-					$results = array();
-					foreach ( $wp_roles->roles as $role ) {
-						foreach ( $role['capabilities'] as $key => $cap ) {
-							$results[ $key ] = ucwords( str_replace( '_', ' ', $key ) );
-						}
-					}
-					$data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
-
-					break;
-
-				case 'capabilities_grouped':
-				case 'capability_grouped':
-				case 'capabilities_group':
-				case 'capability_group':
-					global $wp_roles;
-
-					foreach ( $wp_roles->roles as $role ) {
-						$caps = array();
-						foreach ( $role['capabilities'] as $key => $cap ) {
-							$caps[ $key ] = ucwords( str_replace( '_', ' ', $key ) );
-						}
-						asort( $caps );
-						$data[ $role['name'] ] = $caps;
-					}
-
-					break;
-
-				case 'callback':
-					if ( ! empty( $args ) && is_string( $args ) && function_exists( $args ) ) {
-						$data = call_user_func( $args, $current_value );
-					}
-
-					break;
-			}
-
-			return $data;
-		}
-
-
-		/**
-		 * Router for translation based on the given post-type.
-		 *
-		 * @param string       $type          Type of data request.
-		 * @param mixed|array  $current_value Current value stored in DB.
-		 * @param array|string $args          Arguments for the call.
-		 */
-		private function maybe_get_translation( string $type, &$current_value = '', $args = array() ) {
-			switch ( $type ) {
-				case 'categories':
-				case 'category':
-					$this->maybe_translate( $current_value, 'category' );
-					break;
-
-				case 'pages':
-				case 'page':
-					$this->maybe_translate( $current_value, 'page' );
-					break;
-
-				case 'terms':
-				case 'term':
-					$this->maybe_translate( $current_value, $args['taxonomy'] ?? '' );
-					break;
-
-				case 'tags':
-				case 'tag':
-					$this->maybe_translate( $current_value, 'post_tag' );
-					break;
-
-				case 'menus':
-				case 'menu':
-					$this->maybe_translate( $current_value, 'nav_menu' );
-					break;
-
-				case 'post':
-				case 'posts':
-					$this->maybe_translate( $current_value, 'post' );
-					break;
-				default:
-					$this->maybe_translate( $current_value, '' );
-			}
-		}
-
-		/**
-		 * Maybe translate the values.
-		 *
-		 * @param mixed|array $value     Value.
-		 * @param mixed|array $post_type Post type.
-		 */
-		private function maybe_translate( &$value, $post_type ) {
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$value = apply_filters( "redux/options/$this->opt_name/wordpress_data/translate/post_type_value", $value, $post_type );
-
-			// WPML Integration, see https://wpml.org/documentation/support/creating-multilingual-wordpress-themes/language-dependent-ids/.
-			if ( function_exists( 'icl_object_id' ) ) {
-				if ( has_filter( 'wpml_object_id' ) ) {
-					if ( Redux_Helpers::is_integer( $value ) ) {
-						$value = apply_filters( 'wpml_object_id', $value, $post_type, true );
-					} elseif ( is_array( $value ) ) {
-						$value = array_map(
-							function ( $val ) use ( $post_type ) {
-								return apply_filters( 'wpml_object_id', $val, $post_type, true );
-							},
-							$value
-						);
-					}
-				}
-			}
-		}
-
-		/**
-		 * Set the default arguments for a current query (existing data).
-		 *
-		 * @param string       $type          Type of data request.
-		 * @param array|string $args          Arguments for the call.
-		 * @param mixed|array  $current_value Current value stored in DB.
-		 *
-		 * @return array
-		 */
-		private function get_current_data_args( string $type, $args, $current_value ): array {
-			// In this section, we set the default arguments for each data type.
-			switch ( $type ) {
-				case 'categories':
-				case 'category':
-				case 'pages':
-				case 'page':
-				case 'terms':
-				case 'term':
-				case 'users':
-				case 'user':
-					$args['include'] = $current_value;
-					break;
-				case 'tags':
-				case 'tag':
-					$args['get'] = 'all';
-					break;
-				case 'menus':
-				case 'menu':
-					$args['object_ids'] = $current_value;
-					break;
-				case 'post':
-				case 'posts':
-					if ( ! empty( $current_value ) ) {
-						$args['post__in'] = is_array( $current_value ) ? $current_value : array( $current_value );
-					}
-					break;
-
-				default:
-					$args = array();
-			}
-
-			return $args;
-		}
-
-
-		/**
-		 * Get default arguments for a given data type.
-		 *
-		 * @param string       $type Type of data request.
-		 * @param array|string $args Arguments for the call.
-		 *
-		 * @return array|string
-		 */
-		private function get_arg_defaults( string $type, $args = array() ) {
-			// In this section, we set the default arguments for each data type.
-			switch ( $type ) {
-				case 'categories':
-				case 'category':
-					$args = wp_parse_args(
-						$args,
-						array(
-							'taxonomy' => 'category',
-						)
-					);
-					break;
-
-				case 'pages':
-				case 'page':
-					$args = wp_parse_args(
-						$args,
-						array(
-							'display_keys'   => true,
-							'posts_per_page' => 20,
-						)
-					);
-					break;
-
-				case 'post_type':
-				case 'post_types':
-					$args = wp_parse_args(
-						$args,
-						array(
-							'public'              => true,
-							'exclude_from_search' => false,
-							'output'              => 'names',
-							'operator'            => 'and',
-						)
-					);
-
-					break;
-
-				case 'tag':
-				case 'tags':
-					$args = wp_parse_args(
-						$args,
-						array(
-							'get'          => 'all',
-							'display_keys' => true,
-						)
-					);
-					break;
-
-				case 'sidebars':
-				case 'sidebar':
-				case 'capabilities':
-				case 'capability':
-					$args = wp_parse_args(
-						$args,
-						array(
-							'display_keys' => true,
-						)
-					);
-					break;
-
-				case 'capabilities_grouped':
-				case 'capability_grouped':
-				case 'capabilities_group':
-				case 'capability_group':
-					$args = wp_parse_args(
-						$args,
-						array(
-							'data_sortby' => '',
-						)
-					);
-					break;
-
-			}
-
-			return $args;
-		}
-	}
+    /**
+     * Class Redux_WordPress_Data
+     */
+    class Redux_WordPress_Data extends Redux_Class {
+
+        /**
+         * Holds WordPress data.
+         *
+         * @var null
+         */
+        private $wp_data = null;
+
+        /**
+         * Redux_WordPress_Data constructor.
+         *
+         * @param mixed $redux ReduxFramework pointer or opt_name.
+         */
+        public function __construct( $redux = null ) {
+            if ( is_string( $redux ) ) {
+                $this->opt_name = $redux;
+            } else {
+                parent::__construct( $redux );
+            }
+        }
+
+        /**
+         * Get the data.
+         *
+         * @param string|array $type          Type.
+         * @param array|string $args          Args.
+         * @param string       $opt_name      Opt name.
+         * @param string|int   $current_value Current value.
+         * @param bool         $ajax          Tells if this is an AJAX call.
+         *
+         * @return array|mixed|string
+         */
+        public function get( $type, $args = array(), string $opt_name = '', $current_value = '', bool $ajax = false ) {
+            if ( '' === $opt_name ) {
+                $opt_name = $this->opt_name;
+            }
+
+            // We don't want to run this, it's not a string value. Send it back!
+            if ( is_array( $type ) ) {
+                return $type;
+            }
+
+            /**
+             * Filter 'redux/options/{opt_name}/pre_data/{type}'
+             *
+             * @param string $data
+             */
+            $pre_data = apply_filters( "redux/options/$opt_name/pre_data/$type", null ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            if ( null !== $pre_data || empty( $type ) ) {
+                return $pre_data;
+            }
+
+            if ( isset( $args['data_sortby'] ) && in_array( $args['data_sortby'], array( 'value', 'key' ), true ) ) {
+                $data_sort = $args['data_sortby'];
+                unset( $args['data_sortby'] );
+            } else {
+                $data_sort = 'value';
+            }
+            if ( isset( $args['data_order'] ) && in_array( $args['data_order'], array( 'asc', 'desc' ), true ) ) {
+                $data_order = $args['data_order'];
+                unset( $args['data_order'] );
+            } else {
+                $data_order = 'asc';
+            }
+
+            $this->maybe_get_translation( $type, $current_value, $args );
+
+            $current_data = array();
+            if ( empty( $current_value ) && ! Redux_Helpers::is_integer( $current_value ) ) {
+                $current_value = null;
+            } else {
+                // Get the args to grab the current data.
+                $current_data_args = $this->get_current_data_args( $type, $args, $current_value );
+
+                // Let's make a unique key for this arg array.
+                $current_data_args_key = md5( maybe_serialize( $current_data_args ) );
+
+                // Check to make sure we haven't already run this call before.
+                $current_data = $this->wp_data[ $type . $current_data_args_key ] ?? $this->get_data( $type, $current_data_args, $current_value );
+            }
+
+            // If ajax is enabled AND $current_data is empty, set a dummy value for the init.
+            if ( $ajax && ! wp_doing_ajax() ) {
+                // Dummy is necessary otherwise empty.
+                if ( empty( $current_data ) ) {
+                    $current_data = array(
+                        'dummy' => '',
+                    );
+                }
+
+                return $current_data;
+            }
+
+            // phpcs:ignore Squiz.PHP.CommentedOutCode
+            $args_key = md5( maybe_serialize( $args ) );
+
+            // Data caching.
+            if ( isset( $this->wp_data[ $type . $args_key ] ) ) {
+                $data = $this->wp_data[ $type . $args_key ];
+            } else {
+                /**
+                 * Use data from WordPress to populate an option array.
+                 * */
+                $data = $this->get_data( $type, $args, $current_value );
+            }
+
+            if ( ! empty( $current_data ) ) {
+                $data += $current_data;
+            }
+
+            if ( ! empty( $data ) ) {
+                $data                               = $this->order_data( $data, $data_sort, $data_order );
+                $this->wp_data[ $type . $args_key ] = $data;
+            }
+
+            /**
+             * Filter 'redux/options/{opt_name}/data/{type}'
+             *
+             * @param string $data
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            return apply_filters( "redux/options/$opt_name/data/$type", $data );
+        }
+
+
+        /**
+         * Process the results into a proper array, fetching the data elements needed for each data type.
+         *
+         * @param array|WP_Error $results       Results to process in the data array.
+         * @param string|bool    $id_key        Key on object/array that represents the ID.
+         * @param string|bool    $name_key      Key on object/array that represents the name/text.
+         * @param bool           $add_key       If true, the display key will appear in the text.
+         * @param string|bool    $secondary_key If a data type, you'd rather display a different ID as the display key.
+         *
+         * @return array
+         */
+        private function process_results( $results = array(), $id_key = '', $name_key = '', bool $add_key = true, $secondary_key = 'slug' ): array {
+            $data = array();
+            if ( ! empty( $results ) && ! is_a( $results, 'WP_Error' ) ) {
+                foreach ( $results as $k => $v ) {
+                    if ( empty( $id_key ) ) {
+                        $key = $k;
+                    } else {
+                        if ( is_object( $v ) ) {
+                            $key = $v->$id_key;
+                        } elseif ( is_array( $v ) ) {
+                            $key = $v[ $id_key ];
+                        } else {
+                            $key = $k;
+                        }
+                    }
+
+                    if ( empty( $name_key ) ) {
+                        $value = $v;
+                    } else {
+                        if ( is_object( $v ) ) {
+                            $value = $v->$name_key;
+                        } elseif ( is_array( $v ) ) {
+                            $value = $v[ $name_key ];
+                        } else {
+                            $value = $v;
+                        }
+                    }
+
+                    $display_key = $key;
+
+                    if ( is_object( $v ) && isset( $v->$secondary_key ) ) {
+                        $display_key = $v->$secondary_key;
+                    } elseif ( ! is_object( $v ) && isset( $v[ $secondary_key ] ) ) {
+                        $display_key = $v[ $secondary_key ];
+                    }
+                    $data[ $key ] = $value;
+                    if ( $display_key !== $value && $add_key ) {
+                        $data[ $key ] = $data[ $key ] . ' [' . $display_key . ']';
+                    }
+                }
+            }
+
+            return $data;
+        }
+
+        /**
+         * Order / Sort the data.
+         *
+         * @param array  $data  Data to sort.
+         * @param string $sort  Way to sort. Accepts: key|value.
+         * @param string $order Order of the sort. Accepts: asc|desc.
+         *
+         * @return array
+         */
+        private function order_data( array $data = array(), string $sort = 'value', string $order = 'asc' ): array {
+            if ( 'key' === $sort ) {
+                if ( 'asc' === $order ) {
+                    ksort( $data );
+                } else {
+                    krsort( $data );
+                }
+            } elseif ( 'value' === $sort ) {
+                if ( 'asc' === $order ) {
+                    asort( $data );
+                } else {
+                    arsort( $data );
+                }
+            }
+
+            return $data;
+        }
+
+        /**
+         * Fetch the data for a given type.
+         *
+         * @param string       $type          The data type we're fetching.
+         * @param array|string $args          Arguments to pass.
+         * @param mixed|array  $current_value If a current value already set in the database.
+         *
+         * @return array|null|string
+         */
+        private function get_data( string $type, $args, $current_value ) {
+            $args = $this->get_arg_defaults( $type, $args );
+
+            $opt_name = $this->opt_name;
+            if ( empty( $args ) ) {
+                $args = array();
+            }
+
+            $data = array();
+            if ( isset( $args['args'] ) && empty( $args['args'] ) ) {
+                unset( $args['args'] );
+            }
+
+            $display_keys = false;
+            if ( isset( $args['display_keys'] ) ) {
+                $display_keys = true;
+                unset( $args['display_keys'] );
+            }
+
+            $secondary_key = 'slug';
+            if ( isset( $args['secondary_key'] ) ) {
+                $secondary_key = $args['secondary_key'];
+                unset( $args['secondary_key'] );
+            }
+
+            switch ( $type ) {
+                case 'categories':
+                case 'category':
+                case 'terms':
+                case 'term':
+                    if ( isset( $args['taxonomies'] ) ) {
+                        $args['taxonomy'] = $args['taxonomies'];
+                        unset( $args['taxonomies'] );
+                    }
+                    $results = get_terms( $args );
+                    $data    = $this->process_results( $results, 'term_id', 'name', $display_keys, $secondary_key );
+                    break;
+
+                case 'pages':
+                case 'page':
+                    $results = get_pages( $args );
+                    $data    = $this->process_results( $results, 'ID', 'post_title', $display_keys, $secondary_key );
+                    break;
+
+                case 'tags':
+                case 'tag':
+                    $results = get_tags( $args );
+                    $data    = $this->process_results( $results, 'term_id', 'name', $display_keys, $secondary_key );
+                    break;
+
+                case 'menus':
+                case 'menu':
+                    $results = wp_get_nav_menus( $args );
+                    $data    = $this->process_results( $results, 'term_id', 'name', $display_keys, $secondary_key );
+                    break;
+
+                case 'posts':
+                case 'post':
+                    $results = get_posts( $args );
+                    $data    = $this->process_results( $results, 'ID', 'post_title', $display_keys, $secondary_key );
+                    break;
+
+                case 'users':
+                case 'user':
+                    $results = get_users( $args );
+                    $data    = $this->process_results( $results, 'ID', 'display_name', $display_keys, $secondary_key );
+                    break;
+
+                case 'sites':
+                case 'site':
+                    $sites = get_sites();
+
+                    if ( isset( $sites ) ) {
+                        $results = array();
+                        foreach ( $sites as $site ) {
+                            $site = (array) $site;
+                            $k    = $site['blog_id'];
+                            $v    = $site['domain'] . $site['path'];
+                            $name = get_blog_option( $k, 'blogname' );
+                            if ( ! empty( $name ) ) {
+                                $v .= ' - [' . $name . ']';
+                            }
+                            $results[ $k ] = $v;
+                        }
+                        $data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
+                    }
+
+                    break;
+
+                case 'taxonomies':
+                case 'taxonomy':
+                case 'tax':
+                    $results = get_taxonomies( $args );
+                    $data    = $this->process_results( $results, '', '', $display_keys, $secondary_key );
+                    break;
+
+                case 'post_types':
+                case 'post_type':
+                    global $wp_post_types;
+
+                    $output = $args['output'];
+                    unset( $args['output'] );
+                    $operator = $args['operator'];
+                    unset( $args['operator'] );
+
+                    $post_types = get_post_types( $args, $output, $operator );
+
+                    foreach ( $post_types as $name => $title ) {
+                        if ( isset( $wp_post_types[ $name ]->labels->menu_name ) ) {
+                            $data[ $name ] = $wp_post_types[ $name ]->labels->menu_name;
+                        } else {
+                            $data[ $name ] = ucfirst( $name );
+                        }
+                    }
+                    break;
+
+                case 'menu_locations':
+                case 'menu_location':
+                    global $_wp_registered_nav_menus;
+                    foreach ( $_wp_registered_nav_menus as $k => $v ) {
+                        $data[ $k ] = $v;
+                        if ( ! has_nav_menu( $k ) ) {
+                            $data[ $k ] .= ' ' . __( '[unassigned]', 'redux-framework' );
+                        }
+                    }
+                    break;
+
+                case 'image_sizes':
+                case 'image_size':
+                    global $_wp_additional_image_sizes;
+                    $results = array();
+                    foreach ( $_wp_additional_image_sizes as $size_name => $size_attrs ) {
+                        $results[ $size_name ] = $size_name . ' - ' . $size_attrs['width'] . ' x ' . $size_attrs['height'];
+                    }
+                    $data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
+
+                    break;
+
+                case 'elusive-icons':
+                case 'elusive-icon':
+                case 'elusive':
+                case 'icons':
+                case 'font-icon':
+                case 'font-icons':
+                    $fs    = Redux_Filesystem::get_instance();
+                    $fonts = $fs->get_contents( Redux_Core::$dir . 'assets/css/vendor/elusive-icons.css' );
+                    if ( ! empty( $fonts ) ) {
+                        preg_match_all( '@\.el-(\w+)::before@', $fonts, $matches );
+                        foreach ( $matches[1] as $item ) {
+                            if ( 'before' === $item ) {
+                                continue;
+                            }
+                            $data[ 'el el-' . $item ] = $item;
+                        }
+                    }
+
+                    /**
+                     * Filter 'redux/font-icons'
+                     *
+                     * @param array $font_icons array of elusive icon classes
+                     *
+                     * @deprecated
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $font_icons = apply_filters_deprecated( 'redux/font-icons', array( $data ), '4.3', 'redux/$opt_name/field/font/icons' );
+
+                    /**
+                     * Filter 'redux/{opt_name}/field/font/icons'
+                     *
+                     * @param array $font_icons array of elusive icon classes
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $data = apply_filters( "redux/$opt_name/field/font/icons", $font_icons );
+
+                    break;
+
+                case 'dashicons':
+                case 'dashicon':
+                case 'dash':
+                    $fs    = Redux_Filesystem::get_instance();
+                    $fonts = $fs->get_contents( ABSPATH . WPINC . '/css/dashicons.css' );
+                    if ( ! empty( $fonts ) ) {
+                        preg_match_all( '@\.dashicons-(\w+):before@', $fonts, $matches );
+                        foreach ( $matches[1] as $item ) {
+                            if ( 'before' === $item ) {
+                                continue;
+                            }
+                            $data[ 'dashicons dashicons-' . $item ] = $item;
+                        }
+                    }
+                    break;
+
+                case 'roles':
+                case 'role':
+                    global $wp_roles;
+                    $results = $wp_roles->get_names();
+                    $data    = $this->process_results( $results, '', '', $display_keys, $secondary_key );
+
+                    break;
+
+                case 'sidebars':
+                case 'sidebar':
+                    global $wp_registered_sidebars;
+                    $data = $this->process_results( $wp_registered_sidebars, '', 'name', $display_keys, $secondary_key );
+                    break;
+                case 'capabilities':
+                case 'capability':
+                    global $wp_roles;
+                    $results = array();
+                    foreach ( $wp_roles->roles as $role ) {
+                        foreach ( $role['capabilities'] as $key => $cap ) {
+                            $results[ $key ] = ucwords( str_replace( '_', ' ', $key ) );
+                        }
+                    }
+                    $data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
+
+                    break;
+
+                case 'capabilities_grouped':
+                case 'capability_grouped':
+                case 'capabilities_group':
+                case 'capability_group':
+                    global $wp_roles;
+
+                    foreach ( $wp_roles->roles as $role ) {
+                        $caps = array();
+                        foreach ( $role['capabilities'] as $key => $cap ) {
+                            $caps[ $key ] = ucwords( str_replace( '_', ' ', $key ) );
+                        }
+                        asort( $caps );
+                        $data[ $role['name'] ] = $caps;
+                    }
+
+                    break;
+
+                case 'callback':
+                    if ( ! empty( $args ) && is_string( $args ) && function_exists( $args ) ) {
+                        $data = call_user_func( $args, $current_value );
+                    }
+
+                    break;
+            }
+
+            return $data;
+        }
+
+
+        /**
+         * Router for translation based on the given post-type.
+         *
+         * @param string       $type          Type of data request.
+         * @param mixed|array  $current_value Current value stored in DB.
+         * @param array|string $args          Arguments for the call.
+         */
+        private function maybe_get_translation( string $type, &$current_value = '', $args = array() ) {
+            switch ( $type ) {
+                case 'categories':
+                case 'category':
+                    $this->maybe_translate( $current_value, 'category' );
+                    break;
+
+                case 'pages':
+                case 'page':
+                    $this->maybe_translate( $current_value, 'page' );
+                    break;
+
+                case 'terms':
+                case 'term':
+                    $this->maybe_translate( $current_value, $args['taxonomy'] ?? '' );
+                    break;
+
+                case 'tags':
+                case 'tag':
+                    $this->maybe_translate( $current_value, 'post_tag' );
+                    break;
+
+                case 'menus':
+                case 'menu':
+                    $this->maybe_translate( $current_value, 'nav_menu' );
+                    break;
+
+                case 'post':
+                case 'posts':
+                    $this->maybe_translate( $current_value, 'post' );
+                    break;
+                default:
+                    $this->maybe_translate( $current_value, '' );
+            }
+        }
+
+        /**
+         * Maybe translate the values.
+         *
+         * @param mixed|array $value     Value.
+         * @param mixed|array $post_type Post type.
+         */
+        private function maybe_translate( &$value, $post_type ) {
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $value = apply_filters( "redux/options/$this->opt_name/wordpress_data/translate/post_type_value", $value, $post_type );
+
+            // WPML Integration, see https://wpml.org/documentation/support/creating-multilingual-wordpress-themes/language-dependent-ids/.
+            if ( function_exists( 'icl_object_id' ) ) {
+                if ( has_filter( 'wpml_object_id' ) ) {
+                    if ( Redux_Helpers::is_integer( $value ) ) {
+                        $value = apply_filters( 'wpml_object_id', $value, $post_type, true );
+                    } elseif ( is_array( $value ) ) {
+                        $value = array_map(
+                            function ( $val ) use ( $post_type ) {
+                                return apply_filters( 'wpml_object_id', $val, $post_type, true );
+                            },
+                            $value
+                        );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Set the default arguments for a current query (existing data).
+         *
+         * @param string       $type          Type of data request.
+         * @param array|string $args          Arguments for the call.
+         * @param mixed|array  $current_value Current value stored in DB.
+         *
+         * @return array
+         */
+        private function get_current_data_args( string $type, $args, $current_value ): array {
+            // In this section, we set the default arguments for each data type.
+            switch ( $type ) {
+                case 'categories':
+                case 'category':
+                case 'pages':
+                case 'page':
+                case 'terms':
+                case 'term':
+                case 'users':
+                case 'user':
+                    $args['include'] = $current_value;
+                    break;
+                case 'tags':
+                case 'tag':
+                    $args['get'] = 'all';
+                    break;
+                case 'menus':
+                case 'menu':
+                    $args['object_ids'] = $current_value;
+                    break;
+                case 'post':
+                case 'posts':
+                    if ( ! empty( $current_value ) ) {
+                        $args['post__in'] = is_array( $current_value ) ? $current_value : array( $current_value );
+                    }
+                    break;
+
+                default:
+                    $args = array();
+            }
+
+            return $args;
+        }
+
+
+        /**
+         * Get default arguments for a given data type.
+         *
+         * @param string       $type Type of data request.
+         * @param array|string $args Arguments for the call.
+         *
+         * @return array|string
+         */
+        private function get_arg_defaults( string $type, $args = array() ) {
+            // In this section, we set the default arguments for each data type.
+            switch ( $type ) {
+                case 'categories':
+                case 'category':
+                    $args = wp_parse_args(
+                        $args,
+                        array(
+                            'taxonomy' => 'category',
+                        )
+                    );
+                    break;
+
+                case 'pages':
+                case 'page':
+                    $args = wp_parse_args(
+                        $args,
+                        array(
+                            'display_keys'   => true,
+                            'posts_per_page' => 20,
+                        )
+                    );
+                    break;
+
+                case 'post_type':
+                case 'post_types':
+                    $args = wp_parse_args(
+                        $args,
+                        array(
+                            'public'              => true,
+                            'exclude_from_search' => false,
+                            'output'              => 'names',
+                            'operator'            => 'and',
+                        )
+                    );
+
+                    break;
+
+                case 'tag':
+                case 'tags':
+                    $args = wp_parse_args(
+                        $args,
+                        array(
+                            'get'          => 'all',
+                            'display_keys' => true,
+                        )
+                    );
+                    break;
+
+                case 'sidebars':
+                case 'sidebar':
+                case 'capabilities':
+                case 'capability':
+                    $args = wp_parse_args(
+                        $args,
+                        array(
+                            'display_keys' => true,
+                        )
+                    );
+                    break;
+
+                case 'capabilities_grouped':
+                case 'capability_grouped':
+                case 'capabilities_group':
+                case 'capability_group':
+                    $args = wp_parse_args(
+                        $args,
+                        array(
+                            'data_sortby' => '',
+                        )
+                    );
+                    break;
+
+            }
+
+            return $args;
+        }
+    }
 }

Spacing +24 added lines, -24 removed lines

@@ -93,7 +93,7 @@ 
 				$current_data_args_key = md5( maybe_serialize( $current_data_args ) );
 
 				// Check to make sure we haven't already run this call before.
-				$current_data = $this->wp_data[ $type . $current_data_args_key ] ?? $this->get_data( $type, $current_data_args, $current_value );
+				$current_data = $this->wp_data[$type . $current_data_args_key] ?? $this->get_data( $type, $current_data_args, $current_value );
 			}
 
 			// If ajax is enabled AND $current_data is empty, set a dummy value for the init.
@@ -112,8 +112,8 @@ 
 			$args_key = md5( maybe_serialize( $args ) );
 
 			// Data caching.
-			if ( isset( $this->wp_data[ $type . $args_key ] ) ) {
-				$data = $this->wp_data[ $type . $args_key ];
+			if ( isset( $this->wp_data[$type . $args_key] ) ) {
+				$data = $this->wp_data[$type . $args_key];
 			} else {
 				/**
 				 * Use data from WordPress to populate an option array.
@@ -127,7 +127,7 @@ 
 
 			if ( ! empty( $data ) ) {
 				$data                               = $this->order_data( $data, $data_sort, $data_order );
-				$this->wp_data[ $type . $args_key ] = $data;
+				$this->wp_data[$type . $args_key] = $data;
 			}
 
 			/**
@@ -162,7 +162,7 @@ 
 						if ( is_object( $v ) ) {
 							$key = $v->$id_key;
 						} elseif ( is_array( $v ) ) {
-							$key = $v[ $id_key ];
+							$key = $v[$id_key];
 						} else {
 							$key = $k;
 						}
@@ -174,7 +174,7 @@ 
 						if ( is_object( $v ) ) {
 							$value = $v->$name_key;
 						} elseif ( is_array( $v ) ) {
-							$value = $v[ $name_key ];
+							$value = $v[$name_key];
 						} else {
 							$value = $v;
 						}
@@ -184,12 +184,12 @@ 
 
 					if ( is_object( $v ) && isset( $v->$secondary_key ) ) {
 						$display_key = $v->$secondary_key;
-					} elseif ( ! is_object( $v ) && isset( $v[ $secondary_key ] ) ) {
-						$display_key = $v[ $secondary_key ];
+					} elseif ( ! is_object( $v ) && isset( $v[$secondary_key] ) ) {
+						$display_key = $v[$secondary_key];
 					}
-					$data[ $key ] = $value;
+					$data[$key] = $value;
 					if ( $display_key !== $value && $add_key ) {
-						$data[ $key ] = $data[ $key ] . ' [' . $display_key . ']';
+						$data[$key] = $data[$key] . ' [' . $display_key . ']';
 					}
 				}
 			}
@@ -308,14 +308,14 @@ 
 					if ( isset( $sites ) ) {
 						$results = array();
 						foreach ( $sites as $site ) {
-							$site = (array) $site;
+							$site = ( array ) $site;
 							$k    = $site['blog_id'];
 							$v    = $site['domain'] . $site['path'];
 							$name = get_blog_option( $k, 'blogname' );
 							if ( ! empty( $name ) ) {
 								$v .= ' - [' . $name . ']';
 							}
-							$results[ $k ] = $v;
+							$results[$k] = $v;
 						}
 						$data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
 					}
@@ -341,10 +341,10 @@ 
 					$post_types = get_post_types( $args, $output, $operator );
 
 					foreach ( $post_types as $name => $title ) {
-						if ( isset( $wp_post_types[ $name ]->labels->menu_name ) ) {
-							$data[ $name ] = $wp_post_types[ $name ]->labels->menu_name;
+						if ( isset( $wp_post_types[$name]->labels->menu_name ) ) {
+							$data[$name] = $wp_post_types[$name]->labels->menu_name;
 						} else {
-							$data[ $name ] = ucfirst( $name );
+							$data[$name] = ucfirst( $name );
 						}
 					}
 					break;
@@ -353,9 +353,9 @@ 
 				case 'menu_location':
 					global $_wp_registered_nav_menus;
 					foreach ( $_wp_registered_nav_menus as $k => $v ) {
-						$data[ $k ] = $v;
+						$data[$k] = $v;
 						if ( ! has_nav_menu( $k ) ) {
-							$data[ $k ] .= ' ' . __( '[unassigned]', 'redux-framework' );
+							$data[$k] .= ' ' . __( '[unassigned]', 'redux-framework' );
 						}
 					}
 					break;
@@ -365,7 +365,7 @@ 
 					global $_wp_additional_image_sizes;
 					$results = array();
 					foreach ( $_wp_additional_image_sizes as $size_name => $size_attrs ) {
-						$results[ $size_name ] = $size_name . ' - ' . $size_attrs['width'] . ' x ' . $size_attrs['height'];
+						$results[$size_name] = $size_name . ' - ' . $size_attrs['width'] . ' x ' . $size_attrs['height'];
 					}
 					$data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
 
@@ -385,7 +385,7 @@ 
 							if ( 'before' === $item ) {
 								continue;
 							}
-							$data[ 'el el-' . $item ] = $item;
+							$data['el el-' . $item] = $item;
 						}
 					}
 
@@ -422,7 +422,7 @@ 
 							if ( 'before' === $item ) {
 								continue;
 							}
-							$data[ 'dashicons dashicons-' . $item ] = $item;
+							$data['dashicons dashicons-' . $item] = $item;
 						}
 					}
 					break;
@@ -446,7 +446,7 @@ 
 					$results = array();
 					foreach ( $wp_roles->roles as $role ) {
 						foreach ( $role['capabilities'] as $key => $cap ) {
-							$results[ $key ] = ucwords( str_replace( '_', ' ', $key ) );
+							$results[$key] = ucwords( str_replace( '_', ' ', $key ) );
 						}
 					}
 					$data = $this->process_results( $results, '', '', $display_keys, $secondary_key );
@@ -462,10 +462,10 @@ 
 					foreach ( $wp_roles->roles as $role ) {
 						$caps = array();
 						foreach ( $role['capabilities'] as $key => $cap ) {
-							$caps[ $key ] = ucwords( str_replace( '_', ' ', $key ) );
+							$caps[$key] = ucwords( str_replace( '_', ' ', $key ) );
 						}
 						asort( $caps );
-						$data[ $role['name'] ] = $caps;
+						$data[$role['name']] = $caps;
 					}
 
 					break;
@@ -543,7 +543,7 @@ 
 						$value = apply_filters( 'wpml_object_id', $value, $post_type, true );
 					} elseif ( is_array( $value ) ) {
 						$value = array_map(
-							function ( $val ) use ( $post_type ) {
+							function( $val ) use ( $post_type ) {
 								return apply_filters( 'wpml_object_id', $val, $post_type, true );
 							},
 							$value

redux-core/inc/fields/select/class-redux-select.php

Indentation +223 added lines, -223 removed lines

@@ -13,233 +13,233 @@
 
 if ( ! class_exists( 'Redux_Select', false ) ) {
 
-	/**
-	 * Class Redux_Select
-	 */
-	class Redux_Select extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'options'          => array(),
-				'width'            => '40%',
-				'multi'            => false,
-				'sortable'         => false,
-				'ajax'             => false,
-				'min-input-length' => 1,
-				'placeholder'      => '',
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			$sortable = ( isset( $this->field['sortable'] ) && true === (bool) $this->field['sortable'] ) ? ' select2-sortable' : '';
-
-			if ( ! empty( $sortable ) ) { // Dummy proofing :P.
-				$this->field['multi'] = true;
-			}
-
-			if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
-				if ( empty( $this->field['args'] ) ) {
-					$this->field['args'] = array();
-				}
-
-				if ( 'elusive-icons' === $this->field['data'] || 'elusive-icon' === $this->field['data'] || 'elusive' === $this->field['data'] ) {
-					$icons_file = Redux_Core::$dir . 'lib/elusive-icons.php';
-
-					/**
-					 * Filter 'redux-font-icons-file}'
-					 *
-					 * @param  array $icon_file The File for the icons
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$icons_file = apply_filters( 'redux-font-icons-file', $icons_file );
-
-					/**
-					 * Filter 'redux/{opt_name}/field/font/icons/file'
-					 *
-					 * @param  array $icon_file The file for the icons
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$icons_file = apply_filters( "redux/{$this->parent->args['opt_name']}/field/font/icons/file", $icons_file );
-
-					if ( file_exists( $icons_file ) ) {
-						include_once $icons_file;
-					}
-				}
-
-				// The First one obtained with AJAX.
-				$ajax = false;
-				if ( isset( $this->field['ajax'] ) && $this->field['ajax'] ) {
-					$ajax = true;
-				}
-				$this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value, $ajax );
-			}
-
-			if ( ! empty( $this->field['data'] ) && in_array( $this->field['data'], array( 'elusive-icons', 'elusive-icon', 'elusive', 'dashicons', 'dashicon', 'dash' ), true ) ) {
-				$this->field['class'] .= ' font-icons';
-			}
-
-			if ( ! empty( $this->field['options'] ) ) {
-				$multi = ( isset( $this->field['multi'] ) && $this->field['multi'] ) ? ' multiple="multiple"' : '';
-
-				if ( ! empty( $this->field['width'] ) ) {
-					$width = ' style="width:' . esc_attr( $this->field['width'] ) . '"';
-				} else {
-					$width = ' style="width:40%;"';
-				}
-
-				$name_brackets = '';
-				if ( ! empty( $multi ) ) {
-					$name_brackets = '[]';
-				}
-
-				$placeholder = ( isset( $this->field['placeholder'] ) ) ? esc_attr( $this->field['placeholder'] ) : esc_html__( 'Select an item', 'redux-framework' );
-
-				$select2_width = 'resolve';
-				if ( '' !== $multi ) {
-					$select2_width = '100%';
-				}
-				$this->select2_config['width']      = $select2_width;
-				$this->select2_config['allowClear'] = true;
-
-				if ( isset( $this->field['ajax'] ) && $this->field['ajax'] && isset( $this->field['data'] ) && '' !== $this->field['data'] ) {
-					$this->select2_config['ajax']             = true;
-					$this->select2_config['min-input-length'] = $this->field['min_input_length'] ?? 1;
-					$this->select2_config['action']           = "redux_{$this->parent->args['opt_name']}_select2";
-					if ( isset( $this->field['args'] ) ) {
-						$this->select2_config['args'] = wp_json_encode( $this->field['args'] );
-					}
-					$this->select2_config['nonce']   = wp_create_nonce( "redux_{$this->parent->args['opt_name']}_select2" );
-					$this->select2_config['wp-data'] = $this->field['data'];
-				}
-
-				if ( isset( $this->field['select2'] ) ) {
-					$this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
-				} else {
-					$this->field['select2'] = $this->select2_config;
-				}
-
-				$this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
-
-				$select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
-
-				if ( isset( $this->field['multi'] ) && $this->field['multi'] && isset( $this->field['sortable'] ) && $this->field['sortable'] && ! empty( $this->value ) && is_array( $this->value ) ) {
-					$orig_option            = $this->field['options'];
-					$this->field['options'] = array();
-
-					foreach ( $this->value as $value ) {
-						$this->field['options'][ $value ] = $orig_option[ $value ];
-					}
-
-					if ( count( $this->field['options'] ) < count( $orig_option ) ) {
-						foreach ( $orig_option as $key => $value ) {
-							if ( ! in_array( $key, $this->field['options'], true ) ) {
-								$this->field['options'][ $key ] = $value;
-							}
-						}
-					}
-				}
-
-				$sortable = ( isset( $this->field['sortable'] ) && $this->field['sortable'] ) ? ' select2-sortable' : '';
-
-				echo '<select ' .
-					esc_html( $multi ) . '
+    /**
+     * Class Redux_Select
+     */
+    class Redux_Select extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'options'          => array(),
+                'width'            => '40%',
+                'multi'            => false,
+                'sortable'         => false,
+                'ajax'             => false,
+                'min-input-length' => 1,
+                'placeholder'      => '',
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            $sortable = ( isset( $this->field['sortable'] ) && true === (bool) $this->field['sortable'] ) ? ' select2-sortable' : '';
+
+            if ( ! empty( $sortable ) ) { // Dummy proofing :P.
+                $this->field['multi'] = true;
+            }
+
+            if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
+                if ( empty( $this->field['args'] ) ) {
+                    $this->field['args'] = array();
+                }
+
+                if ( 'elusive-icons' === $this->field['data'] || 'elusive-icon' === $this->field['data'] || 'elusive' === $this->field['data'] ) {
+                    $icons_file = Redux_Core::$dir . 'lib/elusive-icons.php';
+
+                    /**
+                     * Filter 'redux-font-icons-file}'
+                     *
+                     * @param  array $icon_file The File for the icons
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $icons_file = apply_filters( 'redux-font-icons-file', $icons_file );
+
+                    /**
+                     * Filter 'redux/{opt_name}/field/font/icons/file'
+                     *
+                     * @param  array $icon_file The file for the icons
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $icons_file = apply_filters( "redux/{$this->parent->args['opt_name']}/field/font/icons/file", $icons_file );
+
+                    if ( file_exists( $icons_file ) ) {
+                        include_once $icons_file;
+                    }
+                }
+
+                // The First one obtained with AJAX.
+                $ajax = false;
+                if ( isset( $this->field['ajax'] ) && $this->field['ajax'] ) {
+                    $ajax = true;
+                }
+                $this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value, $ajax );
+            }
+
+            if ( ! empty( $this->field['data'] ) && in_array( $this->field['data'], array( 'elusive-icons', 'elusive-icon', 'elusive', 'dashicons', 'dashicon', 'dash' ), true ) ) {
+                $this->field['class'] .= ' font-icons';
+            }
+
+            if ( ! empty( $this->field['options'] ) ) {
+                $multi = ( isset( $this->field['multi'] ) && $this->field['multi'] ) ? ' multiple="multiple"' : '';
+
+                if ( ! empty( $this->field['width'] ) ) {
+                    $width = ' style="width:' . esc_attr( $this->field['width'] ) . '"';
+                } else {
+                    $width = ' style="width:40%;"';
+                }
+
+                $name_brackets = '';
+                if ( ! empty( $multi ) ) {
+                    $name_brackets = '[]';
+                }
+
+                $placeholder = ( isset( $this->field['placeholder'] ) ) ? esc_attr( $this->field['placeholder'] ) : esc_html__( 'Select an item', 'redux-framework' );
+
+                $select2_width = 'resolve';
+                if ( '' !== $multi ) {
+                    $select2_width = '100%';
+                }
+                $this->select2_config['width']      = $select2_width;
+                $this->select2_config['allowClear'] = true;
+
+                if ( isset( $this->field['ajax'] ) && $this->field['ajax'] && isset( $this->field['data'] ) && '' !== $this->field['data'] ) {
+                    $this->select2_config['ajax']             = true;
+                    $this->select2_config['min-input-length'] = $this->field['min_input_length'] ?? 1;
+                    $this->select2_config['action']           = "redux_{$this->parent->args['opt_name']}_select2";
+                    if ( isset( $this->field['args'] ) ) {
+                        $this->select2_config['args'] = wp_json_encode( $this->field['args'] );
+                    }
+                    $this->select2_config['nonce']   = wp_create_nonce( "redux_{$this->parent->args['opt_name']}_select2" );
+                    $this->select2_config['wp-data'] = $this->field['data'];
+                }
+
+                if ( isset( $this->field['select2'] ) ) {
+                    $this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
+                } else {
+                    $this->field['select2'] = $this->select2_config;
+                }
+
+                $this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
+
+                $select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
+
+                if ( isset( $this->field['multi'] ) && $this->field['multi'] && isset( $this->field['sortable'] ) && $this->field['sortable'] && ! empty( $this->value ) && is_array( $this->value ) ) {
+                    $orig_option            = $this->field['options'];
+                    $this->field['options'] = array();
+
+                    foreach ( $this->value as $value ) {
+                        $this->field['options'][ $value ] = $orig_option[ $value ];
+                    }
+
+                    if ( count( $this->field['options'] ) < count( $orig_option ) ) {
+                        foreach ( $orig_option as $key => $value ) {
+                            if ( ! in_array( $key, $this->field['options'], true ) ) {
+                                $this->field['options'][ $key ] = $value;
+                            }
+                        }
+                    }
+                }
+
+                $sortable = ( isset( $this->field['sortable'] ) && $this->field['sortable'] ) ? ' select2-sortable' : '';
+
+                echo '<select ' .
+                    esc_html( $multi ) . '
 			        id="' . esc_attr( $this->field['id'] ) . '-select"
 			        data-placeholder="' . esc_attr( $placeholder ) . '"
 			        name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . esc_attr( $name_brackets ) . '"
 			        class="redux-select-item ' . esc_attr( $this->field['class'] ) . esc_attr( $sortable ) . '"' .
-					$width . ' rows="6"' . esc_attr( $select2_data ) . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '<option></option>';
-
-				foreach ( $this->field['options'] as $k => $v ) {
-					if ( is_array( $v ) ) {
-						echo '<optgroup label="' . esc_attr( $k ) . '">';
-
-						foreach ( $v as $opt => $val ) {
-							$this->make_option( (string) $opt, $val );
-						}
-
-						echo '</optgroup>';
-
-						continue;
-					}
-
-					$this->make_option( (string) $k, $v );
-				}
-
-				echo '</select>';
-			} else {
-				echo '<strong>' . esc_html__( 'No items of this type were found.', 'redux-framework' ) . '</strong>';
-			}
-		}
-
-		/**
-		 * Compile option HTML.
-		 *
-		 * @param string $id         HTML ID.
-		 * @param mixed  $value      Value array.
-		 */
-		private function make_option( string $id, $value ) {
-			if ( is_array( $this->value ) ) {
-				$selected = ( in_array( $id, $this->value, true ) ) ? ' selected="selected"' : '';
-			} else {
-				$selected = selected( $this->value, $id, false );
-			}
-
-			echo '<option value="' . esc_attr( $id ) . '" ' . esc_html( $selected ) . '>' . esc_attr( $value ) . '</option>';
-		}
-
-		/**
-		 * Do enqueue for each field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			if ( isset( $this->field['sortable'] ) && $this->field['sortable'] ) {
-				wp_enqueue_script( 'jquery-ui-sortable' );
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function enqueue() {
-			wp_enqueue_style( 'select2-css' );
-
-			wp_enqueue_script(
-				'redux-field-select',
-				Redux_Core::$url . 'inc/fields/select/redux-select' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'select2-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-select',
-					Redux_Core::$url . 'inc/fields/select/redux-select.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+                    $width . ' rows="6"' . esc_attr( $select2_data ) . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '<option></option>';
+
+                foreach ( $this->field['options'] as $k => $v ) {
+                    if ( is_array( $v ) ) {
+                        echo '<optgroup label="' . esc_attr( $k ) . '">';
+
+                        foreach ( $v as $opt => $val ) {
+                            $this->make_option( (string) $opt, $val );
+                        }
+
+                        echo '</optgroup>';
+
+                        continue;
+                    }
+
+                    $this->make_option( (string) $k, $v );
+                }
+
+                echo '</select>';
+            } else {
+                echo '<strong>' . esc_html__( 'No items of this type were found.', 'redux-framework' ) . '</strong>';
+            }
+        }
+
+        /**
+         * Compile option HTML.
+         *
+         * @param string $id         HTML ID.
+         * @param mixed  $value      Value array.
+         */
+        private function make_option( string $id, $value ) {
+            if ( is_array( $this->value ) ) {
+                $selected = ( in_array( $id, $this->value, true ) ) ? ' selected="selected"' : '';
+            } else {
+                $selected = selected( $this->value, $id, false );
+            }
+
+            echo '<option value="' . esc_attr( $id ) . '" ' . esc_html( $selected ) . '>' . esc_attr( $value ) . '</option>';
+        }
+
+        /**
+         * Do enqueue for each field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            if ( isset( $this->field['sortable'] ) && $this->field['sortable'] ) {
+                wp_enqueue_script( 'jquery-ui-sortable' );
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function enqueue() {
+            wp_enqueue_style( 'select2-css' );
+
+            wp_enqueue_script(
+                'redux-field-select',
+                Redux_Core::$url . 'inc/fields/select/redux-select' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'select2-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-select',
+                    Redux_Core::$url . 'inc/fields/select/redux-select.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Select', 'ReduxFramework_Select' );

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 		 * @since ReduxFramework 1.0.0
 		 */
 		public function render() {
-			$sortable = ( isset( $this->field['sortable'] ) && true === (bool) $this->field['sortable'] ) ? ' select2-sortable' : '';
+			$sortable = ( isset( $this->field['sortable'] ) && true === ( bool ) $this->field['sortable'] ) ? ' select2-sortable' : '';
 
 			if ( ! empty( $sortable ) ) { // Dummy proofing :P.
 				$this->field['multi'] = true;
@@ -140,13 +140,13 @@ 
 					$this->field['options'] = array();
 
 					foreach ( $this->value as $value ) {
-						$this->field['options'][ $value ] = $orig_option[ $value ];
+						$this->field['options'][$value] = $orig_option[$value];
 					}
 
 					if ( count( $this->field['options'] ) < count( $orig_option ) ) {
 						foreach ( $orig_option as $key => $value ) {
 							if ( ! in_array( $key, $this->field['options'], true ) ) {
-								$this->field['options'][ $key ] = $value;
+								$this->field['options'][$key] = $value;
 							}
 						}
 					}
@@ -169,7 +169,7 @@ 
 						echo '<optgroup label="' . esc_attr( $k ) . '">';
 
 						foreach ( $v as $opt => $val ) {
-							$this->make_option( (string) $opt, $val );
+							$this->make_option( ( string ) $opt, $val );
 						}
 
 						echo '</optgroup>';
@@ -177,7 +177,7 @@ 
 						continue;
 					}
 
-					$this->make_option( (string) $k, $v );
+					$this->make_option( ( string ) $k, $v );
 				}
 
 				echo '</select>';

redux-core/inc/extensions/users/class-redux-users-api.php

Spacing +53 added lines, -53 removed lines

@@ -92,7 +92,7 @@ 
 				$instances = Redux::all_instances();
 
 				foreach ( self::$fields as $opt_name => $fields ) {
-					if ( ! isset( $instances[ $opt_name ] ) ) {
+					if ( ! isset( $instances[$opt_name] ) ) {
 						Redux::set_args( $opt_name, array( 'menu_type' => 'hidden' ) );
 
 						Redux::set_sections(
@@ -113,7 +113,7 @@ 
 
 					self::check_opt_name( $opt_name );
 
-					Redux::set_args( $opt_name, self::$args[ $opt_name ] );
+					Redux::set_args( $opt_name, self::$args[$opt_name] );
 				}
 			}
 		}
@@ -126,7 +126,7 @@ 
 		 * @return mixed
 		 */
 		public static function construct_args( string $opt_name ) {
-			$args             = self::$args[ $opt_name ];
+			$args             = self::$args[$opt_name];
 			$args['opt_name'] = $opt_name;
 
 			if ( ! isset( $args['menu_title'] ) ) {
@@ -154,11 +154,11 @@ 
 		public static function construct_profiles( string $opt_name ): array {
 			$profiles = array();
 
-			if ( ! isset( self::$profiles[ $opt_name ] ) ) {
+			if ( ! isset( self::$profiles[$opt_name] ) ) {
 				return $profiles;
 			}
 
-			foreach ( self::$profiles[ $opt_name ] as $profile ) {
+			foreach ( self::$profiles[$opt_name] as $profile ) {
 				$profile['sections'] = self::construct_sections( $opt_name, $profile['id'] );
 				$profiles[]          = $profile;
 			}
@@ -179,22 +179,22 @@ 
 		public static function construct_sections( string $opt_name, $profile_id ): array {
 			$sections = array();
 
-			if ( ! isset( self::$sections[ $opt_name ] ) ) {
+			if ( ! isset( self::$sections[$opt_name] ) ) {
 				return $sections;
 			}
 
-			foreach ( self::$sections[ $opt_name ] as $section_id => $section ) {
+			foreach ( self::$sections[$opt_name] as $section_id => $section ) {
 				if ( $section['profile_id'] === $profile_id ) {
-					self::$sections[ $opt_name ][ $section_id ]['roles'] = $section;
+					self::$sections[$opt_name][$section_id]['roles'] = $section;
 
 					$p = $section['priority'];
 
-					while ( isset( $sections[ $p ] ) ) {
+					while ( isset( $sections[$p] ) ) {
 						echo esc_html( $p++ );
 					}
 
 					$section['fields'] = self::construct_fields( $opt_name, $section_id );
-					$sections[ $p ]    = $section;
+					$sections[$p]    = $section;
 				}
 			}
 
@@ -214,29 +214,29 @@ 
 		public static function construct_fields( string $opt_name = '', string $section_id = '', bool $permissions = false, bool $roles = false ): array {
 			$fields = array();
 
-			if ( ! isset( self::$fields[ $opt_name ] ) ) {
+			if ( ! isset( self::$fields[$opt_name] ) ) {
 				return $fields;
 			}
 
-			foreach ( self::$fields[ $opt_name ] as $key => $field ) {
+			foreach ( self::$fields[$opt_name] as $key => $field ) {
 				// Nested permissions.
 				$field['permissions'] = $field['permissions'] ?? $permissions;
 
-				self::$fields[ $opt_name ][ $key ]['permissions'] = $field['permissions'];
+				self::$fields[$opt_name][$key]['permissions'] = $field['permissions'];
 
 				// Nested roles permissions.
 				$field['roles'] = $field['roles'] ?? $roles;
 
-				self::$fields[ $opt_name ][ $key ]['roles'] = $field['roles'];
+				self::$fields[$opt_name][$key]['roles'] = $field['roles'];
 
 				if ( $field['section_id'] === $section_id ) {
 					$p = $field['priority'];
 
-					while ( isset( $fields[ $p ] ) ) {
+					while ( isset( $fields[$p] ) ) {
 						echo esc_html( $p++ );
 					}
 
-					$fields[ $p ] = $field;
+					$fields[$p] = $field;
 				}
 			}
 
@@ -257,11 +257,11 @@ 
 			self::check_opt_name( $opt_name );
 
 			if ( ! empty( $opt_name ) && ! empty( $id ) ) {
-				if ( ! isset( self::$sections[ $opt_name ][ $id ] ) ) {
+				if ( ! isset( self::$sections[$opt_name][$id] ) ) {
 					$id = strtolower( sanitize_html_class( $id ) );
 				}
 
-				return self::$sections[ $opt_name ][ $id ] ?? false;
+				return self::$sections[$opt_name][$id] ?? false;
 			}
 
 			return false;
@@ -277,8 +277,8 @@ 
 			self::check_opt_name( $opt_name );
 
 			if ( ! empty( $opt_name ) && is_array( $args ) && ! empty( $args ) ) {
-				self::$args[ $opt_name ] = self::$args[ $opt_name ] ?? array();
-				self::$args[ $opt_name ] = wp_parse_args( $args, self::$args[ $opt_name ] );
+				self::$args[$opt_name] = self::$args[$opt_name] ?? array();
+				self::$args[$opt_name] = wp_parse_args( $args, self::$args[$opt_name] );
 			}
 		}
 
@@ -299,11 +299,11 @@ 
 						$section['id'] = 'section';
 					}
 
-					if ( isset( self::$sections[ $opt_name ][ $section['id'] ] ) ) {
+					if ( isset( self::$sections[$opt_name][$section['id']] ) ) {
 						$orig = $section['id'];
 						$i    = 0;
 
-						while ( isset( self::$sections[ $opt_name ][ $section['id'] ] ) ) {
+						while ( isset( self::$sections[$opt_name][$section['id']] ) ) {
 							$section['id'] = $orig . '_' . $i;
 						}
 					}
@@ -318,11 +318,11 @@ 
 						if ( isset( $section['permissions'] ) || isset( $section['roles'] ) ) {
 							foreach ( $section['fields'] as $key => $field ) {
 								if ( ! isset( $field['permissions'] ) && isset( $section['permissions'] ) ) {
-									$section['fields'][ $key ]['permissions'] = $section['permissions'];
+									$section['fields'][$key]['permissions'] = $section['permissions'];
 								}
 
 								if ( ! isset( $field['roles'] ) && isset( $section['roles'] ) ) {
-									$section['fields'][ $key ]['roles'] = $section['roles'];
+									$section['fields'][$key]['roles'] = $section['roles'];
 								}
 							}
 						}
@@ -333,9 +333,9 @@ 
 					unset( $section['fields'] );
 				}
 
-				self::$sections[ $opt_name ][ $section['id'] ] = $section;
+				self::$sections[$opt_name][$section['id']] = $section;
 			} else {
-				self::$errors[ $opt_name ]['section']['empty'] = esc_html__( 'Unable to create a section due an empty section array or the section variable passed was not an array.', 'redux-framework' );
+				self::$errors[$opt_name]['section']['empty'] = esc_html__( 'Unable to create a section due an empty section array or the section variable passed was not an array.', 'redux-framework' );
 			}
 		}
 
@@ -397,7 +397,7 @@ 
 			self::check_opt_name( $opt_name );
 
 			if ( ! empty( $opt_name ) && ! empty( $id ) ) {
-				return self::$fields[ $opt_name ][ $id ] ?? false;
+				return self::$fields[$opt_name][$id] ?? false;
 			}
 
 			return false;
@@ -417,7 +417,7 @@ 
 					$field['priority'] = self::get_priority( $opt_name, 'fields' );
 				}
 
-				self::$fields[ $opt_name ][ $field['id'] ] = $field;
+				self::$fields[$opt_name][$field['id']] = $field;
 			}
 		}
 
@@ -438,11 +438,11 @@ 
 						$profile['id'] = 'profile';
 					}
 
-					if ( isset( self::$profiles[ $opt_name ][ $profile['id'] ] ) ) {
+					if ( isset( self::$profiles[$opt_name][$profile['id']] ) ) {
 						$orig = $profile['id'];
 						$i    = 0;
 
-						while ( isset( self::$profiles[ $opt_name ][ $profile['id'] ] ) ) {
+						while ( isset( self::$profiles[$opt_name][$profile['id']] ) ) {
 							$profile['id'] = $orig . '_' . $i;
 						}
 					}
@@ -453,11 +453,11 @@ 
 						if ( isset( $profile['permissions'] ) || isset( $profile['roles'] ) ) {
 							foreach ( $profile['sections'] as $key => $section ) {
 								if ( ! isset( $section['permissions'] ) && isset( $profile['permissions'] ) ) {
-									$profile['sections'][ $key ]['permissions'] = $profile['permissions'];
+									$profile['sections'][$key]['permissions'] = $profile['permissions'];
 								}
 
 								if ( ! isset( $section['roles'] ) && isset( $profile['roles'] ) ) {
-									$profile['sections'][ $key ]['roles'] = $profile['roles'];
+									$profile['sections'][$key]['roles'] = $profile['roles'];
 								}
 							}
 						}
@@ -468,9 +468,9 @@ 
 					unset( $profile['sections'] );
 				}
 
-				self::$profiles[ $opt_name ][ $profile['id'] ] = $profile;
+				self::$profiles[$opt_name][$profile['id']] = $profile;
 			} else {
-				self::$errors[ $opt_name ]['profile']['empty'] = esc_html__( 'Unable to create a profile due an empty profile array or the profile variable passed was not an array.', 'redux-framework' );
+				self::$errors[$opt_name]['profile']['empty'] = esc_html__( 'Unable to create a profile due an empty profile array or the profile variable passed was not an array.', 'redux-framework' );
 			}
 		}
 
@@ -483,8 +483,8 @@ 
 		 * @return mixed
 		 */
 		public static function get_priority( string $opt_name, $type ) {
-			$priority                              = self::$priority[ $opt_name ][ $type ];
-			self::$priority[ $opt_name ][ $type ] += 1;
+			$priority                              = self::$priority[$opt_name][$type];
+			self::$priority[$opt_name][$type] += 1;
 
 			return $priority;
 		}
@@ -499,34 +499,34 @@ 
 				return;
 			}
 
-			if ( ! isset( self::$profiles[ $opt_name ] ) ) {
-				self::$profiles[ $opt_name ] = array();
+			if ( ! isset( self::$profiles[$opt_name] ) ) {
+				self::$profiles[$opt_name] = array();
 			}
 
-			if ( ! isset( self::$priority[ $opt_name ] ) ) {
-				self::$priority[ $opt_name ]['args'] = 1;
+			if ( ! isset( self::$priority[$opt_name] ) ) {
+				self::$priority[$opt_name]['args'] = 1;
 			}
 
-			if ( ! isset( self::$sections[ $opt_name ] ) ) {
-				self::$sections[ $opt_name ]             = array();
-				self::$priority[ $opt_name ]['sections'] = 1;
+			if ( ! isset( self::$sections[$opt_name] ) ) {
+				self::$sections[$opt_name]             = array();
+				self::$priority[$opt_name]['sections'] = 1;
 			}
 
-			if ( ! isset( self::$fields[ $opt_name ] ) ) {
-				self::$fields[ $opt_name ]             = array();
-				self::$priority[ $opt_name ]['fields'] = 1;
+			if ( ! isset( self::$fields[$opt_name] ) ) {
+				self::$fields[$opt_name]             = array();
+				self::$priority[$opt_name]['fields'] = 1;
 			}
 
-			if ( ! isset( self::$errors[ $opt_name ] ) ) {
-				self::$errors[ $opt_name ] = array();
+			if ( ! isset( self::$errors[$opt_name] ) ) {
+				self::$errors[$opt_name] = array();
 			}
 
-			if ( ! isset( self::$init[ $opt_name ] ) ) {
-				self::$init[ $opt_name ] = false;
+			if ( ! isset( self::$init[$opt_name] ) ) {
+				self::$init[$opt_name] = false;
 			}
 
-			if ( ! isset( self::$args[ $opt_name ] ) ) {
-				self::$args[ $opt_name ] = false;
+			if ( ! isset( self::$args[$opt_name] ) ) {
+				self::$args[$opt_name] = false;
 			}
 		}
 
@@ -565,7 +565,7 @@ 
 						$value = $value[0];
 					}
 
-					$meta[ $key ] = maybe_unserialize( $value );
+					$meta[$key] = maybe_unserialize( $value );
 				}
 			}
 

Indentation +561 added lines, -561 removed lines

@@ -13,565 +13,565 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Users' ) ) {
 
-	/**
-	 * Redux Users API Class
-	 * Simple API for Redux Framework
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Users {
-
-		/**
-		 * Profile array.
-		 *
-		 * @var array
-		 */
-		public static array $profiles = array();
-
-		/**
-		 * Sections array.
-		 *
-		 * @var array
-		 */
-		public static array $sections = array();
-
-		/**
-		 * Fields array.
-		 *
-		 * @var array
-		 */
-		public static array $fields = array();
-
-		/**
-		 * Priority array.
-		 *
-		 * @var array
-		 */
-		public static array $priority = array();
-
-		/**
-		 * Errors array.
-		 *
-		 * @var array
-		 */
-		public static array $errors = array();
-
-		/**
-		 * Init array.
-		 *
-		 * @var array
-		 */
-		public static array $init = array();
-
-		/**
-		 * Args array.
-		 *
-		 * @var array
-		 */
-		public static array $args = array();
-
-		/**
-		 * Load.
-		 */
-		public static function load() {
-			add_action( 'init', array( 'Redux_Users', 'enqueue' ), 99 );
-		}
-
-		/**
-		 * Enqueue support files and fields.
-		 *
-		 * @throws ReflectionException Exception.
-		 */
-		public static function enqueue() {
-			global $pagenow;
-
-			// Check and run instances of Redux where the opt_name hasn't been run.
-			$pagenows = array( 'user-new.php', 'profile.php', 'user-edit.php' );
-
-			if ( ! empty( self::$sections ) && in_array( $pagenow, $pagenows, true ) ) {
-				$instances = Redux::all_instances();
-
-				foreach ( self::$fields as $opt_name => $fields ) {
-					if ( ! isset( $instances[ $opt_name ] ) ) {
-						Redux::set_args( $opt_name, array( 'menu_type' => 'hidden' ) );
-
-						Redux::set_sections(
-							$opt_name,
-							array(
-								array(
-									'id'     => 'EXTENSION_USERS_FAKE_ID' . $opt_name,
-									'fields' => $fields,
-									'title'  => 'N/A',
-								),
-							)
-						);
-
-						Redux::init( $opt_name );
-
-						$instances = ReduxFrameworkInstances::get_all_instances();
-					}
-
-					self::check_opt_name( $opt_name );
-
-					Redux::set_args( $opt_name, self::$args[ $opt_name ] );
-				}
-			}
-		}
-
-		/**
-		 * Construct Args.
-		 *
-		 * @param string $opt_name Panel Opt Name.
-		 *
-		 * @return mixed
-		 */
-		public static function construct_args( string $opt_name ) {
-			$args             = self::$args[ $opt_name ];
-			$args['opt_name'] = $opt_name;
-
-			if ( ! isset( $args['menu_title'] ) ) {
-				$args['menu_title'] = ucfirst( $opt_name ) . ' Options';
-			}
-
-			if ( ! isset( $args['page_title'] ) ) {
-				$args['page_title'] = ucfirst( $opt_name ) . ' Options';
-			}
-
-			if ( ! isset( $args['page_slug'] ) ) {
-				$args['page_slug'] = $opt_name . '_options';
-			}
-
-			return $args;
-		}
-
-		/**
-		 * Construct Profiles.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 *
-		 * @return array
-		 */
-		public static function construct_profiles( string $opt_name ): array {
-			$profiles = array();
-
-			if ( ! isset( self::$profiles[ $opt_name ] ) ) {
-				return $profiles;
-			}
-
-			foreach ( self::$profiles[ $opt_name ] as $profile ) {
-				$profile['sections'] = self::construct_sections( $opt_name, $profile['id'] );
-				$profiles[]          = $profile;
-			}
-
-			ksort( $profiles );
-
-			return $profiles;
-		}
-
-		/**
-		 * Construct Sections.
-		 *
-		 * @param string     $opt_name    Panel opt_name.
-		 * @param int|string $profile_id  Profile ID.
-		 *
-		 * @return array
-		 */
-		public static function construct_sections( string $opt_name, $profile_id ): array {
-			$sections = array();
-
-			if ( ! isset( self::$sections[ $opt_name ] ) ) {
-				return $sections;
-			}
-
-			foreach ( self::$sections[ $opt_name ] as $section_id => $section ) {
-				if ( $section['profile_id'] === $profile_id ) {
-					self::$sections[ $opt_name ][ $section_id ]['roles'] = $section;
-
-					$p = $section['priority'];
-
-					while ( isset( $sections[ $p ] ) ) {
-						echo esc_html( $p++ );
-					}
-
-					$section['fields'] = self::construct_fields( $opt_name, $section_id );
-					$sections[ $p ]    = $section;
-				}
-			}
-
-			return $sections;
-		}
-
-		/**
-		 * Construct Fields.
-		 *
-		 * @param string $opt_name    Panel opt_name.
-		 * @param string $section_id  Section ID.
-		 * @param bool   $permissions Permissions.
-		 * @param bool   $roles       Roles.
-		 *
-		 * @return array
-		 */
-		public static function construct_fields( string $opt_name = '', string $section_id = '', bool $permissions = false, bool $roles = false ): array {
-			$fields = array();
-
-			if ( ! isset( self::$fields[ $opt_name ] ) ) {
-				return $fields;
-			}
-
-			foreach ( self::$fields[ $opt_name ] as $key => $field ) {
-				// Nested permissions.
-				$field['permissions'] = $field['permissions'] ?? $permissions;
-
-				self::$fields[ $opt_name ][ $key ]['permissions'] = $field['permissions'];
-
-				// Nested roles permissions.
-				$field['roles'] = $field['roles'] ?? $roles;
-
-				self::$fields[ $opt_name ][ $key ]['roles'] = $field['roles'];
-
-				if ( $field['section_id'] === $section_id ) {
-					$p = $field['priority'];
-
-					while ( isset( $fields[ $p ] ) ) {
-						echo esc_html( $p++ );
-					}
-
-					$fields[ $p ] = $field;
-				}
-			}
-
-			ksort( $fields );
-
-			return $fields;
-		}
-
-		/**
-		 * Get Section.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param string $id       ID.
-		 *
-		 * @return bool
-		 */
-		public static function get_section( string $opt_name = '', string $id = '' ): bool {
-			self::check_opt_name( $opt_name );
-
-			if ( ! empty( $opt_name ) && ! empty( $id ) ) {
-				if ( ! isset( self::$sections[ $opt_name ][ $id ] ) ) {
-					$id = strtolower( sanitize_html_class( $id ) );
-				}
-
-				return self::$sections[ $opt_name ][ $id ] ?? false;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Set args.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param array  $args     Args array.
-		 */
-		public static function set_args( string $opt_name = '', array $args = array() ) {
-			self::check_opt_name( $opt_name );
-
-			if ( ! empty( $opt_name ) && is_array( $args ) && ! empty( $args ) ) {
-				self::$args[ $opt_name ] = self::$args[ $opt_name ] ?? array();
-				self::$args[ $opt_name ] = wp_parse_args( $args, self::$args[ $opt_name ] );
-			}
-		}
-
-		/**
-		 * Set Section.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param array  $section  Section array.
-		 */
-		public static function set_section( string $opt_name = '', array $section = array() ) {
-			self::check_opt_name( $opt_name );
-
-			if ( ! empty( $opt_name ) && is_array( $section ) && ! empty( $section ) ) {
-				if ( ! isset( $section['id'] ) ) {
-					if ( isset( $section['title'] ) ) {
-						$section['id'] = strtolower( sanitize_html_class( $section['title'] ) );
-					} else {
-						$section['id'] = 'section';
-					}
-
-					if ( isset( self::$sections[ $opt_name ][ $section['id'] ] ) ) {
-						$orig = $section['id'];
-						$i    = 0;
-
-						while ( isset( self::$sections[ $opt_name ][ $section['id'] ] ) ) {
-							$section['id'] = $orig . '_' . $i;
-						}
-					}
-				}
-
-				if ( ! isset( $section['priority'] ) ) {
-					$section['priority'] = self::get_priority( $opt_name, 'sections' );
-				}
-
-				if ( isset( $section['fields'] ) ) {
-					if ( ! empty( $section['fields'] ) && is_array( $section['fields'] ) ) {
-						if ( isset( $section['permissions'] ) || isset( $section['roles'] ) ) {
-							foreach ( $section['fields'] as $key => $field ) {
-								if ( ! isset( $field['permissions'] ) && isset( $section['permissions'] ) ) {
-									$section['fields'][ $key ]['permissions'] = $section['permissions'];
-								}
-
-								if ( ! isset( $field['roles'] ) && isset( $section['roles'] ) ) {
-									$section['fields'][ $key ]['roles'] = $section['roles'];
-								}
-							}
-						}
-
-						self::process_fields_array( $opt_name, $section['id'], $section['fields'] );
-					}
-
-					unset( $section['fields'] );
-				}
-
-				self::$sections[ $opt_name ][ $section['id'] ] = $section;
-			} else {
-				self::$errors[ $opt_name ]['section']['empty'] = esc_html__( 'Unable to create a section due an empty section array or the section variable passed was not an array.', 'redux-framework' );
-			}
-		}
-
-		/**
-		 * Process Section Array.
-		 *
-		 * @param string $opt_name   Panel opt_name.
-		 * @param string $profile_id Profile ID.
-		 * @param array  $sections   Sections array.
-		 */
-		public static function process_sections_array( string $opt_name = '', string $profile_id = '', array $sections = array() ) {
-			if ( ! empty( $opt_name ) && ! empty( $profile_id ) && is_array( $sections ) && ! empty( $sections ) ) {
-				foreach ( $sections as $section ) {
-					if ( ! is_array( $section ) ) {
-						continue;
-					}
-
-					$section['profile_id'] = $profile_id;
-
-					if ( ! isset( $section['fields'] ) || ! is_array( $section['fields'] ) ) {
-						$section['fields'] = array();
-					}
-
-					self::set_section( $opt_name, $section );
-				}
-			}
-		}
-
-		/**
-		 * Process Fields Array.
-		 *
-		 * @param string $opt_name   Panel opt_name.
-		 * @param string $section_id Section ID.
-		 * @param array  $fields     Fields array.
-		 */
-		public static function process_fields_array( string $opt_name = '', string $section_id = '', array $fields = array() ) {
-			if ( ! empty( $opt_name ) && ! empty( $section_id ) && is_array( $fields ) && ! empty( $fields ) ) {
-				foreach ( $fields as $field ) {
-					if ( ! is_array( $field ) ) {
-						continue;
-					}
-
-					$field['section_id'] = $section_id;
-
-					self::set_field( $opt_name, $field );
-				}
-			}
-		}
-
-		/**
-		 * Get field.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param string $id       Field ID.
-		 *
-		 * @return bool
-		 */
-		public static function get_field( string $opt_name = '', string $id = '' ): bool {
-			self::check_opt_name( $opt_name );
-
-			if ( ! empty( $opt_name ) && ! empty( $id ) ) {
-				return self::$fields[ $opt_name ][ $id ] ?? false;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Set field.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param array  $field    Field array.
-		 */
-		public static function set_field( string $opt_name = '', array $field = array() ) {
-			self::check_opt_name( $opt_name );
-
-			if ( ! empty( $opt_name ) && is_array( $field ) && ! empty( $field ) ) {
-				if ( ! isset( $field['priority'] ) ) {
-					$field['priority'] = self::get_priority( $opt_name, 'fields' );
-				}
-
-				self::$fields[ $opt_name ][ $field['id'] ] = $field;
-			}
-		}
-
-		/**
-		 * Set Profile.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param array  $profile  Profile array.
-		 */
-		public static function set_profile( string $opt_name = '', array $profile = array() ) {
-			self::check_opt_name( $opt_name );
-
-			if ( ! empty( $opt_name ) && is_array( $profile ) && ! empty( $profile ) ) {
-				if ( ! isset( $profile['id'] ) ) {
-					if ( isset( $profile['title'] ) ) {
-						$profile['id'] = strtolower( sanitize_html_class( $profile['title'] ) );
-					} else {
-						$profile['id'] = 'profile';
-					}
-
-					if ( isset( self::$profiles[ $opt_name ][ $profile['id'] ] ) ) {
-						$orig = $profile['id'];
-						$i    = 0;
-
-						while ( isset( self::$profiles[ $opt_name ][ $profile['id'] ] ) ) {
-							$profile['id'] = $orig . '_' . $i;
-						}
-					}
-				}
-
-				if ( isset( $profile['sections'] ) ) {
-					if ( ! empty( $profile['sections'] ) && is_array( $profile['sections'] ) ) {
-						if ( isset( $profile['permissions'] ) || isset( $profile['roles'] ) ) {
-							foreach ( $profile['sections'] as $key => $section ) {
-								if ( ! isset( $section['permissions'] ) && isset( $profile['permissions'] ) ) {
-									$profile['sections'][ $key ]['permissions'] = $profile['permissions'];
-								}
-
-								if ( ! isset( $section['roles'] ) && isset( $profile['roles'] ) ) {
-									$profile['sections'][ $key ]['roles'] = $profile['roles'];
-								}
-							}
-						}
-
-						self::process_sections_array( $opt_name, $profile['id'], $profile['sections'] );
-					}
-
-					unset( $profile['sections'] );
-				}
-
-				self::$profiles[ $opt_name ][ $profile['id'] ] = $profile;
-			} else {
-				self::$errors[ $opt_name ]['profile']['empty'] = esc_html__( 'Unable to create a profile due an empty profile array or the profile variable passed was not an array.', 'redux-framework' );
-			}
-		}
-
-		/**
-		 * Get Priority.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 * @param mixed  $type     Type.
-		 *
-		 * @return mixed
-		 */
-		public static function get_priority( string $opt_name, $type ) {
-			$priority                              = self::$priority[ $opt_name ][ $type ];
-			self::$priority[ $opt_name ][ $type ] += 1;
-
-			return $priority;
-		}
-
-		/**
-		 * Check opt name.
-		 *
-		 * @param string $opt_name Panel opt_name.
-		 */
-		public static function check_opt_name( string $opt_name = '' ) {
-			if ( empty( $opt_name ) || is_array( $opt_name ) ) {
-				return;
-			}
-
-			if ( ! isset( self::$profiles[ $opt_name ] ) ) {
-				self::$profiles[ $opt_name ] = array();
-			}
-
-			if ( ! isset( self::$priority[ $opt_name ] ) ) {
-				self::$priority[ $opt_name ]['args'] = 1;
-			}
-
-			if ( ! isset( self::$sections[ $opt_name ] ) ) {
-				self::$sections[ $opt_name ]             = array();
-				self::$priority[ $opt_name ]['sections'] = 1;
-			}
-
-			if ( ! isset( self::$fields[ $opt_name ] ) ) {
-				self::$fields[ $opt_name ]             = array();
-				self::$priority[ $opt_name ]['fields'] = 1;
-			}
-
-			if ( ! isset( self::$errors[ $opt_name ] ) ) {
-				self::$errors[ $opt_name ] = array();
-			}
-
-			if ( ! isset( self::$init[ $opt_name ] ) ) {
-				self::$init[ $opt_name ] = false;
-			}
-
-			if ( ! isset( self::$args[ $opt_name ] ) ) {
-				self::$args[ $opt_name ] = false;
-			}
-		}
-
-		/**
-		 * Get USer Meta.
-		 *
-		 * @param array $args Args array.
-		 *
-		 * @return mixed
-		 */
-		public static function get_user_meta( array $args = array() ) {
-			$default = array(
-				'key'      => '',
-				'opt_name' => '',
-				'user'     => '',
-			);
-
-			$args = wp_parse_args( $args, $default );
-
-			if ( empty( $args['user'] ) ) {
-				$args['user'] = get_current_user_id();
-			}
-
-			// phpcs:ignore WordPress.PHP.DontExtract
-			extract( $args );
-
-			$single = ! empty( $key );
-
-			$meta = get_user_meta( $user, $key, $single );
-
-			if ( $single ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-				// Do nothing.
-			} elseif ( ! empty( $meta ) ) {
-				foreach ( $meta as $key => $value ) {
-					if ( is_array( $value ) ) {
-						$value = $value[0];
-					}
-
-					$meta[ $key ] = maybe_unserialize( $value );
-				}
-			}
-
-			return $meta;
-		}
-	}
-
-	Redux_Users::load();
+    /**
+     * Redux Users API Class
+     * Simple API for Redux Framework
+     *
+     * @since       1.0.0
+     */
+    class Redux_Users {
+
+        /**
+         * Profile array.
+         *
+         * @var array
+         */
+        public static array $profiles = array();
+
+        /**
+         * Sections array.
+         *
+         * @var array
+         */
+        public static array $sections = array();
+
+        /**
+         * Fields array.
+         *
+         * @var array
+         */
+        public static array $fields = array();
+
+        /**
+         * Priority array.
+         *
+         * @var array
+         */
+        public static array $priority = array();
+
+        /**
+         * Errors array.
+         *
+         * @var array
+         */
+        public static array $errors = array();
+
+        /**
+         * Init array.
+         *
+         * @var array
+         */
+        public static array $init = array();
+
+        /**
+         * Args array.
+         *
+         * @var array
+         */
+        public static array $args = array();
+
+        /**
+         * Load.
+         */
+        public static function load() {
+            add_action( 'init', array( 'Redux_Users', 'enqueue' ), 99 );
+        }
+
+        /**
+         * Enqueue support files and fields.
+         *
+         * @throws ReflectionException Exception.
+         */
+        public static function enqueue() {
+            global $pagenow;
+
+            // Check and run instances of Redux where the opt_name hasn't been run.
+            $pagenows = array( 'user-new.php', 'profile.php', 'user-edit.php' );
+
+            if ( ! empty( self::$sections ) && in_array( $pagenow, $pagenows, true ) ) {
+                $instances = Redux::all_instances();
+
+                foreach ( self::$fields as $opt_name => $fields ) {
+                    if ( ! isset( $instances[ $opt_name ] ) ) {
+                        Redux::set_args( $opt_name, array( 'menu_type' => 'hidden' ) );
+
+                        Redux::set_sections(
+                            $opt_name,
+                            array(
+                                array(
+                                    'id'     => 'EXTENSION_USERS_FAKE_ID' . $opt_name,
+                                    'fields' => $fields,
+                                    'title'  => 'N/A',
+                                ),
+                            )
+                        );
+
+                        Redux::init( $opt_name );
+
+                        $instances = ReduxFrameworkInstances::get_all_instances();
+                    }
+
+                    self::check_opt_name( $opt_name );
+
+                    Redux::set_args( $opt_name, self::$args[ $opt_name ] );
+                }
+            }
+        }
+
+        /**
+         * Construct Args.
+         *
+         * @param string $opt_name Panel Opt Name.
+         *
+         * @return mixed
+         */
+        public static function construct_args( string $opt_name ) {
+            $args             = self::$args[ $opt_name ];
+            $args['opt_name'] = $opt_name;
+
+            if ( ! isset( $args['menu_title'] ) ) {
+                $args['menu_title'] = ucfirst( $opt_name ) . ' Options';
+            }
+
+            if ( ! isset( $args['page_title'] ) ) {
+                $args['page_title'] = ucfirst( $opt_name ) . ' Options';
+            }
+
+            if ( ! isset( $args['page_slug'] ) ) {
+                $args['page_slug'] = $opt_name . '_options';
+            }
+
+            return $args;
+        }
+
+        /**
+         * Construct Profiles.
+         *
+         * @param string $opt_name Panel opt_name.
+         *
+         * @return array
+         */
+        public static function construct_profiles( string $opt_name ): array {
+            $profiles = array();
+
+            if ( ! isset( self::$profiles[ $opt_name ] ) ) {
+                return $profiles;
+            }
+
+            foreach ( self::$profiles[ $opt_name ] as $profile ) {
+                $profile['sections'] = self::construct_sections( $opt_name, $profile['id'] );
+                $profiles[]          = $profile;
+            }
+
+            ksort( $profiles );
+
+            return $profiles;
+        }
+
+        /**
+         * Construct Sections.
+         *
+         * @param string     $opt_name    Panel opt_name.
+         * @param int|string $profile_id  Profile ID.
+         *
+         * @return array
+         */
+        public static function construct_sections( string $opt_name, $profile_id ): array {
+            $sections = array();
+
+            if ( ! isset( self::$sections[ $opt_name ] ) ) {
+                return $sections;
+            }
+
+            foreach ( self::$sections[ $opt_name ] as $section_id => $section ) {
+                if ( $section['profile_id'] === $profile_id ) {
+                    self::$sections[ $opt_name ][ $section_id ]['roles'] = $section;
+
+                    $p = $section['priority'];
+
+                    while ( isset( $sections[ $p ] ) ) {
+                        echo esc_html( $p++ );
+                    }
+
+                    $section['fields'] = self::construct_fields( $opt_name, $section_id );
+                    $sections[ $p ]    = $section;
+                }
+            }
+
+            return $sections;
+        }
+
+        /**
+         * Construct Fields.
+         *
+         * @param string $opt_name    Panel opt_name.
+         * @param string $section_id  Section ID.
+         * @param bool   $permissions Permissions.
+         * @param bool   $roles       Roles.
+         *
+         * @return array
+         */
+        public static function construct_fields( string $opt_name = '', string $section_id = '', bool $permissions = false, bool $roles = false ): array {
+            $fields = array();
+
+            if ( ! isset( self::$fields[ $opt_name ] ) ) {
+                return $fields;
+            }
+
+            foreach ( self::$fields[ $opt_name ] as $key => $field ) {
+                // Nested permissions.
+                $field['permissions'] = $field['permissions'] ?? $permissions;
+
+                self::$fields[ $opt_name ][ $key ]['permissions'] = $field['permissions'];
+
+                // Nested roles permissions.
+                $field['roles'] = $field['roles'] ?? $roles;
+
+                self::$fields[ $opt_name ][ $key ]['roles'] = $field['roles'];
+
+                if ( $field['section_id'] === $section_id ) {
+                    $p = $field['priority'];
+
+                    while ( isset( $fields[ $p ] ) ) {
+                        echo esc_html( $p++ );
+                    }
+
+                    $fields[ $p ] = $field;
+                }
+            }
+
+            ksort( $fields );
+
+            return $fields;
+        }
+
+        /**
+         * Get Section.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param string $id       ID.
+         *
+         * @return bool
+         */
+        public static function get_section( string $opt_name = '', string $id = '' ): bool {
+            self::check_opt_name( $opt_name );
+
+            if ( ! empty( $opt_name ) && ! empty( $id ) ) {
+                if ( ! isset( self::$sections[ $opt_name ][ $id ] ) ) {
+                    $id = strtolower( sanitize_html_class( $id ) );
+                }
+
+                return self::$sections[ $opt_name ][ $id ] ?? false;
+            }
+
+            return false;
+        }
+
+        /**
+         * Set args.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param array  $args     Args array.
+         */
+        public static function set_args( string $opt_name = '', array $args = array() ) {
+            self::check_opt_name( $opt_name );
+
+            if ( ! empty( $opt_name ) && is_array( $args ) && ! empty( $args ) ) {
+                self::$args[ $opt_name ] = self::$args[ $opt_name ] ?? array();
+                self::$args[ $opt_name ] = wp_parse_args( $args, self::$args[ $opt_name ] );
+            }
+        }
+
+        /**
+         * Set Section.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param array  $section  Section array.
+         */
+        public static function set_section( string $opt_name = '', array $section = array() ) {
+            self::check_opt_name( $opt_name );
+
+            if ( ! empty( $opt_name ) && is_array( $section ) && ! empty( $section ) ) {
+                if ( ! isset( $section['id'] ) ) {
+                    if ( isset( $section['title'] ) ) {
+                        $section['id'] = strtolower( sanitize_html_class( $section['title'] ) );
+                    } else {
+                        $section['id'] = 'section';
+                    }
+
+                    if ( isset( self::$sections[ $opt_name ][ $section['id'] ] ) ) {
+                        $orig = $section['id'];
+                        $i    = 0;
+
+                        while ( isset( self::$sections[ $opt_name ][ $section['id'] ] ) ) {
+                            $section['id'] = $orig . '_' . $i;
+                        }
+                    }
+                }
+
+                if ( ! isset( $section['priority'] ) ) {
+                    $section['priority'] = self::get_priority( $opt_name, 'sections' );
+                }
+
+                if ( isset( $section['fields'] ) ) {
+                    if ( ! empty( $section['fields'] ) && is_array( $section['fields'] ) ) {
+                        if ( isset( $section['permissions'] ) || isset( $section['roles'] ) ) {
+                            foreach ( $section['fields'] as $key => $field ) {
+                                if ( ! isset( $field['permissions'] ) && isset( $section['permissions'] ) ) {
+                                    $section['fields'][ $key ]['permissions'] = $section['permissions'];
+                                }
+
+                                if ( ! isset( $field['roles'] ) && isset( $section['roles'] ) ) {
+                                    $section['fields'][ $key ]['roles'] = $section['roles'];
+                                }
+                            }
+                        }
+
+                        self::process_fields_array( $opt_name, $section['id'], $section['fields'] );
+                    }
+
+                    unset( $section['fields'] );
+                }
+
+                self::$sections[ $opt_name ][ $section['id'] ] = $section;
+            } else {
+                self::$errors[ $opt_name ]['section']['empty'] = esc_html__( 'Unable to create a section due an empty section array or the section variable passed was not an array.', 'redux-framework' );
+            }
+        }
+
+        /**
+         * Process Section Array.
+         *
+         * @param string $opt_name   Panel opt_name.
+         * @param string $profile_id Profile ID.
+         * @param array  $sections   Sections array.
+         */
+        public static function process_sections_array( string $opt_name = '', string $profile_id = '', array $sections = array() ) {
+            if ( ! empty( $opt_name ) && ! empty( $profile_id ) && is_array( $sections ) && ! empty( $sections ) ) {
+                foreach ( $sections as $section ) {
+                    if ( ! is_array( $section ) ) {
+                        continue;
+                    }
+
+                    $section['profile_id'] = $profile_id;
+
+                    if ( ! isset( $section['fields'] ) || ! is_array( $section['fields'] ) ) {
+                        $section['fields'] = array();
+                    }
+
+                    self::set_section( $opt_name, $section );
+                }
+            }
+        }
+
+        /**
+         * Process Fields Array.
+         *
+         * @param string $opt_name   Panel opt_name.
+         * @param string $section_id Section ID.
+         * @param array  $fields     Fields array.
+         */
+        public static function process_fields_array( string $opt_name = '', string $section_id = '', array $fields = array() ) {
+            if ( ! empty( $opt_name ) && ! empty( $section_id ) && is_array( $fields ) && ! empty( $fields ) ) {
+                foreach ( $fields as $field ) {
+                    if ( ! is_array( $field ) ) {
+                        continue;
+                    }
+
+                    $field['section_id'] = $section_id;
+
+                    self::set_field( $opt_name, $field );
+                }
+            }
+        }
+
+        /**
+         * Get field.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param string $id       Field ID.
+         *
+         * @return bool
+         */
+        public static function get_field( string $opt_name = '', string $id = '' ): bool {
+            self::check_opt_name( $opt_name );
+
+            if ( ! empty( $opt_name ) && ! empty( $id ) ) {
+                return self::$fields[ $opt_name ][ $id ] ?? false;
+            }
+
+            return false;
+        }
+
+        /**
+         * Set field.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param array  $field    Field array.
+         */
+        public static function set_field( string $opt_name = '', array $field = array() ) {
+            self::check_opt_name( $opt_name );
+
+            if ( ! empty( $opt_name ) && is_array( $field ) && ! empty( $field ) ) {
+                if ( ! isset( $field['priority'] ) ) {
+                    $field['priority'] = self::get_priority( $opt_name, 'fields' );
+                }
+
+                self::$fields[ $opt_name ][ $field['id'] ] = $field;
+            }
+        }
+
+        /**
+         * Set Profile.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param array  $profile  Profile array.
+         */
+        public static function set_profile( string $opt_name = '', array $profile = array() ) {
+            self::check_opt_name( $opt_name );
+
+            if ( ! empty( $opt_name ) && is_array( $profile ) && ! empty( $profile ) ) {
+                if ( ! isset( $profile['id'] ) ) {
+                    if ( isset( $profile['title'] ) ) {
+                        $profile['id'] = strtolower( sanitize_html_class( $profile['title'] ) );
+                    } else {
+                        $profile['id'] = 'profile';
+                    }
+
+                    if ( isset( self::$profiles[ $opt_name ][ $profile['id'] ] ) ) {
+                        $orig = $profile['id'];
+                        $i    = 0;
+
+                        while ( isset( self::$profiles[ $opt_name ][ $profile['id'] ] ) ) {
+                            $profile['id'] = $orig . '_' . $i;
+                        }
+                    }
+                }
+
+                if ( isset( $profile['sections'] ) ) {
+                    if ( ! empty( $profile['sections'] ) && is_array( $profile['sections'] ) ) {
+                        if ( isset( $profile['permissions'] ) || isset( $profile['roles'] ) ) {
+                            foreach ( $profile['sections'] as $key => $section ) {
+                                if ( ! isset( $section['permissions'] ) && isset( $profile['permissions'] ) ) {
+                                    $profile['sections'][ $key ]['permissions'] = $profile['permissions'];
+                                }
+
+                                if ( ! isset( $section['roles'] ) && isset( $profile['roles'] ) ) {
+                                    $profile['sections'][ $key ]['roles'] = $profile['roles'];
+                                }
+                            }
+                        }
+
+                        self::process_sections_array( $opt_name, $profile['id'], $profile['sections'] );
+                    }
+
+                    unset( $profile['sections'] );
+                }
+
+                self::$profiles[ $opt_name ][ $profile['id'] ] = $profile;
+            } else {
+                self::$errors[ $opt_name ]['profile']['empty'] = esc_html__( 'Unable to create a profile due an empty profile array or the profile variable passed was not an array.', 'redux-framework' );
+            }
+        }
+
+        /**
+         * Get Priority.
+         *
+         * @param string $opt_name Panel opt_name.
+         * @param mixed  $type     Type.
+         *
+         * @return mixed
+         */
+        public static function get_priority( string $opt_name, $type ) {
+            $priority                              = self::$priority[ $opt_name ][ $type ];
+            self::$priority[ $opt_name ][ $type ] += 1;
+
+            return $priority;
+        }
+
+        /**
+         * Check opt name.
+         *
+         * @param string $opt_name Panel opt_name.
+         */
+        public static function check_opt_name( string $opt_name = '' ) {
+            if ( empty( $opt_name ) || is_array( $opt_name ) ) {
+                return;
+            }
+
+            if ( ! isset( self::$profiles[ $opt_name ] ) ) {
+                self::$profiles[ $opt_name ] = array();
+            }
+
+            if ( ! isset( self::$priority[ $opt_name ] ) ) {
+                self::$priority[ $opt_name ]['args'] = 1;
+            }
+
+            if ( ! isset( self::$sections[ $opt_name ] ) ) {
+                self::$sections[ $opt_name ]             = array();
+                self::$priority[ $opt_name ]['sections'] = 1;
+            }
+
+            if ( ! isset( self::$fields[ $opt_name ] ) ) {
+                self::$fields[ $opt_name ]             = array();
+                self::$priority[ $opt_name ]['fields'] = 1;
+            }
+
+            if ( ! isset( self::$errors[ $opt_name ] ) ) {
+                self::$errors[ $opt_name ] = array();
+            }
+
+            if ( ! isset( self::$init[ $opt_name ] ) ) {
+                self::$init[ $opt_name ] = false;
+            }
+
+            if ( ! isset( self::$args[ $opt_name ] ) ) {
+                self::$args[ $opt_name ] = false;
+            }
+        }
+
+        /**
+         * Get USer Meta.
+         *
+         * @param array $args Args array.
+         *
+         * @return mixed
+         */
+        public static function get_user_meta( array $args = array() ) {
+            $default = array(
+                'key'      => '',
+                'opt_name' => '',
+                'user'     => '',
+            );
+
+            $args = wp_parse_args( $args, $default );
+
+            if ( empty( $args['user'] ) ) {
+                $args['user'] = get_current_user_id();
+            }
+
+            // phpcs:ignore WordPress.PHP.DontExtract
+            extract( $args );
+
+            $single = ! empty( $key );
+
+            $meta = get_user_meta( $user, $key, $single );
+
+            if ( $single ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+                // Do nothing.
+            } elseif ( ! empty( $meta ) ) {
+                foreach ( $meta as $key => $value ) {
+                    if ( is_array( $value ) ) {
+                        $value = $value[0];
+                    }
+
+                    $meta[ $key ] = maybe_unserialize( $value );
+                }
+            }
+
+            return $meta;
+        }
+    }
+
+    Redux_Users::load();
 }

redux-core/inc/extensions/color_scheme/class-redux-extension-color-scheme.php

Spacing +21 added lines, -21 removed lines

@@ -125,7 +125,7 @@ 
 			}
 
 			$x            = get_option( $this->parent->args['opt_name'] );
-			$color_opts   = $x[ $this->field_id ] ?? array();
+			$color_opts   = $x[$this->field_id] ?? array();
 			$wrong_format = false;
 
 			if ( ! isset( $color_opts['color_scheme_name'] ) ) {
@@ -133,8 +133,8 @@ 
 
 				$data = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
 
-				if ( ! empty( $data ) && isset( $x[ $this->field_id ] ) ) {
-					$x[ $this->field_id ] = $data;
+				if ( ! empty( $data ) && isset( $x[$this->field_id] ) ) {
+					$x[$this->field_id] = $data;
 
 					update_option( $this->parent->args['opt_name'], $x );
 				}
@@ -165,9 +165,9 @@ 
 
 				$data = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
 
-				$this->parent->options[ $this->field_id ] = $data;
+				$this->parent->options[$this->field_id] = $data;
 
-				$defaults[ $this->field_id ] = $data;
+				$defaults[$this->field_id] = $data;
 			}
 
 			return $defaults;
@@ -217,7 +217,7 @@ 
 			if ( Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
 				// Check if reset_all was fired.
 				$this->reset_all();
-				$defaults[ $this->field_id ] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
+				$defaults[$this->field_id] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
 			}
 
 			return $defaults;
@@ -237,7 +237,7 @@ 
 					$cur_tab = sanitize_text_field( wp_unslash( $_COOKIE['redux_current_tab'] ) );
 
 					// Get the tab/section number field is used on.
-					$tab_num = $this->parent->field_sections['color_scheme'][ $this->field_id ];
+					$tab_num = $this->parent->field_sections['color_scheme'][$this->field_id];
 
 					// Match...
 					if ( $cur_tab === $tab_num ) {
@@ -245,7 +245,7 @@ 
 						// Reset data.
 						$this->reset_all();
 					}
-					$defaults[ $this->field_id ] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
+					$defaults[$this->field_id] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
 				}
 			}
 
@@ -263,7 +263,7 @@ 
 		 * @access      public
 		 */
 		public function save_hook( array $saved_options = array(), array $old_options = array() ): array {
-			if ( ! isset( $saved_options[ $this->field_id ] ) || empty( $saved_options[ $this->field_id ] ) || ( is_array( $saved_options[ $this->field_id ] ) && $old_options === $saved_options ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
+			if ( ! isset( $saved_options[$this->field_id] ) || empty( $saved_options[$this->field_id] ) || ( is_array( $saved_options[$this->field_id] ) && $old_options === $saved_options ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
 				return $saved_options;
 			}
 
@@ -272,7 +272,7 @@ 
 				return $saved_options;
 			}
 
-			$first_value = reset( $saved_options[ $this->field_id ] ); // First Element's Value.
+			$first_value = reset( $saved_options[$this->field_id] ); // First Element's Value.
 
 			// Parse the JSON to an array.
 			if ( isset( $first_value['data'] ) ) {
@@ -283,7 +283,7 @@ 
 				Redux_Color_Scheme_Functions::set_current_scheme_id( $saved_options['redux-scheme-select'] );
 
 				// Get the current field ID.
-				$raw_data = $saved_options[ $this->field_id ];
+				$raw_data = $saved_options[$this->field_id];
 
 				// Create a new array.
 				$save_data = array();
@@ -341,7 +341,7 @@ 
 				// Enum through values and assign them to a new array.
 				foreach ( $save_data as $val ) {
 					if ( isset( $val['id'] ) ) {
-						$new_scheme[ $val['id'] ] = $val;
+						$new_scheme[$val['id']] = $val;
 					}
 				}
 
@@ -354,24 +354,24 @@ 
 					if ( isset( $v['type'] ) ) {
 						$val = $v['value'];
 
-						unset( $database_data[ $k ] );
+						unset( $database_data[$k] );
 
-						$database_data[ $k ] = $val;
+						$database_data[$k] = $val;
 					}
 				}
 
-				$saved_options[ $this->field_id ] = $database_data;
+				$saved_options[$this->field_id] = $database_data;
 
 				// Check if we should save this compared to the old data.
 				$save_scheme = false;
 
 				// Doesn't exist or is empty.
-				if ( ! isset( $old_options[ $this->field_id ] ) || ( isset( $old_options[ $this->field_id ] ) && ! empty( $old_options[ $this->field_id ] ) ) ) {
+				if ( ! isset( $old_options[$this->field_id] ) || ( isset( $old_options[$this->field_id] ) && ! empty( $old_options[$this->field_id] ) ) ) {
 					$save_scheme = true;
 				}
 
 				// Isn't empty and isn't the same as the new array.
-				if ( ! empty( $old_options[ $this->field_id ] ) && $saved_options[ $this->field_id ] !== $old_options[ $this->field_id ] ) {
+				if ( ! empty( $old_options[$this->field_id] ) && $saved_options[$this->field_id] !== $old_options[$this->field_id] ) {
 					$save_scheme = true;
 				}
 
@@ -413,7 +413,7 @@ 
 		 * @access      public
 		 */
 		public function reset_all() {
-			if ( ! empty( $this->field_id ) && isset( $this->parent->options_defaults[ $this->field_id ] ) && ! empty( $this->parent->options_defaults[ $this->field_id ] ) ) {
+			if ( ! empty( $this->field_id ) && isset( $this->parent->options_defaults[$this->field_id] ) && ! empty( $this->parent->options_defaults[$this->field_id] ) ) {
 				Redux_Color_Scheme_Functions::$parent   = $this->parent;
 				Redux_Color_Scheme_Functions::$field_id = $this->field_id;
 
@@ -643,10 +643,10 @@ 
 						if ( false !== $schemes ) {
 
 							// If scheme name exists...
-							if ( isset( $schemes[ $scheme_id ] ) ) {
+							if ( isset( $schemes[$scheme_id] ) ) {
 
 								// Unset it.
-								unset( $schemes[ $scheme_id ] );
+								unset( $schemes[$scheme_id] );
 
 								// Save the scheme data, minus the deleted scheme.  Upon success...
 								if ( true === Redux_Color_Scheme_Functions::write_scheme_file( $schemes ) ) {
@@ -730,7 +730,7 @@ 
 		 * @return      array Default values from config.
 		 */
 		private function get_default_data(): array {
-			$def_opts = $this->parent->options_defaults[ $this->field_id ];
+			$def_opts = $this->parent->options_defaults[$this->field_id];
 
 			if ( isset( $def_opts['color_scheme_name'] ) ) {
 				return array();

Indentation +766 added lines, -766 removed lines

@@ -16,774 +16,774 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Color_Scheme' ) ) {
 
-	/**
-	 * Class Redux_Extension_Color_Scheme
-	 */
-	class Redux_Extension_Color_Scheme extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.4.10';
-
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Color Schemes';
-
-		/**
-		 * Field ID.
-		 *
-		 * @var string
-		 */
-		public $field_id = '';
-
-		/**
-		 * Transparent output bit.
-		 *
-		 * @var bool
-		 */
-		public bool $output_transparent = false;
-
-		/**
-		 * Extension field name.
-		 *
-		 * @var string
-		 */
-		public string $field_name = '';
-
-		/**
-		 * Class Constructor. Defines the args for the extensions class
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       object $redux Parent settings.
-		 *
-		 * @return      void
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux, __FILE__ );
-
-			$this->add_field( 'color_scheme' );
-			$this->field_name = 'color_scheme';
-
-			add_filter( "redux/options/{$this->parent->args['opt_name']}/defaults", array( $this, 'set_defaults' ) );
+    /**
+     * Class Redux_Extension_Color_Scheme
+     */
+    class Redux_Extension_Color_Scheme extends Redux_Extension_Abstract {
+
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.4.10';
+
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Color Schemes';
+
+        /**
+         * Field ID.
+         *
+         * @var string
+         */
+        public $field_id = '';
+
+        /**
+         * Transparent output bit.
+         *
+         * @var bool
+         */
+        public bool $output_transparent = false;
+
+        /**
+         * Extension field name.
+         *
+         * @var string
+         */
+        public string $field_name = '';
+
+        /**
+         * Class Constructor. Defines the args for the extensions class
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       object $redux Parent settings.
+         *
+         * @return      void
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux, __FILE__ );
+
+            $this->add_field( 'color_scheme' );
+            $this->field_name = 'color_scheme';
+
+            add_filter( "redux/options/{$this->parent->args['opt_name']}/defaults", array( $this, 'set_defaults' ) );
 
-			// Ajax hooks.
-			add_action( 'wp_ajax_redux_color_schemes', array( $this, 'parse_ajax' ) );
-			add_action( 'wp_ajax_nopriv_redux_color_schemes', array( $this, 'parse_ajax' ) );
-
-			// Reset hooks.
-			add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults', array( $this, 'reset_defaults' ), 0, 3 );
-			add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults_section', array( $this, 'reset_defaults_section' ), 0, 3 );
-
-			// Save filter.
-			add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/before_validation', array( $this, 'save_hook' ), 0, 3 );
-
-			// Register hook - to get field id and prep helper.
-			add_action( 'redux/options/' . $this->parent->args['opt_name'] . '/field/' . $this->field_name . '/register', array( $this, 'register_field' ) );
-
-			include_once $this->extension_dir . 'color_scheme/inc/class-redux-color-scheme-functions.php';
-			Redux_Color_Scheme_Functions::init( $redux );
-
-			$field = Redux_Color_Scheme_Functions::get_field( $redux );
-
-			if ( ! is_array( $field ) ) {
-				return;
-			}
-
-			$this->field_id = $field['id'];
-
-			// Prep storage.
-			$upload_dir = Redux_Color_Scheme_Functions::$upload_dir;
-
-			// Create uploads/redux_scheme_colors/ folder.
-			if ( ! is_dir( $upload_dir ) ) {
-				Redux_Core::$filesystem->execute( 'mkdir', $upload_dir );
-			}
-		}
-
-		/**
-		 * Set default values after reset.
-		 *
-		 * @param array $defaults Default values.
-		 *
-		 * @return array
-		 */
-		public function set_defaults( array $defaults = array() ): array {
-			if ( ! Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
-				return $defaults;
-			}
-
-			if ( empty( $this->field_id ) ) {
-				return $defaults;
-			}
-
-			$x            = get_option( $this->parent->args['opt_name'] );
-			$color_opts   = $x[ $this->field_id ] ?? array();
-			$wrong_format = false;
-
-			if ( ! isset( $color_opts['color_scheme_name'] ) ) {
-				$wrong_format = true;
-
-				$data = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
-
-				if ( ! empty( $data ) && isset( $x[ $this->field_id ] ) ) {
-					$x[ $this->field_id ] = $data;
-
-					update_option( $this->parent->args['opt_name'], $x );
-				}
-			}
-
-			Redux_Color_Scheme_Functions::$parent = $this->parent;
-
-			$ot_val                   = Redux_Color_Scheme_Functions::get_output_transparent_val();
-			$this->output_transparent = $ot_val;
-
-			Redux_Color_Scheme_Functions::convert_to_db();
-
-			$scheme_key  = Redux_Color_Scheme_Functions::get_scheme_key();
-			$scheme_data = get_option( $scheme_key );
-
-			$scheme_data_exists = ! empty( $scheme_data );
-
-			$default_exists = in_array( 'default', array_map( 'strtolower', Redux_Color_Scheme_Functions::get_scheme_names() ), true );
-
-			if ( ! $scheme_data_exists || ! $default_exists || $wrong_format ) {
-				$data = $this->get_default_data();
-
-				// Add to (and/or create) JSON scheme file.
-				Redux_Color_Scheme_Functions::set_scheme_data( 'Default', $data );
-
-				// Set default scheme.
-				Redux_Color_Scheme_Functions::set_current_scheme_id( 'Default' );
-
-				$data = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
-
-				$this->parent->options[ $this->field_id ] = $data;
-
-				$defaults[ $this->field_id ] = $data;
-			}
-
-			return $defaults;
-		}
-
-		/**
-		 * Field Register. Sets the whole smash up.
-		 *
-		 * @param       array $data Field data.
-		 *
-		 * @return      array
-		 * @since       1.0.0
-		 * @access      public
-		 */
-		public function register_field( array $data ): array {
-
-			// Include color_scheme helper.
-			include_once $this->extension_dir . 'color_scheme/inc/class-redux-color-scheme-functions.php';
-
-			if ( isset( $data['output_transparent'] ) ) {
-				$this->output_transparent = $data['output_transparent'];
-			}
+            // Ajax hooks.
+            add_action( 'wp_ajax_redux_color_schemes', array( $this, 'parse_ajax' ) );
+            add_action( 'wp_ajax_nopriv_redux_color_schemes', array( $this, 'parse_ajax' ) );
+
+            // Reset hooks.
+            add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults', array( $this, 'reset_defaults' ), 0, 3 );
+            add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults_section', array( $this, 'reset_defaults_section' ), 0, 3 );
+
+            // Save filter.
+            add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/before_validation', array( $this, 'save_hook' ), 0, 3 );
+
+            // Register hook - to get field id and prep helper.
+            add_action( 'redux/options/' . $this->parent->args['opt_name'] . '/field/' . $this->field_name . '/register', array( $this, 'register_field' ) );
+
+            include_once $this->extension_dir . 'color_scheme/inc/class-redux-color-scheme-functions.php';
+            Redux_Color_Scheme_Functions::init( $redux );
+
+            $field = Redux_Color_Scheme_Functions::get_field( $redux );
+
+            if ( ! is_array( $field ) ) {
+                return;
+            }
+
+            $this->field_id = $field['id'];
+
+            // Prep storage.
+            $upload_dir = Redux_Color_Scheme_Functions::$upload_dir;
+
+            // Create uploads/redux_scheme_colors/ folder.
+            if ( ! is_dir( $upload_dir ) ) {
+                Redux_Core::$filesystem->execute( 'mkdir', $upload_dir );
+            }
+        }
+
+        /**
+         * Set default values after reset.
+         *
+         * @param array $defaults Default values.
+         *
+         * @return array
+         */
+        public function set_defaults( array $defaults = array() ): array {
+            if ( ! Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
+                return $defaults;
+            }
+
+            if ( empty( $this->field_id ) ) {
+                return $defaults;
+            }
+
+            $x            = get_option( $this->parent->args['opt_name'] );
+            $color_opts   = $x[ $this->field_id ] ?? array();
+            $wrong_format = false;
+
+            if ( ! isset( $color_opts['color_scheme_name'] ) ) {
+                $wrong_format = true;
+
+                $data = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
+
+                if ( ! empty( $data ) && isset( $x[ $this->field_id ] ) ) {
+                    $x[ $this->field_id ] = $data;
+
+                    update_option( $this->parent->args['opt_name'], $x );
+                }
+            }
+
+            Redux_Color_Scheme_Functions::$parent = $this->parent;
+
+            $ot_val                   = Redux_Color_Scheme_Functions::get_output_transparent_val();
+            $this->output_transparent = $ot_val;
+
+            Redux_Color_Scheme_Functions::convert_to_db();
+
+            $scheme_key  = Redux_Color_Scheme_Functions::get_scheme_key();
+            $scheme_data = get_option( $scheme_key );
+
+            $scheme_data_exists = ! empty( $scheme_data );
+
+            $default_exists = in_array( 'default', array_map( 'strtolower', Redux_Color_Scheme_Functions::get_scheme_names() ), true );
+
+            if ( ! $scheme_data_exists || ! $default_exists || $wrong_format ) {
+                $data = $this->get_default_data();
+
+                // Add to (and/or create) JSON scheme file.
+                Redux_Color_Scheme_Functions::set_scheme_data( 'Default', $data );
+
+                // Set default scheme.
+                Redux_Color_Scheme_Functions::set_current_scheme_id( 'Default' );
+
+                $data = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
+
+                $this->parent->options[ $this->field_id ] = $data;
+
+                $defaults[ $this->field_id ] = $data;
+            }
+
+            return $defaults;
+        }
+
+        /**
+         * Field Register. Sets the whole smash up.
+         *
+         * @param       array $data Field data.
+         *
+         * @return      array
+         * @since       1.0.0
+         * @access      public
+         */
+        public function register_field( array $data ): array {
+
+            // Include color_scheme helper.
+            include_once $this->extension_dir . 'color_scheme/inc/class-redux-color-scheme-functions.php';
+
+            if ( isset( $data['output_transparent'] ) ) {
+                $this->output_transparent = $data['output_transparent'];
+            }
 
-			$this->field_id                         = $data['id'];
-			Redux_Color_Scheme_Functions::$field_id = $data['id'];
-
-			// Set helper parent object.
-			Redux_Color_Scheme_Functions::$parent = $this->parent;
-
-			// Prep storage.
-			$upload_dir = Redux_Color_Scheme_Functions::$upload_dir;
-
-			// Set upload_dir cookie.
-			setcookie( 'redux_color_scheme_upload_dir', $upload_dir, 0, '/' );
-
-			return $data;
-		}
-
-		/**
-		 * Reset defaults.
-		 *
-		 * @param array $defaults Default values.
-		 *
-		 * @return array
-		 */
-		public function reset_defaults( array $defaults = array() ): array {
-			if ( Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
-				// Check if reset_all was fired.
-				$this->reset_all();
-				$defaults[ $this->field_id ] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
-			}
+            $this->field_id                         = $data['id'];
+            Redux_Color_Scheme_Functions::$field_id = $data['id'];
+
+            // Set helper parent object.
+            Redux_Color_Scheme_Functions::$parent = $this->parent;
+
+            // Prep storage.
+            $upload_dir = Redux_Color_Scheme_Functions::$upload_dir;
+
+            // Set upload_dir cookie.
+            setcookie( 'redux_color_scheme_upload_dir', $upload_dir, 0, '/' );
+
+            return $data;
+        }
+
+        /**
+         * Reset defaults.
+         *
+         * @param array $defaults Default values.
+         *
+         * @return array
+         */
+        public function reset_defaults( array $defaults = array() ): array {
+            if ( Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
+                // Check if reset_all was fired.
+                $this->reset_all();
+                $defaults[ $this->field_id ] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
+            }
 
-			return $defaults;
-		}
+            return $defaults;
+        }
 
-		/**
-		 * Reset section defaults.
-		 *
-		 * @param array $defaults Default values.
-		 *
-		 * @return array
-		 */
-		public function reset_defaults_section( array $defaults = array() ): array {
-			if ( Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
-				// Get the current tab/section number.
-				if ( isset( $_COOKIE['redux_current_tab'] ) ) {
-					$cur_tab = sanitize_text_field( wp_unslash( $_COOKIE['redux_current_tab'] ) );
-
-					// Get the tab/section number field is used on.
-					$tab_num = $this->parent->field_sections['color_scheme'][ $this->field_id ];
-
-					// Match...
-					if ( $cur_tab === $tab_num ) {
-
-						// Reset data.
-						$this->reset_all();
-					}
-					$defaults[ $this->field_id ] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
-				}
-			}
-
-			return $defaults;
-		}
-
-		/**
-		 * Save Changes Hook. What to do when changes are saved
-		 *
-		 * @param array $saved_options Saved data.
-		 * @param array $old_options   Previous data.
-		 *
-		 * @return      array
-		 * @since       1.0.0
-		 * @access      public
-		 */
-		public function save_hook( array $saved_options = array(), array $old_options = array() ): array {
-			if ( ! isset( $saved_options[ $this->field_id ] ) || empty( $saved_options[ $this->field_id ] ) || ( is_array( $saved_options[ $this->field_id ] ) && $old_options === $saved_options ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
-				return $saved_options;
-			}
-
-			// We'll use the reset hook instead.
-			if ( ! empty( $saved_options['defaults'] ) || ! empty( $saved_options['defaults-section'] ) ) {
-				return $saved_options;
-			}
-
-			$first_value = reset( $saved_options[ $this->field_id ] ); // First Element's Value.
-
-			// Parse the JSON to an array.
-			if ( isset( $first_value['data'] ) ) {
-
-				Redux_Color_Scheme_Functions::$parent   = $this->parent;
-				Redux_Color_Scheme_Functions::$field_id = $this->field_id;
-
-				Redux_Color_Scheme_Functions::set_current_scheme_id( $saved_options['redux-scheme-select'] );
-
-				// Get the current field ID.
-				$raw_data = $saved_options[ $this->field_id ];
-
-				// Create a new array.
-				$save_data = array();
-
-				// Enum through saved data.
-				foreach ( $raw_data as $id => $val ) {
-
-					if ( 'color_scheme_name' !== $id ) {
-						if ( is_array( $val ) ) {
-
-							if ( ! isset( $val['data'] ) ) {
-								continue;
-							}
-
-							$data = json_decode( rawurldecode( $val['data'] ), true );
-
-							// Sanitize everything.
-							$color = $data['color'] ?? '';
-							$alpha = $data['alpha'] ?? 1;
-
-							$id    = $data['id'] ?? $id;
-							$title = $data['title'] ?? $id;
-
-							$grp = $data['group'] ?? '';
-
-							if ( '' === $color || 'transparent' === $color ) {
-								$rgba = $this->output_transparent ? 'transparent' : '';
-							} else {
-								$rgba = Redux_Helpers::hex2rgba( $color, $alpha );
-							}
-
-							// Create an array of saved data.
-							$save_data[] = array(
-								'id'    => $id,
-								'title' => $title,
-								'color' => $color,
-								'alpha' => $alpha,
-								'group' => $grp,
-								'rgba'  => $rgba,
-							);
-						} else {
-							$save_data[] = array(
-								'id'    => $id,
-								'value' => $val,
-								'type'  => 'select',
-							);
-						}
-					}
-				}
-
-				$new_scheme = array();
-
-				$new_scheme['color_scheme_name'] = Redux_Color_Scheme_Functions::get_current_scheme_id();
-
-				// Enum through values and assign them to a new array.
-				foreach ( $save_data as $val ) {
-					if ( isset( $val['id'] ) ) {
-						$new_scheme[ $val['id'] ] = $val;
-					}
-				}
-
-				// Filter for DB save
-				// Doesn't need to save select arrays to a database,
-				// just the id => value.
-				$database_data = $new_scheme;
-
-				foreach ( $database_data as $k => $v ) {
-					if ( isset( $v['type'] ) ) {
-						$val = $v['value'];
-
-						unset( $database_data[ $k ] );
-
-						$database_data[ $k ] = $val;
-					}
-				}
-
-				$saved_options[ $this->field_id ] = $database_data;
-
-				// Check if we should save this compared to the old data.
-				$save_scheme = false;
-
-				// Doesn't exist or is empty.
-				if ( ! isset( $old_options[ $this->field_id ] ) || ( isset( $old_options[ $this->field_id ] ) && ! empty( $old_options[ $this->field_id ] ) ) ) {
-					$save_scheme = true;
-				}
-
-				// Isn't empty and isn't the same as the new array.
-				if ( ! empty( $old_options[ $this->field_id ] ) && $saved_options[ $this->field_id ] !== $old_options[ $this->field_id ] ) {
-					$save_scheme = true;
-				}
-
-				if ( $save_scheme ) {
-					$scheme = Redux_Color_Scheme_Functions::get_current_scheme_id();
-					Redux_Color_Scheme_Functions::set_scheme_data( $scheme, $save_data );
-				}
-			}
-
-			return $saved_options;
-		}
-
-		/**
-		 * Reset data. Restores colour picker to default values
-		 *
-		 * @since       1.0.0
-		 * @access      private
-		 * @return      void
-		 */
-		private function reset_data() {
-			Redux_Color_Scheme_Functions::$parent   = $this->parent;
-			Redux_Color_Scheme_Functions::$field_id = $this->field_id;
-
-			// Get default data.
-			$data = $this->get_default_data();
-
-			// Add to (and/or create) JSON scheme file.
-			Redux_Color_Scheme_Functions::set_scheme_data( 'Default', $data );
-
-			// Set default scheme.
-			Redux_Color_Scheme_Functions::set_current_scheme_id( 'Default' );
-		}
-
-		/**
-		 * Reset All Hook. Todo list when all data is reset
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      public
-		 */
-		public function reset_all() {
-			if ( ! empty( $this->field_id ) && isset( $this->parent->options_defaults[ $this->field_id ] ) && ! empty( $this->parent->options_defaults[ $this->field_id ] ) ) {
-				Redux_Color_Scheme_Functions::$parent   = $this->parent;
-				Redux_Color_Scheme_Functions::$field_id = $this->field_id;
-
-				$this->reset_data();
-			}
-		}
-
-		/**
-		 * AJAX evaluator. Determine course of action based on AJAX callback
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function parse_ajax() {
-			if ( isset( $_REQUEST['nonce'] ) && isset( $_REQUEST['opt_name'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['nonce'] ) ), 'redux_' . sanitize_text_field( wp_unslash( $_REQUEST['opt_name'] ) ) . '_color_schemes' ) ) {
-				$parent = $this->parent;
-
-				// Do action.
-				if ( isset( $_REQUEST['type'] ) ) {
-
-					// Save scheme.
-					if ( 'save' === $_REQUEST['type'] ) {
-						$this->save_scheme( $parent );
-
-						// Delete scheme.
-					} elseif ( 'delete' === $_REQUEST['type'] ) {
-						$this->delete_scheme( $parent );
-
-						// Scheme change.
-					} elseif ( 'update' === $_REQUEST['type'] ) {
-						$this->get_scheme_html( $parent );
-
-						// Export scheme file.
-					} elseif ( 'export' === $_REQUEST['type'] ) {
-						$this->download_schemes();
-
-						// Import scheme file.
-					} elseif ( 'import' === $_REQUEST['type'] ) {
-						$this->import_schemes();
-					}
-				}
-			} else {
-				wp_die( esc_html__( 'Invalid Security Credentials.  Please reload the page and try again.', 'redux-framework' ) );
-			}
-		}
-
-		/**
-		 * Download Scheme File.
-		 *
-		 * @since       4.4.18
-		 * @access      private
-		 * @return      void
-		 */
-		private function import_schemes() {
-			if ( isset( $_REQUEST['content'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$content = wp_unslash( $_REQUEST['content'] ); // phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-				$content = is_array( $content ) ? array_map( 'stripslashes_deep', $content ) : stripslashes( $content );
-				$content = json_decode( $content, true );
-
-				if ( is_null( $content ) ) {
-					$result = array(
-						'result' => false,
-						'data'   => esc_html__( 'Import unsuccessful! Malformed JSON data detected.', 'redux-framework' ),
-					);
-
-					$result = wp_json_encode( $result );
-
-					echo $result; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-
-					die;
-				}
-
-				if ( isset( $content['Default']['color_scheme_name'] ) ) {
-					$content = wp_json_encode( $content );
-
-					$param_array = array(
-						'content'   => $content,
-						'overwrite' => true,
-						'chmod'     => FS_CHMOD_FILE,
-					);
-
-					$import_file = Redux_Color_Scheme_Functions::$upload_dir . Redux_Color_Scheme_Functions::$parent->args['opt_name'] . '_' . Redux_Color_Scheme_Functions::$field_id . '.json';
-
-					if ( true === Redux_Core::$filesystem->execute( 'put_contents', $import_file, $param_array ) ) {
-						$result = array(
-							'result' => true,
-							// translators: %s = HTML content.
-							'data'   => sprintf( esc_html__( 'Import successful! Click %s to refresh.', 'redux-framework' ), '<strong>' . esc_html__( 'OK', 'redux-framework' ) . '</strong>' ),
-						);
-					} else {
-						$result = array(
-							'result' => false,
-							'data'   => esc_html__( 'Import unsuccessful! File permission error: Could not write import data to server.', 'redux-framework' ),
-						);
-					}
-				} else {
-					$result = array(
-						'result' => false,
-						'data'   => esc_html__( 'Import unsuccessful! The selected file is not a valid color scheme file.', 'redux-framework' ),
-					);
-				}
-			} else {
-				$result = array(
-					'result' => false,
-					'data'   => esc_html__( 'Import unsuccessful! No data detected in the import file.', 'redux-framework' ),
-				);
-			}
-
-			$result = wp_json_encode( $result );
-
-			echo $result; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-
-			die;
-		}
-
-		/**
-		 * Download Scheme File.
-		 *
-		 * @since       1.0.0
-		 * @access      private
-		 * @return      void
-		 */
-		private function download_schemes() {
-			Redux_Color_Scheme_Functions::$parent   = $this->parent;
-			Redux_Color_Scheme_Functions::$field_id = $this->field_id;
-
-			// Read contents of scheme file.
-			$content = Redux_Color_Scheme_Functions::read_scheme_file();
-			$content = wp_json_encode( $content );
-
-			// Set header info.
-			header( 'Content-Description: File Transfer' );
-			header( 'Content-type: application/txt' );
-			header( 'Content-Disposition: attachment; filename="redux_schemes_' . $this->parent->args['opt_name'] . '_' . $this->field_id . '_' . gmdate( 'm-d-Y' ) . '.json"' );
-			header( 'Content-Transfer-Encoding: binary' );
-			header( 'Expires: 0' );
-			header( 'Cache-Control: must-revalidate' );
-			header( 'Pragma: public' );
-
-			// File download.
-			echo $content; // phpcs:ignore WordPress.Security.EscapeOutput
-
-			// 2B ~! 2B
-			die;
-		}
-
-		/**
-		 * Save Scheme. Saved an individual scheme to JSON scheme file.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework object.
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      private
-		 */
-		private function save_scheme( ReduxFramework $redux ) {
-			Redux_Color_Scheme_Functions::$parent   = $redux;
-			Redux_Color_Scheme_Functions::$field_id = $this->field_id;
-
-			// Get the scheme name.
-			if ( isset( $_REQUEST['scheme_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$scheme_name = sanitize_text_field( wp_unslash( $_REQUEST['scheme_name'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
-				// Check for duplicates.
-				$names = Redux_Color_Scheme_Functions::get_scheme_names();
-				foreach ( $names as $name ) {
-					$name     = strtolower( $name );
-					$tmp_name = strtolower( $scheme_name );
-
-					if ( $name === $tmp_name ) {
-						echo 'fail';
-						die();
-					}
-				}
-
-				// Get scheme data.
-				if ( isset( $_REQUEST['scheme_data'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-					$scheme_data = wp_unslash( $_REQUEST['scheme_data'] ); // phpcs:ignore WordPress.Security
-
-					// Get field ID.
-					if ( isset( $_REQUEST['field_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-						$scheme_data = rawurldecode( $scheme_data );
-						$scheme_data = json_decode( $scheme_data, true );
-
-						// Save scheme to file.  If successful...
-						if ( true === Redux_Color_Scheme_Functions::set_scheme_data( $scheme_name, $scheme_data ) ) {
-
-							// Update scheme selector.
-							echo Redux_Color_Scheme_Functions::get_scheme_select_html( $scheme_name ); // phpcs:ignore WordPress.Security.EscapeOutput
-						}
-					}
-				}
-			}
-
-			die(); // a horrible death!
-		}
-
-		/**
-		 * Delete Scheme. Delete individual scheme from JSON scheme file.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework object.
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      private
-		 */
-		private function delete_scheme( ReduxFramework $redux ) {
-
-			// Get deleted scheme ID.
-			if ( isset( $_REQUEST['scheme_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$scheme_id = sanitize_text_field( wp_unslash( $_REQUEST['scheme_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
-				// Get field ID.
-				if ( isset( $_REQUEST['field_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-					$field_id = sanitize_text_field( wp_unslash( $_REQUEST['field_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
-					// If scheme ID was passed (and why wouldn't it be?? Hmm??).
-					if ( $scheme_id ) {
-						Redux_Color_Scheme_Functions::$field_id = $field_id;
-						Redux_Color_Scheme_Functions::$parent   = $redux;
-
-						// Get the entire scheme file.
-						$schemes = Redux_Color_Scheme_Functions::read_scheme_file();
-
-						// If we got a good read...
-						if ( false !== $schemes ) {
-
-							// If scheme name exists...
-							if ( isset( $schemes[ $scheme_id ] ) ) {
-
-								// Unset it.
-								unset( $schemes[ $scheme_id ] );
-
-								// Save the scheme data, minus the deleted scheme.  Upon success...
-								if ( true === Redux_Color_Scheme_Functions::write_scheme_file( $schemes ) ) {
-
-									// Set default scheme.
-									Redux_Color_Scheme_Functions::set_current_scheme_id( 'Default' );
-
-									// Update field ID.
-									Redux_Color_Scheme_Functions::$field_id = $field_id;
-
-									// Meh TODO.
-									Redux_Color_Scheme_Functions::set_database_data();
-
-									echo 'success';
-								} else {
-									echo 'Failed to write JSON file to server.';
-								}
-							} else {
-								echo 'Scheme name does not exist in JSON string.  Aborting.';
-							}
-						} else {
-							echo 'Failed to read JSON scheme file, or file is empty.';
-						}
-					} else {
-						echo 'No scheme ID passed.  Aborting.';
-					}
-				}
-			}
-
-			die(); // rolled a two.
-		}
-
-		/**
-		 * Gets the new scheme based on selection.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework object.
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      private
-		 */
-		private function get_scheme_html( ReduxFramework $redux ) {
-			if ( isset( $_POST['scheme_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-
-				// Get the selected scheme name.
-				$scheme_id = sanitize_text_field( wp_unslash( $_POST['scheme_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
-				if ( isset( $_POST['field_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-
-					// Get the field ID.
-					$field_id = sanitize_text_field( wp_unslash( $_POST['field_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
-					// Get the field class.
-					$field_class = isset( $_POST['field_class'] ) ? sanitize_text_field( wp_unslash( $_POST['field_class'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification
-
-					Redux_Color_Scheme_Functions::$parent = $redux;
-
-					// Set the updated field ID.
-					Redux_Color_Scheme_Functions::$field_id = $field_id;
-
-					// Set the updated field class.
-					Redux_Color_Scheme_Functions::$field_class = $field_class;
-
-					// Get the color picket layout HTML.
-					$html = Redux_Color_Scheme_Functions::get_current_color_scheme_html( $scheme_id );
-
-					// Print!
-					echo $html; // phpcs:ignore WordPress.Security.EscapeOutput
-				}
-			}
-
-			die(); // another day.
-		}
-
-
-		/**
-		 * Retrieves an array of default data for color picker.
-		 *
-		 * @since       1.0.0
-		 * @access      private
-		 * @return      array Default values from config.
-		 */
-		private function get_default_data(): array {
-			$def_opts = $this->parent->options_defaults[ $this->field_id ];
-
-			if ( isset( $def_opts['color_scheme_name'] ) ) {
-				return array();
-			}
-
-			$sections = $this->parent->sections;
-			$data     = array();
-
-			foreach ( $sections as $arr ) {
-				if ( isset( $arr['fields'] ) ) {
-					foreach ( $arr['fields'] as $arr2 ) {
-						if ( $arr2['id'] === $this->field_id ) {
-
-							// Select fields.
-							if ( isset( $arr2['select'] ) ) {
-								foreach ( $arr2['select'] as $v ) {
-									$data[] = array(
-										'id'    => $v['id'],
-										'value' => $v['default'],
-										'type'  => 'select',
-									);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			foreach ( $def_opts as $v ) {
-				$title = $v['title'] ?? $v['id'];
-				$color = $v['color'] ?? '';
-				$alpha = $v['alpha'] ?? 1;
-				$grp   = $v['group'] ?? '';
-
-				if ( '' === $color || 'transparent' === $color ) {
-					$rgba = $this->output_transparent ? 'transparent' : '';
-				} else {
-					$rgba = Redux_Helpers::hex2rgba( $color, $alpha );
-				}
-
-				$data[] = array(
-					'id'    => $v['id'],
-					'title' => $title,
-					'color' => $color,
-					'alpha' => $alpha,
-					'group' => $grp,
-					'rgba'  => $rgba,
-				);
-			}
-
-			return $data;
-		}
-	}
-
-	class_alias( Redux_Extension_Color_Scheme::class, 'ReduxFramework_Extension_Color_Scheme' );
+        /**
+         * Reset section defaults.
+         *
+         * @param array $defaults Default values.
+         *
+         * @return array
+         */
+        public function reset_defaults_section( array $defaults = array() ): array {
+            if ( Redux_Helpers::is_field_in_use( $this->parent, 'color_scheme' ) ) {
+                // Get the current tab/section number.
+                if ( isset( $_COOKIE['redux_current_tab'] ) ) {
+                    $cur_tab = sanitize_text_field( wp_unslash( $_COOKIE['redux_current_tab'] ) );
+
+                    // Get the tab/section number field is used on.
+                    $tab_num = $this->parent->field_sections['color_scheme'][ $this->field_id ];
+
+                    // Match...
+                    if ( $cur_tab === $tab_num ) {
+
+                        // Reset data.
+                        $this->reset_all();
+                    }
+                    $defaults[ $this->field_id ] = Redux_Color_Scheme_Functions::data_array_from_scheme( 'Default' );
+                }
+            }
+
+            return $defaults;
+        }
+
+        /**
+         * Save Changes Hook. What to do when changes are saved
+         *
+         * @param array $saved_options Saved data.
+         * @param array $old_options   Previous data.
+         *
+         * @return      array
+         * @since       1.0.0
+         * @access      public
+         */
+        public function save_hook( array $saved_options = array(), array $old_options = array() ): array {
+            if ( ! isset( $saved_options[ $this->field_id ] ) || empty( $saved_options[ $this->field_id ] ) || ( is_array( $saved_options[ $this->field_id ] ) && $old_options === $saved_options ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
+                return $saved_options;
+            }
+
+            // We'll use the reset hook instead.
+            if ( ! empty( $saved_options['defaults'] ) || ! empty( $saved_options['defaults-section'] ) ) {
+                return $saved_options;
+            }
+
+            $first_value = reset( $saved_options[ $this->field_id ] ); // First Element's Value.
+
+            // Parse the JSON to an array.
+            if ( isset( $first_value['data'] ) ) {
+
+                Redux_Color_Scheme_Functions::$parent   = $this->parent;
+                Redux_Color_Scheme_Functions::$field_id = $this->field_id;
+
+                Redux_Color_Scheme_Functions::set_current_scheme_id( $saved_options['redux-scheme-select'] );
+
+                // Get the current field ID.
+                $raw_data = $saved_options[ $this->field_id ];
+
+                // Create a new array.
+                $save_data = array();
+
+                // Enum through saved data.
+                foreach ( $raw_data as $id => $val ) {
+
+                    if ( 'color_scheme_name' !== $id ) {
+                        if ( is_array( $val ) ) {
+
+                            if ( ! isset( $val['data'] ) ) {
+                                continue;
+                            }
+
+                            $data = json_decode( rawurldecode( $val['data'] ), true );
+
+                            // Sanitize everything.
+                            $color = $data['color'] ?? '';
+                            $alpha = $data['alpha'] ?? 1;
+
+                            $id    = $data['id'] ?? $id;
+                            $title = $data['title'] ?? $id;
+
+                            $grp = $data['group'] ?? '';
+
+                            if ( '' === $color || 'transparent' === $color ) {
+                                $rgba = $this->output_transparent ? 'transparent' : '';
+                            } else {
+                                $rgba = Redux_Helpers::hex2rgba( $color, $alpha );
+                            }
+
+                            // Create an array of saved data.
+                            $save_data[] = array(
+                                'id'    => $id,
+                                'title' => $title,
+                                'color' => $color,
+                                'alpha' => $alpha,
+                                'group' => $grp,
+                                'rgba'  => $rgba,
+                            );
+                        } else {
+                            $save_data[] = array(
+                                'id'    => $id,
+                                'value' => $val,
+                                'type'  => 'select',
+                            );
+                        }
+                    }
+                }
+
+                $new_scheme = array();
+
+                $new_scheme['color_scheme_name'] = Redux_Color_Scheme_Functions::get_current_scheme_id();
+
+                // Enum through values and assign them to a new array.
+                foreach ( $save_data as $val ) {
+                    if ( isset( $val['id'] ) ) {
+                        $new_scheme[ $val['id'] ] = $val;
+                    }
+                }
+
+                // Filter for DB save
+                // Doesn't need to save select arrays to a database,
+                // just the id => value.
+                $database_data = $new_scheme;
+
+                foreach ( $database_data as $k => $v ) {
+                    if ( isset( $v['type'] ) ) {
+                        $val = $v['value'];
+
+                        unset( $database_data[ $k ] );
+
+                        $database_data[ $k ] = $val;
+                    }
+                }
+
+                $saved_options[ $this->field_id ] = $database_data;
+
+                // Check if we should save this compared to the old data.
+                $save_scheme = false;
+
+                // Doesn't exist or is empty.
+                if ( ! isset( $old_options[ $this->field_id ] ) || ( isset( $old_options[ $this->field_id ] ) && ! empty( $old_options[ $this->field_id ] ) ) ) {
+                    $save_scheme = true;
+                }
+
+                // Isn't empty and isn't the same as the new array.
+                if ( ! empty( $old_options[ $this->field_id ] ) && $saved_options[ $this->field_id ] !== $old_options[ $this->field_id ] ) {
+                    $save_scheme = true;
+                }
+
+                if ( $save_scheme ) {
+                    $scheme = Redux_Color_Scheme_Functions::get_current_scheme_id();
+                    Redux_Color_Scheme_Functions::set_scheme_data( $scheme, $save_data );
+                }
+            }
+
+            return $saved_options;
+        }
+
+        /**
+         * Reset data. Restores colour picker to default values
+         *
+         * @since       1.0.0
+         * @access      private
+         * @return      void
+         */
+        private function reset_data() {
+            Redux_Color_Scheme_Functions::$parent   = $this->parent;
+            Redux_Color_Scheme_Functions::$field_id = $this->field_id;
+
+            // Get default data.
+            $data = $this->get_default_data();
+
+            // Add to (and/or create) JSON scheme file.
+            Redux_Color_Scheme_Functions::set_scheme_data( 'Default', $data );
+
+            // Set default scheme.
+            Redux_Color_Scheme_Functions::set_current_scheme_id( 'Default' );
+        }
+
+        /**
+         * Reset All Hook. Todo list when all data is reset
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      public
+         */
+        public function reset_all() {
+            if ( ! empty( $this->field_id ) && isset( $this->parent->options_defaults[ $this->field_id ] ) && ! empty( $this->parent->options_defaults[ $this->field_id ] ) ) {
+                Redux_Color_Scheme_Functions::$parent   = $this->parent;
+                Redux_Color_Scheme_Functions::$field_id = $this->field_id;
+
+                $this->reset_data();
+            }
+        }
+
+        /**
+         * AJAX evaluator. Determine course of action based on AJAX callback
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function parse_ajax() {
+            if ( isset( $_REQUEST['nonce'] ) && isset( $_REQUEST['opt_name'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['nonce'] ) ), 'redux_' . sanitize_text_field( wp_unslash( $_REQUEST['opt_name'] ) ) . '_color_schemes' ) ) {
+                $parent = $this->parent;
+
+                // Do action.
+                if ( isset( $_REQUEST['type'] ) ) {
+
+                    // Save scheme.
+                    if ( 'save' === $_REQUEST['type'] ) {
+                        $this->save_scheme( $parent );
+
+                        // Delete scheme.
+                    } elseif ( 'delete' === $_REQUEST['type'] ) {
+                        $this->delete_scheme( $parent );
+
+                        // Scheme change.
+                    } elseif ( 'update' === $_REQUEST['type'] ) {
+                        $this->get_scheme_html( $parent );
+
+                        // Export scheme file.
+                    } elseif ( 'export' === $_REQUEST['type'] ) {
+                        $this->download_schemes();
+
+                        // Import scheme file.
+                    } elseif ( 'import' === $_REQUEST['type'] ) {
+                        $this->import_schemes();
+                    }
+                }
+            } else {
+                wp_die( esc_html__( 'Invalid Security Credentials.  Please reload the page and try again.', 'redux-framework' ) );
+            }
+        }
+
+        /**
+         * Download Scheme File.
+         *
+         * @since       4.4.18
+         * @access      private
+         * @return      void
+         */
+        private function import_schemes() {
+            if ( isset( $_REQUEST['content'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $content = wp_unslash( $_REQUEST['content'] ); // phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+                $content = is_array( $content ) ? array_map( 'stripslashes_deep', $content ) : stripslashes( $content );
+                $content = json_decode( $content, true );
+
+                if ( is_null( $content ) ) {
+                    $result = array(
+                        'result' => false,
+                        'data'   => esc_html__( 'Import unsuccessful! Malformed JSON data detected.', 'redux-framework' ),
+                    );
+
+                    $result = wp_json_encode( $result );
+
+                    echo $result; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+                    die;
+                }
+
+                if ( isset( $content['Default']['color_scheme_name'] ) ) {
+                    $content = wp_json_encode( $content );
+
+                    $param_array = array(
+                        'content'   => $content,
+                        'overwrite' => true,
+                        'chmod'     => FS_CHMOD_FILE,
+                    );
+
+                    $import_file = Redux_Color_Scheme_Functions::$upload_dir . Redux_Color_Scheme_Functions::$parent->args['opt_name'] . '_' . Redux_Color_Scheme_Functions::$field_id . '.json';
+
+                    if ( true === Redux_Core::$filesystem->execute( 'put_contents', $import_file, $param_array ) ) {
+                        $result = array(
+                            'result' => true,
+                            // translators: %s = HTML content.
+                            'data'   => sprintf( esc_html__( 'Import successful! Click %s to refresh.', 'redux-framework' ), '<strong>' . esc_html__( 'OK', 'redux-framework' ) . '</strong>' ),
+                        );
+                    } else {
+                        $result = array(
+                            'result' => false,
+                            'data'   => esc_html__( 'Import unsuccessful! File permission error: Could not write import data to server.', 'redux-framework' ),
+                        );
+                    }
+                } else {
+                    $result = array(
+                        'result' => false,
+                        'data'   => esc_html__( 'Import unsuccessful! The selected file is not a valid color scheme file.', 'redux-framework' ),
+                    );
+                }
+            } else {
+                $result = array(
+                    'result' => false,
+                    'data'   => esc_html__( 'Import unsuccessful! No data detected in the import file.', 'redux-framework' ),
+                );
+            }
+
+            $result = wp_json_encode( $result );
+
+            echo $result; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+            die;
+        }
+
+        /**
+         * Download Scheme File.
+         *
+         * @since       1.0.0
+         * @access      private
+         * @return      void
+         */
+        private function download_schemes() {
+            Redux_Color_Scheme_Functions::$parent   = $this->parent;
+            Redux_Color_Scheme_Functions::$field_id = $this->field_id;
+
+            // Read contents of scheme file.
+            $content = Redux_Color_Scheme_Functions::read_scheme_file();
+            $content = wp_json_encode( $content );
+
+            // Set header info.
+            header( 'Content-Description: File Transfer' );
+            header( 'Content-type: application/txt' );
+            header( 'Content-Disposition: attachment; filename="redux_schemes_' . $this->parent->args['opt_name'] . '_' . $this->field_id . '_' . gmdate( 'm-d-Y' ) . '.json"' );
+            header( 'Content-Transfer-Encoding: binary' );
+            header( 'Expires: 0' );
+            header( 'Cache-Control: must-revalidate' );
+            header( 'Pragma: public' );
+
+            // File download.
+            echo $content; // phpcs:ignore WordPress.Security.EscapeOutput
+
+            // 2B ~! 2B
+            die;
+        }
+
+        /**
+         * Save Scheme. Saved an individual scheme to JSON scheme file.
+         *
+         * @param ReduxFramework $redux ReduxFramework object.
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      private
+         */
+        private function save_scheme( ReduxFramework $redux ) {
+            Redux_Color_Scheme_Functions::$parent   = $redux;
+            Redux_Color_Scheme_Functions::$field_id = $this->field_id;
+
+            // Get the scheme name.
+            if ( isset( $_REQUEST['scheme_name'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $scheme_name = sanitize_text_field( wp_unslash( $_REQUEST['scheme_name'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+                // Check for duplicates.
+                $names = Redux_Color_Scheme_Functions::get_scheme_names();
+                foreach ( $names as $name ) {
+                    $name     = strtolower( $name );
+                    $tmp_name = strtolower( $scheme_name );
+
+                    if ( $name === $tmp_name ) {
+                        echo 'fail';
+                        die();
+                    }
+                }
+
+                // Get scheme data.
+                if ( isset( $_REQUEST['scheme_data'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                    $scheme_data = wp_unslash( $_REQUEST['scheme_data'] ); // phpcs:ignore WordPress.Security
+
+                    // Get field ID.
+                    if ( isset( $_REQUEST['field_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                        $scheme_data = rawurldecode( $scheme_data );
+                        $scheme_data = json_decode( $scheme_data, true );
+
+                        // Save scheme to file.  If successful...
+                        if ( true === Redux_Color_Scheme_Functions::set_scheme_data( $scheme_name, $scheme_data ) ) {
+
+                            // Update scheme selector.
+                            echo Redux_Color_Scheme_Functions::get_scheme_select_html( $scheme_name ); // phpcs:ignore WordPress.Security.EscapeOutput
+                        }
+                    }
+                }
+            }
+
+            die(); // a horrible death!
+        }
+
+        /**
+         * Delete Scheme. Delete individual scheme from JSON scheme file.
+         *
+         * @param ReduxFramework $redux ReduxFramework object.
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      private
+         */
+        private function delete_scheme( ReduxFramework $redux ) {
+
+            // Get deleted scheme ID.
+            if ( isset( $_REQUEST['scheme_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $scheme_id = sanitize_text_field( wp_unslash( $_REQUEST['scheme_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+                // Get field ID.
+                if ( isset( $_REQUEST['field_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                    $field_id = sanitize_text_field( wp_unslash( $_REQUEST['field_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+                    // If scheme ID was passed (and why wouldn't it be?? Hmm??).
+                    if ( $scheme_id ) {
+                        Redux_Color_Scheme_Functions::$field_id = $field_id;
+                        Redux_Color_Scheme_Functions::$parent   = $redux;
+
+                        // Get the entire scheme file.
+                        $schemes = Redux_Color_Scheme_Functions::read_scheme_file();
+
+                        // If we got a good read...
+                        if ( false !== $schemes ) {
+
+                            // If scheme name exists...
+                            if ( isset( $schemes[ $scheme_id ] ) ) {
+
+                                // Unset it.
+                                unset( $schemes[ $scheme_id ] );
+
+                                // Save the scheme data, minus the deleted scheme.  Upon success...
+                                if ( true === Redux_Color_Scheme_Functions::write_scheme_file( $schemes ) ) {
+
+                                    // Set default scheme.
+                                    Redux_Color_Scheme_Functions::set_current_scheme_id( 'Default' );
+
+                                    // Update field ID.
+                                    Redux_Color_Scheme_Functions::$field_id = $field_id;
+
+                                    // Meh TODO.
+                                    Redux_Color_Scheme_Functions::set_database_data();
+
+                                    echo 'success';
+                                } else {
+                                    echo 'Failed to write JSON file to server.';
+                                }
+                            } else {
+                                echo 'Scheme name does not exist in JSON string.  Aborting.';
+                            }
+                        } else {
+                            echo 'Failed to read JSON scheme file, or file is empty.';
+                        }
+                    } else {
+                        echo 'No scheme ID passed.  Aborting.';
+                    }
+                }
+            }
+
+            die(); // rolled a two.
+        }
+
+        /**
+         * Gets the new scheme based on selection.
+         *
+         * @param ReduxFramework $redux ReduxFramework object.
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      private
+         */
+        private function get_scheme_html( ReduxFramework $redux ) {
+            if ( isset( $_POST['scheme_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+
+                // Get the selected scheme name.
+                $scheme_id = sanitize_text_field( wp_unslash( $_POST['scheme_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+                if ( isset( $_POST['field_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+
+                    // Get the field ID.
+                    $field_id = sanitize_text_field( wp_unslash( $_POST['field_id'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+                    // Get the field class.
+                    $field_class = isset( $_POST['field_class'] ) ? sanitize_text_field( wp_unslash( $_POST['field_class'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification
+
+                    Redux_Color_Scheme_Functions::$parent = $redux;
+
+                    // Set the updated field ID.
+                    Redux_Color_Scheme_Functions::$field_id = $field_id;
+
+                    // Set the updated field class.
+                    Redux_Color_Scheme_Functions::$field_class = $field_class;
+
+                    // Get the color picket layout HTML.
+                    $html = Redux_Color_Scheme_Functions::get_current_color_scheme_html( $scheme_id );
+
+                    // Print!
+                    echo $html; // phpcs:ignore WordPress.Security.EscapeOutput
+                }
+            }
+
+            die(); // another day.
+        }
+
+
+        /**
+         * Retrieves an array of default data for color picker.
+         *
+         * @since       1.0.0
+         * @access      private
+         * @return      array Default values from config.
+         */
+        private function get_default_data(): array {
+            $def_opts = $this->parent->options_defaults[ $this->field_id ];
+
+            if ( isset( $def_opts['color_scheme_name'] ) ) {
+                return array();
+            }
+
+            $sections = $this->parent->sections;
+            $data     = array();
+
+            foreach ( $sections as $arr ) {
+                if ( isset( $arr['fields'] ) ) {
+                    foreach ( $arr['fields'] as $arr2 ) {
+                        if ( $arr2['id'] === $this->field_id ) {
+
+                            // Select fields.
+                            if ( isset( $arr2['select'] ) ) {
+                                foreach ( $arr2['select'] as $v ) {
+                                    $data[] = array(
+                                        'id'    => $v['id'],
+                                        'value' => $v['default'],
+                                        'type'  => 'select',
+                                    );
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            foreach ( $def_opts as $v ) {
+                $title = $v['title'] ?? $v['id'];
+                $color = $v['color'] ?? '';
+                $alpha = $v['alpha'] ?? 1;
+                $grp   = $v['group'] ?? '';
+
+                if ( '' === $color || 'transparent' === $color ) {
+                    $rgba = $this->output_transparent ? 'transparent' : '';
+                } else {
+                    $rgba = Redux_Helpers::hex2rgba( $color, $alpha );
+                }
+
+                $data[] = array(
+                    'id'    => $v['id'],
+                    'title' => $title,
+                    'color' => $color,
+                    'alpha' => $alpha,
+                    'group' => $grp,
+                    'rgba'  => $rgba,
+                );
+            }
+
+            return $data;
+        }
+    }
+
+    class_alias( Redux_Extension_Color_Scheme::class, 'ReduxFramework_Extension_Color_Scheme' );
 }

redux-core/inc/extensions/taxonomy/class-redux-extension-taxonomy.php

Spacing +82 added lines, -82 removed lines

@@ -271,8 +271,8 @@ 
 					if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
 						$run_hooks = true;
 
-						$this->meta[ $this->tag_id ] = Redux_Taxonomy::get_term_meta( array( 'taxonomy' => $this->tag_id ) );
-						$this->parent->options       = array_merge( $this->parent->options, $this->meta[ $this->tag_id ] );
+						$this->meta[$this->tag_id] = Redux_Taxonomy::get_term_meta( array( 'taxonomy' => $this->tag_id ) );
+						$this->parent->options       = array_merge( $this->parent->options, $this->meta[$this->tag_id] );
 
 						foreach ( $term['sections'] as $sk => $section ) {
 							if ( ! empty( $section['fields'] ) ) {
@@ -280,7 +280,7 @@ 
 									if ( ! isset( $field['class'] ) ) {
 										$field['class'] = '';
 
-										$this->terms[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
+										$this->terms[$bk]['sections'][$sk]['fields'][$fk] = $field;
 									}
 
 									$this->parent->required_class->check_dependencies( $field );
@@ -291,37 +291,37 @@ 
 										}
 
 										if ( isset( $field['default'] ) ) {
-											$this->options_defaults[ $field['id'] ] = $field['default'];
+											$this->options_defaults[$field['id']] = $field['default'];
 										} else {
-											$this->options_defaults[ $field['id'] ] = $this->field_default( $field );
+											$this->options_defaults[$field['id']] = $this->field_default( $field );
 										}
 
 										foreach ( $term['taxonomy_types'] as $type ) {
-											$this->taxonomy_type_fields[ $type ][ $field['id'] ] = 1;
+											$this->taxonomy_type_fields[$type][$field['id']] = 1;
 										}
 
 										if ( ! empty( $field['output'] ) ) {
-											$this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
+											$this->output[$field['id']] = isset( $this->output[$field['id']] ) ? array_merge( $field['output'], $this->output[$field['id']] ) : $field['output'];
 										}
 
 										// Detect what field types are being used.
-										if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
-											$this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
+										if ( ! isset( $this->parent->fields[$field['type']][$field['id']] ) ) {
+											$this->parent->fields[$field['type']][$field['id']] = 1;
 										} else {
-											$this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
+											$this->parent->fields[$field['type']] = array( $field['id'] => 1 );
 										}
 
-										if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
-											$this->to_replace[ $field['id'] ] = $field;
+										if ( isset( $this->options_defaults[$field['id']] ) ) {
+											$this->to_replace[$field['id']] = $field;
 										}
 									}
 
-									if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
-										$this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
+									if ( ! isset( $this->parent->options[$field['id']] ) ) {
+										$this->parent->sections[( count( $this->parent->sections ) - 1 )]['fields'][] = $field;
 									}
 
-									if ( ! isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) ) {
-										$this->meta[ $this->tag_id ][ $field['id'] ] = $this->options_defaults[ $field['id'] ];
+									if ( ! isset( $this->meta[$this->tag_id][$field['id']] ) ) {
+										$this->meta[$this->tag_id][$field['id']] = $this->options_defaults[$field['id']];
 									}
 
 									// Only override if it exists, and it's not the default.
@@ -369,8 +369,8 @@ 
 		 * @return mixed
 		 */
 		public function replace_field( array $field ) {
-			if ( isset( $this->to_replace[ $field['id'] ] ) ) {
-				$field = $this->to_replace[ $field['id'] ];
+			if ( isset( $this->to_replace[$field['id']] ) ) {
+				$field = $this->to_replace[$field['id']];
 			}
 
 			return $field;
@@ -384,7 +384,7 @@ 
 		 * @return array
 		 */
 		public function override_can_output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
+			if ( isset( $this->output[$field['id']] ) ) {
 				$field['force_output'] = true;
 			}
 
@@ -399,8 +399,8 @@ 
 		 * @return array
 		 */
 		public function output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['output'] = $this->output[ $field['id'] ];
+			if ( isset( $this->output[$field['id']] ) ) {
+				$field['output'] = $this->output[$field['id']];
 			}
 
 			return $field;
@@ -421,13 +421,13 @@ 
 			$data = wp_parse_args( $meta, $this->options_defaults );
 
 			foreach ( $data as $key => $value ) {
-				if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
-					$data[ $key ] = $meta[ $key ];
+				if ( isset( $meta[$key] ) && '' !== $meta[$key] ) {
+					$data[$key] = $meta[$key];
 					continue;
 				}
 
-				if ( isset( $options[ $key ] ) ) {
-					$data[ $key ] = $options[ $key ];
+				if ( isset( $options[$key] ) ) {
+					$data[$key] = $options[$key];
 				}
 			}
 
@@ -460,7 +460,7 @@ 
 				if ( ! empty( $term['taxonomy_types'] ) ) {
 					if ( ! is_array( $term['taxonomy_types'] ) ) {
 						$term['taxonomy_types']                = array( $term['taxonomy_types'] );
-						$this->terms[ $key ]['taxonomy_types'] = $term['taxonomy_types'];
+						$this->terms[$key]['taxonomy_types'] = $term['taxonomy_types'];
 					}
 				}
 			}
@@ -532,7 +532,7 @@ 
 							} else {
 								$section['id'] = sanitize_title( $section['title'], $sk );
 							}
-							$this->terms[ $key ]['sections'][ $sk ] = $section;
+							$this->terms[$key]['sections'][$sk] = $section;
 						}
 						if ( isset( $section['fields'] ) ) {
 							foreach ( $section['fields'] as $k => $field ) {
@@ -541,14 +541,14 @@ 
 								}
 
 								if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
-									$this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
-									unset( $this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
+									$this->terms[$key]['sections'][$sk]['fields'][$k]['args'] = $field['options'];
+									unset( $this->terms[$key]['sections'][$sk]['fields'][$k]['options'] );
 								}
 
 								if ( 'section' === $field['type'] && isset( $field['indent'] ) && true === $field['indent'] ) {
 									$field['class']  = $field['class'] ?? '';
 									$field['class'] .= 'redux-section-indent-start';
-									$this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
+									$this->terms[$key]['sections'][$sk]['fields'][$k] = $field;
 								}
 
 								if ( ! isset( $this->parent->options_defaults_class ) ) {
@@ -570,8 +570,8 @@ 
 				}
 			}
 
-			if ( empty( $this->meta[ $this->tag_id ] ) ) {
-				$this->meta[ $this->tag_id ] = $this->get_meta( $this->tag_id );
+			if ( empty( $this->meta[$this->tag_id] ) ) {
+				$this->meta[$this->tag_id] = $this->get_meta( $this->tag_id );
 			}
 		}
 
@@ -662,8 +662,8 @@ 
 				$this->parent->options_class->get();
 			}
 
-			if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
-				return $this->parent->options[ $field_id['id'] ];
+			if ( isset( $this->parent->options[$field_id['id']] ) && isset( $this->parent->options_defaults[$field_id['id']] ) && $this->parent->options[$field_id['id']] !== $this->parent->options_defaults[$field_id['id']] ) {
+				return $this->parent->options[$field_id['id']];
 			} else {
 				if ( empty( $this->options_defaults ) ) {
 					$this->default_values(); // fill cache.
@@ -671,11 +671,11 @@ 
 
 				$data = '';
 				if ( ! empty( $this->options_defaults ) ) {
-					$data = $this->options_defaults[ $field_id['id'] ] ?? '';
+					$data = $this->options_defaults[$field_id['id']] ?? '';
 				}
 
-				if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
-					$data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
+				if ( empty( $data ) && isset( $this->parent->options_defaults[$field_id['id']] ) ) {
+					$data = $this->parent->options_defaults[$field_id['id']] ?? '';
 				}
 
 				return $data;
@@ -690,8 +690,8 @@ 
 		 * @return array
 		 */
 		private function get_meta( string $id ): array {
-			if ( ! isset( $this->meta[ $id ] ) ) {
-				$this->meta[ $id ] = array();
+			if ( ! isset( $this->meta[$id] ) ) {
+				$this->meta[$id] = array();
 				$o_data            = get_post_meta( $id );
 
 				// phpcs:ignore WordPress.NamingConventions.ValidHookName
@@ -700,30 +700,30 @@ 
 				if ( ! empty( $o_data ) ) {
 					foreach ( $o_data as $key => $value ) {
 						if ( count( $value ) === 1 ) {
-							$this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
+							$this->meta[$id][$key] = maybe_unserialize( $value[0] );
 						} else {
 							$new_value = array_map( 'maybe_unserialize', $value );
 
-							$this->meta[ $id ][ $key ] = $new_value[0];
+							$this->meta[$id][$key] = $new_value[0];
 						}
 					}
 				}
 
-				if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
-					$data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+				if ( isset( $this->meta[$id][$this->parent->args['opt_name']] ) ) {
+					$data = maybe_unserialize( $this->meta[$id][$this->parent->args['opt_name']] );
 
 					foreach ( $data as $key => $value ) {
-						$this->meta[ $id ][ $key ] = $value;
+						$this->meta[$id][$key] = $value;
 						update_post_meta( $id, $key, $value );
 					}
 
-					unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+					unset( $this->meta[$id][$this->parent->args['opt_name']] );
 
 					delete_post_meta( $id, $this->parent->args['opt_name'] );
 				}
 			}
 
-			return $this->meta[ $id ];
+			return $this->meta[$id];
 		}
 
 		/**
@@ -739,29 +739,29 @@ 
 
 			// Override these values if they differ from the admin panel defaults.
 			if ( isset( $the_post->taxonomy_type ) && in_array( $the_post->taxonomy_type, $this->taxonomy_types, true ) ) {
-				if ( isset( $this->taxonomy_type_values[ $the_post->taxonomy_type ] ) ) {
-					$meta = $this->taxonomy_type_fields[ $the_post->taxonomy_type ];
+				if ( isset( $this->taxonomy_type_values[$the_post->taxonomy_type] ) ) {
+					$meta = $this->taxonomy_type_fields[$the_post->taxonomy_type];
 				} else {
 					$defaults = array();
-					if ( ! empty( $this->taxonomy_type_fields[ $the_post->taxonomy_type ] ) ) {
-						foreach ( $this->taxonomy_type_fields[ $the_post->taxonomy_type ] as $key => $null ) {
-							if ( isset( $this->options_defaults[ $key ] ) ) {
-								$defaults[ $key ] = $this->options_defaults[ $key ];
+					if ( ! empty( $this->taxonomy_type_fields[$the_post->taxonomy_type] ) ) {
+						foreach ( $this->taxonomy_type_fields[$the_post->taxonomy_type] as $key => $null ) {
+							if ( isset( $this->options_defaults[$key] ) ) {
+								$defaults[$key] = $this->options_defaults[$key];
 							}
 						}
 					}
 
 					$meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
 
-					$this->taxonomy_type_fields[ $the_post->taxonomy_type ] = $meta;
+					$this->taxonomy_type_fields[$the_post->taxonomy_type] = $meta;
 				}
 
 				if ( ! empty( $meta_key ) ) {
-					if ( ! isset( $meta[ $meta_key ] ) ) {
-						$meta[ $meta_key ] = $def_val;
+					if ( ! isset( $meta[$meta_key] ) ) {
+						$meta[$meta_key] = $def_val;
 					}
 
-					return $meta[ $meta_key ];
+					return $meta[$meta_key];
 				} else {
 					return $meta;
 				}
@@ -960,11 +960,11 @@ 
 									$field['class'] .= 'redux-section-indent-start';
 								}
 
-								if ( ! isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) ) {
-									$this->meta[ $this->tag_id ][ $field['id'] ] = '';
+								if ( ! isset( $this->meta[$this->tag_id][$field['id']] ) ) {
+									$this->meta[$this->tag_id][$field['id']] = '';
 								}
 
-								$this->parent->render_class->field_input( $field, $this->meta[ $this->tag_id ][ $field['id'] ], true );
+								$this->parent->render_class->field_input( $field, $this->meta[$this->tag_id][$field['id']], true );
 								echo '</td></tr>';
 							}
 							echo '</tbody></table>';
@@ -992,7 +992,7 @@ 
 		public function meta_terms_save( $tag_id ): bool {
 
 			// Check if our nonce is set.
-			if ( ! isset( $_POST['redux_taxonomy_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
+			if ( ! isset( $_POST['redux_taxonomy_meta_nonce'] ) || ! isset( $_POST[$this->parent->args['opt_name']] ) ) {
 				return false;
 			}
 
@@ -1009,16 +1009,16 @@ 
 			$to_delete  = array();
 			$dont_save  = true;
 
-			$field_args = Redux_Taxonomy::$fields[ $this->parent->args['opt_name'] ];
+			$field_args = Redux_Taxonomy::$fields[$this->parent->args['opt_name']];
 
-			foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+			foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[$this->parent->args['opt_name']] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
 
 				// Do not save anything the user doesn't have permissions for.
-				if ( ! empty( $field_args[ $key ]['permissions'] ) ) {
-					foreach ( (array) $field_args[ $key ]['permissions'] as $pv ) {
+				if ( ! empty( $field_args[$key]['permissions'] ) ) {
+					foreach ( ( array ) $field_args[$key]['permissions'] as $pv ) {
 
 						// Do not save anything the user doesn't have permissions for.
-						if ( isset( $field_args[ $key ] ) ) {
+						if ( isset( $field_args[$key] ) ) {
 							if ( user_can( get_current_user_id(), $pv ) ) {
 								break;
 							}
@@ -1030,7 +1030,7 @@ 
 				if ( is_array( $value ) ) {
 					foreach ( $value as $k => $v ) {
 						if ( ! is_array( $v ) ) {
-							$value[ $k ] = stripslashes( $v );
+							$value[$k] = stripslashes( $v );
 						}
 					}
 				}
@@ -1038,19 +1038,19 @@ 
 				$save = true;
 
 				// parent_options.
-				if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
+				if ( ! $dont_save && isset( $this->options_defaults[$key] ) && $value === $this->options_defaults[$key] ) {
 					$save = false;
 				}
 
-				if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
+				if ( $save && isset( $this->parent_options[$key] ) && $this->parent_options[$key] !== $value ) {
 					$save = false;
 				}
 
 				if ( $save ) {
-					$to_save[ $key ]    = $value;
-					$to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
+					$to_save[$key]    = $value;
+					$to_compare[$key] = $this->parent->options[$key] ?? '';
 				} else {
-					$to_delete[ $key ] = $value;
+					$to_delete[$key] = $value;
 				}
 			}
 
@@ -1061,11 +1061,11 @@ 
 
 			// Validate fields (if needed).
 			foreach ( $to_save as $key => $value ) {
-				if ( isset( $validate[ $key ] ) && $validate[ $key ] !== $value ) {
-					if ( isset( $meta[ $key ] ) && $validate[ $key ] === $meta[ $key ] ) {
-						unset( $to_save[ $key ] );
+				if ( isset( $validate[$key] ) && $validate[$key] !== $value ) {
+					if ( isset( $meta[$key] ) && $validate[$key] === $meta[$key] ) {
+						unset( $to_save[$key] );
 					} else {
-						$to_save[ $key ] = $validate[ $key ];
+						$to_save[$key] = $validate[$key];
 					}
 				}
 			}
@@ -1091,27 +1091,27 @@ 
 
 			$post_tax = isset( $_POST['taxonomy'] ) ? sanitize_text_field( wp_unslash( $_POST['taxonomy'] ) ) : '';
 
-			$check = $this->taxonomy_type_fields[ $post_tax ] ?? array();
+			$check = $this->taxonomy_type_fields[$post_tax] ?? array();
 
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName
 			$to_save = apply_filters( 'redux/taxonomy/save', $to_save, $to_compare, $this->sections );
 
 			foreach ( $to_save as $key => $value ) {
-				$prev_value = $this->meta[ $tag_id ][ $key ] ?? '';
+				$prev_value = $this->meta[$tag_id][$key] ?? '';
 
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
+				if ( isset( $check[$key] ) ) {
+					unset( $check[$key] );
 				}
 
 				update_term_meta( $tag_id, $key, $value, $prev_value );
 			}
 
 			foreach ( $to_delete as $key => $value ) {
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
+				if ( isset( $check[$key] ) ) {
+					unset( $check[$key] );
 				}
 
-				$prev_value = $this->meta[ $tag_id ][ $key ] ?? '';
+				$prev_value = $this->meta[$tag_id][$key] ?? '';
 				delete_term_meta( $tag_id, $key, $prev_value );
 			}
 

Indentation +1101 added lines, -1101 removed lines

@@ -14,834 +14,834 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Taxonomy' ) ) {
 
-	/**
-	 * Main ReduxFramework customizer extension class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Extension_Taxonomy extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.4.19';
-
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Taxonomy';
-
-		/**
-		 * Terms array.
-		 *
-		 * @var array
-		 */
-		public array $terms = array();
-
-		/**
-		 * Taxonomy types array.
-		 *
-		 * @var array
-		 */
-		public array $taxonomy_types = array();
-
-		/**
-		 * Taxonomy type.
-		 *
-		 * @var string
-		 */
-		public string $taxonomy_type = '';
-
-		/**
-		 * Sections array.
-		 *
-		 * @var array
-		 */
-		public array $sections = array();
-
-		/**
-		 * Original args array.
-		 *
-		 * @var array
-		 */
-		public array $orig_args = array();
-
-		/**
-		 * Output array.
-		 *
-		 * @var array
-		 */
-		public array $output = array();
-
-		/**
-		 * Parent options.
-		 *
-		 * @var array
-		 */
-		public array $parent_options = array();
-
-		/**
-		 * Parent defaults.
-		 *
-		 * @var array
-		 */
-		public array $parent_defaults = array();
-
-		/**
-		 * Taxonomy field types array.
-		 *
-		 * @var array
-		 */
-		public array $taxonomy_type_fields = array();
-
-		/**
-		 * Option defaults.
-		 *
-		 * @var array
-		 */
-		public array $options_defaults = array();
-
-		/**
-		 * To replace array.
-		 *
-		 * @var array
-		 */
-		public array $to_replace = array();
-
-		/**
-		 * Meta array.
-		 *
-		 * @var array
-		 */
-		public array $meta = array();
-
-		/**
-		 * Tag ID.
-		 *
-		 * @var int
-		 */
-		public int $tag_id = 0;
-
-		/**
-		 * Accepted WordPress screens.
-		 *
-		 * @var array
-		 */
-		private array $pagenows;
-
-		/**
-		 * Notices array.
-		 *
-		 * @var array
-		 */
-		public array $notices;
-
-		/**
-		 * Redux_Extension_Taxonomy constructor.
-		 *
-		 * @param object $redux ReduxFramework object.
-		 */
-		public function __construct( $redux ) {
-			global $pagenow;
-
-			parent::__construct( $redux, __FILE__ );
-
-			$this->parent = $redux;
-
-			$this->add_field( 'taxonomy' );
-			$this->parent->extensions['taxonomy'] = $this;
-
-			$this->pagenows = array( 'edit-tags.php', 'term.php' );
-
-			include_once __DIR__ . '/redux-taxonomy-helpers.php';
-
-			add_action( 'admin_notices', array( $this, 'meta_terms_show_errors' ), 0 );
-			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 20 );
-
-			if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) {
-				$this->init();
-
-				// phpcs:ignore WordPress.Security.NonceVerification
-				if ( isset( $_POST['taxonomy'] ) ) {
-
-					// phpcs:ignore WordPress.Security.NonceVerification
-					add_action( 'edit_' . sanitize_text_field( wp_unslash( $_POST['taxonomy'] ) ), array( $this, 'meta_terms_save' ), 10, 3 );
-				}
-			}
-		}
-
-		/**
-		 * Add term classes.
-		 *
-		 * @param array $classes Classes.
-		 *
-		 * @return array
-		 */
-		public function add_term_classes( array $classes ): array {
-			$classes[] = 'redux-taxonomy';
-			$classes[] = 'redux-' . $this->parent->args['opt_name'];
-
-			if ( '' !== $this->parent->args['class'] ) {
-				$classes[] = $this->parent->args['class'];
-			}
-
-			return $classes;
-		}
-
-		/**
-		 * Add term hide class.
-		 *
-		 * @param array $classes Classes.
-		 *
-		 * @return array
-		 */
-		public function add_term_hide_class( array $classes ): array {
-			$classes[] = 'hide';
-
-			return $classes;
-		}
-
-		/**
-		 * Init.
-		 */
-		public function init() {
-			global $pagenow;
-
-			if ( isset( $_POST['action'] ) && 'redux_demo_customizer_save' === $_POST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification
-				return;
-			}
-
-			$this->parent->transients['run_compiler'] = false;
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$this->terms = apply_filters( 'redux/taxonomy/' . $this->parent->args['opt_name'] . '/terms', $this->terms, $this->parent->args['opt_name'] );
-
-			if ( empty( $this->terms ) && class_exists( 'Redux_Taxonomy' ) ) {
-				$this->terms = Redux_Taxonomy::construct_terms( $this->parent->args['opt_name'] );
-			}
-
-			if ( empty( $this->terms ) || ! is_array( $this->terms ) ) {
-				return;
-			}
-
-			// phpcs:disable WordPress.Security.NonceVerification
-			if ( ! isset( $_GET['tag_ID'] ) ) {
-				$_GET['tag_ID'] = 0;
-			}
-			$this->tag_id        = isset( $_GET['tag_ID'] ) ? sanitize_text_field( wp_unslash( $_GET['tag_ID'] ) ) : 0;
-			$this->taxonomy_type = isset( $_GET['taxonomy'] ) ? sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) : '';
-			// phpcs:enable WordPress.Security.NonceVerification
-
-			foreach ( $this->terms as $bk => $term ) {
-
-				// If the tag_ids for this term are set, we're limiting to the current tag id.
-				if ( ! empty( $term['tag_ids'] ) ) {
-					if ( ! is_array( $term['tag_ids'] ) ) {
-						$term['tag_ids'] = array( $term['tag_ids'] );
-					}
-					if ( ! in_array( $this->tag_id, $term['tag_ids'], true ) ) {
-						continue;
-					}
-				}
-
-				if ( ! isset( $term['taxonomy_types'] ) ) {
-					return;
-				}
-
-				if ( ! empty( $term['sections'] ) ) {
-					$this->sections         = $term['sections'];
-					$this->parent->sections = array_merge( $this->parent->sections, $term['sections'] );
-
-					$this->taxonomy_types = wp_parse_args( $this->taxonomy_types, $term['taxonomy_types'] );
-
-					// Checking to override the parent variables.
-					$add_field = false;
-
-					foreach ( $term['taxonomy_types'] as $type ) {
-						if ( $this->taxonomy_type === $type ) {
-							$add_field = true;
-						}
-					}
-
-					// Replacing all the fields.
-					if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
-						$run_hooks = true;
-
-						$this->meta[ $this->tag_id ] = Redux_Taxonomy::get_term_meta( array( 'taxonomy' => $this->tag_id ) );
-						$this->parent->options       = array_merge( $this->parent->options, $this->meta[ $this->tag_id ] );
-
-						foreach ( $term['sections'] as $sk => $section ) {
-							if ( ! empty( $section['fields'] ) ) {
-								foreach ( $section['fields'] as $fk => $field ) {
-									if ( ! isset( $field['class'] ) ) {
-										$field['class'] = '';
-
-										$this->terms[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
-									}
-
-									$this->parent->required_class->check_dependencies( $field );
-
-									if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
-										if ( empty( $field['id'] ) ) {
-											continue;
-										}
-
-										if ( isset( $field['default'] ) ) {
-											$this->options_defaults[ $field['id'] ] = $field['default'];
-										} else {
-											$this->options_defaults[ $field['id'] ] = $this->field_default( $field );
-										}
-
-										foreach ( $term['taxonomy_types'] as $type ) {
-											$this->taxonomy_type_fields[ $type ][ $field['id'] ] = 1;
-										}
-
-										if ( ! empty( $field['output'] ) ) {
-											$this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
-										}
-
-										// Detect what field types are being used.
-										if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
-											$this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
-										} else {
-											$this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
-										}
-
-										if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
-											$this->to_replace[ $field['id'] ] = $field;
-										}
-									}
-
-									if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
-										$this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
-									}
-
-									if ( ! isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) ) {
-										$this->meta[ $this->tag_id ][ $field['id'] ] = $this->options_defaults[ $field['id'] ];
-									}
-
-									// Only override if it exists, and it's not the default.
-									// phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-									/** If ( isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) && isset( $field['default'] ) && $this->meta[ $this->tag_id ][ $field['id'] ] === $field['default'] ) {
-									 *   // unset($this->meta[$this->tag_id][$field['id']]); .
-									 * }
-									 */
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if ( isset( $run_hooks ) && true === $run_hooks ) {
-				$this->parent_options = array();
-
-				if ( ! empty( $this->to_replace ) ) {
-					foreach ( $this->to_replace as $id => $field ) {
-						add_filter( "redux/options/{$this->parent->args['opt_name']}/field/$id/register", array( $this, 'replace_field' ) );
-					}
-				}
-
-				add_filter( "redux/options/{$this->parent->args['opt_name']}/options", array( $this, 'override_options' ) );
-				add_filter( "redux/field/{$this->parent->args['opt_name']}/_can_output_css", array( $this, 'override_can_output_css' ) );
-				add_filter( "redux/field/{$this->parent->args['opt_name']}/output_css", array( $this, 'output_css' ) );
-
-				// phpcs:disable WordPress.Security.NonceVerification
-				if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) && isset( $_GET['taxonomy'] ) ) {
-					$priority = $this->parent->args['taxonomy_priority'] ?? 3;
-
-					add_action( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) . '_edit_form', array( $this, 'add_meta_terms' ), $priority );
-					add_action( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) . '_add_form_fields', array( $this, 'add_meta_terms' ), $priority );
-				}
-				// phpcs:enable WordPress.Security.NonceVerification
-			}
-		}
-
-		/**
-		 * Replace field.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return mixed
-		 */
-		public function replace_field( array $field ) {
-			if ( isset( $this->to_replace[ $field['id'] ] ) ) {
-				$field = $this->to_replace[ $field['id'] ];
-			}
-
-			return $field;
-		}
-
-		/**
-		 * CSS can output override.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return array
-		 */
-		public function override_can_output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['force_output'] = true;
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Output CSS>
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return array
-		 */
-		public function output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['output'] = $this->output[ $field['id'] ];
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Make sure the defaults are the defaults
-		 *
-		 * @param array $options Options array.
-		 *
-		 * @return array
-		 */
-		public function override_options( array $options ): array {
-			$this->parent->options_class->default_values();
-			$this->parent_defaults = $this->parent->options_defaults;
-
-			$meta = $this->get_meta( $this->tag_id );
-			$data = wp_parse_args( $meta, $this->options_defaults );
-
-			foreach ( $data as $key => $value ) {
-				if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
-					$data[ $key ] = $meta[ $key ];
-					continue;
-				}
-
-				if ( isset( $options[ $key ] ) ) {
-					$data[ $key ] = $options[ $key ];
-				}
-			}
-
-			$this->parent->options_defaults = wp_parse_args( $this->options_defaults, $this->parent->options_defaults );
-
-			return wp_parse_args( $data, $options );
-		}
-
-		/**
-		 * Enqueue support files and fields.
-		 */
-		public function enqueue() {
-			global $pagenow;
-
-			$types    = array();
-			$sections = array();
-
-			// Enqueue css.
-			foreach ( $this->terms as $key => $term ) {
-				if ( empty( $term['sections'] ) ) {
-					continue;
-				}
-
-				// phpcs:ignore WordPress.Security.NonceVerification
-				if ( isset( $_GET['taxonomy'] ) && isset( $term['taxonomy_types'] ) && in_array( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ), $term['taxonomy_types'], true ) ) {
-					$sections[] = $term['sections'];
-				}
-
-				$types = isset( $term['taxonomy_types'] ) ? array_merge( $term['taxonomy_types'], $types ) : $types;
-				if ( ! empty( $term['taxonomy_types'] ) ) {
-					if ( ! is_array( $term['taxonomy_types'] ) ) {
-						$term['taxonomy_types']                = array( $term['taxonomy_types'] );
-						$this->terms[ $key ]['taxonomy_types'] = $term['taxonomy_types'];
-					}
-				}
-			}
-
-			// phpcs:ignore WordPress.Security.NonceVerification
-			if ( in_array( $pagenow, $this->pagenows, true ) && isset( $_GET['taxonomy'] ) ) {
-				if ( in_array( wp_unslash( $_GET['taxonomy'] ), $types, true ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-					$this->parent->transients       = get_transient( $this->parent->args['opt_name'] . '-transients-taxonomy' );
-					$this->parent->transients_check = $this->parent->transients;
-
-					if ( isset( $this->parent->transients['notices'] ) ) {
-						$this->notices                              = $this->parent->transients['notices'];
-						$this->parent->transients['last_save_mode'] = 'taxonomy';
-					}
-
-					delete_transient( $this->parent->args['opt_name'] . '-transients-taxonomy' );
-					$this->parent->enqueue_class->init();
-
-					$this->parent->sections = $sections;
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/taxonomy/{$this->parent->args['opt_name']}/enqueue" );
-
-					/**
-					 * Redux taxonomy CSS
-					 * filter 'redux/page/{opt_name}/enqueue/redux-extension-taxonomy-css'
-					 */
-					if ( true === $this->parent->args['dev_mode'] ) {
-						wp_enqueue_style(
-							'redux-extension-taxonomy',
-							// phpcs:ignore WordPress.NamingConventions.ValidHookName
-							apply_filters( "redux/taxonomy/{$this->parent->args['opt_name']}/enqueue/redux-extension-taxonomy-css", $this->extension_url . 'redux-extension-taxonomy.css' ),
-							array( 'redux-admin-css' ),
-							self::$version
-						);
-					}
-
-					/**
-					 * Redux taxonomy JS
-					 * filter 'redux/page/{opt_name}/enqueue/redux-extension-taxonomy-js
-					 */
-					wp_enqueue_script(
-						'redux-extension-taxonomy',
-						// phpcs:ignore WordPress.NamingConventions.ValidHookName
-						apply_filters( "redux/taxonomy/{$this->parent->args['opt_name']}/enqueue/redux-extension-taxonomy-js", $this->extension_url . 'redux-extension-taxonomy' . Redux_Functions::is_min() . '.js' ),
-						array( 'jquery', 'redux-js' ),
-						self::$version,
-						true
-					);
-				}
-			}
-		}
-
-		/**
-		 * DEPRECATED
-		 */
-		public function default_values() {
-			if ( ! empty( $this->terms ) && empty( $this->options_defaults ) ) {
-				foreach ( $this->terms as $key => $term ) {
-					if ( empty( $term['sections'] ) ) {
-						continue;
-					}
-
-					// fill the cache.
-					foreach ( $term['sections'] as $sk => $section ) {
-						if ( ! isset( $section['id'] ) ) {
-							if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
-								$section['id'] = $sk;
-							} else {
-								$section['id'] = sanitize_title( $section['title'], $sk );
-							}
-							$this->terms[ $key ]['sections'][ $sk ] = $section;
-						}
-						if ( isset( $section['fields'] ) ) {
-							foreach ( $section['fields'] as $k => $field ) {
-								if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
-									continue;
-								}
-
-								if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
-									$this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
-									unset( $this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
-								}
-
-								if ( 'section' === $field['type'] && isset( $field['indent'] ) && true === $field['indent'] ) {
-									$field['class']  = $field['class'] ?? '';
-									$field['class'] .= 'redux-section-indent-start';
-									$this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
-								}
-
-								if ( ! isset( $this->parent->options_defaults_class ) ) {
-									$this->parent->options_defaults_class = new Redux_Options_Defaults();
-								}
-
-								$this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $field );
-
-								if ( 'repeater' === $field['type'] ) {
-									foreach ( $field['fields'] as $f ) {
-										$this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $f, null, true );
-									}
-								}
-
-								$this->parent->options_defaults = $this->parent->options_defaults_class->options_defaults;
-							}
-						}
-					}
-				}
-			}
-
-			if ( empty( $this->meta[ $this->tag_id ] ) ) {
-				$this->meta[ $this->tag_id ] = $this->get_meta( $this->tag_id );
-			}
-		}
-
-		/**
-		 * Add Meta Terms.
-		 */
-		public function add_meta_terms() {
-			if ( empty( $this->terms ) || ! is_array( $this->terms ) ) {
-				return;
-			}
-
-			foreach ( $this->terms as $key => $term ) {
-				if ( empty( $term['sections'] ) ) {
-					continue;
-				}
-
-				$defaults = array(
-					'id'         => "$key",
-					'section_id' => $key,
-					'terms'      => array(),
-				);
-
-				$term = wp_parse_args( $term, $defaults );
-				if ( ! empty( $term['taxonomy_types'] ) && isset( $_GET['taxonomy'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-					foreach ( $term['taxonomy_types'] as $termtype ) {
-						if ( $_GET['taxonomy'] !== $termtype ) { // phpcs:ignore WordPress.Security.NonceVerification
-							continue;
-						}
-
-						// Override the parent args on a metaterm level.
-						if ( empty( $this->orig_args ) ) {
-							$this->orig_args = $this->parent->args;
-						}
-
-						if ( isset( $term['args'] ) ) {
-							$this->parent->args = wp_parse_args( $term['args'], $this->orig_args );
-						} elseif ( $this->parent->args !== $this->orig_args ) {
-							$this->parent->args = $this->orig_args;
-						}
-
-						if ( ! isset( $term['class'] ) ) {
-							$term['class'] = array();
-						}
-
-						if ( ! empty( $term['class'] ) ) {
-							if ( ! is_array( $term['class'] ) ) {
-								$term['class'] = array( $term['class'] );
-							}
-						}
-
-						$term['class'] = $this->add_term_classes( $term['class'] );
-
-						if ( isset( $term['post_format'] ) ) {
-							$term['class'] = $this->add_term_hide_class( $term['class'] );
-						}
-
-						global $pagenow;
-						if ( strpos( $pagenow, 'edit-' ) !== false ) {
-
-							$term['style']   = 'wp';
-							$term['class'][] = ' edit-page';
-							$term['class'][] = ' redux-wp-style';
-						}
-
-						$this->generate_terms( array( 'args' => $term ) );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Field Default.
-		 *
-		 * @param array $field_id ID.
-		 *
-		 * @return mixed|string
-		 */
-		private function field_default( array $field_id ) {
-			if ( ! isset( $this->parent->options_defaults ) ) {
-				$this->parent->options_defaults = $this->parent->default_values();
-			}
-
-			if ( ! isset( $this->parent->options ) || empty( $this->parent->options ) ) {
-				if ( ! isset( $this->parent->options_class ) ) {
-					$this->parent->options_class = new Redux_Options_Constructor( $this->parent );
-				}
-
-				$this->parent->options_class->get();
-			}
-
-			if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
-				return $this->parent->options[ $field_id['id'] ];
-			} else {
-				if ( empty( $this->options_defaults ) ) {
-					$this->default_values(); // fill cache.
-				}
-
-				$data = '';
-				if ( ! empty( $this->options_defaults ) ) {
-					$data = $this->options_defaults[ $field_id['id'] ] ?? '';
-				}
-
-				if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
-					$data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
-				}
-
-				return $data;
-			}
-		}
-
-		/**
-		 * Function to get and cache the post-meta.
-		 *
-		 * @param string $id ID.
-		 *
-		 * @return array
-		 */
-		private function get_meta( string $id ): array {
-			if ( ! isset( $this->meta[ $id ] ) ) {
-				$this->meta[ $id ] = array();
-				$o_data            = get_post_meta( $id );
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$o_data = apply_filters( "redux/taxonomy/{$this->parent->args['opt_name']}/get_meta", $o_data );
-
-				if ( ! empty( $o_data ) ) {
-					foreach ( $o_data as $key => $value ) {
-						if ( count( $value ) === 1 ) {
-							$this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
-						} else {
-							$new_value = array_map( 'maybe_unserialize', $value );
-
-							$this->meta[ $id ][ $key ] = $new_value[0];
-						}
-					}
-				}
-
-				if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
-					$data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
-
-					foreach ( $data as $key => $value ) {
-						$this->meta[ $id ][ $key ] = $value;
-						update_post_meta( $id, $key, $value );
-					}
-
-					unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
-
-					delete_post_meta( $id, $this->parent->args['opt_name'] );
-				}
-			}
-
-			return $this->meta[ $id ];
-		}
-
-		/**
-		 * Get values.
-		 *
-		 * @param mixed  $the_post WP_Post.
-		 * @param string $meta_key Meta key.
-		 * @param string $def_val  Default value.
-		 *
-		 * @return mixed|string
-		 */
-		public function get_values( $the_post, string $meta_key = '', string $def_val = '' ) {
-
-			// Override these values if they differ from the admin panel defaults.
-			if ( isset( $the_post->taxonomy_type ) && in_array( $the_post->taxonomy_type, $this->taxonomy_types, true ) ) {
-				if ( isset( $this->taxonomy_type_values[ $the_post->taxonomy_type ] ) ) {
-					$meta = $this->taxonomy_type_fields[ $the_post->taxonomy_type ];
-				} else {
-					$defaults = array();
-					if ( ! empty( $this->taxonomy_type_fields[ $the_post->taxonomy_type ] ) ) {
-						foreach ( $this->taxonomy_type_fields[ $the_post->taxonomy_type ] as $key => $null ) {
-							if ( isset( $this->options_defaults[ $key ] ) ) {
-								$defaults[ $key ] = $this->options_defaults[ $key ];
-							}
-						}
-					}
-
-					$meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
-
-					$this->taxonomy_type_fields[ $the_post->taxonomy_type ] = $meta;
-				}
-
-				if ( ! empty( $meta_key ) ) {
-					if ( ! isset( $meta[ $meta_key ] ) ) {
-						$meta[ $meta_key ] = $def_val;
-					}
-
-					return $meta[ $meta_key ];
-				} else {
-					return $meta;
-				}
-			}
-
-			return $def_val;
-		}
-
-		/**
-		 * Check edit visibility.
-		 *
-		 * @param array $params Array.
-		 * @param bool  $subscan Flag to perform scan for fields of fields.
-		 *
-		 * @return bool
-		 */
-		private function check_edit_visibility( array $params = array(), bool $subscan = true ): bool {
-			global $pagenow;
-
-			// Edit page visibility.
-			if ( strpos( $pagenow, 'edit-' ) !== false ) {
-				if ( true === $subscan ) {
-					if ( isset( $params['fields'] ) ) {
-
-						foreach ( $params['fields'] as $field ) {
-							if ( in_array( $field['id'], Redux_Core::$fields_hidden, true ) ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-								// Not visible.
-							} elseif ( isset( $field['add_visibility'] ) && $field['add_visibility'] ) {
-								return true;
-							}
-						}
-
-						return false;
-					}
-				}
-
-				if ( isset( $params['add_visibility'] ) && true === $params['add_visibility'] ) {
-					return true;
-				}
-
-				return false;
-			}
-
-			return true;
-		}
-
-		/**
-		 * Generate Terms.
-		 *
-		 * @param array $metaterm Term.
-		 */
-		private function generate_terms( array $metaterm ) {
-			if ( ! empty( $metaterm['args']['permissions'] ) && ! Redux_Helpers::current_user_can( $metaterm['args']['permissions'] ) ) {
-				return;
-			}
-
-			if ( isset( $metaterm['args']['style'] ) && in_array( $metaterm['args']['style'], array( 'wp', 'wordpress' ), true ) ) {
-				$container_class             = 'redux-wp-style';
-				$metaterm['args']['sidebar'] = false;
-			} elseif ( isset( $metaterm['args']['sidebar'] ) && ! $metaterm['args']['sidebar'] ) {
-				$container_class = 'redux-no-sections';
-			} else {
-				$container_class = 'redux-has-sections';
-			}
-
-			$class = implode( ' ', $metaterm['args']['class'] );
-			echo '<div class="' . esc_attr( $class ) . '">';
-
-			$sections = $metaterm['args']['sections'];
-
-			wp_nonce_field( 'redux_taxonomy_meta_nonce', 'redux_taxonomy_meta_nonce' );
-
-			wp_dequeue_script( 'json-view-js' );
-
-			$sidebar = true;
-			if ( count( $sections ) === 1 || ( isset( $metaterm['args']['sidebar'] ) && false === $metaterm['args']['sidebar'] ) ) {
-				$sidebar = false; // Show the section dividers or not.
-			}
-
-			?>
+    /**
+     * Main ReduxFramework customizer extension class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Extension_Taxonomy extends Redux_Extension_Abstract {
+
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.4.19';
+
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Taxonomy';
+
+        /**
+         * Terms array.
+         *
+         * @var array
+         */
+        public array $terms = array();
+
+        /**
+         * Taxonomy types array.
+         *
+         * @var array
+         */
+        public array $taxonomy_types = array();
+
+        /**
+         * Taxonomy type.
+         *
+         * @var string
+         */
+        public string $taxonomy_type = '';
+
+        /**
+         * Sections array.
+         *
+         * @var array
+         */
+        public array $sections = array();
+
+        /**
+         * Original args array.
+         *
+         * @var array
+         */
+        public array $orig_args = array();
+
+        /**
+         * Output array.
+         *
+         * @var array
+         */
+        public array $output = array();
+
+        /**
+         * Parent options.
+         *
+         * @var array
+         */
+        public array $parent_options = array();
+
+        /**
+         * Parent defaults.
+         *
+         * @var array
+         */
+        public array $parent_defaults = array();
+
+        /**
+         * Taxonomy field types array.
+         *
+         * @var array
+         */
+        public array $taxonomy_type_fields = array();
+
+        /**
+         * Option defaults.
+         *
+         * @var array
+         */
+        public array $options_defaults = array();
+
+        /**
+         * To replace array.
+         *
+         * @var array
+         */
+        public array $to_replace = array();
+
+        /**
+         * Meta array.
+         *
+         * @var array
+         */
+        public array $meta = array();
+
+        /**
+         * Tag ID.
+         *
+         * @var int
+         */
+        public int $tag_id = 0;
+
+        /**
+         * Accepted WordPress screens.
+         *
+         * @var array
+         */
+        private array $pagenows;
+
+        /**
+         * Notices array.
+         *
+         * @var array
+         */
+        public array $notices;
+
+        /**
+         * Redux_Extension_Taxonomy constructor.
+         *
+         * @param object $redux ReduxFramework object.
+         */
+        public function __construct( $redux ) {
+            global $pagenow;
+
+            parent::__construct( $redux, __FILE__ );
+
+            $this->parent = $redux;
+
+            $this->add_field( 'taxonomy' );
+            $this->parent->extensions['taxonomy'] = $this;
+
+            $this->pagenows = array( 'edit-tags.php', 'term.php' );
+
+            include_once __DIR__ . '/redux-taxonomy-helpers.php';
+
+            add_action( 'admin_notices', array( $this, 'meta_terms_show_errors' ), 0 );
+            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 20 );
+
+            if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) {
+                $this->init();
+
+                // phpcs:ignore WordPress.Security.NonceVerification
+                if ( isset( $_POST['taxonomy'] ) ) {
+
+                    // phpcs:ignore WordPress.Security.NonceVerification
+                    add_action( 'edit_' . sanitize_text_field( wp_unslash( $_POST['taxonomy'] ) ), array( $this, 'meta_terms_save' ), 10, 3 );
+                }
+            }
+        }
+
+        /**
+         * Add term classes.
+         *
+         * @param array $classes Classes.
+         *
+         * @return array
+         */
+        public function add_term_classes( array $classes ): array {
+            $classes[] = 'redux-taxonomy';
+            $classes[] = 'redux-' . $this->parent->args['opt_name'];
+
+            if ( '' !== $this->parent->args['class'] ) {
+                $classes[] = $this->parent->args['class'];
+            }
+
+            return $classes;
+        }
+
+        /**
+         * Add term hide class.
+         *
+         * @param array $classes Classes.
+         *
+         * @return array
+         */
+        public function add_term_hide_class( array $classes ): array {
+            $classes[] = 'hide';
+
+            return $classes;
+        }
+
+        /**
+         * Init.
+         */
+        public function init() {
+            global $pagenow;
+
+            if ( isset( $_POST['action'] ) && 'redux_demo_customizer_save' === $_POST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+                return;
+            }
+
+            $this->parent->transients['run_compiler'] = false;
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $this->terms = apply_filters( 'redux/taxonomy/' . $this->parent->args['opt_name'] . '/terms', $this->terms, $this->parent->args['opt_name'] );
+
+            if ( empty( $this->terms ) && class_exists( 'Redux_Taxonomy' ) ) {
+                $this->terms = Redux_Taxonomy::construct_terms( $this->parent->args['opt_name'] );
+            }
+
+            if ( empty( $this->terms ) || ! is_array( $this->terms ) ) {
+                return;
+            }
+
+            // phpcs:disable WordPress.Security.NonceVerification
+            if ( ! isset( $_GET['tag_ID'] ) ) {
+                $_GET['tag_ID'] = 0;
+            }
+            $this->tag_id        = isset( $_GET['tag_ID'] ) ? sanitize_text_field( wp_unslash( $_GET['tag_ID'] ) ) : 0;
+            $this->taxonomy_type = isset( $_GET['taxonomy'] ) ? sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) : '';
+            // phpcs:enable WordPress.Security.NonceVerification
+
+            foreach ( $this->terms as $bk => $term ) {
+
+                // If the tag_ids for this term are set, we're limiting to the current tag id.
+                if ( ! empty( $term['tag_ids'] ) ) {
+                    if ( ! is_array( $term['tag_ids'] ) ) {
+                        $term['tag_ids'] = array( $term['tag_ids'] );
+                    }
+                    if ( ! in_array( $this->tag_id, $term['tag_ids'], true ) ) {
+                        continue;
+                    }
+                }
+
+                if ( ! isset( $term['taxonomy_types'] ) ) {
+                    return;
+                }
+
+                if ( ! empty( $term['sections'] ) ) {
+                    $this->sections         = $term['sections'];
+                    $this->parent->sections = array_merge( $this->parent->sections, $term['sections'] );
+
+                    $this->taxonomy_types = wp_parse_args( $this->taxonomy_types, $term['taxonomy_types'] );
+
+                    // Checking to override the parent variables.
+                    $add_field = false;
+
+                    foreach ( $term['taxonomy_types'] as $type ) {
+                        if ( $this->taxonomy_type === $type ) {
+                            $add_field = true;
+                        }
+                    }
+
+                    // Replacing all the fields.
+                    if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
+                        $run_hooks = true;
+
+                        $this->meta[ $this->tag_id ] = Redux_Taxonomy::get_term_meta( array( 'taxonomy' => $this->tag_id ) );
+                        $this->parent->options       = array_merge( $this->parent->options, $this->meta[ $this->tag_id ] );
+
+                        foreach ( $term['sections'] as $sk => $section ) {
+                            if ( ! empty( $section['fields'] ) ) {
+                                foreach ( $section['fields'] as $fk => $field ) {
+                                    if ( ! isset( $field['class'] ) ) {
+                                        $field['class'] = '';
+
+                                        $this->terms[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
+                                    }
+
+                                    $this->parent->required_class->check_dependencies( $field );
+
+                                    if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
+                                        if ( empty( $field['id'] ) ) {
+                                            continue;
+                                        }
+
+                                        if ( isset( $field['default'] ) ) {
+                                            $this->options_defaults[ $field['id'] ] = $field['default'];
+                                        } else {
+                                            $this->options_defaults[ $field['id'] ] = $this->field_default( $field );
+                                        }
+
+                                        foreach ( $term['taxonomy_types'] as $type ) {
+                                            $this->taxonomy_type_fields[ $type ][ $field['id'] ] = 1;
+                                        }
+
+                                        if ( ! empty( $field['output'] ) ) {
+                                            $this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
+                                        }
+
+                                        // Detect what field types are being used.
+                                        if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
+                                            $this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
+                                        } else {
+                                            $this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
+                                        }
+
+                                        if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
+                                            $this->to_replace[ $field['id'] ] = $field;
+                                        }
+                                    }
+
+                                    if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
+                                        $this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
+                                    }
+
+                                    if ( ! isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) ) {
+                                        $this->meta[ $this->tag_id ][ $field['id'] ] = $this->options_defaults[ $field['id'] ];
+                                    }
+
+                                    // Only override if it exists, and it's not the default.
+                                    // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+                                    /** If ( isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) && isset( $field['default'] ) && $this->meta[ $this->tag_id ][ $field['id'] ] === $field['default'] ) {
+                                     *   // unset($this->meta[$this->tag_id][$field['id']]); .
+                                     * }
+                                     */
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ( isset( $run_hooks ) && true === $run_hooks ) {
+                $this->parent_options = array();
+
+                if ( ! empty( $this->to_replace ) ) {
+                    foreach ( $this->to_replace as $id => $field ) {
+                        add_filter( "redux/options/{$this->parent->args['opt_name']}/field/$id/register", array( $this, 'replace_field' ) );
+                    }
+                }
+
+                add_filter( "redux/options/{$this->parent->args['opt_name']}/options", array( $this, 'override_options' ) );
+                add_filter( "redux/field/{$this->parent->args['opt_name']}/_can_output_css", array( $this, 'override_can_output_css' ) );
+                add_filter( "redux/field/{$this->parent->args['opt_name']}/output_css", array( $this, 'output_css' ) );
+
+                // phpcs:disable WordPress.Security.NonceVerification
+                if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) && isset( $_GET['taxonomy'] ) ) {
+                    $priority = $this->parent->args['taxonomy_priority'] ?? 3;
+
+                    add_action( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) . '_edit_form', array( $this, 'add_meta_terms' ), $priority );
+                    add_action( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) . '_add_form_fields', array( $this, 'add_meta_terms' ), $priority );
+                }
+                // phpcs:enable WordPress.Security.NonceVerification
+            }
+        }
+
+        /**
+         * Replace field.
+         *
+         * @param array $field Field array.
+         *
+         * @return mixed
+         */
+        public function replace_field( array $field ) {
+            if ( isset( $this->to_replace[ $field['id'] ] ) ) {
+                $field = $this->to_replace[ $field['id'] ];
+            }
+
+            return $field;
+        }
+
+        /**
+         * CSS can output override.
+         *
+         * @param array $field Field array.
+         *
+         * @return array
+         */
+        public function override_can_output_css( array $field ): array {
+            if ( isset( $this->output[ $field['id'] ] ) ) {
+                $field['force_output'] = true;
+            }
+
+            return $field;
+        }
+
+        /**
+         * Output CSS>
+         *
+         * @param array $field Field array.
+         *
+         * @return array
+         */
+        public function output_css( array $field ): array {
+            if ( isset( $this->output[ $field['id'] ] ) ) {
+                $field['output'] = $this->output[ $field['id'] ];
+            }
+
+            return $field;
+        }
+
+        /**
+         * Make sure the defaults are the defaults
+         *
+         * @param array $options Options array.
+         *
+         * @return array
+         */
+        public function override_options( array $options ): array {
+            $this->parent->options_class->default_values();
+            $this->parent_defaults = $this->parent->options_defaults;
+
+            $meta = $this->get_meta( $this->tag_id );
+            $data = wp_parse_args( $meta, $this->options_defaults );
+
+            foreach ( $data as $key => $value ) {
+                if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
+                    $data[ $key ] = $meta[ $key ];
+                    continue;
+                }
+
+                if ( isset( $options[ $key ] ) ) {
+                    $data[ $key ] = $options[ $key ];
+                }
+            }
+
+            $this->parent->options_defaults = wp_parse_args( $this->options_defaults, $this->parent->options_defaults );
+
+            return wp_parse_args( $data, $options );
+        }
+
+        /**
+         * Enqueue support files and fields.
+         */
+        public function enqueue() {
+            global $pagenow;
+
+            $types    = array();
+            $sections = array();
+
+            // Enqueue css.
+            foreach ( $this->terms as $key => $term ) {
+                if ( empty( $term['sections'] ) ) {
+                    continue;
+                }
+
+                // phpcs:ignore WordPress.Security.NonceVerification
+                if ( isset( $_GET['taxonomy'] ) && isset( $term['taxonomy_types'] ) && in_array( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ), $term['taxonomy_types'], true ) ) {
+                    $sections[] = $term['sections'];
+                }
+
+                $types = isset( $term['taxonomy_types'] ) ? array_merge( $term['taxonomy_types'], $types ) : $types;
+                if ( ! empty( $term['taxonomy_types'] ) ) {
+                    if ( ! is_array( $term['taxonomy_types'] ) ) {
+                        $term['taxonomy_types']                = array( $term['taxonomy_types'] );
+                        $this->terms[ $key ]['taxonomy_types'] = $term['taxonomy_types'];
+                    }
+                }
+            }
+
+            // phpcs:ignore WordPress.Security.NonceVerification
+            if ( in_array( $pagenow, $this->pagenows, true ) && isset( $_GET['taxonomy'] ) ) {
+                if ( in_array( wp_unslash( $_GET['taxonomy'] ), $types, true ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                    $this->parent->transients       = get_transient( $this->parent->args['opt_name'] . '-transients-taxonomy' );
+                    $this->parent->transients_check = $this->parent->transients;
+
+                    if ( isset( $this->parent->transients['notices'] ) ) {
+                        $this->notices                              = $this->parent->transients['notices'];
+                        $this->parent->transients['last_save_mode'] = 'taxonomy';
+                    }
+
+                    delete_transient( $this->parent->args['opt_name'] . '-transients-taxonomy' );
+                    $this->parent->enqueue_class->init();
+
+                    $this->parent->sections = $sections;
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/taxonomy/{$this->parent->args['opt_name']}/enqueue" );
+
+                    /**
+                     * Redux taxonomy CSS
+                     * filter 'redux/page/{opt_name}/enqueue/redux-extension-taxonomy-css'
+                     */
+                    if ( true === $this->parent->args['dev_mode'] ) {
+                        wp_enqueue_style(
+                            'redux-extension-taxonomy',
+                            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                            apply_filters( "redux/taxonomy/{$this->parent->args['opt_name']}/enqueue/redux-extension-taxonomy-css", $this->extension_url . 'redux-extension-taxonomy.css' ),
+                            array( 'redux-admin-css' ),
+                            self::$version
+                        );
+                    }
+
+                    /**
+                     * Redux taxonomy JS
+                     * filter 'redux/page/{opt_name}/enqueue/redux-extension-taxonomy-js
+                     */
+                    wp_enqueue_script(
+                        'redux-extension-taxonomy',
+                        // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                        apply_filters( "redux/taxonomy/{$this->parent->args['opt_name']}/enqueue/redux-extension-taxonomy-js", $this->extension_url . 'redux-extension-taxonomy' . Redux_Functions::is_min() . '.js' ),
+                        array( 'jquery', 'redux-js' ),
+                        self::$version,
+                        true
+                    );
+                }
+            }
+        }
+
+        /**
+         * DEPRECATED
+         */
+        public function default_values() {
+            if ( ! empty( $this->terms ) && empty( $this->options_defaults ) ) {
+                foreach ( $this->terms as $key => $term ) {
+                    if ( empty( $term['sections'] ) ) {
+                        continue;
+                    }
+
+                    // fill the cache.
+                    foreach ( $term['sections'] as $sk => $section ) {
+                        if ( ! isset( $section['id'] ) ) {
+                            if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
+                                $section['id'] = $sk;
+                            } else {
+                                $section['id'] = sanitize_title( $section['title'], $sk );
+                            }
+                            $this->terms[ $key ]['sections'][ $sk ] = $section;
+                        }
+                        if ( isset( $section['fields'] ) ) {
+                            foreach ( $section['fields'] as $k => $field ) {
+                                if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
+                                    continue;
+                                }
+
+                                if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
+                                    $this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
+                                    unset( $this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
+                                }
+
+                                if ( 'section' === $field['type'] && isset( $field['indent'] ) && true === $field['indent'] ) {
+                                    $field['class']  = $field['class'] ?? '';
+                                    $field['class'] .= 'redux-section-indent-start';
+                                    $this->terms[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
+                                }
+
+                                if ( ! isset( $this->parent->options_defaults_class ) ) {
+                                    $this->parent->options_defaults_class = new Redux_Options_Defaults();
+                                }
+
+                                $this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $field );
+
+                                if ( 'repeater' === $field['type'] ) {
+                                    foreach ( $field['fields'] as $f ) {
+                                        $this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $f, null, true );
+                                    }
+                                }
+
+                                $this->parent->options_defaults = $this->parent->options_defaults_class->options_defaults;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ( empty( $this->meta[ $this->tag_id ] ) ) {
+                $this->meta[ $this->tag_id ] = $this->get_meta( $this->tag_id );
+            }
+        }
+
+        /**
+         * Add Meta Terms.
+         */
+        public function add_meta_terms() {
+            if ( empty( $this->terms ) || ! is_array( $this->terms ) ) {
+                return;
+            }
+
+            foreach ( $this->terms as $key => $term ) {
+                if ( empty( $term['sections'] ) ) {
+                    continue;
+                }
+
+                $defaults = array(
+                    'id'         => "$key",
+                    'section_id' => $key,
+                    'terms'      => array(),
+                );
+
+                $term = wp_parse_args( $term, $defaults );
+                if ( ! empty( $term['taxonomy_types'] ) && isset( $_GET['taxonomy'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                    foreach ( $term['taxonomy_types'] as $termtype ) {
+                        if ( $_GET['taxonomy'] !== $termtype ) { // phpcs:ignore WordPress.Security.NonceVerification
+                            continue;
+                        }
+
+                        // Override the parent args on a metaterm level.
+                        if ( empty( $this->orig_args ) ) {
+                            $this->orig_args = $this->parent->args;
+                        }
+
+                        if ( isset( $term['args'] ) ) {
+                            $this->parent->args = wp_parse_args( $term['args'], $this->orig_args );
+                        } elseif ( $this->parent->args !== $this->orig_args ) {
+                            $this->parent->args = $this->orig_args;
+                        }
+
+                        if ( ! isset( $term['class'] ) ) {
+                            $term['class'] = array();
+                        }
+
+                        if ( ! empty( $term['class'] ) ) {
+                            if ( ! is_array( $term['class'] ) ) {
+                                $term['class'] = array( $term['class'] );
+                            }
+                        }
+
+                        $term['class'] = $this->add_term_classes( $term['class'] );
+
+                        if ( isset( $term['post_format'] ) ) {
+                            $term['class'] = $this->add_term_hide_class( $term['class'] );
+                        }
+
+                        global $pagenow;
+                        if ( strpos( $pagenow, 'edit-' ) !== false ) {
+
+                            $term['style']   = 'wp';
+                            $term['class'][] = ' edit-page';
+                            $term['class'][] = ' redux-wp-style';
+                        }
+
+                        $this->generate_terms( array( 'args' => $term ) );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Field Default.
+         *
+         * @param array $field_id ID.
+         *
+         * @return mixed|string
+         */
+        private function field_default( array $field_id ) {
+            if ( ! isset( $this->parent->options_defaults ) ) {
+                $this->parent->options_defaults = $this->parent->default_values();
+            }
+
+            if ( ! isset( $this->parent->options ) || empty( $this->parent->options ) ) {
+                if ( ! isset( $this->parent->options_class ) ) {
+                    $this->parent->options_class = new Redux_Options_Constructor( $this->parent );
+                }
+
+                $this->parent->options_class->get();
+            }
+
+            if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
+                return $this->parent->options[ $field_id['id'] ];
+            } else {
+                if ( empty( $this->options_defaults ) ) {
+                    $this->default_values(); // fill cache.
+                }
+
+                $data = '';
+                if ( ! empty( $this->options_defaults ) ) {
+                    $data = $this->options_defaults[ $field_id['id'] ] ?? '';
+                }
+
+                if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
+                    $data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
+                }
+
+                return $data;
+            }
+        }
+
+        /**
+         * Function to get and cache the post-meta.
+         *
+         * @param string $id ID.
+         *
+         * @return array
+         */
+        private function get_meta( string $id ): array {
+            if ( ! isset( $this->meta[ $id ] ) ) {
+                $this->meta[ $id ] = array();
+                $o_data            = get_post_meta( $id );
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $o_data = apply_filters( "redux/taxonomy/{$this->parent->args['opt_name']}/get_meta", $o_data );
+
+                if ( ! empty( $o_data ) ) {
+                    foreach ( $o_data as $key => $value ) {
+                        if ( count( $value ) === 1 ) {
+                            $this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
+                        } else {
+                            $new_value = array_map( 'maybe_unserialize', $value );
+
+                            $this->meta[ $id ][ $key ] = $new_value[0];
+                        }
+                    }
+                }
+
+                if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
+                    $data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+
+                    foreach ( $data as $key => $value ) {
+                        $this->meta[ $id ][ $key ] = $value;
+                        update_post_meta( $id, $key, $value );
+                    }
+
+                    unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+
+                    delete_post_meta( $id, $this->parent->args['opt_name'] );
+                }
+            }
+
+            return $this->meta[ $id ];
+        }
+
+        /**
+         * Get values.
+         *
+         * @param mixed  $the_post WP_Post.
+         * @param string $meta_key Meta key.
+         * @param string $def_val  Default value.
+         *
+         * @return mixed|string
+         */
+        public function get_values( $the_post, string $meta_key = '', string $def_val = '' ) {
+
+            // Override these values if they differ from the admin panel defaults.
+            if ( isset( $the_post->taxonomy_type ) && in_array( $the_post->taxonomy_type, $this->taxonomy_types, true ) ) {
+                if ( isset( $this->taxonomy_type_values[ $the_post->taxonomy_type ] ) ) {
+                    $meta = $this->taxonomy_type_fields[ $the_post->taxonomy_type ];
+                } else {
+                    $defaults = array();
+                    if ( ! empty( $this->taxonomy_type_fields[ $the_post->taxonomy_type ] ) ) {
+                        foreach ( $this->taxonomy_type_fields[ $the_post->taxonomy_type ] as $key => $null ) {
+                            if ( isset( $this->options_defaults[ $key ] ) ) {
+                                $defaults[ $key ] = $this->options_defaults[ $key ];
+                            }
+                        }
+                    }
+
+                    $meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
+
+                    $this->taxonomy_type_fields[ $the_post->taxonomy_type ] = $meta;
+                }
+
+                if ( ! empty( $meta_key ) ) {
+                    if ( ! isset( $meta[ $meta_key ] ) ) {
+                        $meta[ $meta_key ] = $def_val;
+                    }
+
+                    return $meta[ $meta_key ];
+                } else {
+                    return $meta;
+                }
+            }
+
+            return $def_val;
+        }
+
+        /**
+         * Check edit visibility.
+         *
+         * @param array $params Array.
+         * @param bool  $subscan Flag to perform scan for fields of fields.
+         *
+         * @return bool
+         */
+        private function check_edit_visibility( array $params = array(), bool $subscan = true ): bool {
+            global $pagenow;
+
+            // Edit page visibility.
+            if ( strpos( $pagenow, 'edit-' ) !== false ) {
+                if ( true === $subscan ) {
+                    if ( isset( $params['fields'] ) ) {
+
+                        foreach ( $params['fields'] as $field ) {
+                            if ( in_array( $field['id'], Redux_Core::$fields_hidden, true ) ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+                                // Not visible.
+                            } elseif ( isset( $field['add_visibility'] ) && $field['add_visibility'] ) {
+                                return true;
+                            }
+                        }
+
+                        return false;
+                    }
+                }
+
+                if ( isset( $params['add_visibility'] ) && true === $params['add_visibility'] ) {
+                    return true;
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        /**
+         * Generate Terms.
+         *
+         * @param array $metaterm Term.
+         */
+        private function generate_terms( array $metaterm ) {
+            if ( ! empty( $metaterm['args']['permissions'] ) && ! Redux_Helpers::current_user_can( $metaterm['args']['permissions'] ) ) {
+                return;
+            }
+
+            if ( isset( $metaterm['args']['style'] ) && in_array( $metaterm['args']['style'], array( 'wp', 'wordpress' ), true ) ) {
+                $container_class             = 'redux-wp-style';
+                $metaterm['args']['sidebar'] = false;
+            } elseif ( isset( $metaterm['args']['sidebar'] ) && ! $metaterm['args']['sidebar'] ) {
+                $container_class = 'redux-no-sections';
+            } else {
+                $container_class = 'redux-has-sections';
+            }
+
+            $class = implode( ' ', $metaterm['args']['class'] );
+            echo '<div class="' . esc_attr( $class ) . '">';
+
+            $sections = $metaterm['args']['sections'];
+
+            wp_nonce_field( 'redux_taxonomy_meta_nonce', 'redux_taxonomy_meta_nonce' );
+
+            wp_dequeue_script( 'json-view-js' );
+
+            $sidebar = true;
+            if ( count( $sections ) === 1 || ( isset( $metaterm['args']['sidebar'] ) && false === $metaterm['args']['sidebar'] ) ) {
+                $sidebar = false; // Show the section dividers or not.
+            }
+
+            ?>
 			<div data-opt-name="<?php echo esc_attr( $this->parent->args['opt_name'] ); ?>"
 				class="redux-container <?php echo( esc_attr( $container_class ) ); ?> redux-term redux-box-normal redux-term-normal">
 				<div class="redux-notices">
@@ -865,292 +865,292 @@ 
 					</div>
 				</div>
 				<?php
-				echo '<a href="javascript:void(0);" class="expand_options hide" style="display:none;">' . esc_html__( 'Expand', 'redux-framework' ) . '</a>';
-				if ( $sidebar ) {
-					?>
+                echo '<a href="javascript:void(0);" class="expand_options hide" style="display:none;">' . esc_html__( 'Expand', 'redux-framework' ) . '</a>';
+                if ( $sidebar ) {
+                    ?>
 					<div class="redux-sidebar">
 						<ul class="redux-group-menu">
 							<?php
-							foreach ( $sections as $s_key => $section ) {
-								if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
-									continue;
-								}
-
-								// phpcs:ignore WordPress.Security.EscapeOutput
-								echo $this->parent->render_class->section_menu( $s_key, $section, '_' . $metaterm['args']['id'], $sections );
-							}
-							?>
+                            foreach ( $sections as $s_key => $section ) {
+                                if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
+                                    continue;
+                                }
+
+                                // phpcs:ignore WordPress.Security.EscapeOutput
+                                echo $this->parent->render_class->section_menu( $s_key, $section, '_' . $metaterm['args']['id'], $sections );
+                            }
+                            ?>
 						</ul>
 					</div>
 				<?php } ?>
 				<div class="redux-main">
 					<?php
 
-					foreach ( $sections as $s_key => $section ) {
-						if ( ! $this->check_edit_visibility( $section ) ) {
-							continue;
-						}
-
-						if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
-							continue;
-						}
-
-						if ( ! empty( $section['fields'] ) ) {
-							if ( isset( $section['args'] ) ) {
-								$this->parent->args = wp_parse_args( $section['args'], $this->orig_args );
-							} elseif ( $this->parent->args !== $this->orig_args ) {
-								$this->parent->args = $this->orig_args;
-							}
-
-							$hide             = $sidebar ? '' : ' display-group';
-							$section['class'] = isset( $section['class'] ) ? " {$section['class']}" : '';
-
-							// phpcs:ignore WordPress.Security.EscapeOutput
-							echo "<div id='{$s_key}_{$metaterm['args']['id']}_section_group' class='redux-group-tab{$section['class']} redux_metaterm_panel$hide'>";
-
-							if ( ! empty( $section['title'] ) ) {
-								echo '<h3 class="redux-section-title">' . wp_kses_post( $section['title'] ) . '</h3>';
-							}
-
-							if ( ! empty( $section['desc'] ) ) {
-								echo '<div class="redux-section-desc">' . wp_kses_post( $section['desc'] ) . '</div>';
-							}
-
-							echo '<table class="form-table"><tbody>';
-
-							foreach ( $section['fields'] as $field ) {
-								if ( ! $this->check_edit_visibility( $field, false ) ) {
-									continue;
-								}
-
-								if ( ! empty( $field['permissions'] ) && ! Redux_Helpers::current_user_can( $field['permissions'] ) ) {
-									continue;
-								}
-
-								$field['name'] = $this->parent->args['opt_name'] . '[' . $field['id'] . ']';
-
-								$is_hidden = false;
-								$ex_style  = '';
-								if ( isset( $field['hidden'] ) && $field['hidden'] ) {
-									$is_hidden = true;
-									$ex_style  = ' style="border-bottom: none;"';
-								}
-
-								// phpcs:ignore WordPress.Security.EscapeOutput
-								echo '<tr valign="top"' . $ex_style . '>';
-
-								$th = $this->parent->render_class->get_header_html( $field );
-
-								if ( $is_hidden ) {
-									$str_pos = strpos( $th, 'redux_field_th' );
-
-									if ( $str_pos > - 1 ) {
-										$th = str_replace( 'redux_field_th', 'redux_field_th hide', $th );
-									}
-								}
-
-								if ( $sidebar ) {
-									if ( ! ( isset( $metaterm['args']['sections'] ) && count( $metaterm['args']['sections'] ) === 1 && isset( $metaterm['args']['sections'][0]['fields'] ) && count( $metaterm['args']['sections'][0]['fields'] ) === 1 ) && isset( $field['title'] ) ) {
-										echo '<th scope="row">';
-										if ( ! empty( $th ) ) {
-											echo $th; // phpcs:ignore WordPress.Security.EscapeOutput
-										}
-										echo '</th>';
-										echo '<td>';
-									}
-								} else {
-									echo '<td>' . $th; // phpcs:ignore WordPress.Security.EscapeOutput
-								}
-
-								if ( 'section' === $field['type'] && true === $field['indent'] ) {
-									$field['class']  = $field['class'] ?? '';
-									$field['class'] .= 'redux-section-indent-start';
-								}
-
-								if ( ! isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) ) {
-									$this->meta[ $this->tag_id ][ $field['id'] ] = '';
-								}
-
-								$this->parent->render_class->field_input( $field, $this->meta[ $this->tag_id ][ $field['id'] ], true );
-								echo '</td></tr>';
-							}
-							echo '</tbody></table>';
-							echo '</div>';
-						}
-					}
-					?>
+                    foreach ( $sections as $s_key => $section ) {
+                        if ( ! $this->check_edit_visibility( $section ) ) {
+                            continue;
+                        }
+
+                        if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
+                            continue;
+                        }
+
+                        if ( ! empty( $section['fields'] ) ) {
+                            if ( isset( $section['args'] ) ) {
+                                $this->parent->args = wp_parse_args( $section['args'], $this->orig_args );
+                            } elseif ( $this->parent->args !== $this->orig_args ) {
+                                $this->parent->args = $this->orig_args;
+                            }
+
+                            $hide             = $sidebar ? '' : ' display-group';
+                            $section['class'] = isset( $section['class'] ) ? " {$section['class']}" : '';
+
+                            // phpcs:ignore WordPress.Security.EscapeOutput
+                            echo "<div id='{$s_key}_{$metaterm['args']['id']}_section_group' class='redux-group-tab{$section['class']} redux_metaterm_panel$hide'>";
+
+                            if ( ! empty( $section['title'] ) ) {
+                                echo '<h3 class="redux-section-title">' . wp_kses_post( $section['title'] ) . '</h3>';
+                            }
+
+                            if ( ! empty( $section['desc'] ) ) {
+                                echo '<div class="redux-section-desc">' . wp_kses_post( $section['desc'] ) . '</div>';
+                            }
+
+                            echo '<table class="form-table"><tbody>';
+
+                            foreach ( $section['fields'] as $field ) {
+                                if ( ! $this->check_edit_visibility( $field, false ) ) {
+                                    continue;
+                                }
+
+                                if ( ! empty( $field['permissions'] ) && ! Redux_Helpers::current_user_can( $field['permissions'] ) ) {
+                                    continue;
+                                }
+
+                                $field['name'] = $this->parent->args['opt_name'] . '[' . $field['id'] . ']';
+
+                                $is_hidden = false;
+                                $ex_style  = '';
+                                if ( isset( $field['hidden'] ) && $field['hidden'] ) {
+                                    $is_hidden = true;
+                                    $ex_style  = ' style="border-bottom: none;"';
+                                }
+
+                                // phpcs:ignore WordPress.Security.EscapeOutput
+                                echo '<tr valign="top"' . $ex_style . '>';
+
+                                $th = $this->parent->render_class->get_header_html( $field );
+
+                                if ( $is_hidden ) {
+                                    $str_pos = strpos( $th, 'redux_field_th' );
+
+                                    if ( $str_pos > - 1 ) {
+                                        $th = str_replace( 'redux_field_th', 'redux_field_th hide', $th );
+                                    }
+                                }
+
+                                if ( $sidebar ) {
+                                    if ( ! ( isset( $metaterm['args']['sections'] ) && count( $metaterm['args']['sections'] ) === 1 && isset( $metaterm['args']['sections'][0]['fields'] ) && count( $metaterm['args']['sections'][0]['fields'] ) === 1 ) && isset( $field['title'] ) ) {
+                                        echo '<th scope="row">';
+                                        if ( ! empty( $th ) ) {
+                                            echo $th; // phpcs:ignore WordPress.Security.EscapeOutput
+                                        }
+                                        echo '</th>';
+                                        echo '<td>';
+                                    }
+                                } else {
+                                    echo '<td>' . $th; // phpcs:ignore WordPress.Security.EscapeOutput
+                                }
+
+                                if ( 'section' === $field['type'] && true === $field['indent'] ) {
+                                    $field['class']  = $field['class'] ?? '';
+                                    $field['class'] .= 'redux-section-indent-start';
+                                }
+
+                                if ( ! isset( $this->meta[ $this->tag_id ][ $field['id'] ] ) ) {
+                                    $this->meta[ $this->tag_id ][ $field['id'] ] = '';
+                                }
+
+                                $this->parent->render_class->field_input( $field, $this->meta[ $this->tag_id ][ $field['id'] ], true );
+                                echo '</td></tr>';
+                            }
+                            echo '</tbody></table>';
+                            echo '</div>';
+                        }
+                    }
+                    ?>
 				</div>
 				<div class="clear"></div>
 			</div>
 			<?php
-			echo '</div>';
-		}
-
-		/**
-		 * Save meta terms
-		 * Runs when a post is saved and does an action which to write panel save scripts can hook into.
-		 *
-		 * @access public
-		 *
-		 * @param mixed $tag_id Yag ID.
-		 *
-		 * @return bool
-		 */
-		public function meta_terms_save( $tag_id ): bool {
-
-			// Check if our nonce is set.
-			if ( ! isset( $_POST['redux_taxonomy_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
-				return false;
-			}
-
-			// Verify that the nonce is valid.
-			// Validate fields (if needed).
-			if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux_taxonomy_meta_nonce'] ) ), 'redux_taxonomy_meta_nonce' ) ) {
-				return $tag_id;
-			}
-
-			$meta = Redux_Taxonomy::get_term_meta( array( 'taxonomy' => $tag_id ) );
-
-			$to_save    = array();
-			$to_compare = array();
-			$to_delete  = array();
-			$dont_save  = true;
-
-			$field_args = Redux_Taxonomy::$fields[ $this->parent->args['opt_name'] ];
-
-			foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
-
-				// Do not save anything the user doesn't have permissions for.
-				if ( ! empty( $field_args[ $key ]['permissions'] ) ) {
-					foreach ( (array) $field_args[ $key ]['permissions'] as $pv ) {
-
-						// Do not save anything the user doesn't have permissions for.
-						if ( isset( $field_args[ $key ] ) ) {
-							if ( user_can( get_current_user_id(), $pv ) ) {
-								break;
-							}
-						}
-					}
-				}
-
-				// Have to remove the escaping for array comparison.
-				if ( is_array( $value ) ) {
-					foreach ( $value as $k => $v ) {
-						if ( ! is_array( $v ) ) {
-							$value[ $k ] = stripslashes( $v );
-						}
-					}
-				}
-
-				$save = true;
-
-				// parent_options.
-				if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
-					$save = false;
-				}
-
-				if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
-					$save = false;
-				}
-
-				if ( $save ) {
-					$to_save[ $key ]    = $value;
-					$to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
-				} else {
-					$to_delete[ $key ] = $value;
-				}
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$to_save = apply_filters( 'redux/taxonomy/save/before_validate', $to_save, $to_compare, $this->sections );
-
-			$validate = $this->parent->validate_class->validate( $to_save, $to_compare, $this->sections );
-
-			// Validate fields (if needed).
-			foreach ( $to_save as $key => $value ) {
-				if ( isset( $validate[ $key ] ) && $validate[ $key ] !== $value ) {
-					if ( isset( $meta[ $key ] ) && $validate[ $key ] === $meta[ $key ] ) {
-						unset( $to_save[ $key ] );
-					} else {
-						$to_save[ $key ] = $validate[ $key ];
-					}
-				}
-			}
-
-			if ( ! empty( $this->parent->errors ) || ! empty( $this->parent->warnings ) ) {
-				$this->parent->transients['notices'] = ( isset( $this->parent->transients['notices'] ) && is_array( $this->parent->transients['notices'] ) ) ? $this->parent->transients['notices'] : array();
-
-				if ( ! isset( $this->parent->transients['notices']['errors'] ) || $this->parent->transients['notices']['errors'] !== $this->parent->errors ) {
-					$this->parent->transients['notices']['errors'] = $this->parent->errors;
-					$update_transients                             = true;
-				}
-
-				if ( ! isset( $this->parent->transients['notices']['warnings'] ) || $this->parent->transients['notices']['warnings'] !== $this->parent->warnings ) {
-					$this->parent->transients['notices']['warnings'] = $this->parent->warnings;
-					$update_transients                               = true;
-				}
-
-				if ( isset( $update_transients ) ) {
-					$this->parent->transients['notices']['override'] = 1;
-					set_transient( $this->parent->args['opt_name'] . '-transients-taxonomy', $this->parent->transients );
-				}
-			}
-
-			$post_tax = isset( $_POST['taxonomy'] ) ? sanitize_text_field( wp_unslash( $_POST['taxonomy'] ) ) : '';
-
-			$check = $this->taxonomy_type_fields[ $post_tax ] ?? array();
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$to_save = apply_filters( 'redux/taxonomy/save', $to_save, $to_compare, $this->sections );
-
-			foreach ( $to_save as $key => $value ) {
-				$prev_value = $this->meta[ $tag_id ][ $key ] ?? '';
-
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
-				}
-
-				update_term_meta( $tag_id, $key, $value, $prev_value );
-			}
-
-			foreach ( $to_delete as $key => $value ) {
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
-				}
-
-				$prev_value = $this->meta[ $tag_id ][ $key ] ?? '';
-				delete_term_meta( $tag_id, $key, $prev_value );
-			}
-
-			if ( ! empty( $check ) ) {
-				foreach ( $check as $key => $value ) {
-					delete_term_meta( $tag_id, $key );
-				}
-			}
-
-			return true;
-		}
-
-		/**
-		 * Show any stored error messages.
-		 *
-		 * @access public
-		 * @return void
-		 */
-		public function meta_terms_show_errors() {
-			if ( isset( $this->notices['errors'] ) && ! empty( $this->notices['errors'] ) ) {
-				echo '<div id="redux_taxonomy_errors" class="error fade">';
-				echo '<p><strong><span></span> ' . count( $this->notices['errors'] ) . ' ' . esc_html__( 'error(s) were found!', 'redux-framework' ) . '</strong></p>';
-				echo '</div>';
-			}
-
-			if ( isset( $this->notices['warnings'] ) && ! empty( $this->notices['warnings'] ) ) {
-				echo '<div id="redux_taxonomy_warnings" class="error fade" style="border-left-color: #E8E20C;">';
-				echo '<p><strong><span></span> ' . count( $this->notices['warnings'] ) . ' ' . esc_html__( 'warnings(s) were found!', 'redux-framework' ) . '</strong></p>';
-				echo '</div>';
-			}
-		}
-	}
+            echo '</div>';
+        }
+
+        /**
+         * Save meta terms
+         * Runs when a post is saved and does an action which to write panel save scripts can hook into.
+         *
+         * @access public
+         *
+         * @param mixed $tag_id Yag ID.
+         *
+         * @return bool
+         */
+        public function meta_terms_save( $tag_id ): bool {
+
+            // Check if our nonce is set.
+            if ( ! isset( $_POST['redux_taxonomy_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
+                return false;
+            }
+
+            // Verify that the nonce is valid.
+            // Validate fields (if needed).
+            if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux_taxonomy_meta_nonce'] ) ), 'redux_taxonomy_meta_nonce' ) ) {
+                return $tag_id;
+            }
+
+            $meta = Redux_Taxonomy::get_term_meta( array( 'taxonomy' => $tag_id ) );
+
+            $to_save    = array();
+            $to_compare = array();
+            $to_delete  = array();
+            $dont_save  = true;
+
+            $field_args = Redux_Taxonomy::$fields[ $this->parent->args['opt_name'] ];
+
+            foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+
+                // Do not save anything the user doesn't have permissions for.
+                if ( ! empty( $field_args[ $key ]['permissions'] ) ) {
+                    foreach ( (array) $field_args[ $key ]['permissions'] as $pv ) {
+
+                        // Do not save anything the user doesn't have permissions for.
+                        if ( isset( $field_args[ $key ] ) ) {
+                            if ( user_can( get_current_user_id(), $pv ) ) {
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // Have to remove the escaping for array comparison.
+                if ( is_array( $value ) ) {
+                    foreach ( $value as $k => $v ) {
+                        if ( ! is_array( $v ) ) {
+                            $value[ $k ] = stripslashes( $v );
+                        }
+                    }
+                }
+
+                $save = true;
+
+                // parent_options.
+                if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
+                    $save = false;
+                }
+
+                if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
+                    $save = false;
+                }
+
+                if ( $save ) {
+                    $to_save[ $key ]    = $value;
+                    $to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
+                } else {
+                    $to_delete[ $key ] = $value;
+                }
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $to_save = apply_filters( 'redux/taxonomy/save/before_validate', $to_save, $to_compare, $this->sections );
+
+            $validate = $this->parent->validate_class->validate( $to_save, $to_compare, $this->sections );
+
+            // Validate fields (if needed).
+            foreach ( $to_save as $key => $value ) {
+                if ( isset( $validate[ $key ] ) && $validate[ $key ] !== $value ) {
+                    if ( isset( $meta[ $key ] ) && $validate[ $key ] === $meta[ $key ] ) {
+                        unset( $to_save[ $key ] );
+                    } else {
+                        $to_save[ $key ] = $validate[ $key ];
+                    }
+                }
+            }
+
+            if ( ! empty( $this->parent->errors ) || ! empty( $this->parent->warnings ) ) {
+                $this->parent->transients['notices'] = ( isset( $this->parent->transients['notices'] ) && is_array( $this->parent->transients['notices'] ) ) ? $this->parent->transients['notices'] : array();
+
+                if ( ! isset( $this->parent->transients['notices']['errors'] ) || $this->parent->transients['notices']['errors'] !== $this->parent->errors ) {
+                    $this->parent->transients['notices']['errors'] = $this->parent->errors;
+                    $update_transients                             = true;
+                }
+
+                if ( ! isset( $this->parent->transients['notices']['warnings'] ) || $this->parent->transients['notices']['warnings'] !== $this->parent->warnings ) {
+                    $this->parent->transients['notices']['warnings'] = $this->parent->warnings;
+                    $update_transients                               = true;
+                }
+
+                if ( isset( $update_transients ) ) {
+                    $this->parent->transients['notices']['override'] = 1;
+                    set_transient( $this->parent->args['opt_name'] . '-transients-taxonomy', $this->parent->transients );
+                }
+            }
+
+            $post_tax = isset( $_POST['taxonomy'] ) ? sanitize_text_field( wp_unslash( $_POST['taxonomy'] ) ) : '';
+
+            $check = $this->taxonomy_type_fields[ $post_tax ] ?? array();
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $to_save = apply_filters( 'redux/taxonomy/save', $to_save, $to_compare, $this->sections );
+
+            foreach ( $to_save as $key => $value ) {
+                $prev_value = $this->meta[ $tag_id ][ $key ] ?? '';
+
+                if ( isset( $check[ $key ] ) ) {
+                    unset( $check[ $key ] );
+                }
+
+                update_term_meta( $tag_id, $key, $value, $prev_value );
+            }
+
+            foreach ( $to_delete as $key => $value ) {
+                if ( isset( $check[ $key ] ) ) {
+                    unset( $check[ $key ] );
+                }
+
+                $prev_value = $this->meta[ $tag_id ][ $key ] ?? '';
+                delete_term_meta( $tag_id, $key, $prev_value );
+            }
+
+            if ( ! empty( $check ) ) {
+                foreach ( $check as $key => $value ) {
+                    delete_term_meta( $tag_id, $key );
+                }
+            }
+
+            return true;
+        }
+
+        /**
+         * Show any stored error messages.
+         *
+         * @access public
+         * @return void
+         */
+        public function meta_terms_show_errors() {
+            if ( isset( $this->notices['errors'] ) && ! empty( $this->notices['errors'] ) ) {
+                echo '<div id="redux_taxonomy_errors" class="error fade">';
+                echo '<p><strong><span></span> ' . count( $this->notices['errors'] ) . ' ' . esc_html__( 'error(s) were found!', 'redux-framework' ) . '</strong></p>';
+                echo '</div>';
+            }
+
+            if ( isset( $this->notices['warnings'] ) && ! empty( $this->notices['warnings'] ) ) {
+                echo '<div id="redux_taxonomy_warnings" class="error fade" style="border-left-color: #E8E20C;">';
+                echo '<p><strong><span></span> ' . count( $this->notices['warnings'] ) . ' ' . esc_html__( 'warnings(s) were found!', 'redux-framework' ) . '</strong></p>';
+                echo '</div>';
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Extension_Taxonomy', 'ReduxFramework_extension_taxonomy' );