reduxframework / redux-framework

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

Indentation +297 added lines, -297 removed lines

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

Spacing +7 added lines, -7 removed lines

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

sample/sections/extensions/icon-select.php

Indentation +68 added lines, -68 removed lines

@@ -16,82 +16,82 @@
 require_once Redux_Core::$dir . 'inc/extensions/icon_select/font-awesome-5-free.php';
 
 Redux::set_section(
-	$opt_name,
-	array(
-		'title'      => esc_html__( 'Icon Select', 'your-textdomain-here' ),
-		'desc'       => esc_html__( 'For full documentation on this field, visit: ', 'your-textdomain-here' ) . '<a href="https://devs.redux.io/core-extensions/icon-select.html" target="_blank">https://devs.redux.io/core-extensions/icon-select.html</a>',
-		'subsection' => true,
-		'fields'     => array(
+    $opt_name,
+    array(
+        'title'      => esc_html__( 'Icon Select', 'your-textdomain-here' ),
+        'desc'       => esc_html__( 'For full documentation on this field, visit: ', 'your-textdomain-here' ) . '<a href="https://devs.redux.io/core-extensions/icon-select.html" target="_blank">https://devs.redux.io/core-extensions/icon-select.html</a>',
+        'subsection' => true,
+        'fields'     => array(
 
-			/**
-			 * This field was left in the sample config to display that every effort to maintain backward compatibility with older
-			 * versions of Icon Select has been implemented.
-			 * Please do NOT use argument in this field in your projects.
-			 * They are considered deprecated.
-			 */
-			array(
-				'id'               => 'icon-select-legacy',
-				'type'             => 'icon_select',
-				'title'            => esc_html__( 'Legacy Icon Select', 'your-textdomain-here' ),
-				'subtitle'         => esc_html__( 'Original Icon Select field that maintains backward compatibility with the original extension.', 'your-textdomain-here' ),
-				'default'          => '',
-				'options'          => redux_icon_select_fa_5_free(),
+            /**
+             * This field was left in the sample config to display that every effort to maintain backward compatibility with older
+             * versions of Icon Select has been implemented.
+             * Please do NOT use argument in this field in your projects.
+             * They are considered deprecated.
+             */
+            array(
+                'id'               => 'icon-select-legacy',
+                'type'             => 'icon_select',
+                'title'            => esc_html__( 'Legacy Icon Select', 'your-textdomain-here' ),
+                'subtitle'         => esc_html__( 'Original Icon Select field that maintains backward compatibility with the original extension.', 'your-textdomain-here' ),
+                'default'          => '',
+                'options'          => redux_icon_select_fa_5_free(),
 
-				// Disable auto-enqueue of stylesheet if present in the panel.
-				'enqueue'          => true,
+                // Disable auto-enqueue of stylesheet if present in the panel.
+                'enqueue'          => true,
 
-				// Disable auto-enqueue of stylesheet on the front-end.
-				'enqueue_frontend' => true,
+                // Disable auto-enqueue of stylesheet on the front-end.
+                'enqueue_frontend' => true,
 
-				// Stylesheet URL.
-				//'stylesheet'       => 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.css',
+                // Stylesheet URL.
+                //'stylesheet'       => 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.css',
 
-				// (Optional) Specify a class prefix if one is needed to initialize the icon.
-				'prefix'           => 'fa',
-			),
+                // (Optional) Specify a class prefix if one is needed to initialize the icon.
+                'prefix'           => 'fa',
+            ),
 
-			/**
-			 * When creating fields for Icon Select, use this as a template instead.
-			 * For detailed documentation, see: https://devs.redux.io/core-extensions/icon-select.html
-			 */
-			array(
-				'id'               => 'icon-select',
-				'type'             => 'icon_select',
-				'title'            => esc_html__( 'Icon Select', 'your-textdomain-here' ),
-				'subtitle'         => esc_html__( 'Select an icon.', 'your-textdomain-here' ),
-				'default'          => 'fas fa-1',
+            /**
+             * When creating fields for Icon Select, use this as a template instead.
+             * For detailed documentation, see: https://devs.redux.io/core-extensions/icon-select.html
+             */
+            array(
+                'id'               => 'icon-select',
+                'type'             => 'icon_select',
+                'title'            => esc_html__( 'Icon Select', 'your-textdomain-here' ),
+                'subtitle'         => esc_html__( 'Select an icon.', 'your-textdomain-here' ),
+                'default'          => 'fas fa-1',
 
-				// Disable auto-enqueue of stylesheet if present in the panel.
-				'enqueue'          => true,
+                // Disable auto-enqueue of stylesheet if present in the panel.
+                'enqueue'          => true,
 
-				// Disable auto-enqueue of stylesheet on the front-end.
-				'enqueue_frontend' => true,
+                // Disable auto-enqueue of stylesheet on the front-end.
+                'enqueue_frontend' => true,
 
-				// Stylesheet data.
-				'stylesheet'       => array(
-					array(
-						'url'    => 'https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/7.2.96/css/materialdesignicons.css',
-						'title'  => 'Material Icons',
-						'prefix' => 'mdi-set',
-					),
-					array(
-						'url'    => 'https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css',
-						'title'  => 'Bootstrap',
-						'prefix' => 'bi',
-					),
-					array(
-						'url'    => 'https://cdn.lineicons.com/4.0/lineicons.css',
-						'title'  => 'Line Icons',
-						'prefix' => 'lni',
-					),
-					array(
-						'url'    => 'https://cdn.jsdelivr.net/gh/devicons/devicon@v2.15.1/devicon.min.css',
-						'title'  => 'Dev Icons',
-						'prefix' => '',
-					),
-				),
-			),
-		),
-	)
+                // Stylesheet data.
+                'stylesheet'       => array(
+                    array(
+                        'url'    => 'https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/7.2.96/css/materialdesignicons.css',
+                        'title'  => 'Material Icons',
+                        'prefix' => 'mdi-set',
+                    ),
+                    array(
+                        'url'    => 'https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css',
+                        'title'  => 'Bootstrap',
+                        'prefix' => 'bi',
+                    ),
+                    array(
+                        'url'    => 'https://cdn.lineicons.com/4.0/lineicons.css',
+                        'title'  => 'Line Icons',
+                        'prefix' => 'lni',
+                    ),
+                    array(
+                        'url'    => 'https://cdn.jsdelivr.net/gh/devicons/devicon@v2.15.1/devicon.min.css',
+                        'title'  => 'Dev Icons',
+                        'prefix' => '',
+                    ),
+                ),
+            ),
+        ),
+    )
 );
 // phpcs:enable

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

Indentation +237 added lines, -237 removed lines

@@ -11,241 +11,241 @@
 
 if ( ! class_exists( 'Redux_Validation', false ) ) {
 
-	/**
-	 * Class Redux_Validation
-	 */
-	class Redux_Validation extends Redux_Class {
-
-		/**
-		 * Validate values from options form (used in settings api validate function)
-		 * calls the custom validation class for the field so authors can override with custom classes
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       array $plugin_options Plugin Options.
-		 * @param       array $options        Options.
-		 * @param       array $sections       Sections array.
-		 *
-		 * @return      array $plugin_options
-		 */
-		public function validate( array $plugin_options, array $options, array $sections ): array {
-			$core = $this->core();
-
-			if (null === $core) {
-				return $plugin_options;
-			}
-
-			foreach ( $sections as $k => $section ) {
-				if ( isset( $section['fields'] ) ) {
-					foreach ( $section['fields'] as $fkey => $field ) {
-						if ( is_array( $field ) ) {
-							$field['section_id'] = $k;
-						}
-
-						if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
-							if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
-								$plugin_options[ $field['id'] ] = 0;
-							}
-						}
-
-						// Part of Dovy's serialize typography effort.  Preserved here in case it becomes a thing. - kp.
-						/**
-						 * If ( isset ( $field['type'] ) && $field['type'] == 'typography' ) {
-						 *      if ( ! is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-						 *          $plugin_options[ $field['id'] ] = json_decode( $plugin_options[ $field['id'] ], true );
-						 *      }
-						 * }
-						 */
-
-						if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
-							$plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
-						}
-
-						// Make sure 'validate' field is set.
-						if ( isset( $field['validate'] ) ) {
-
-							// Can we make this an array of validations?
-							$val_arr = array();
-
-							if ( is_array( $field['validate'] ) ) {
-								$val_arr = $field['validate'];
-							} else {
-								$val_arr[] = $field['validate'];
-							}
-
-							foreach ( $val_arr as $idx => $val ) {
-								// shim for old *_not_empty validations.
-								if ( 'email_not_empty' === $val || 'numeric_not_empty' === $val ) {
-									$val = 'not_empty';
-								}
-
-								// Make sure 'validate field' is set to 'not_empty'.
-								$is_not_empty = false;
-
-								if ( 'not_empty' === $val ) {
-									// Set the flag.
-									$is_not_empty = true;
-								}
-
-								// Check for empty id value.
-								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
-
-									// If we are looking for an empty value, in the case of 'not_empty'
-									// then we need to keep processing.
-									if ( ! $is_not_empty ) {
-
-										// Empty id and not checking for 'not_empty'.  Bail out...
-										if ( ! isset( $field['validate_callback'] ) ) {
-											continue;
-										}
-									}
-								}
-
-								// Force validate of custom field types.
-								if ( isset( $field['type'] ) && ! isset( $val ) && ! isset( $field['validate_callback'] ) ) {
-									if ( 'color' === $field['type'] || 'color_gradient' === $field['type'] ) {
-										$val = 'color';
-									} elseif ( 'date' === $field['type'] ) {
-										$val = 'date';
-									}
-								}
-
-								// No need.  Spectrum self validates.
-								if ( 'color_rgba' === $field['type'] ) {
-									continue;
-								}
-
-								// Shim out old color rgba validators.
-								if ( 'color_rgba' === $val || 'colorrgba' === $val ) {
-									$val = 'color';
-								}
-
-								$validate = 'Redux_Validation_' . $val;
-
-								if ( ! class_exists( $validate ) ) {
-									$file = str_replace( '_', '-', $val );
-
-									/**
-									 * Filter 'redux/validate/{opt_name}/class/{field.validate}'
-									 *
-									 * @param string $validate   validation class file path
-									 */
-
-									// phpcs:ignore WordPress.NamingConventions.ValidHookName
-									$class_file = apply_filters( "redux/validate/{$core->args['opt_name']}/class/$val", Redux_Core::$dir . "inc/validation/$val/class-redux-validation-$file.php", $validate );
-
-									if ( $class_file ) {
-										if ( file_exists( $class_file ) ) {
-											require_once $class_file;
-										}
-									}
-								}
-
-								if ( class_exists( $validate ) ) {
-									if ( empty( $options[ $field['id'] ] ) ) {
-										$options[ $field['id'] ] = '';
-									}
-
-									if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-										foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
-											$before = null;
-											$after  = null;
-
-											if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
-													$before = $plugin_options[ $field['id'] ][ $key ];
-												} else {
-													$before = trim( $plugin_options[ $field['id'] ][ $key ] );
-												}
-											}
-
-											if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												$after = $options[ $field['id'] ][ $key ];
-											}
-
-											$validation = new $validate( $core, $field, $before, $after );
-
-											if ( ! empty( $validation->value ) || '0' === $validation->value ) {
-												$plugin_options[ $field['id'] ][ $key ] = $validation->value;
-											} else {
-												unset( $plugin_options[ $field['id'] ][ $key ] );
-											}
-
-											if ( ! empty( $validation->error ) ) {
-												$core->errors[] = $validation->error;
-											}
-
-											if ( ! empty( $validation->warning ) ) {
-												$core->warnings[] = $validation->warning;
-											}
-
-											if ( ! empty( $validation->sanitize ) ) {
-												$core->sanitize[] = $validation->sanitize;
-											}
-										}
-									} else {
-										if ( isset( $plugin_options[ $field['id'] ] ) ) {
-											if ( is_array( $plugin_options[ $field['id'] ] ) ) {
-												$pofi = $plugin_options[ $field['id'] ];
-											} else {
-												$pofi = trim( $plugin_options[ $field['id'] ] );
-											}
-										} else {
-											$pofi = null;
-										}
-
-										$validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
-										$plugin_options[ $field['id'] ] = $validation->value;
-
-										if ( ! empty( $validation->error ) ) {
-											$core->errors[] = $validation->error;
-										}
-
-										if ( ! empty( $validation->warning ) ) {
-											$core->warnings[] = $validation->warning;
-										}
-
-										if ( ! empty( $validation->sanitize ) ) {
-											$core->sanitize[] = $validation->sanitize;
-										}
-									}
-
-									break;
-								}
-							}
-						}
-
-						if ( isset( $field['validate_callback'] ) && ( is_callable( $field['validate_callback'] ) || ( is_string( $field['validate_callback'] ) && function_exists( $field['validate_callback'] ) ) ) ) {
-							$callback = $field['validate_callback'];
-							unset( $field['validate_callback'] );
-
-							$plugin_option = $plugin_options[ $field['id'] ] ?? null;
-							$option        = $options[ $field['id'] ] ?? null;
-
-							if ( null !== $plugin_option ) {
-								$callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
-
-								$plugin_options[ $field['id'] ] = $callbackvalues['value'];
-
-								if ( isset( $callbackvalues['error'] ) ) {
-									$core->errors[] = $callbackvalues['error'];
-								}
-
-								if ( isset( $callbackvalues['warning'] ) ) {
-									$core->warnings[] = $callbackvalues['warning'];
-								}
-
-								if ( isset( $callbackvalues['sanitize'] ) ) {
-									$core->sanitize[] = $callbackvalues['sanitize'];
-								}
-							}
-						}
-					}
-				}
-			}
-
-			return $plugin_options;
-		}
-	}
+    /**
+     * Class Redux_Validation
+     */
+    class Redux_Validation extends Redux_Class {
+
+        /**
+         * Validate values from options form (used in settings api validate function)
+         * calls the custom validation class for the field so authors can override with custom classes
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       array $plugin_options Plugin Options.
+         * @param       array $options        Options.
+         * @param       array $sections       Sections array.
+         *
+         * @return      array $plugin_options
+         */
+        public function validate( array $plugin_options, array $options, array $sections ): array {
+            $core = $this->core();
+
+            if (null === $core) {
+                return $plugin_options;
+            }
+
+            foreach ( $sections as $k => $section ) {
+                if ( isset( $section['fields'] ) ) {
+                    foreach ( $section['fields'] as $fkey => $field ) {
+                        if ( is_array( $field ) ) {
+                            $field['section_id'] = $k;
+                        }
+
+                        if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
+                            if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
+                                $plugin_options[ $field['id'] ] = 0;
+                            }
+                        }
+
+                        // Part of Dovy's serialize typography effort.  Preserved here in case it becomes a thing. - kp.
+                        /**
+                         * If ( isset ( $field['type'] ) && $field['type'] == 'typography' ) {
+                         *      if ( ! is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
+                         *          $plugin_options[ $field['id'] ] = json_decode( $plugin_options[ $field['id'] ], true );
+                         *      }
+                         * }
+                         */
+
+                        if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
+                            $plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
+                        }
+
+                        // Make sure 'validate' field is set.
+                        if ( isset( $field['validate'] ) ) {
+
+                            // Can we make this an array of validations?
+                            $val_arr = array();
+
+                            if ( is_array( $field['validate'] ) ) {
+                                $val_arr = $field['validate'];
+                            } else {
+                                $val_arr[] = $field['validate'];
+                            }
+
+                            foreach ( $val_arr as $idx => $val ) {
+                                // shim for old *_not_empty validations.
+                                if ( 'email_not_empty' === $val || 'numeric_not_empty' === $val ) {
+                                    $val = 'not_empty';
+                                }
+
+                                // Make sure 'validate field' is set to 'not_empty'.
+                                $is_not_empty = false;
+
+                                if ( 'not_empty' === $val ) {
+                                    // Set the flag.
+                                    $is_not_empty = true;
+                                }
+
+                                // Check for empty id value.
+                                if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+
+                                    // If we are looking for an empty value, in the case of 'not_empty'
+                                    // then we need to keep processing.
+                                    if ( ! $is_not_empty ) {
+
+                                        // Empty id and not checking for 'not_empty'.  Bail out...
+                                        if ( ! isset( $field['validate_callback'] ) ) {
+                                            continue;
+                                        }
+                                    }
+                                }
+
+                                // Force validate of custom field types.
+                                if ( isset( $field['type'] ) && ! isset( $val ) && ! isset( $field['validate_callback'] ) ) {
+                                    if ( 'color' === $field['type'] || 'color_gradient' === $field['type'] ) {
+                                        $val = 'color';
+                                    } elseif ( 'date' === $field['type'] ) {
+                                        $val = 'date';
+                                    }
+                                }
+
+                                // No need.  Spectrum self validates.
+                                if ( 'color_rgba' === $field['type'] ) {
+                                    continue;
+                                }
+
+                                // Shim out old color rgba validators.
+                                if ( 'color_rgba' === $val || 'colorrgba' === $val ) {
+                                    $val = 'color';
+                                }
+
+                                $validate = 'Redux_Validation_' . $val;
+
+                                if ( ! class_exists( $validate ) ) {
+                                    $file = str_replace( '_', '-', $val );
+
+                                    /**
+                                     * Filter 'redux/validate/{opt_name}/class/{field.validate}'
+                                     *
+                                     * @param string $validate   validation class file path
+                                     */
+
+                                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                                    $class_file = apply_filters( "redux/validate/{$core->args['opt_name']}/class/$val", Redux_Core::$dir . "inc/validation/$val/class-redux-validation-$file.php", $validate );
+
+                                    if ( $class_file ) {
+                                        if ( file_exists( $class_file ) ) {
+                                            require_once $class_file;
+                                        }
+                                    }
+                                }
+
+                                if ( class_exists( $validate ) ) {
+                                    if ( empty( $options[ $field['id'] ] ) ) {
+                                        $options[ $field['id'] ] = '';
+                                    }
+
+                                    if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
+                                        foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+                                            $before = null;
+                                            $after  = null;
+
+                                            if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                    $before = $plugin_options[ $field['id'] ][ $key ];
+                                                } else {
+                                                    $before = trim( $plugin_options[ $field['id'] ][ $key ] );
+                                                }
+                                            }
+
+                                            if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                $after = $options[ $field['id'] ][ $key ];
+                                            }
+
+                                            $validation = new $validate( $core, $field, $before, $after );
+
+                                            if ( ! empty( $validation->value ) || '0' === $validation->value ) {
+                                                $plugin_options[ $field['id'] ][ $key ] = $validation->value;
+                                            } else {
+                                                unset( $plugin_options[ $field['id'] ][ $key ] );
+                                            }
+
+                                            if ( ! empty( $validation->error ) ) {
+                                                $core->errors[] = $validation->error;
+                                            }
+
+                                            if ( ! empty( $validation->warning ) ) {
+                                                $core->warnings[] = $validation->warning;
+                                            }
+
+                                            if ( ! empty( $validation->sanitize ) ) {
+                                                $core->sanitize[] = $validation->sanitize;
+                                            }
+                                        }
+                                    } else {
+                                        if ( isset( $plugin_options[ $field['id'] ] ) ) {
+                                            if ( is_array( $plugin_options[ $field['id'] ] ) ) {
+                                                $pofi = $plugin_options[ $field['id'] ];
+                                            } else {
+                                                $pofi = trim( $plugin_options[ $field['id'] ] );
+                                            }
+                                        } else {
+                                            $pofi = null;
+                                        }
+
+                                        $validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
+                                        $plugin_options[ $field['id'] ] = $validation->value;
+
+                                        if ( ! empty( $validation->error ) ) {
+                                            $core->errors[] = $validation->error;
+                                        }
+
+                                        if ( ! empty( $validation->warning ) ) {
+                                            $core->warnings[] = $validation->warning;
+                                        }
+
+                                        if ( ! empty( $validation->sanitize ) ) {
+                                            $core->sanitize[] = $validation->sanitize;
+                                        }
+                                    }
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        if ( isset( $field['validate_callback'] ) && ( is_callable( $field['validate_callback'] ) || ( is_string( $field['validate_callback'] ) && function_exists( $field['validate_callback'] ) ) ) ) {
+                            $callback = $field['validate_callback'];
+                            unset( $field['validate_callback'] );
+
+                            $plugin_option = $plugin_options[ $field['id'] ] ?? null;
+                            $option        = $options[ $field['id'] ] ?? null;
+
+                            if ( null !== $plugin_option ) {
+                                $callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
+
+                                $plugin_options[ $field['id'] ] = $callbackvalues['value'];
+
+                                if ( isset( $callbackvalues['error'] ) ) {
+                                    $core->errors[] = $callbackvalues['error'];
+                                }
+
+                                if ( isset( $callbackvalues['warning'] ) ) {
+                                    $core->warnings[] = $callbackvalues['warning'];
+                                }
+
+                                if ( isset( $callbackvalues['sanitize'] ) ) {
+                                    $core->sanitize[] = $callbackvalues['sanitize'];
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return $plugin_options;
+        }
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -32,7 +32,7 @@ 
 		public function validate( array $plugin_options, array $options, array $sections ): array {
 			$core = $this->core();
 
-			if (null === $core) {
+			if ( null === $core ) {
 				return $plugin_options;
 			}
 
@@ -44,8 +44,8 @@ 
 						}
 
 						if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
-							if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
-								$plugin_options[ $field['id'] ] = 0;
+							if ( ! isset( $plugin_options[$field['id']] ) ) {
+								$plugin_options[$field['id']] = 0;
 							}
 						}
 
@@ -58,8 +58,8 @@ 
 						 * }
 						 */
 
-						if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
-							$plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
+						if ( isset( $core->extensions[$field['type']] ) && method_exists( $core->extensions[$field['type']], '_validate_values' ) ) {
+							$plugin_options = $core->extensions[$field['type']]->_validate_values( $plugin_options, $field, $sections );
 						}
 
 						// Make sure 'validate' field is set.
@@ -89,7 +89,7 @@ 
 								}
 
 								// Check for empty id value.
-								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[$field['id']] ) || ( '' === $plugin_options[$field['id']] ) ) {
 
 									// If we are looking for an empty value, in the case of 'not_empty'
 									// then we need to keep processing.
@@ -143,33 +143,33 @@ 
 								}
 
 								if ( class_exists( $validate ) ) {
-									if ( empty( $options[ $field['id'] ] ) ) {
-										$options[ $field['id'] ] = '';
+									if ( empty( $options[$field['id']] ) ) {
+										$options[$field['id']] = '';
 									}
 
-									if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-										foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+									if ( isset( $plugin_options[$field['id']] ) && is_array( $plugin_options[$field['id']] ) && ! empty( $plugin_options[$field['id']] ) ) {
+										foreach ( $plugin_options[$field['id']] as $key => $value ) {
 											$before = null;
 											$after  = null;
 
-											if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
-													$before = $plugin_options[ $field['id'] ][ $key ];
+											if ( isset( $plugin_options[$field['id']][$key] ) && ( ! empty( $plugin_options[$field['id']][$key] ) || '0' === $plugin_options[$field['id']][$key] ) ) {
+												if ( is_array( $plugin_options[$field['id']][$key] ) ) {
+													$before = $plugin_options[$field['id']][$key];
 												} else {
-													$before = trim( $plugin_options[ $field['id'] ][ $key ] );
+													$before = trim( $plugin_options[$field['id']][$key] );
 												}
 											}
 
-											if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												$after = $options[ $field['id'] ][ $key ];
+											if ( isset( $options[$field['id']][$key] ) && ( ! empty( $plugin_options[$field['id']][$key] ) || '0' === $plugin_options[$field['id']][$key] ) ) {
+												$after = $options[$field['id']][$key];
 											}
 
 											$validation = new $validate( $core, $field, $before, $after );
 
 											if ( ! empty( $validation->value ) || '0' === $validation->value ) {
-												$plugin_options[ $field['id'] ][ $key ] = $validation->value;
+												$plugin_options[$field['id']][$key] = $validation->value;
 											} else {
-												unset( $plugin_options[ $field['id'] ][ $key ] );
+												unset( $plugin_options[$field['id']][$key] );
 											}
 
 											if ( ! empty( $validation->error ) ) {
@@ -185,18 +185,18 @@ 
 											}
 										}
 									} else {
-										if ( isset( $plugin_options[ $field['id'] ] ) ) {
-											if ( is_array( $plugin_options[ $field['id'] ] ) ) {
-												$pofi = $plugin_options[ $field['id'] ];
+										if ( isset( $plugin_options[$field['id']] ) ) {
+											if ( is_array( $plugin_options[$field['id']] ) ) {
+												$pofi = $plugin_options[$field['id']];
 											} else {
-												$pofi = trim( $plugin_options[ $field['id'] ] );
+												$pofi = trim( $plugin_options[$field['id']] );
 											}
 										} else {
 											$pofi = null;
 										}
 
-										$validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
-										$plugin_options[ $field['id'] ] = $validation->value;
+										$validation                     = new $validate( $core, $field, $pofi, $options[$field['id']] );
+										$plugin_options[$field['id']] = $validation->value;
 
 										if ( ! empty( $validation->error ) ) {
 											$core->errors[] = $validation->error;
@@ -220,13 +220,13 @@ 
 							$callback = $field['validate_callback'];
 							unset( $field['validate_callback'] );
 
-							$plugin_option = $plugin_options[ $field['id'] ] ?? null;
-							$option        = $options[ $field['id'] ] ?? null;
+							$plugin_option = $plugin_options[$field['id']] ?? null;
+							$option        = $options[$field['id']] ?? null;
 
 							if ( null !== $plugin_option ) {
 								$callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
 
-								$plugin_options[ $field['id'] ] = $callbackvalues['value'];
+								$plugin_options[$field['id']] = $callbackvalues['value'];
 
 								if ( isset( $callbackvalues['error'] ) ) {
 									$core->errors[] = $callbackvalues['error'];

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

Indentation +59 added lines, -59 removed lines

@@ -12,73 +12,73 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Gallery', false ) ) {
 
-	/**
-	 * Main Redux_gallery class
-	 *
-	 * @since       3.0.0
-	 */
-	class Redux_Gallery extends Redux_Field {
+    /**
+     * Main Redux_gallery class
+     *
+     * @since       3.0.0
+     */
+    class Redux_Gallery extends Redux_Field {
 
-		/**
-		 * 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() {
-			echo '<div class="screenshot">';
+        /**
+         * 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() {
+            echo '<div class="screenshot">';
 
-			if ( ! empty( $this->value ) ) {
-				$ids = explode( ',', $this->value );
+            if ( ! empty( $this->value ) ) {
+                $ids = explode( ',', $this->value );
 
-				foreach ( $ids as $attachment_id ) {
-					$img = wp_get_attachment_image_src( $attachment_id );
-					if ( false !== $img ) {
-						$alt = wp_prepare_attachment_for_js( $attachment_id );
-						$alt = $alt['alt'] ?? '';
+                foreach ( $ids as $attachment_id ) {
+                    $img = wp_get_attachment_image_src( $attachment_id );
+                    if ( false !== $img ) {
+                        $alt = wp_prepare_attachment_for_js( $attachment_id );
+                        $alt = $alt['alt'] ?? '';
 
-						echo '<a class="of-uploaded-image" href="' . esc_url( $img[0] ) . '">';
-						echo '<img class="redux-option-image" id="image_' . esc_attr( $this->field['id'] ) . '_' . esc_attr( $attachment_id ) . '" src="' . esc_url( $img[0] ) . '" alt="' . esc_attr( $alt ) . '" target="_blank" rel="external" />';
-						echo '</a>';
-					}
-				}
-			}
+                        echo '<a class="of-uploaded-image" href="' . esc_url( $img[0] ) . '">';
+                        echo '<img class="redux-option-image" id="image_' . esc_attr( $this->field['id'] ) . '_' . esc_attr( $attachment_id ) . '" src="' . esc_url( $img[0] ) . '" alt="' . esc_attr( $alt ) . '" target="_blank" rel="external" />';
+                        echo '</a>';
+                    }
+                }
+            }
 
-			echo '</div>';
-			echo '<a href="#" onclick="return false;" id="edit-gallery" class="gallery-attachments button button-primary">' . esc_html__( 'Add/Edit Gallery', 'redux-framework' ) . '</a> ';
-			echo '<a href="#" onclick="return false;" id="clear-gallery" class="gallery-attachments button">' . esc_html__( 'Clear Gallery', 'redux-framework' ) . '</a>';
-			echo '<input type="hidden" class="gallery_values ' . esc_attr( $this->field['class'] ) . '" value="' . esc_attr( $this->value ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" />';
-		}
+            echo '</div>';
+            echo '<a href="#" onclick="return false;" id="edit-gallery" class="gallery-attachments button button-primary">' . esc_html__( 'Add/Edit Gallery', 'redux-framework' ) . '</a> ';
+            echo '<a href="#" onclick="return false;" id="clear-gallery" class="gallery-attachments button">' . esc_html__( 'Clear Gallery', 'redux-framework' ) . '</a>';
+            echo '<input type="hidden" class="gallery_values ' . esc_attr( $this->field['class'] ) . '" value="' . esc_attr( $this->value ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" />';
+        }
 
-		/**
-		 * 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() {
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
 
-			if ( function_exists( 'wp_enqueue_media' ) ) {
-				wp_enqueue_media();
-			} else {
-				wp_enqueue_script( 'media-upload' );
-				wp_enqueue_script( 'thickbox' );
-				wp_enqueue_style( 'thickbox' );
-			}
+            if ( function_exists( 'wp_enqueue_media' ) ) {
+                wp_enqueue_media();
+            } else {
+                wp_enqueue_script( 'media-upload' );
+                wp_enqueue_script( 'thickbox' );
+                wp_enqueue_style( 'thickbox' );
+            }
 
-			wp_enqueue_script(
-				'redux-field-gallery',
-				Redux_Core::$url . 'inc/fields/gallery/redux-gallery' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+            wp_enqueue_script(
+                'redux-field-gallery',
+                Redux_Core::$url . 'inc/fields/gallery/redux-gallery' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Gallery', 'ReduxFramework_Gallery' );

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;
 			}
 		}
 

redux-core/inc/fields/ace_editor/class-redux-ace-editor.php

Indentation +71 added lines, -71 removed lines

@@ -13,45 +13,45 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Ace_Editor', false ) ) {
 
-	/**
-	 * Class Redux_Ace_Editor
-	 */
-	class Redux_Ace_Editor extends Redux_Field {
+    /**
+     * Class Redux_Ace_Editor
+     */
+    class Redux_Ace_Editor extends Redux_Field {
 
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			if ( is_array( $this->value ) ) {
-				$this->value = '';
-			} else {
-				$this->value = trim( $this->value );
-			}
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            if ( is_array( $this->value ) ) {
+                $this->value = '';
+            } else {
+                $this->value = trim( $this->value );
+            }
 
-			if ( ! empty( $this->field['options'] ) ) {
-				$this->field['args'] = $this->field['options'];
-				unset( $this->field['options'] );
-			}
+            if ( ! empty( $this->field['options'] ) ) {
+                $this->field['args'] = $this->field['options'];
+                unset( $this->field['options'] );
+            }
 
-			if ( ! isset( $this->field['mode'] ) ) {
-				$this->field['mode'] = 'javascript';
-			}
-			if ( ! isset( $this->field['theme'] ) ) {
-				$this->field['theme'] = 'monokai';
-			}
+            if ( ! isset( $this->field['mode'] ) ) {
+                $this->field['mode'] = 'javascript';
+            }
+            if ( ! isset( $this->field['theme'] ) ) {
+                $this->field['theme'] = 'monokai';
+            }
 
-			$params = array(
-				'minLines' => 10,
-				'maxLines' => 30,
-			);
+            $params = array(
+                'minLines' => 10,
+                'maxLines' => 30,
+            );
 
-			if ( isset( $this->field['args'] ) && ! empty( $this->field['args'] ) && is_array( $this->field['args'] ) ) {
-				$params = wp_parse_args( $this->field['args'], $params );
-			}
-			?>
+            if ( isset( $this->field['args'] ) && ! empty( $this->field['args'] ) && is_array( $this->field['args'] ) ) {
+                $params = wp_parse_args( $this->field['args'], $params );
+            }
+            ?>
 			<div class="ace-wrapper">
 				<input
 					type="hidden"
@@ -70,46 +70,46 @@ 
 					class="ace-editor-area"><?php echo esc_html( $this->value ); ?></pre>
 			</div>
 			<?php
-		}
+        }
 
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-ace-editor',
-					Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor.css',
-					array(),
-					$this->timestamp
-				);
-			}
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-ace-editor',
+                    Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
 
-			if ( ! wp_script_is( 'ace-editor-js' ) ) {
-				wp_enqueue_script(
-					'ace-editor-js',
-					// phpcs:ignore Generic.Strings.UnnecessaryStringConcat, WordPress.NamingConventions.ValidHookName
-					apply_filters( 'redux/' . $this->parent->args['opt_name'] . 'fields/ace/script', '//' . 'cdnjs' . '.cloudflare' . '.com/ajax/libs/ace/1.43.0/ace.min.js' ),
-					array( 'jquery' ),
-					'1.43.0',
-					true
-				);
-			}
+            if ( ! wp_script_is( 'ace-editor-js' ) ) {
+                wp_enqueue_script(
+                    'ace-editor-js',
+                    // phpcs:ignore Generic.Strings.UnnecessaryStringConcat, WordPress.NamingConventions.ValidHookName
+                    apply_filters( 'redux/' . $this->parent->args['opt_name'] . 'fields/ace/script', '//' . 'cdnjs' . '.cloudflare' . '.com/ajax/libs/ace/1.43.0/ace.min.js' ),
+                    array( 'jquery' ),
+                    '1.43.0',
+                    true
+                );
+            }
 
-			wp_enqueue_script(
-				'redux-field-ace-editor',
-				Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'ace-editor-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+            wp_enqueue_script(
+                'redux-field-ace-editor',
+                Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'ace-editor-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Ace_Editor', 'ReduxFramework_Ace_Editor' );

class-redux-framework-plugin.php

Indentation +435 added lines, -435 removed lines

@@ -11,439 +11,439 @@
 
 if ( ! class_exists( 'Redux_Framework_Plugin', false ) ) {
 
-	/**
-	 * Main Redux_Framework_Plugin class
-	 *
-	 * @since       3.0.0
-	 */
-	class Redux_Framework_Plugin {
-
-		/**
-		 * Option array for demo mode.
-		 *
-		 * @access      protected
-		 * @var         array $options Array of config options, used to check for demo mode
-		 * @since       3.0.0
-		 */
-		protected array $options = array();
-
-		/**
-		 * Use this value as the text domain when translating strings from this plugin. It should match
-		 * the Text Domain field set in the plugin header, as well as the directory name of the plugin.
-		 * Additionally, text domains should only contain letters, number and hyphens, not underscores
-		 * or spaces.
-		 *
-		 * @access      protected
-		 * @var         string $plugin_slug The unique ID (slug) of this plugin
-		 * @since       3.0.0
-		 */
-		protected string $plugin_slug = 'redux-framework';
-
-		/**
-		 * Set on network activate.
-		 *
-		 * @access      protected
-		 * @var         null|string $plugin_network_activated Check for plugin network activation
-		 * @since       3.0.0
-		 */
-		protected ?string $plugin_network_activated = null;
-
-		/**
-		 * Class instance.
-		 *
-		 * @access      private
-		 * @var         ?Redux_Framework_Plugin $instance The one true Redux_Framework_Plugin
-		 * @since       3.0.0
-		 */
-		private static ?Redux_Framework_Plugin $instance = null;
-
-		/**
-		 * Crash flag.
-		 *
-		 * @access      private
-		 * @var         Redux_Framework_Plugin $crash Crash flag if inside a crash.
-		 * @since       4.1.15
-		 */
-		public static $crash = false;
-
-		/**
-		 * Get active instance
-		 *
-		 * @access      public
-		 * @since       3.1.3
-		 * @return      self::$instance The one true Redux_Framework_Plugin
-		 */
-		public static function instance(): ?Redux_Framework_Plugin {
-			$path = REDUX_PLUGIN_FILE;
-			$res  = false;
-
-			if ( function_exists( 'get_plugin_data' ) && file_exists( $path ) ) {
-				$data = get_plugin_data( $path, true, false );
-
-				if ( isset( $data['Version'] ) && '' !== $data['Version'] ) {
-					$res = version_compare( $data['Version'], '4', '<' );
-				}
-
-				// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals -- active_plugins is a WP hook.
-				if ( true === $res && ! in_array( 'redux-framework/redux-framework.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ), true ) ) {
-					echo '<div class="error"><p>' . esc_html__( 'Redux Framework version 4 is activated but not loaded. Redux Framework version 3 is still installed and activated.  Please deactivate Redux Framework version 3.', 'redux-framework' ) . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput
-					return null;
-				}
-			}
-
-			if ( ! self::$instance ) {
-				self::$instance = new self();
-				if ( class_exists( 'ReduxFramework' ) ) {
-					self::$instance->load_first();
-				} else {
-					self::$instance->get_redux_options();
-					self::$instance->includes();
-					self::$instance->hooks();
-				}
-			}
-
-			return self::$instance;
-		}
-
-		/**
-		 * Shim for getting instance
-		 *
-		 * @access      public
-		 * @since       4.0.1
-		 * @return      self::$instance The one true Redux_Framework_Plugin
-		 */
-		public static function get_instance(): ?Redux_Framework_Plugin {
-			return self::instance();
-		}
-
-		/**
-		 * Get Redux options
-		 *
-		 * @access      public
-		 * @since       3.1.3
-		 * @return      void
-		 */
-		public function get_redux_options() {
-
-			// Setup defaults.
-			$defaults = array(
-				'demo' => false,
-			);
-
-			// If multisite is enabled.
-			if ( is_multisite() ) {
-
-				// Get network activated plugins.
-				$plugins = get_site_option( 'active_sitewide_plugins' );
-
-				foreach ( $plugins as $file => $plugin ) {
-					if ( strpos( $file, 'redux-framework.php' ) !== false ) {
-						$this->plugin_network_activated = true;
-						$this->options                  = get_site_option( 'ReduxFrameworkPlugin', $defaults );
-					}
-				}
-			}
-
-			// If options aren't set, grab them now!
-			if ( empty( $this->options ) ) {
-				$this->options = get_option( 'ReduxFrameworkPlugin', $defaults );
-			}
-		}
-
-		/**
-		 * Include the necessary files
-		 *
-		 * @access      public
-		 * @since       3.1.3
-		 * @return      void
-		 */
-		public function includes() {
-
-			// Include Redux_Core.
-			if ( file_exists( __DIR__ . '/redux-core/framework.php' ) ) {
-				require_once __DIR__ . '/redux-core/framework.php';
-			}
-
-			if ( file_exists( __DIR__ . '/redux-templates/redux-templates.php' ) ) {
-				require_once __DIR__ . '/redux-templates/redux-templates.php';
-			}
-
-			if ( isset( Redux_Core::$as_plugin ) ) {
-				Redux_Core::$as_plugin = true;
-			}
-
-			add_action( 'setup_theme', array( $this, 'load_sample_config' ) );
-		}
-
-		/**
-		 * Loads the sample config after everything is loaded.
-		 *
-		 * @access      public
-		 * @since       4.0.2
-		 * @return      void
-		 */
-		public function load_sample_config() {
-			// Include demo config, if demo mode is active.
-			if ( $this->options['demo'] && file_exists( __DIR__ . '/sample/sample-config.php' ) ) {
-				require_once __DIR__ . '/sample/sample-config.php';
-			}
-		}
-
-		/**
-		 * Run action and filter hooks
-		 *
-		 * @access      private
-		 * @since       3.1.3
-		 * @return      void
-		 */
-		private function hooks() {
-			add_action( 'activated_plugin', array( $this, 'load_first' ) );
-			add_action( 'wp_loaded', array( $this, 'options_toggle_check' ) );
-
-			// Activate plugin when a new blog is added.
-			add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) );
-
-			// Display admin notices.
-			add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-
-			// Edit plugin metalinks.
-			add_filter( 'plugin_row_meta', array( $this, 'plugin_metalinks' ), null, 2 );
-			add_filter( 'network_admin_plugin_action_links', array( $this, 'add_settings_link' ), 1, 2 );
-			add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 1, 2 );
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( 'redux/plugin/hooks', $this );
-		}
-
-		/**
-		 * Pushes Redux to the top of plugin load list, so it initializes before any plugin that may use it.
-		 */
-		public function load_first() {
-			if ( ! class_exists( 'Redux_Functions_Ex' ) ) {
-				require_once __DIR__ . '/redux-core/inc/classes/class-redux-functions-ex.php';
-			}
-
-			$plugin_dir = Redux_Functions_Ex::wp_normalize_path( WP_PLUGIN_DIR ) . '/';
-			$self_file  = Redux_Functions_Ex::wp_normalize_path( __FILE__ );
-
-			$path = str_replace( $plugin_dir, '', $self_file );
-			$path = str_replace( 'class-redux-framework-plugin.php', 'redux-framework.php', $path );
-
-			$plugins = get_option( 'active_plugins' );
-
-			if ( $plugins ) {
-				$key = array_search( $path, $plugins, true );
-
-				if ( false !== $key ) {
-					array_splice( $plugins, $key, 1 );
-					array_unshift( $plugins, $path );
-					update_option( 'active_plugins', $plugins );
-				}
-			}
-		}
-
-		/**
-		 * Fired on plugin activation
-		 *
-		 * @access      public
-		 * @return      void
-		 * @since       3.0.0
-		 */
-		public static function activate() {
-			delete_site_transient( 'update_plugins' );
-		}
-
-		/**
-		 * Fired when plugin is deactivated
-		 *
-		 * @access      public
-		 * @since       3.0.0
-		 *
-		 * @param       boolean $network_wide True if plugin is network activated, false otherwise.
-		 *
-		 * @return      void
-		 */
-		public static function deactivate( ?bool $network_wide ) {
-			if ( function_exists( 'is_multisite' ) && is_multisite() ) {
-				if ( $network_wide ) {
-					// Get all blog IDs.
-					$blog_ids = self::get_blog_ids();
-
-					foreach ( $blog_ids as $blog_id ) {
-						switch_to_blog( $blog_id );
-						self::single_deactivate();
-					}
-					restore_current_blog();
-				} else {
-					self::single_deactivate();
-				}
-			} else {
-				self::single_deactivate();
-			}
-
-			delete_option( 'ReduxFrameworkPlugin' );
-		}
-
-		/**
-		 * Fired when a new WPMU site is activated
-		 *
-		 * @access      public
-		 *
-		 * @param       int $blog_id The ID of the new blog.
-		 *
-		 * @return      void
-		 * @since       3.0.0
-		 */
-		public function activate_new_site( int $blog_id ) {
-			if ( 1 !== did_action( 'wpmu_new_blog' ) ) {
-				return;
-			}
-
-			switch_to_blog( $blog_id );
-			self::single_activate();
-			restore_current_blog();
-		}
-
-		/**
-		 * Get all IDs of blogs that are not activated, not spam, and not deleted
-		 *
-		 * @access      private
-		 * @since       3.0.0
-		 * @global      object $wpdb
-		 * @return      array|false Array of IDs or false if none are found
-		 */
-		private static function get_blog_ids() {
-			global $wpdb;
-
-			$var = '0';
-
-			// Get an array of IDs (We have to do it this way because WordPress says so, however redundant).
-			$result = wp_cache_get( 'redux-blog-ids' );
-			if ( false === $result ) {
-
-				// WordPress says get_col is discouraged?  I found no alternative.  So...ignore! - kp.
-				// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
-				$result = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE archived = %s AND spam = %s AND deleted = %s", $var, $var, $var ) );
-
-				wp_cache_set( 'redux-blog-ids', $result );
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Fired for each WPMS blog on plugin activation
-		 *
-		 * @access      private
-		 * @since       3.0.0
-		 * @return      void
-		 */
-		private static function single_activate() {
-			$nonce = wp_create_nonce( 'redux_framework_demo' );
-
-			$notices   = get_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES', array() );
-			$notices[] = esc_html__( 'Redux Framework has an embedded demo.', 'redux-framework' ) . ' <a href="./plugins.php?redux-framework-plugin=demo&nonce=' . $nonce . '">' . esc_html__( 'Click here to activate the sample config file.', 'redux-framework' ) . '</a>';
-
-			update_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES', $notices );
-		}
-
-		/**
-		 * Display admin notices
-		 *
-		 * @access      public
-		 * @since       3.0.0
-		 * @return      void
-		 */
-		public function admin_notices() {
-			do_action( 'redux_framework_plugin_admin_notice' );
-			$notices = get_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES', '' );
-			if ( ! empty( $notices ) ) {
-				foreach ( $notices as $notice ) {
-					echo '<div class="updated notice is-dismissible"><p>' . $notice . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput
-				}
-
-				delete_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES' );
-			}
-		}
-
-		/**
-		 * Fired for each blog when the plugin is deactivated
-		 *
-		 * @access      private
-		 * @since       3.0.0
-		 * @return      void
-		 */
-		private static function single_deactivate() {
-			delete_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES' );
-		}
-
-		/**
-		 * Turn on or off
-		 *
-		 * @access      public
-		 * @since       3.0.0
-		 * @return      void
-		 */
-		public function options_toggle_check() {
-			if ( isset( $_GET['nonce'] ) && wp_verify_nonce( sanitize_key( $_GET['nonce'] ), 'redux_framework_demo' ) ) {
-				if ( isset( $_GET['redux-framework-plugin'] ) && 'demo' === $_GET['redux-framework-plugin'] ) {
-					$url = admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) );
-
-					if ( false === $this->options['demo'] ) {
-						$this->options['demo'] = true;
-						$url                   = admin_url( add_query_arg( array( 'page' => 'redux_demo' ), 'admin.php' ) );
-					} else {
-						$this->options['demo'] = false;
-					}
-
-					if ( is_multisite() && $this->plugin_network_activated ) {
-						update_site_option( 'ReduxFrameworkPlugin', $this->options );
-					} else {
-						update_option( 'ReduxFrameworkPlugin', $this->options );
-					}
-
-					wp_safe_redirect( esc_url( $url ) );
-
-					exit();
-				}
-			}
-		}
-
-
-		/**
-		 * Add a settings link to the Redux entry in the plugin overview screen
-		 *
-		 * @param array $links Links array.
-		 *
-		 * @return array
-		 * @see   filter:plugin_action_links
-		 * @since 1.0
-		 */
-		public function add_settings_link( array $links ): array {
-			return $links;
-		}
-
-		/**
-		 * Edit plugin metalinks
-		 *
-		 * @access      public
-		 *
-		 * @param array  $links The current array of links.
-		 * @param string $file  A specific plugin row.
-		 *
-		 * @return      array The modified array of links
-		 * @since       3.0.0
-		 */
-		public function plugin_metalinks( array $links, string $file ): array {
-			if ( strpos( $file, 'redux-framework.php' ) !== false && is_plugin_active( $file ) ) {
-				$links[] = '<a href="' . esc_url( admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) ) ) . '">' . esc_html__( 'What is this?', 'redux-framework' ) . '</a>';
-			}
-
-			return $links;
-		}
-	}
-
-	if ( ! class_exists( 'ReduxFrameworkPlugin' ) ) {
-		class_alias( 'Redux_Framework_Plugin', 'ReduxFrameworkPlugin' );
-	}
+    /**
+     * Main Redux_Framework_Plugin class
+     *
+     * @since       3.0.0
+     */
+    class Redux_Framework_Plugin {
+
+        /**
+         * Option array for demo mode.
+         *
+         * @access      protected
+         * @var         array $options Array of config options, used to check for demo mode
+         * @since       3.0.0
+         */
+        protected array $options = array();
+
+        /**
+         * Use this value as the text domain when translating strings from this plugin. It should match
+         * the Text Domain field set in the plugin header, as well as the directory name of the plugin.
+         * Additionally, text domains should only contain letters, number and hyphens, not underscores
+         * or spaces.
+         *
+         * @access      protected
+         * @var         string $plugin_slug The unique ID (slug) of this plugin
+         * @since       3.0.0
+         */
+        protected string $plugin_slug = 'redux-framework';
+
+        /**
+         * Set on network activate.
+         *
+         * @access      protected
+         * @var         null|string $plugin_network_activated Check for plugin network activation
+         * @since       3.0.0
+         */
+        protected ?string $plugin_network_activated = null;
+
+        /**
+         * Class instance.
+         *
+         * @access      private
+         * @var         ?Redux_Framework_Plugin $instance The one true Redux_Framework_Plugin
+         * @since       3.0.0
+         */
+        private static ?Redux_Framework_Plugin $instance = null;
+
+        /**
+         * Crash flag.
+         *
+         * @access      private
+         * @var         Redux_Framework_Plugin $crash Crash flag if inside a crash.
+         * @since       4.1.15
+         */
+        public static $crash = false;
+
+        /**
+         * Get active instance
+         *
+         * @access      public
+         * @since       3.1.3
+         * @return      self::$instance The one true Redux_Framework_Plugin
+         */
+        public static function instance(): ?Redux_Framework_Plugin {
+            $path = REDUX_PLUGIN_FILE;
+            $res  = false;
+
+            if ( function_exists( 'get_plugin_data' ) && file_exists( $path ) ) {
+                $data = get_plugin_data( $path, true, false );
+
+                if ( isset( $data['Version'] ) && '' !== $data['Version'] ) {
+                    $res = version_compare( $data['Version'], '4', '<' );
+                }
+
+                // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals -- active_plugins is a WP hook.
+                if ( true === $res && ! in_array( 'redux-framework/redux-framework.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ), true ) ) {
+                    echo '<div class="error"><p>' . esc_html__( 'Redux Framework version 4 is activated but not loaded. Redux Framework version 3 is still installed and activated.  Please deactivate Redux Framework version 3.', 'redux-framework' ) . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput
+                    return null;
+                }
+            }
+
+            if ( ! self::$instance ) {
+                self::$instance = new self();
+                if ( class_exists( 'ReduxFramework' ) ) {
+                    self::$instance->load_first();
+                } else {
+                    self::$instance->get_redux_options();
+                    self::$instance->includes();
+                    self::$instance->hooks();
+                }
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Shim for getting instance
+         *
+         * @access      public
+         * @since       4.0.1
+         * @return      self::$instance The one true Redux_Framework_Plugin
+         */
+        public static function get_instance(): ?Redux_Framework_Plugin {
+            return self::instance();
+        }
+
+        /**
+         * Get Redux options
+         *
+         * @access      public
+         * @since       3.1.3
+         * @return      void
+         */
+        public function get_redux_options() {
+
+            // Setup defaults.
+            $defaults = array(
+                'demo' => false,
+            );
+
+            // If multisite is enabled.
+            if ( is_multisite() ) {
+
+                // Get network activated plugins.
+                $plugins = get_site_option( 'active_sitewide_plugins' );
+
+                foreach ( $plugins as $file => $plugin ) {
+                    if ( strpos( $file, 'redux-framework.php' ) !== false ) {
+                        $this->plugin_network_activated = true;
+                        $this->options                  = get_site_option( 'ReduxFrameworkPlugin', $defaults );
+                    }
+                }
+            }
+
+            // If options aren't set, grab them now!
+            if ( empty( $this->options ) ) {
+                $this->options = get_option( 'ReduxFrameworkPlugin', $defaults );
+            }
+        }
+
+        /**
+         * Include the necessary files
+         *
+         * @access      public
+         * @since       3.1.3
+         * @return      void
+         */
+        public function includes() {
+
+            // Include Redux_Core.
+            if ( file_exists( __DIR__ . '/redux-core/framework.php' ) ) {
+                require_once __DIR__ . '/redux-core/framework.php';
+            }
+
+            if ( file_exists( __DIR__ . '/redux-templates/redux-templates.php' ) ) {
+                require_once __DIR__ . '/redux-templates/redux-templates.php';
+            }
+
+            if ( isset( Redux_Core::$as_plugin ) ) {
+                Redux_Core::$as_plugin = true;
+            }
+
+            add_action( 'setup_theme', array( $this, 'load_sample_config' ) );
+        }
+
+        /**
+         * Loads the sample config after everything is loaded.
+         *
+         * @access      public
+         * @since       4.0.2
+         * @return      void
+         */
+        public function load_sample_config() {
+            // Include demo config, if demo mode is active.
+            if ( $this->options['demo'] && file_exists( __DIR__ . '/sample/sample-config.php' ) ) {
+                require_once __DIR__ . '/sample/sample-config.php';
+            }
+        }
+
+        /**
+         * Run action and filter hooks
+         *
+         * @access      private
+         * @since       3.1.3
+         * @return      void
+         */
+        private function hooks() {
+            add_action( 'activated_plugin', array( $this, 'load_first' ) );
+            add_action( 'wp_loaded', array( $this, 'options_toggle_check' ) );
+
+            // Activate plugin when a new blog is added.
+            add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) );
+
+            // Display admin notices.
+            add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+
+            // Edit plugin metalinks.
+            add_filter( 'plugin_row_meta', array( $this, 'plugin_metalinks' ), null, 2 );
+            add_filter( 'network_admin_plugin_action_links', array( $this, 'add_settings_link' ), 1, 2 );
+            add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 1, 2 );
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( 'redux/plugin/hooks', $this );
+        }
+
+        /**
+         * Pushes Redux to the top of plugin load list, so it initializes before any plugin that may use it.
+         */
+        public function load_first() {
+            if ( ! class_exists( 'Redux_Functions_Ex' ) ) {
+                require_once __DIR__ . '/redux-core/inc/classes/class-redux-functions-ex.php';
+            }
+
+            $plugin_dir = Redux_Functions_Ex::wp_normalize_path( WP_PLUGIN_DIR ) . '/';
+            $self_file  = Redux_Functions_Ex::wp_normalize_path( __FILE__ );
+
+            $path = str_replace( $plugin_dir, '', $self_file );
+            $path = str_replace( 'class-redux-framework-plugin.php', 'redux-framework.php', $path );
+
+            $plugins = get_option( 'active_plugins' );
+
+            if ( $plugins ) {
+                $key = array_search( $path, $plugins, true );
+
+                if ( false !== $key ) {
+                    array_splice( $plugins, $key, 1 );
+                    array_unshift( $plugins, $path );
+                    update_option( 'active_plugins', $plugins );
+                }
+            }
+        }
+
+        /**
+         * Fired on plugin activation
+         *
+         * @access      public
+         * @return      void
+         * @since       3.0.0
+         */
+        public static function activate() {
+            delete_site_transient( 'update_plugins' );
+        }
+
+        /**
+         * Fired when plugin is deactivated
+         *
+         * @access      public
+         * @since       3.0.0
+         *
+         * @param       boolean $network_wide True if plugin is network activated, false otherwise.
+         *
+         * @return      void
+         */
+        public static function deactivate( ?bool $network_wide ) {
+            if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+                if ( $network_wide ) {
+                    // Get all blog IDs.
+                    $blog_ids = self::get_blog_ids();
+
+                    foreach ( $blog_ids as $blog_id ) {
+                        switch_to_blog( $blog_id );
+                        self::single_deactivate();
+                    }
+                    restore_current_blog();
+                } else {
+                    self::single_deactivate();
+                }
+            } else {
+                self::single_deactivate();
+            }
+
+            delete_option( 'ReduxFrameworkPlugin' );
+        }
+
+        /**
+         * Fired when a new WPMU site is activated
+         *
+         * @access      public
+         *
+         * @param       int $blog_id The ID of the new blog.
+         *
+         * @return      void
+         * @since       3.0.0
+         */
+        public function activate_new_site( int $blog_id ) {
+            if ( 1 !== did_action( 'wpmu_new_blog' ) ) {
+                return;
+            }
+
+            switch_to_blog( $blog_id );
+            self::single_activate();
+            restore_current_blog();
+        }
+
+        /**
+         * Get all IDs of blogs that are not activated, not spam, and not deleted
+         *
+         * @access      private
+         * @since       3.0.0
+         * @global      object $wpdb
+         * @return      array|false Array of IDs or false if none are found
+         */
+        private static function get_blog_ids() {
+            global $wpdb;
+
+            $var = '0';
+
+            // Get an array of IDs (We have to do it this way because WordPress says so, however redundant).
+            $result = wp_cache_get( 'redux-blog-ids' );
+            if ( false === $result ) {
+
+                // WordPress says get_col is discouraged?  I found no alternative.  So...ignore! - kp.
+                // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+                $result = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE archived = %s AND spam = %s AND deleted = %s", $var, $var, $var ) );
+
+                wp_cache_set( 'redux-blog-ids', $result );
+            }
+
+            return $result;
+        }
+
+        /**
+         * Fired for each WPMS blog on plugin activation
+         *
+         * @access      private
+         * @since       3.0.0
+         * @return      void
+         */
+        private static function single_activate() {
+            $nonce = wp_create_nonce( 'redux_framework_demo' );
+
+            $notices   = get_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES', array() );
+            $notices[] = esc_html__( 'Redux Framework has an embedded demo.', 'redux-framework' ) . ' <a href="./plugins.php?redux-framework-plugin=demo&nonce=' . $nonce . '">' . esc_html__( 'Click here to activate the sample config file.', 'redux-framework' ) . '</a>';
+
+            update_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES', $notices );
+        }
+
+        /**
+         * Display admin notices
+         *
+         * @access      public
+         * @since       3.0.0
+         * @return      void
+         */
+        public function admin_notices() {
+            do_action( 'redux_framework_plugin_admin_notice' );
+            $notices = get_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES', '' );
+            if ( ! empty( $notices ) ) {
+                foreach ( $notices as $notice ) {
+                    echo '<div class="updated notice is-dismissible"><p>' . $notice . '</p></div>'; // phpcs:ignore WordPress.Security.EscapeOutput
+                }
+
+                delete_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES' );
+            }
+        }
+
+        /**
+         * Fired for each blog when the plugin is deactivated
+         *
+         * @access      private
+         * @since       3.0.0
+         * @return      void
+         */
+        private static function single_deactivate() {
+            delete_option( 'ReduxFrameworkPlugin_ACTIVATED_NOTICES' );
+        }
+
+        /**
+         * Turn on or off
+         *
+         * @access      public
+         * @since       3.0.0
+         * @return      void
+         */
+        public function options_toggle_check() {
+            if ( isset( $_GET['nonce'] ) && wp_verify_nonce( sanitize_key( $_GET['nonce'] ), 'redux_framework_demo' ) ) {
+                if ( isset( $_GET['redux-framework-plugin'] ) && 'demo' === $_GET['redux-framework-plugin'] ) {
+                    $url = admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) );
+
+                    if ( false === $this->options['demo'] ) {
+                        $this->options['demo'] = true;
+                        $url                   = admin_url( add_query_arg( array( 'page' => 'redux_demo' ), 'admin.php' ) );
+                    } else {
+                        $this->options['demo'] = false;
+                    }
+
+                    if ( is_multisite() && $this->plugin_network_activated ) {
+                        update_site_option( 'ReduxFrameworkPlugin', $this->options );
+                    } else {
+                        update_option( 'ReduxFrameworkPlugin', $this->options );
+                    }
+
+                    wp_safe_redirect( esc_url( $url ) );
+
+                    exit();
+                }
+            }
+        }
+
+
+        /**
+         * Add a settings link to the Redux entry in the plugin overview screen
+         *
+         * @param array $links Links array.
+         *
+         * @return array
+         * @see   filter:plugin_action_links
+         * @since 1.0
+         */
+        public function add_settings_link( array $links ): array {
+            return $links;
+        }
+
+        /**
+         * Edit plugin metalinks
+         *
+         * @access      public
+         *
+         * @param array  $links The current array of links.
+         * @param string $file  A specific plugin row.
+         *
+         * @return      array The modified array of links
+         * @since       3.0.0
+         */
+        public function plugin_metalinks( array $links, string $file ): array {
+            if ( strpos( $file, 'redux-framework.php' ) !== false && is_plugin_active( $file ) ) {
+                $links[] = '<a href="' . esc_url( admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) ) ) . '">' . esc_html__( 'What is this?', 'redux-framework' ) . '</a>';
+            }
+
+            return $links;
+        }
+    }
+
+    if ( ! class_exists( 'ReduxFrameworkPlugin' ) ) {
+        class_alias( 'Redux_Framework_Plugin', 'ReduxFrameworkPlugin' );
+    }
 }