reduxframework / redux-framework

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

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

Spacing +9 added lines, -9 removed lines

@@ -109,7 +109,7 @@ 
 							}
 
 							$field['default'] = $field['default'] ?? '';
-							$value            = $core->options[ $field['id'] ] ?? $field['default'];
+							$value            = $core->options[$field['id']] ?? $field['default'];
 							$style_data       = '';
 
 							if ( empty( $field_class ) ) {
@@ -118,7 +118,7 @@ 
 
 							$field_object = new $field_class( $field, $value, $core );
 
-							if ( ! empty( $core->options[ $field['id'] ] ) && class_exists( $field_class ) && method_exists( $field_class, 'output' ) && $this->can_output_css( $core, $field ) ) {
+							if ( ! empty( $core->options[$field['id']] ) && class_exists( $field_class ) && method_exists( $field_class, 'output' ) && $this->can_output_css( $core, $field ) ) {
 
 								// phpcs:ignore WordPress.NamingConventions.ValidHookName
 								$field = apply_filters( "redux/field/{$core->args['opt_name']}/output_css", $field );
@@ -223,7 +223,7 @@ 
 				// Revamp thanks to Harry: https://csswizardry.com/2020/05/the-fastest-google-fonts/.
 				$href      = str_replace( array( '|', ' ' ), array( '%7C', '%20' ), urldecode( $href ) );
 				$new_html  = '<link rel="preload" as="style" href="' . esc_attr( $href ) . '" />';
-				$new_html .= '<link rel="stylesheet" href="' . esc_attr( $href ) . '" media="print" onload="this.media=\'all\'">';  // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+				$new_html .= '<link rel="stylesheet" href="' . esc_attr( $href ) . '" media="print" onload="this.media=\'all\'">'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 				$new_html .= '<noscript><link rel="stylesheet" href="' . esc_attr( $href ) . '" /></noscript>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 				$html      = $new_html;
 			}
@@ -269,19 +269,19 @@ 
 
 					foreach ( $val_pieces as $val_key => $val_val ) {
 						$val_key                            = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] ) . '-' . $val_key;
-						$core->output_variables[ $val_key ] = $val_val;
+						$core->output_variables[$val_key] = $val_val;
 						if ( ! empty( $style_data ) ) {
 							$val_key                            = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] );
-							$core->output_variables[ $val_key ] = $style_data;
+							$core->output_variables[$val_key] = $style_data;
 						}
 					}
 				} else {
 					$val_key = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] );
 
 					if ( ! empty( $style_data ) ) {
-						$core->output_variables[ $val_key ] = $style_data;
+						$core->output_variables[$val_key] = $style_data;
 					} else {
-						$core->output_variables[ $val_key ] = $value;
+						$core->output_variables[$val_key] = $value;
 					}
 				}
 			}
@@ -344,14 +344,14 @@ 
 			if ( ! empty( $field['required'] ) ) {
 				if ( isset( $field['required'][0] ) ) {
 					if ( ! is_array( $field['required'][0] ) && 3 === count( $field['required'] ) ) {
-						$parent_value = $GLOBALS[ $core->args['global_variable'] ][ $field['required'][0] ] ?? '';
+						$parent_value = $GLOBALS[$core->args['global_variable']][$field['required'][0]] ?? '';
 						$check_value  = $field['required'][2];
 						$operation    = $field['required'][1];
 						$return       = $core->required_class->compare_value_dependencies( $parent_value, $check_value, $operation );
 					} elseif ( is_array( $field['required'][0] ) ) {
 						foreach ( $field['required'] as $required ) {
 							if ( isset( $required[0] ) && ! is_array( $required[0] ) && 3 === count( $required ) ) {
-								$parent_value = $GLOBALS[ $core->args['global_variable'] ][ $required[0] ] ?? '';
+								$parent_value = $GLOBALS[$core->args['global_variable']][$required[0]] ?? '';
 								$check_value  = $required[2];
 								$operation    = $required[1];
 								$return       = $core->required_class->compare_value_dependencies( $parent_value, $check_value, $operation );

Indentation +358 added lines, -358 removed lines

@@ -12,362 +12,362 @@
 
 if ( ! class_exists( 'Redux_Output', false ) ) {
 
-	/**
-	 * Class Redux_Output
-	 */
-	class Redux_Output extends Redux_Class {
-
-		/**
-		 * Redux_Output constructor.
-		 *
-		 * @param object $redux ReduxFramework pointer.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux );
-
-			// Output dynamic CSS.
-			// Frontend: Maybe enqueue dynamic CSS and Google fonts.
-			if ( empty( $this->args['output_location'] ) || in_array( 'frontend', $this->args['output_location'], true ) ) {
-				add_action( 'wp_head', array( $this, 'output_css' ), 150 );
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue' ), 150 );
-			}
-
-			// Login page: Maybe enqueue dynamic CSS and Google fonts.
-			if ( in_array( 'login', $this->args['output_location'], true ) ) {
-				add_action( 'login_head', array( $this, 'output_css' ), 150 );
-				add_action( 'login_enqueue_scripts', array( $this, 'enqueue' ), 150 );
-			}
-
-			// Admin area: Maybe enqueue dynamic CSS and Google fonts.
-			if ( in_array( 'admin', $this->args['output_location'], true ) ) {
-				add_action( 'admin_head', array( $this, 'output_css' ), 150 );
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 150 );
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/output/{$this->parent->args['opt_name']}/construct", $this );
-			// Useful for adding different locations for CSS output.
-		}
-
-		/**
-		 * Enqueue CSS and Google fonts for front end
-		 *
-		 * @return void
-		 * @throws ReflectionException Exception.
-		 * @since  1.0.0
-		 * @access public
-		 */
-		public function enqueue() {
-			$core = $this->core();
-
-			if ( false === $core->args['output'] && false === $core->args['compiler'] ) {
-				return;
-			}
-
-			foreach ( $core->sections as $k => $section ) {
-				if ( isset( $section['type'] ) && ( 'divide' === $section['type'] ) ) {
-					continue;
-				}
-
-				if ( isset( $section['fields'] ) ) {
-					foreach ( $section['fields'] as $fieldk => $field ) {
-						if ( isset( $field['type'] ) && 'callback' !== $field['type'] ) {
-							$field_classes = array( 'Redux_' . $field['type'], 'ReduxFramework_' . $field['type'] );
-
-							$field_class = Redux_Functions::class_exists_ex( $field_classes );
-
-							if ( false === $field_class ) {
-								if ( ! isset( $field['compiler'] ) ) {
-									$field['compiler'] = '';
-								}
-
-								$field_type = str_replace( '_', '-', $field['type'] );
-								$core_path  = Redux_Core::$dir . "inc/fields/{$field['type']}/class-redux-$field_type.php";
-
-								if ( ! file_exists( $core_path ) ) {
-									$core_path = Redux_Core::$dir . "inc/fields/{$field['type']}/field_{$field['type']}.php";
-								}
-
-								$filter_path = $core_path;
-
-								/**
-								 * Field class file
-								 * filter 'redux/{opt_name}/field/class/{field.type}'
-								 *
-								 * @param string $file field class file.
-								 * @param array $field field config data
-								 */
-
-								// phpcs:ignore WordPress.NamingConventions.ValidHookName
-								$class_file = apply_filters( "redux/{$core->args['opt_name']}/field/class/{$field['type']}", $filter_path, $field );
-
-								if ( $class_file && file_exists( $class_file ) ) {
-									require_once $class_file;
-
-									$field_class = Redux_Functions::class_exists_ex( $field_classes );
-								}
-							}
-
-							$field['default'] = $field['default'] ?? '';
-							$value            = $core->options[ $field['id'] ] ?? $field['default'];
-							$style_data       = '';
-
-							if ( empty( $field_class ) ) {
-								continue;
-							}
-
-							$field_object = new $field_class( $field, $value, $core );
-
-							if ( ! empty( $core->options[ $field['id'] ] ) && class_exists( $field_class ) && method_exists( $field_class, 'output' ) && $this->can_output_css( $core, $field ) ) {
-
-								// phpcs:ignore WordPress.NamingConventions.ValidHookName
-								$field = apply_filters( "redux/field/{$core->args['opt_name']}/output_css", $field );
-
-								if ( ! empty( $field['output'] ) && ! is_array( $field['output'] ) ) {
-									$field['output'] = array( $field['output'] );
-								}
-
-								if ( ( ( isset( $field['output'] ) && ! empty( $field['output'] ) ) || ( isset( $field['compiler'] ) && ! empty( $field['compiler'] ) ) || ( isset( $field['media_query'] ) && ! empty( $field['media_query'] ) ) || 'typography' === $field['type'] || 'icon_select' === $field['type'] || 'social_profiles' === $field['type'] ) ) {
-									if ( method_exists( $field_class, 'css_style' ) ) {
-										$style_data = $field_object->css_style( $field_object->value );
-									}
-								}
-
-								if ( null !== $style_data ) {
-									if ( ( ( isset( $field['output'] ) && ! empty( $field['output'] ) ) || ( isset( $field['compiler'] ) && ! empty( $field['compiler'] ) ) || 'typography' === $field['type'] || 'icon_select' === $field['type'] || 'social_profiles' === $field['type'] ) ) {
-										$field_object->output( $style_data );
-									}
-
-									if ( isset( $field['media_query'] ) && ! empty( $field['media_query'] ) ) {
-										$field_object->media_query( $style_data );
-									}
-								}
-							}
-
-							// phpcs:ignore WordPress.NamingConventions.ValidHookName
-							do_action( "redux/field/{$core->args['opt_name']}/output_loop", $core, $field, $value, $style_data );
-
-							// phpcs:ignore WordPress.NamingConventions.ValidHookName
-							do_action( "redux/field/{$core->args['opt_name']}/output_loop/{$field['type']}", $core, $field, $value, $style_data );
-
-							if ( method_exists( $field_class, 'output_variables' ) && $this->can_output_css( $core, $field ) ) {
-								$passed_style_data = $field_object->output_variables( $style_data );
-								$this->output_variables( $core, $section, $field, $value, $passed_style_data );
-							}
-						}
-					}
-
-					if ( ! empty( $core->outputCSS ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-						// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-						$core->outputCSS = html_entity_decode( $core->outputCSS, ENT_QUOTES, 'UTF-8' );
-					}
-				}
-			}
-
-			// For use like in the customizer. Stops the output, but passes the CSS in the variable for the compiler.
-			if ( true === Redux_Core::$no_output ) {
-				return;
-			}
-
-			if ( ! empty( Redux_Core::$typography ) && filter_var( $core->args['output'], FILTER_VALIDATE_BOOLEAN ) ) {
-				$version = ! empty( $core->transients['last_save'] ) ? $core->transients['last_save'] : '';
-				if ( ! class_exists( 'Redux_Typography' ) ) {
-					require_once Redux_Core::$dir . '/inc/fields/typography/class-redux-typography.php';
-				}
-
-				$typography = new Redux_Typography( null, null, $core );
-
-				$core->args['disable_google_fonts_link'] = ( ! isset( $core->args['disable_google_fonts_link'] ) ? false : $core->args['disable_google_fonts_link'] );
-
-				if ( ! $core->args['disable_google_fonts_link'] ) {
-					$url = $typography->make_google_web_font_link( Redux_Core::$typography );
-					wp_enqueue_style( 'redux-google-fonts-' . $core->args['opt_name'], $url, array(), $version );
-					add_filter( 'style_loader_tag', array( $this, 'add_style_attributes' ), 10, 4 );
-					add_filter( 'wp_resource_hints', array( $this, 'google_fonts_preconnect' ), 10, 2 );
-				}
-			}
-		}
-
-		/**
-		 * Add a Google Fonts preconnect link.
-		 *
-		 * @param array  $urls              HTML to be added.
-		 * @param string $relationship_type Handle name.
-		 *
-		 * @return      array
-		 * @since       4.1.15
-		 * @access      public
-		 */
-		public function google_fonts_preconnect( array $urls, string $relationship_type ): array {
-			if ( 'preconnect' !== $relationship_type ) {
-				return $urls;
-			}
-			$urls[] = array(
-				'rel'  => 'preconnect',
-				'href' => 'https://fonts.gstatic.com',
-				'crossorigin',
-			);
-			return $urls;
-		}
-
-		/**
-		 * Filter to enhance the google fonts enqueue.
-		 *
-		 * @param string $html   HTML to be added.
-		 * @param string $handle Handle name.
-		 * @param string $href   HREF URL of a script.
-		 *
-		 * @return      string
-		 * @since       4.1.15
-		 * @access      public
-		 */
-		public function add_style_attributes( string $html = '', string $handle = '', string $href = '' ): string {
-			if ( Redux_Functions_Ex::string_starts_with( $handle, 'redux-google-fonts-' ) ) {
-				// Revamp thanks to Harry: https://csswizardry.com/2020/05/the-fastest-google-fonts/.
-				$href      = str_replace( array( '|', ' ' ), array( '%7C', '%20' ), urldecode( $href ) );
-				$new_html  = '<link rel="preload" as="style" href="' . esc_attr( $href ) . '" />';
-				$new_html .= '<link rel="stylesheet" href="' . esc_attr( $href ) . '" media="print" onload="this.media=\'all\'">';  // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
-				$new_html .= '<noscript><link rel="stylesheet" href="' . esc_attr( $href ) . '" /></noscript>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
-				$html      = $new_html;
-			}
-
-			return $html;
-		}
-
-		/**
-		 * Function to output output_variables to the dynamic output.
-		 *
-		 * @param ReduxFramework $core       ReduxFramework core pointer.
-		 * @param array          $section    Section containing this field.
-		 * @param array          $field      Field object.
-		 * @param array|string   $value      Current value of field.
-		 * @param string|null    $style_data CSS output string to append to the root output variable.
-		 *
-		 * @return      void
-		 * @since       4.0.3
-		 * @access      public
-		 */
-		private function output_variables( ReduxFramework $core, array $section = array(), array $field = array(), $value = array(), ?string $style_data = '' ) {
-			// Let's allow section overrides, please.
-			if ( isset( $section['output_variables'] ) && ! isset( $field['output_variables'] ) ) {
-				$field['output_variables'] = $section['output_variables'];
-			}
-			if ( isset( $section['output_variables_prefix'] ) && ! isset( $field['output_variables_prefix'] ) ) {
-				$field['output_variables_prefix'] = $section['output_variables_prefix'];
-			}
-			if ( isset( $field['output_variables'] ) && $field['output_variables'] ) {
-				$output_variables_prefix = $core->args['output_variables_prefix'];
-				if ( isset( $field['output_variables_prefix'] ) && ! empty( $field['output_variables_prefix'] ) ) {
-					$output_variables_prefix = $field['output_variables_prefix'];
-				} elseif ( isset( $section['output_variables_prefix'] ) && ! empty( $section['output_variables_prefix'] ) ) {
-					$output_variables_prefix = $section['output_variables_prefix'];
-				}
-
-				if ( is_array( $value ) ) {
-					$val_pieces = array_filter( $value, 'strlen' );
-					// We don't need to show the Google boolean.
-					if ( 'typography' === $field['type'] && isset( $val_pieces['google'] ) ) {
-						unset( $val_pieces['google'] );
-					}
-
-					foreach ( $val_pieces as $val_key => $val_val ) {
-						$val_key                            = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] ) . '-' . $val_key;
-						$core->output_variables[ $val_key ] = $val_val;
-						if ( ! empty( $style_data ) ) {
-							$val_key                            = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] );
-							$core->output_variables[ $val_key ] = $style_data;
-						}
-					}
-				} else {
-					$val_key = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] );
-
-					if ( ! empty( $style_data ) ) {
-						$core->output_variables[ $val_key ] = $style_data;
-					} else {
-						$core->output_variables[ $val_key ] = $value;
-					}
-				}
-			}
-		}
-
-		/**
-		 * Output dynamic CSS at the bottom of HEAD
-		 *
-		 * @return      void
-		 * @since       3.2.8
-		 * @access      public
-		 */
-		public function output_css() {
-			$core = $this->core();
-
-			if ( false === $core->args['output'] && false === $core->args['compiler'] && empty( $core->output_variables ) ) {
-				return;
-			}
-
-			if ( true === Redux_Core::$no_output ) {
-				return;
-			}
-
-			if ( ! empty( $core->output_variables ) ) {
-				$root_css = ':root{';
-				foreach ( $core->output_variables as $key => $value ) {
-					$root_css .= "$key:$value;";
-				}
-				$root_css .= '}';
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName, WordPress.Security.EscapeOutput
-				$core->outputCSS = $root_css . $core->outputCSS;
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidVariableName
-			if ( ! empty( $core->outputCSS ) && ( true === $core->args['output_tag'] || ( isset( $_POST['customized'] ) && isset( $_POST['nonce'] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nonce'] ) ), 'preview-customize_' . wp_get_theme()->get_stylesheet() ) ) ) ) {
-				// phpcs:ignore WordPress.NamingConventions.ValidVariableName, WordPress.Security.EscapeOutput
-				echo '<style id="' . esc_attr( $core->args['opt_name'] ) . '-dynamic-css" title="dynamic-css" class="redux-options-output">' . $core->outputCSS . '</style>';
-			}
-		}
-
-		/**
-		 * Can Output CSS
-		 * Check if a field meets its requirements before outputting to CSS
-		 *
-		 * @param ReduxFramework $core  ReduxFramework core pointer.
-		 * @param array          $field Field array.
-		 *
-		 * @return bool
-		 */
-		private function can_output_css( ReduxFramework $core, array $field ): ?bool {
-			$return = true;
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$field = apply_filters( "redux/field/{$core->args['opt_name']}/_can_output_css", $field );
-
-			if ( isset( $field['force_output'] ) && true === $field['force_output'] ) {
-				return true;
-			}
-
-			if ( ! empty( $field['required'] ) ) {
-				if ( isset( $field['required'][0] ) ) {
-					if ( ! is_array( $field['required'][0] ) && 3 === count( $field['required'] ) ) {
-						$parent_value = $GLOBALS[ $core->args['global_variable'] ][ $field['required'][0] ] ?? '';
-						$check_value  = $field['required'][2];
-						$operation    = $field['required'][1];
-						$return       = $core->required_class->compare_value_dependencies( $parent_value, $check_value, $operation );
-					} elseif ( is_array( $field['required'][0] ) ) {
-						foreach ( $field['required'] as $required ) {
-							if ( isset( $required[0] ) && ! is_array( $required[0] ) && 3 === count( $required ) ) {
-								$parent_value = $GLOBALS[ $core->args['global_variable'] ][ $required[0] ] ?? '';
-								$check_value  = $required[2];
-								$operation    = $required[1];
-								$return       = $core->required_class->compare_value_dependencies( $parent_value, $check_value, $operation );
-							}
-							if ( ! $return ) {
-								return $return;
-							}
-						}
-					}
-				}
-			}
-
-			return $return;
-		}
-	}
+    /**
+     * Class Redux_Output
+     */
+    class Redux_Output extends Redux_Class {
+
+        /**
+         * Redux_Output constructor.
+         *
+         * @param object $redux ReduxFramework pointer.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux );
+
+            // Output dynamic CSS.
+            // Frontend: Maybe enqueue dynamic CSS and Google fonts.
+            if ( empty( $this->args['output_location'] ) || in_array( 'frontend', $this->args['output_location'], true ) ) {
+                add_action( 'wp_head', array( $this, 'output_css' ), 150 );
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue' ), 150 );
+            }
+
+            // Login page: Maybe enqueue dynamic CSS and Google fonts.
+            if ( in_array( 'login', $this->args['output_location'], true ) ) {
+                add_action( 'login_head', array( $this, 'output_css' ), 150 );
+                add_action( 'login_enqueue_scripts', array( $this, 'enqueue' ), 150 );
+            }
+
+            // Admin area: Maybe enqueue dynamic CSS and Google fonts.
+            if ( in_array( 'admin', $this->args['output_location'], true ) ) {
+                add_action( 'admin_head', array( $this, 'output_css' ), 150 );
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 150 );
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/output/{$this->parent->args['opt_name']}/construct", $this );
+            // Useful for adding different locations for CSS output.
+        }
+
+        /**
+         * Enqueue CSS and Google fonts for front end
+         *
+         * @return void
+         * @throws ReflectionException Exception.
+         * @since  1.0.0
+         * @access public
+         */
+        public function enqueue() {
+            $core = $this->core();
+
+            if ( false === $core->args['output'] && false === $core->args['compiler'] ) {
+                return;
+            }
+
+            foreach ( $core->sections as $k => $section ) {
+                if ( isset( $section['type'] ) && ( 'divide' === $section['type'] ) ) {
+                    continue;
+                }
+
+                if ( isset( $section['fields'] ) ) {
+                    foreach ( $section['fields'] as $fieldk => $field ) {
+                        if ( isset( $field['type'] ) && 'callback' !== $field['type'] ) {
+                            $field_classes = array( 'Redux_' . $field['type'], 'ReduxFramework_' . $field['type'] );
+
+                            $field_class = Redux_Functions::class_exists_ex( $field_classes );
+
+                            if ( false === $field_class ) {
+                                if ( ! isset( $field['compiler'] ) ) {
+                                    $field['compiler'] = '';
+                                }
+
+                                $field_type = str_replace( '_', '-', $field['type'] );
+                                $core_path  = Redux_Core::$dir . "inc/fields/{$field['type']}/class-redux-$field_type.php";
+
+                                if ( ! file_exists( $core_path ) ) {
+                                    $core_path = Redux_Core::$dir . "inc/fields/{$field['type']}/field_{$field['type']}.php";
+                                }
+
+                                $filter_path = $core_path;
+
+                                /**
+                                 * Field class file
+                                 * filter 'redux/{opt_name}/field/class/{field.type}'
+                                 *
+                                 * @param string $file field class file.
+                                 * @param array $field field config data
+                                 */
+
+                                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                                $class_file = apply_filters( "redux/{$core->args['opt_name']}/field/class/{$field['type']}", $filter_path, $field );
+
+                                if ( $class_file && file_exists( $class_file ) ) {
+                                    require_once $class_file;
+
+                                    $field_class = Redux_Functions::class_exists_ex( $field_classes );
+                                }
+                            }
+
+                            $field['default'] = $field['default'] ?? '';
+                            $value            = $core->options[ $field['id'] ] ?? $field['default'];
+                            $style_data       = '';
+
+                            if ( empty( $field_class ) ) {
+                                continue;
+                            }
+
+                            $field_object = new $field_class( $field, $value, $core );
+
+                            if ( ! empty( $core->options[ $field['id'] ] ) && class_exists( $field_class ) && method_exists( $field_class, 'output' ) && $this->can_output_css( $core, $field ) ) {
+
+                                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                                $field = apply_filters( "redux/field/{$core->args['opt_name']}/output_css", $field );
+
+                                if ( ! empty( $field['output'] ) && ! is_array( $field['output'] ) ) {
+                                    $field['output'] = array( $field['output'] );
+                                }
+
+                                if ( ( ( isset( $field['output'] ) && ! empty( $field['output'] ) ) || ( isset( $field['compiler'] ) && ! empty( $field['compiler'] ) ) || ( isset( $field['media_query'] ) && ! empty( $field['media_query'] ) ) || 'typography' === $field['type'] || 'icon_select' === $field['type'] || 'social_profiles' === $field['type'] ) ) {
+                                    if ( method_exists( $field_class, 'css_style' ) ) {
+                                        $style_data = $field_object->css_style( $field_object->value );
+                                    }
+                                }
+
+                                if ( null !== $style_data ) {
+                                    if ( ( ( isset( $field['output'] ) && ! empty( $field['output'] ) ) || ( isset( $field['compiler'] ) && ! empty( $field['compiler'] ) ) || 'typography' === $field['type'] || 'icon_select' === $field['type'] || 'social_profiles' === $field['type'] ) ) {
+                                        $field_object->output( $style_data );
+                                    }
+
+                                    if ( isset( $field['media_query'] ) && ! empty( $field['media_query'] ) ) {
+                                        $field_object->media_query( $style_data );
+                                    }
+                                }
+                            }
+
+                            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                            do_action( "redux/field/{$core->args['opt_name']}/output_loop", $core, $field, $value, $style_data );
+
+                            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                            do_action( "redux/field/{$core->args['opt_name']}/output_loop/{$field['type']}", $core, $field, $value, $style_data );
+
+                            if ( method_exists( $field_class, 'output_variables' ) && $this->can_output_css( $core, $field ) ) {
+                                $passed_style_data = $field_object->output_variables( $style_data );
+                                $this->output_variables( $core, $section, $field, $value, $passed_style_data );
+                            }
+                        }
+                    }
+
+                    if ( ! empty( $core->outputCSS ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                        // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                        $core->outputCSS = html_entity_decode( $core->outputCSS, ENT_QUOTES, 'UTF-8' );
+                    }
+                }
+            }
+
+            // For use like in the customizer. Stops the output, but passes the CSS in the variable for the compiler.
+            if ( true === Redux_Core::$no_output ) {
+                return;
+            }
+
+            if ( ! empty( Redux_Core::$typography ) && filter_var( $core->args['output'], FILTER_VALIDATE_BOOLEAN ) ) {
+                $version = ! empty( $core->transients['last_save'] ) ? $core->transients['last_save'] : '';
+                if ( ! class_exists( 'Redux_Typography' ) ) {
+                    require_once Redux_Core::$dir . '/inc/fields/typography/class-redux-typography.php';
+                }
+
+                $typography = new Redux_Typography( null, null, $core );
+
+                $core->args['disable_google_fonts_link'] = ( ! isset( $core->args['disable_google_fonts_link'] ) ? false : $core->args['disable_google_fonts_link'] );
+
+                if ( ! $core->args['disable_google_fonts_link'] ) {
+                    $url = $typography->make_google_web_font_link( Redux_Core::$typography );
+                    wp_enqueue_style( 'redux-google-fonts-' . $core->args['opt_name'], $url, array(), $version );
+                    add_filter( 'style_loader_tag', array( $this, 'add_style_attributes' ), 10, 4 );
+                    add_filter( 'wp_resource_hints', array( $this, 'google_fonts_preconnect' ), 10, 2 );
+                }
+            }
+        }
+
+        /**
+         * Add a Google Fonts preconnect link.
+         *
+         * @param array  $urls              HTML to be added.
+         * @param string $relationship_type Handle name.
+         *
+         * @return      array
+         * @since       4.1.15
+         * @access      public
+         */
+        public function google_fonts_preconnect( array $urls, string $relationship_type ): array {
+            if ( 'preconnect' !== $relationship_type ) {
+                return $urls;
+            }
+            $urls[] = array(
+                'rel'  => 'preconnect',
+                'href' => 'https://fonts.gstatic.com',
+                'crossorigin',
+            );
+            return $urls;
+        }
+
+        /**
+         * Filter to enhance the google fonts enqueue.
+         *
+         * @param string $html   HTML to be added.
+         * @param string $handle Handle name.
+         * @param string $href   HREF URL of a script.
+         *
+         * @return      string
+         * @since       4.1.15
+         * @access      public
+         */
+        public function add_style_attributes( string $html = '', string $handle = '', string $href = '' ): string {
+            if ( Redux_Functions_Ex::string_starts_with( $handle, 'redux-google-fonts-' ) ) {
+                // Revamp thanks to Harry: https://csswizardry.com/2020/05/the-fastest-google-fonts/.
+                $href      = str_replace( array( '|', ' ' ), array( '%7C', '%20' ), urldecode( $href ) );
+                $new_html  = '<link rel="preload" as="style" href="' . esc_attr( $href ) . '" />';
+                $new_html .= '<link rel="stylesheet" href="' . esc_attr( $href ) . '" media="print" onload="this.media=\'all\'">';  // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+                $new_html .= '<noscript><link rel="stylesheet" href="' . esc_attr( $href ) . '" /></noscript>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+                $html      = $new_html;
+            }
+
+            return $html;
+        }
+
+        /**
+         * Function to output output_variables to the dynamic output.
+         *
+         * @param ReduxFramework $core       ReduxFramework core pointer.
+         * @param array          $section    Section containing this field.
+         * @param array          $field      Field object.
+         * @param array|string   $value      Current value of field.
+         * @param string|null    $style_data CSS output string to append to the root output variable.
+         *
+         * @return      void
+         * @since       4.0.3
+         * @access      public
+         */
+        private function output_variables( ReduxFramework $core, array $section = array(), array $field = array(), $value = array(), ?string $style_data = '' ) {
+            // Let's allow section overrides, please.
+            if ( isset( $section['output_variables'] ) && ! isset( $field['output_variables'] ) ) {
+                $field['output_variables'] = $section['output_variables'];
+            }
+            if ( isset( $section['output_variables_prefix'] ) && ! isset( $field['output_variables_prefix'] ) ) {
+                $field['output_variables_prefix'] = $section['output_variables_prefix'];
+            }
+            if ( isset( $field['output_variables'] ) && $field['output_variables'] ) {
+                $output_variables_prefix = $core->args['output_variables_prefix'];
+                if ( isset( $field['output_variables_prefix'] ) && ! empty( $field['output_variables_prefix'] ) ) {
+                    $output_variables_prefix = $field['output_variables_prefix'];
+                } elseif ( isset( $section['output_variables_prefix'] ) && ! empty( $section['output_variables_prefix'] ) ) {
+                    $output_variables_prefix = $section['output_variables_prefix'];
+                }
+
+                if ( is_array( $value ) ) {
+                    $val_pieces = array_filter( $value, 'strlen' );
+                    // We don't need to show the Google boolean.
+                    if ( 'typography' === $field['type'] && isset( $val_pieces['google'] ) ) {
+                        unset( $val_pieces['google'] );
+                    }
+
+                    foreach ( $val_pieces as $val_key => $val_val ) {
+                        $val_key                            = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] ) . '-' . $val_key;
+                        $core->output_variables[ $val_key ] = $val_val;
+                        if ( ! empty( $style_data ) ) {
+                            $val_key                            = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] );
+                            $core->output_variables[ $val_key ] = $style_data;
+                        }
+                    }
+                } else {
+                    $val_key = $output_variables_prefix . sanitize_title_with_dashes( $field['id'] );
+
+                    if ( ! empty( $style_data ) ) {
+                        $core->output_variables[ $val_key ] = $style_data;
+                    } else {
+                        $core->output_variables[ $val_key ] = $value;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Output dynamic CSS at the bottom of HEAD
+         *
+         * @return      void
+         * @since       3.2.8
+         * @access      public
+         */
+        public function output_css() {
+            $core = $this->core();
+
+            if ( false === $core->args['output'] && false === $core->args['compiler'] && empty( $core->output_variables ) ) {
+                return;
+            }
+
+            if ( true === Redux_Core::$no_output ) {
+                return;
+            }
+
+            if ( ! empty( $core->output_variables ) ) {
+                $root_css = ':root{';
+                foreach ( $core->output_variables as $key => $value ) {
+                    $root_css .= "$key:$value;";
+                }
+                $root_css .= '}';
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName, WordPress.Security.EscapeOutput
+                $core->outputCSS = $root_css . $core->outputCSS;
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+            if ( ! empty( $core->outputCSS ) && ( true === $core->args['output_tag'] || ( isset( $_POST['customized'] ) && isset( $_POST['nonce'] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nonce'] ) ), 'preview-customize_' . wp_get_theme()->get_stylesheet() ) ) ) ) {
+                // phpcs:ignore WordPress.NamingConventions.ValidVariableName, WordPress.Security.EscapeOutput
+                echo '<style id="' . esc_attr( $core->args['opt_name'] ) . '-dynamic-css" title="dynamic-css" class="redux-options-output">' . $core->outputCSS . '</style>';
+            }
+        }
+
+        /**
+         * Can Output CSS
+         * Check if a field meets its requirements before outputting to CSS
+         *
+         * @param ReduxFramework $core  ReduxFramework core pointer.
+         * @param array          $field Field array.
+         *
+         * @return bool
+         */
+        private function can_output_css( ReduxFramework $core, array $field ): ?bool {
+            $return = true;
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $field = apply_filters( "redux/field/{$core->args['opt_name']}/_can_output_css", $field );
+
+            if ( isset( $field['force_output'] ) && true === $field['force_output'] ) {
+                return true;
+            }
+
+            if ( ! empty( $field['required'] ) ) {
+                if ( isset( $field['required'][0] ) ) {
+                    if ( ! is_array( $field['required'][0] ) && 3 === count( $field['required'] ) ) {
+                        $parent_value = $GLOBALS[ $core->args['global_variable'] ][ $field['required'][0] ] ?? '';
+                        $check_value  = $field['required'][2];
+                        $operation    = $field['required'][1];
+                        $return       = $core->required_class->compare_value_dependencies( $parent_value, $check_value, $operation );
+                    } elseif ( is_array( $field['required'][0] ) ) {
+                        foreach ( $field['required'] as $required ) {
+                            if ( isset( $required[0] ) && ! is_array( $required[0] ) && 3 === count( $required ) ) {
+                                $parent_value = $GLOBALS[ $core->args['global_variable'] ][ $required[0] ] ?? '';
+                                $check_value  = $required[2];
+                                $operation    = $required[1];
+                                $return       = $core->required_class->compare_value_dependencies( $parent_value, $check_value, $operation );
+                            }
+                            if ( ! $return ) {
+                                return $return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return $return;
+        }
+    }
 }

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

Indentation +76 added lines, -76 removed lines

@@ -10,80 +10,80 @@
 
 if ( ! class_exists( 'Redux_Extensions', false ) ) {
 
-	/**
-	 * Class Redux_Extensions
-	 */
-	class Redux_Extensions extends Redux_Class {
-
-		/**
-		 * Redux_Extensions constructor.
-		 *
-		 * @param object $redux ReduxFramework object pointer.
-		 *
-		 * @throws ReflectionException Exception.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux );
-
-			$this->load();
-		}
-
-		/**
-		 * Class load functions.
-		 *
-		 * @throws ReflectionException For fallback.
-		 */
-		private function load() {
-			$core = $this->core();
-
-			$max = 1;
-
-			for ( $i = 1; $i <= $max; $i++ ) {
-				$path = Redux_Core::$dir . 'inc/extensions/';
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$path = apply_filters( 'redux/' . $core->args['opt_name'] . '/extensions/dir', $path );
-
-				/**
-				 * Action 'redux/extensions/before'
-				 *
-				 * @param object $this ReduxFramework
-				 */
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				do_action( 'redux/extensions/before', $core );
-
-				/**
-				 * Action 'redux/extensions/{opt_name}/before'
-				 *
-				 * @param object $this ReduxFramework
-				 */
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				do_action( "redux/extensions/{$core->args['opt_name']}/before", $core );
-
-				if ( isset( $core->old_opt_name ) ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( 'redux/extensions/' . $core->old_opt_name . '/before', $core );
-				}
-
-				require_once Redux_Core::$dir . 'inc/classes/class-redux-extension-abstract.php';
-
-				$path = untrailingslashit( $path );
-
-				Redux::set_extensions( $core->args['opt_name'], $path, true );
-
-				/**
-				 * Action 'redux/extensions/{opt_name}'
-				 *
-				 * @param object $this ReduxFramework
-				 */
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				do_action( "redux/extensions/{$core->args['opt_name']}", $core );
-
-				if ( isset( $core->old_opt_name ) ) {
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( 'redux/extensions/' . $core->old_opt_name, $core );
-				}
-			}
-		}
-	}
+    /**
+     * Class Redux_Extensions
+     */
+    class Redux_Extensions extends Redux_Class {
+
+        /**
+         * Redux_Extensions constructor.
+         *
+         * @param object $redux ReduxFramework object pointer.
+         *
+         * @throws ReflectionException Exception.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux );
+
+            $this->load();
+        }
+
+        /**
+         * Class load functions.
+         *
+         * @throws ReflectionException For fallback.
+         */
+        private function load() {
+            $core = $this->core();
+
+            $max = 1;
+
+            for ( $i = 1; $i <= $max; $i++ ) {
+                $path = Redux_Core::$dir . 'inc/extensions/';
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $path = apply_filters( 'redux/' . $core->args['opt_name'] . '/extensions/dir', $path );
+
+                /**
+                 * Action 'redux/extensions/before'
+                 *
+                 * @param object $this ReduxFramework
+                 */
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                do_action( 'redux/extensions/before', $core );
+
+                /**
+                 * Action 'redux/extensions/{opt_name}/before'
+                 *
+                 * @param object $this ReduxFramework
+                 */
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                do_action( "redux/extensions/{$core->args['opt_name']}/before", $core );
+
+                if ( isset( $core->old_opt_name ) ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( 'redux/extensions/' . $core->old_opt_name . '/before', $core );
+                }
+
+                require_once Redux_Core::$dir . 'inc/classes/class-redux-extension-abstract.php';
+
+                $path = untrailingslashit( $path );
+
+                Redux::set_extensions( $core->args['opt_name'], $path, true );
+
+                /**
+                 * Action 'redux/extensions/{opt_name}'
+                 *
+                 * @param object $this ReduxFramework
+                 */
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                do_action( "redux/extensions/{$core->args['opt_name']}", $core );
+
+                if ( isset( $core->old_opt_name ) ) {
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( 'redux/extensions/' . $core->old_opt_name, $core );
+                }
+            }
+        }
+    }
 }

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

Indentation +20 added lines, -20 removed lines

@@ -11,27 +11,27 @@
 
 if ( ! class_exists( 'Redux_Path', false ) ) {
 
-	/**
-	 * Class Redux_Path
-	 */
-	class Redux_Path {
+    /**
+     * Class Redux_Path
+     */
+    class Redux_Path {
 
-		/**
-		 * Class init
-		 */
-		public static function init() {}
+        /**
+         * Class init
+         */
+        public static function init() {}
 
-		/**
-		 * Gets Redux path.
-		 *
-		 * @param string $relative_path Self-explanatory.
-		 *
-		 * @return string
-		 */
-		public static function get_path( string $relative_path ): string {
-			return Redux_Core::$redux_path . $relative_path;
-		}
-	}
+        /**
+         * Gets Redux path.
+         *
+         * @param string $relative_path Self-explanatory.
+         *
+         * @return string
+         */
+        public static function get_path( string $relative_path ): string {
+            return Redux_Core::$redux_path . $relative_path;
+        }
+    }
 
-	Redux_Path::init();
+    Redux_Path::init();
 }

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

Indentation +76 added lines, -76 removed lines

@@ -12,100 +12,100 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Content', false ) ) {
 
-	/**
-	 * Main Redux_Content class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Content extends Redux_Field {
+    /**
+     * Main Redux_Content class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Content extends Redux_Field {
 
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'content' => '',
-				'class'   => '',
-				'mode'    => 'content',
-				'icon'    => '',
-				'style'   => 'normal',
-			);
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'content' => '',
+                'class'   => '',
+                'mode'    => 'content',
+                'icon'    => '',
+                'style'   => 'normal',
+            );
 
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
 
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			echo '</td></tr></table>';
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            echo '</td></tr></table>';
 
-			if ( 'content' === $this->field['mode'] ) {
-				echo '<div
+            if ( 'content' === $this->field['mode'] ) {
+                echo '<div
 						id="content-' . esc_attr( $this->field['id'] ) . '"
 						class="redux-field redux-field-borders ' . esc_attr( $this->field['class'] ) . ' redux-field-' . esc_attr( $this->field['mode'] ) . '"' .
-					'>';
+                    '>';
 
-				echo wp_kses_post( $this->field['content'] );
-			} elseif ( 'heading' === $this->field['mode'] ) {
-				$has_icon = isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ? 'hasIcon ' : '';
+                echo wp_kses_post( $this->field['content'] );
+            } elseif ( 'heading' === $this->field['mode'] ) {
+                $has_icon = isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ? 'hasIcon ' : '';
 
-				echo '<div
+                echo '<div
 						id="heading-' . esc_attr( $this->field['id'] ) . '"
 						class="redux-field redux-field-borders ' . esc_attr( $has_icon ) . esc_attr( $this->field['class'] ) . ' redux-field-' . esc_attr( $this->field['mode'] ) . '"' .
-					'>';
+                    '>';
 
-				if ( isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ) {
-					echo '<p class="redux-heading-icon"><i class="' . esc_attr( $this->field['icon'] ) . ' icon-large"></i></p>';
-				}
+                if ( isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ) {
+                    echo '<p class="redux-heading-icon"><i class="' . esc_attr( $this->field['icon'] ) . ' icon-large"></i></p>';
+                }
 
-				echo '<h2 class="redux-heading-text">' . wp_kses_post( $this->field['content'] ) . '</h2>';
-			} elseif ( 'subheading' === $this->field['mode'] ) {
-				echo '<div
+                echo '<h2 class="redux-heading-text">' . wp_kses_post( $this->field['content'] ) . '</h2>';
+            } elseif ( 'subheading' === $this->field['mode'] ) {
+                echo '<div
 						id="subheading-' . esc_attr( $this->field['id'] ) . '"
 						class="redux-field redux-field-borders ' . esc_attr( $this->field['class'] ) . ' redux-field-' . esc_attr( $this->field['mode'] ) . '"' .
-					'>';
+                    '>';
 
-				echo wp_kses_post( $this->field['content'] );
-			} elseif ( 'submessage' === $this->field['mode'] ) {
-				echo '<div
+                echo wp_kses_post( $this->field['content'] );
+            } elseif ( 'submessage' === $this->field['mode'] ) {
+                echo '<div
 						id="submessage-' . esc_attr( $this->field['id'] ) . '"
 						class="redux-field redux-field-no-borders redux-submessage-' . esc_attr( $this->field['style'] ) . ' ' . esc_attr( $this->field['class'] ) . ' redux-field-' . esc_attr( $this->field['mode'] ) . '"' .
-					'>';
+                    '>';
 
-				echo wp_kses_post( $this->field['content'] );
-			}
+                echo wp_kses_post( $this->field['content'] );
+            }
 
-			echo '</div>';
-			echo '<table class="form-table no-border" style="display:none;">';
-			echo '<tbody>';
-			echo '<tr style="border-bottom:0; display:none;">';
-			echo '<th style="padding-top:0;"></th>';
-			echo '<td style="padding-top:0;">';
-		}
+            echo '</div>';
+            echo '<table class="form-table no-border" style="display:none;">';
+            echo '<tbody>';
+            echo '<tr style="border-bottom:0; display:none;">';
+            echo '<th style="padding-top:0;"></th>';
+            echo '<td style="padding-top:0;">';
+        }
 
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-content',
-					Redux_Core::$url . 'inc/fields/content/redux-content.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-content',
+                    Redux_Core::$url . 'inc/fields/content/redux-content.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }

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

Indentation +268 added lines, -268 removed lines

@@ -12,133 +12,133 @@ 
 
 if ( ! class_exists( 'Redux_Dimensions', false ) ) {
 
-	/**
-	 * Class Redux_Dimensions
-	 */
-	class Redux_Dimensions extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			// No errors, please.
-			$defaults = array(
-				'width'          => true,
-				'height'         => true,
-				'units_extended' => false,
-				'units'          => 'px',
-				'mode'           => array(
-					'width'  => false,
-					'height' => false,
-				),
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			$defaults = array(
-				'width'  => '',
-				'height' => '',
-				'units'  => 'px',
-			);
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-
-			if ( isset( $this->value['unit'] ) ) {
-				$this->value['units'] = $this->value['unit'];
-			}
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			/*
+    /**
+     * Class Redux_Dimensions
+     */
+    class Redux_Dimensions extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            // No errors, please.
+            $defaults = array(
+                'width'          => true,
+                'height'         => true,
+                'units_extended' => false,
+                'units'          => 'px',
+                'mode'           => array(
+                    'width'  => false,
+                    'height' => false,
+                ),
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            $defaults = array(
+                'width'  => '',
+                'height' => '',
+                'units'  => 'px',
+            );
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+
+            if ( isset( $this->value['unit'] ) ) {
+                $this->value['units'] = $this->value['unit'];
+            }
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            /*
 			 * Acceptable values checks.  If the passed variable doesn't pass muster, we unset them
 			 * and reset them with default values to avoid errors.
 			 */
 
-			$arr_units = Redux_Helpers::$array_units;
+            $arr_units = Redux_Helpers::$array_units;
 
-			$unit_check   = $arr_units;
-			$unit_check[] = false;
+            $unit_check   = $arr_units;
+            $unit_check[] = false;
 
-			// If units field has a value but is not an acceptable value, unset the variable.
-			if ( isset( $this->field['units'] ) && ! Redux_Helpers::array_in_array( $this->field['units'], $unit_check ) ) {
-				unset( $this->field['units'] );
-			}
+            // If units field has a value but is not an acceptable value, unset the variable.
+            if ( isset( $this->field['units'] ) && ! Redux_Helpers::array_in_array( $this->field['units'], $unit_check ) ) {
+                unset( $this->field['units'] );
+            }
 
-			// If there is a default unit value  but is not an accepted value, unset the variable.
-			if ( isset( $this->value['units'] ) && ! Redux_Helpers::array_in_array( $this->value['units'], $unit_check ) ) {
-				unset( $this->value['units'] );
-			}
+            // If there is a default unit value  but is not an accepted value, unset the variable.
+            if ( isset( $this->value['units'] ) && ! Redux_Helpers::array_in_array( $this->value['units'], $unit_check ) ) {
+                unset( $this->value['units'] );
+            }
 
-			/*
+            /*
 			 * Since the unit field could be an array, string value or bool (to hide the unit field)
 			 * we need to separate our functions to avoid those nasty PHP index notices!
 			 */
 
-			// if field units have a value and ARE an array, then evaluate as needed.
-			if ( isset( $this->field['units'] ) && ! is_array( $this->field['units'] ) ) {
-
-				// If units fields has a value but units value does not then make units value the field value.
-				if ( isset( $this->field['units'] ) && ! isset( $this->value['units'] ) || false === $this->field['units'] ) {
-					$this->value['units'] = $this->field['units'];
-
-					// If unit field does NOT have a value and units value does NOT have a value, set both to blank (default?).
-				} elseif ( ! isset( $this->field['units'] ) && ! isset( $this->value['units'] ) ) {
-					$this->field['units'] = 'px';
-					$this->value['units'] = 'px';
-
-					// If unit field has NO value but units value does, then set unit field to value field.
-				} elseif ( ! isset( $this->field['units'] ) && isset( $this->value['units'] ) ) {
-					$this->field['units'] = $this->value['units'];
-
-					// if unit value is set and unit value doesn't equal unit field (coz who knows why)
-					// then set unit value to unit field.
-				} elseif ( isset( $this->value['units'] ) && $this->value['units'] !== $this->field['units'] ) {
-					$this->value['units'] = $this->field['units'];
-				}
-
-				// do stuff based on unit field NOT set as an array.
-				// phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-			} elseif ( isset( $this->field['units'] ) && is_array( $this->field['units'] ) ) {
-				// nothing to do here, but I'm leaving the construct just in case I have to debug this again.
-			}
-
-			echo '<fieldset id="' . esc_attr( $this->field['id'] ) . '-fieldset" class="redux-dimensions-container" data-id="' . esc_attr( $this->field['id'] ) . '">';
-
-			$this->select2_config['allowClear'] = false;
-
-			if ( isset( $this->field['select2'] ) ) {
-				$this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
-			} else {
-				$this->field['select2'] = $this->select2_config;
-			}
-
-			$this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
-
-			$select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
-
-			// This used to be unit field, but was giving the PHP index error when it was an array,
-			// so I changed it.
-			echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '-units" class="field-units" value="' . esc_attr( $this->value['units'] ) . '">';
-
-			/**
-			 * Width
-			 * */
-			if ( true === $this->field['width'] ) {
-				if ( ! empty( $this->value['width'] ) && false !== $this->value['units'] && strpos( $this->value['width'], strval( $this->value['units'] ) ) === false ) {
-					$this->value['width'] = filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
-					if ( false !== $this->field['units'] ) {
-						$this->value['width'] .= $this->value['units'];
-					}
-				}
-				echo '<div class="field-dimensions-input input-prepend">';
-				echo '<span class="add-on"><i class="el el-resize-horizontal icon-large"></i></span>';
-				echo '<input
+            // if field units have a value and ARE an array, then evaluate as needed.
+            if ( isset( $this->field['units'] ) && ! is_array( $this->field['units'] ) ) {
+
+                // If units fields has a value but units value does not then make units value the field value.
+                if ( isset( $this->field['units'] ) && ! isset( $this->value['units'] ) || false === $this->field['units'] ) {
+                    $this->value['units'] = $this->field['units'];
+
+                    // If unit field does NOT have a value and units value does NOT have a value, set both to blank (default?).
+                } elseif ( ! isset( $this->field['units'] ) && ! isset( $this->value['units'] ) ) {
+                    $this->field['units'] = 'px';
+                    $this->value['units'] = 'px';
+
+                    // If unit field has NO value but units value does, then set unit field to value field.
+                } elseif ( ! isset( $this->field['units'] ) && isset( $this->value['units'] ) ) {
+                    $this->field['units'] = $this->value['units'];
+
+                    // if unit value is set and unit value doesn't equal unit field (coz who knows why)
+                    // then set unit value to unit field.
+                } elseif ( isset( $this->value['units'] ) && $this->value['units'] !== $this->field['units'] ) {
+                    $this->value['units'] = $this->field['units'];
+                }
+
+                // do stuff based on unit field NOT set as an array.
+                // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+            } elseif ( isset( $this->field['units'] ) && is_array( $this->field['units'] ) ) {
+                // nothing to do here, but I'm leaving the construct just in case I have to debug this again.
+            }
+
+            echo '<fieldset id="' . esc_attr( $this->field['id'] ) . '-fieldset" class="redux-dimensions-container" data-id="' . esc_attr( $this->field['id'] ) . '">';
+
+            $this->select2_config['allowClear'] = false;
+
+            if ( isset( $this->field['select2'] ) ) {
+                $this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
+            } else {
+                $this->field['select2'] = $this->select2_config;
+            }
+
+            $this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
+
+            $select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
+
+            // This used to be unit field, but was giving the PHP index error when it was an array,
+            // so I changed it.
+            echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '-units" class="field-units" value="' . esc_attr( $this->value['units'] ) . '">';
+
+            /**
+             * Width
+             * */
+            if ( true === $this->field['width'] ) {
+                if ( ! empty( $this->value['width'] ) && false !== $this->value['units'] && strpos( $this->value['width'], strval( $this->value['units'] ) ) === false ) {
+                    $this->value['width'] = filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+                    if ( false !== $this->field['units'] ) {
+                        $this->value['width'] .= $this->value['units'];
+                    }
+                }
+                echo '<div class="field-dimensions-input input-prepend">';
+                echo '<span class="add-on"><i class="el el-resize-horizontal icon-large"></i></span>';
+                echo '<input
 						type="text"
 						id="' . esc_attr( $this->field['id'] ) . '-width"
 						class="redux-dimensions-input redux-dimensions-width mini ' . esc_attr( $this->field['class'] ) . '"
@@ -146,29 +146,29 @@ 
 						rel="' . esc_attr( $this->field['id'] ) . '-width-hidden"
 						value="' . esc_attr( filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) ) . '">';
 
-				echo '<input
+                echo '<input
 						data-id="' . esc_attr( $this->field['id'] ) . '"
 						type="hidden"
 						id="' . esc_attr( $this->field['id'] ) . '-width-hidden"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[width]"
 						value="' . esc_attr( $this->value['width'] ) . '">';
 
-				echo '</div>';
-			}
-
-			/**
-			 * Height
-			 * */
-			if ( true === $this->field['height'] ) {
-				if ( ! empty( $this->value['height'] ) && false !== $this->value['units'] && strpos( $this->value['height'], strval( $this->value['units'] ) ) === false ) {
-					$this->value['height'] = filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
-					if ( false !== $this->field['units'] ) {
-						$this->value['height'] .= $this->value['units'];
-					}
-				}
-				echo '<div class="field-dimensions-input input-prepend">';
-				echo '<span class="add-on"><i class="el el-resize-vertical icon-large"></i></span>';
-				echo '<input
+                echo '</div>';
+            }
+
+            /**
+             * Height
+             * */
+            if ( true === $this->field['height'] ) {
+                if ( ! empty( $this->value['height'] ) && false !== $this->value['units'] && strpos( $this->value['height'], strval( $this->value['units'] ) ) === false ) {
+                    $this->value['height'] = filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+                    if ( false !== $this->field['units'] ) {
+                        $this->value['height'] .= $this->value['units'];
+                    }
+                }
+                echo '<div class="field-dimensions-input input-prepend">';
+                echo '<span class="add-on"><i class="el el-resize-vertical icon-large"></i></span>';
+                echo '<input
 						type="text"
 						id="' . esc_attr( $this->field['id'] ) . '-height"
 						class="redux-dimensions-input redux-dimensions-height mini ' . esc_attr( $this->field['class'] ) . '"
@@ -176,156 +176,156 @@ 
 						rel="' . esc_attr( $this->field['id'] ) . '-height-hidden"
 						value="' . esc_attr( filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) ) . '">';
 
-				echo '<input
+                echo '<input
 						data-id="' . esc_attr( $this->field['id'] ) . '"
 						type="hidden"
 						id="' . esc_attr( $this->field['id'] ) . '-height-hidden"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[height]"
 						value="' . esc_attr( $this->value['height'] ) . '">';
-						echo '</div>';
-			}
-
-			/**
-			 * Units
-			 * */
-			// If units field is set and units field NOT false then fill out the options object and show it, otherwise it's hidden
-			// and the default units value will apply.
-			if ( isset( $this->field['units'] ) && false !== $this->field['units'] ) {
-				echo '<div
+                        echo '</div>';
+            }
+
+            /**
+             * Units
+             * */
+            // If units field is set and units field NOT false then fill out the options object and show it, otherwise it's hidden
+            // and the default units value will apply.
+            if ( isset( $this->field['units'] ) && false !== $this->field['units'] ) {
+                echo '<div
 						class="select_wrapper dimensions-units"
 						original-title="' . esc_html__( 'Units', 'redux-framework' ) . '">';
 
-				echo '<select
+                echo '<select
 						data-id="' . esc_attr( $this->field['id'] ) . '"
 						data-placeholder="' . esc_html__( 'Units', 'redux-framework' ) . '"
 						class="redux-dimensions redux-dimensions-units select ' . esc_attr( $this->field['class'] ) . '"
 						original-title="' . esc_html__( 'Units', 'redux-framework' ) . '"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[units]"' . esc_attr( $select2_data ) . '>';
 
-				// Extended units, show 'em all.
-				if ( $this->field['units_extended'] ) {
-					$test_units = $arr_units;
-				} else {
-					$test_units = array( 'px', 'em', 'rem', '%' );
-				}
-
-				if ( '' !== $this->field['units'] && is_array( $this->field['units'] ) ) {
-					$test_units = $this->field['units'];
-				}
-
-				if ( in_array( $this->field['units'], $test_units, true ) ) {
-					echo '<option value="' . esc_attr( $this->field['units'] ) . '" selected="selected">' . esc_attr( $this->field['units'] ) . '</option>';
-				} else {
-					foreach ( $test_units as $a_unit ) {
-						echo '<option value="' . esc_attr( $a_unit ) . '" ' . selected( $this->value['units'], $a_unit, false ) . '>' . esc_attr( $a_unit ) . '</option>';
-					}
-				}
-				echo '</select></div>';
-			}
-
-			echo '</fieldset>';
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function enqueue() {
-			wp_enqueue_style( 'select2-css' );
-
-			wp_enqueue_script(
-				'redux-field-dimensions',
-				Redux_Core::$url . 'inc/fields/dimensions/redux-dimensions' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'select2-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-dimensions',
-					Redux_Core::$url . 'inc/fields/dimensions/redux-dimensions.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Compile CSS styles for output.
-		 *
-		 * @param string $data CSS data.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			$style = '';
-
-			// If field units has a value and IS an array, then evaluate as needed.
-			if ( isset( $this->field['units'] ) && ! is_array( $this->field['units'] ) ) {
-
-				// If units fields has a value but units value does not then make units value the field value.
-				if ( isset( $this->field['units'] ) && ! isset( $this->value['units'] ) || false === $this->field['units'] ) {
-					$this->value['units'] = $this->field['units'];
-
-					// If units field does NOT have a value and units value does NOT have a value, set both to blank (default?).
-				} elseif ( ! isset( $this->field['units'] ) && ! isset( $this->value['units'] ) ) {
-					$this->field['units'] = 'px';
-					$this->value['units'] = 'px';
-
-					// If units field has NO value but units value does, then set unit field to value field.
-				} elseif ( ! isset( $this->field['units'] ) && isset( $this->value['units'] ) ) {
-					$this->field['units'] = $this->value['units'];
-
-					// If unit value is set and unit value doesn't equal unit field (coz who knows why)
-					// then set unit value to unit field.
-				} elseif ( isset( $this->value['units'] ) && $this->field['units'] !== $this->value['units'] ) {
-					$this->value['units'] = $this->field['units'];
-				}
-
-				// Do stuff based on unit field NOT set as an array.
-				// phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-			} elseif ( isset( $this->field['units'] ) && is_array( $this->field['units'] ) ) {
-				// nothing to do here, but I'm leaving the construct just in case I have to debug this again.
-			}
-
-			$units = $this->value['units'] ?? '';
-
-			if ( ! is_array( $this->field['mode'] ) ) {
-				$height = isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'height';
-				$width  = isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'width';
-			} else {
-				$height = false !== $this->field['mode']['height'] ? $this->field['mode']['height'] : 'height';
-				$width  = false !== $this->field['mode']['width'] ? $this->field['mode']['width'] : 'width';
-			}
-
-			$clean_value = array(
-				$height => isset( $this->value['height'] ) ? filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : '',
-				$width  => isset( $this->value['width'] ) ? filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : '',
-			);
-
-			foreach ( $clean_value as $key => $value ) {
-				// Output if it's a numeric entry.
-				if ( isset( $value ) && is_numeric( $value ) ) {
-					$style .= $key . ':' . $value . $units . ';';
-				}
-			}
-
-			return $style;
-		}
-
-		/**
-		 * 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.
-		}
-	}
+                // Extended units, show 'em all.
+                if ( $this->field['units_extended'] ) {
+                    $test_units = $arr_units;
+                } else {
+                    $test_units = array( 'px', 'em', 'rem', '%' );
+                }
+
+                if ( '' !== $this->field['units'] && is_array( $this->field['units'] ) ) {
+                    $test_units = $this->field['units'];
+                }
+
+                if ( in_array( $this->field['units'], $test_units, true ) ) {
+                    echo '<option value="' . esc_attr( $this->field['units'] ) . '" selected="selected">' . esc_attr( $this->field['units'] ) . '</option>';
+                } else {
+                    foreach ( $test_units as $a_unit ) {
+                        echo '<option value="' . esc_attr( $a_unit ) . '" ' . selected( $this->value['units'], $a_unit, false ) . '>' . esc_attr( $a_unit ) . '</option>';
+                    }
+                }
+                echo '</select></div>';
+            }
+
+            echo '</fieldset>';
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function enqueue() {
+            wp_enqueue_style( 'select2-css' );
+
+            wp_enqueue_script(
+                'redux-field-dimensions',
+                Redux_Core::$url . 'inc/fields/dimensions/redux-dimensions' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'select2-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-dimensions',
+                    Redux_Core::$url . 'inc/fields/dimensions/redux-dimensions.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Compile CSS styles for output.
+         *
+         * @param string $data CSS data.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            $style = '';
+
+            // If field units has a value and IS an array, then evaluate as needed.
+            if ( isset( $this->field['units'] ) && ! is_array( $this->field['units'] ) ) {
+
+                // If units fields has a value but units value does not then make units value the field value.
+                if ( isset( $this->field['units'] ) && ! isset( $this->value['units'] ) || false === $this->field['units'] ) {
+                    $this->value['units'] = $this->field['units'];
+
+                    // If units field does NOT have a value and units value does NOT have a value, set both to blank (default?).
+                } elseif ( ! isset( $this->field['units'] ) && ! isset( $this->value['units'] ) ) {
+                    $this->field['units'] = 'px';
+                    $this->value['units'] = 'px';
+
+                    // If units field has NO value but units value does, then set unit field to value field.
+                } elseif ( ! isset( $this->field['units'] ) && isset( $this->value['units'] ) ) {
+                    $this->field['units'] = $this->value['units'];
+
+                    // If unit value is set and unit value doesn't equal unit field (coz who knows why)
+                    // then set unit value to unit field.
+                } elseif ( isset( $this->value['units'] ) && $this->field['units'] !== $this->value['units'] ) {
+                    $this->value['units'] = $this->field['units'];
+                }
+
+                // Do stuff based on unit field NOT set as an array.
+                // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+            } elseif ( isset( $this->field['units'] ) && is_array( $this->field['units'] ) ) {
+                // nothing to do here, but I'm leaving the construct just in case I have to debug this again.
+            }
+
+            $units = $this->value['units'] ?? '';
+
+            if ( ! is_array( $this->field['mode'] ) ) {
+                $height = isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'height';
+                $width  = isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'width';
+            } else {
+                $height = false !== $this->field['mode']['height'] ? $this->field['mode']['height'] : 'height';
+                $width  = false !== $this->field['mode']['width'] ? $this->field['mode']['width'] : 'width';
+            }
+
+            $clean_value = array(
+                $height => isset( $this->value['height'] ) ? filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : '',
+                $width  => isset( $this->value['width'] ) ? filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : '',
+            );
+
+            foreach ( $clean_value as $key => $value ) {
+                // Output if it's a numeric entry.
+                if ( isset( $value ) && is_numeric( $value ) ) {
+                    $style .= $key . ':' . $value . $units . ';';
+                }
+            }
+
+            return $style;
+        }
+
+        /**
+         * 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_Dimensions', 'ReduxFramework_Dimensions' );

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

Indentation +341 added lines, -341 removed lines

@@ -12,370 +12,370 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Border', false ) ) {
 
-	/**
-	 * Class Redux_Border
-	 */
-	class Redux_Border extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			// No errors, please.
-			$defaults = array(
-				'top'    => true,
-				'bottom' => true,
-				'all'    => true,
-				'style'  => true,
-				'color'  => true,
-				'left'   => true,
-				'right'  => true,
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			$defaults = array(
-				'top'    => '',
-				'right'  => '',
-				'bottom' => '',
-				'left'   => '',
-				'color'  => '',
-				'style'  => '',
-			);
-
-			$this->value = wp_parse_args( $this->value, $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() {
-			$value = array(
-				'top'    => isset( $this->value['border-top'] ) ? filter_var( $this->value['border-top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'right'  => isset( $this->value['border-right'] ) ? filter_var( $this->value['border-right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'bottom' => isset( $this->value['border-bottom'] ) ? filter_var( $this->value['border-bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'left'   => isset( $this->value['border-left'] ) ? filter_var( $this->value['border-left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'color'  => $this->value['border-color'] ?? $this->value['color'],
-				'style'  => $this->value['border-style'] ?? $this->value['style'],
-			);
-
-			if ( ( isset( $this->value['width'] ) || isset( $this->value['border-width'] ) ) ) {
-				if ( isset( $this->value['border-width'] ) && ! empty( $this->value['border-width'] ) ) {
-					$this->value['width'] = $this->value['border-width'];
-				}
-
-				$this->value['width'] = $this->strip_alphas( $this->value['width'] );
-
-				$value['top']    = $this->value['width'];
-				$value['right']  = $this->value['width'];
-				$value['bottom'] = $this->value['width'];
-				$value['left']   = $this->value['width'];
-			}
-
-			$this->value = $value;
-
-			$defaults = array(
-				'top'    => '',
-				'right'  => '',
-				'bottom' => '',
-				'left'   => '',
-			);
-
-			$this->check_for_all();
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-
-			$this->select2_config['allowClear'] = false;
-
-			if ( isset( $this->field['select2'] ) ) {
-				$this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
-			} else {
-				$this->field['select2'] = $this->select2_config;
-			}
-
-			$this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
-
-			$select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
-
-			echo '<input type="hidden" class="field-units" value="px">';
-
-			if ( isset( $this->field['all'] ) && true === $this->field['all'] ) {
-				echo '<div class="field-border-input input-prepend"><span class="add-on"><i class="el el-fullscreen icon-large"></i></span><input type="text" class="redux-border-all redux-border-input mini ' . esc_attr( $this->field['class'] ) . '" placeholder="' . esc_html__( 'All', 'redux-framework' ) . '" rel="' . esc_attr( $this->field['id'] ) . '-all" value="' . esc_attr( $this->value['top'] ) . '"></div>';
-			}
-
-			echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-top-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-top]" value="' . ( isset( $this->value['top'] ) && '' !== $this->value['top'] ? esc_attr( $this->value['top'] ) . 'px' : '' ) . '">';
-			echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-right-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-right]" value="' . ( isset( $this->value['right'] ) && '' !== $this->value['right'] ? esc_attr( $this->value['right'] ) . 'px' : '' ) . '">';
-			echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-bottom-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-bottom]" value="' . ( isset( $this->value['bottom'] ) && '' !== $this->value['bottom'] ? esc_attr( $this->value['bottom'] ) . 'px' : '' ) . '">';
-			echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-left-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-left]" value="' . ( isset( $this->value['left'] ) && '' !== $this->value['left'] ? esc_attr( $this->value['left'] ) . 'px' : '' ) . '">';
-
-			if ( ! isset( $this->field['all'] ) || true !== $this->field['all'] ) {
-				/**
-				 * Top
-				 * */
-				if ( true === $this->field['top'] ) {
-					echo '<div class="field-border-input input-prepend">
+    /**
+     * Class Redux_Border
+     */
+    class Redux_Border extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            // No errors, please.
+            $defaults = array(
+                'top'    => true,
+                'bottom' => true,
+                'all'    => true,
+                'style'  => true,
+                'color'  => true,
+                'left'   => true,
+                'right'  => true,
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            $defaults = array(
+                'top'    => '',
+                'right'  => '',
+                'bottom' => '',
+                'left'   => '',
+                'color'  => '',
+                'style'  => '',
+            );
+
+            $this->value = wp_parse_args( $this->value, $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() {
+            $value = array(
+                'top'    => isset( $this->value['border-top'] ) ? filter_var( $this->value['border-top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'right'  => isset( $this->value['border-right'] ) ? filter_var( $this->value['border-right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'bottom' => isset( $this->value['border-bottom'] ) ? filter_var( $this->value['border-bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'left'   => isset( $this->value['border-left'] ) ? filter_var( $this->value['border-left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'color'  => $this->value['border-color'] ?? $this->value['color'],
+                'style'  => $this->value['border-style'] ?? $this->value['style'],
+            );
+
+            if ( ( isset( $this->value['width'] ) || isset( $this->value['border-width'] ) ) ) {
+                if ( isset( $this->value['border-width'] ) && ! empty( $this->value['border-width'] ) ) {
+                    $this->value['width'] = $this->value['border-width'];
+                }
+
+                $this->value['width'] = $this->strip_alphas( $this->value['width'] );
+
+                $value['top']    = $this->value['width'];
+                $value['right']  = $this->value['width'];
+                $value['bottom'] = $this->value['width'];
+                $value['left']   = $this->value['width'];
+            }
+
+            $this->value = $value;
+
+            $defaults = array(
+                'top'    => '',
+                'right'  => '',
+                'bottom' => '',
+                'left'   => '',
+            );
+
+            $this->check_for_all();
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+
+            $this->select2_config['allowClear'] = false;
+
+            if ( isset( $this->field['select2'] ) ) {
+                $this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
+            } else {
+                $this->field['select2'] = $this->select2_config;
+            }
+
+            $this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
+
+            $select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
+
+            echo '<input type="hidden" class="field-units" value="px">';
+
+            if ( isset( $this->field['all'] ) && true === $this->field['all'] ) {
+                echo '<div class="field-border-input input-prepend"><span class="add-on"><i class="el el-fullscreen icon-large"></i></span><input type="text" class="redux-border-all redux-border-input mini ' . esc_attr( $this->field['class'] ) . '" placeholder="' . esc_html__( 'All', 'redux-framework' ) . '" rel="' . esc_attr( $this->field['id'] ) . '-all" value="' . esc_attr( $this->value['top'] ) . '"></div>';
+            }
+
+            echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-top-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-top]" value="' . ( isset( $this->value['top'] ) && '' !== $this->value['top'] ? esc_attr( $this->value['top'] ) . 'px' : '' ) . '">';
+            echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-right-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-right]" value="' . ( isset( $this->value['right'] ) && '' !== $this->value['right'] ? esc_attr( $this->value['right'] ) . 'px' : '' ) . '">';
+            echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-bottom-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-bottom]" value="' . ( isset( $this->value['bottom'] ) && '' !== $this->value['bottom'] ? esc_attr( $this->value['bottom'] ) . 'px' : '' ) . '">';
+            echo '<input type="hidden" class="redux-border-value" id="' . esc_attr( $this->field['id'] ) . '-left-hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-left]" value="' . ( isset( $this->value['left'] ) && '' !== $this->value['left'] ? esc_attr( $this->value['left'] ) . 'px' : '' ) . '">';
+
+            if ( ! isset( $this->field['all'] ) || true !== $this->field['all'] ) {
+                /**
+                 * Top
+                 * */
+                if ( true === $this->field['top'] ) {
+                    echo '<div class="field-border-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-up icon-large"></i>
                             </span>
                             <input type="text" id="' . esc_attr( $this->field['id'] ) . '-top" class="redux-border-top redux-border-input mini ' . esc_attr( $this->field['class'] ) . '" placeholder="' . esc_html__( 'Top', 'redux-framework' ) . '" rel="' . esc_attr( $this->field['id'] ) . '-top-hidden" value="' . esc_attr( $this->value['top'] ) . '">
                          </div>';
-				}
+                }
 
-				/**
-				 * Right
-				 * */
-				if ( true === $this->field['right'] ) {
-					echo '<div class="field-border-input input-prepend">
+                /**
+                 * Right
+                 * */
+                if ( true === $this->field['right'] ) {
+                    echo '<div class="field-border-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-right icon-large"></i>
                             </span>
                             <input type="text" id="' . esc_attr( $this->field['id'] ) . '-right" class="redux-border-right redux-border-input mini ' . esc_attr( $this->field['class'] ) . '" placeholder="' . esc_html__( 'Right', 'redux-framework' ) . '" rel="' . esc_attr( $this->field['id'] ) . '-right-hidden" value="' . esc_attr( $this->value['right'] ) . '">
                         </div>';
-				}
+                }
 
-				/**
-				 * Bottom
-				 * */
-				if ( true === $this->field['bottom'] ) {
-					echo '<div class="field-border-input input-prepend">
+                /**
+                 * Bottom
+                 * */
+                if ( true === $this->field['bottom'] ) {
+                    echo '<div class="field-border-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-down icon-large"></i>
                             </span>
                             <input type="text" id="' . esc_attr( $this->field['id'] ) . '-bottom" class="redux-border-bottom redux-border-input mini ' . esc_attr( $this->field['class'] ) . '" placeholder="' . esc_html__( 'Bottom', 'redux-framework' ) . '" rel="' . esc_attr( $this->field['id'] ) . '-bottom-hidden" value="' . esc_attr( $this->value['bottom'] ) . '">
                         </div>';
-				}
+                }
 
-				/**
-				 * Left
-				 * */
-				if ( true === $this->field['left'] ) {
-					echo '<div class="field-border-input input-prepend">
+                /**
+                 * Left
+                 * */
+                if ( true === $this->field['left'] ) {
+                    echo '<div class="field-border-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-left icon-large"></i>
                             </span>
                             <input type="text" id="' . esc_attr( $this->field['id'] ) . '-left" class="redux-border-left redux-border-input mini ' . esc_attr( $this->field['class'] ) . '" placeholder="' . esc_html__( 'Left', 'redux-framework' ) . '" rel="' . esc_attr( $this->field['id'] ) . '-left-hidden" value="' . esc_attr( $this->value['left'] ) . '">
                         </div>';
-				}
-			}
-
-			/**
-			 * Border-style
-			 * */
-			if ( false !== $this->field['style'] ) {
-				$options = array(
-					'solid'  => esc_html__( 'Solid', 'redux-framework' ),
-					'dashed' => esc_html__( 'Dashed', 'redux-framework' ),
-					'dotted' => esc_html__( 'Dotted', 'redux-framework' ),
-					'double' => esc_html__( 'Double', 'redux-framework' ),
-					'none'   => esc_html__( 'None', 'redux-framework' ),
-				);
-
-				echo '<select data-placeholder="' . esc_html__( 'Border style', 'redux-framework' ) . '" id="' . esc_attr( $this->field['id'] ) . '[border-style]" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-style]" class="tips redux-border-style ' . esc_attr( $this->field['class'] ) . '" rows="6" data-id="' . esc_attr( $this->field['id'] ) . '"' . esc_attr( $select2_data ) . '>';
-
-				foreach ( $options as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $value['style'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			} else {
-				echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '[border-style]" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-style]" value="' . esc_attr( $this->value['style'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '">';
-			}
-
-			/**
-			 * Color
-			 * */
-			if ( false !== $this->field['color'] ) {
-				$default = $this->field['default']['border-color'] ?? '';
-
-				if ( empty( $default ) ) {
-					$default = ( isset( $this->field['default']['color'] ) ) ? $this->field['default']['color'] : '#ffffff';
-				}
-
-				echo '<input ';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-color]"';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-border"';
-				echo 'class="color-picker redux-border-color redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'value="' . esc_attr( $this->value['color'] ) . '"';
-				echo 'data-default-color="' . esc_attr( $default ) . '"';
-				echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => '',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-			} else {
-				echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '[border-color]" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-color]" value="' . esc_attr( $this->value['color'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '">';
-			}
-		}
-
-
-		/**
-		 * Do enqueue for each field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			if ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
-				if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
-					wp_enqueue_script( 'redux-wp-color-picker-alpha' );
-				}
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function enqueue() {
-			$min = Redux_Functions::is_min();
-
-			if ( ! wp_style_is( 'select2-css' ) ) {
-				wp_enqueue_style( 'select2-css' );
-			}
-
-			if ( ! wp_style_is( 'wp-color-picker' ) ) {
-				wp_enqueue_style( 'wp-color-picker' );
-			}
-
-			$dep_array = array( 'jquery', 'select2-js', 'wp-color-picker', 'redux-js' );
-
-			wp_enqueue_script(
-				'redux-field-border',
-				Redux_Core::$url . 'inc/fields/border/redux-border' . $min . '.js',
-				$dep_array,
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				if ( ! wp_style_is( 'redux-color-picker' ) ) {
-					wp_enqueue_style( 'redux-color-picker' );
-				}
-
-				wp_enqueue_style(
-					'redux-field-border',
-					Redux_Core::$url . 'inc/fields/border/redux-border.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Check to make sure all is properly set.
-		 *
-		 * @return void
-		 */
-		private function check_for_all() {
-			if ( true === $this->field['all'] ) {
-				if ( 1 !== $this->field['top'] || 1 !== $this->field['bottom'] || 1 !== $this->field['left'] || 1 !== $this->field['right'] ) {
-					$this->field['all'] = false;
-				}
-			}
-		}
-
-		/**
-		 * Output CSS styling.
-		 *
-		 * @param mixed $data Value array.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			$style = '';
-
-			$this->check_for_all();
-
-			if ( isset( $this->field['all'] ) && true === $this->field['all'] ) {
-				$border_width = $data['border-width'] ?? '0px';
-				$val          = $data['border-top'] ?? $border_width;
-
-				$data['border-top']    = $val;
-				$data['border-bottom'] = $val;
-				$data['border-left']   = $val;
-				$data['border-right']  = $val;
-			}
-
-			$clean_value = array(
-				'color' => ! empty( $data['border-color'] ) ? $data['border-color'] : '',
-				'style' => ! empty( $data['border-style'] ) ? $data['border-style'] : '',
-			);
-
-			$border_width = '';
-			if ( isset( $data['border-width'] ) ) {
-				$border_width = $data['border-width'];
-			}
-
-			$this->field['top']    = $this->field['top'] ?? true;
-			$this->field['bottom'] = $this->field['bottom'] ?? true;
-			$this->field['left']   = $this->field['left'] ?? true;
-			$this->field['right']  = $this->field['right'] ?? true;
-
-			if ( true === $this->field['top'] ) {
-				$clean_value['top'] = ! empty( $data['border-top'] ) ? $data['border-top'] : $border_width;
-			}
-
-			if ( true === $this->field['bottom'] ) {
-				$clean_value['bottom'] = ! empty( $data['border-bottom'] ) ? $data['border-bottom'] : $border_width;
-			}
-
-			if ( true === $this->field['left'] ) {
-				$clean_value['left'] = ! empty( $data['border-left'] ) ? $data['border-left'] : $border_width;
-			}
-
-			if ( true === $this->field['right'] ) {
-				$clean_value['right'] = ! empty( $data['border-right'] ) ? $data['border-right'] : $border_width;
-			}
-
-			// absolute, padding, margin.
-			if ( ! isset( $this->field['all'] ) || true !== $this->field['all'] ) {
-				foreach ( $clean_value as $key => $value ) {
-					if ( 'color' === $key || 'style' === $key ) {
-						continue;
-					}
-					if ( ! empty( $value ) ) {
-						$style .= 'border-' . $key . ':' . $value . ' ' . $clean_value['style'] . ' ' . $clean_value['color'] . ';';
-					}
-				}
-			} elseif ( ! empty( $clean_value['top'] ) ) {
-				$style .= 'border:' . $clean_value['top'] . ' ' . $clean_value['style'] . ' ' . $clean_value['color'] . ';';
-			}
-
-			return $style;
-		}
-
-		/**
-		 * Strip alpha chars.
-		 *
-		 * @param string $s Criteria.
-		 *
-		 * @return null|string|string[]
-		 */
-		private function strip_alphas( string $s ) {
-			// Regex is our friend.  THERE ARE FOUR LIGHTS!!
-			return preg_replace( '/[^\d.-]/', '', $s );
-		}
-
-		/**
-		 * 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.
-		}
-	}
+                }
+            }
+
+            /**
+             * Border-style
+             * */
+            if ( false !== $this->field['style'] ) {
+                $options = array(
+                    'solid'  => esc_html__( 'Solid', 'redux-framework' ),
+                    'dashed' => esc_html__( 'Dashed', 'redux-framework' ),
+                    'dotted' => esc_html__( 'Dotted', 'redux-framework' ),
+                    'double' => esc_html__( 'Double', 'redux-framework' ),
+                    'none'   => esc_html__( 'None', 'redux-framework' ),
+                );
+
+                echo '<select data-placeholder="' . esc_html__( 'Border style', 'redux-framework' ) . '" id="' . esc_attr( $this->field['id'] ) . '[border-style]" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-style]" class="tips redux-border-style ' . esc_attr( $this->field['class'] ) . '" rows="6" data-id="' . esc_attr( $this->field['id'] ) . '"' . esc_attr( $select2_data ) . '>';
+
+                foreach ( $options as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $value['style'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            } else {
+                echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '[border-style]" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-style]" value="' . esc_attr( $this->value['style'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '">';
+            }
+
+            /**
+             * Color
+             * */
+            if ( false !== $this->field['color'] ) {
+                $default = $this->field['default']['border-color'] ?? '';
+
+                if ( empty( $default ) ) {
+                    $default = ( isset( $this->field['default']['color'] ) ) ? $this->field['default']['color'] : '#ffffff';
+                }
+
+                echo '<input ';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-color]"';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-border"';
+                echo 'class="color-picker redux-border-color redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'value="' . esc_attr( $this->value['color'] ) . '"';
+                echo 'data-default-color="' . esc_attr( $default ) . '"';
+                echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => '',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+            } else {
+                echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '[border-color]" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[border-color]" value="' . esc_attr( $this->value['color'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '">';
+            }
+        }
+
+
+        /**
+         * Do enqueue for each field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            if ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
+                if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
+                    wp_enqueue_script( 'redux-wp-color-picker-alpha' );
+                }
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function enqueue() {
+            $min = Redux_Functions::is_min();
+
+            if ( ! wp_style_is( 'select2-css' ) ) {
+                wp_enqueue_style( 'select2-css' );
+            }
+
+            if ( ! wp_style_is( 'wp-color-picker' ) ) {
+                wp_enqueue_style( 'wp-color-picker' );
+            }
+
+            $dep_array = array( 'jquery', 'select2-js', 'wp-color-picker', 'redux-js' );
+
+            wp_enqueue_script(
+                'redux-field-border',
+                Redux_Core::$url . 'inc/fields/border/redux-border' . $min . '.js',
+                $dep_array,
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                if ( ! wp_style_is( 'redux-color-picker' ) ) {
+                    wp_enqueue_style( 'redux-color-picker' );
+                }
+
+                wp_enqueue_style(
+                    'redux-field-border',
+                    Redux_Core::$url . 'inc/fields/border/redux-border.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Check to make sure all is properly set.
+         *
+         * @return void
+         */
+        private function check_for_all() {
+            if ( true === $this->field['all'] ) {
+                if ( 1 !== $this->field['top'] || 1 !== $this->field['bottom'] || 1 !== $this->field['left'] || 1 !== $this->field['right'] ) {
+                    $this->field['all'] = false;
+                }
+            }
+        }
+
+        /**
+         * Output CSS styling.
+         *
+         * @param mixed $data Value array.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            $style = '';
+
+            $this->check_for_all();
+
+            if ( isset( $this->field['all'] ) && true === $this->field['all'] ) {
+                $border_width = $data['border-width'] ?? '0px';
+                $val          = $data['border-top'] ?? $border_width;
+
+                $data['border-top']    = $val;
+                $data['border-bottom'] = $val;
+                $data['border-left']   = $val;
+                $data['border-right']  = $val;
+            }
+
+            $clean_value = array(
+                'color' => ! empty( $data['border-color'] ) ? $data['border-color'] : '',
+                'style' => ! empty( $data['border-style'] ) ? $data['border-style'] : '',
+            );
+
+            $border_width = '';
+            if ( isset( $data['border-width'] ) ) {
+                $border_width = $data['border-width'];
+            }
+
+            $this->field['top']    = $this->field['top'] ?? true;
+            $this->field['bottom'] = $this->field['bottom'] ?? true;
+            $this->field['left']   = $this->field['left'] ?? true;
+            $this->field['right']  = $this->field['right'] ?? true;
+
+            if ( true === $this->field['top'] ) {
+                $clean_value['top'] = ! empty( $data['border-top'] ) ? $data['border-top'] : $border_width;
+            }
+
+            if ( true === $this->field['bottom'] ) {
+                $clean_value['bottom'] = ! empty( $data['border-bottom'] ) ? $data['border-bottom'] : $border_width;
+            }
+
+            if ( true === $this->field['left'] ) {
+                $clean_value['left'] = ! empty( $data['border-left'] ) ? $data['border-left'] : $border_width;
+            }
+
+            if ( true === $this->field['right'] ) {
+                $clean_value['right'] = ! empty( $data['border-right'] ) ? $data['border-right'] : $border_width;
+            }
+
+            // absolute, padding, margin.
+            if ( ! isset( $this->field['all'] ) || true !== $this->field['all'] ) {
+                foreach ( $clean_value as $key => $value ) {
+                    if ( 'color' === $key || 'style' === $key ) {
+                        continue;
+                    }
+                    if ( ! empty( $value ) ) {
+                        $style .= 'border-' . $key . ':' . $value . ' ' . $clean_value['style'] . ' ' . $clean_value['color'] . ';';
+                    }
+                }
+            } elseif ( ! empty( $clean_value['top'] ) ) {
+                $style .= 'border:' . $clean_value['top'] . ' ' . $clean_value['style'] . ' ' . $clean_value['color'] . ';';
+            }
+
+            return $style;
+        }
+
+        /**
+         * Strip alpha chars.
+         *
+         * @param string $s Criteria.
+         *
+         * @return null|string|string[]
+         */
+        private function strip_alphas( string $s ) {
+            // Regex is our friend.  THERE ARE FOUR LIGHTS!!
+            return preg_replace( '/[^\d.-]/', '', $s );
+        }
+
+        /**
+         * 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_Border', 'ReduxFramework_Border' );