reduxframework / redux-framework

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

Indentation +386 added lines, -386 removed lines

@@ -11,390 +11,390 @@
 
 if ( ! class_exists( 'Redux_Args', false ) ) {
 
-	/**
-	 * Class Redux_Args
-	 */
-	class Redux_Args {
-
-		/**
-		 * Returns entire arguments array.
-		 *
-		 * @var array|mixed
-		 */
-		public $get = array();
-
-		/**
-		 * ReduxFramework object.
-		 *
-		 * @var ReduxFramework|null
-		 */
-		private ?ReduxFramework $parent;
-
-		/**
-		 * Switch to omit social icons if dev_mode is set to true and Redux defaults are used.
-		 *
-		 * @var bool
-		 */
-		public bool $omit_icons = false;
-
-		/**
-		 * Switch to omit support menu items if dev_mode is set to true and redux defaults are used.
-		 *
-		 * @var bool
-		 */
-		public bool $omit_items = false;
-
-		/**
-		 * Flag to force dev_mod to true if in localhost or WP_DEBUG is set to true.
-		 *
-		 * @var bool
-		 */
-		public bool $dev_mode_forced = false;
-
-		/**
-		 * Redux_Args constructor.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework object.
-		 * @param array          $args  Global arguments array.
-		 */
-		public function __construct( ReduxFramework $redux, array $args ) {
-			$this->parent = $redux;
-
-			$default = array(
-				'opt_name'                         => '',
-				'last_tab'                         => '',
-				'menu_icon'                        => '',
-				'menu_title'                       => '',
-				'page_title'                       => '',
-				'page_slug'                        => '',
-				'page_permissions'                 => 'manage_options',
-				'menu_type'                        => 'menu',
-				'page_parent'                      => 'themes.php',
-				'page_priority'                    => null,
-				'allow_sub_menu'                   => true,
-				'save_defaults'                    => true,
-				'footer_credit'                    => '',
-				'async_typography'                 => false,
-				'disable_google_fonts_link'        => false,
-				'class'                            => '',
-				'admin_bar'                        => true,
-				'admin_bar_priority'               => 999,
-				'admin_bar_icon'                   => '',
-				'help_tabs'                        => array(),
-				'help_sidebar'                     => '',
-				'database'                         => '',
-				'customizer'                       => false,
-				'global_variable'                  => '',
-				'output'                           => true,
-				'output_variables_prefix'          => '--',
-				'compiler_output_variables_prefix' => '$',
-				'compiler'                         => true,
-				'output_tag'                       => true,
-				'output_location'                  => array( 'frontend' ),
-				'transient_time'                   => '',
-				'default_show'                     => false,
-				'default_mark'                     => '',
-				'disable_save_warn'                => false,
-				'open_expanded'                    => false,
-				'hide_expand'                      => false,
-				'network_admin'                    => false,
-				'network_sites'                    => true,
-				'hide_reset'                       => false,
-				'hide_save'                        => false,
-				'hints'                            => array(
-					'icon'          => 'el el-question-sign',
-					'icon_position' => 'right',
-					'icon_color'    => 'lightgray',
-					'icon_size'     => 'normal',
-					'tip_style'     => array(
-						'color'   => 'light',
-						'shadow'  => true,
-						'rounded' => false,
-						'style'   => '',
-					),
-					'tip_position'  => array(
-						'my' => 'top_left',
-						'at' => 'bottom_right',
-					),
-					'tip_effect'    => array(
-						'show' => array(
-							'effect'   => 'slide',
-							'duration' => '500',
-							'event'    => 'mouseover',
-						),
-						'hide' => array(
-							'effect'   => 'fade',
-							'duration' => '500',
-							'event'    => 'click mouseleave',
-						),
-					),
-				),
-				'font_weights'                     => array(
-					array(
-						'id'   => '400',
-						'name' => __( 'Regular 400', 'redux-framework' ),
-					),
-					array(
-						'id'   => '400italic',
-						'name' => __( 'Regular 400 Italic', 'redux-framework' ),
-					),
-					array(
-						'id'   => '700',
-						'name' => __( 'Bold 700', 'redux-framework' ),
-					),
-					array(
-						'id'   => '700italic',
-						'name' => __( 'Bold 700 Italic', 'redux-framework' ),
-					),
-				),
-				'show_import_export'               => true,
-				'show_options_object'              => true,
-				'dev_mode'                         => true,
-				'templates_path'                   => '',
-				'ajax_save'                        => true,
-				'use_cdn'                          => true,
-				'cdn_check_time'                   => 1440,
-				'options_api'                      => true,
-				'allow_tracking'                   => true,
-				'admin_theme'                      => 'wp',
-				'elusive_frontend'                 => false,
-				'fontawesome_frontend'             => false,
-				'flyout_submenus'                  => true,
-				'font_display'                     => 'swap', // block|swap|fallback|optional.
-				'load_on_cron'                     => false,
-				'search'                           => false,
-				'widget_area'                      => false,
-				'custom_fonts'                     => true,
-			);
-
-			$args = Redux_Functions::parse_args( $args, $default );
-
-			$args = $this->args( $args );
-
-			$args = $this->default_cleanup( $args );
-
-			if ( ! in_array( $args['font_display'], array( 'block', 'swap', 'fallback', 'optional' ), true ) ) {
-				$args['font_display'] = 'swap';
-			}
-
-			if ( isset( $args['async_typography'] ) && $args['async_typography'] ) {
-				$args['async_typography'] = false;
-			}
-
-			$this->get = $args;
-
-			$this->parent->args = $args;
-
-			if ( 'redux_extensions_demo' !== $args['opt_name'] && 'redux_demo' !== $args['opt_name'] ) {
-				$this->change_demo_defaults( $args );
-			}
-		}
-
-		/**
-		 * Builds and sanitizes a global args array.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return array
-		 */
-		private function args( array $args ): array {
-			$args = $this->no_errors_please( $args );
-
-			$this->parent->old_opt_name = $args['opt_name'];
-
-			$args = $this->filters( $args );
-
-			if ( ! function_exists( 'wp_rand' ) ) {
-				require_once ABSPATH . '/wp-includes/pluggable.php';
-			}
-
-			if ( $args['opt_name'] === $this->parent->old_opt_name ) {
-				$this->parent->old_opt_name = null;
-				unset( $this->parent->old_opt_name );
-			}
-
-			// Do not save the defaults if we're on a live preview!
-			if ( 'customize' === $GLOBALS['pagenow'] && isset( $_GET['customize_theme'] ) && ! empty( $_GET['customize_theme'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$args['save_defaults'] = false;
-			}
-
-			return $this->shim( $args );
-		}
-
-		/**
-		 * Apply filters to arg data.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return mixed|void
-		 */
-		private function filters( array $args ) {
-			/**
-			 * Filter 'redux/args/{opt_name}'
-			 *
-			 * @param     array     $args ReduxFramework configuration
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$args = apply_filters( "redux/args/{$args['opt_name']}", $args );
-
-			/**
-			 * Filter 'redux/options/{opt_name}/args'
-			 *
-			 * @param     array     $args ReduxFramework configuration
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			return apply_filters( "redux/options/{$args['opt_name']}/args", $args );
-		}
-
-		/**
-		 * Sanitize args that should not be empty.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return array
-		 */
-		private function no_errors_please( array $args ): array {
-			if ( empty( $args['transient_time'] ) ) {
-				$args['transient_time'] = 60 * MINUTE_IN_SECONDS;
-			}
-
-			if ( empty( $args['footer_credit'] ) ) {
-
-				$footer_text = sprintf(
-				/* translators: 1: Redux, 2: Link to plugin review */
-					__( 'Enjoyed %1$s? Please leave us a %2$s rating. We really appreciate your support!', 'redux-framework' ),
-					'<strong>' . __( 'Redux', 'redux-framework' ) . '</strong>',
-					'<a href="https://wordpress.org/support/plugin/redux-framework/reviews/?filter=5/#new-post" target="_blank">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
-				);
-				$args['footer_credit'] = '<span id="footer-thankyou">' . $footer_text . '</span>';
-			}
-
-			if ( empty( $args['menu_title'] ) ) {
-				$args['menu_title'] = esc_html__( 'Options', 'redux-framework' );
-			}
-
-			if ( empty( $args['page_title'] ) ) {
-				$args['page_title'] = esc_html__( 'Options', 'redux-framework' );
-			}
-
-			// Auto creates the page_slug appropriately.
-			if ( empty( $args['page_slug'] ) ) {
-				if ( ! empty( $args['display_name'] ) ) {
-					$args['page_slug'] = sanitize_html_class( $args['display_name'] );
-				} elseif ( ! empty( $args['page_title'] ) ) {
-					$args['page_slug'] = sanitize_html_class( $args['page_title'] );
-				} elseif ( ! empty( $args['menu_title'] ) ) {
-					$args['page_slug'] = sanitize_html_class( $args['menu_title'] );
-				} else {
-					$args['page_slug'] = str_replace( '-', '_', $args['opt_name'] );
-				}
-			}
-
-			return $args;
-		}
-
-		/**
-		 * Shims for much older v3 configs.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return array
-		 */
-		private function shim( array $args ): array {
-			/**
-			 * SHIM SECTION
-			 * Old variables and ways of doing things that need correcting.  ;)
-			 * */
-			// Variable name change.
-			if ( ! empty( $args['page_cap'] ) ) {
-				$args['page_permissions'] = $args['page_cap'];
-				unset( $args['page_cap'] );
-			}
-
-			if ( ! empty( $args['page_position'] ) ) {
-				$args['page_priority'] = $args['page_position'];
-				unset( $args['page_position'] );
-			}
-
-			if ( ! empty( $args['page_type'] ) ) {
-				$args['menu_type'] = $args['page_type'];
-				unset( $args['page_type'] );
-			}
-
-			return $args;
-		}
-
-		/**
-		 * Verify to see if dev has bothered to change admin bar links and share icons from demo data to their own.
-		 *
-		 * @param array $args Global args.
-		 */
-		private function change_demo_defaults( array $args ) {
-			if ( $args['dev_mode'] || true === Redux_Helpers::is_local_host() ) {
-				if ( ! empty( $args['admin_bar_links'] ) ) {
-					foreach ( $args['admin_bar_links'] as $arr ) {
-						if ( is_array( $arr ) && ! empty( $arr ) ) {
-							foreach ( $arr as $y ) {
-								if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
-									$this->omit_items = true;
-									break;
-								}
-							}
-						}
-					}
-				}
-
-				if ( ! empty( $args['share_icons'] ) ) {
-					foreach ( $args['share_icons'] as $arr ) {
-						if ( is_array( $arr ) && ! empty( $arr ) ) {
-							foreach ( $arr as $y ) {
-								if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
-									$this->omit_icons = true;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		/**
-		 * Fix other arg criteria that sometimes gets hosed up.
-		 *
-		 * @param array $args Global args.
-		 *
-		 * @return array
-		 * @noinspection PhpStrictComparisonWithOperandsOfDifferentTypesInspection
-		 */
-		private function default_cleanup( array $args ): array {
-
-			// Fix the global variable name.
-			if ( '' === $args['global_variable'] && false !== $args['global_variable'] ) {
-				$args['global_variable'] = str_replace( '-', '_', $args['opt_name'] );
-			}
-
-			if ( isset( $args['customizer_only'] ) && $args['customizer_only'] ) {
-				$args['menu_type']      = 'hidden';
-				$args['customizer']     = true;
-				$args['admin_bar']      = false;
-				$args['allow_sub_menu'] = false;
-			}
-
-			// Check if the Airplane Mode plugin is installed.
-			if ( class_exists( 'Airplane_Mode_Core' ) ) {
-				$airplane = Airplane_Mode_Core::getInstance();
-				if ( method_exists( $airplane, 'enabled' ) ) {
-					if ( $airplane->enabled() ) {
-						$args['use_cdn'] = false;
-					}
-				} elseif ( 'on' === $airplane->check_status() ) {
-					$args['use_cdn'] = false;
-				}
-			}
-
-			return $args;
-		}
-	}
+    /**
+     * Class Redux_Args
+     */
+    class Redux_Args {
+
+        /**
+         * Returns entire arguments array.
+         *
+         * @var array|mixed
+         */
+        public $get = array();
+
+        /**
+         * ReduxFramework object.
+         *
+         * @var ReduxFramework|null
+         */
+        private ?ReduxFramework $parent;
+
+        /**
+         * Switch to omit social icons if dev_mode is set to true and Redux defaults are used.
+         *
+         * @var bool
+         */
+        public bool $omit_icons = false;
+
+        /**
+         * Switch to omit support menu items if dev_mode is set to true and redux defaults are used.
+         *
+         * @var bool
+         */
+        public bool $omit_items = false;
+
+        /**
+         * Flag to force dev_mod to true if in localhost or WP_DEBUG is set to true.
+         *
+         * @var bool
+         */
+        public bool $dev_mode_forced = false;
+
+        /**
+         * Redux_Args constructor.
+         *
+         * @param ReduxFramework $redux ReduxFramework object.
+         * @param array          $args  Global arguments array.
+         */
+        public function __construct( ReduxFramework $redux, array $args ) {
+            $this->parent = $redux;
+
+            $default = array(
+                'opt_name'                         => '',
+                'last_tab'                         => '',
+                'menu_icon'                        => '',
+                'menu_title'                       => '',
+                'page_title'                       => '',
+                'page_slug'                        => '',
+                'page_permissions'                 => 'manage_options',
+                'menu_type'                        => 'menu',
+                'page_parent'                      => 'themes.php',
+                'page_priority'                    => null,
+                'allow_sub_menu'                   => true,
+                'save_defaults'                    => true,
+                'footer_credit'                    => '',
+                'async_typography'                 => false,
+                'disable_google_fonts_link'        => false,
+                'class'                            => '',
+                'admin_bar'                        => true,
+                'admin_bar_priority'               => 999,
+                'admin_bar_icon'                   => '',
+                'help_tabs'                        => array(),
+                'help_sidebar'                     => '',
+                'database'                         => '',
+                'customizer'                       => false,
+                'global_variable'                  => '',
+                'output'                           => true,
+                'output_variables_prefix'          => '--',
+                'compiler_output_variables_prefix' => '$',
+                'compiler'                         => true,
+                'output_tag'                       => true,
+                'output_location'                  => array( 'frontend' ),
+                'transient_time'                   => '',
+                'default_show'                     => false,
+                'default_mark'                     => '',
+                'disable_save_warn'                => false,
+                'open_expanded'                    => false,
+                'hide_expand'                      => false,
+                'network_admin'                    => false,
+                'network_sites'                    => true,
+                'hide_reset'                       => false,
+                'hide_save'                        => false,
+                'hints'                            => array(
+                    'icon'          => 'el el-question-sign',
+                    'icon_position' => 'right',
+                    'icon_color'    => 'lightgray',
+                    'icon_size'     => 'normal',
+                    'tip_style'     => array(
+                        'color'   => 'light',
+                        'shadow'  => true,
+                        'rounded' => false,
+                        'style'   => '',
+                    ),
+                    'tip_position'  => array(
+                        'my' => 'top_left',
+                        'at' => 'bottom_right',
+                    ),
+                    'tip_effect'    => array(
+                        'show' => array(
+                            'effect'   => 'slide',
+                            'duration' => '500',
+                            'event'    => 'mouseover',
+                        ),
+                        'hide' => array(
+                            'effect'   => 'fade',
+                            'duration' => '500',
+                            'event'    => 'click mouseleave',
+                        ),
+                    ),
+                ),
+                'font_weights'                     => array(
+                    array(
+                        'id'   => '400',
+                        'name' => __( 'Regular 400', 'redux-framework' ),
+                    ),
+                    array(
+                        'id'   => '400italic',
+                        'name' => __( 'Regular 400 Italic', 'redux-framework' ),
+                    ),
+                    array(
+                        'id'   => '700',
+                        'name' => __( 'Bold 700', 'redux-framework' ),
+                    ),
+                    array(
+                        'id'   => '700italic',
+                        'name' => __( 'Bold 700 Italic', 'redux-framework' ),
+                    ),
+                ),
+                'show_import_export'               => true,
+                'show_options_object'              => true,
+                'dev_mode'                         => true,
+                'templates_path'                   => '',
+                'ajax_save'                        => true,
+                'use_cdn'                          => true,
+                'cdn_check_time'                   => 1440,
+                'options_api'                      => true,
+                'allow_tracking'                   => true,
+                'admin_theme'                      => 'wp',
+                'elusive_frontend'                 => false,
+                'fontawesome_frontend'             => false,
+                'flyout_submenus'                  => true,
+                'font_display'                     => 'swap', // block|swap|fallback|optional.
+                'load_on_cron'                     => false,
+                'search'                           => false,
+                'widget_area'                      => false,
+                'custom_fonts'                     => true,
+            );
+
+            $args = Redux_Functions::parse_args( $args, $default );
+
+            $args = $this->args( $args );
+
+            $args = $this->default_cleanup( $args );
+
+            if ( ! in_array( $args['font_display'], array( 'block', 'swap', 'fallback', 'optional' ), true ) ) {
+                $args['font_display'] = 'swap';
+            }
+
+            if ( isset( $args['async_typography'] ) && $args['async_typography'] ) {
+                $args['async_typography'] = false;
+            }
+
+            $this->get = $args;
+
+            $this->parent->args = $args;
+
+            if ( 'redux_extensions_demo' !== $args['opt_name'] && 'redux_demo' !== $args['opt_name'] ) {
+                $this->change_demo_defaults( $args );
+            }
+        }
+
+        /**
+         * Builds and sanitizes a global args array.
+         *
+         * @param     array $args Global args.
+         *
+         * @return array
+         */
+        private function args( array $args ): array {
+            $args = $this->no_errors_please( $args );
+
+            $this->parent->old_opt_name = $args['opt_name'];
+
+            $args = $this->filters( $args );
+
+            if ( ! function_exists( 'wp_rand' ) ) {
+                require_once ABSPATH . '/wp-includes/pluggable.php';
+            }
+
+            if ( $args['opt_name'] === $this->parent->old_opt_name ) {
+                $this->parent->old_opt_name = null;
+                unset( $this->parent->old_opt_name );
+            }
+
+            // Do not save the defaults if we're on a live preview!
+            if ( 'customize' === $GLOBALS['pagenow'] && isset( $_GET['customize_theme'] ) && ! empty( $_GET['customize_theme'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $args['save_defaults'] = false;
+            }
+
+            return $this->shim( $args );
+        }
+
+        /**
+         * Apply filters to arg data.
+         *
+         * @param     array $args Global args.
+         *
+         * @return mixed|void
+         */
+        private function filters( array $args ) {
+            /**
+             * Filter 'redux/args/{opt_name}'
+             *
+             * @param     array     $args ReduxFramework configuration
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $args = apply_filters( "redux/args/{$args['opt_name']}", $args );
+
+            /**
+             * Filter 'redux/options/{opt_name}/args'
+             *
+             * @param     array     $args ReduxFramework configuration
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            return apply_filters( "redux/options/{$args['opt_name']}/args", $args );
+        }
+
+        /**
+         * Sanitize args that should not be empty.
+         *
+         * @param     array $args Global args.
+         *
+         * @return array
+         */
+        private function no_errors_please( array $args ): array {
+            if ( empty( $args['transient_time'] ) ) {
+                $args['transient_time'] = 60 * MINUTE_IN_SECONDS;
+            }
+
+            if ( empty( $args['footer_credit'] ) ) {
+
+                $footer_text = sprintf(
+                /* translators: 1: Redux, 2: Link to plugin review */
+                    __( 'Enjoyed %1$s? Please leave us a %2$s rating. We really appreciate your support!', 'redux-framework' ),
+                    '<strong>' . __( 'Redux', 'redux-framework' ) . '</strong>',
+                    '<a href="https://wordpress.org/support/plugin/redux-framework/reviews/?filter=5/#new-post" target="_blank">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
+                );
+                $args['footer_credit'] = '<span id="footer-thankyou">' . $footer_text . '</span>';
+            }
+
+            if ( empty( $args['menu_title'] ) ) {
+                $args['menu_title'] = esc_html__( 'Options', 'redux-framework' );
+            }
+
+            if ( empty( $args['page_title'] ) ) {
+                $args['page_title'] = esc_html__( 'Options', 'redux-framework' );
+            }
+
+            // Auto creates the page_slug appropriately.
+            if ( empty( $args['page_slug'] ) ) {
+                if ( ! empty( $args['display_name'] ) ) {
+                    $args['page_slug'] = sanitize_html_class( $args['display_name'] );
+                } elseif ( ! empty( $args['page_title'] ) ) {
+                    $args['page_slug'] = sanitize_html_class( $args['page_title'] );
+                } elseif ( ! empty( $args['menu_title'] ) ) {
+                    $args['page_slug'] = sanitize_html_class( $args['menu_title'] );
+                } else {
+                    $args['page_slug'] = str_replace( '-', '_', $args['opt_name'] );
+                }
+            }
+
+            return $args;
+        }
+
+        /**
+         * Shims for much older v3 configs.
+         *
+         * @param     array $args Global args.
+         *
+         * @return array
+         */
+        private function shim( array $args ): array {
+            /**
+             * SHIM SECTION
+             * Old variables and ways of doing things that need correcting.  ;)
+             * */
+            // Variable name change.
+            if ( ! empty( $args['page_cap'] ) ) {
+                $args['page_permissions'] = $args['page_cap'];
+                unset( $args['page_cap'] );
+            }
+
+            if ( ! empty( $args['page_position'] ) ) {
+                $args['page_priority'] = $args['page_position'];
+                unset( $args['page_position'] );
+            }
+
+            if ( ! empty( $args['page_type'] ) ) {
+                $args['menu_type'] = $args['page_type'];
+                unset( $args['page_type'] );
+            }
+
+            return $args;
+        }
+
+        /**
+         * Verify to see if dev has bothered to change admin bar links and share icons from demo data to their own.
+         *
+         * @param array $args Global args.
+         */
+        private function change_demo_defaults( array $args ) {
+            if ( $args['dev_mode'] || true === Redux_Helpers::is_local_host() ) {
+                if ( ! empty( $args['admin_bar_links'] ) ) {
+                    foreach ( $args['admin_bar_links'] as $arr ) {
+                        if ( is_array( $arr ) && ! empty( $arr ) ) {
+                            foreach ( $arr as $y ) {
+                                if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
+                                    $this->omit_items = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if ( ! empty( $args['share_icons'] ) ) {
+                    foreach ( $args['share_icons'] as $arr ) {
+                        if ( is_array( $arr ) && ! empty( $arr ) ) {
+                            foreach ( $arr as $y ) {
+                                if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
+                                    $this->omit_icons = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Fix other arg criteria that sometimes gets hosed up.
+         *
+         * @param array $args Global args.
+         *
+         * @return array
+         * @noinspection PhpStrictComparisonWithOperandsOfDifferentTypesInspection
+         */
+        private function default_cleanup( array $args ): array {
+
+            // Fix the global variable name.
+            if ( '' === $args['global_variable'] && false !== $args['global_variable'] ) {
+                $args['global_variable'] = str_replace( '-', '_', $args['opt_name'] );
+            }
+
+            if ( isset( $args['customizer_only'] ) && $args['customizer_only'] ) {
+                $args['menu_type']      = 'hidden';
+                $args['customizer']     = true;
+                $args['admin_bar']      = false;
+                $args['allow_sub_menu'] = false;
+            }
+
+            // Check if the Airplane Mode plugin is installed.
+            if ( class_exists( 'Airplane_Mode_Core' ) ) {
+                $airplane = Airplane_Mode_Core::getInstance();
+                if ( method_exists( $airplane, 'enabled' ) ) {
+                    if ( $airplane->enabled() ) {
+                        $args['use_cdn'] = false;
+                    }
+                } elseif ( 'on' === $airplane->check_status() ) {
+                    $args['use_cdn'] = false;
+                }
+            }
+
+            return $args;
+        }
+    }
 }

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

Indentation +295 added lines, -295 removed lines

@@ -11,299 +11,299 @@
 
 if ( ! class_exists( 'Redux_Shortcodes' ) ) {
 
-	/**
-	 * Redux Framework shortcode extension class. Takes the common WordPress functions `wp_get_theme()` and `bloginfo()` and a few other functions and makes them accessible via shortcodes. Below you will find a table for the possible shortcodes and their values.
-	 * | shortcode | Function | Description |
-	 * |-----------|----------|-------------|
-	 * | blog-name | bloginfo("name") | Displays the "Site Title" set in Settings > General. This data is retrieved from the "blogname" record in the wp_options table. |
-	 * | blog-description | bloginfo("description") |  Displays the "Tagline" set in Settings > General. This data is retrieved from the "blogdescription" record in the wp_options table.|
-	 * | blog-wpurl | bloginfo("wpurl") |  Displays the "WordPress address (URL)" set in Settings > General. This data is retrieved from the "siteurl" record in the wp_options table. Consider using **blog-root_url** instead, especially for multi-site configurations using paths instead of subdomains (it will return the root site not the current sub-site). |
-	 * | blog-root_url | site_url() |  Return the root site, not the current sub-site. |
-	 * | blog-url | home_url() |  Displays the "Site address (URL)" set in Settings > General. This data is retrieved from the "home" record in the wp_options table. |
-	 * | blog-admin_email | bloginfo("admin_email") |  Displays the "E-mail address" set in Settings > General. This data is retrieved from the "admin_email" record in the wp_options table.|
-	 * | blog-charset | bloginfo("charset") |  Displays the "Encoding for pages and feeds" set in Settings > Reading. This data is retrieved from the "blog_charset" record in the wp_options table. Note: In Version 3.5.0 and later, character encoding is no longer configurable from the Administration Panel. Therefore, this parameter always echoes "UTF-8", which is the default encoding of WordPress.|
-	 * | blog-version | bloginfo("version") |  Displays the WordPress Version you use. This data is retrieved from the $wp_version variable set in wp-includes/version.php.|
-	 * | blog-html_type | bloginfo("html_type") |  Displays the Content-Type of WordPress HTML pages (default: "text/html"). This data is retrieved from the "html_type" record in the wp_options table. Themes and plugins can override the default value using the pre_option_html_type filter.|
-	 * | blog-text_direction | bloginfo("text_direction") |  Displays the Text Direction of WordPress HTML pages. Consider using **blog-text_direction_boolean** instead if you want a true/false response. |
-	 * | blog-text_direction_boolean | is_rtl() |  Displays true/false check if the Text Direction of WordPress HTML pages is left instead of right |
-	 * | blog-language | bloginfo("language") |  Displays the language of WordPress.|
-	 * | blog-stylesheet_url | get_stylesheet_uri() |  Displays the primary CSS (usually style.css) file URL of the active theme. |
-	 * | blog-stylesheet_directory | bloginfo("stylesheet_directory") |  Displays the stylesheet directory URL of the active theme. (Was a local path in earlier WordPress versions.) Consider echoing get_stylesheet_directory_uri() instead.|
-	 * | blog-template_url | get_template_directory_uri() |  Parent template uri. Consider using **blog-child_template_url** for the child template URI. |
-	 * | blog-child_template_url | get_stylesheet_directory_uri() | Child template URI. |
-	 * | blog-pingback_url | bloginfo("pingback_url") |  Displays the Pingback XML-RPC file URL (xmlrpc.php).|
-	 * | blog-atom_url | bloginfo("atom_url") |  Displays the Atom feed URL (/feed/atom).|
-	 * | blog-rdf_url | bloginfo("rdf_url") |  Displays the RDF/RSS 1.0 feed URL (/feed/rfd).|
-	 * | blog-rss_url | bloginfo("rss_url") |  Displays the RSS 0.92 feed URL (/feed/rss).|
-	 * | blog-rss2_url | bloginfo("rss2_url") |  Displays the RSS 2.0 feed URL (/feed).|
-	 * | blog-comments_atom_url | bloginfo("comments_atom_url") |  Displays the comments Atom feed URL (/comments/feed).|
-	 * | blog-comments_rss2_url | bloginfo("comments_rss2_url") |  Displays the comments RSS 2.0 feed URL (/comments/feed).|
-	 * | login-url | wp_login_url() | Returns the WordPress login URL. |
-	 * | login-url | wp_logout_url() | Returns the WordPress logout URL. |
-	 * | current_year | date("Y") | Returns the current year. |
-	 * | theme-name | $theme_info->get("Name") | Theme name as given in theme's style.css |
-	 * | theme-uri | $theme_info->get("ThemeURI") | The path to the theme's directory |
-	 * | theme-description | $theme_info->get("Description") | The description of the theme |
-	 * | theme-author | $theme_info->get("Author") | The theme's author |
-	 * | theme-author_uri | $theme_info->get("AuthorURI") | The website of the theme author |
-	 * | theme-version | $theme_info->get("Version") | The version of the theme |
-	 * | theme-template | $theme_info->get("Template") | The folder name of the current theme |
-	 * | theme-status | $theme_info->get("Status") | If the theme is published |
-	 * | theme-tags | $theme_info->get("Tags") | Tags used to describe the theme |
-	 * | theme-text_domain | $theme_info->get("TextDomain") | The text domain used in the theme for translation purposes |
-	 * | theme-domain_path | $theme_info->get("DomainPath") | Path to the theme translation files |
-	 *
-	 * @version 1.0.0
-	 */
-
-	/**
-	 * Class Redux_Shortcodes
-	 */
-	class Redux_Shortcodes {
-
-		/**
-		 * Redux_Shortcodes constructor.
-		 */
-		public function __construct() {
-			if ( ! shortcode_exists( 'bloginfo' ) ) {
-				add_shortcode( 'bloginfo', array( $this, 'blog_info' ) );
-			} else {
-				add_shortcode( 'redux_bloginfo', array( $this, 'blog_info' ) );
-			}
-
-			if ( ! shortcode_exists( 'themeinfo' ) ) {
-				add_shortcode( 'themeinfo', array( $this, 'theme_info' ) );
-			} else {
-				add_shortcode( 'redux_themeinfo', array( $this, 'theme_info' ) );
-			}
-
-			if ( ! shortcode_exists( 'date' ) ) {
-				add_shortcode( 'date', array( $this, 'date' ) );
-			} else {
-				add_shortcode( 'redux_date', array( $this, 'date' ) );
-			}
-		}
-
-		/**
-		 * Return site/blog info by a validated selector.
-		 * Assumes the return value is printed into HTML (text node).
-		 * If you need raw values for other contexts, remove the esc_* here
-		 * and escape at the final render point instead.
-		 *
-		 * @param array|string $atts    Attributes.
-		 * @param string|null  $content Content.
-		 *
-		 * @return string Escaped for HTML text (URLs are escaped with esc_url()).
-		 */
-		public function blog_info( $atts = array(), ?string $content = null ): string {
-
-			// Normalize and merge defaults.
-			$atts = is_array( $atts ) ? wp_unslash( $atts ) : array();
-			$atts = shortcode_atts(
-				array(
-					'data' => '',
-				),
-				$atts
-			);
-
-			// Allow content as fallback for the selector.
-			if ( null !== $content && '' === $atts['data'] ) {
-				$atts['data'] = $content;
-			}
-
-			// Validate selector as a key and clamp length.
-			$key = substr( sanitize_key( $atts['data'] ), 0, 64 );
-
-			// Map aliases -> handlers.
-			// Keep your original intent (filesystem paths vs URIs) but make it safe and explicit.
-			switch ( $key ) {
-				// Filesystem paths (escape as text).
-				case 'stylesheet_directory':
-				case 'child_template_directory':
-					return esc_html( get_stylesheet_directory() );
-
-				case 'template_directory':
-					return esc_html( get_template_directory() );
-
-				// Theme URIs.
-				case 'parent_template_url':
-					return esc_url( get_template_directory_uri() );
-
-				case 'child_template_url':
-				case 'template_url':
-					return esc_url( get_stylesheet_directory_uri() );
-
-				// URLs.
-				case 'url':
-					return esc_url( home_url() );
-
-				case 'root_url':
-					return esc_url( site_url() );
-
-				case 'stylesheet_url':
-					return esc_url( get_stylesheet_uri() );
-
-				case 'logout_url':
-					return esc_url( wp_logout_url() );
-
-				case 'login_url':
-					return esc_url( wp_login_url() );
-
-				case 'register_url':
-					return esc_url( wp_registration_url() );
-
-				case 'lostpassword_url':
-				case 'lost_password_url':
-					return esc_url( wp_lostpassword_url() );
-
-				// Booleans.
-				case 'text_direction_bool':
-				case 'text_direction_boolean':
-					return esc_html( is_rtl() ? '1' : '0' );
-
-				case 'is_multisite':
-					return esc_html( is_multisite() ? '1' : '0' );
-
-				// Text direction as string.
-				case 'text_direction':
-					return esc_html( is_rtl() ? 'rtl' : 'ltr' );
-
-				default:
-					// Safe fallback: pull raw blog info, then escape as text.
-					// (Avoid over-sanitizing: this is trusted core data).
-					$value = get_bloginfo( $key );
-					return esc_html( (string) $value );
-			}
-		}
-
-		/**
-		 * Get theme info.
-		 *
-		 * @param array|string $atts    Attributes.
-		 * @param string|null  $content Content.
-		 *
-		 * @return string
-		 */
-		public function theme_info( array $atts = array(), ?string $content = null ): string {
-			// Normalize input and merge defaults.
-			$atts = wp_unslash( $atts );
-			$atts = shortcode_atts(
-				array(
-					'data' => '',
-				),
-				$atts
-			);
-
-			// Allow content as a fallback selector.
-			if ( null !== $content && '' === $atts['data'] ) {
-				$atts['data'] = $content;
-			}
-
-			// Validate selector as a key.
-			$key = sanitize_key( $atts['data'] );
-
-			// Map aliases -> canonical WP_Theme header keys or special handlers.
-			$map = array(
-				'name'        => 'Name',
-				'themeuri'    => 'ThemeURI',
-				'theme_uri'   => 'ThemeURI',
-				'description' => 'Description',
-				'author'      => 'Author',
-				'authoruri'   => 'AuthorURI',
-				'author_uri'  => 'AuthorURI',
-				'version'     => 'Version',
-				'template'    => 'Template',
-				'status'      => 'Status',
-				'tags'        => 'Tags',
-				'textdomain'  => 'TextDomain',
-				'text_domain' => 'TextDomain',
-				'domainpath'  => 'DomainPath',
-				'domain_path' => 'DomainPath',
-				'is_child'    => 'is_child', // special case.
-			);
-
-			// Default to "name" when empty or unknown.
-			if ( '' === $key || ! isset( $map[ $key ] ) ) {
-				$key = 'name';
-			}
-
-			// Cache theme object.
-			if ( empty( $this->theme_info ) ) {
-				$this->theme_info = wp_get_theme();
-			}
-
-			$canonical = $map[ $key ];
-
-			// Special case: is_child — return "1" or "0" as string.
-			if ( 'is_child' === $canonical ) {
-				$bool = Redux_Helpers::is_child_theme( get_template_directory() );
-				return esc_html( $bool ? '1' : '0' );
-			}
-
-			$value = $this->theme_info->get( $canonical );
-
-			// WP_Theme::get('Tags') may be array; normalize to string.
-			if ( is_array( $value ) ) {
-				$value = implode( ', ', array_filter( array_map( 'trim', $value ) ) );
-			}
-
-			$value = (string) $value;
-
-			// Escape by context.
-			switch ( $canonical ) {
-				case 'ThemeURI':
-				case 'AuthorURI':
-					// If you ultimately print this inside an href, escape at that final context instead.
-					// Here we assume the plain text output of the URL.
-					return esc_url( $value );
-
-				default:
-					return esc_html( $value );
-			}
-		}
-
-		/**
-		 * Get date info.
-		 *
-		 * @param array|string $atts    Attributes.
-		 * @param string|null  $content Content.
-		 *
-		 * @return string
-		 */
-		public function date( $atts = array(), ?string $content = null ): string {
-
-			// 1) Normalize + unslash
-			$atts = is_array( $atts ) ? wp_unslash( $atts ) : array();
-
-			// 2) Default/merge (if this is a shortcode handler, pass the tag as the 3rd arg)
-			$atts = shortcode_atts(
-				array(
-					'data' => '',
-				),
-				$atts
-			);
-
-			// 3) Allow content as a fallback for the format
-			if ( null !== $content && '' === $atts['data'] ) {
-				// Keep content simple text; strip tags and control chars.
-				$atts['data'] = sanitize_text_field( wp_unslash( $content ) );
-			}
-
-			// 4) Validate and constrain the format string
-			$format = (string) $atts['data'];
-			$format = substr( $format, 0, 64 ); // avoid absurdly long inputs.
-
-			// Allow common date format tokens + typical literal punctuation and backslash for escaping.
-			// If invalid chars are present, fall back to a safe default.
-			if ( '' === $format || ! preg_match( '/^[A-Za-z0-9\s:\-.,\/\\\\T]+$/', $format ) ) {
-				$format = 'Y';
-			}
-
-			// 5) Use wp_date() to respect WP timezone and locale (date_i18n is deprecated).
-			$output = wp_date( $format );
-
-			// 6) Escape for HTML context before returning (safe default for shortcode/rendered output).
-			return esc_html( $output );
-		}
-	}
+    /**
+     * Redux Framework shortcode extension class. Takes the common WordPress functions `wp_get_theme()` and `bloginfo()` and a few other functions and makes them accessible via shortcodes. Below you will find a table for the possible shortcodes and their values.
+     * | shortcode | Function | Description |
+     * |-----------|----------|-------------|
+     * | blog-name | bloginfo("name") | Displays the "Site Title" set in Settings > General. This data is retrieved from the "blogname" record in the wp_options table. |
+     * | blog-description | bloginfo("description") |  Displays the "Tagline" set in Settings > General. This data is retrieved from the "blogdescription" record in the wp_options table.|
+     * | blog-wpurl | bloginfo("wpurl") |  Displays the "WordPress address (URL)" set in Settings > General. This data is retrieved from the "siteurl" record in the wp_options table. Consider using **blog-root_url** instead, especially for multi-site configurations using paths instead of subdomains (it will return the root site not the current sub-site). |
+     * | blog-root_url | site_url() |  Return the root site, not the current sub-site. |
+     * | blog-url | home_url() |  Displays the "Site address (URL)" set in Settings > General. This data is retrieved from the "home" record in the wp_options table. |
+     * | blog-admin_email | bloginfo("admin_email") |  Displays the "E-mail address" set in Settings > General. This data is retrieved from the "admin_email" record in the wp_options table.|
+     * | blog-charset | bloginfo("charset") |  Displays the "Encoding for pages and feeds" set in Settings > Reading. This data is retrieved from the "blog_charset" record in the wp_options table. Note: In Version 3.5.0 and later, character encoding is no longer configurable from the Administration Panel. Therefore, this parameter always echoes "UTF-8", which is the default encoding of WordPress.|
+     * | blog-version | bloginfo("version") |  Displays the WordPress Version you use. This data is retrieved from the $wp_version variable set in wp-includes/version.php.|
+     * | blog-html_type | bloginfo("html_type") |  Displays the Content-Type of WordPress HTML pages (default: "text/html"). This data is retrieved from the "html_type" record in the wp_options table. Themes and plugins can override the default value using the pre_option_html_type filter.|
+     * | blog-text_direction | bloginfo("text_direction") |  Displays the Text Direction of WordPress HTML pages. Consider using **blog-text_direction_boolean** instead if you want a true/false response. |
+     * | blog-text_direction_boolean | is_rtl() |  Displays true/false check if the Text Direction of WordPress HTML pages is left instead of right |
+     * | blog-language | bloginfo("language") |  Displays the language of WordPress.|
+     * | blog-stylesheet_url | get_stylesheet_uri() |  Displays the primary CSS (usually style.css) file URL of the active theme. |
+     * | blog-stylesheet_directory | bloginfo("stylesheet_directory") |  Displays the stylesheet directory URL of the active theme. (Was a local path in earlier WordPress versions.) Consider echoing get_stylesheet_directory_uri() instead.|
+     * | blog-template_url | get_template_directory_uri() |  Parent template uri. Consider using **blog-child_template_url** for the child template URI. |
+     * | blog-child_template_url | get_stylesheet_directory_uri() | Child template URI. |
+     * | blog-pingback_url | bloginfo("pingback_url") |  Displays the Pingback XML-RPC file URL (xmlrpc.php).|
+     * | blog-atom_url | bloginfo("atom_url") |  Displays the Atom feed URL (/feed/atom).|
+     * | blog-rdf_url | bloginfo("rdf_url") |  Displays the RDF/RSS 1.0 feed URL (/feed/rfd).|
+     * | blog-rss_url | bloginfo("rss_url") |  Displays the RSS 0.92 feed URL (/feed/rss).|
+     * | blog-rss2_url | bloginfo("rss2_url") |  Displays the RSS 2.0 feed URL (/feed).|
+     * | blog-comments_atom_url | bloginfo("comments_atom_url") |  Displays the comments Atom feed URL (/comments/feed).|
+     * | blog-comments_rss2_url | bloginfo("comments_rss2_url") |  Displays the comments RSS 2.0 feed URL (/comments/feed).|
+     * | login-url | wp_login_url() | Returns the WordPress login URL. |
+     * | login-url | wp_logout_url() | Returns the WordPress logout URL. |
+     * | current_year | date("Y") | Returns the current year. |
+     * | theme-name | $theme_info->get("Name") | Theme name as given in theme's style.css |
+     * | theme-uri | $theme_info->get("ThemeURI") | The path to the theme's directory |
+     * | theme-description | $theme_info->get("Description") | The description of the theme |
+     * | theme-author | $theme_info->get("Author") | The theme's author |
+     * | theme-author_uri | $theme_info->get("AuthorURI") | The website of the theme author |
+     * | theme-version | $theme_info->get("Version") | The version of the theme |
+     * | theme-template | $theme_info->get("Template") | The folder name of the current theme |
+     * | theme-status | $theme_info->get("Status") | If the theme is published |
+     * | theme-tags | $theme_info->get("Tags") | Tags used to describe the theme |
+     * | theme-text_domain | $theme_info->get("TextDomain") | The text domain used in the theme for translation purposes |
+     * | theme-domain_path | $theme_info->get("DomainPath") | Path to the theme translation files |
+     *
+     * @version 1.0.0
+     */
+
+    /**
+     * Class Redux_Shortcodes
+     */
+    class Redux_Shortcodes {
+
+        /**
+         * Redux_Shortcodes constructor.
+         */
+        public function __construct() {
+            if ( ! shortcode_exists( 'bloginfo' ) ) {
+                add_shortcode( 'bloginfo', array( $this, 'blog_info' ) );
+            } else {
+                add_shortcode( 'redux_bloginfo', array( $this, 'blog_info' ) );
+            }
+
+            if ( ! shortcode_exists( 'themeinfo' ) ) {
+                add_shortcode( 'themeinfo', array( $this, 'theme_info' ) );
+            } else {
+                add_shortcode( 'redux_themeinfo', array( $this, 'theme_info' ) );
+            }
+
+            if ( ! shortcode_exists( 'date' ) ) {
+                add_shortcode( 'date', array( $this, 'date' ) );
+            } else {
+                add_shortcode( 'redux_date', array( $this, 'date' ) );
+            }
+        }
+
+        /**
+         * Return site/blog info by a validated selector.
+         * Assumes the return value is printed into HTML (text node).
+         * If you need raw values for other contexts, remove the esc_* here
+         * and escape at the final render point instead.
+         *
+         * @param array|string $atts    Attributes.
+         * @param string|null  $content Content.
+         *
+         * @return string Escaped for HTML text (URLs are escaped with esc_url()).
+         */
+        public function blog_info( $atts = array(), ?string $content = null ): string {
+
+            // Normalize and merge defaults.
+            $atts = is_array( $atts ) ? wp_unslash( $atts ) : array();
+            $atts = shortcode_atts(
+                array(
+                    'data' => '',
+                ),
+                $atts
+            );
+
+            // Allow content as fallback for the selector.
+            if ( null !== $content && '' === $atts['data'] ) {
+                $atts['data'] = $content;
+            }
+
+            // Validate selector as a key and clamp length.
+            $key = substr( sanitize_key( $atts['data'] ), 0, 64 );
+
+            // Map aliases -> handlers.
+            // Keep your original intent (filesystem paths vs URIs) but make it safe and explicit.
+            switch ( $key ) {
+                // Filesystem paths (escape as text).
+                case 'stylesheet_directory':
+                case 'child_template_directory':
+                    return esc_html( get_stylesheet_directory() );
+
+                case 'template_directory':
+                    return esc_html( get_template_directory() );
+
+                // Theme URIs.
+                case 'parent_template_url':
+                    return esc_url( get_template_directory_uri() );
+
+                case 'child_template_url':
+                case 'template_url':
+                    return esc_url( get_stylesheet_directory_uri() );
+
+                // URLs.
+                case 'url':
+                    return esc_url( home_url() );
+
+                case 'root_url':
+                    return esc_url( site_url() );
+
+                case 'stylesheet_url':
+                    return esc_url( get_stylesheet_uri() );
+
+                case 'logout_url':
+                    return esc_url( wp_logout_url() );
+
+                case 'login_url':
+                    return esc_url( wp_login_url() );
+
+                case 'register_url':
+                    return esc_url( wp_registration_url() );
+
+                case 'lostpassword_url':
+                case 'lost_password_url':
+                    return esc_url( wp_lostpassword_url() );
+
+                // Booleans.
+                case 'text_direction_bool':
+                case 'text_direction_boolean':
+                    return esc_html( is_rtl() ? '1' : '0' );
+
+                case 'is_multisite':
+                    return esc_html( is_multisite() ? '1' : '0' );
+
+                // Text direction as string.
+                case 'text_direction':
+                    return esc_html( is_rtl() ? 'rtl' : 'ltr' );
+
+                default:
+                    // Safe fallback: pull raw blog info, then escape as text.
+                    // (Avoid over-sanitizing: this is trusted core data).
+                    $value = get_bloginfo( $key );
+                    return esc_html( (string) $value );
+            }
+        }
+
+        /**
+         * Get theme info.
+         *
+         * @param array|string $atts    Attributes.
+         * @param string|null  $content Content.
+         *
+         * @return string
+         */
+        public function theme_info( array $atts = array(), ?string $content = null ): string {
+            // Normalize input and merge defaults.
+            $atts = wp_unslash( $atts );
+            $atts = shortcode_atts(
+                array(
+                    'data' => '',
+                ),
+                $atts
+            );
+
+            // Allow content as a fallback selector.
+            if ( null !== $content && '' === $atts['data'] ) {
+                $atts['data'] = $content;
+            }
+
+            // Validate selector as a key.
+            $key = sanitize_key( $atts['data'] );
+
+            // Map aliases -> canonical WP_Theme header keys or special handlers.
+            $map = array(
+                'name'        => 'Name',
+                'themeuri'    => 'ThemeURI',
+                'theme_uri'   => 'ThemeURI',
+                'description' => 'Description',
+                'author'      => 'Author',
+                'authoruri'   => 'AuthorURI',
+                'author_uri'  => 'AuthorURI',
+                'version'     => 'Version',
+                'template'    => 'Template',
+                'status'      => 'Status',
+                'tags'        => 'Tags',
+                'textdomain'  => 'TextDomain',
+                'text_domain' => 'TextDomain',
+                'domainpath'  => 'DomainPath',
+                'domain_path' => 'DomainPath',
+                'is_child'    => 'is_child', // special case.
+            );
+
+            // Default to "name" when empty or unknown.
+            if ( '' === $key || ! isset( $map[ $key ] ) ) {
+                $key = 'name';
+            }
+
+            // Cache theme object.
+            if ( empty( $this->theme_info ) ) {
+                $this->theme_info = wp_get_theme();
+            }
+
+            $canonical = $map[ $key ];
+
+            // Special case: is_child — return "1" or "0" as string.
+            if ( 'is_child' === $canonical ) {
+                $bool = Redux_Helpers::is_child_theme( get_template_directory() );
+                return esc_html( $bool ? '1' : '0' );
+            }
+
+            $value = $this->theme_info->get( $canonical );
+
+            // WP_Theme::get('Tags') may be array; normalize to string.
+            if ( is_array( $value ) ) {
+                $value = implode( ', ', array_filter( array_map( 'trim', $value ) ) );
+            }
+
+            $value = (string) $value;
+
+            // Escape by context.
+            switch ( $canonical ) {
+                case 'ThemeURI':
+                case 'AuthorURI':
+                    // If you ultimately print this inside an href, escape at that final context instead.
+                    // Here we assume the plain text output of the URL.
+                    return esc_url( $value );
+
+                default:
+                    return esc_html( $value );
+            }
+        }
+
+        /**
+         * Get date info.
+         *
+         * @param array|string $atts    Attributes.
+         * @param string|null  $content Content.
+         *
+         * @return string
+         */
+        public function date( $atts = array(), ?string $content = null ): string {
+
+            // 1) Normalize + unslash
+            $atts = is_array( $atts ) ? wp_unslash( $atts ) : array();
+
+            // 2) Default/merge (if this is a shortcode handler, pass the tag as the 3rd arg)
+            $atts = shortcode_atts(
+                array(
+                    'data' => '',
+                ),
+                $atts
+            );
+
+            // 3) Allow content as a fallback for the format
+            if ( null !== $content && '' === $atts['data'] ) {
+                // Keep content simple text; strip tags and control chars.
+                $atts['data'] = sanitize_text_field( wp_unslash( $content ) );
+            }
+
+            // 4) Validate and constrain the format string
+            $format = (string) $atts['data'];
+            $format = substr( $format, 0, 64 ); // avoid absurdly long inputs.
+
+            // Allow common date format tokens + typical literal punctuation and backslash for escaping.
+            // If invalid chars are present, fall back to a safe default.
+            if ( '' === $format || ! preg_match( '/^[A-Za-z0-9\s:\-.,\/\\\\T]+$/', $format ) ) {
+                $format = 'Y';
+            }
+
+            // 5) Use wp_date() to respect WP timezone and locale (date_i18n is deprecated).
+            $output = wp_date( $format );
+
+            // 6) Escape for HTML context before returning (safe default for shortcode/rendered output).
+            return esc_html( $output );
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -172,7 +172,7 @@ 
 					// Safe fallback: pull raw blog info, then escape as text.
 					// (Avoid over-sanitizing: this is trusted core data).
 					$value = get_bloginfo( $key );
-					return esc_html( (string) $value );
+					return esc_html( ( string ) $value );
 			}
 		}
 
@@ -223,7 +223,7 @@ 
 			);
 
 			// Default to "name" when empty or unknown.
-			if ( '' === $key || ! isset( $map[ $key ] ) ) {
+			if ( '' === $key || ! isset( $map[$key] ) ) {
 				$key = 'name';
 			}
 
@@ -232,7 +232,7 @@ 
 				$this->theme_info = wp_get_theme();
 			}
 
-			$canonical = $map[ $key ];
+			$canonical = $map[$key];
 
 			// Special case: is_child — return "1" or "0" as string.
 			if ( 'is_child' === $canonical ) {
@@ -247,7 +247,7 @@ 
 				$value = implode( ', ', array_filter( array_map( 'trim', $value ) ) );
 			}
 
-			$value = (string) $value;
+			$value = ( string ) $value;
 
 			// Escape by context.
 			switch ( $canonical ) {
@@ -290,7 +290,7 @@ 
 			}
 
 			// 4) Validate and constrain the format string
-			$format = (string) $atts['data'];
+			$format = ( string ) $atts['data'];
 			$format = substr( $format, 0, 64 ); // avoid absurdly long inputs.
 
 			// Allow common date format tokens + typical literal punctuation and backslash for escaping.

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

Indentation +429 added lines, -429 removed lines

@@ -12,440 +12,440 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Repeater' ) ) {
 
-	/**
-	 * Class Redux_Repeater
-	 */
-	class Redux_Repeater extends Redux_Field {
-
-		/**
-		 * Repeater values.
-		 *
-		 * @var string
-		 */
-		private string $repeater_values;
-
-		/**
-		 * Set defaults.
-		 */
-		public function set_defaults() {
-			$this->repeater_values = '';
-
-			if ( ! isset( $this->field['bind_title'] ) && ! empty( $this->field['fields'] ) ) {
-				$this->field['bind_title'] = $this->field['fields'][0]['id'];
-			}
-
-			$default = array(
-				'group_values'  => false,
-				'item_name'     => '',
-				'bind_title'    => true,
-				'sortable'      => true,
-				'limit'         => 10,
-				'init_empty'    => false,
-				'panels_closed' => false,
-			);
-
-			$this->field = wp_parse_args( $this->field, $default );
-		}
-
-		/**
-		 * 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() {
-			$unallowed = array( 'tabbed', 'social_profiles', 'color_scheme', 'repeater' );
-
-			if ( isset( $this->field['group_values'] ) && $this->field['group_values'] ) {
-				$this->repeater_values = '[' . $this->field['id'] . ']';
-			}
-
-			if ( false === $this->field['init_empty'] ) {
-				$title = '';
-
-				if ( empty( $this->value ) || ! is_array( $this->value ) ) {
-					$this->value = array(
-						'redux_repeater_data' => array(
-							array(
-								'title' => $title,
-							),
-						),
-					);
-				}
-			}
-
-			if ( isset( $this->field['subfields'] ) && empty( $this->field['fields'] ) ) {
-				$this->field['fields'] = $this->field['subfields'];
-				unset( $this->field['subfields'] );
-			}
-
-			echo '<div class="redux-repeater-accordion" data-id="' . esc_attr( $this->field['id'] ) . '" data-panels-closed="' . esc_attr( $this->field['panels_closed'] ) . '">';
-
-			$x = 0;
-
-			if ( isset( $this->value['redux_repeater_data'] ) && is_array( $this->value['redux_repeater_data'] ) && ! empty( $this->value['redux_repeater_data'] ) ) {
-				$repeaters = $this->value['redux_repeater_data'];
-
-				if ( '' === $this->field['bind_title'] ) {
-					$keys                      = array_keys( min( $repeaters ) );
-					$this->field['bind_title'] = $keys[0];
-				}
-				foreach ( $repeaters as $repeater ) {
-					if ( empty( $repeater ) ) {
-						continue;
-					}
-
-					echo '<div class="redux-repeater-accordion-repeater" data-sortid="' . esc_attr( $x ) . '">';
-					echo '<table style="margin-top: 0;" class="redux-repeater-accordion redux-repeater form-table no-border">';
-					echo '<fieldset class="redux-field " data-id="' . esc_attr( $this->field['id'] ) . '">';
-
-					echo '<input type="hidden" name="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][redux_repeater_data][' . esc_attr( $x ) . '][title]" value="' . esc_attr( $repeater['title'] ) . '" class="regular-text slide-title" data-key="' . esc_attr( $x ) . '" />';
-
-					if ( isset( $this->field['bind_title'] ) ) {
-						foreach ( $this->field['fields'] as $field ) {
-							if ( $field['id'] === $this->field['bind_title'] ) {
-								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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
-										}
-									}
-								}
-
-								$default = $field['default'] ?? '';
-
-								if ( ! empty( $this->repeater_values ) ) {
-									$repeater['title'] = ! isset( $this->parent->options[ $this->field['id'] ][ $field['id'] ][ $x ] ) ? $default : $this->parent->options[ $this->field['id'] ][ $field['id'] ][ $x ];
-								} else {
-									$repeater['title'] = ! isset( $this->parent->options[ $field['id'] ][ $x ] ) ? $default : $this->parent->options[ $field['id'] ][ $x ];
-								}
-
-								if ( isset( $field['options'] ) && is_array( $field['options'] ) ) {
-									if ( isset( $field['options'][ $repeater['title'] ] ) ) {
-										$repeater['title'] = $field['options'][ $repeater['title'] ];
-									}
-								}
-							}
-						}
-					}
-
-					if ( is_array( $repeater['title'] ) ) {
-						$repeater['title'] = esc_html__( 'Title', 'redux-framework' );
-					}
-
-					echo '<h3><span class="redux-repeater-header">' . esc_html( $repeater['title'] ) . ' </span></h3>';
-
-					echo '<div>';
-
-					foreach ( $this->field['fields'] as $field ) {
-						if ( ! isset( $field['class'] ) ) {
-							$field['class'] = '';
-						}
-
-						if ( isset( $this->field['bind_title'] ) && $field['id'] === $this->field['bind_title'] ) {
-							$field['class'] .= ' bind_title';
-						}
-
-						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 Repeater field.', 'redux-framework' );
-						} else {
-							$this->output_field( $field, $x );
-						}
-					}
-
-					if ( ! isset( $this->field['static'] ) && empty( $this->field['static'] ) ) {
-						echo '<a href="javascript:void(0);" class="button deletion redux-warning-primary redux-repeaters-remove">' . esc_html__( 'Delete', 'redux-framework' ) . ' ' . esc_html( $this->field['item_name'] ) . '</a>';
-					}
-
-					echo '</div>';
-					echo '</fieldset>';
-					echo '</table>';
-					echo '</div>';
-
-					++$x;
-				}
-			}
-
-			if ( 0 === $x || ( isset( $this->field['static'] ) && ( $x - 1 ) < $this->field['static'] ) ) {
-				if ( isset( $this->field['static'] ) && $x < $this->field['static'] ) {
-					$loop = $this->field['static'] - $x;
-				} else {
-					$loop = 1;
-				}
-
-				$class = '';
-
-				if ( 0 === $x && true === $this->field['init_empty'] ) {
-					$class = 'close-me';
-				}
-
-				while ( $loop > 0 ) {
-					echo '<div class="redux-repeater-accordion-repeater ' . esc_attr( $class ) . '">';
-					echo '<table style="margin-top: 0;" class="redux-repeater-accordion redux-repeater form-table no-border">';
-					echo '<fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '">';
-
-					if ( ! isset( $this->value['redux_repeater_data'][ $x ]['title'] ) && is_array( $this->value ) && isset( $this->value['redux_repeater_data'] ) && is_array( $this->value['redux_repeater_data'] ) ) {
-						$this->value['redux_repeater_data'][ $x ]['title'] = null;
-					}
-
-					echo '<input type="hidden" name="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][redux_repeater_data][' . intval( $x ) . '][title]" value="" class="regular-text slide-title" />';
-
-					echo '<h3><span class="redux-repeater-header"> </span></h3>';
-					echo '<div>';
-
-					foreach ( $this->field['fields'] as $field ) {
-						if ( isset( $this->field['bind_title'] ) && $field['id'] === $this->field['bind_title'] ) {
-							if ( ! isset( $field['class'] ) || ( isset( $field['title'] ) && empty( $field['title'] ) ) ) {
-								$field['class'] = 'bind_title';
-							} else {
-								$field['class'] .= ' bind_title';
-							}
-						}
-
-						$this->output_field( $field, $x );
-					}
-
-					if ( ! isset( $this->field['static'] ) && empty( $this->field['static'] ) ) {
-						echo '<a href="javascript:void(0);" class="button deletion redux-repeaters-remove">' . esc_html__( 'Delete', 'redux-framework' ) . ' ' . esc_html( $this->field['item_name'] ) . '</a>';
-					}
-
-					echo '</div>';
-					echo '</fieldset>';
-					echo '</table>';
-					echo '</div>';
-
-					++$x;
-					--$loop;
-				}
-			}
-
-			echo '</div>';
-			if ( ! isset( $this->field['static'] ) && empty( $this->field['static'] ) ) {
-				$disabled = '';
-
-				if ( isset( $this->field['limit'] ) && is_integer( $this->field['limit'] ) ) {
-					if ( $x >= $this->field['limit'] ) {
-						$disabled = ' button-disabled';
-					}
-				}
-
-				echo '<a href="javascript:void(0);" class="button redux-repeaters-add button-primary' . esc_attr( $disabled ) . '" data-name="' . esc_attr( $this->parent->args['opt_name'] . $this->repeater_values ) . '[title][]">' . esc_html__( 'Add', 'redux-framework' ) . ' ' . esc_html( $this->field['item_name'] ) . '</a><br/>';
-			}
-		}
-
-		/**
-		 * 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() {
-			wp_print_styles( 'editor-buttons' );
-
-			// Set up min files for dev_mode = false.
-			$min = Redux_Functions::is_min();
-
-			wp_enqueue_script(
-				'redux-field-repeater',
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$this->url . 'redux-repeater' . $min . '.js',
-				array( 'jquery', 'jquery-ui-core', 'jquery-ui-accordion', 'jquery-ui-sortable', 'wp-color-picker', 'redux-js' ),
-				Redux_Extension_Repeater::$version,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-repeater',
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$this->url . 'redux-repeater.css',
-					array(),
-					Redux_Extension_Repeater::$version
-				);
-			}
-		}
-
-		/**
-		 * Output field.
-		 *
-		 * @param array $field Field array.
-		 * @param int   $x     Index.
-		 */
-		public function output_field( array $field, int $x ) {
-			$this->enqueue_dependencies( $field );
-
-			if ( ! isset( $field['class'] ) ) {
-				$field['class'] = '';
-			}
-
-			$field['class'] .= ' repeater';
-
-			if ( ! empty( $field['title'] ) ) {
-				echo '<h4>' . wp_kses_post( $field['title'] ) . '</h4>';
-			}
-
-			if ( ! empty( $field['subtitle'] ) ) {
-				echo '<span class="description">' . wp_kses_post( $field['subtitle'] ) . '</span>';
-			}
-
-			$orig_field_id = $field['id'];
-
-			$field['id']          = $field['id'] . '-' . $x;
-			$field['name']        = $this->parent->args['opt_name'] . $this->repeater_values . '[' . $orig_field_id . ']';
-			$field['name_suffix'] = '[' . $x . ']';
-			$field['class']      .= ' in-repeater';
-			$field['repeater_id'] = $orig_field_id;
-
-			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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
-					}
-				}
-			}
-
-			$default = $field['default'] ?? '';
-
-			if ( ! empty( $this->repeater_values ) ) {
-				$value = empty( $this->parent->options[ $this->field['id'] ][ $orig_field_id ][ $x ] ) ? $default : $this->parent->options[ $this->field['id'] ][ $orig_field_id ][ $x ];
-			} else {
-				$value = empty( $this->parent->options[ $orig_field_id ][ $x ] ) ? $default : $this->parent->options[ $orig_field_id ][ $x ];
-			}
-
-			ob_start();
-
-			$this->parent->render_class->field_input( $field, $value );
-
-			$content = ob_get_contents();
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$_field = apply_filters( 'redux-support-repeater', $content, $field, 0 );
-
-			ob_end_clean();
-
-			echo $_field; // phpcs:ignore WordPress.Security.EscapeOutput
-		}
-
-
-		/**
-		 * Localize.
-		 *
-		 * @param array  $field Field array.
-		 * @param string $value Value.
-		 *
-		 * @return array|string
-		 */
-		public function localize( array $field, string $value = '' ) {
-			if ( isset( $field['subfields'] ) && empty( $field['fields'] ) ) {
-				$field['fields'] = $field['subfields'];
-				unset( $field['subfields'] );
-			}
-
-			if ( isset( $field['group_values'] ) && $field['group_values'] ) {
-				$this->repeater_values = '[' . $field['id'] . ']';
-			}
-
-			$var = '';
-
-			if ( '' === $value ) {
-				$value = array();
-			}
-
-			if ( ! empty( $field['fields'] ) ) {
-				ob_start();
-
-				foreach ( $field['fields'] as $f ) {
-					if ( isset( $this->field['bind_title'] ) && $f['id'] === $this->field['bind_title'] ) {
-						if ( ! isset( $f['class'] ) || ( isset( $f['title'] ) && empty( $f['title'] ) ) ) {
-							$f['class'] = 'bind_title';
-						} else {
-							$f['class'] .= ' bind_title';
-						}
-					}
+    /**
+     * Class Redux_Repeater
+     */
+    class Redux_Repeater extends Redux_Field {
+
+        /**
+         * Repeater values.
+         *
+         * @var string
+         */
+        private string $repeater_values;
+
+        /**
+         * Set defaults.
+         */
+        public function set_defaults() {
+            $this->repeater_values = '';
+
+            if ( ! isset( $this->field['bind_title'] ) && ! empty( $this->field['fields'] ) ) {
+                $this->field['bind_title'] = $this->field['fields'][0]['id'];
+            }
+
+            $default = array(
+                'group_values'  => false,
+                'item_name'     => '',
+                'bind_title'    => true,
+                'sortable'      => true,
+                'limit'         => 10,
+                'init_empty'    => false,
+                'panels_closed' => false,
+            );
+
+            $this->field = wp_parse_args( $this->field, $default );
+        }
+
+        /**
+         * 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() {
+            $unallowed = array( 'tabbed', 'social_profiles', 'color_scheme', 'repeater' );
+
+            if ( isset( $this->field['group_values'] ) && $this->field['group_values'] ) {
+                $this->repeater_values = '[' . $this->field['id'] . ']';
+            }
+
+            if ( false === $this->field['init_empty'] ) {
+                $title = '';
+
+                if ( empty( $this->value ) || ! is_array( $this->value ) ) {
+                    $this->value = array(
+                        'redux_repeater_data' => array(
+                            array(
+                                'title' => $title,
+                            ),
+                        ),
+                    );
+                }
+            }
+
+            if ( isset( $this->field['subfields'] ) && empty( $this->field['fields'] ) ) {
+                $this->field['fields'] = $this->field['subfields'];
+                unset( $this->field['subfields'] );
+            }
+
+            echo '<div class="redux-repeater-accordion" data-id="' . esc_attr( $this->field['id'] ) . '" data-panels-closed="' . esc_attr( $this->field['panels_closed'] ) . '">';
+
+            $x = 0;
+
+            if ( isset( $this->value['redux_repeater_data'] ) && is_array( $this->value['redux_repeater_data'] ) && ! empty( $this->value['redux_repeater_data'] ) ) {
+                $repeaters = $this->value['redux_repeater_data'];
+
+                if ( '' === $this->field['bind_title'] ) {
+                    $keys                      = array_keys( min( $repeaters ) );
+                    $this->field['bind_title'] = $keys[0];
+                }
+                foreach ( $repeaters as $repeater ) {
+                    if ( empty( $repeater ) ) {
+                        continue;
+                    }
+
+                    echo '<div class="redux-repeater-accordion-repeater" data-sortid="' . esc_attr( $x ) . '">';
+                    echo '<table style="margin-top: 0;" class="redux-repeater-accordion redux-repeater form-table no-border">';
+                    echo '<fieldset class="redux-field " data-id="' . esc_attr( $this->field['id'] ) . '">';
+
+                    echo '<input type="hidden" name="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][redux_repeater_data][' . esc_attr( $x ) . '][title]" value="' . esc_attr( $repeater['title'] ) . '" class="regular-text slide-title" data-key="' . esc_attr( $x ) . '" />';
+
+                    if ( isset( $this->field['bind_title'] ) ) {
+                        foreach ( $this->field['fields'] as $field ) {
+                            if ( $field['id'] === $this->field['bind_title'] ) {
+                                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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
+                                        }
+                                    }
+                                }
+
+                                $default = $field['default'] ?? '';
+
+                                if ( ! empty( $this->repeater_values ) ) {
+                                    $repeater['title'] = ! isset( $this->parent->options[ $this->field['id'] ][ $field['id'] ][ $x ] ) ? $default : $this->parent->options[ $this->field['id'] ][ $field['id'] ][ $x ];
+                                } else {
+                                    $repeater['title'] = ! isset( $this->parent->options[ $field['id'] ][ $x ] ) ? $default : $this->parent->options[ $field['id'] ][ $x ];
+                                }
+
+                                if ( isset( $field['options'] ) && is_array( $field['options'] ) ) {
+                                    if ( isset( $field['options'][ $repeater['title'] ] ) ) {
+                                        $repeater['title'] = $field['options'][ $repeater['title'] ];
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if ( is_array( $repeater['title'] ) ) {
+                        $repeater['title'] = esc_html__( 'Title', 'redux-framework' );
+                    }
+
+                    echo '<h3><span class="redux-repeater-header">' . esc_html( $repeater['title'] ) . ' </span></h3>';
+
+                    echo '<div>';
+
+                    foreach ( $this->field['fields'] as $field ) {
+                        if ( ! isset( $field['class'] ) ) {
+                            $field['class'] = '';
+                        }
+
+                        if ( isset( $this->field['bind_title'] ) && $field['id'] === $this->field['bind_title'] ) {
+                            $field['class'] .= ' bind_title';
+                        }
+
+                        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 Repeater field.', 'redux-framework' );
+                        } else {
+                            $this->output_field( $field, $x );
+                        }
+                    }
+
+                    if ( ! isset( $this->field['static'] ) && empty( $this->field['static'] ) ) {
+                        echo '<a href="javascript:void(0);" class="button deletion redux-warning-primary redux-repeaters-remove">' . esc_html__( 'Delete', 'redux-framework' ) . ' ' . esc_html( $this->field['item_name'] ) . '</a>';
+                    }
+
+                    echo '</div>';
+                    echo '</fieldset>';
+                    echo '</table>';
+                    echo '</div>';
+
+                    ++$x;
+                }
+            }
+
+            if ( 0 === $x || ( isset( $this->field['static'] ) && ( $x - 1 ) < $this->field['static'] ) ) {
+                if ( isset( $this->field['static'] ) && $x < $this->field['static'] ) {
+                    $loop = $this->field['static'] - $x;
+                } else {
+                    $loop = 1;
+                }
+
+                $class = '';
+
+                if ( 0 === $x && true === $this->field['init_empty'] ) {
+                    $class = 'close-me';
+                }
+
+                while ( $loop > 0 ) {
+                    echo '<div class="redux-repeater-accordion-repeater ' . esc_attr( $class ) . '">';
+                    echo '<table style="margin-top: 0;" class="redux-repeater-accordion redux-repeater form-table no-border">';
+                    echo '<fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '">';
+
+                    if ( ! isset( $this->value['redux_repeater_data'][ $x ]['title'] ) && is_array( $this->value ) && isset( $this->value['redux_repeater_data'] ) && is_array( $this->value['redux_repeater_data'] ) ) {
+                        $this->value['redux_repeater_data'][ $x ]['title'] = null;
+                    }
+
+                    echo '<input type="hidden" name="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][redux_repeater_data][' . intval( $x ) . '][title]" value="" class="regular-text slide-title" />';
+
+                    echo '<h3><span class="redux-repeater-header"> </span></h3>';
+                    echo '<div>';
+
+                    foreach ( $this->field['fields'] as $field ) {
+                        if ( isset( $this->field['bind_title'] ) && $field['id'] === $this->field['bind_title'] ) {
+                            if ( ! isset( $field['class'] ) || ( isset( $field['title'] ) && empty( $field['title'] ) ) ) {
+                                $field['class'] = 'bind_title';
+                            } else {
+                                $field['class'] .= ' bind_title';
+                            }
+                        }
+
+                        $this->output_field( $field, $x );
+                    }
+
+                    if ( ! isset( $this->field['static'] ) && empty( $this->field['static'] ) ) {
+                        echo '<a href="javascript:void(0);" class="button deletion redux-repeaters-remove">' . esc_html__( 'Delete', 'redux-framework' ) . ' ' . esc_html( $this->field['item_name'] ) . '</a>';
+                    }
+
+                    echo '</div>';
+                    echo '</fieldset>';
+                    echo '</table>';
+                    echo '</div>';
+
+                    ++$x;
+                    --$loop;
+                }
+            }
+
+            echo '</div>';
+            if ( ! isset( $this->field['static'] ) && empty( $this->field['static'] ) ) {
+                $disabled = '';
+
+                if ( isset( $this->field['limit'] ) && is_integer( $this->field['limit'] ) ) {
+                    if ( $x >= $this->field['limit'] ) {
+                        $disabled = ' button-disabled';
+                    }
+                }
+
+                echo '<a href="javascript:void(0);" class="button redux-repeaters-add button-primary' . esc_attr( $disabled ) . '" data-name="' . esc_attr( $this->parent->args['opt_name'] . $this->repeater_values ) . '[title][]">' . esc_html__( 'Add', 'redux-framework' ) . ' ' . esc_html( $this->field['item_name'] ) . '</a><br/>';
+            }
+        }
+
+        /**
+         * 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() {
+            wp_print_styles( 'editor-buttons' );
+
+            // Set up min files for dev_mode = false.
+            $min = Redux_Functions::is_min();
+
+            wp_enqueue_script(
+                'redux-field-repeater',
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $this->url . 'redux-repeater' . $min . '.js',
+                array( 'jquery', 'jquery-ui-core', 'jquery-ui-accordion', 'jquery-ui-sortable', 'wp-color-picker', 'redux-js' ),
+                Redux_Extension_Repeater::$version,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-repeater',
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $this->url . 'redux-repeater.css',
+                    array(),
+                    Redux_Extension_Repeater::$version
+                );
+            }
+        }
+
+        /**
+         * Output field.
+         *
+         * @param array $field Field array.
+         * @param int   $x     Index.
+         */
+        public function output_field( array $field, int $x ) {
+            $this->enqueue_dependencies( $field );
+
+            if ( ! isset( $field['class'] ) ) {
+                $field['class'] = '';
+            }
+
+            $field['class'] .= ' repeater';
+
+            if ( ! empty( $field['title'] ) ) {
+                echo '<h4>' . wp_kses_post( $field['title'] ) . '</h4>';
+            }
+
+            if ( ! empty( $field['subtitle'] ) ) {
+                echo '<span class="description">' . wp_kses_post( $field['subtitle'] ) . '</span>';
+            }
+
+            $orig_field_id = $field['id'];
+
+            $field['id']          = $field['id'] . '-' . $x;
+            $field['name']        = $this->parent->args['opt_name'] . $this->repeater_values . '[' . $orig_field_id . ']';
+            $field['name_suffix'] = '[' . $x . ']';
+            $field['class']      .= ' in-repeater';
+            $field['repeater_id'] = $orig_field_id;
+
+            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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
+                    }
+                }
+            }
+
+            $default = $field['default'] ?? '';
+
+            if ( ! empty( $this->repeater_values ) ) {
+                $value = empty( $this->parent->options[ $this->field['id'] ][ $orig_field_id ][ $x ] ) ? $default : $this->parent->options[ $this->field['id'] ][ $orig_field_id ][ $x ];
+            } else {
+                $value = empty( $this->parent->options[ $orig_field_id ][ $x ] ) ? $default : $this->parent->options[ $orig_field_id ][ $x ];
+            }
+
+            ob_start();
+
+            $this->parent->render_class->field_input( $field, $value );
+
+            $content = ob_get_contents();
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $_field = apply_filters( 'redux-support-repeater', $content, $field, 0 );
+
+            ob_end_clean();
+
+            echo $_field; // phpcs:ignore WordPress.Security.EscapeOutput
+        }
+
+
+        /**
+         * Localize.
+         *
+         * @param array  $field Field array.
+         * @param string $value Value.
+         *
+         * @return array|string
+         */
+        public function localize( array $field, string $value = '' ) {
+            if ( isset( $field['subfields'] ) && empty( $field['fields'] ) ) {
+                $field['fields'] = $field['subfields'];
+                unset( $field['subfields'] );
+            }
+
+            if ( isset( $field['group_values'] ) && $field['group_values'] ) {
+                $this->repeater_values = '[' . $field['id'] . ']';
+            }
+
+            $var = '';
+
+            if ( '' === $value ) {
+                $value = array();
+            }
+
+            if ( ! empty( $field['fields'] ) ) {
+                ob_start();
+
+                foreach ( $field['fields'] as $f ) {
+                    if ( isset( $this->field['bind_title'] ) && $f['id'] === $this->field['bind_title'] ) {
+                        if ( ! isset( $f['class'] ) || ( isset( $f['title'] ) && empty( $f['title'] ) ) ) {
+                            $f['class'] = 'bind_title';
+                        } else {
+                            $f['class'] .= ' bind_title';
+                        }
+                    }
 
-					$this->output_field( $f, 99999 );
-				}
-
-				$var = ob_get_contents();
+                    $this->output_field( $f, 99999 );
+                }
+
+                $var = ob_get_contents();
 
-				$var = array(
-					'html'     => $var . '<a href="javascript:void(0);" class="button deletion redux-repeaters-remove">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>',
-					'count'    => count( $value ),
-					'sortable' => true,
-					'limit'    => '',
-					'name'     => $this->parent->args['opt_name'] . '[' . $field['id'] . '][0]',
-				);
-
-				if ( isset( $field['sortable'] ) && is_bool( $this->field['sortable'] ) ) {
-					$var['sortable'] = $field['sortable'];
-				}
-				if ( isset( $field['limit'] ) && is_integer( $field['limit'] ) ) {
-					$var['limit'] = $field['limit'];
-				}
-
-				ob_end_clean();
-			}
-
-			return $var;
-		}
-
-		/**
-		 * Enqueue Deps.
-		 *
-		 * @param array $field Field.
-		 */
-		private function enqueue_dependencies( array $field ) {
-			$field_type = $field['type'];
-
-			$field_class = 'Redux_' . $field_type;
+                $var = array(
+                    'html'     => $var . '<a href="javascript:void(0);" class="button deletion redux-repeaters-remove">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>',
+                    'count'    => count( $value ),
+                    'sortable' => true,
+                    'limit'    => '',
+                    'name'     => $this->parent->args['opt_name'] . '[' . $field['id'] . '][0]',
+                );
+
+                if ( isset( $field['sortable'] ) && is_bool( $this->field['sortable'] ) ) {
+                    $var['sortable'] = $field['sortable'];
+                }
+                if ( isset( $field['limit'] ) && is_integer( $field['limit'] ) ) {
+                    $var['limit'] = $field['limit'];
+                }
+
+                ob_end_clean();
+            }
+
+            return $var;
+        }
+
+        /**
+         * 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 );
+            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 );
+                // 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 ( 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, '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;
-			}
-		}
-	}
+            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;
+            }
+        }
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -115,11 +115,11 @@ 
 										}
 
 										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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
+											$field['options'][$key] = $this->parent->wordpress_data->get( $data, $field['args'][$key], $this->parent->args['opt_name'] );
 										}
 									}
 								}
@@ -127,14 +127,14 @@ 
 								$default = $field['default'] ?? '';
 
 								if ( ! empty( $this->repeater_values ) ) {
-									$repeater['title'] = ! isset( $this->parent->options[ $this->field['id'] ][ $field['id'] ][ $x ] ) ? $default : $this->parent->options[ $this->field['id'] ][ $field['id'] ][ $x ];
+									$repeater['title'] = ! isset( $this->parent->options[$this->field['id']][$field['id']][$x] ) ? $default : $this->parent->options[$this->field['id']][$field['id']][$x];
 								} else {
-									$repeater['title'] = ! isset( $this->parent->options[ $field['id'] ][ $x ] ) ? $default : $this->parent->options[ $field['id'] ][ $x ];
+									$repeater['title'] = ! isset( $this->parent->options[$field['id']][$x] ) ? $default : $this->parent->options[$field['id']][$x];
 								}
 
 								if ( isset( $field['options'] ) && is_array( $field['options'] ) ) {
-									if ( isset( $field['options'][ $repeater['title'] ] ) ) {
-										$repeater['title'] = $field['options'][ $repeater['title'] ];
+									if ( isset( $field['options'][$repeater['title']] ) ) {
+										$repeater['title'] = $field['options'][$repeater['title']];
 									}
 								}
 							}
@@ -196,8 +196,8 @@ 
 					echo '<table style="margin-top: 0;" class="redux-repeater-accordion redux-repeater form-table no-border">';
 					echo '<fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '">';
 
-					if ( ! isset( $this->value['redux_repeater_data'][ $x ]['title'] ) && is_array( $this->value ) && isset( $this->value['redux_repeater_data'] ) && is_array( $this->value['redux_repeater_data'] ) ) {
-						$this->value['redux_repeater_data'][ $x ]['title'] = null;
+					if ( ! isset( $this->value['redux_repeater_data'][$x]['title'] ) && is_array( $this->value ) && isset( $this->value['redux_repeater_data'] ) && is_array( $this->value['redux_repeater_data'] ) ) {
+						$this->value['redux_repeater_data'][$x]['title'] = null;
 					}
 
 					echo '<input type="hidden" name="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][redux_repeater_data][' . intval( $x ) . '][title]" value="" class="regular-text slide-title" />';
@@ -319,10 +319,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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
+						$field['options'][$key] = $this->parent->wordpress_data->get( $data, $field['args'][$key], $this->parent->args['opt_name'] );
 					}
 				}
 			}
@@ -330,9 +330,9 @@ 
 			$default = $field['default'] ?? '';
 
 			if ( ! empty( $this->repeater_values ) ) {
-				$value = empty( $this->parent->options[ $this->field['id'] ][ $orig_field_id ][ $x ] ) ? $default : $this->parent->options[ $this->field['id'] ][ $orig_field_id ][ $x ];
+				$value = empty( $this->parent->options[$this->field['id']][$orig_field_id][$x] ) ? $default : $this->parent->options[$this->field['id']][$orig_field_id][$x];
 			} else {
-				$value = empty( $this->parent->options[ $orig_field_id ][ $x ] ) ? $default : $this->parent->options[ $orig_field_id ][ $x ];
+				$value = empty( $this->parent->options[$orig_field_id][$x] ) ? $default : $this->parent->options[$orig_field_id][$x];
 			}
 
 			ob_start();
@@ -444,7 +444,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/extensions/tabbed/tabbed/class-redux-tabbed.php

Indentation +198 added lines, -198 removed lines

@@ -11,211 +11,211 @@
 
 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 );
-		}
+            $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' );
+        /**
+         * 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 ) {
+            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'] = '';
-			}
+                $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';
+            $field['class'] .= ' tabbed';
 
-			echo '<div class="redux-tab-field">';
+            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['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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
-					}
-				}
-			}
-
-			$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
-				);
-			}
-		}
-	}
+                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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
+                    }
+                }
+            }
+
+            $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,11 +114,11 @@ 
 					}
 
 					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->wordpress_data->get( $data, $field['args'][ $key ], $this->parent->args['opt_name'] );
+						$field['options'][$key] = $this->parent->wordpress_data->get( $data, $field['args'][$key], $this->parent->args['opt_name'] );
 					}
 				}
 			}
@@ -127,7 +127,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 );
 
@@ -187,7 +187,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;
 			}
 		}