reduxframework / redux-framework

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

Indentation +200 added lines, -200 removed lines

@@ -11,206 +11,206 @@
 
 if ( ! class_exists( 'Redux_Spinner', false ) ) {
 
-	/**
-	 * Class Redux_Spinner
-	 */
-	class Redux_Spinner extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$params = array(
-				'min'     => 0,
-				'max'     => 1,
-				'step'    => 1,
-				'default' => '',
-				'edit'    => true,
-				'plus'    => '+',
-				'minus'   => '-',
-				'format'  => '',
-				'prefix'  => '',
-				'suffix'  => '',
-				'point'   => '.',
-				'places'  => null,
-			);
-
-			$this->field = wp_parse_args( $this->field, $params );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function render() {
-			$data_string = '';
-
-			foreach ( $this->field as $key => $val ) {
-				if ( in_array( $key, array( 'min', 'max', 'step', 'default', 'plus', 'minus', 'prefix', 'suffix', 'point', 'places' ), true ) ) {
-					$data_string .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			}
-
-			$data_string .= ' data-val=' . $this->value;
-
-			// Don't allow input edit if there's a step.
-			$readonly = '';
-			if ( isset( $this->field['edit'] ) && false === $this->field['edit'] ) {
-				$readonly = ' readonly="readonly"';
-			}
-
-			echo '<div id="' . esc_attr( $this->field['id'] ) . '-spinner" class="redux_spinner" rel="' . esc_attr( $this->field['id'] ) . '">';
-
-			echo '<input type="text" ' . $data_string . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" id="' . esc_attr( $this->field['id'] ) . '" value="' . esc_attr( $this->value ) . '" class="mini spinner-input ' . esc_attr( $this->field['class'] ) . '"' . $readonly . '/>'; // phpcs:ignore WordPress.Security.EscapeOutput
-
-			echo '</div>';
-		}
-
-		/**
-		 * Clean the field data to the fields defaults given the parameters.
-		 *
-		 * @since Redux_Framework 3.1.1
-		 */
-		private function clean() {
-			if ( empty( $this->field['min'] ) ) {
-				$this->field['min'] = 0;
-			} else {
-				$this->field['min'] = intval( $this->field['min'] );
-			}
-
-			if ( empty( $this->field['max'] ) ) {
-				$this->field['max'] = $this->field['min'] + 1;
-			} else {
-				$this->field['max'] = intval( $this->field['max'] );
-			}
-
-			if ( empty( $this->field['step'] ) || $this->field['step'] > $this->field['max'] ) {
-				$this->field['step'] = 1;
-			} else {
-				$this->field['step'] = intval( $this->field['step'] );
-			}
-
-			if ( empty( $this->value ) && ! empty( $this->field['default'] ) && $this->field['min'] >= 1 ) {
-				$this->value = intval( $this->field['default'] );
-			}
-
-			if ( empty( $this->value ) && $this->field['min'] >= 1 ) {
-				$this->value = $this->field['min'];
-			}
-
-			if ( empty( $this->value ) ) {
-				$this->value = 0;
-			}
-
-			// Extra Validation.
-			if ( $this->value < $this->field['min'] ) {
-				$this->value = $this->field['min'];
-			} elseif ( $this->value > $this->field['max'] ) {
-				$this->value = $this->field['max'];
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function enqueue() {
-			wp_enqueue_script(
-				'redux-field-spinner-custom',
-				Redux_Core::$url . 'inc/fields/spinner/vendor/jquery.ui.spinner' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			wp_enqueue_script(
-				'redux-field-spinner',
-				Redux_Core::$url . 'inc/fields/spinner/redux-spinner' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-field-spinner-custom', 'jquery-ui-core', 'jquery-ui-dialog', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-spinner',
-					Redux_Core::$url . 'inc/fields/spinner/redux-spinner.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * CSS/compiler output.
-		 *
-		 * @param string|null|array $style CSS styles.
-		 */
-		public function output( $style = '' ) {
-			if ( ! empty( $this->value ) ) {
-				if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
-					$css                      = $this->parse_css( $this->value, $this->field['output'] );
-					$this->parent->outputCSS .= esc_attr( $css );
-				}
-
-				if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
-					$css                        = $this->parse_css( $this->value, $this->field['compiler'] );
-					$this->parent->compilerCSS .= esc_attr( $css );
-				}
-			}
-		}
-
-		/**
-		 * Compile CSS data for output.
-		 *
-		 * @param mixed $value Value.
-		 * @param mixed $output .
-		 *
-		 * @return string
-		 */
-		private function parse_css( $value, $output ): string {
-			// No notices.
-			$css = '';
-
-			$unit = $this->field['output_unit'] ?? 'px';
-
-			// Must be an array.
-			if ( is_array( $output ) ) {
-				foreach ( $output as $selector => $mode ) {
-					if ( '' !== $mode && '' !== $selector ) {
-						$css .= $selector . '{' . $mode . ':' . $value . $unit . ';}';
-					}
-				}
-			}
-
-			return $css;
-		}
-
-		/**
-		 * Generate CSS style (unused, but needed).
-		 *
-		 * @param string $data Field data.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			return '';
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+    /**
+     * Class Redux_Spinner
+     */
+    class Redux_Spinner extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $params = array(
+                'min'     => 0,
+                'max'     => 1,
+                'step'    => 1,
+                'default' => '',
+                'edit'    => true,
+                'plus'    => '+',
+                'minus'   => '-',
+                'format'  => '',
+                'prefix'  => '',
+                'suffix'  => '',
+                'point'   => '.',
+                'places'  => null,
+            );
+
+            $this->field = wp_parse_args( $this->field, $params );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function render() {
+            $data_string = '';
+
+            foreach ( $this->field as $key => $val ) {
+                if ( in_array( $key, array( 'min', 'max', 'step', 'default', 'plus', 'minus', 'prefix', 'suffix', 'point', 'places' ), true ) ) {
+                    $data_string .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $val ) . '" ';
+                }
+            }
+
+            $data_string .= ' data-val=' . $this->value;
+
+            // Don't allow input edit if there's a step.
+            $readonly = '';
+            if ( isset( $this->field['edit'] ) && false === $this->field['edit'] ) {
+                $readonly = ' readonly="readonly"';
+            }
+
+            echo '<div id="' . esc_attr( $this->field['id'] ) . '-spinner" class="redux_spinner" rel="' . esc_attr( $this->field['id'] ) . '">';
+
+            echo '<input type="text" ' . $data_string . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" id="' . esc_attr( $this->field['id'] ) . '" value="' . esc_attr( $this->value ) . '" class="mini spinner-input ' . esc_attr( $this->field['class'] ) . '"' . $readonly . '/>'; // phpcs:ignore WordPress.Security.EscapeOutput
+
+            echo '</div>';
+        }
+
+        /**
+         * Clean the field data to the fields defaults given the parameters.
+         *
+         * @since Redux_Framework 3.1.1
+         */
+        private function clean() {
+            if ( empty( $this->field['min'] ) ) {
+                $this->field['min'] = 0;
+            } else {
+                $this->field['min'] = intval( $this->field['min'] );
+            }
+
+            if ( empty( $this->field['max'] ) ) {
+                $this->field['max'] = $this->field['min'] + 1;
+            } else {
+                $this->field['max'] = intval( $this->field['max'] );
+            }
+
+            if ( empty( $this->field['step'] ) || $this->field['step'] > $this->field['max'] ) {
+                $this->field['step'] = 1;
+            } else {
+                $this->field['step'] = intval( $this->field['step'] );
+            }
+
+            if ( empty( $this->value ) && ! empty( $this->field['default'] ) && $this->field['min'] >= 1 ) {
+                $this->value = intval( $this->field['default'] );
+            }
+
+            if ( empty( $this->value ) && $this->field['min'] >= 1 ) {
+                $this->value = $this->field['min'];
+            }
+
+            if ( empty( $this->value ) ) {
+                $this->value = 0;
+            }
+
+            // Extra Validation.
+            if ( $this->value < $this->field['min'] ) {
+                $this->value = $this->field['min'];
+            } elseif ( $this->value > $this->field['max'] ) {
+                $this->value = $this->field['max'];
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function enqueue() {
+            wp_enqueue_script(
+                'redux-field-spinner-custom',
+                Redux_Core::$url . 'inc/fields/spinner/vendor/jquery.ui.spinner' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            wp_enqueue_script(
+                'redux-field-spinner',
+                Redux_Core::$url . 'inc/fields/spinner/redux-spinner' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-field-spinner-custom', 'jquery-ui-core', 'jquery-ui-dialog', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-spinner',
+                    Redux_Core::$url . 'inc/fields/spinner/redux-spinner.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * CSS/compiler output.
+         *
+         * @param string|null|array $style CSS styles.
+         */
+        public function output( $style = '' ) {
+            if ( ! empty( $this->value ) ) {
+                if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
+                    $css                      = $this->parse_css( $this->value, $this->field['output'] );
+                    $this->parent->outputCSS .= esc_attr( $css );
+                }
+
+                if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
+                    $css                        = $this->parse_css( $this->value, $this->field['compiler'] );
+                    $this->parent->compilerCSS .= esc_attr( $css );
+                }
+            }
+        }
+
+        /**
+         * Compile CSS data for output.
+         *
+         * @param mixed $value Value.
+         * @param mixed $output .
+         *
+         * @return string
+         */
+        private function parse_css( $value, $output ): string {
+            // No notices.
+            $css = '';
+
+            $unit = $this->field['output_unit'] ?? 'px';
+
+            // Must be an array.
+            if ( is_array( $output ) ) {
+                foreach ( $output as $selector => $mode ) {
+                    if ( '' !== $mode && '' !== $selector ) {
+                        $css .= $selector . '{' . $mode . ':' . $value . $unit . ';}';
+                    }
+                }
+            }
+
+            return $css;
+        }
+
+        /**
+         * Generate CSS style (unused, but needed).
+         *
+         * @param string $data Field data.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            return '';
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Spinner', 'ReduxFramework_Spinner' );

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

Indentation +36 added lines, -36 removed lines

@@ -12,53 +12,53 @@
 
 if ( ! class_exists( 'Redux_Radio', false ) ) {
 
-	/**
-	 * Class Redux_Radio
-	 */
-	class Redux_Radio extends Redux_Field {
+    /**
+     * Class Redux_Radio
+     */
+    class Redux_Radio 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 ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
-				if ( empty( $this->field['args'] ) ) {
-					$this->field['args'] = array();
-				}
+        /**
+         * 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 ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
+                if ( empty( $this->field['args'] ) ) {
+                    $this->field['args'] = array();
+                }
 
-				if ( is_array( $this->field['data'] ) ) {
-					$this->field['options'] = $this->field['data'];
-				} else {
-					$this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
-				}
-			}
+                if ( is_array( $this->field['data'] ) ) {
+                    $this->field['options'] = $this->field['data'];
+                } else {
+                    $this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
+                }
+            }
 
-			$this->field['data_class'] = ( isset( $this->field['multi_layout'] ) ) ? 'data-' . $this->field['multi_layout'] : 'data-full';
+            $this->field['data_class'] = ( isset( $this->field['multi_layout'] ) ) ? 'data-' . $this->field['multi_layout'] : 'data-full';
 
-			if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
-				echo '<ul class="' . esc_attr( $this->field['data_class'] ) . '">';
+            if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
+                echo '<ul class="' . esc_attr( $this->field['data_class'] ) . '">';
 
-				foreach ( $this->field['options'] as $k => $v ) {
-					echo '<li>';
-					echo '<label for="' . esc_attr( $this->field['id'] . '_' . array_search( $k, array_keys( $this->field['options'] ), true ) ) . '">';
-					echo '<input
+                foreach ( $this->field['options'] as $k => $v ) {
+                    echo '<li>';
+                    echo '<label for="' . esc_attr( $this->field['id'] . '_' . array_search( $k, array_keys( $this->field['options'] ), true ) ) . '">';
+                    echo '<input
 							type="radio"
 							class="radio ' . esc_attr( $this->field['class'] ) . '"
 							id="' . esc_attr( $this->field['id'] . '_' . array_search( $k, array_keys( $this->field['options'] ), true ) ) . '"
 							name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"
 							value="' . esc_attr( $k ) . '" ' . ( ! is_array( $this->value ) ? checked( $this->value, $k, false ) : '' ) . '/>';
-					echo ' <span>' . wp_kses_post( $v ) . '</span>';
-					echo '</label>';
-					echo '</li>';
-				}
+                    echo ' <span>' . wp_kses_post( $v ) . '</span>';
+                    echo '</label>';
+                    echo '</li>';
+                }
 
-				echo '</ul>';
-			}
-		}
-	}
+                echo '</ul>';
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Radio', 'ReduxFramework_Radio' );

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

Indentation +88 added lines, -88 removed lines

@@ -12,94 +12,94 @@
 
 if ( ! class_exists( 'Redux_Text', false ) ) {
 
-	/**
-	 * Class Redux_Text
-	 */
-	class Redux_Text 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 ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
-				if ( empty( $this->field['args'] ) ) {
-					$this->field['args'] = array();
-				}
-
-				$this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
-				$this->field['class']  .= ' hasOptions ';
-			}
-
-			if ( empty( $this->value ) && ! empty( $this->field['data'] ) && ! empty( $this->field['options'] ) ) {
-				$this->value = $this->field['options'];
-			}
-
-			$qtip_title = isset( $this->field['text_hint']['title'] ) ? 'qtip-title="' . $this->field['text_hint']['title'] . '" ' : '';
-			$qtip_text  = isset( $this->field['text_hint']['content'] ) ? 'qtip-content="' . $this->field['text_hint']['content'] . '" ' : '';
-
-			$readonly     = ( isset( $this->field['readonly'] ) && $this->field['readonly'] ) ? ' readonly="readonly"' : '';
-			$autocomplete = ( isset( $this->field['autocomplete'] ) && false === $this->field['autocomplete'] ) ? ' autocomplete="off"' : '';
-
-			if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
-				$placeholder = '';
-
-				if ( isset( $this->field['placeholder'] ) ) {
-					$placeholder = $this->field['placeholder'];
-				}
-
-				foreach ( $this->field['options'] as $k => $v ) {
-					if ( ! empty( $placeholder ) ) {
-						$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
-					}
-
-					echo '<div class="input_wrapper">';
-					echo '<label for="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '">' . esc_html( $v ) . '</label> ';
-
-					$value = $this->value[ $k ] ?? '';
-					$value = ! empty( $this->value[ $k ] ) ? $this->value[ $k ] : '';
-
-					// phpcs:ignore WordPress.Security.EscapeOutput
-					echo '<input type="text" id="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '" ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) ) . ']" ' . $placeholder . ' value="' . esc_attr( $value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '" ' . esc_html( $readonly ) . esc_html( $autocomplete ) . '/><br />';
-					echo '</div>';
-				}
-			} else {
-				$placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
-
-				// phpcs:ignore WordPress.Security.EscapeOutput
-				echo '<input ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . 'type="text" id="' . esc_attr( $this->field['id'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" ' . $placeholder . 'value="' . esc_attr( $this->value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '"' . esc_html( $readonly ) . esc_html( $autocomplete ) . ' />';
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-text',
-					Redux_Core::$url . 'inc/fields/text/redux-text.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+    /**
+     * Class Redux_Text
+     */
+    class Redux_Text 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 ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
+                if ( empty( $this->field['args'] ) ) {
+                    $this->field['args'] = array();
+                }
+
+                $this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
+                $this->field['class']  .= ' hasOptions ';
+            }
+
+            if ( empty( $this->value ) && ! empty( $this->field['data'] ) && ! empty( $this->field['options'] ) ) {
+                $this->value = $this->field['options'];
+            }
+
+            $qtip_title = isset( $this->field['text_hint']['title'] ) ? 'qtip-title="' . $this->field['text_hint']['title'] . '" ' : '';
+            $qtip_text  = isset( $this->field['text_hint']['content'] ) ? 'qtip-content="' . $this->field['text_hint']['content'] . '" ' : '';
+
+            $readonly     = ( isset( $this->field['readonly'] ) && $this->field['readonly'] ) ? ' readonly="readonly"' : '';
+            $autocomplete = ( isset( $this->field['autocomplete'] ) && false === $this->field['autocomplete'] ) ? ' autocomplete="off"' : '';
+
+            if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
+                $placeholder = '';
+
+                if ( isset( $this->field['placeholder'] ) ) {
+                    $placeholder = $this->field['placeholder'];
+                }
+
+                foreach ( $this->field['options'] as $k => $v ) {
+                    if ( ! empty( $placeholder ) ) {
+                        $placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
+                    }
+
+                    echo '<div class="input_wrapper">';
+                    echo '<label for="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '">' . esc_html( $v ) . '</label> ';
+
+                    $value = $this->value[ $k ] ?? '';
+                    $value = ! empty( $this->value[ $k ] ) ? $this->value[ $k ] : '';
+
+                    // phpcs:ignore WordPress.Security.EscapeOutput
+                    echo '<input type="text" id="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '" ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) ) . ']" ' . $placeholder . ' value="' . esc_attr( $value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '" ' . esc_html( $readonly ) . esc_html( $autocomplete ) . '/><br />';
+                    echo '</div>';
+                }
+            } else {
+                $placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
+
+                // phpcs:ignore WordPress.Security.EscapeOutput
+                echo '<input ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . 'type="text" id="' . esc_attr( $this->field['id'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" ' . $placeholder . 'value="' . esc_attr( $this->value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '"' . esc_html( $readonly ) . esc_html( $autocomplete ) . ' />';
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-text',
+                    Redux_Core::$url . 'inc/fields/text/redux-text.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Text', 'ReduxFramework_Text' );

Spacing +3 added lines, -3 removed lines

@@ -52,14 +52,14 @@
 
 				foreach ( $this->field['options'] as $k => $v ) {
 					if ( ! empty( $placeholder ) ) {
-						$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
+						$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][$k] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][$k] ) . '" ' : '';
 					}
 
 					echo '<div class="input_wrapper">';
 					echo '<label for="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '">' . esc_html( $v ) . '</label> ';
 
-					$value = $this->value[ $k ] ?? '';
-					$value = ! empty( $this->value[ $k ] ) ? $this->value[ $k ] : '';
+					$value = $this->value[$k] ?? '';
+					$value = ! empty( $this->value[$k] ) ? $this->value[$k] : '';
 
 					// phpcs:ignore WordPress.Security.EscapeOutput
 					echo '<input type="text" id="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '" ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) ) . ']" ' . $placeholder . ' value="' . esc_attr( $value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '" ' . esc_html( $readonly ) . esc_html( $autocomplete ) . '/><br />';

redux-templates/classes/class-init.php

Indentation +30 added lines, -30 removed lines

@@ -19,36 +19,36 @@
  */
 class Init {
 
-	/**
-	 * Init constructor.
-	 *
-	 * @access public
-	 */
-	public function __construct() {
-		global $pagenow;
-
-		if ( 'widgets.php' === $pagenow ) {
-			return;
-		}
-
-		require_once REDUXTEMPLATES_DIR_PATH . 'classes/class-templates.php';
-
-		add_action( 'init', array( $this, 'load' ) );
-
-		if ( did_action( 'init' ) ) { // In case the devs load it at the wrong place.
-			$this->load();
-		}
-	}
-
-	/**
-	 * Load everything up after init.
-	 *
-	 * @access public
-	 * @since 4.0.0
-	 */
-	public static function load() {
-		new ReduxTemplates\Templates();
-	}
+    /**
+     * Init constructor.
+     *
+     * @access public
+     */
+    public function __construct() {
+        global $pagenow;
+
+        if ( 'widgets.php' === $pagenow ) {
+            return;
+        }
+
+        require_once REDUXTEMPLATES_DIR_PATH . 'classes/class-templates.php';
+
+        add_action( 'init', array( $this, 'load' ) );
+
+        if ( did_action( 'init' ) ) { // In case the devs load it at the wrong place.
+            $this->load();
+        }
+    }
+
+    /**
+     * Load everything up after init.
+     *
+     * @access public
+     * @since 4.0.0
+     */
+    public static function load() {
+        new ReduxTemplates\Templates();
+    }
 }
 
 new Init();

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

Indentation +33 added lines, -33 removed lines

@@ -11,37 +11,37 @@ 
 
 if ( ! class_exists( 'Redux_Textarea', false ) ) {
 
-	/**
-	 * Class Redux_Textarea
-	 */
-	class Redux_Textarea extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'placeholder'  => '',
-				'rows'         => 6,
-				'autocomplete' => false,
-				'readonly'     => false,
-				'class'        => '',
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 * */
-		public function render() {
-			$readonly     = ( true === boolval( $this->field['readonly'] ) ) ? ' readonly' : '';
-			$autocomplete = ( true === boolval( $this->field['autocomplete'] ) ) ? 'on' : 'off';
-
-			?>
+    /**
+     * Class Redux_Textarea
+     */
+    class Redux_Textarea extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'placeholder'  => '',
+                'rows'         => 6,
+                'autocomplete' => false,
+                'readonly'     => false,
+                'class'        => '',
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         * */
+        public function render() {
+            $readonly     = ( true === boolval( $this->field['readonly'] ) ) ? ' readonly' : '';
+            $autocomplete = ( true === boolval( $this->field['autocomplete'] ) ) ? 'on' : 'off';
+
+            ?>
 			<label for="<?php echo esc_attr( $this->field['id'] ); ?>-textarea"></label>
 			<textarea <?php echo esc_html( $readonly ); ?>
 					name="<?php echo esc_attr( $this->field['name'] . $this->field['name_suffix'] ); ?>"
@@ -51,8 +51,8 @@ 
 					class="large-text <?php echo esc_attr( $this->field['class'] ); ?>"
 					rows="<?php echo esc_attr( $this->field['rows'] ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
 			<?php
-		}
-	}
+        }
+    }
 }
 
 class_alias( 'Redux_Textarea', 'ReduxFramework_Textarea' );

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

Indentation +406 added lines, -406 removed lines

@@ -12,396 +12,396 @@ 
 
 if ( ! class_exists( 'Redux_Panel', false ) ) {
 
-	/**
-	 * Class Redux_Panel
-	 */
-	class Redux_Panel {
-
-		/**
-		 * ReduxFramework object pointer.
-		 *
-		 * @var object
-		 */
-		public $parent = null;
-
-		/**
-		 * Path to templates dir.
-		 *
-		 * @var null|string
-		 */
-		public $template_path = null;
-
-		/**
-		 * Original template path.
-		 *
-		 * @var null
-		 */
-		public $original_path = null;
-
-		/**
-		 * Sets the path from the arg or via filter. Also calls the panel template function.
-		 *
-		 * @param object $redux ReduxFramework pointer.
-		 */
-		public function __construct( $redux ) {
-			$this->parent        = $redux;
-			$this->template_path = Redux_Core::$dir . 'templates/panel/';
-			$this->original_path = Redux_Core::$dir . 'templates/panel/';
-
-			if ( ! empty( $this->parent->args['templates_path'] ) ) {
-				$this->template_path = trailingslashit( $this->parent->args['templates_path'] );
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$this->template_path = trailingslashit( apply_filters( "redux/{$this->parent->args['opt_name']}/panel/templates_path", $this->template_path ) );
-		}
-
-		/**
-		 * Class init.
-		 */
-		public function init() {
-			$this->panel_template();
-		}
-
-		/**
-		 * Loads the panel templates where needed and provides the container for Redux
-		 */
-		private function panel_template() {
-			if ( $this->parent->args['dev_mode'] ) {
-				$this->template_file_check_notice();
-			}
-
-			/**
-			 * Action 'redux/{opt_name}/panel/before'
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/before" );
-
-			echo '<div class="wrap"><h2></h2></div>'; // Stupid hack for WordPress alerts and warnings.
-
-			echo '<div class="clear"></div>';
-			echo '<div class="wrap redux-wrap-div" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '">';
-
-			// Do we support JS?
-			echo '<noscript><div class="no-js">' . esc_html__( 'Warning- This options panel will not work properly without javascript!', 'redux-framework' ) . '</div></noscript>';
-
-			// Security is vital!
-			echo '<input type="hidden" class="redux-ajax-security" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '" id="ajaxsecurity" name="security" value="' . esc_attr( wp_create_nonce( 'redux_ajax_nonce' . $this->parent->args['opt_name'] ) ) . '" />';
-
-			/**
-			 * Action 'redux/page/{opt_name}/form/before'
-			 *
-			 * @param object $this ReduxFramework
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/page/{$this->parent->args['opt_name']}/form/before", $this );
-
-			if ( is_rtl() ) {
-				$this->parent->args['class'] = ' redux-rtl';
-			}
-
-			$this->get_template( 'container.tpl.php' );
-
-			/**
-			 * Action 'redux/page/{opt_name}/form/after'
-			 *
-			 * @param object $this ReduxFramework
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/page/{$this->parent->args['opt_name']}/form/after", $this );
-
-			echo '<div class="clear"></div>';
-			echo '</div>';
-
-			if ( true === $this->parent->args['dev_mode'] ) {
-				echo '<br /><div class="redux-timer">' . esc_html( get_num_queries() ) . ' queries in ' . esc_html( timer_stop() ) . ' seconds<br/>Redux is currently set to developer mode.</div>';
-			}
-
-			/**
-			 * Action 'redux/{opt_name}/panel/after'
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/after" );
-		}
-
-		/**
-		 * Calls the various notification bars and sets the appropriate templates.
-		 */
-		public function notification_bar() {
-			if ( isset( $this->parent->transients['last_save_mode'] ) ) {
-
-				if ( 'import' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/import'
-					 *
-					 * @param object $this ReduxFramework
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/import", $this, $this->parent->transients['changed_values'] );
-
-					echo '<div class="admin-notice notice-blue saved_notice">';
-
-					/**
-					 * Filter 'redux-imported-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings imported" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-imported-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Imported!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				} elseif ( 'defaults' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/reset'
-					 *
-					 * @param object $this ReduxFramework
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/reset", $this );
-
-					echo '<div class="saved_notice admin-notice notice-yellow">';
-
-					/**
-					 * Filter 'redux-defaults-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings imported" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-defaults-text-{$this->parent->args['opt_name']}", esc_html__( 'All Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				} elseif ( 'defaults_section' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/section/reset'
-					 *
-					 * @param object $this ReduxFramework
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/section/reset", $this );
-
-					echo '<div class="saved_notice admin-notice notice-yellow">';
-
-					/**
-					 * Filter 'redux-defaults-section-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings imported" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-defaults-section-text-{$this->parent->args['opt_name']}", esc_html__( 'Section Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				} elseif ( 'normal' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/saved'
-					 *
-					 * @param mixed $value set/saved option value
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/saved", $this->parent->options, $this->parent->transients['changed_values'] );
-
-					echo '<div class="saved_notice admin-notice notice-green">';
-
-					/**
-					 * Filter 'redux-saved-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings saved" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-saved-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Saved!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				}
-
-				unset( $this->parent->transients['last_save_mode'] );
-
-				$this->parent->transient_class->set();
-			}
-
-			/**
-			 * Action 'redux/options/{opt_name}/settings/changes'
-			 *
-			 * @param mixed $value set/saved option value
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/options/{$this->parent->args['opt_name']}/settings/change", $this->parent->options, $this->parent->transients['changed_values'] );
-
-			echo '<div class="redux-save-warn notice-yellow">';
-
-			/**
-			 * Filter 'redux-changed-text-{opt_name}'
-			 *
-			 * @param string $text Translated "settings have changed" text.
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			echo '<strong>' . esc_html( apply_filters( "redux-changed-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings have changed, you should save them!', 'redux-framework' ) ) ) . '</strong>';
-			echo '</div>';
-
-			/**
-			 * Action 'redux/options/{opt_name}/errors'
-			 *
-			 * @param array $this ->errors error information
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/options/{$this->parent->args['opt_name']}/errors", $this->parent->errors );
-
-			echo '<div class="redux-field-errors notice-red">';
-			echo '<strong>';
-			echo '<span></span> ' . esc_html__( 'error(s) were found!', 'redux-framework' );
-			echo '</strong>';
-			echo '</div>';
-
-			/**
-			 * Action 'redux/options/{opt_name}/warnings'
-			 *
-			 * @param array $this ->warnings warning information
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/options/{$this->parent->args['opt_name']}/warnings", $this->parent->warnings );
-
-			echo '<div class="redux-field-warnings notice-yellow">';
-			echo '<strong>';
-			echo '<span></span> ' . esc_html__( 'warning(s) were found!', 'redux-framework' );
-			echo '</strong>';
-			echo '</div>';
-		}
-
-		/**
-		 * Used to initialize the settings fields for this panel. Required for saving and redirect.
-		 */
-		private function init_settings_fields() {
-			// Must run or the page won't redirect properly.
-			settings_fields( "{$this->parent->args['opt_name']}_group" );
-		}
-
-		/**
-		 * Enable file deprecate warning from core.  This is necessary because the function is considered private.
-		 *
-		 * @return bool
-		 */
-		public function tick_file_deprecate_warning(): bool {
-			return true;
-		}
-
-		/**
-		 * Used to select the proper template. If it doesn't exist in the path, then the original template file is used.
-		 *
-		 * @param string $file Path to template file.
-		 */
-		public function get_template( string $file ) {
-			if ( empty( $file ) ) {
-				return;
-			}
-
-			if ( file_exists( $this->template_path . $file ) ) {
-				$path = $this->template_path . $file;
-			} else {
-				$path = $this->original_path . $file;
-			}
-
-			// Shim for v3 templates.
-			if ( ! file_exists( $path ) ) {
-				$old_file = $file;
-
-				add_filter( 'deprecated_file_trigger_error', array( $this, 'tick_file_deprecate_warning' ) );
-
-				$file = str_replace( '_', '-', $file );
-
-				_deprecated_file( esc_html( $old_file ), '4.0', esc_html( $file ), 'Please replace this outdated template with the current one from the Redux core.' );
-
-				if ( file_exists( $this->template_path . $file ) ) {
-					$path = $this->template_path . $file;
-				} else {
-					$path = $this->original_path . $file;
-				}
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/before' );
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$path = apply_filters( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file, $path );
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/after' );
-
-			if ( file_exists( $path ) ) {
-				if ( is_readable( $path ) ) {
-					require $path;
-				} else {
-					// translators: %1$s: template path.
-					echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s cannot be read. Please check the permissions for this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
-				}
-			} elseif ( file_exists( Redux_Core::$dir . 'templates/panel/' . $file ) ) {
-					require Redux_Core::$dir . 'templates/panel/' . $file;
-			} else {
-				// translators: %1$s: template path.
-				echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s does not exist. Please reinstall Redux to replace this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
-			}
-		}
-
-		/**
-		 * Scan the template files.
-		 *
-		 * @param string $template_path Path to template file.
-		 *
-		 * @return array
-		 */
-		public function scan_template_files( string $template_path ): array {
-			$files  = scandir( $template_path );
-			$result = array();
-			if ( $files ) {
-				foreach ( $files as $value ) {
-					if ( ! in_array( $value, array( '.', '..' ), true ) ) {
-						if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
-							$sub_files = self::scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
-							foreach ( $sub_files as $sub_file ) {
-								$result[] = $value . DIRECTORY_SEPARATOR . $sub_file;
-							}
-						} else {
-							$result[] = $value;
-						}
-					}
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Show a notice highlighting bad template files
-		 */
-		public function template_file_check_notice() {
-			if ( $this->original_path === $this->template_path ) {
-				return;
-			}
-
-			$core_templates = $this->scan_template_files( $this->original_path );
-
-			foreach ( $core_templates as $file ) {
-				$developer_theme_file = false;
-
-				if ( file_exists( $this->template_path . $file ) ) {
-					$developer_theme_file = $this->template_path . $file;
-				}
-
-				if ( $developer_theme_file ) {
-					$core_version      = Redux_Helpers::get_template_version( $this->original_path . $file );
-					$developer_version = Redux_Helpers::get_template_version( $developer_theme_file );
-
-					if ( $core_version && $developer_version && version_compare( $developer_version, $core_version, '<' ) ) {
-						?>
+    /**
+     * Class Redux_Panel
+     */
+    class Redux_Panel {
+
+        /**
+         * ReduxFramework object pointer.
+         *
+         * @var object
+         */
+        public $parent = null;
+
+        /**
+         * Path to templates dir.
+         *
+         * @var null|string
+         */
+        public $template_path = null;
+
+        /**
+         * Original template path.
+         *
+         * @var null
+         */
+        public $original_path = null;
+
+        /**
+         * Sets the path from the arg or via filter. Also calls the panel template function.
+         *
+         * @param object $redux ReduxFramework pointer.
+         */
+        public function __construct( $redux ) {
+            $this->parent        = $redux;
+            $this->template_path = Redux_Core::$dir . 'templates/panel/';
+            $this->original_path = Redux_Core::$dir . 'templates/panel/';
+
+            if ( ! empty( $this->parent->args['templates_path'] ) ) {
+                $this->template_path = trailingslashit( $this->parent->args['templates_path'] );
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $this->template_path = trailingslashit( apply_filters( "redux/{$this->parent->args['opt_name']}/panel/templates_path", $this->template_path ) );
+        }
+
+        /**
+         * Class init.
+         */
+        public function init() {
+            $this->panel_template();
+        }
+
+        /**
+         * Loads the panel templates where needed and provides the container for Redux
+         */
+        private function panel_template() {
+            if ( $this->parent->args['dev_mode'] ) {
+                $this->template_file_check_notice();
+            }
+
+            /**
+             * Action 'redux/{opt_name}/panel/before'
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/before" );
+
+            echo '<div class="wrap"><h2></h2></div>'; // Stupid hack for WordPress alerts and warnings.
+
+            echo '<div class="clear"></div>';
+            echo '<div class="wrap redux-wrap-div" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '">';
+
+            // Do we support JS?
+            echo '<noscript><div class="no-js">' . esc_html__( 'Warning- This options panel will not work properly without javascript!', 'redux-framework' ) . '</div></noscript>';
+
+            // Security is vital!
+            echo '<input type="hidden" class="redux-ajax-security" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '" id="ajaxsecurity" name="security" value="' . esc_attr( wp_create_nonce( 'redux_ajax_nonce' . $this->parent->args['opt_name'] ) ) . '" />';
+
+            /**
+             * Action 'redux/page/{opt_name}/form/before'
+             *
+             * @param object $this ReduxFramework
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/page/{$this->parent->args['opt_name']}/form/before", $this );
+
+            if ( is_rtl() ) {
+                $this->parent->args['class'] = ' redux-rtl';
+            }
+
+            $this->get_template( 'container.tpl.php' );
+
+            /**
+             * Action 'redux/page/{opt_name}/form/after'
+             *
+             * @param object $this ReduxFramework
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/page/{$this->parent->args['opt_name']}/form/after", $this );
+
+            echo '<div class="clear"></div>';
+            echo '</div>';
+
+            if ( true === $this->parent->args['dev_mode'] ) {
+                echo '<br /><div class="redux-timer">' . esc_html( get_num_queries() ) . ' queries in ' . esc_html( timer_stop() ) . ' seconds<br/>Redux is currently set to developer mode.</div>';
+            }
+
+            /**
+             * Action 'redux/{opt_name}/panel/after'
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/after" );
+        }
+
+        /**
+         * Calls the various notification bars and sets the appropriate templates.
+         */
+        public function notification_bar() {
+            if ( isset( $this->parent->transients['last_save_mode'] ) ) {
+
+                if ( 'import' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/import'
+                     *
+                     * @param object $this ReduxFramework
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/import", $this, $this->parent->transients['changed_values'] );
+
+                    echo '<div class="admin-notice notice-blue saved_notice">';
+
+                    /**
+                     * Filter 'redux-imported-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings imported" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-imported-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Imported!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                } elseif ( 'defaults' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/reset'
+                     *
+                     * @param object $this ReduxFramework
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/reset", $this );
+
+                    echo '<div class="saved_notice admin-notice notice-yellow">';
+
+                    /**
+                     * Filter 'redux-defaults-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings imported" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-defaults-text-{$this->parent->args['opt_name']}", esc_html__( 'All Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                } elseif ( 'defaults_section' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/section/reset'
+                     *
+                     * @param object $this ReduxFramework
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/section/reset", $this );
+
+                    echo '<div class="saved_notice admin-notice notice-yellow">';
+
+                    /**
+                     * Filter 'redux-defaults-section-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings imported" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-defaults-section-text-{$this->parent->args['opt_name']}", esc_html__( 'Section Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                } elseif ( 'normal' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/saved'
+                     *
+                     * @param mixed $value set/saved option value
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/saved", $this->parent->options, $this->parent->transients['changed_values'] );
+
+                    echo '<div class="saved_notice admin-notice notice-green">';
+
+                    /**
+                     * Filter 'redux-saved-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings saved" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-saved-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Saved!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                }
+
+                unset( $this->parent->transients['last_save_mode'] );
+
+                $this->parent->transient_class->set();
+            }
+
+            /**
+             * Action 'redux/options/{opt_name}/settings/changes'
+             *
+             * @param mixed $value set/saved option value
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/options/{$this->parent->args['opt_name']}/settings/change", $this->parent->options, $this->parent->transients['changed_values'] );
+
+            echo '<div class="redux-save-warn notice-yellow">';
+
+            /**
+             * Filter 'redux-changed-text-{opt_name}'
+             *
+             * @param string $text Translated "settings have changed" text.
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            echo '<strong>' . esc_html( apply_filters( "redux-changed-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings have changed, you should save them!', 'redux-framework' ) ) ) . '</strong>';
+            echo '</div>';
+
+            /**
+             * Action 'redux/options/{opt_name}/errors'
+             *
+             * @param array $this ->errors error information
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/options/{$this->parent->args['opt_name']}/errors", $this->parent->errors );
+
+            echo '<div class="redux-field-errors notice-red">';
+            echo '<strong>';
+            echo '<span></span> ' . esc_html__( 'error(s) were found!', 'redux-framework' );
+            echo '</strong>';
+            echo '</div>';
+
+            /**
+             * Action 'redux/options/{opt_name}/warnings'
+             *
+             * @param array $this ->warnings warning information
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/options/{$this->parent->args['opt_name']}/warnings", $this->parent->warnings );
+
+            echo '<div class="redux-field-warnings notice-yellow">';
+            echo '<strong>';
+            echo '<span></span> ' . esc_html__( 'warning(s) were found!', 'redux-framework' );
+            echo '</strong>';
+            echo '</div>';
+        }
+
+        /**
+         * Used to initialize the settings fields for this panel. Required for saving and redirect.
+         */
+        private function init_settings_fields() {
+            // Must run or the page won't redirect properly.
+            settings_fields( "{$this->parent->args['opt_name']}_group" );
+        }
+
+        /**
+         * Enable file deprecate warning from core.  This is necessary because the function is considered private.
+         *
+         * @return bool
+         */
+        public function tick_file_deprecate_warning(): bool {
+            return true;
+        }
+
+        /**
+         * Used to select the proper template. If it doesn't exist in the path, then the original template file is used.
+         *
+         * @param string $file Path to template file.
+         */
+        public function get_template( string $file ) {
+            if ( empty( $file ) ) {
+                return;
+            }
+
+            if ( file_exists( $this->template_path . $file ) ) {
+                $path = $this->template_path . $file;
+            } else {
+                $path = $this->original_path . $file;
+            }
+
+            // Shim for v3 templates.
+            if ( ! file_exists( $path ) ) {
+                $old_file = $file;
+
+                add_filter( 'deprecated_file_trigger_error', array( $this, 'tick_file_deprecate_warning' ) );
+
+                $file = str_replace( '_', '-', $file );
+
+                _deprecated_file( esc_html( $old_file ), '4.0', esc_html( $file ), 'Please replace this outdated template with the current one from the Redux core.' );
+
+                if ( file_exists( $this->template_path . $file ) ) {
+                    $path = $this->template_path . $file;
+                } else {
+                    $path = $this->original_path . $file;
+                }
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/before' );
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $path = apply_filters( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file, $path );
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/after' );
+
+            if ( file_exists( $path ) ) {
+                if ( is_readable( $path ) ) {
+                    require $path;
+                } else {
+                    // translators: %1$s: template path.
+                    echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s cannot be read. Please check the permissions for this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
+                }
+            } elseif ( file_exists( Redux_Core::$dir . 'templates/panel/' . $file ) ) {
+                    require Redux_Core::$dir . 'templates/panel/' . $file;
+            } else {
+                // translators: %1$s: template path.
+                echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s does not exist. Please reinstall Redux to replace this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
+            }
+        }
+
+        /**
+         * Scan the template files.
+         *
+         * @param string $template_path Path to template file.
+         *
+         * @return array
+         */
+        public function scan_template_files( string $template_path ): array {
+            $files  = scandir( $template_path );
+            $result = array();
+            if ( $files ) {
+                foreach ( $files as $value ) {
+                    if ( ! in_array( $value, array( '.', '..' ), true ) ) {
+                        if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
+                            $sub_files = self::scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
+                            foreach ( $sub_files as $sub_file ) {
+                                $result[] = $value . DIRECTORY_SEPARATOR . $sub_file;
+                            }
+                        } else {
+                            $result[] = $value;
+                        }
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Show a notice highlighting bad template files
+         */
+        public function template_file_check_notice() {
+            if ( $this->original_path === $this->template_path ) {
+                return;
+            }
+
+            $core_templates = $this->scan_template_files( $this->original_path );
+
+            foreach ( $core_templates as $file ) {
+                $developer_theme_file = false;
+
+                if ( file_exists( $this->template_path . $file ) ) {
+                    $developer_theme_file = $this->template_path . $file;
+                }
+
+                if ( $developer_theme_file ) {
+                    $core_version      = Redux_Helpers::get_template_version( $this->original_path . $file );
+                    $developer_version = Redux_Helpers::get_template_version( $developer_theme_file );
+
+                    if ( $core_version && $developer_version && version_compare( $developer_version, $core_version, '<' ) ) {
+                        ?>
 						<div id="message" class="error redux-message" style="display:block!important">
 							<p>
 								<strong><?php esc_html_e( 'Your panel has bundled copies of Redux Framework template files that are outdated!', 'redux-framework' ); ?></strong>&nbsp;&nbsp;<?php esc_html_e( 'Please ask the author of this theme to update them as functionality issues could arise.', 'redux-framework' ); ?>
@@ -409,23 +409,23 @@ 
 						</div>
 						<?php
 
-						return;
-					}
-				}
-			}
-		}
-
-		/**
-		 * Outputs the HTML for a given section using the WordPress settings API.
-		 *
-		 * @param mixed $k Section number of settings panel to display.
-		 */
-		private function output_section( $k ) {
-			do_settings_sections( $this->parent->args['opt_name'] . $k . '_section_group' );
-		}
-	}
+                        return;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Outputs the HTML for a given section using the WordPress settings API.
+         *
+         * @param mixed $k Section number of settings panel to display.
+         */
+        private function output_section( $k ) {
+            do_settings_sections( $this->parent->args['opt_name'] . $k . '_section_group' );
+        }
+    }
 }
 
 if ( ! class_exists( 'reduxCorePanel' ) ) {
-	class_alias( 'Redux_Panel', 'reduxCorePanel' );
+    class_alias( 'Redux_Panel', 'reduxCorePanel' );
 }

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

Indentation +36 added lines, -36 removed lines

@@ -11,51 +11,51 @@
 
 if ( ! class_exists( 'Redux_Validation_Color', false ) ) {
 
-	/**
-	 * Class Redux_Validation_Color
-	 */
-	class Redux_Validation_Color extends Redux_Validate {
+    /**
+     * Class Redux_Validation_Color
+     */
+    class Redux_Validation_Color extends Redux_Validate {
 
-		/**
-		 * Field Validate Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function validate() {
+        /**
+         * Field Validate Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function validate() {
 
-			if ( empty( $this->value ) || ( 'transparent' === $this->value ) || is_array( $this->value ) ) {
-				return;
-			}
+            if ( empty( $this->value ) || ( 'transparent' === $this->value ) || is_array( $this->value ) ) {
+                return;
+            }
 
-			$test = str_replace( '#', '', Redux_Core::strtolower( trim( $this->value ) ) );
-			if ( ! in_array( strlen( $test ), array( 3, 6 ), true ) ) {
-				// translators: %1$s: sanitized value.  %2$s: Old value.
-				$this->field['msg'] = $this->field['msg'] ?? sprintf( esc_html__( 'Invalid HTML color code %1$s. Please enter a valid code. No value was saved.', 'redux-framework' ), '<code>' . $this->value . '</code>' );
+            $test = str_replace( '#', '', Redux_Core::strtolower( trim( $this->value ) ) );
+            if ( ! in_array( strlen( $test ), array( 3, 6 ), true ) ) {
+                // translators: %1$s: sanitized value.  %2$s: Old value.
+                $this->field['msg'] = $this->field['msg'] ?? sprintf( esc_html__( 'Invalid HTML color code %1$s. Please enter a valid code. No value was saved.', 'redux-framework' ), '<code>' . $this->value . '</code>' );
 
-				$this->warning = $this->field;
-				$this->value   = '';
+                $this->warning = $this->field;
+                $this->value   = '';
 
-				return;
-			} else {
-				$this->field['msg'] = '';
-				$this->warning      = $this->field;
+                return;
+            } else {
+                $this->field['msg'] = '';
+                $this->warning      = $this->field;
 
-			}
+            }
 
-			$sanitized_value = Redux_Colors::sanitize_color( $this->value );
+            $sanitized_value = Redux_Colors::sanitize_color( $this->value );
 
-			if ( $sanitized_value !== $this->value ) {
-				// translators: %1$s: sanitized value.  %2$s: Old value.
-				$this->field['msg'] = $this->field['msg'] ?? sprintf( esc_html__( 'Sanitized value and saved as %1$s instead of %2$s.', 'redux-framework' ), '<code>' . $sanitized_value . '</code>', '<code>' . $this->value . '</code>' );
+            if ( $sanitized_value !== $this->value ) {
+                // translators: %1$s: sanitized value.  %2$s: Old value.
+                $this->field['msg'] = $this->field['msg'] ?? sprintf( esc_html__( 'Sanitized value and saved as %1$s instead of %2$s.', 'redux-framework' ), '<code>' . $sanitized_value . '</code>', '<code>' . $this->value . '</code>' );
 
-				$this->field['old']     = $this->value;
-				$this->field['current'] = $sanitized_value;
+                $this->field['old']     = $this->value;
+                $this->field['current'] = $sanitized_value;
 
-				$this->warning = $this->field;
-			}
+                $this->warning = $this->field;
+            }
 
-			$this->value = strtoupper( $sanitized_value );
-		}
-	}
+            $this->value = strtoupper( $sanitized_value );
+        }
+    }
 }

redux-core/inc/classes/class-redux-options-defaults.php

Indentation +195 added lines, -195 removed lines

@@ -11,199 +11,199 @@
 
 if ( ! class_exists( 'Redux_Options_Defaults', false ) ) {
 
-	/**
-	 * Class Redux_Options_Defaults
-	 */
-	class Redux_Options_Defaults {
-
-		/**
-		 * Default options.
-		 *
-		 * @var array
-		 */
-		public $options_defaults = array();
-
-		/**
-		 * Field array.
-		 *
-		 * @var array
-		 */
-		public $fields = array();
-
-		/**
-		 * Is repeater group flag.
-		 *
-		 * @var bool
-		 */
-		private $is_repeater_group = false;
-
-		/**
-		 * Repeater ID.
-		 *
-		 * @var bool
-		 */
-		private $repeater_id = '';
-
-		/**
-		 * Creates a default options array.
-		 *
-		 * @param string $opt_name      Panel opt_name.
-		 * @param array  $sections      Panel sections array.
-		 * @param null   $wp_data_class WordPress data class.
-		 *
-		 * @return array
-		 */
-		public function default_values( string $opt_name = '', array $sections = array(), $wp_data_class = null ): array {
-			// We want it to be clean each time this is run.
-			$this->options_defaults = array();
-
-			// Check to make sure we're not in the select2 action, we don't want to fetch any there.
-			if ( isset( $_REQUEST['action'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$action = sanitize_text_field( wp_unslash( $_REQUEST['action'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-				if ( Redux_Functions_Ex::string_ends_with( $action, '_select2' ) && Redux_Functions_Ex::string_starts_with( $action, 'redux_' ) ) {
-					return array();
-				}
-			}
-
-			if ( ! empty( $sections ) ) {
-
-				// Fill the cache.
-				foreach ( $sections as $sk => $section ) {
-					if ( ! isset( $section['id'] ) ) {
-						if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
-							$section['id'] = $sk;
-						} else {
-							$section['id'] = sanitize_title( $section['title'], $sk );
-						}
-
-						$sections[ $sk ] = $section;
-					}
-					if ( isset( $section['fields'] ) ) {
-						foreach ( $section['fields'] as $field ) {
-							if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
-								continue;
-							}
-
-							$this->field_default_values( $opt_name, $field, $wp_data_class, false );
-
-							if ( 'tabbed' === $field['type'] ) {
-								if ( ! empty( $field['tabs'] ) ) {
-									foreach ( $field['tabs'] as $val ) {
-										if ( ! empty( $val['fields'] ) ) {
-											foreach ( $val['fields'] as $f ) {
-												$this->field_default_values( $opt_name, $f, $wp_data_class, false, true );
-											}
-										}
-									}
-								}
-							}
-
-							if ( 'repeater' === $field['type'] ) {
-								if ( ! empty( $field['fields'] ) ) {
-									foreach ( $field['fields'] as $f ) {
-										$this->field_default_values( $opt_name, $f, $wp_data_class, true );
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			return $this->options_defaults;
-		}
-
-		/**
-		 * Field default values.
-		 *
-		 * @param string $opt_name      Panel opt_name.
-		 * @param array  $field         Field array.
-		 * @param null   $wp_data_class WordPress data class.
-		 * @param bool   $is_repeater   Is a repeater field.
-		 * @param bool   $is_tabbed     Is a tabbed field.
-		 */
-		public function field_default_values( string $opt_name = '', array $field = array(), $wp_data_class = null, bool $is_repeater = false, $is_tabbed = false ) {
-			if ( 'repeater' === $field['type'] ) {
-				if ( isset( $field['group_values'] ) && true === $field['group_values'] ) {
-					$this->is_repeater_group = true;
-					$this->repeater_id       = $field['id'];
-				}
-			}
-
-			if ( null === $wp_data_class && class_exists( 'Redux_WordPress_Data' ) && ! ( 'select' === $field['type'] && isset( $field['ajax'] ) && $field['ajax'] ) ) {
-				$wp_data_class = new Redux_WordPress_Data( $opt_name );
-			}
-
-			// Detect what field types are being used.
-			if ( ! isset( $this->fields[ $field['type'] ][ $field['id'] ] ) ) {
-				$this->fields[ $field['type'] ][ $field['id'] ] = 1;
-			} else {
-				$this->fields[ $field['type'] ] = array( $field['id'] => 1 );
-			}
-
-			if ( isset( $field['default'] ) ) {
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$def = apply_filters( "redux/$opt_name/field/{$field['type']}/defaults", $field['default'], $field );
-
-				if ( true === $is_repeater ) {
-					if ( true === $this->is_repeater_group ) {
-						$this->options_defaults[ $this->repeater_id ][ $field['id'] ] = array( $def );
-					} else {
-						$this->options_defaults[ $field['id'] ] = array( $def );
-					}
-				} elseif ( true === $is_tabbed ) {
-					$this->options_defaults[ $field['id'] ] = $def;
-				} else {
-					$this->options_defaults[ $field['id'] ] = $def;
-				}
-			} elseif ( ( 'ace_editor' !== $field['type'] ) && ! ( 'select' === $field['type'] && ! empty( $field['ajax'] ) ) ) {
-				if ( isset( $field['data'] ) ) {
-					if ( ! isset( $field['args'] ) ) {
-						$field['args'] = array();
-					}
-					if ( is_array( $field['data'] ) && ! empty( $field['data'] ) ) {
-						foreach ( $field['data'] as $key => $data ) {
-							if ( ! empty( $data ) ) {
-								if ( ! isset( $field['args'][ $key ] ) ) {
-									$field['args'][ $key ] = array();
-								}
-								if ( null !== $wp_data_class ) {
-									$field['options'][ $key ] = $wp_data_class->get( $data, $field['args'][ $key ], $opt_name );
-								}
-							}
-						}
-					} elseif ( null !== $wp_data_class ) {
-						$field['options'] = $wp_data_class->get( $field['data'], $field['args'], $opt_name );
-					}
-
-					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();
-							}
-							if ( null !== $wp_data_class ) {
-								$field['options'][ $key ] = $wp_data_class->get( $data, $field['args'][ $key ], $opt_name );
-							}
-						}
-					}
-
-					if ( isset( $field['options'] ) ) {
-						if ( 'sortable' === $field['type'] ) {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( array() ) : array();
-						} elseif ( 'image_select' === $field['type'] ) {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( '' ) : '';
-						} elseif ( 'select' === $field['type'] ) {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( '' ) : '';
-						} else {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( $field['options'] ) : $field['options'];
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Class Redux_Options_Defaults
+     */
+    class Redux_Options_Defaults {
+
+        /**
+         * Default options.
+         *
+         * @var array
+         */
+        public $options_defaults = array();
+
+        /**
+         * Field array.
+         *
+         * @var array
+         */
+        public $fields = array();
+
+        /**
+         * Is repeater group flag.
+         *
+         * @var bool
+         */
+        private $is_repeater_group = false;
+
+        /**
+         * Repeater ID.
+         *
+         * @var bool
+         */
+        private $repeater_id = '';
+
+        /**
+         * Creates a default options array.
+         *
+         * @param string $opt_name      Panel opt_name.
+         * @param array  $sections      Panel sections array.
+         * @param null   $wp_data_class WordPress data class.
+         *
+         * @return array
+         */
+        public function default_values( string $opt_name = '', array $sections = array(), $wp_data_class = null ): array {
+            // We want it to be clean each time this is run.
+            $this->options_defaults = array();
+
+            // Check to make sure we're not in the select2 action, we don't want to fetch any there.
+            if ( isset( $_REQUEST['action'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $action = sanitize_text_field( wp_unslash( $_REQUEST['action'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+                if ( Redux_Functions_Ex::string_ends_with( $action, '_select2' ) && Redux_Functions_Ex::string_starts_with( $action, 'redux_' ) ) {
+                    return array();
+                }
+            }
+
+            if ( ! empty( $sections ) ) {
+
+                // Fill the cache.
+                foreach ( $sections as $sk => $section ) {
+                    if ( ! isset( $section['id'] ) ) {
+                        if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
+                            $section['id'] = $sk;
+                        } else {
+                            $section['id'] = sanitize_title( $section['title'], $sk );
+                        }
+
+                        $sections[ $sk ] = $section;
+                    }
+                    if ( isset( $section['fields'] ) ) {
+                        foreach ( $section['fields'] as $field ) {
+                            if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
+                                continue;
+                            }
+
+                            $this->field_default_values( $opt_name, $field, $wp_data_class, false );
+
+                            if ( 'tabbed' === $field['type'] ) {
+                                if ( ! empty( $field['tabs'] ) ) {
+                                    foreach ( $field['tabs'] as $val ) {
+                                        if ( ! empty( $val['fields'] ) ) {
+                                            foreach ( $val['fields'] as $f ) {
+                                                $this->field_default_values( $opt_name, $f, $wp_data_class, false, true );
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            if ( 'repeater' === $field['type'] ) {
+                                if ( ! empty( $field['fields'] ) ) {
+                                    foreach ( $field['fields'] as $f ) {
+                                        $this->field_default_values( $opt_name, $f, $wp_data_class, true );
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return $this->options_defaults;
+        }
+
+        /**
+         * Field default values.
+         *
+         * @param string $opt_name      Panel opt_name.
+         * @param array  $field         Field array.
+         * @param null   $wp_data_class WordPress data class.
+         * @param bool   $is_repeater   Is a repeater field.
+         * @param bool   $is_tabbed     Is a tabbed field.
+         */
+        public function field_default_values( string $opt_name = '', array $field = array(), $wp_data_class = null, bool $is_repeater = false, $is_tabbed = false ) {
+            if ( 'repeater' === $field['type'] ) {
+                if ( isset( $field['group_values'] ) && true === $field['group_values'] ) {
+                    $this->is_repeater_group = true;
+                    $this->repeater_id       = $field['id'];
+                }
+            }
+
+            if ( null === $wp_data_class && class_exists( 'Redux_WordPress_Data' ) && ! ( 'select' === $field['type'] && isset( $field['ajax'] ) && $field['ajax'] ) ) {
+                $wp_data_class = new Redux_WordPress_Data( $opt_name );
+            }
+
+            // Detect what field types are being used.
+            if ( ! isset( $this->fields[ $field['type'] ][ $field['id'] ] ) ) {
+                $this->fields[ $field['type'] ][ $field['id'] ] = 1;
+            } else {
+                $this->fields[ $field['type'] ] = array( $field['id'] => 1 );
+            }
+
+            if ( isset( $field['default'] ) ) {
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $def = apply_filters( "redux/$opt_name/field/{$field['type']}/defaults", $field['default'], $field );
+
+                if ( true === $is_repeater ) {
+                    if ( true === $this->is_repeater_group ) {
+                        $this->options_defaults[ $this->repeater_id ][ $field['id'] ] = array( $def );
+                    } else {
+                        $this->options_defaults[ $field['id'] ] = array( $def );
+                    }
+                } elseif ( true === $is_tabbed ) {
+                    $this->options_defaults[ $field['id'] ] = $def;
+                } else {
+                    $this->options_defaults[ $field['id'] ] = $def;
+                }
+            } elseif ( ( 'ace_editor' !== $field['type'] ) && ! ( 'select' === $field['type'] && ! empty( $field['ajax'] ) ) ) {
+                if ( isset( $field['data'] ) ) {
+                    if ( ! isset( $field['args'] ) ) {
+                        $field['args'] = array();
+                    }
+                    if ( is_array( $field['data'] ) && ! empty( $field['data'] ) ) {
+                        foreach ( $field['data'] as $key => $data ) {
+                            if ( ! empty( $data ) ) {
+                                if ( ! isset( $field['args'][ $key ] ) ) {
+                                    $field['args'][ $key ] = array();
+                                }
+                                if ( null !== $wp_data_class ) {
+                                    $field['options'][ $key ] = $wp_data_class->get( $data, $field['args'][ $key ], $opt_name );
+                                }
+                            }
+                        }
+                    } elseif ( null !== $wp_data_class ) {
+                        $field['options'] = $wp_data_class->get( $field['data'], $field['args'], $opt_name );
+                    }
+
+                    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();
+                            }
+                            if ( null !== $wp_data_class ) {
+                                $field['options'][ $key ] = $wp_data_class->get( $data, $field['args'][ $key ], $opt_name );
+                            }
+                        }
+                    }
+
+                    if ( isset( $field['options'] ) ) {
+                        if ( 'sortable' === $field['type'] ) {
+                            $this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( array() ) : array();
+                        } elseif ( 'image_select' === $field['type'] ) {
+                            $this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( '' ) : '';
+                        } elseif ( 'select' === $field['type'] ) {
+                            $this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( '' ) : '';
+                        } else {
+                            $this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( $field['options'] ) : $field['options'];
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -77,7 +77,7 @@ 
 							$section['id'] = sanitize_title( $section['title'], $sk );
 						}
 
-						$sections[ $sk ] = $section;
+						$sections[$sk] = $section;
 					}
 					if ( isset( $section['fields'] ) ) {
 						foreach ( $section['fields'] as $field ) {
@@ -136,10 +136,10 @@ 
 			}
 
 			// Detect what field types are being used.
-			if ( ! isset( $this->fields[ $field['type'] ][ $field['id'] ] ) ) {
-				$this->fields[ $field['type'] ][ $field['id'] ] = 1;
+			if ( ! isset( $this->fields[$field['type']][$field['id']] ) ) {
+				$this->fields[$field['type']][$field['id']] = 1;
 			} else {
-				$this->fields[ $field['type'] ] = array( $field['id'] => 1 );
+				$this->fields[$field['type']] = array( $field['id'] => 1 );
 			}
 
 			if ( isset( $field['default'] ) ) {
@@ -148,14 +148,14 @@ 
 
 				if ( true === $is_repeater ) {
 					if ( true === $this->is_repeater_group ) {
-						$this->options_defaults[ $this->repeater_id ][ $field['id'] ] = array( $def );
+						$this->options_defaults[$this->repeater_id][$field['id']] = array( $def );
 					} else {
-						$this->options_defaults[ $field['id'] ] = array( $def );
+						$this->options_defaults[$field['id']] = array( $def );
 					}
 				} elseif ( true === $is_tabbed ) {
-					$this->options_defaults[ $field['id'] ] = $def;
+					$this->options_defaults[$field['id']] = $def;
 				} else {
-					$this->options_defaults[ $field['id'] ] = $def;
+					$this->options_defaults[$field['id']] = $def;
 				}
 			} elseif ( ( 'ace_editor' !== $field['type'] ) && ! ( 'select' === $field['type'] && ! empty( $field['ajax'] ) ) ) {
 				if ( isset( $field['data'] ) ) {
@@ -165,11 +165,11 @@ 
 					if ( is_array( $field['data'] ) && ! empty( $field['data'] ) ) {
 						foreach ( $field['data'] as $key => $data ) {
 							if ( ! empty( $data ) ) {
-								if ( ! isset( $field['args'][ $key ] ) ) {
-									$field['args'][ $key ] = array();
+								if ( ! isset( $field['args'][$key] ) ) {
+									$field['args'][$key] = array();
 								}
 								if ( null !== $wp_data_class ) {
-									$field['options'][ $key ] = $wp_data_class->get( $data, $field['args'][ $key ], $opt_name );
+									$field['options'][$key] = $wp_data_class->get( $data, $field['args'][$key], $opt_name );
 								}
 							}
 						}
@@ -182,24 +182,24 @@ 
 							$field['args'] = array();
 						}
 						foreach ( $field['data'] as $key => $data ) {
-							if ( ! isset( $field['args'][ $key ] ) ) {
-								$field['args'][ $key ] = array();
+							if ( ! isset( $field['args'][$key] ) ) {
+								$field['args'][$key] = array();
 							}
 							if ( null !== $wp_data_class ) {
-								$field['options'][ $key ] = $wp_data_class->get( $data, $field['args'][ $key ], $opt_name );
+								$field['options'][$key] = $wp_data_class->get( $data, $field['args'][$key], $opt_name );
 							}
 						}
 					}
 
 					if ( isset( $field['options'] ) ) {
 						if ( 'sortable' === $field['type'] ) {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( array() ) : array();
+							$this->options_defaults[$field['id']] = ( true === $is_repeater ) ? array( array() ) : array();
 						} elseif ( 'image_select' === $field['type'] ) {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( '' ) : '';
+							$this->options_defaults[$field['id']] = ( true === $is_repeater ) ? array( '' ) : '';
 						} elseif ( 'select' === $field['type'] ) {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( '' ) : '';
+							$this->options_defaults[$field['id']] = ( true === $is_repeater ) ? array( '' ) : '';
 						} else {
-							$this->options_defaults[ $field['id'] ] = ( true === $is_repeater ) ? array( $field['options'] ) : $field['options'];
+							$this->options_defaults[$field['id']] = ( true === $is_repeater ) ? array( $field['options'] ) : $field['options'];
 						}
 					}
 				}

sample/sections/extensions/color-scheme.php

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 					'cancel_text'            => 'Cancel',
 					'show_buttons'           => true,
 					'use_extended_classes'   => true,
-					'palette'                => null,  // show default.
+					'palette'                => null, // show default.
 				),
 				'groups'   => array(
 					esc_html__( 'Header', 'your-textdomain-here' ) => array(
@@ -76,13 +76,13 @@ 
 						'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
 					),
 					array(
-						'id'        => 'home-link',     // ID.
-						'title'     => 'home link',     // Display text.
-						'color'     => '#fdfdfd',       // Default colour.
-						'alpha'     => 1,               // Default alpha.
-						'selector'  => '.home-link,.wp-block-site-title a',    // CSS selector.
-						'mode'      => 'color',         // CSS mode.
-						'important' => true,            // CSS important.
+						'id'        => 'home-link', // ID.
+						'title'     => 'home link', // Display text.
+						'color'     => '#fdfdfd', // Default colour.
+						'alpha'     => 1, // Default alpha.
+						'selector'  => '.home-link,.wp-block-site-title a', // CSS selector.
+						'mode'      => 'color', // CSS mode.
+						'important' => true, // CSS important.
 						'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
 					),
 					array(

Indentation +208 added lines, -208 removed lines

@@ -11,214 +11,214 @@
 defined( 'ABSPATH' ) || exit;
 
 Redux::set_section(
-	$opt_name,
-	array(
-		'title'      => esc_html__( 'Color Schemes', 'your-textdomain-here' ),
-		'desc'       => esc_html__( 'For full documentation on this field, visit: ', 'your-textdomain-here' ) . '<a href="https://devs.redux.io/core-extensions/color-schemes.html" target="_blank">https://devs.redux.io/core-extensions/color-schemes.html</a>',
-		'subsection' => true,
-		'fields'     => array(
-			array(
-				'id'       => 'opt-color-scheme',
-				'type'     => 'color_scheme',
-				'title'    => esc_html__( 'Color Schemes', 'your-textdomain-here' ),
-				'subtitle' => esc_html__( 'Save and load color schemes', 'your-textdomain-here' ),
-				'desc'     => esc_html__( 'If you\'re using the theme 2023, you will be able to see many changes on the current site.', 'your-textdomain-here' ),
-				'output'   => true,
-				'compiler' => true,
-				'simple'   => false,
-				'options'  => array(
-					'show_input'             => true,
-					'show_initial'           => true,
-					'show_alpha'             => true,
-					'show_palette'           => true,
-					'show_palette_only'      => false,
-					'show_selection_palette' => true,
-					'max_palette_size'       => 10,
-					'allow_empty'            => true,
-					'clickout_fires_change'  => false,
-					'choose_text'            => 'Choose',
-					'cancel_text'            => 'Cancel',
-					'show_buttons'           => true,
-					'use_extended_classes'   => true,
-					'palette'                => null,  // show default.
-				),
-				'groups'   => array(
-					esc_html__( 'Header', 'your-textdomain-here' ) => array(
-						'desc'           => esc_html__( 'Set header and nav colors here. (Group open by default)', 'your-textdomain-here' ),
-						'hidden'         => false,
-						'accordion_open' => true,
-					),
-					esc_html__( 'Body', 'your-textdomain-here' ) => esc_html__( 'Set body and content colors here.', 'your-textdomain-here' ),
-					esc_html__( 'Widget', 'your-textdomain-here' ) => '',
-					'' => esc_html__( 'These colors are not assigned to any group.', 'your-textdomain-here' ),
-				),
-				'default'  => array(
-					array(
-						'id'        => 'site-header',
-						'title'     => 'site header',
-						'color'     => '#980000',
-						'alpha'     => 1,
-						'selector'  => array(
-							'background' => '.site-header-main,header',
-							'color'      => '.tester',
-						),
-						'mode'      => 'background-color',
-						'important' => true,
-						'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
-					),
-					array(
-						'id'        => 'site-header-border',
-						'title'     => 'site header border',
-						'color'     => '#ff0000',
-						'alpha'     => 1,
-						'selector'  => '.site-header,header',
-						'mode'      => 'border-color',
-						'important' => true,
-						'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
-					),
-					array(
-						'id'        => 'home-link',     // ID.
-						'title'     => 'home link',     // Display text.
-						'color'     => '#fdfdfd',       // Default colour.
-						'alpha'     => 1,               // Default alpha.
-						'selector'  => '.home-link,.wp-block-site-title a',    // CSS selector.
-						'mode'      => 'color',         // CSS mode.
-						'important' => true,            // CSS important.
-						'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
-					),
-					array(
-						'id'        => 'site-description',
-						'title'     => 'site description',
-						'color'     => '#ededed',
-						'alpha'     => 1,
-						'selector'  => 'h2.site-description,.wp-block-site-tagline',
-						'mode'      => 'color',
-						'important' => true,
-						'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'navbar',
-						'title'    => 'navbar',
-						'color'    => '#e06666',
-						'alpha'    => 1,
-						'selector' => '.navbar,.wp-block-navigation',
-						'mode'     => 'background-color',
-						'group'    => esc_html__( 'Header', 'your-textdomain-here' ),
+    $opt_name,
+    array(
+        'title'      => esc_html__( 'Color Schemes', 'your-textdomain-here' ),
+        'desc'       => esc_html__( 'For full documentation on this field, visit: ', 'your-textdomain-here' ) . '<a href="https://devs.redux.io/core-extensions/color-schemes.html" target="_blank">https://devs.redux.io/core-extensions/color-schemes.html</a>',
+        'subsection' => true,
+        'fields'     => array(
+            array(
+                'id'       => 'opt-color-scheme',
+                'type'     => 'color_scheme',
+                'title'    => esc_html__( 'Color Schemes', 'your-textdomain-here' ),
+                'subtitle' => esc_html__( 'Save and load color schemes', 'your-textdomain-here' ),
+                'desc'     => esc_html__( 'If you\'re using the theme 2023, you will be able to see many changes on the current site.', 'your-textdomain-here' ),
+                'output'   => true,
+                'compiler' => true,
+                'simple'   => false,
+                'options'  => array(
+                    'show_input'             => true,
+                    'show_initial'           => true,
+                    'show_alpha'             => true,
+                    'show_palette'           => true,
+                    'show_palette_only'      => false,
+                    'show_selection_palette' => true,
+                    'max_palette_size'       => 10,
+                    'allow_empty'            => true,
+                    'clickout_fires_change'  => false,
+                    'choose_text'            => 'Choose',
+                    'cancel_text'            => 'Cancel',
+                    'show_buttons'           => true,
+                    'use_extended_classes'   => true,
+                    'palette'                => null,  // show default.
+                ),
+                'groups'   => array(
+                    esc_html__( 'Header', 'your-textdomain-here' ) => array(
+                        'desc'           => esc_html__( 'Set header and nav colors here. (Group open by default)', 'your-textdomain-here' ),
+                        'hidden'         => false,
+                        'accordion_open' => true,
+                    ),
+                    esc_html__( 'Body', 'your-textdomain-here' ) => esc_html__( 'Set body and content colors here.', 'your-textdomain-here' ),
+                    esc_html__( 'Widget', 'your-textdomain-here' ) => '',
+                    '' => esc_html__( 'These colors are not assigned to any group.', 'your-textdomain-here' ),
+                ),
+                'default'  => array(
+                    array(
+                        'id'        => 'site-header',
+                        'title'     => 'site header',
+                        'color'     => '#980000',
+                        'alpha'     => 1,
+                        'selector'  => array(
+                            'background' => '.site-header-main,header',
+                            'color'      => '.tester',
+                        ),
+                        'mode'      => 'background-color',
+                        'important' => true,
+                        'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'        => 'site-header-border',
+                        'title'     => 'site header border',
+                        'color'     => '#ff0000',
+                        'alpha'     => 1,
+                        'selector'  => '.site-header,header',
+                        'mode'      => 'border-color',
+                        'important' => true,
+                        'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'        => 'home-link',     // ID.
+                        'title'     => 'home link',     // Display text.
+                        'color'     => '#fdfdfd',       // Default colour.
+                        'alpha'     => 1,               // Default alpha.
+                        'selector'  => '.home-link,.wp-block-site-title a',    // CSS selector.
+                        'mode'      => 'color',         // CSS mode.
+                        'important' => true,            // CSS important.
+                        'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'        => 'site-description',
+                        'title'     => 'site description',
+                        'color'     => '#ededed',
+                        'alpha'     => 1,
+                        'selector'  => 'h2.site-description,.wp-block-site-tagline',
+                        'mode'      => 'color',
+                        'important' => true,
+                        'group'     => esc_html__( 'Header', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'navbar',
+                        'title'    => 'navbar',
+                        'color'    => '#e06666',
+                        'alpha'    => 1,
+                        'selector' => '.navbar,.wp-block-navigation',
+                        'mode'     => 'background-color',
+                        'group'    => esc_html__( 'Header', 'your-textdomain-here' ),
 
-					),
-					array(
-						'id'       => 'body-text',
-						'title'    => 'body text',
-						'color'    => '#000000',
-						'alpha'    => 1,
-						'selector' => 'body p',
-						'mode'     => 'color',
-						'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'site-content',
-						'title'    => 'site content',
-						'color'    => '#a4c2f4',
-						'alpha'    => 1,
-						'selector' => '.site-content',
-						'mode'     => 'background-color',
-						'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'entry-content',
-						'title'    => 'entry content',
-						'color'    => '#93c47d',
-						'alpha'    => 1,
-						'selector' => '.entry-content',
-						'mode'     => 'background-color',
-						'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'entry-title',
-						'title'    => 'entry title',
-						'color'    => '#000000',
-						'alpha'    => 1,
-						'selector' => '.entry-title a',
-						'mode'     => 'color',
-						'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'entry-title-hover',
-						'title'    => 'entry title hover',
-						'color'    => '#ffffff',
-						'alpha'    => 1,
-						'selector' => '.entry-title a:hover',
-						'mode'     => 'color',
-						'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'entry-meta',
-						'title'    => 'entry meta',
-						'color'    => '#0b5394',
-						'alpha'    => 1,
-						'selector' => '.entry-meta a',
-						'mode'     => 'color',
-						'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
-					),
-					array(
-						'id'       => 'widget-container',
-						'title'    => 'widget container',
-						'color'    => '#f1c232',
-						'alpha'    => .5,
-						'selector' => '.widget',
-						'mode'     => 'background-color',
-						'group'    => esc_html__( 'Widget', 'your-textdomain-here' ),
-					),
-					array(
-						'id'        => 'widget-title',
-						'title'     => 'widget title',
-						'color'     => '#741b47',
-						'alpha'     => 1,
-						'selector'  => '.widget-title',
-						'mode'      => 'color',
-						'important' => true,
-						'group'     => esc_html__( 'Widget', 'your-textdomain-here' ),
-					),
-					array(
-						'id'        => 'widget-text',
-						'title'     => 'widget text',
-						'color'     => '#fdfdfd',
-						'alpha'     => 1,
-						'selector'  => '.widget a',
-						'mode'      => 'color',
-						'important' => true,
-						'group'     => esc_html__( 'Widget', 'your-textdomain-here' ),
-					),
-					array(
-						'id'        => 'sidebar-container',
-						'title'     => 'sidebar container',
-						'color'     => '#d5a6bd',
-						'alpha'     => 1,
-						'selector'  => '.sidebar-container',
-						'mode'      => 'background-color',
-						'important' => true,
-						'group'     => '',
-					),
-					array(
-						'id'       => 'site-footer',
-						'title'    => 'site footer',
-						'color'    => '#ededed',
-						'alpha'    => 1,
-						'selector' => '.site-footer,footer',
-						'mode'     => 'background-color',
-						'group'    => '',
-					),
-					array(
-						'id'       => 'site-footer-text',
-						'title'    => 'site footer text',
-						'color'    => '#000000',
-						'alpha'    => 1,
-						'selector' => '.site-footer a, footer a',
-						'group'    => '',
-					),
-				),
-			),
-		),
-	)
+                    ),
+                    array(
+                        'id'       => 'body-text',
+                        'title'    => 'body text',
+                        'color'    => '#000000',
+                        'alpha'    => 1,
+                        'selector' => 'body p',
+                        'mode'     => 'color',
+                        'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'site-content',
+                        'title'    => 'site content',
+                        'color'    => '#a4c2f4',
+                        'alpha'    => 1,
+                        'selector' => '.site-content',
+                        'mode'     => 'background-color',
+                        'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'entry-content',
+                        'title'    => 'entry content',
+                        'color'    => '#93c47d',
+                        'alpha'    => 1,
+                        'selector' => '.entry-content',
+                        'mode'     => 'background-color',
+                        'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'entry-title',
+                        'title'    => 'entry title',
+                        'color'    => '#000000',
+                        'alpha'    => 1,
+                        'selector' => '.entry-title a',
+                        'mode'     => 'color',
+                        'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'entry-title-hover',
+                        'title'    => 'entry title hover',
+                        'color'    => '#ffffff',
+                        'alpha'    => 1,
+                        'selector' => '.entry-title a:hover',
+                        'mode'     => 'color',
+                        'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'entry-meta',
+                        'title'    => 'entry meta',
+                        'color'    => '#0b5394',
+                        'alpha'    => 1,
+                        'selector' => '.entry-meta a',
+                        'mode'     => 'color',
+                        'group'    => esc_html__( 'Body', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'       => 'widget-container',
+                        'title'    => 'widget container',
+                        'color'    => '#f1c232',
+                        'alpha'    => .5,
+                        'selector' => '.widget',
+                        'mode'     => 'background-color',
+                        'group'    => esc_html__( 'Widget', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'        => 'widget-title',
+                        'title'     => 'widget title',
+                        'color'     => '#741b47',
+                        'alpha'     => 1,
+                        'selector'  => '.widget-title',
+                        'mode'      => 'color',
+                        'important' => true,
+                        'group'     => esc_html__( 'Widget', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'        => 'widget-text',
+                        'title'     => 'widget text',
+                        'color'     => '#fdfdfd',
+                        'alpha'     => 1,
+                        'selector'  => '.widget a',
+                        'mode'      => 'color',
+                        'important' => true,
+                        'group'     => esc_html__( 'Widget', 'your-textdomain-here' ),
+                    ),
+                    array(
+                        'id'        => 'sidebar-container',
+                        'title'     => 'sidebar container',
+                        'color'     => '#d5a6bd',
+                        'alpha'     => 1,
+                        'selector'  => '.sidebar-container',
+                        'mode'      => 'background-color',
+                        'important' => true,
+                        'group'     => '',
+                    ),
+                    array(
+                        'id'       => 'site-footer',
+                        'title'    => 'site footer',
+                        'color'    => '#ededed',
+                        'alpha'    => 1,
+                        'selector' => '.site-footer,footer',
+                        'mode'     => 'background-color',
+                        'group'    => '',
+                    ),
+                    array(
+                        'id'       => 'site-footer-text',
+                        'title'    => 'site footer text',
+                        'color'    => '#000000',
+                        'alpha'    => 1,
+                        'selector' => '.site-footer a, footer a',
+                        'group'    => '',
+                    ),
+                ),
+            ),
+        ),
+    )
 );
 // phpcs:enable