reduxframework / redux-framework

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

Spacing +53 added lines, -53 removed lines

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

Indentation +561 added lines, -561 removed lines

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

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

Spacing +21 added lines, -21 removed lines

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

Indentation +766 added lines, -766 removed lines

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

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

Spacing +82 added lines, -82 removed lines

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

Indentation +1101 added lines, -1101 removed lines

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

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

Spacing +117 added lines, -117 removed lines

@@ -316,7 +316,7 @@ 
 								$box['page_template'] = array( $box['page_template'] );
 							}
 
-							$this->wp_links[ $box_id ]['page_template'] = isset( $this->wp_links[ $box_id ]['page_template'] ) ? wp_parse_args( $this->wp_links[ $box_id ]['page_template'], $box['page_template'] ) : $box['page_template'];
+							$this->wp_links[$box_id]['page_template'] = isset( $this->wp_links[$box_id]['page_template'] ) ? wp_parse_args( $this->wp_links[$box_id]['page_template'], $box['page_template'] ) : $box['page_template'];
 						}
 
 						if ( isset( $box['post_format'] ) && ( in_array( $this->post_type, $this->post_types, true ) || '' === $this->post_type || false === $this->post_type ) ) {
@@ -324,10 +324,10 @@ 
 								$box['post_format'] = array( $box['post_format'] );
 							}
 
-							$this->wp_links[ $box_id ]['post_format'] = isset( $this->wp_links[ $box_id ]['post_format'] ) ? wp_parse_args( $this->wp_links[ $box_id ]['post_format'], $box['post_format'] ) : $box['post_format'];
+							$this->wp_links[$box_id]['post_format'] = isset( $this->wp_links[$box_id]['post_format'] ) ? wp_parse_args( $this->wp_links[$box_id]['post_format'], $box['post_format'] ) : $box['post_format'];
 						}
 
-						$this->meta[ $this->post_id ] = $this->get_meta( $this->post_id );
+						$this->meta[$this->post_id] = $this->get_meta( $this->post_id );
 
 						foreach ( $box['sections'] as $sk => $section ) {
 							if ( ! empty( $section['fields'] ) ) {
@@ -335,7 +335,7 @@ 
 									if ( ! isset( $field['class'] ) ) {
 										$field['class'] = '';
 
-										$this->boxes[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
+										$this->boxes[$bk]['sections'][$sk]['fields'][$fk] = $field;
 									}
 
 									if ( $add_field || ( ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) || ( ! is_admin() ) ) ) {
@@ -344,43 +344,43 @@ 
 										}
 
 										if ( isset( $field['default'] ) ) {
-											$this->options_defaults[ $field['id'] ] = $field['default'];
+											$this->options_defaults[$field['id']] = $field['default'];
 										} else {
-											$this->options_defaults[ $field['id'] ] = $this->field_default( $field );
+											$this->options_defaults[$field['id']] = $this->field_default( $field );
 										}
 
 										foreach ( $box['post_types'] as $type ) {
-											$this->post_type_fields[ $type ][ $field['id'] ] = 1;
+											$this->post_type_fields[$type][$field['id']] = 1;
 
 											if ( 'repeater' === $field['type'] ) {
 												foreach ( $field['fields'] as $val ) {
-													$this->post_type_fields[ $type ][ $val['id'] ] = 1;
+													$this->post_type_fields[$type][$val['id']] = 1;
 												}
 											}
 										}
 
 										if ( ! empty( $field['output'] ) ) {
-											$this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
+											$this->output[$field['id']] = isset( $this->output[$field['id']] ) ? array_merge( $field['output'], $this->output[$field['id']] ) : $field['output'];
 										}
 
 										// Detect what field types are being used.
-										if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
-											$this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
+										if ( ! isset( $this->parent->fields[$field['type']][$field['id']] ) ) {
+											$this->parent->fields[$field['type']][$field['id']] = 1;
 										} else {
-											$this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
+											$this->parent->fields[$field['type']] = array( $field['id'] => 1 );
 										}
 
-										if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
-											$this->to_replace[ $field['id'] ] = $field;
+										if ( isset( $this->options_defaults[$field['id']] ) ) {
+											$this->to_replace[$field['id']] = $field;
 										}
 									}
 
-									if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
-										$this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
+									if ( ! isset( $this->parent->options[$field['id']] ) ) {
+										$this->parent->sections[( count( $this->parent->sections ) - 1 )]['fields'][] = $field;
 									}
 
-									if ( ! isset( $this->meta[ $this->post_id ][ $field['id'] ] ) ) {
-										$this->meta[ $this->post_id ][ $field['id'] ] = $this->options_defaults[ $field['id'] ];
+									if ( ! isset( $this->meta[$this->post_id][$field['id']] ) ) {
+										$this->meta[$this->post_id][$field['id']] = $this->options_defaults[$field['id']];
 									}
 
 									// Only override if it exists, and it's not the default.
@@ -420,8 +420,8 @@ 
 		 * @return mixed
 		 */
 		public function replace_field( array $field ) {
-			if ( isset( $this->to_replace[ $field['id'] ] ) ) {
-				$field = $this->to_replace[ $field['id'] ];
+			if ( isset( $this->to_replace[$field['id']] ) ) {
+				$field = $this->to_replace[$field['id']];
 			}
 
 			return $field;
@@ -435,7 +435,7 @@ 
 		 * @return array
 		 */
 		public function override_can_output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
+			if ( isset( $this->output[$field['id']] ) ) {
 				$field['force_output'] = true;
 			}
 
@@ -450,8 +450,8 @@ 
 		 * @return array
 		 */
 		public function output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['output'] = $this->output[ $field['id'] ];
+			if ( isset( $this->output[$field['id']] ) ) {
+				$field['output'] = $this->output[$field['id']];
 			}
 
 			return $field;
@@ -472,13 +472,13 @@ 
 			$data = wp_parse_args( $meta, $this->options_defaults );
 
 			foreach ( $data as $key => $value ) {
-				if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
-					$data[ $key ] = $meta[ $key ];
+				if ( isset( $meta[$key] ) && '' !== $meta[$key] ) {
+					$data[$key] = $meta[$key];
 					continue;
 				}
 
-				if ( isset( $options[ $key ] ) ) {
-					$data[ $key ] = $options[ $key ];
+				if ( isset( $options[$key] ) ) {
+					$data[$key] = $options[$key];
 				}
 			}
 
@@ -504,9 +504,9 @@ 
 				$the_post = $post;
 			}
 
-			if ( isset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] ) ) {
-				$GLOBALS[ $this->parent->args['global_variable'] ] = $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ];
-				unset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
+			if ( isset( $GLOBALS[$this->parent->args['global_variable'] . '-loop'] ) ) {
+				$GLOBALS[$this->parent->args['global_variable']] = $GLOBALS[$this->parent->args['global_variable'] . '-loop'];
+				unset( $GLOBALS[$this->parent->args['global_variable'] . '-loop'] );
 			}
 
 			// Override these values if they differ from the admin panel defaults.  ;) .
@@ -517,8 +517,8 @@ 
 				}
 
 				// Backup the args.
-				$GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] = $GLOBALS[ $this->parent->args['global_variable'] ];
-				$GLOBALS[ $this->parent->args['global_variable'] ]           = wp_parse_args( $meta, $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
+				$GLOBALS[$this->parent->args['global_variable'] . '-loop'] = $GLOBALS[$this->parent->args['global_variable']];
+				$GLOBALS[$this->parent->args['global_variable']]           = wp_parse_args( $meta, $GLOBALS[$this->parent->args['global_variable'] . '-loop'] );
 			}
 		}
 
@@ -526,10 +526,10 @@ 
 		 * Loop end.
 		 */
 		public function loop_end() {
-			if ( isset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] ) ) {
-				$GLOBALS[ $this->parent->args['global_variable'] ] = $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ];
+			if ( isset( $GLOBALS[$this->parent->args['global_variable'] . '-loop'] ) ) {
+				$GLOBALS[$this->parent->args['global_variable']] = $GLOBALS[$this->parent->args['global_variable'] . '-loop'];
 
-				unset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
+				unset( $GLOBALS[$this->parent->args['global_variable'] . '-loop'] );
 			}
 		}
 
@@ -554,7 +554,7 @@ 
 				if ( ! empty( $box['post_types'] ) ) {
 					if ( ! is_array( $box['post_types'] ) ) {
 						$box['post_types']                 = array( $box['post_types'] );
-						$this->boxes[ $key ]['post_types'] = $box['post_types'];
+						$this->boxes[$key]['post_types'] = $box['post_types'];
 					}
 				}
 			}
@@ -644,7 +644,7 @@ 
 			}
 
 			if ( isset( $_GET['post'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification
-				$post = (int) sanitize_text_field( wp_unslash( $_GET['post'] ) );  // phpcs:ignore WordPress.Security.NonceVerification
+				$post = ( int ) sanitize_text_field( wp_unslash( $_GET['post'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
 
 				if ( ! empty( $post ) ) {
 					return $post;
@@ -665,7 +665,7 @@ 
 
 			$post_id = url_to_postid( $url );
 
-			if ( isset( $post_id ) && '' !== (string) $post_id && 0 !== $post_id ) {
+			if ( isset( $post_id ) && '' !== ( string ) $post_id && 0 !== $post_id ) {
 				return $post_id;
 			}
 
@@ -721,9 +721,9 @@ 
 					}
 
 					foreach ( $GLOBALS['wp_post_types'] as $key => $value ) {
-						if ( ! empty( $_GET[ $key ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+						if ( ! empty( $_GET[$key] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 							$args = array(
-								'name'      => sanitize_text_field( wp_unslash( $_GET[ $key ] ) ), // phpcs:ignore WordPress.Security.NonceVerification
+								'name'      => sanitize_text_field( wp_unslash( $_GET[$key] ) ), // phpcs:ignore WordPress.Security.NonceVerification
 								'post_type' => $key,
 								'showposts' => 1,
 							);
@@ -809,7 +809,7 @@ 
 
 					foreach ( $query_vars as $key => $value ) {
 						if ( in_array( $key, $wp->public_query_vars, true ) ) {
-							$query[ $key ] = $value;
+							$query[$key] = $value;
 						}
 					}
 
@@ -843,35 +843,35 @@ 
 					// Taken from class-wp.php.
 					foreach ( $GLOBALS['wp_post_types'] as $post_type => $t ) {
 						if ( isset( $t->query_var ) ) {
-							$post_type_query_vars[ $t->query_var ] = $post_type;
+							$post_type_query_vars[$t->query_var] = $post_type;
 						}
 					}
 
 					foreach ( $wp->public_query_vars as $wpvar ) {
-						if ( isset( $wp->extra_query_vars[ $wpvar ] ) ) {
-							$query[ $wpvar ] = $wp->extra_query_vars[ $wpvar ];
-						} elseif ( isset( $_POST[ $wpvar ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-							$query[ $wpvar ] = sanitize_text_field( wp_unslash( $_POST[ $wpvar ] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-						} elseif ( isset( $_GET[ $wpvar ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-							$query[ $wpvar ] = sanitize_text_field( wp_unslash( $_GET[ $wpvar ] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-						} elseif ( isset( $query_vars[ $wpvar ] ) ) {
-							$query[ $wpvar ] = $query_vars[ $wpvar ];
+						if ( isset( $wp->extra_query_vars[$wpvar] ) ) {
+							$query[$wpvar] = $wp->extra_query_vars[$wpvar];
+						} elseif ( isset( $_POST[$wpvar] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+							$query[$wpvar] = sanitize_text_field( wp_unslash( $_POST[$wpvar] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+						} elseif ( isset( $_GET[$wpvar] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+							$query[$wpvar] = sanitize_text_field( wp_unslash( $_GET[$wpvar] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+						} elseif ( isset( $query_vars[$wpvar] ) ) {
+							$query[$wpvar] = $query_vars[$wpvar];
 						}
 
-						if ( ! empty( $query[ $wpvar ] ) ) {
-							if ( ! is_array( $query[ $wpvar ] ) ) {
-								$query[ $wpvar ] = (string) $query[ $wpvar ];
+						if ( ! empty( $query[$wpvar] ) ) {
+							if ( ! is_array( $query[$wpvar] ) ) {
+								$query[$wpvar] = ( string ) $query[$wpvar];
 							} else {
-								foreach ( $query[ $wpvar ] as $vkey => $v ) {
+								foreach ( $query[$wpvar] as $vkey => $v ) {
 									if ( ! is_object( $v ) ) {
-										$query[ $wpvar ][ $vkey ] = (string) $v;
+										$query[$wpvar][$vkey] = ( string ) $v;
 									}
 								}
 							}
 
-							if ( isset( $post_type_query_vars[ $wpvar ] ) ) {
-								$query['post_type'] = $post_type_query_vars[ $wpvar ];
-								$query['name']      = $query[ $wpvar ];
+							if ( isset( $post_type_query_vars[$wpvar] ) ) {
+								$query['post_type'] = $post_type_query_vars[$wpvar];
+								$query['name']      = $query[$wpvar];
 							}
 						}
 					}
@@ -930,7 +930,7 @@ 
 							} else {
 								$section['id'] = sanitize_text_field( $section['title'] );
 							}
-							$this->boxes[ $key ]['sections'][ $sk ] = $section;
+							$this->boxes[$key]['sections'][$sk] = $section;
 						}
 						if ( isset( $section['fields'] ) ) {
 							foreach ( $section['fields'] as $k => $field ) {
@@ -940,15 +940,15 @@ 
 								}
 
 								if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
-									$this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
-									unset( $this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
+									$this->boxes[$key]['sections'][$sk]['fields'][$k]['args'] = $field['options'];
+									unset( $this->boxes[$key]['sections'][$sk]['fields'][$k]['options'] );
 								}
 
 								if ( 'section' === $field['type'] && isset( $field['indent'] ) && ( true === $field['indent'] || 'true' === $field['indent'] ) ) {
 									$field['class']  = $field['class'] ?? '';
 									$field['class'] .= 'redux-section-indent-start';
 
-									$this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
+									$this->boxes[$key]['sections'][$sk]['fields'][$k] = $field;
 								}
 
 								if ( ! isset( $this->parent->options_defaults_class ) ) {
@@ -970,8 +970,8 @@ 
 				}
 			}
 
-			if ( empty( $this->meta[ $this->post_id ] ) ) {
-				$this->meta[ $this->post_id ] = $this->get_meta( $this->post_id );
+			if ( empty( $this->meta[$this->post_id] ) ) {
+				$this->meta[$this->post_id] = $this->get_meta( $this->post_id );
 			}
 		}
 
@@ -1085,8 +1085,8 @@ 
 
 			$this->options = $this->parent->options;
 
-			if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
-				return $this->parent->options[ $field_id['id'] ];
+			if ( isset( $this->parent->options[$field_id['id']] ) && isset( $this->parent->options_defaults[$field_id['id']] ) && $this->parent->options[$field_id['id']] !== $this->parent->options_defaults[$field_id['id']] ) {
+				return $this->parent->options[$field_id['id']];
 			} else {
 				if ( empty( $this->options_defaults ) ) {
 					$this->default_values(); // fill cache.
@@ -1094,11 +1094,11 @@ 
 
 				$data = '';
 				if ( ! empty( $this->options_defaults ) ) {
-					$data = $this->options_defaults[ $field_id['id'] ] ?? '';
+					$data = $this->options_defaults[$field_id['id']] ?? '';
 				}
 
-				if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
-					$data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
+				if ( empty( $data ) && isset( $this->parent->options_defaults[$field_id['id']] ) ) {
+					$data = $this->parent->options_defaults[$field_id['id']] ?? '';
 				}
 
 				return $data;
@@ -1113,8 +1113,8 @@ 
 		 * @return array
 		 */
 		private function get_meta( $id ): array {
-			if ( ! isset( $this->meta[ $id ] ) ) {
-				$this->meta[ $id ] = array();
+			if ( ! isset( $this->meta[$id] ) ) {
+				$this->meta[$id] = array();
 				$o_data            = get_post_meta( $id );
 
 				// phpcs:ignore WordPress.NamingConventions.ValidHookName
@@ -1123,30 +1123,30 @@ 
 				if ( ! empty( $o_data ) ) {
 					foreach ( $o_data as $key => $value ) {
 						if ( 1 === count( $value ) ) {
-							$this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
+							$this->meta[$id][$key] = maybe_unserialize( $value[0] );
 						} else {
 							$new_value = array_map( 'maybe_unserialize', $value );
 
-							$this->meta[ $id ][ $key ] = $new_value[0];
+							$this->meta[$id][$key] = $new_value[0];
 						}
 					}
 				}
 
-				if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
-					$data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+				if ( isset( $this->meta[$id][$this->parent->args['opt_name']] ) ) {
+					$data = maybe_unserialize( $this->meta[$id][$this->parent->args['opt_name']] );
 
 					foreach ( $data as $key => $value ) {
-						$this->meta[ $id ][ $key ] = $value;
+						$this->meta[$id][$key] = $value;
 						update_post_meta( $id, $key, $value );
 					}
 
-					unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+					unset( $this->meta[$id][$this->parent->args['opt_name']] );
 
 					delete_post_meta( $id, $this->parent->args['opt_name'] );
 				}
 			}
 
-			return $this->meta[ $id ];
+			return $this->meta[$id];
 		}
 
 		/**
@@ -1162,29 +1162,29 @@ 
 
 			// Override these values if they differ from the admin panel defaults.  ;) .
 			if ( isset( $the_post->post_type ) && in_array( $the_post->post_type, $this->post_types, true ) ) {
-				if ( isset( $this->post_type_values[ $the_post->post_type ] ) ) {
-					$meta = $this->post_type_fields[ $the_post->post_type ];
+				if ( isset( $this->post_type_values[$the_post->post_type] ) ) {
+					$meta = $this->post_type_fields[$the_post->post_type];
 				} else {
 					$defaults = array();
-					if ( ! empty( $this->post_type_fields[ $the_post->post_type ] ) ) {
-						foreach ( $this->post_type_fields[ $the_post->post_type ] as $key => $null ) {
-							if ( isset( $this->options_defaults[ $key ] ) ) {
-								$defaults[ $key ] = $this->options_defaults[ $key ];
+					if ( ! empty( $this->post_type_fields[$the_post->post_type] ) ) {
+						foreach ( $this->post_type_fields[$the_post->post_type] as $key => $null ) {
+							if ( isset( $this->options_defaults[$key] ) ) {
+								$defaults[$key] = $this->options_defaults[$key];
 							}
 						}
 					}
 
 					$meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
 
-					$this->post_type_fields[ $the_post->post_type ] = $meta;
+					$this->post_type_fields[$the_post->post_type] = $meta;
 				}
 
 				if ( ! empty( $meta_key ) ) {
-					if ( ! isset( $meta[ $meta_key ] ) ) {
-						$meta[ $meta_key ] = $def_val;
+					if ( ! isset( $meta[$meta_key] ) ) {
+						$meta[$meta_key] = $def_val;
 					}
 
-					return $meta[ $meta_key ];
+					return $meta[$meta_key];
 				} else {
 					return $meta;
 				}
@@ -1335,11 +1335,11 @@ 
 									$field['class'] .= 'redux-section-indent-start';
 								}
 
-								if ( ! isset( $this->meta[ $this->post_id ][ $field['id'] ] ) ) {
-									$this->meta[ $this->post_id ][ $field['id'] ] = '';
+								if ( ! isset( $this->meta[$this->post_id][$field['id']] ) ) {
+									$this->meta[$this->post_id][$field['id']] = '';
 								}
 
-								$this->parent->render_class->field_input( $field, $this->meta[ $this->post_id ][ $field['id'] ], true );
+								$this->parent->render_class->field_input( $field, $this->meta[$this->post_id][$field['id']], true );
 								echo '</td></tr>';
 							}
 							echo '</tbody></table>';
@@ -1374,7 +1374,7 @@ 
 			}
 
 			// Check if our nonce is set.
-			if ( ! isset( $_POST['redux_metaboxes_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
+			if ( ! isset( $_POST['redux_metaboxes_meta_nonce'] ) || ! isset( $_POST[$this->parent->args['opt_name']] ) ) {
 				return $post_id;
 			}
 
@@ -1396,17 +1396,17 @@ 
 			}
 
 			// Import.
-			if ( isset( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) && ! empty( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) ) {
-				$import = json_decode( sanitize_text_field( wp_unslash( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) ), true );
-				unset( $_POST[ $this->parent->args['opt_name'] ]['import_code'] );
+			if ( isset( $_POST[$this->parent->args['opt_name']]['import_code'] ) && ! empty( $_POST[$this->parent->args['opt_name']]['import_code'] ) ) {
+				$import = json_decode( sanitize_text_field( wp_unslash( $_POST[$this->parent->args['opt_name']]['import_code'] ) ), true );
+				unset( $_POST[$this->parent->args['opt_name']]['import_code'] );
 
-				foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
-					if ( ! isset( $import[ $key ] ) ) {
-						$import[ $key ] = $value;
+				foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[$this->parent->args['opt_name']] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+					if ( ! isset( $import[$key] ) ) {
+						$import[$key] = $value;
 					}
 				}
 
-				$_POST[ $this->parent->args['opt_name'] ] = $import;
+				$_POST[$this->parent->args['opt_name']] = $import;
 			}
 
 			$to_save    = array();
@@ -1418,13 +1418,13 @@ 
 				$dont_save = false;
 			}
 
-			foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+			foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[$this->parent->args['opt_name']] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
 
 				// Have to remove the escaping for array comparison.
 				if ( is_array( $value ) ) {
 					foreach ( $value as $k => $v ) {
 						if ( ! is_array( $v ) ) {
-							$value[ $k ] = wp_unslash( $v );
+							$value[$k] = wp_unslash( $v );
 						}
 					}
 				}
@@ -1432,19 +1432,19 @@ 
 				$save = true;
 
 				// parent_options.
-				if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
+				if ( ! $dont_save && isset( $this->options_defaults[$key] ) && $value === $this->options_defaults[$key] ) {
 					$save = false;
 				}
 
-				if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
+				if ( $save && isset( $this->parent_options[$key] ) && $this->parent_options[$key] !== $value ) {
 					$save = false;
 				}
 
 				if ( $save ) {
-					$to_save[ $key ]    = $value;
-					$to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
+					$to_save[$key]    = $value;
+					$to_compare[$key] = $this->parent->options[$key] ?? '';
 				} else {
-					$to_delete[ $key ] = $value;
+					$to_delete[$key] = $value;
 				}
 			}
 
@@ -1455,11 +1455,11 @@ 
 
 			// Validate fields (if needed).
 			foreach ( $to_save as $key => $value ) {
-				if ( isset( $validate[ $key ] ) && $value !== $validate[ $key ] ) {
-					if ( isset( $this->parent->options[ $key ] ) && $validate[ $key ] === $this->parent->options[ $key ] ) {
-						unset( $to_save[ $key ] );
+				if ( isset( $validate[$key] ) && $value !== $validate[$key] ) {
+					if ( isset( $this->parent->options[$key] ) && $validate[$key] === $this->parent->options[$key] ) {
+						unset( $to_save[$key] );
 					} else {
-						$to_save[ $key ] = $validate[ $key ];
+						$to_save[$key] = $validate[$key];
 					}
 				}
 			}
@@ -1484,28 +1484,28 @@ 
 			}
 
 			if ( isset( $_POST['post_type'] ) ) {
-				$check = $this->post_type_fields[ sanitize_text_field( wp_unslash( $_POST['post_type'] ) ) ];
+				$check = $this->post_type_fields[sanitize_text_field( wp_unslash( $_POST['post_type'] ) )];
 			}
 
 			// phpcs:ignore WordPress.NamingConventions.ValidHookName
 			$to_save = apply_filters( 'redux/metaboxes/save', $to_save, $to_compare, $this->sections );
 
 			foreach ( $to_save as $key => $value ) {
-				$prev_value = $this->meta[ $post_id ][ $key ] ?? '';
+				$prev_value = $this->meta[$post_id][$key] ?? '';
 
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
+				if ( isset( $check[$key] ) ) {
+					unset( $check[$key] );
 				}
 
 				update_post_meta( $post_id, $key, $value, $prev_value );
 			}
 
 			foreach ( $to_delete as $key => $value ) {
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
+				if ( isset( $check[$key] ) ) {
+					unset( $check[$key] );
 				}
 
-				$prev_value = $this->meta[ $post_id ][ $key ] ?? '';
+				$prev_value = $this->meta[$post_id][$key] ?? '';
 				delete_post_meta( $post_id, $key, $prev_value );
 			}
 

Indentation +1465 added lines, -1465 removed lines

@@ -14,1184 +14,1184 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Metaboxes', false ) ) {
 
-	/**
-	 * Main Redux_Extension_Metaboxes class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Extension_Metaboxes extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.2.0';
-
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Metaboxes';
-
-		/**
-		 * Boxes array.
-		 *
-		 * @var array|null
-		 */
-		public ?array $boxes = array();
-
-		/**
-		 * Post types array.
-		 *
-		 * @var array|null
-		 */
-		public ?array $post_types = array();
-
-		/**
-		 * Post type.
-		 *
-		 * @var string|null
-		 */
-		public ?string $post_type;
-
-		/**
-		 * Sections array.
-		 *
-		 * @var array|null
-		 */
-		public ?array $orig_args;
-
-		/**
-		 * Sections array.
-		 *
-		 * @var array|null
-		 */
-		public ?array $sections = array();
-
-		/**
-		 * CSS output array.
-		 *
-		 * @var array|null
-		 */
-		public ?array $output = array();
-
-		/**
-		 * Options array.
-		 *
-		 * @var array
-		 */
-		public array $options = array();
-
-		/**
-		 * Parent options array.
-		 *
-		 * @var array
-		 */
-		public array $parent_options = array();
-
-		/**
-		 * Parent defaults array.
-		 *
-		 * @var array
-		 */
-		public array $parent_defaults = array();
-
-		/**
-		 * Post type fields array.
-		 *
-		 * @var array
-		 */
-		public array $post_type_fields = array();
-
-		/**
-		 * Options defaults array.
-		 *
-		 * @var array
-		 */
-		public array $options_defaults = array();
-
-		/**
-		 * Replace array.
-		 *
-		 * @var array
-		 */
-		public array $to_replace = array();
-
-		/**
-		 * Meta data array.
-		 *
-		 * @var array
-		 */
-		public array $meta = array();
-
-		/**
-		 * Post ID.
-		 *
-		 * @var null|int
-		 */
-		public ?int $post_id = 0;
-
-		/**
-		 * Base URI.
-		 *
-		 * @var string|null
-		 */
-		public ?string $base_url;
-
-		/**
-		 * WP_Links array.
-		 *
-		 * @var array
-		 */
-		public array $wp_links = array();
-
-		/**
-		 * Notices.
-		 *
-		 * @var array
-		 */
-		private array $notices = array();
-
-		/**
-		 * ReduxFramework_extension_metaboxes constructor.
-		 *
-		 * @param object $redux ReduxFramework object.
-		 */
-		public function __construct( $redux ) {
-			global $pagenow;
-
-			parent::__construct( $redux, __FILE__ );
-
-			$this->parent->extensions['metaboxes'] = $this;
-
-			$this->extension_dir = trailingslashit( str_replace( '\\', '/', __DIR__ ) );
-			$this->extension_url = site_url( str_replace( trailingslashit( str_replace( '\\', '/', ABSPATH ) ), '', $this->extension_dir ) );
-
-			// Only run metaboxes on the pages/posts, not the front-end.
-			// The DOING_AJAX check allows for redux_post_meta to work inside
-			// AJAX calls. - kp.
-			if ( 'post-new.php' !== $pagenow && 'post.php' !== $pagenow ) {
-				if ( is_admin() ) {
-					if ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) {
-						return;
-					}
-
-					return;
-				}
-			}
-
-			if ( 'wp-cron.php' === $pagenow || 'wp-comments-post.php' === $pagenow ) {
-				return;
-			}
-
-			// Must not update the DB when just updating metaboxes. Sheesh.
-			if ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) {
-				$this->parent->never_save_to_db = true;
-			}
-
-			include_once Redux_Core::$dir . 'inc/extensions/metaboxes/redux-metaboxes-helpers.php';
-
-			// phpcs:ignore Generic.Strings.UnnecessaryStringConcat
-			add_action( 'add_' . 'meta_' . 'boxes', array( $this, 'add' ) );
-			add_action( 'save_post', array( $this, 'meta_boxes_save' ), 1, 2 );
-			add_action( 'pre_post_update', array( $this, 'pre_post_update' ) );
-			add_action( 'admin_notices', array( $this, 'meta_boxes_show_errors' ), 0 );
-			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 20 );
-
-			// Global variable overrides for within loops.
-			add_action( 'the_post', array( $this, 'loop_start' ), 0 );
-			add_action( 'loop_end', array( $this, 'loop_end' ), 0 );
-
-			$this->init();
-		}
-
-		/**
-		 * Added class names to metabox DIV.
-		 *
-		 * @param array $classes Class array.
-		 *
-		 * @return array
-		 */
-		public function add_box_classes( array $classes ): array {
-			$classes[] = 'redux-metabox';
-			$classes[] = 'redux-' . $this->parent->args['opt_name'];
-
-			if ( '' !== $this->parent->args['class'] ) {
-				$classes[] = $this->parent->args['class'];
-			}
-
-			return $classes;
-		}
-
-		/**
-		 * Class init.
-		 */
-		public function init() {
-			global $pagenow;
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$this->boxes = apply_filters( 'redux/metaboxes/' . $this->parent->args['opt_name'] . '/boxes', $this->boxes, $this->parent->args['opt_name'] );
-
-			if ( empty( $this->boxes ) && class_exists( 'Redux_Metaboxes' ) ) {
-				$this->boxes = Redux_Metaboxes::construct_boxes( $this->parent->args['opt_name'] );
-			}
-
-			if ( empty( $this->boxes ) || ! is_array( $this->boxes ) ) {
-				return;
-			}
-
-			if ( isset( Redux_Core::$server['HTTP_HOST'] ) && isset( Redux_Core::$server['REQUEST_URI'] ) ) {
-				$this->base_url = ( is_ssl() ? 'https://' : 'http://' ) . sanitize_text_field( wp_unslash( Redux_Core::$server['HTTP_HOST'] ) ) . sanitize_text_field( wp_unslash( Redux_Core::$server['REQUEST_URI'] ) ); // Safe & Reliable.
-				$this->post_id  = $this->url_to_postid( ( is_ssl() ? 'https://' : 'http://' ) . sanitize_text_field( wp_unslash( Redux_Core::$server['HTTP_HOST'] ) ) . sanitize_text_field( wp_unslash( Redux_Core::$server['REQUEST_URI'] ) ) );
-			}
-
-			if ( is_admin() && isset( $_GET['post_type'] ) && ! empty( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$this->post_type = sanitize_text_field( wp_unslash( $_GET['post_type'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-			} else {
-				$this->post_type = get_post_type( $this->post_id );
-			}
-
-			foreach ( $this->boxes as $bk => $box ) {
-
-				// If the post-ids for this box are set, we're limiting to the current post id.
-				if ( ! empty( $box['post_ids'] ) ) {
-					if ( ! is_array( $box['post_ids'] ) ) {
-						$box['post_ids'] = array( $box['post_ids'] );
-					}
-					if ( ! in_array( $this->post_id, $box['post_ids'], true ) ) {
-						continue;
-					}
-				}
-
-				if ( ! empty( $box['sections'] ) ) {
-					$this->sections = wp_parse_args( $this->sections, $box['sections'] );
-
-					$this->post_types = wp_parse_args( $this->post_types, $box['post_types'] );
-
-					// Checking to override the parent variables.
-					$add_field = false;
-
-					foreach ( $box['post_types'] as $type ) {
-						if ( $this->post_type === $type ) {
-							$add_field = true;
-						}
-					}
-
-					// Replacing all the fields.
-					if ( $add_field || ( ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) || ( ! is_admin() ) ) ) {
-						$run_hooks = true;
-
-						$box_id = 'redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'];
-
-						// phpcs:ignore WordPress.NamingConventions.ValidHookName
-						do_action( 'redux/' . $this->parent->args['opt_name'] . '/extensions/metabox/init', $this, $box );
-
-						if ( isset( $box['page_template'] ) && 'page' === $this->post_type ) {
-							if ( ! is_array( $box['page_template'] ) ) {
-								$box['page_template'] = array( $box['page_template'] );
-							}
-
-							$this->wp_links[ $box_id ]['page_template'] = isset( $this->wp_links[ $box_id ]['page_template'] ) ? wp_parse_args( $this->wp_links[ $box_id ]['page_template'], $box['page_template'] ) : $box['page_template'];
-						}
-
-						if ( isset( $box['post_format'] ) && ( in_array( $this->post_type, $this->post_types, true ) || '' === $this->post_type || false === $this->post_type ) ) {
-							if ( ! is_array( $box['post_format'] ) ) {
-								$box['post_format'] = array( $box['post_format'] );
-							}
-
-							$this->wp_links[ $box_id ]['post_format'] = isset( $this->wp_links[ $box_id ]['post_format'] ) ? wp_parse_args( $this->wp_links[ $box_id ]['post_format'], $box['post_format'] ) : $box['post_format'];
-						}
-
-						$this->meta[ $this->post_id ] = $this->get_meta( $this->post_id );
-
-						foreach ( $box['sections'] as $sk => $section ) {
-							if ( ! empty( $section['fields'] ) ) {
-								foreach ( $section['fields'] as $fk => $field ) {
-									if ( ! isset( $field['class'] ) ) {
-										$field['class'] = '';
-
-										$this->boxes[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
-									}
-
-									if ( $add_field || ( ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) || ( ! is_admin() ) ) ) {
-										if ( empty( $field['id'] ) ) {
-											continue;
-										}
-
-										if ( isset( $field['default'] ) ) {
-											$this->options_defaults[ $field['id'] ] = $field['default'];
-										} else {
-											$this->options_defaults[ $field['id'] ] = $this->field_default( $field );
-										}
-
-										foreach ( $box['post_types'] as $type ) {
-											$this->post_type_fields[ $type ][ $field['id'] ] = 1;
-
-											if ( 'repeater' === $field['type'] ) {
-												foreach ( $field['fields'] as $val ) {
-													$this->post_type_fields[ $type ][ $val['id'] ] = 1;
-												}
-											}
-										}
-
-										if ( ! empty( $field['output'] ) ) {
-											$this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
-										}
-
-										// Detect what field types are being used.
-										if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
-											$this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
-										} else {
-											$this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
-										}
-
-										if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
-											$this->to_replace[ $field['id'] ] = $field;
-										}
-									}
-
-									if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
-										$this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
-									}
-
-									if ( ! isset( $this->meta[ $this->post_id ][ $field['id'] ] ) ) {
-										$this->meta[ $this->post_id ][ $field['id'] ] = $this->options_defaults[ $field['id'] ];
-									}
-
-									// Only override if it exists, and it's not the default.
-									// phpcs:ignore Squiz.PHP.CommentedOutCode
-									// if ( isset( $this->meta[ $this->post_id ][ $field['id'] ] ) && isset( $field['default'] ) && $this->meta[ $this->post_id ][ $field['id'] ] === $field['default'] ) {
-									// unset($this->meta[$this->post_id][$field['id']]);
-									// } .
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if ( isset( $run_hooks ) && true === $run_hooks ) {
-				$this->parent_options = array();
-
-				if ( ! empty( $this->to_replace ) ) {
-					foreach ( $this->to_replace as $id => $field ) {
-
-						// phpcs:ignore WordPress.NamingConventions.ValidHookName
-						add_filter( "redux/options/{$this->parent->args['opt_name']}/field/$id/register", array( $this, 'replace_field' ) );
-					}
-				}
-
-				add_filter( "redux/options/{$this->parent->args['opt_name']}/options", array( $this, 'override_options' ) );
-				add_filter( "redux/field/{$this->parent->args['opt_name']}/_can_output_css", array( $this, 'override_can_output_css' ) );
-				add_filter( "redux/field/{$this->parent->args['opt_name']}/output_css", array( $this, 'output_css' ) );
-			}
-		}
-
-		/**
-		 * Replace Field.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return mixed
-		 */
-		public function replace_field( array $field ) {
-			if ( isset( $this->to_replace[ $field['id'] ] ) ) {
-				$field = $this->to_replace[ $field['id'] ];
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Override CSS output.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return array
-		 */
-		public function override_can_output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['force_output'] = true;
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Output CSS.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return array
-		 */
-		public function output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['output'] = $this->output[ $field['id'] ];
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Make sure the defaults are the defaults
-		 *
-		 * @param array $options Options array.
-		 *
-		 * @return array
-		 */
-		public function override_options( array $options ): array {
-			$this->parent->default_values();
-			$this->parent_defaults = $this->parent->options_defaults;
-
-			$meta = $this->get_meta( $this->post_id );
-			$data = wp_parse_args( $meta, $this->options_defaults );
-
-			foreach ( $data as $key => $value ) {
-				if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
-					$data[ $key ] = $meta[ $key ];
-					continue;
-				}
-
-				if ( isset( $options[ $key ] ) ) {
-					$data[ $key ] = $options[ $key ];
-				}
-			}
-
-			$this->parent->options_defaults = wp_parse_args( $this->options_defaults, $this->parent->options_defaults );
-
-			return wp_parse_args( $data, $options );
-		}
-
-		/**
-		 * Loop start.
-		 *
-		 * @param mixed $the_post WP_Post object.
-		 *
-		 * @return array|void
-		 */
-		public function loop_start( $the_post = array() ) {
-			if ( is_admin() ) {
-				return $the_post;
-			}
-
-			if ( isset( $the_post ) && is_array( $the_post ) ) {
-				global $post;
-				$the_post = $post;
-			}
-
-			if ( isset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] ) ) {
-				$GLOBALS[ $this->parent->args['global_variable'] ] = $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ];
-				unset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
-			}
-
-			// Override these values if they differ from the admin panel defaults.  ;) .
-			if ( in_array( $the_post->post_type, $this->post_types, true ) ) {
-				$meta = $this->get_meta( $the_post->ID );
-				if ( empty( $meta ) ) {
-					return;
-				}
-
-				// Backup the args.
-				$GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] = $GLOBALS[ $this->parent->args['global_variable'] ];
-				$GLOBALS[ $this->parent->args['global_variable'] ]           = wp_parse_args( $meta, $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
-			}
-		}
-
-		/**
-		 * Loop end.
-		 */
-		public function loop_end() {
-			if ( isset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] ) ) {
-				$GLOBALS[ $this->parent->args['global_variable'] ] = $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ];
-
-				unset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
-			}
-		}
-
-		/**
-		 * Enqueue fields.
-		 */
-		public function enqueue() {
-			global $pagenow;
-
-			$types = array();
-
-			// Enqueue CSS.
-			foreach ( $this->boxes as $key => $box ) {
-				if ( empty( $box['sections'] ) ) {
-					continue;
-				}
-
-				if ( isset( $box['post_types'] ) ) {
-					$types = array_merge( $box['post_types'], $types );
-				}
-
-				if ( ! empty( $box['post_types'] ) ) {
-					if ( ! is_array( $box['post_types'] ) ) {
-						$box['post_types']                 = array( $box['post_types'] );
-						$this->boxes[ $key ]['post_types'] = $box['post_types'];
-					}
-				}
-			}
-
-			if ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) {
-				global $post;
-
-				if ( in_array( $post->post_type, $types, true ) ) {
-					$this->parent->transients       = get_transient( $this->parent->args['opt_name'] . '-transients-metaboxes' );
-					$this->parent->transients_check = $this->parent->transients;
-
-					if ( isset( $this->parent->transients['notices'] ) ) {
-						$this->notices                              = $this->parent->transients['notices'];
-						$this->parent->transients['last_save_mode'] = 'metaboxes';
-					}
-
-					delete_transient( $this->parent->args['opt_name'] . '-transients-metaboxes' );
-					$this->parent->enqueue_class->init();
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/metaboxes/{$this->parent->args['opt_name']}/enqueue" );
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/{$this->parent->args['opt_name']}/extensions/metaboxes/enqueue" );
-
-					/**
-					 * Redux metaboxes CSS
-					 * filter 'redux/page/{opt_name}/enqueue/redux-extension-metaboxes-css'
-					 */
-					if ( $this->parent->args['dev_mode'] ) {
-						wp_enqueue_style(
-							'redux-extension-metaboxes',
-							apply_filters( "redux/metaboxes/{$this->parent->args['opt_name']}/enqueue/redux-extension-metaboxes-css", $this->extension_url . 'redux-extension-metaboxes.css' ), // phpcs:ignore: WordPress.NamingConventions.ValidHookName
-							array(),
-							self::$version
-						);
-					}
-
-					/**
-					 * Redux metaboxes JS
-					 * filter 'redux/page/{opt_name}/enqueue/redux-extension-metaboxes-js
-					 */
-					wp_enqueue_script(
-						'redux-extension-metaboxes',
-						apply_filters( "redux/metaboxes/{$this->parent->args['opt_name']}/enqueue/redux-extension-metaboxes-js", $this->extension_url . 'redux-extension-metaboxes' . Redux_Functions::isMin() . '.js' ), // phpcs:ignore: WordPress.NamingConventions.ValidHookName
-						array( 'jquery', 'redux-js' ),
-						self::$version,
-						true
-					);
-
-					// Values used by the javascript.
-					wp_localize_script(
-						'redux-extension-metaboxes',
-						'reduxMetaboxes',
-						$this->wp_links
-					);
-
-					wp_localize_script(
-						'redux-extension-metaboxes',
-						'reduxMetaboxesPageTemplate',
-						array(
-							'_wp_page_template' => get_post_meta( get_the_ID(), '_wp_page_template', true ),
-						)
-					);
-				}
-			}
-		}
-
-		/* Post URLs to IDs function, supports custom post types - borrowed and modified from url_to_postid() in wp-includes/rewrite.php */
-
-		// Taken from http://betterwp.net/wordpress-tips/url_to_postid-for-custom-post-types/
-		// Customized to work with non-rewrite URLs
-		// Modified by Dovy Paukstys (@dovy) of Redux Framework.
-
-		/**
-		 * URL to PostID.
-		 *
-		 * @param string $url URL.
-		 *
-		 * @return int|mixed|void
-		 */
-		private function url_to_postid( string $url ) {
-			global $wp_rewrite, $pagenow;
-
-			if ( ! empty( $this->post_id ) ) {
-				return $this->post_id;
-			}
-
-			if ( isset( $_GET['post'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification
-				$post = (int) sanitize_text_field( wp_unslash( $_GET['post'] ) );  // phpcs:ignore WordPress.Security.NonceVerification
-
-				if ( ! empty( $post ) ) {
-					return $post;
-				}
-			}
-
-			if ( 'post-new.php' === $pagenow || 'wp-login.php' === $pagenow ) {
-				return;
-			}
-
-			if ( is_admin() && 'post.php' === $pagenow && isset( $_POST['post_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$post_id = sanitize_text_field( wp_unslash( $_POST['post_ID'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
-				if ( ! empty( $post_id ) && is_numeric( $post_id ) ) {
-					return $post_id;
-				}
-			}
-
-			$post_id = url_to_postid( $url );
-
-			if ( isset( $post_id ) && '' !== (string) $post_id && 0 !== $post_id ) {
-				return $post_id;
-			}
-
-			// First, check to see if there is a 'p=N' or 'page_id=N' to match against.
-			if ( preg_match( '#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values ) ) {
-				$id = absint( $values[2] );
-				if ( $id ) {
-					return $id;
-				}
-			}
-
-			// Check to see if we are using rewrite rules.
-			if ( isset( $wp_rewrite ) ) {
-				$rewrite = $wp_rewrite->wp_rewrite_rules();
-			}
-
-			// Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options.
-			if ( empty( $rewrite ) ) {
-				if ( ! empty( $_GET ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-
-					/************************************************************************
+    /**
+     * Main Redux_Extension_Metaboxes class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Extension_Metaboxes extends Redux_Extension_Abstract {
+
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.2.0';
+
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Metaboxes';
+
+        /**
+         * Boxes array.
+         *
+         * @var array|null
+         */
+        public ?array $boxes = array();
+
+        /**
+         * Post types array.
+         *
+         * @var array|null
+         */
+        public ?array $post_types = array();
+
+        /**
+         * Post type.
+         *
+         * @var string|null
+         */
+        public ?string $post_type;
+
+        /**
+         * Sections array.
+         *
+         * @var array|null
+         */
+        public ?array $orig_args;
+
+        /**
+         * Sections array.
+         *
+         * @var array|null
+         */
+        public ?array $sections = array();
+
+        /**
+         * CSS output array.
+         *
+         * @var array|null
+         */
+        public ?array $output = array();
+
+        /**
+         * Options array.
+         *
+         * @var array
+         */
+        public array $options = array();
+
+        /**
+         * Parent options array.
+         *
+         * @var array
+         */
+        public array $parent_options = array();
+
+        /**
+         * Parent defaults array.
+         *
+         * @var array
+         */
+        public array $parent_defaults = array();
+
+        /**
+         * Post type fields array.
+         *
+         * @var array
+         */
+        public array $post_type_fields = array();
+
+        /**
+         * Options defaults array.
+         *
+         * @var array
+         */
+        public array $options_defaults = array();
+
+        /**
+         * Replace array.
+         *
+         * @var array
+         */
+        public array $to_replace = array();
+
+        /**
+         * Meta data array.
+         *
+         * @var array
+         */
+        public array $meta = array();
+
+        /**
+         * Post ID.
+         *
+         * @var null|int
+         */
+        public ?int $post_id = 0;
+
+        /**
+         * Base URI.
+         *
+         * @var string|null
+         */
+        public ?string $base_url;
+
+        /**
+         * WP_Links array.
+         *
+         * @var array
+         */
+        public array $wp_links = array();
+
+        /**
+         * Notices.
+         *
+         * @var array
+         */
+        private array $notices = array();
+
+        /**
+         * ReduxFramework_extension_metaboxes constructor.
+         *
+         * @param object $redux ReduxFramework object.
+         */
+        public function __construct( $redux ) {
+            global $pagenow;
+
+            parent::__construct( $redux, __FILE__ );
+
+            $this->parent->extensions['metaboxes'] = $this;
+
+            $this->extension_dir = trailingslashit( str_replace( '\\', '/', __DIR__ ) );
+            $this->extension_url = site_url( str_replace( trailingslashit( str_replace( '\\', '/', ABSPATH ) ), '', $this->extension_dir ) );
+
+            // Only run metaboxes on the pages/posts, not the front-end.
+            // The DOING_AJAX check allows for redux_post_meta to work inside
+            // AJAX calls. - kp.
+            if ( 'post-new.php' !== $pagenow && 'post.php' !== $pagenow ) {
+                if ( is_admin() ) {
+                    if ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) {
+                        return;
+                    }
+
+                    return;
+                }
+            }
+
+            if ( 'wp-cron.php' === $pagenow || 'wp-comments-post.php' === $pagenow ) {
+                return;
+            }
+
+            // Must not update the DB when just updating metaboxes. Sheesh.
+            if ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) {
+                $this->parent->never_save_to_db = true;
+            }
+
+            include_once Redux_Core::$dir . 'inc/extensions/metaboxes/redux-metaboxes-helpers.php';
+
+            // phpcs:ignore Generic.Strings.UnnecessaryStringConcat
+            add_action( 'add_' . 'meta_' . 'boxes', array( $this, 'add' ) );
+            add_action( 'save_post', array( $this, 'meta_boxes_save' ), 1, 2 );
+            add_action( 'pre_post_update', array( $this, 'pre_post_update' ) );
+            add_action( 'admin_notices', array( $this, 'meta_boxes_show_errors' ), 0 );
+            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 20 );
+
+            // Global variable overrides for within loops.
+            add_action( 'the_post', array( $this, 'loop_start' ), 0 );
+            add_action( 'loop_end', array( $this, 'loop_end' ), 0 );
+
+            $this->init();
+        }
+
+        /**
+         * Added class names to metabox DIV.
+         *
+         * @param array $classes Class array.
+         *
+         * @return array
+         */
+        public function add_box_classes( array $classes ): array {
+            $classes[] = 'redux-metabox';
+            $classes[] = 'redux-' . $this->parent->args['opt_name'];
+
+            if ( '' !== $this->parent->args['class'] ) {
+                $classes[] = $this->parent->args['class'];
+            }
+
+            return $classes;
+        }
+
+        /**
+         * Class init.
+         */
+        public function init() {
+            global $pagenow;
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $this->boxes = apply_filters( 'redux/metaboxes/' . $this->parent->args['opt_name'] . '/boxes', $this->boxes, $this->parent->args['opt_name'] );
+
+            if ( empty( $this->boxes ) && class_exists( 'Redux_Metaboxes' ) ) {
+                $this->boxes = Redux_Metaboxes::construct_boxes( $this->parent->args['opt_name'] );
+            }
+
+            if ( empty( $this->boxes ) || ! is_array( $this->boxes ) ) {
+                return;
+            }
+
+            if ( isset( Redux_Core::$server['HTTP_HOST'] ) && isset( Redux_Core::$server['REQUEST_URI'] ) ) {
+                $this->base_url = ( is_ssl() ? 'https://' : 'http://' ) . sanitize_text_field( wp_unslash( Redux_Core::$server['HTTP_HOST'] ) ) . sanitize_text_field( wp_unslash( Redux_Core::$server['REQUEST_URI'] ) ); // Safe & Reliable.
+                $this->post_id  = $this->url_to_postid( ( is_ssl() ? 'https://' : 'http://' ) . sanitize_text_field( wp_unslash( Redux_Core::$server['HTTP_HOST'] ) ) . sanitize_text_field( wp_unslash( Redux_Core::$server['REQUEST_URI'] ) ) );
+            }
+
+            if ( is_admin() && isset( $_GET['post_type'] ) && ! empty( $_GET['post_type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $this->post_type = sanitize_text_field( wp_unslash( $_GET['post_type'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+            } else {
+                $this->post_type = get_post_type( $this->post_id );
+            }
+
+            foreach ( $this->boxes as $bk => $box ) {
+
+                // If the post-ids for this box are set, we're limiting to the current post id.
+                if ( ! empty( $box['post_ids'] ) ) {
+                    if ( ! is_array( $box['post_ids'] ) ) {
+                        $box['post_ids'] = array( $box['post_ids'] );
+                    }
+                    if ( ! in_array( $this->post_id, $box['post_ids'], true ) ) {
+                        continue;
+                    }
+                }
+
+                if ( ! empty( $box['sections'] ) ) {
+                    $this->sections = wp_parse_args( $this->sections, $box['sections'] );
+
+                    $this->post_types = wp_parse_args( $this->post_types, $box['post_types'] );
+
+                    // Checking to override the parent variables.
+                    $add_field = false;
+
+                    foreach ( $box['post_types'] as $type ) {
+                        if ( $this->post_type === $type ) {
+                            $add_field = true;
+                        }
+                    }
+
+                    // Replacing all the fields.
+                    if ( $add_field || ( ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) || ( ! is_admin() ) ) ) {
+                        $run_hooks = true;
+
+                        $box_id = 'redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'];
+
+                        // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                        do_action( 'redux/' . $this->parent->args['opt_name'] . '/extensions/metabox/init', $this, $box );
+
+                        if ( isset( $box['page_template'] ) && 'page' === $this->post_type ) {
+                            if ( ! is_array( $box['page_template'] ) ) {
+                                $box['page_template'] = array( $box['page_template'] );
+                            }
+
+                            $this->wp_links[ $box_id ]['page_template'] = isset( $this->wp_links[ $box_id ]['page_template'] ) ? wp_parse_args( $this->wp_links[ $box_id ]['page_template'], $box['page_template'] ) : $box['page_template'];
+                        }
+
+                        if ( isset( $box['post_format'] ) && ( in_array( $this->post_type, $this->post_types, true ) || '' === $this->post_type || false === $this->post_type ) ) {
+                            if ( ! is_array( $box['post_format'] ) ) {
+                                $box['post_format'] = array( $box['post_format'] );
+                            }
+
+                            $this->wp_links[ $box_id ]['post_format'] = isset( $this->wp_links[ $box_id ]['post_format'] ) ? wp_parse_args( $this->wp_links[ $box_id ]['post_format'], $box['post_format'] ) : $box['post_format'];
+                        }
+
+                        $this->meta[ $this->post_id ] = $this->get_meta( $this->post_id );
+
+                        foreach ( $box['sections'] as $sk => $section ) {
+                            if ( ! empty( $section['fields'] ) ) {
+                                foreach ( $section['fields'] as $fk => $field ) {
+                                    if ( ! isset( $field['class'] ) ) {
+                                        $field['class'] = '';
+
+                                        $this->boxes[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
+                                    }
+
+                                    if ( $add_field || ( ( is_admin() && ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) ) || ( ! is_admin() ) ) ) {
+                                        if ( empty( $field['id'] ) ) {
+                                            continue;
+                                        }
+
+                                        if ( isset( $field['default'] ) ) {
+                                            $this->options_defaults[ $field['id'] ] = $field['default'];
+                                        } else {
+                                            $this->options_defaults[ $field['id'] ] = $this->field_default( $field );
+                                        }
+
+                                        foreach ( $box['post_types'] as $type ) {
+                                            $this->post_type_fields[ $type ][ $field['id'] ] = 1;
+
+                                            if ( 'repeater' === $field['type'] ) {
+                                                foreach ( $field['fields'] as $val ) {
+                                                    $this->post_type_fields[ $type ][ $val['id'] ] = 1;
+                                                }
+                                            }
+                                        }
+
+                                        if ( ! empty( $field['output'] ) ) {
+                                            $this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
+                                        }
+
+                                        // Detect what field types are being used.
+                                        if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
+                                            $this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
+                                        } else {
+                                            $this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
+                                        }
+
+                                        if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
+                                            $this->to_replace[ $field['id'] ] = $field;
+                                        }
+                                    }
+
+                                    if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
+                                        $this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
+                                    }
+
+                                    if ( ! isset( $this->meta[ $this->post_id ][ $field['id'] ] ) ) {
+                                        $this->meta[ $this->post_id ][ $field['id'] ] = $this->options_defaults[ $field['id'] ];
+                                    }
+
+                                    // Only override if it exists, and it's not the default.
+                                    // phpcs:ignore Squiz.PHP.CommentedOutCode
+                                    // if ( isset( $this->meta[ $this->post_id ][ $field['id'] ] ) && isset( $field['default'] ) && $this->meta[ $this->post_id ][ $field['id'] ] === $field['default'] ) {
+                                    // unset($this->meta[$this->post_id][$field['id']]);
+                                    // } .
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ( isset( $run_hooks ) && true === $run_hooks ) {
+                $this->parent_options = array();
+
+                if ( ! empty( $this->to_replace ) ) {
+                    foreach ( $this->to_replace as $id => $field ) {
+
+                        // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                        add_filter( "redux/options/{$this->parent->args['opt_name']}/field/$id/register", array( $this, 'replace_field' ) );
+                    }
+                }
+
+                add_filter( "redux/options/{$this->parent->args['opt_name']}/options", array( $this, 'override_options' ) );
+                add_filter( "redux/field/{$this->parent->args['opt_name']}/_can_output_css", array( $this, 'override_can_output_css' ) );
+                add_filter( "redux/field/{$this->parent->args['opt_name']}/output_css", array( $this, 'output_css' ) );
+            }
+        }
+
+        /**
+         * Replace Field.
+         *
+         * @param array $field Field array.
+         *
+         * @return mixed
+         */
+        public function replace_field( array $field ) {
+            if ( isset( $this->to_replace[ $field['id'] ] ) ) {
+                $field = $this->to_replace[ $field['id'] ];
+            }
+
+            return $field;
+        }
+
+        /**
+         * Override CSS output.
+         *
+         * @param array $field Field array.
+         *
+         * @return array
+         */
+        public function override_can_output_css( array $field ): array {
+            if ( isset( $this->output[ $field['id'] ] ) ) {
+                $field['force_output'] = true;
+            }
+
+            return $field;
+        }
+
+        /**
+         * Output CSS.
+         *
+         * @param array $field Field array.
+         *
+         * @return array
+         */
+        public function output_css( array $field ): array {
+            if ( isset( $this->output[ $field['id'] ] ) ) {
+                $field['output'] = $this->output[ $field['id'] ];
+            }
+
+            return $field;
+        }
+
+        /**
+         * Make sure the defaults are the defaults
+         *
+         * @param array $options Options array.
+         *
+         * @return array
+         */
+        public function override_options( array $options ): array {
+            $this->parent->default_values();
+            $this->parent_defaults = $this->parent->options_defaults;
+
+            $meta = $this->get_meta( $this->post_id );
+            $data = wp_parse_args( $meta, $this->options_defaults );
+
+            foreach ( $data as $key => $value ) {
+                if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
+                    $data[ $key ] = $meta[ $key ];
+                    continue;
+                }
+
+                if ( isset( $options[ $key ] ) ) {
+                    $data[ $key ] = $options[ $key ];
+                }
+            }
+
+            $this->parent->options_defaults = wp_parse_args( $this->options_defaults, $this->parent->options_defaults );
+
+            return wp_parse_args( $data, $options );
+        }
+
+        /**
+         * Loop start.
+         *
+         * @param mixed $the_post WP_Post object.
+         *
+         * @return array|void
+         */
+        public function loop_start( $the_post = array() ) {
+            if ( is_admin() ) {
+                return $the_post;
+            }
+
+            if ( isset( $the_post ) && is_array( $the_post ) ) {
+                global $post;
+                $the_post = $post;
+            }
+
+            if ( isset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] ) ) {
+                $GLOBALS[ $this->parent->args['global_variable'] ] = $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ];
+                unset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
+            }
+
+            // Override these values if they differ from the admin panel defaults.  ;) .
+            if ( in_array( $the_post->post_type, $this->post_types, true ) ) {
+                $meta = $this->get_meta( $the_post->ID );
+                if ( empty( $meta ) ) {
+                    return;
+                }
+
+                // Backup the args.
+                $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] = $GLOBALS[ $this->parent->args['global_variable'] ];
+                $GLOBALS[ $this->parent->args['global_variable'] ]           = wp_parse_args( $meta, $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
+            }
+        }
+
+        /**
+         * Loop end.
+         */
+        public function loop_end() {
+            if ( isset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] ) ) {
+                $GLOBALS[ $this->parent->args['global_variable'] ] = $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ];
+
+                unset( $GLOBALS[ $this->parent->args['global_variable'] . '-loop' ] );
+            }
+        }
+
+        /**
+         * Enqueue fields.
+         */
+        public function enqueue() {
+            global $pagenow;
+
+            $types = array();
+
+            // Enqueue CSS.
+            foreach ( $this->boxes as $key => $box ) {
+                if ( empty( $box['sections'] ) ) {
+                    continue;
+                }
+
+                if ( isset( $box['post_types'] ) ) {
+                    $types = array_merge( $box['post_types'], $types );
+                }
+
+                if ( ! empty( $box['post_types'] ) ) {
+                    if ( ! is_array( $box['post_types'] ) ) {
+                        $box['post_types']                 = array( $box['post_types'] );
+                        $this->boxes[ $key ]['post_types'] = $box['post_types'];
+                    }
+                }
+            }
+
+            if ( 'post-new.php' === $pagenow || 'post.php' === $pagenow ) {
+                global $post;
+
+                if ( in_array( $post->post_type, $types, true ) ) {
+                    $this->parent->transients       = get_transient( $this->parent->args['opt_name'] . '-transients-metaboxes' );
+                    $this->parent->transients_check = $this->parent->transients;
+
+                    if ( isset( $this->parent->transients['notices'] ) ) {
+                        $this->notices                              = $this->parent->transients['notices'];
+                        $this->parent->transients['last_save_mode'] = 'metaboxes';
+                    }
+
+                    delete_transient( $this->parent->args['opt_name'] . '-transients-metaboxes' );
+                    $this->parent->enqueue_class->init();
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/metaboxes/{$this->parent->args['opt_name']}/enqueue" );
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/{$this->parent->args['opt_name']}/extensions/metaboxes/enqueue" );
+
+                    /**
+                     * Redux metaboxes CSS
+                     * filter 'redux/page/{opt_name}/enqueue/redux-extension-metaboxes-css'
+                     */
+                    if ( $this->parent->args['dev_mode'] ) {
+                        wp_enqueue_style(
+                            'redux-extension-metaboxes',
+                            apply_filters( "redux/metaboxes/{$this->parent->args['opt_name']}/enqueue/redux-extension-metaboxes-css", $this->extension_url . 'redux-extension-metaboxes.css' ), // phpcs:ignore: WordPress.NamingConventions.ValidHookName
+                            array(),
+                            self::$version
+                        );
+                    }
+
+                    /**
+                     * Redux metaboxes JS
+                     * filter 'redux/page/{opt_name}/enqueue/redux-extension-metaboxes-js
+                     */
+                    wp_enqueue_script(
+                        'redux-extension-metaboxes',
+                        apply_filters( "redux/metaboxes/{$this->parent->args['opt_name']}/enqueue/redux-extension-metaboxes-js", $this->extension_url . 'redux-extension-metaboxes' . Redux_Functions::isMin() . '.js' ), // phpcs:ignore: WordPress.NamingConventions.ValidHookName
+                        array( 'jquery', 'redux-js' ),
+                        self::$version,
+                        true
+                    );
+
+                    // Values used by the javascript.
+                    wp_localize_script(
+                        'redux-extension-metaboxes',
+                        'reduxMetaboxes',
+                        $this->wp_links
+                    );
+
+                    wp_localize_script(
+                        'redux-extension-metaboxes',
+                        'reduxMetaboxesPageTemplate',
+                        array(
+                            '_wp_page_template' => get_post_meta( get_the_ID(), '_wp_page_template', true ),
+                        )
+                    );
+                }
+            }
+        }
+
+        /* Post URLs to IDs function, supports custom post types - borrowed and modified from url_to_postid() in wp-includes/rewrite.php */
+
+        // Taken from http://betterwp.net/wordpress-tips/url_to_postid-for-custom-post-types/
+        // Customized to work with non-rewrite URLs
+        // Modified by Dovy Paukstys (@dovy) of Redux Framework.
+
+        /**
+         * URL to PostID.
+         *
+         * @param string $url URL.
+         *
+         * @return int|mixed|void
+         */
+        private function url_to_postid( string $url ) {
+            global $wp_rewrite, $pagenow;
+
+            if ( ! empty( $this->post_id ) ) {
+                return $this->post_id;
+            }
+
+            if ( isset( $_GET['post'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification
+                $post = (int) sanitize_text_field( wp_unslash( $_GET['post'] ) );  // phpcs:ignore WordPress.Security.NonceVerification
+
+                if ( ! empty( $post ) ) {
+                    return $post;
+                }
+            }
+
+            if ( 'post-new.php' === $pagenow || 'wp-login.php' === $pagenow ) {
+                return;
+            }
+
+            if ( is_admin() && 'post.php' === $pagenow && isset( $_POST['post_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $post_id = sanitize_text_field( wp_unslash( $_POST['post_ID'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+                if ( ! empty( $post_id ) && is_numeric( $post_id ) ) {
+                    return $post_id;
+                }
+            }
+
+            $post_id = url_to_postid( $url );
+
+            if ( isset( $post_id ) && '' !== (string) $post_id && 0 !== $post_id ) {
+                return $post_id;
+            }
+
+            // First, check to see if there is a 'p=N' or 'page_id=N' to match against.
+            if ( preg_match( '#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values ) ) {
+                $id = absint( $values[2] );
+                if ( $id ) {
+                    return $id;
+                }
+            }
+
+            // Check to see if we are using rewrite rules.
+            if ( isset( $wp_rewrite ) ) {
+                $rewrite = $wp_rewrite->wp_rewrite_rules();
+            }
+
+            // Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options.
+            if ( empty( $rewrite ) ) {
+                if ( ! empty( $_GET ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+
+                    /************************************************************************
 					 * ADDED: Trys checks URL for ?posttype=postname
 					 ************************************************************************ */
 
-					// Assign $url to $temp_url just in case. :) .
-					$temp_url = $url;
-
-					// Get rid of the #anchor.
-					$url_split = explode( '#', $temp_url );
-					$temp_url  = $url_split[0];
-
-					// Get rid of URL ?query=string.
-					$url_query = explode( '&', $temp_url );
-					$temp_url  = $url_query[0];
-
-					// Get rid of ? mark.
-					$url_query = explode( '?', $temp_url );
-
-					if ( ! empty( $url_query[1] ) && strpos( $url_query[1], '=' ) ) {
-						$url_query = explode( '=', $url_query[1] );
-
-						if ( isset( $url_query[0] ) && isset( $url_query[1] ) ) {
-							$args = array(
-								'name'      => $url_query[1],
-								'post_type' => $url_query[0],
-								'showposts' => 1,
-							);
-
-							if ( get_posts( $args ) === $post ) {
-								return $post[0]->ID;
-							}
-						}
-					}
-
-					foreach ( $GLOBALS['wp_post_types'] as $key => $value ) {
-						if ( ! empty( $_GET[ $key ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-							$args = array(
-								'name'      => sanitize_text_field( wp_unslash( $_GET[ $key ] ) ), // phpcs:ignore WordPress.Security.NonceVerification
-								'post_type' => $key,
-								'showposts' => 1,
-							);
-
-							if ( get_posts( $args ) === $post ) {
-								return $post[0]->ID;
-							}
-						}
-					}
-				}
-			}
-
-			// Get rid of the #anchor.
-			$url_split = explode( '#', $url );
-			$url       = $url_split[0];
-
-			// Get rid of URL ?query=string.
-			$url_query = explode( '?', $url );
-			$url       = $url_query[0];
-
-			// Set the correct URL scheme.
-			$scheme = wp_parse_url( home_url(), PHP_URL_SCHEME );
-			$url    = set_url_scheme( $url, $scheme );
-
-			// Add 'www.' if it is absent and should be there.
-			if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {
-				$url = str_replace( '://', '://www.', $url );
-			}
-
-			// Strip 'www.' if it is present and shouldn't be.
-			if ( false === strpos( home_url(), '://www.' ) ) {
-				$url = str_replace( '://www.', '://', $url );
-			}
-
-			// Strip 'index.php/' if we're not using path info permalinks.
-			if ( isset( $wp_rewrite ) && ! $wp_rewrite->using_index_permalinks() ) {
-				$url = str_replace( 'index.php/', '', $url );
-			}
-
-			if ( false !== strpos( $url, home_url() ) ) {
-				// Chop off http://domain.com.
-				$url = str_replace( home_url(), '', $url );
-			} else {
-				// Chop off /path/to/blog.
-				$home_path = wp_parse_url( home_url() );
-				$home_path = $home_path['path'] ?? '';
-				$url       = str_replace( $home_path, '', $url );
-			}
-
-			// Trim leading and lagging slashes.
-			$url = trim( $url, '/' );
-
-			$request = $url;
-
-			if ( empty( $request ) && ( empty( $_GET ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				return get_option( 'page_on_front' );
-			}
-
-			// Look for matches.
-			$request_match = $request;
-
-			foreach ( $rewrite as $match => $query ) {
-				// If the requesting file is the anchor of the match, prepend it
-				// to the path info.
-				if ( ! empty( $url ) && ( $url !== $request ) && ( strpos( $match, $url ) === 0 ) ) {
-					$request_match = $url . '/' . $request;
-				}
-
-				if ( preg_match( "!^$match!", $request_match, $matches ) ) {
-					global $wp;
-
-					// Got a match.
-					// Trim the query of everything up to the '?'.
-					$query = preg_replace( '!^.+\?!', '', $query );
-
-					// Substitute the substring matches into the query.
-					$query = addslashes( WP_MatchesMapRegex::apply( $query, $matches ) );
-
-					// Filter out non-public query vars.
-					parse_str( $query, $query_vars );
-
-					$query = array();
-
-					foreach ( $query_vars as $key => $value ) {
-						if ( in_array( $key, $wp->public_query_vars, true ) ) {
-							$query[ $key ] = $value;
-						}
-					}
-
-					/************************************************************************
+                    // Assign $url to $temp_url just in case. :) .
+                    $temp_url = $url;
+
+                    // Get rid of the #anchor.
+                    $url_split = explode( '#', $temp_url );
+                    $temp_url  = $url_split[0];
+
+                    // Get rid of URL ?query=string.
+                    $url_query = explode( '&', $temp_url );
+                    $temp_url  = $url_query[0];
+
+                    // Get rid of ? mark.
+                    $url_query = explode( '?', $temp_url );
+
+                    if ( ! empty( $url_query[1] ) && strpos( $url_query[1], '=' ) ) {
+                        $url_query = explode( '=', $url_query[1] );
+
+                        if ( isset( $url_query[0] ) && isset( $url_query[1] ) ) {
+                            $args = array(
+                                'name'      => $url_query[1],
+                                'post_type' => $url_query[0],
+                                'showposts' => 1,
+                            );
+
+                            if ( get_posts( $args ) === $post ) {
+                                return $post[0]->ID;
+                            }
+                        }
+                    }
+
+                    foreach ( $GLOBALS['wp_post_types'] as $key => $value ) {
+                        if ( ! empty( $_GET[ $key ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                            $args = array(
+                                'name'      => sanitize_text_field( wp_unslash( $_GET[ $key ] ) ), // phpcs:ignore WordPress.Security.NonceVerification
+                                'post_type' => $key,
+                                'showposts' => 1,
+                            );
+
+                            if ( get_posts( $args ) === $post ) {
+                                return $post[0]->ID;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Get rid of the #anchor.
+            $url_split = explode( '#', $url );
+            $url       = $url_split[0];
+
+            // Get rid of URL ?query=string.
+            $url_query = explode( '?', $url );
+            $url       = $url_query[0];
+
+            // Set the correct URL scheme.
+            $scheme = wp_parse_url( home_url(), PHP_URL_SCHEME );
+            $url    = set_url_scheme( $url, $scheme );
+
+            // Add 'www.' if it is absent and should be there.
+            if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {
+                $url = str_replace( '://', '://www.', $url );
+            }
+
+            // Strip 'www.' if it is present and shouldn't be.
+            if ( false === strpos( home_url(), '://www.' ) ) {
+                $url = str_replace( '://www.', '://', $url );
+            }
+
+            // Strip 'index.php/' if we're not using path info permalinks.
+            if ( isset( $wp_rewrite ) && ! $wp_rewrite->using_index_permalinks() ) {
+                $url = str_replace( 'index.php/', '', $url );
+            }
+
+            if ( false !== strpos( $url, home_url() ) ) {
+                // Chop off http://domain.com.
+                $url = str_replace( home_url(), '', $url );
+            } else {
+                // Chop off /path/to/blog.
+                $home_path = wp_parse_url( home_url() );
+                $home_path = $home_path['path'] ?? '';
+                $url       = str_replace( $home_path, '', $url );
+            }
+
+            // Trim leading and lagging slashes.
+            $url = trim( $url, '/' );
+
+            $request = $url;
+
+            if ( empty( $request ) && ( empty( $_GET ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                return get_option( 'page_on_front' );
+            }
+
+            // Look for matches.
+            $request_match = $request;
+
+            foreach ( $rewrite as $match => $query ) {
+                // If the requesting file is the anchor of the match, prepend it
+                // to the path info.
+                if ( ! empty( $url ) && ( $url !== $request ) && ( strpos( $match, $url ) === 0 ) ) {
+                    $request_match = $url . '/' . $request;
+                }
+
+                if ( preg_match( "!^$match!", $request_match, $matches ) ) {
+                    global $wp;
+
+                    // Got a match.
+                    // Trim the query of everything up to the '?'.
+                    $query = preg_replace( '!^.+\?!', '', $query );
+
+                    // Substitute the substring matches into the query.
+                    $query = addslashes( WP_MatchesMapRegex::apply( $query, $matches ) );
+
+                    // Filter out non-public query vars.
+                    parse_str( $query, $query_vars );
+
+                    $query = array();
+
+                    foreach ( $query_vars as $key => $value ) {
+                        if ( in_array( $key, $wp->public_query_vars, true ) ) {
+                            $query[ $key ] = $value;
+                        }
+                    }
+
+                    /************************************************************************
 					 * ADDED: $GLOBALS['wp_post_types'] doesn't seem to have custom posttypes
 					 * Trying below to find posttypes in $rewrite rules
 					 ************************************************************************ */
 
-					// PostType Array.
-					$post_types = array();
-
-					foreach ( $rewrite as $value ) {
-						if ( preg_match( '/post_type=([^&]+)/i', $value, $matched ) ) {
-							if ( isset( $matched[1] ) && ! in_array( $matched[1], $post_types, true ) ) {
-								$post_types[] = $matched[1];
-							}
-						}
-					}
-
-					foreach ( $query_vars as $key => $value ) {
-						if ( in_array( $key, $post_types, true ) ) {
-							$query['post_type'] = $key;
-							$query['postname']  = $value;
-						}
-					}
-
-					/************************************************************************
+                    // PostType Array.
+                    $post_types = array();
+
+                    foreach ( $rewrite as $value ) {
+                        if ( preg_match( '/post_type=([^&]+)/i', $value, $matched ) ) {
+                            if ( isset( $matched[1] ) && ! in_array( $matched[1], $post_types, true ) ) {
+                                $post_types[] = $matched[1];
+                            }
+                        }
+                    }
+
+                    foreach ( $query_vars as $key => $value ) {
+                        if ( in_array( $key, $post_types, true ) ) {
+                            $query['post_type'] = $key;
+                            $query['postname']  = $value;
+                        }
+                    }
+
+                    /************************************************************************
 					 * END ADD
 					 ************************************************************************ */
 
-					// Taken from class-wp.php.
-					foreach ( $GLOBALS['wp_post_types'] as $post_type => $t ) {
-						if ( isset( $t->query_var ) ) {
-							$post_type_query_vars[ $t->query_var ] = $post_type;
-						}
-					}
-
-					foreach ( $wp->public_query_vars as $wpvar ) {
-						if ( isset( $wp->extra_query_vars[ $wpvar ] ) ) {
-							$query[ $wpvar ] = $wp->extra_query_vars[ $wpvar ];
-						} elseif ( isset( $_POST[ $wpvar ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-							$query[ $wpvar ] = sanitize_text_field( wp_unslash( $_POST[ $wpvar ] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-						} elseif ( isset( $_GET[ $wpvar ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-							$query[ $wpvar ] = sanitize_text_field( wp_unslash( $_GET[ $wpvar ] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-						} elseif ( isset( $query_vars[ $wpvar ] ) ) {
-							$query[ $wpvar ] = $query_vars[ $wpvar ];
-						}
-
-						if ( ! empty( $query[ $wpvar ] ) ) {
-							if ( ! is_array( $query[ $wpvar ] ) ) {
-								$query[ $wpvar ] = (string) $query[ $wpvar ];
-							} else {
-								foreach ( $query[ $wpvar ] as $vkey => $v ) {
-									if ( ! is_object( $v ) ) {
-										$query[ $wpvar ][ $vkey ] = (string) $v;
-									}
-								}
-							}
-
-							if ( isset( $post_type_query_vars[ $wpvar ] ) ) {
-								$query['post_type'] = $post_type_query_vars[ $wpvar ];
-								$query['name']      = $query[ $wpvar ];
-							}
-						}
-					}
-
-					// Do the query.
-					if ( ! empty( $query['pagename'] ) ) {
-						$args = array(
-							'name'      => $query['pagename'],
-							'post_type' => 'page',
-							'showposts' => 1,
-						);
-
-						if ( isset( $post ) && get_posts( $args ) === $post ) {
-							return $post[0]->ID;
-						}
-					}
-
-					$query = new WP_Query( $query );
-
-					if ( ! empty( $query->posts ) && $query->is_singular ) {
-						return $query->post->ID;
-					} else {
-
-						// WooCommerce override.
-						if ( isset( $query->query['post_type'] ) && 'product' === $query->query['post_type'] && class_exists( 'WooCommerce' ) ) {
-							return get_option( 'woocommerce_shop_page_id' );
-						}
-					}
-
-					if ( ( empty( $query->page ) ) && ( empty( $query->pagename ) ) ) {
-						return 0;
-					}
-				}
-			}
-
-			return 0;
-		}
-
-		/**
-		 * Get default values.
-		 */
-		public function default_values() {
-			if ( ! empty( $this->boxes ) && empty( $this->options_defaults ) ) {
-				foreach ( $this->boxes as $key => $box ) {
-					if ( empty( $box['sections'] ) ) {
-						continue;
-					}
-
-					// fill the cache.
-					foreach ( $box['sections'] as $sk => $section ) {
-						if ( ! isset( $section['id'] ) ) {
-							if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
-								$section['id'] = $sk;
-							} else {
-								$section['id'] = sanitize_text_field( $section['title'] );
-							}
-							$this->boxes[ $key ]['sections'][ $sk ] = $section;
-						}
-						if ( isset( $section['fields'] ) ) {
-							foreach ( $section['fields'] as $k => $field ) {
-
-								if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
-									continue;
-								}
-
-								if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
-									$this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
-									unset( $this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
-								}
-
-								if ( 'section' === $field['type'] && isset( $field['indent'] ) && ( true === $field['indent'] || 'true' === $field['indent'] ) ) {
-									$field['class']  = $field['class'] ?? '';
-									$field['class'] .= 'redux-section-indent-start';
-
-									$this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
-								}
-
-								if ( ! isset( $this->parent->options_defaults_class ) ) {
-									$this->parent->options_defaults_class = new Redux_Options_Defaults();
-								}
-
-								$this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $field );
-
-								if ( 'repeater' === $field['type'] ) {
-									foreach ( $field['fields'] as $f ) {
-										$this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $f, null, true );
-									}
-								}
-
-								$this->parent->options_defaults = $this->parent->options_defaults_class->options_defaults;
-							}
-						}
-					}
-				}
-			}
-
-			if ( empty( $this->meta[ $this->post_id ] ) ) {
-				$this->meta[ $this->post_id ] = $this->get_meta( $this->post_id );
-			}
-		}
-
-		/**
-		 * Add Meta Boxes
-		 */
-		public function add() {
-			if ( empty( $this->boxes ) || ! is_array( $this->boxes ) ) {
-				return;
-			}
-
-			foreach ( $this->boxes as $key => $box ) {
-				if ( empty( $box['sections'] ) ) {
-					continue;
-				}
-
-				// Save users from themselves.
-				if ( isset( $box['position'] ) && ! in_array( strtolower( $box['position'] ), array( 'normal', 'advanced', 'side' ), true ) ) {
-					unset( $box['position'] );
-				}
-
-				if ( isset( $box['priority'] ) && ! in_array( strtolower( $box['priority'] ), array( 'high', 'core', 'default', 'low' ), true ) ) {
-					unset( $box['priority'] );
-				}
-
-				$defaults = array(
-					'id'         => $key . '-' . $this->parent->args['opt_name'],
-					'post_types' => array( 'page', 'post' ),
-					'position'   => 'normal',
-					'priority'   => 'high',
-				);
-
-				$box = wp_parse_args( $box, $defaults );
-				if ( ! empty( $box['post_types'] ) ) {
-					foreach ( $box['post_types'] as $posttype ) {
-						if ( isset( $box['title'] ) ) {
-							$title = $box['title'];
-						} elseif ( isset( $box['sections'] ) && 1 === count( $box['sections'] ) && isset( $box['sections'][0]['fields'] ) && 1 === count( $box['sections'][0]['fields'] ) && isset( $box['sections'][0]['fields'][0]['title'] ) ) {
-
-								// If only one field in this box.
-								$title = $box['sections'][0]['fields'][0]['title'];
-						} else {
-							$title = ucfirst( $posttype ) . ' ' . __( 'Options', 'redux-framework' );
-						}
-
-						$args = array(
-							'position' => $box['position'],
-							'sections' => $box['sections'],
-							'key'      => $key,
-						);
-
-						// Override the parent args on a metabox level.
-						if ( empty( $this->orig_args ) ) {
-							$this->orig_args = $this->parent->args;
-						}
-
-						if ( isset( $box['args'] ) ) {
-							$this->parent->args = wp_parse_args( $box['args'], $this->orig_args );
-						} elseif ( $this->parent->args !== $this->orig_args ) {
-							$this->parent->args = $this->orig_args;
-						}
-
-						add_filter( 'postbox_classes_' . $posttype . '_redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'], array( $this, 'add_box_classes' ) );
-
-						// phpcs:ignore WordPress.NamingConventions.ValidHookName
-						do_action( 'redux/' . $this->parent->args['opt_name'] . '/extensions/metabox/add', $this, $box, $posttype );
-
-						if ( isset( $box['post_format'] ) ) {
-							add_filter( 'postbox_classes_' . $posttype . '_redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'], array( $this, 'add_box_hide_class' ) );
-						}
-
-						// phpcs:ignore Generic.Strings.UnnecessaryStringConcat
-						call_user_func( 'add' . '_meta' . '_box', 'redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'], $title, array( $this, 'generate_boxes' ), $posttype, $box['position'], $box['priority'], $args );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Add hidden class to metabox DIV.
-		 *
-		 * @param array $classes Class array.
-		 *
-		 * @return array
-		 */
-		public function add_box_hide_class( array $classes ): array {
-			$classes[] = 'hide';
-
-			return $classes;
-		}
-
-		/**
-		 * Field Defaults.
-		 *
-		 * @param mixed $field_id ID.
-		 *
-		 * @return mixed|string
-		 */
-		private function field_default( $field_id ) {
-			if ( ! isset( $this->parent->options_defaults ) ) {
-				$this->parent->options_defaults = $this->parent->default_values();
-			}
-
-			if ( ! isset( $this->parent->options ) || empty( $this->parent->options ) ) {
-				if ( ! isset( $this->parent->options_class ) ) {
-					$this->parent->options_class = new Redux_Options_Constructor( $this->parent );
-				}
-
-				$this->parent->options_class->get();
-			}
-
-			$this->options = $this->parent->options;
-
-			if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
-				return $this->parent->options[ $field_id['id'] ];
-			} else {
-				if ( empty( $this->options_defaults ) ) {
-					$this->default_values(); // fill cache.
-				}
-
-				$data = '';
-				if ( ! empty( $this->options_defaults ) ) {
-					$data = $this->options_defaults[ $field_id['id'] ] ?? '';
-				}
-
-				if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
-					$data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
-				}
-
-				return $data;
-			}
-		}
-
-		/**
-		 * Function to get and cache the post meta.
-		 *
-		 * @param mixed $id ID.
-		 *
-		 * @return array
-		 */
-		private function get_meta( $id ): array {
-			if ( ! isset( $this->meta[ $id ] ) ) {
-				$this->meta[ $id ] = array();
-				$o_data            = get_post_meta( $id );
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$o_data = apply_filters( "redux/metaboxes/{$this->parent->args['opt_name']}/get_meta", $o_data );
-
-				if ( ! empty( $o_data ) ) {
-					foreach ( $o_data as $key => $value ) {
-						if ( 1 === count( $value ) ) {
-							$this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
-						} else {
-							$new_value = array_map( 'maybe_unserialize', $value );
-
-							$this->meta[ $id ][ $key ] = $new_value[0];
-						}
-					}
-				}
-
-				if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
-					$data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
-
-					foreach ( $data as $key => $value ) {
-						$this->meta[ $id ][ $key ] = $value;
-						update_post_meta( $id, $key, $value );
-					}
-
-					unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
-
-					delete_post_meta( $id, $this->parent->args['opt_name'] );
-				}
-			}
-
-			return $this->meta[ $id ];
-		}
-
-		/**
-		 * Get values.
-		 *
-		 * @param mixed  $the_post Post object/id.
-		 * @param string $meta_key Meta key.
-		 * @param mixed  $def_val  Def value.
-		 *
-		 * @return array|mixed|string
-		 */
-		public function get_values( $the_post, string $meta_key = '', $def_val = '' ) {
-
-			// Override these values if they differ from the admin panel defaults.  ;) .
-			if ( isset( $the_post->post_type ) && in_array( $the_post->post_type, $this->post_types, true ) ) {
-				if ( isset( $this->post_type_values[ $the_post->post_type ] ) ) {
-					$meta = $this->post_type_fields[ $the_post->post_type ];
-				} else {
-					$defaults = array();
-					if ( ! empty( $this->post_type_fields[ $the_post->post_type ] ) ) {
-						foreach ( $this->post_type_fields[ $the_post->post_type ] as $key => $null ) {
-							if ( isset( $this->options_defaults[ $key ] ) ) {
-								$defaults[ $key ] = $this->options_defaults[ $key ];
-							}
-						}
-					}
-
-					$meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
-
-					$this->post_type_fields[ $the_post->post_type ] = $meta;
-				}
-
-				if ( ! empty( $meta_key ) ) {
-					if ( ! isset( $meta[ $meta_key ] ) ) {
-						$meta[ $meta_key ] = $def_val;
-					}
-
-					return $meta[ $meta_key ];
-				} else {
-					return $meta;
-				}
-			}
-
-			return $def_val;
-		}
-
-		/**
-		 * Generate Boxes.
-		 *
-		 * @param mixed $post Post.
-		 * @param array $metabox Metabox array.
-		 */
-		public function generate_boxes( $post, array $metabox ) {
-			if ( ! empty( $metabox['args']['permissions'] ) && ! Redux_Helpers::current_user_can( $metabox['args']['permissions'] ) ) {
-				return;
-			}
-
-			$sections = $metabox['args']['sections'];
-
-			wp_nonce_field( 'redux_metaboxes_meta_nonce', 'redux_metaboxes_meta_nonce' );
-
-			wp_dequeue_script( 'json-view-js' );
-
-			$sidebar = true;
-
-			if ( 'side' === $metabox['args']['position'] || 1 === count( $sections ) || ( isset( $metabox['args']['sidebar'] ) && false === $metabox['args']['sidebar'] ) ) {
-				$sidebar = false; // Show the section dividers or not.
-			}
-
-			?>
+                    // Taken from class-wp.php.
+                    foreach ( $GLOBALS['wp_post_types'] as $post_type => $t ) {
+                        if ( isset( $t->query_var ) ) {
+                            $post_type_query_vars[ $t->query_var ] = $post_type;
+                        }
+                    }
+
+                    foreach ( $wp->public_query_vars as $wpvar ) {
+                        if ( isset( $wp->extra_query_vars[ $wpvar ] ) ) {
+                            $query[ $wpvar ] = $wp->extra_query_vars[ $wpvar ];
+                        } elseif ( isset( $_POST[ $wpvar ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                            $query[ $wpvar ] = sanitize_text_field( wp_unslash( $_POST[ $wpvar ] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+                        } elseif ( isset( $_GET[ $wpvar ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                            $query[ $wpvar ] = sanitize_text_field( wp_unslash( $_GET[ $wpvar ] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+                        } elseif ( isset( $query_vars[ $wpvar ] ) ) {
+                            $query[ $wpvar ] = $query_vars[ $wpvar ];
+                        }
+
+                        if ( ! empty( $query[ $wpvar ] ) ) {
+                            if ( ! is_array( $query[ $wpvar ] ) ) {
+                                $query[ $wpvar ] = (string) $query[ $wpvar ];
+                            } else {
+                                foreach ( $query[ $wpvar ] as $vkey => $v ) {
+                                    if ( ! is_object( $v ) ) {
+                                        $query[ $wpvar ][ $vkey ] = (string) $v;
+                                    }
+                                }
+                            }
+
+                            if ( isset( $post_type_query_vars[ $wpvar ] ) ) {
+                                $query['post_type'] = $post_type_query_vars[ $wpvar ];
+                                $query['name']      = $query[ $wpvar ];
+                            }
+                        }
+                    }
+
+                    // Do the query.
+                    if ( ! empty( $query['pagename'] ) ) {
+                        $args = array(
+                            'name'      => $query['pagename'],
+                            'post_type' => 'page',
+                            'showposts' => 1,
+                        );
+
+                        if ( isset( $post ) && get_posts( $args ) === $post ) {
+                            return $post[0]->ID;
+                        }
+                    }
+
+                    $query = new WP_Query( $query );
+
+                    if ( ! empty( $query->posts ) && $query->is_singular ) {
+                        return $query->post->ID;
+                    } else {
+
+                        // WooCommerce override.
+                        if ( isset( $query->query['post_type'] ) && 'product' === $query->query['post_type'] && class_exists( 'WooCommerce' ) ) {
+                            return get_option( 'woocommerce_shop_page_id' );
+                        }
+                    }
+
+                    if ( ( empty( $query->page ) ) && ( empty( $query->pagename ) ) ) {
+                        return 0;
+                    }
+                }
+            }
+
+            return 0;
+        }
+
+        /**
+         * Get default values.
+         */
+        public function default_values() {
+            if ( ! empty( $this->boxes ) && empty( $this->options_defaults ) ) {
+                foreach ( $this->boxes as $key => $box ) {
+                    if ( empty( $box['sections'] ) ) {
+                        continue;
+                    }
+
+                    // fill the cache.
+                    foreach ( $box['sections'] as $sk => $section ) {
+                        if ( ! isset( $section['id'] ) ) {
+                            if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
+                                $section['id'] = $sk;
+                            } else {
+                                $section['id'] = sanitize_text_field( $section['title'] );
+                            }
+                            $this->boxes[ $key ]['sections'][ $sk ] = $section;
+                        }
+                        if ( isset( $section['fields'] ) ) {
+                            foreach ( $section['fields'] as $k => $field ) {
+
+                                if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
+                                    continue;
+                                }
+
+                                if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
+                                    $this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
+                                    unset( $this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
+                                }
+
+                                if ( 'section' === $field['type'] && isset( $field['indent'] ) && ( true === $field['indent'] || 'true' === $field['indent'] ) ) {
+                                    $field['class']  = $field['class'] ?? '';
+                                    $field['class'] .= 'redux-section-indent-start';
+
+                                    $this->boxes[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
+                                }
+
+                                if ( ! isset( $this->parent->options_defaults_class ) ) {
+                                    $this->parent->options_defaults_class = new Redux_Options_Defaults();
+                                }
+
+                                $this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $field );
+
+                                if ( 'repeater' === $field['type'] ) {
+                                    foreach ( $field['fields'] as $f ) {
+                                        $this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $f, null, true );
+                                    }
+                                }
+
+                                $this->parent->options_defaults = $this->parent->options_defaults_class->options_defaults;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ( empty( $this->meta[ $this->post_id ] ) ) {
+                $this->meta[ $this->post_id ] = $this->get_meta( $this->post_id );
+            }
+        }
+
+        /**
+         * Add Meta Boxes
+         */
+        public function add() {
+            if ( empty( $this->boxes ) || ! is_array( $this->boxes ) ) {
+                return;
+            }
+
+            foreach ( $this->boxes as $key => $box ) {
+                if ( empty( $box['sections'] ) ) {
+                    continue;
+                }
+
+                // Save users from themselves.
+                if ( isset( $box['position'] ) && ! in_array( strtolower( $box['position'] ), array( 'normal', 'advanced', 'side' ), true ) ) {
+                    unset( $box['position'] );
+                }
+
+                if ( isset( $box['priority'] ) && ! in_array( strtolower( $box['priority'] ), array( 'high', 'core', 'default', 'low' ), true ) ) {
+                    unset( $box['priority'] );
+                }
+
+                $defaults = array(
+                    'id'         => $key . '-' . $this->parent->args['opt_name'],
+                    'post_types' => array( 'page', 'post' ),
+                    'position'   => 'normal',
+                    'priority'   => 'high',
+                );
+
+                $box = wp_parse_args( $box, $defaults );
+                if ( ! empty( $box['post_types'] ) ) {
+                    foreach ( $box['post_types'] as $posttype ) {
+                        if ( isset( $box['title'] ) ) {
+                            $title = $box['title'];
+                        } elseif ( isset( $box['sections'] ) && 1 === count( $box['sections'] ) && isset( $box['sections'][0]['fields'] ) && 1 === count( $box['sections'][0]['fields'] ) && isset( $box['sections'][0]['fields'][0]['title'] ) ) {
+
+                                // If only one field in this box.
+                                $title = $box['sections'][0]['fields'][0]['title'];
+                        } else {
+                            $title = ucfirst( $posttype ) . ' ' . __( 'Options', 'redux-framework' );
+                        }
+
+                        $args = array(
+                            'position' => $box['position'],
+                            'sections' => $box['sections'],
+                            'key'      => $key,
+                        );
+
+                        // Override the parent args on a metabox level.
+                        if ( empty( $this->orig_args ) ) {
+                            $this->orig_args = $this->parent->args;
+                        }
+
+                        if ( isset( $box['args'] ) ) {
+                            $this->parent->args = wp_parse_args( $box['args'], $this->orig_args );
+                        } elseif ( $this->parent->args !== $this->orig_args ) {
+                            $this->parent->args = $this->orig_args;
+                        }
+
+                        add_filter( 'postbox_classes_' . $posttype . '_redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'], array( $this, 'add_box_classes' ) );
+
+                        // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                        do_action( 'redux/' . $this->parent->args['opt_name'] . '/extensions/metabox/add', $this, $box, $posttype );
+
+                        if ( isset( $box['post_format'] ) ) {
+                            add_filter( 'postbox_classes_' . $posttype . '_redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'], array( $this, 'add_box_hide_class' ) );
+                        }
+
+                        // phpcs:ignore Generic.Strings.UnnecessaryStringConcat
+                        call_user_func( 'add' . '_meta' . '_box', 'redux-' . $this->parent->args['opt_name'] . '-metabox-' . $box['id'], $title, array( $this, 'generate_boxes' ), $posttype, $box['position'], $box['priority'], $args );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Add hidden class to metabox DIV.
+         *
+         * @param array $classes Class array.
+         *
+         * @return array
+         */
+        public function add_box_hide_class( array $classes ): array {
+            $classes[] = 'hide';
+
+            return $classes;
+        }
+
+        /**
+         * Field Defaults.
+         *
+         * @param mixed $field_id ID.
+         *
+         * @return mixed|string
+         */
+        private function field_default( $field_id ) {
+            if ( ! isset( $this->parent->options_defaults ) ) {
+                $this->parent->options_defaults = $this->parent->default_values();
+            }
+
+            if ( ! isset( $this->parent->options ) || empty( $this->parent->options ) ) {
+                if ( ! isset( $this->parent->options_class ) ) {
+                    $this->parent->options_class = new Redux_Options_Constructor( $this->parent );
+                }
+
+                $this->parent->options_class->get();
+            }
+
+            $this->options = $this->parent->options;
+
+            if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
+                return $this->parent->options[ $field_id['id'] ];
+            } else {
+                if ( empty( $this->options_defaults ) ) {
+                    $this->default_values(); // fill cache.
+                }
+
+                $data = '';
+                if ( ! empty( $this->options_defaults ) ) {
+                    $data = $this->options_defaults[ $field_id['id'] ] ?? '';
+                }
+
+                if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
+                    $data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
+                }
+
+                return $data;
+            }
+        }
+
+        /**
+         * Function to get and cache the post meta.
+         *
+         * @param mixed $id ID.
+         *
+         * @return array
+         */
+        private function get_meta( $id ): array {
+            if ( ! isset( $this->meta[ $id ] ) ) {
+                $this->meta[ $id ] = array();
+                $o_data            = get_post_meta( $id );
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $o_data = apply_filters( "redux/metaboxes/{$this->parent->args['opt_name']}/get_meta", $o_data );
+
+                if ( ! empty( $o_data ) ) {
+                    foreach ( $o_data as $key => $value ) {
+                        if ( 1 === count( $value ) ) {
+                            $this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
+                        } else {
+                            $new_value = array_map( 'maybe_unserialize', $value );
+
+                            $this->meta[ $id ][ $key ] = $new_value[0];
+                        }
+                    }
+                }
+
+                if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
+                    $data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+
+                    foreach ( $data as $key => $value ) {
+                        $this->meta[ $id ][ $key ] = $value;
+                        update_post_meta( $id, $key, $value );
+                    }
+
+                    unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+
+                    delete_post_meta( $id, $this->parent->args['opt_name'] );
+                }
+            }
+
+            return $this->meta[ $id ];
+        }
+
+        /**
+         * Get values.
+         *
+         * @param mixed  $the_post Post object/id.
+         * @param string $meta_key Meta key.
+         * @param mixed  $def_val  Def value.
+         *
+         * @return array|mixed|string
+         */
+        public function get_values( $the_post, string $meta_key = '', $def_val = '' ) {
+
+            // Override these values if they differ from the admin panel defaults.  ;) .
+            if ( isset( $the_post->post_type ) && in_array( $the_post->post_type, $this->post_types, true ) ) {
+                if ( isset( $this->post_type_values[ $the_post->post_type ] ) ) {
+                    $meta = $this->post_type_fields[ $the_post->post_type ];
+                } else {
+                    $defaults = array();
+                    if ( ! empty( $this->post_type_fields[ $the_post->post_type ] ) ) {
+                        foreach ( $this->post_type_fields[ $the_post->post_type ] as $key => $null ) {
+                            if ( isset( $this->options_defaults[ $key ] ) ) {
+                                $defaults[ $key ] = $this->options_defaults[ $key ];
+                            }
+                        }
+                    }
+
+                    $meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
+
+                    $this->post_type_fields[ $the_post->post_type ] = $meta;
+                }
+
+                if ( ! empty( $meta_key ) ) {
+                    if ( ! isset( $meta[ $meta_key ] ) ) {
+                        $meta[ $meta_key ] = $def_val;
+                    }
+
+                    return $meta[ $meta_key ];
+                } else {
+                    return $meta;
+                }
+            }
+
+            return $def_val;
+        }
+
+        /**
+         * Generate Boxes.
+         *
+         * @param mixed $post Post.
+         * @param array $metabox Metabox array.
+         */
+        public function generate_boxes( $post, array $metabox ) {
+            if ( ! empty( $metabox['args']['permissions'] ) && ! Redux_Helpers::current_user_can( $metabox['args']['permissions'] ) ) {
+                return;
+            }
+
+            $sections = $metabox['args']['sections'];
+
+            wp_nonce_field( 'redux_metaboxes_meta_nonce', 'redux_metaboxes_meta_nonce' );
+
+            wp_dequeue_script( 'json-view-js' );
+
+            $sidebar = true;
+
+            if ( 'side' === $metabox['args']['position'] || 1 === count( $sections ) || ( isset( $metabox['args']['sidebar'] ) && false === $metabox['args']['sidebar'] ) ) {
+                $sidebar = false; // Show the section dividers or not.
+            }
+
+            ?>
 			<input
 					type="hidden"
 					id="currentSection"
@@ -1221,21 +1221,21 @@ 
 					</div>
 				</div>
 				<?php
-				echo '<a href="javascript:void(0);" class="expand_options hide" style="display:none;">' . esc_html__( 'Expand', 'redux-framework' ) . '</a>';
-				if ( $sidebar ) {
-					?>
+                echo '<a href="javascript:void(0);" class="expand_options hide" style="display:none;">' . esc_html__( 'Expand', 'redux-framework' ) . '</a>';
+                if ( $sidebar ) {
+                    ?>
 					<div class="redux-sidebar">
 						<ul class="redux-group-menu">
 							<?php
 
-							foreach ( $sections as $s_key => $section ) {
-								if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
-									continue;
-								}
+                            foreach ( $sections as $s_key => $section ) {
+                                if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
+                                    continue;
+                                }
 
-								echo $this->parent->render_class->section_menu( $s_key, $section, '_box_' . $metabox['id'], $sections ); // phpcs:ignore WordPress.Security.EscapeOutput
-							}
-							?>
+                                echo $this->parent->render_class->section_menu( $s_key, $section, '_box_' . $metabox['id'], $sections ); // phpcs:ignore WordPress.Security.EscapeOutput
+                            }
+                            ?>
 						</ul>
 					</div>
 				<?php } ?>
@@ -1243,295 +1243,295 @@ 
 				<div class="redux-main">
 					<?php
 
-					foreach ( $sections as $s_key => $section ) {
-						if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
-							continue;
-						}
-						if ( ! empty( $section['fields'] ) ) {
-							if ( isset( $section['args'] ) ) {
-								$this->parent->args = wp_parse_args( $section['args'], $this->orig_args );
-							} elseif ( $this->parent->args !== $this->orig_args ) {
-								$this->parent->args = $this->orig_args;
-							}
-
-							$hide             = $sidebar ? '' : ' display-group';
-							$section['class'] = isset( $section['class'] ) ? ' ' . $section['class'] : '';
-							echo '<div id="' . esc_attr( $s_key ) . '_box_' . esc_attr( $metabox['id'] ) . '_section_group" class="redux-group-tab' . esc_attr( $section['class'] ) . ' redux_metabox_panel' . esc_attr( $hide ) . '">';
-
-							if ( ! empty( $section['title'] ) ) {
-								echo '<h3 class="redux-section-title">' . wp_kses_post( $section['title'] ) . '</h3>';
-							}
-
-							if ( ! empty( $section['desc'] ) ) {
-								echo '<div class="redux-section-desc">' . wp_kses_post( $section['desc'] ) . '</div>';
-							}
-
-							echo '<table class="form-table"><tbody>';
-							foreach ( $section['fields'] as $field ) {
-								if ( ! empty( $field['permissions'] ) && ! Redux_Helpers::current_user_can( $field['permissions'] ) ) {
-									continue;
-								}
-								$field['name'] = $this->parent->args['opt_name'] . '[' . $field['id'] . ']';
-
-								$is_hidden = false;
-								$ex_style  = '';
-								if ( isset( $field['hidden'] ) && $field['hidden'] ) {
-									$is_hidden = true;
-									$ex_style  = ' style="border-bottom: none;"';
-								}
-
-								echo '<tr valign="top"' . $ex_style . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
-
-								$th = $this->parent->render_class->get_header_html( $field );
-
-								if ( $is_hidden ) {
-									$str_pos = strpos( $th, 'redux_field_th' );
-
-									if ( $str_pos > - 1 ) {
-										$th = str_replace( 'redux_field_th', 'redux_field_th hide', $th );
-									}
-								}
-
-								if ( $sidebar ) {
-									if ( ! ( isset( $metabox['args']['sections'] ) && 1 === count( $metabox['args']['sections'] ) && isset( $metabox['args']['sections'][0]['fields'] ) && 1 === count( $metabox['args']['sections'][0]['fields'] ) ) && isset( $field['title'] ) ) {
-										echo '<th scope="row">';
-										if ( ! empty( $th ) ) {
-											echo $th; // phpcs:ignore WordPress.Security.EscapeOutput
-										}
-										echo '</th>';
-										echo '<td>';
-									}
-								} else {
-									echo '<td>' . $th; // phpcs:ignore WordPress.Security.EscapeOutput
-								}
-
-								if ( 'section' === $field['type'] && ( 'true' === $field['indent'] || true === $field['indent'] ) ) {
-									$field['class']  = $field['class'] ?? '';
-									$field['class'] .= 'redux-section-indent-start';
-								}
-
-								if ( ! isset( $this->meta[ $this->post_id ][ $field['id'] ] ) ) {
-									$this->meta[ $this->post_id ][ $field['id'] ] = '';
-								}
-
-								$this->parent->render_class->field_input( $field, $this->meta[ $this->post_id ][ $field['id'] ], true );
-								echo '</td></tr>';
-							}
-							echo '</tbody></table>';
-							echo '</div>';
-						}
-					}
-					?>
+                    foreach ( $sections as $s_key => $section ) {
+                        if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
+                            continue;
+                        }
+                        if ( ! empty( $section['fields'] ) ) {
+                            if ( isset( $section['args'] ) ) {
+                                $this->parent->args = wp_parse_args( $section['args'], $this->orig_args );
+                            } elseif ( $this->parent->args !== $this->orig_args ) {
+                                $this->parent->args = $this->orig_args;
+                            }
+
+                            $hide             = $sidebar ? '' : ' display-group';
+                            $section['class'] = isset( $section['class'] ) ? ' ' . $section['class'] : '';
+                            echo '<div id="' . esc_attr( $s_key ) . '_box_' . esc_attr( $metabox['id'] ) . '_section_group" class="redux-group-tab' . esc_attr( $section['class'] ) . ' redux_metabox_panel' . esc_attr( $hide ) . '">';
+
+                            if ( ! empty( $section['title'] ) ) {
+                                echo '<h3 class="redux-section-title">' . wp_kses_post( $section['title'] ) . '</h3>';
+                            }
+
+                            if ( ! empty( $section['desc'] ) ) {
+                                echo '<div class="redux-section-desc">' . wp_kses_post( $section['desc'] ) . '</div>';
+                            }
+
+                            echo '<table class="form-table"><tbody>';
+                            foreach ( $section['fields'] as $field ) {
+                                if ( ! empty( $field['permissions'] ) && ! Redux_Helpers::current_user_can( $field['permissions'] ) ) {
+                                    continue;
+                                }
+                                $field['name'] = $this->parent->args['opt_name'] . '[' . $field['id'] . ']';
+
+                                $is_hidden = false;
+                                $ex_style  = '';
+                                if ( isset( $field['hidden'] ) && $field['hidden'] ) {
+                                    $is_hidden = true;
+                                    $ex_style  = ' style="border-bottom: none;"';
+                                }
+
+                                echo '<tr valign="top"' . $ex_style . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
+
+                                $th = $this->parent->render_class->get_header_html( $field );
+
+                                if ( $is_hidden ) {
+                                    $str_pos = strpos( $th, 'redux_field_th' );
+
+                                    if ( $str_pos > - 1 ) {
+                                        $th = str_replace( 'redux_field_th', 'redux_field_th hide', $th );
+                                    }
+                                }
+
+                                if ( $sidebar ) {
+                                    if ( ! ( isset( $metabox['args']['sections'] ) && 1 === count( $metabox['args']['sections'] ) && isset( $metabox['args']['sections'][0]['fields'] ) && 1 === count( $metabox['args']['sections'][0]['fields'] ) ) && isset( $field['title'] ) ) {
+                                        echo '<th scope="row">';
+                                        if ( ! empty( $th ) ) {
+                                            echo $th; // phpcs:ignore WordPress.Security.EscapeOutput
+                                        }
+                                        echo '</th>';
+                                        echo '<td>';
+                                    }
+                                } else {
+                                    echo '<td>' . $th; // phpcs:ignore WordPress.Security.EscapeOutput
+                                }
+
+                                if ( 'section' === $field['type'] && ( 'true' === $field['indent'] || true === $field['indent'] ) ) {
+                                    $field['class']  = $field['class'] ?? '';
+                                    $field['class'] .= 'redux-section-indent-start';
+                                }
+
+                                if ( ! isset( $this->meta[ $this->post_id ][ $field['id'] ] ) ) {
+                                    $this->meta[ $this->post_id ][ $field['id'] ] = '';
+                                }
+
+                                $this->parent->render_class->field_input( $field, $this->meta[ $this->post_id ][ $field['id'] ], true );
+                                echo '</td></tr>';
+                            }
+                            echo '</tbody></table>';
+                            echo '</div>';
+                        }
+                    }
+                    ?>
 				</div>
 				<div class="clear"></div>
 			</div>
 			<?php
-		}
-
-		/**
-		 * Save meta boxes
-		 * Runs when a post is saved and does an action which the write panel save scripts can hook into.
-		 *
-		 * @access public
-		 *
-		 * @param mixed $post_id Post ID.
-		 * @param mixed $post Post.
-		 *
-		 * @return mixed
-		 */
-		public function meta_boxes_save( $post_id, $post ) {
-			if ( isset( $_POST['vc_inline'] ) && sanitize_text_field( wp_unslash( $_POST['vc_inline'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				return $post_id;
-			}
-
-			if ( isset( $_POST['post_ID'] ) && strval( $post_id ) !== $_POST['post_ID'] ) { // phpcs:ignore WordPress.Security.NonceVerification
-				return $post_id;
-			}
-
-			// Check if our nonce is set.
-			if ( ! isset( $_POST['redux_metaboxes_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
-				return $post_id;
-			}
-
-			// Verify that the nonce is valid.
-			// Validate fields (if needed).
-			if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux_metaboxes_meta_nonce'] ) ), 'redux_metaboxes_meta_nonce' ) ) {
-				return $post_id;
-			}
-
-			// If this is an autosave, our form has not been submitted, so we don't want to do anything.
-			if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-				return $post_id;
-			}
-
-			// Check the user's permissions, even allowing custom capabilities.
-			$obj = get_post_type_object( $post->post_type );
-			if ( ! current_user_can( $obj->cap->edit_post, $post_id ) ) {
-				return $post_id;
-			}
-
-			// Import.
-			if ( isset( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) && ! empty( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) ) {
-				$import = json_decode( sanitize_text_field( wp_unslash( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) ), true );
-				unset( $_POST[ $this->parent->args['opt_name'] ]['import_code'] );
-
-				foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
-					if ( ! isset( $import[ $key ] ) ) {
-						$import[ $key ] = $value;
-					}
-				}
-
-				$_POST[ $this->parent->args['opt_name'] ] = $import;
-			}
-
-			$to_save    = array();
-			$to_compare = array();
-			$to_delete  = array();
-			$dont_save  = true;
-
-			if ( isset( $this->parent->args['metaboxes_save_defaults'] ) && $this->parent->args['metaboxes_save_defaults'] ) {
-				$dont_save = false;
-			}
-
-			foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
-
-				// Have to remove the escaping for array comparison.
-				if ( is_array( $value ) ) {
-					foreach ( $value as $k => $v ) {
-						if ( ! is_array( $v ) ) {
-							$value[ $k ] = wp_unslash( $v );
-						}
-					}
-				}
-
-				$save = true;
-
-				// parent_options.
-				if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
-					$save = false;
-				}
-
-				if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
-					$save = false;
-				}
-
-				if ( $save ) {
-					$to_save[ $key ]    = $value;
-					$to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
-				} else {
-					$to_delete[ $key ] = $value;
-				}
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$to_save = apply_filters( 'redux/metaboxes/save/before_validate', $to_save, $to_compare, $this->sections );
-
-			$validate = $this->parent->validate_class->validate( $to_save, $to_compare, $this->sections );
-
-			// Validate fields (if needed).
-			foreach ( $to_save as $key => $value ) {
-				if ( isset( $validate[ $key ] ) && $value !== $validate[ $key ] ) {
-					if ( isset( $this->parent->options[ $key ] ) && $validate[ $key ] === $this->parent->options[ $key ] ) {
-						unset( $to_save[ $key ] );
-					} else {
-						$to_save[ $key ] = $validate[ $key ];
-					}
-				}
-			}
-
-			if ( ! empty( $this->parent->errors ) || ! empty( $this->parent->warnings ) ) {
-				$this->parent->transients['notices'] = ( isset( $this->parent->transients['notices'] ) && is_array( $this->parent->transients['notices'] ) ) ? $this->parent->transients['notices'] : array();
-
-				if ( ! isset( $this->parent->transients['notices']['errors'] ) || $this->parent->transients['notices']['errors'] !== $this->parent->errors ) {
-					$this->parent->transients['notices']['errors'] = $this->parent->errors;
-					$update_transients                             = true;
-				}
-
-				if ( ! isset( $this->parent->transients['notices']['warnings'] ) || $this->parent->transients['notices']['warnings'] !== $this->parent->warnings ) {
-					$this->parent->transients['notices']['warnings'] = $this->parent->warnings;
-					$update_transients                               = true;
-				}
-
-				if ( isset( $update_transients ) ) {
-					$this->parent->transients['notices']['override'] = 1;
-					set_transient( $this->parent->args['opt_name'] . '-transients-metaboxes', $this->parent->transients );
-				}
-			}
-
-			if ( isset( $_POST['post_type'] ) ) {
-				$check = $this->post_type_fields[ sanitize_text_field( wp_unslash( $_POST['post_type'] ) ) ];
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$to_save = apply_filters( 'redux/metaboxes/save', $to_save, $to_compare, $this->sections );
-
-			foreach ( $to_save as $key => $value ) {
-				$prev_value = $this->meta[ $post_id ][ $key ] ?? '';
-
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
-				}
-
-				update_post_meta( $post_id, $key, $value, $prev_value );
-			}
-
-			foreach ( $to_delete as $key => $value ) {
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
-				}
-
-				$prev_value = $this->meta[ $post_id ][ $key ] ?? '';
-				delete_post_meta( $post_id, $key, $prev_value );
-			}
-
-			if ( ! empty( $check ) ) {
-				foreach ( $check as $key => $value ) {
-					delete_post_meta( $post_id, $key );
-				}
-			}
-
-			return $post_id;
-		}
-
-		/**
-		 * Some functions, like the term recount, require the visibility to be set prior. Lets save that here.
-		 *
-		 * @access public
-		 *
-		 * @param mixed $post_id Post ID.
-		 *
-		 * @return void
-		 */
-		public function pre_post_update( $post_id ) {
-			if ( isset( $_POST['_visibility'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				update_post_meta( $post_id, '_visibility', sanitize_text_field( wp_unslash( $_POST['_visibility'] ) ) ); // phpcs:ignore WordPress.Security.NonceVerification
-			}
-
-			if ( isset( $_POST['_stock_status'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				update_post_meta( $post_id, '_stock_status', sanitize_text_field( wp_unslash( $_POST['_stock_status'] ) ) ); // phpcs:ignore WordPress.Security.NonceVerification
-			}
-		}
-
-		/**
-		 * Show any stored error messages.
-		 *
-		 * @access public
-		 * @return void
-		 */
-		public function meta_boxes_show_errors() {
-			if ( isset( $this->notices['errors'] ) && ! empty( $this->notices['errors'] ) ) {
-				echo '<div id="redux_metaboxes_errors" class="error fade">';
-				echo '<p><strong><span></span> ' . count( $this->notices['errors'] ) . ' ' . esc_html__( 'error(s) were found!', 'redux-framework' ) . '</strong></p>';
-				echo '</div>';
-			}
-
-			if ( isset( $this->notices['warnings'] ) && ! empty( $this->notices['warnings'] ) ) {
-				echo '<div id="redux_metaboxes_warnings" class="error fade" style="border-left-color: #E8E20C;">';
-				echo '<p><strong><span></span> ' . count( $this->notices['warnings'] ) . ' ' . esc_html__( 'warnings(s) were found!', 'redux-framework' ) . '</strong></p>';
-				echo '</div>';
-			}
-		}
-	}
-
-	class_alias( Redux_Extension_Metaboxes::class, 'ReduxFramework_Extension_metaboxes' );
+        }
+
+        /**
+         * Save meta boxes
+         * Runs when a post is saved and does an action which the write panel save scripts can hook into.
+         *
+         * @access public
+         *
+         * @param mixed $post_id Post ID.
+         * @param mixed $post Post.
+         *
+         * @return mixed
+         */
+        public function meta_boxes_save( $post_id, $post ) {
+            if ( isset( $_POST['vc_inline'] ) && sanitize_text_field( wp_unslash( $_POST['vc_inline'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                return $post_id;
+            }
+
+            if ( isset( $_POST['post_ID'] ) && strval( $post_id ) !== $_POST['post_ID'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+                return $post_id;
+            }
+
+            // Check if our nonce is set.
+            if ( ! isset( $_POST['redux_metaboxes_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
+                return $post_id;
+            }
+
+            // Verify that the nonce is valid.
+            // Validate fields (if needed).
+            if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux_metaboxes_meta_nonce'] ) ), 'redux_metaboxes_meta_nonce' ) ) {
+                return $post_id;
+            }
+
+            // If this is an autosave, our form has not been submitted, so we don't want to do anything.
+            if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+                return $post_id;
+            }
+
+            // Check the user's permissions, even allowing custom capabilities.
+            $obj = get_post_type_object( $post->post_type );
+            if ( ! current_user_can( $obj->cap->edit_post, $post_id ) ) {
+                return $post_id;
+            }
+
+            // Import.
+            if ( isset( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) && ! empty( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) ) {
+                $import = json_decode( sanitize_text_field( wp_unslash( $_POST[ $this->parent->args['opt_name'] ]['import_code'] ) ), true );
+                unset( $_POST[ $this->parent->args['opt_name'] ]['import_code'] );
+
+                foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+                    if ( ! isset( $import[ $key ] ) ) {
+                        $import[ $key ] = $value;
+                    }
+                }
+
+                $_POST[ $this->parent->args['opt_name'] ] = $import;
+            }
+
+            $to_save    = array();
+            $to_compare = array();
+            $to_delete  = array();
+            $dont_save  = true;
+
+            if ( isset( $this->parent->args['metaboxes_save_defaults'] ) && $this->parent->args['metaboxes_save_defaults'] ) {
+                $dont_save = false;
+            }
+
+            foreach ( Redux_Helpers::sanitize_array( wp_unslash( $_POST[ $this->parent->args['opt_name'] ] ) ) as $key => $value ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+
+                // Have to remove the escaping for array comparison.
+                if ( is_array( $value ) ) {
+                    foreach ( $value as $k => $v ) {
+                        if ( ! is_array( $v ) ) {
+                            $value[ $k ] = wp_unslash( $v );
+                        }
+                    }
+                }
+
+                $save = true;
+
+                // parent_options.
+                if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
+                    $save = false;
+                }
+
+                if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
+                    $save = false;
+                }
+
+                if ( $save ) {
+                    $to_save[ $key ]    = $value;
+                    $to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
+                } else {
+                    $to_delete[ $key ] = $value;
+                }
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $to_save = apply_filters( 'redux/metaboxes/save/before_validate', $to_save, $to_compare, $this->sections );
+
+            $validate = $this->parent->validate_class->validate( $to_save, $to_compare, $this->sections );
+
+            // Validate fields (if needed).
+            foreach ( $to_save as $key => $value ) {
+                if ( isset( $validate[ $key ] ) && $value !== $validate[ $key ] ) {
+                    if ( isset( $this->parent->options[ $key ] ) && $validate[ $key ] === $this->parent->options[ $key ] ) {
+                        unset( $to_save[ $key ] );
+                    } else {
+                        $to_save[ $key ] = $validate[ $key ];
+                    }
+                }
+            }
+
+            if ( ! empty( $this->parent->errors ) || ! empty( $this->parent->warnings ) ) {
+                $this->parent->transients['notices'] = ( isset( $this->parent->transients['notices'] ) && is_array( $this->parent->transients['notices'] ) ) ? $this->parent->transients['notices'] : array();
+
+                if ( ! isset( $this->parent->transients['notices']['errors'] ) || $this->parent->transients['notices']['errors'] !== $this->parent->errors ) {
+                    $this->parent->transients['notices']['errors'] = $this->parent->errors;
+                    $update_transients                             = true;
+                }
+
+                if ( ! isset( $this->parent->transients['notices']['warnings'] ) || $this->parent->transients['notices']['warnings'] !== $this->parent->warnings ) {
+                    $this->parent->transients['notices']['warnings'] = $this->parent->warnings;
+                    $update_transients                               = true;
+                }
+
+                if ( isset( $update_transients ) ) {
+                    $this->parent->transients['notices']['override'] = 1;
+                    set_transient( $this->parent->args['opt_name'] . '-transients-metaboxes', $this->parent->transients );
+                }
+            }
+
+            if ( isset( $_POST['post_type'] ) ) {
+                $check = $this->post_type_fields[ sanitize_text_field( wp_unslash( $_POST['post_type'] ) ) ];
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $to_save = apply_filters( 'redux/metaboxes/save', $to_save, $to_compare, $this->sections );
+
+            foreach ( $to_save as $key => $value ) {
+                $prev_value = $this->meta[ $post_id ][ $key ] ?? '';
+
+                if ( isset( $check[ $key ] ) ) {
+                    unset( $check[ $key ] );
+                }
+
+                update_post_meta( $post_id, $key, $value, $prev_value );
+            }
+
+            foreach ( $to_delete as $key => $value ) {
+                if ( isset( $check[ $key ] ) ) {
+                    unset( $check[ $key ] );
+                }
+
+                $prev_value = $this->meta[ $post_id ][ $key ] ?? '';
+                delete_post_meta( $post_id, $key, $prev_value );
+            }
+
+            if ( ! empty( $check ) ) {
+                foreach ( $check as $key => $value ) {
+                    delete_post_meta( $post_id, $key );
+                }
+            }
+
+            return $post_id;
+        }
+
+        /**
+         * Some functions, like the term recount, require the visibility to be set prior. Lets save that here.
+         *
+         * @access public
+         *
+         * @param mixed $post_id Post ID.
+         *
+         * @return void
+         */
+        public function pre_post_update( $post_id ) {
+            if ( isset( $_POST['_visibility'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                update_post_meta( $post_id, '_visibility', sanitize_text_field( wp_unslash( $_POST['_visibility'] ) ) ); // phpcs:ignore WordPress.Security.NonceVerification
+            }
+
+            if ( isset( $_POST['_stock_status'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                update_post_meta( $post_id, '_stock_status', sanitize_text_field( wp_unslash( $_POST['_stock_status'] ) ) ); // phpcs:ignore WordPress.Security.NonceVerification
+            }
+        }
+
+        /**
+         * Show any stored error messages.
+         *
+         * @access public
+         * @return void
+         */
+        public function meta_boxes_show_errors() {
+            if ( isset( $this->notices['errors'] ) && ! empty( $this->notices['errors'] ) ) {
+                echo '<div id="redux_metaboxes_errors" class="error fade">';
+                echo '<p><strong><span></span> ' . count( $this->notices['errors'] ) . ' ' . esc_html__( 'error(s) were found!', 'redux-framework' ) . '</strong></p>';
+                echo '</div>';
+            }
+
+            if ( isset( $this->notices['warnings'] ) && ! empty( $this->notices['warnings'] ) ) {
+                echo '<div id="redux_metaboxes_warnings" class="error fade" style="border-left-color: #E8E20C;">';
+                echo '<p><strong><span></span> ' . count( $this->notices['warnings'] ) . ' ' . esc_html__( 'warnings(s) were found!', 'redux-framework' ) . '</strong></p>';
+                echo '</div>';
+            }
+        }
+    }
+
+    class_alias( Redux_Extension_Metaboxes::class, 'ReduxFramework_Extension_metaboxes' );
 }

redux-core/inc/extensions/metaboxes/redux-metaboxes-helpers.php

Indentation +36 added lines, -36 removed lines

@@ -8,49 +8,49 @@
 defined( 'ABSPATH' ) || exit;
 
 if ( ! function_exists( 'redux_metaboxes_loop_start' ) ) {
-	/**
-	 * Start loop.
-	 *
-	 * @param string $opt_name Panel opt_name.
-	 * @param array  $the_post Post object.
-	 */
-	function redux_metaboxes_loop_start( string $opt_name, array $the_post = array() ) {
-		$redux     = ReduxFrameworkInstances::get_instance( $opt_name );
-		$metaboxes = $redux->extensions['metaboxes'];
+    /**
+     * Start loop.
+     *
+     * @param string $opt_name Panel opt_name.
+     * @param array  $the_post Post object.
+     */
+    function redux_metaboxes_loop_start( string $opt_name, array $the_post = array() ) {
+        $redux     = ReduxFrameworkInstances::get_instance( $opt_name );
+        $metaboxes = $redux->extensions['metaboxes'];
 
-		$metaboxes->loop_start( $the_post );
-	}
+        $metaboxes->loop_start( $the_post );
+    }
 }
 
 if ( ! function_exists( 'redux_metaboxes_loop_end' ) ) {
-	/**
-	 * End loop.
-	 *
-	 * @param string $opt_name Panel opt_name.
-	 * @param array  $the_post Deprecated.
-	 */
-	function redux_metaboxes_loop_end( string $opt_name, array $the_post = array() ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
-		_deprecated_argument( __FUNCTION__, '4.5', '$the_post argument has been deprecated and will be removed in a future version. Please update your code accordingly!' );
+    /**
+     * End loop.
+     *
+     * @param string $opt_name Panel opt_name.
+     * @param array  $the_post Deprecated.
+     */
+    function redux_metaboxes_loop_end( string $opt_name, array $the_post = array() ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
+        _deprecated_argument( __FUNCTION__, '4.5', '$the_post argument has been deprecated and will be removed in a future version. Please update your code accordingly!' );
 
-		$redux     = ReduxFrameworkInstances::get_instance( $opt_name );
-		$metaboxes = $redux->extensions['metaboxes'];
+        $redux     = ReduxFrameworkInstances::get_instance( $opt_name );
+        $metaboxes = $redux->extensions['metaboxes'];
 
-		$metaboxes->loop_end();
-	}
+        $metaboxes->loop_end();
+    }
 }
 
 if ( ! function_exists( 'redux_post_meta' ) ) {
-	/**
-	 * Retrieve post meta values/settings.
-	 *
-	 * @param string $opt_name Panel opt_name.
-	 * @param mixed  $the_post Post ID.
-	 * @param string $meta_key Meta key.
-	 * @param mixed  $def_val  Default value.
-	 *
-	 * @return string|void
-	 */
-	function redux_post_meta( string $opt_name = '', $the_post = array(), string $meta_key = '', $def_val = '' ) {
-		return Redux::get_post_meta( $opt_name, $the_post, $meta_key, $def_val );
-	}
+    /**
+     * Retrieve post meta values/settings.
+     *
+     * @param string $opt_name Panel opt_name.
+     * @param mixed  $the_post Post ID.
+     * @param string $meta_key Meta key.
+     * @param mixed  $def_val  Default value.
+     *
+     * @return string|void
+     */
+    function redux_post_meta( string $opt_name = '', $the_post = array(), string $meta_key = '', $def_val = '' ) {
+        return Redux::get_post_meta( $opt_name, $the_post, $meta_key, $def_val );
+    }
 }

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

Spacing +79 added lines, -79 removed lines

@@ -219,7 +219,7 @@ 
 			}
 
 			foreach ( $this->profiles as $bk => $profile ) {
-				$profile['roles'] = isset( $profile['roles'] ) ? (array) $profile['roles'] : array( 'read' );
+				$profile['roles'] = isset( $profile['roles'] ) ? ( array ) $profile['roles'] : array( 'read' );
 
 				if ( ! empty( $profile['sections'] ) ) {
 					$this->sections = $profile['sections'];
@@ -243,7 +243,7 @@ 
 									if ( ! isset( $field['class'] ) ) {
 										$field['class'] = '';
 
-										$this->profiles[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
+										$this->profiles[$bk]['sections'][$sk]['fields'][$fk] = $field;
 									}
 
 									$this->parent->required_class->check_dependencies( $field );
@@ -254,37 +254,37 @@ 
 										}
 
 										if ( isset( $field['default'] ) ) {
-											$this->options_defaults[ $field['id'] ] = $field['default'];
+											$this->options_defaults[$field['id']] = $field['default'];
 										} else {
-											$this->options_defaults[ $field['id'] ] = $this->field_default( $field );
+											$this->options_defaults[$field['id']] = $this->field_default( $field );
 										}
 
 										foreach ( $profile['roles'] as $type ) {
-											$this->profile_fields[ $type ][ $field['id'] ] = 1;
+											$this->profile_fields[$type][$field['id']] = 1;
 										}
 
 										if ( ! empty( $field['output'] ) ) {
-											$this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
+											$this->output[$field['id']] = isset( $this->output[$field['id']] ) ? array_merge( $field['output'], $this->output[$field['id']] ) : $field['output'];
 										}
 
 										// Detect what field types are being used.
-										if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
-											$this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
+										if ( ! isset( $this->parent->fields[$field['type']][$field['id']] ) ) {
+											$this->parent->fields[$field['type']][$field['id']] = 1;
 										} else {
-											$this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
+											$this->parent->fields[$field['type']] = array( $field['id'] => 1 );
 										}
 
-										if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
-											$this->to_replace[ $field['id'] ] = $field;
+										if ( isset( $this->options_defaults[$field['id']] ) ) {
+											$this->to_replace[$field['id']] = $field;
 										}
 									}
 
-									if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
-										$this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
+									if ( ! isset( $this->parent->options[$field['id']] ) ) {
+										$this->parent->sections[( count( $this->parent->sections ) - 1 )]['fields'][] = $field;
 									}
 
-									if ( ! isset( $this->meta[ $field['id'] ] ) ) {
-										$this->meta[ $field['id'] ] = $this->options_defaults[ $field['id'] ];
+									if ( ! isset( $this->meta[$field['id']] ) ) {
+										$this->meta[$field['id']] = $this->options_defaults[$field['id']];
 									}
 
 									// Only override if it exists, and it's not the default.
@@ -326,8 +326,8 @@ 
 		 * @return mixed
 		 */
 		public function replace_field( array $field ) {
-			if ( isset( $this->to_replace[ $field['id'] ] ) ) {
-				$field = $this->to_replace[ $field['id'] ];
+			if ( isset( $this->to_replace[$field['id']] ) ) {
+				$field = $this->to_replace[$field['id']];
 			}
 
 			return $field;
@@ -341,8 +341,8 @@ 
 		 * @return array
 		 */
 		public function output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['output'] = $this->output[ $field['id'] ];
+			if ( isset( $this->output[$field['id']] ) ) {
+				$field['output'] = $this->output[$field['id']];
 			}
 
 			return $field;
@@ -368,13 +368,13 @@ 
 			$data = wp_parse_args( $this->meta, $this->options_defaults );
 
 			foreach ( $data as $key => $value ) {
-				if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
-					$data[ $key ] = $meta[ $key ];
+				if ( isset( $meta[$key] ) && '' !== $meta[$key] ) {
+					$data[$key] = $meta[$key];
 					continue;
 				}
 
-				if ( isset( $options[ $key ] ) ) {
-					$data[ $key ] = $options[ $key ];
+				if ( isset( $options[$key] ) ) {
+					$data[$key] = $options[$key];
 				}
 			}
 
@@ -398,7 +398,7 @@ 
 					$relation = $query;
 
 				} elseif ( ! is_array( $query ) ) {
-					$clean_queries[ $key ]['values'] = array( $query );
+					$clean_queries[$key]['values'] = array( $query );
 
 					// First-order clause.
 				} elseif ( $this->is_first_order_clause( $query ) ) {
@@ -407,7 +407,7 @@ 
 						unset( $query['value'] );
 					}
 
-					$clean_queries[ $key ] = $query;
+					$clean_queries[$key] = $query;
 
 					// Otherwise, it's a nested query, so we recurse.
 				} else {
@@ -415,7 +415,7 @@ 
 					$cleaned_query = $this->sanitize_query( $query );
 
 					if ( ! empty( $cleaned_query ) ) {
-						$clean_queries[ $key ] = $cleaned_query;
+						$clean_queries[$key] = $cleaned_query;
 					}
 				}
 			}
@@ -534,7 +534,7 @@ 
 							} else {
 								$section['id'] = sanitize_title( $section['title'], $sk );
 							}
-							$this->profiles[ $key ]['sections'][ $sk ] = $section;
+							$this->profiles[$key]['sections'][$sk] = $section;
 						}
 						if ( isset( $section['fields'] ) ) {
 							foreach ( $section['fields'] as $k => $field ) {
@@ -543,15 +543,15 @@ 
 								}
 
 								if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
-									$this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
-									unset( $this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
+									$this->profiles[$key]['sections'][$sk]['fields'][$k]['args'] = $field['options'];
+									unset( $this->profiles[$key]['sections'][$sk]['fields'][$k]['options'] );
 								}
 
 								if ( 'section' === $field['type'] && isset( $field['indent'] ) && true === $field['indent'] ) {
 									$field['class']  = $field['class'] ?? '';
 									$field['class'] .= 'redux-section-indent-start';
 
-									$this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
+									$this->profiles[$key]['sections'][$sk]['fields'][$k] = $field;
 								}
 
 								if ( ! isset( $this->parent->options_defaults_class ) ) {
@@ -660,8 +660,8 @@ 
 				$this->parent->options_class->get();
 			}
 
-			if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
-				return $this->parent->options[ $field_id['id'] ];
+			if ( isset( $this->parent->options[$field_id['id']] ) && isset( $this->parent->options_defaults[$field_id['id']] ) && $this->parent->options[$field_id['id']] !== $this->parent->options_defaults[$field_id['id']] ) {
+				return $this->parent->options[$field_id['id']];
 			} else {
 				if ( empty( $this->options_defaults ) ) {
 					$this->default_values(); // fill cache.
@@ -669,11 +669,11 @@ 
 
 				$data = '';
 				if ( ! empty( $this->options_defaults ) ) {
-					$data = $this->options_defaults[ $field_id['id'] ] ?? '';
+					$data = $this->options_defaults[$field_id['id']] ?? '';
 				}
 
-				if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
-					$data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
+				if ( empty( $data ) && isset( $this->parent->options_defaults[$field_id['id']] ) ) {
+					$data = $this->parent->options_defaults[$field_id['id']] ?? '';
 				}
 
 				return $data;
@@ -688,8 +688,8 @@ 
 		 * @return array
 		 */
 		private function get_meta( string $id ): array {
-			if ( ! isset( $this->meta[ $id ] ) ) {
-				$this->meta[ $id ] = array();
+			if ( ! isset( $this->meta[$id] ) ) {
+				$this->meta[$id] = array();
 				$o_data            = get_post_meta( $id );
 
 				// phpcs:ignore WordPress.NamingConventions.ValidHookName
@@ -698,30 +698,30 @@ 
 				if ( ! empty( $o_data ) ) {
 					foreach ( $o_data as $key => $value ) {
 						if ( count( $value ) === 1 ) {
-							$this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
+							$this->meta[$id][$key] = maybe_unserialize( $value[0] );
 						} else {
 							$new_value = array_map( 'maybe_unserialize', $value );
 
-							$this->meta[ $id ][ $key ] = $new_value[0];
+							$this->meta[$id][$key] = $new_value[0];
 						}
 					}
 				}
 
-				if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
-					$data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+				if ( isset( $this->meta[$id][$this->parent->args['opt_name']] ) ) {
+					$data = maybe_unserialize( $this->meta[$id][$this->parent->args['opt_name']] );
 
 					foreach ( $data as $key => $value ) {
-						$this->meta[ $id ][ $key ] = $value;
+						$this->meta[$id][$key] = $value;
 						update_post_meta( $id, $key, $value );
 					}
 
-					unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+					unset( $this->meta[$id][$this->parent->args['opt_name']] );
 
 					delete_post_meta( $id, $this->parent->args['opt_name'] );
 				}
 			}
 
-			return $this->meta[ $id ];
+			return $this->meta[$id];
 		}
 
 		/**
@@ -737,29 +737,29 @@ 
 
 			// Override these values if they differ from the admin panel defaults.  ;).
 			if ( isset( $the_post->users_role ) && in_array( $the_post->users_role, $this->users_roles, true ) ) {
-				if ( isset( $this->users_role_values[ $the_post->users_role ] ) ) {
-					$meta = $this->profile_fields[ $the_post->users_role ];
+				if ( isset( $this->users_role_values[$the_post->users_role] ) ) {
+					$meta = $this->profile_fields[$the_post->users_role];
 				} else {
 					$defaults = array();
-					if ( ! empty( $this->profile_fields[ $the_post->users_role ] ) ) {
-						foreach ( $this->profile_fields[ $the_post->users_role ] as $key => $null ) {
-							if ( isset( $this->options_defaults[ $key ] ) ) {
-								$defaults[ $key ] = $this->options_defaults[ $key ];
+					if ( ! empty( $this->profile_fields[$the_post->users_role] ) ) {
+						foreach ( $this->profile_fields[$the_post->users_role] as $key => $null ) {
+							if ( isset( $this->options_defaults[$key] ) ) {
+								$defaults[$key] = $this->options_defaults[$key];
 							}
 						}
 					}
 
 					$meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
 
-					$this->profile_fields[ $the_post->users_role ] = $meta;
+					$this->profile_fields[$the_post->users_role] = $meta;
 				}
 
 				if ( ! empty( $meta_key ) ) {
-					if ( ! isset( $meta[ $meta_key ] ) ) {
-						$meta[ $meta_key ] = $def_val;
+					if ( ! isset( $meta[$meta_key] ) ) {
+						$meta[$meta_key] = $def_val;
 					}
 
-					return $meta[ $meta_key ];
+					return $meta[$meta_key];
 				} else {
 					return $meta;
 				}
@@ -958,11 +958,11 @@ 
 									$field['class'] .= 'redux-section-indent-start';
 								}
 
-								if ( ! isset( $this->meta[ $field['id'] ] ) ) {
-									$this->meta[ $field['id'] ] = '';
+								if ( ! isset( $this->meta[$field['id']] ) ) {
+									$this->meta[$field['id']] = '';
 								}
 
-								$this->parent->render_class->field_input( $field, $this->meta[ $field['id'] ] );
+								$this->parent->render_class->field_input( $field, $this->meta[$field['id']] );
 								echo '</td></tr>';
 							}
 							echo '</tbody></table>';
@@ -994,7 +994,7 @@ 
 			}
 
 			// Check if our nonce is set.
-			if ( ! isset( $_POST['redux_users_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
+			if ( ! isset( $_POST['redux_users_meta_nonce'] ) || ! isset( $_POST[$this->parent->args['opt_name']] ) ) {
 				return false;
 			}
 
@@ -1013,16 +1013,16 @@ 
 			$to_delete  = array();
 			$dont_save  = true;
 
-			$field_args = Redux_Users::$fields[ $this->parent->args['opt_name'] ];
+			$field_args = Redux_Users::$fields[$this->parent->args['opt_name']];
 
-			foreach ( $_POST[ $this->parent->args['opt_name'] ] as $key => $value ) { // phpcs:ignore WordPress.Security
+			foreach ( $_POST[$this->parent->args['opt_name']] as $key => $value ) { // phpcs:ignore WordPress.Security
 				$key = sanitize_text_field( wp_unslash( $key ) );
 
-				if ( ! empty( $field_args[ $key ]['permissions'] ) ) {
-					foreach ( (array) $field_args[ $key ]['permissions'] as $pv ) {
+				if ( ! empty( $field_args[$key]['permissions'] ) ) {
+					foreach ( ( array ) $field_args[$key]['permissions'] as $pv ) {
 
 						// Do not save anything the user doesn't have permissions for.
-						if ( isset( $field_args[ $key ] ) ) {
+						if ( isset( $field_args[$key] ) ) {
 							if ( user_can( $user_id, $pv ) && user_can( $check_user_id, $pv ) ) {
 								break;
 							}
@@ -1034,7 +1034,7 @@ 
 				if ( is_array( $value ) ) {
 					foreach ( $value as $k => $v ) {
 						if ( ! is_array( $v ) ) {
-							$value[ $k ] = sanitize_text_field( wp_unslash( $v ) );
+							$value[$k] = sanitize_text_field( wp_unslash( $v ) );
 						}
 					}
 				}
@@ -1042,19 +1042,19 @@ 
 				$save = true;
 
 				// parent_options.
-				if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
+				if ( ! $dont_save && isset( $this->options_defaults[$key] ) && $value === $this->options_defaults[$key] ) {
 					$save = false;
 				}
 
-				if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
+				if ( $save && isset( $this->parent_options[$key] ) && $this->parent_options[$key] !== $value ) {
 					$save = false;
 				}
 
 				if ( $save ) {
-					$to_save[ $key ]    = $value;
-					$to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
+					$to_save[$key]    = $value;
+					$to_compare[$key] = $this->parent->options[$key] ?? '';
 				} else {
-					$to_delete[ $key ] = $value;
+					$to_delete[$key] = $value;
 				}
 			}
 
@@ -1065,11 +1065,11 @@ 
 
 			// Validate fields (if needed).
 			foreach ( $to_save as $key => $value ) {
-				if ( isset( $validate[ $key ] ) && $validate[ $key ] !== $value ) {
-					if ( isset( $this->meta[ $key ] ) && $validate[ $key ] === $this->meta[ $key ] ) {
-						unset( $to_save[ $key ] );
+				if ( isset( $validate[$key] ) && $validate[$key] !== $value ) {
+					if ( isset( $this->meta[$key] ) && $validate[$key] === $this->meta[$key] ) {
+						unset( $to_save[$key] );
 					} else {
-						$to_save[ $key ] = $validate[ $key ];
+						$to_save[$key] = $validate[$key];
 					}
 				}
 			}
@@ -1099,21 +1099,21 @@ 
 			$to_save = apply_filters( 'redux/users/save', $to_save, $to_compare, $this->sections );
 
 			foreach ( $to_save as $key => $value ) {
-				$prev_value = $this->meta[ $key ] ?? '';
+				$prev_value = $this->meta[$key] ?? '';
 
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
+				if ( isset( $check[$key] ) ) {
+					unset( $check[$key] );
 				}
 
 				update_user_meta( $user_id, $key, $value, $prev_value );
 			}
 
 			foreach ( $to_delete as $key => $value ) {
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
+				if ( isset( $check[$key] ) ) {
+					unset( $check[$key] );
 				}
 
-				$prev_value = $this->meta[ $key ] ?? '';
+				$prev_value = $this->meta[$key] ?? '';
 				delete_user_meta( $user_id, $key, $prev_value );
 			}
 			if ( ! empty( $check ) ) {

Indentation +1091 added lines, -1091 removed lines

@@ -13,827 +13,827 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Users' ) ) {
 
-	/**
-	 * Main Redux_Extension_Users class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Extension_Users extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.5.6';
-
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Users';
-
-
-		/**
-		 * Profiles array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $profiles = array();
-
-		/**
-		 * User roles array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $users_roles = array();
-
-		/**
-		 * User role array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $users_role = array();
-
-		/**
-		 * Sections array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $sections = array();
-
-		/**
-		 * Original args array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $orig_args = array();
-
-		/**
-		 * Output array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $output = array();
-
-		/**
-		 * Parent options array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $parent_options = array();
-
-		/**
-		 * Parent defaults.
-		 *
-		 * @var null|array
-		 */
-		public ?array $parent_defaults = array();
-
-		/**
-		 * Profile fields array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $profile_fields = array();
-
-		/**
-		 * Options defaults.
-		 *
-		 * @var null|array
-		 */
-		public ?array $options_defaults = array();
-
-		/**
-		 * To replace array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $to_replace = array();
-
-		/**
-		 * Meta array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $meta = array();
-
-		/**
-		 * Array of page names.
-		 *
-		 * @var null|array
-		 */
-		public ?array $pagenows;
-
-		/**
-		 * Notices array.
-		 *
-		 * @var null|array
-		 */
-		public ?array $notices;
-
-		/**
-		 * Redux_Extension_Users constructor.
-		 *
-		 * @param object $redux ReduxFramework pointer.
-		 */
-		public function __construct( $redux ) {
-			global $pagenow;
-
-			parent::__construct( $redux, __FILE__ );
-
-			$this->parent = $redux;
-
-			$this->add_field( 'users' );
-			$this->parent->extensions['users'] = $this;
-
-			$this->pagenows = array( 'user-new.php', 'profile.php', 'user-edit.php' );
-
-			require_once __DIR__ . '/redux-users-helpers.php';
-
-			add_action( 'admin_notices', array( $this, 'meta_profiles_show_errors' ), 0 );
-			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 20 );
-
-			if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) {
-				$this->init();
-
-				add_action( 'personal_options_update', array( $this, 'user_meta_save' ) );
-				add_action( 'edit_user_profile_update', array( $this, 'user_meta_save' ) );
-
-			}
-		}
-
-		/**
-		 * Add term classes.
-		 *
-		 * @param array $classes Classes.
-		 *
-		 * @return array
-		 */
-		public function add_user_classes( array $classes ): array {
-			$classes[] = 'redux-users';
-			$classes[] = 'redux-' . $this->parent->args['opt_name'];
-
-			if ( '' !== $this->parent->args['class'] ) {
-				$classes[] = $this->parent->args['class'];
-			}
-
-			return $classes;
-		}
-
-		/**
-		 * Add hide term class.
-		 *
-		 * @param array $classes Classes.
-		 *
-		 * @return array
-		 */
-		public function add_user_hide_class( array $classes ): array {
-			$classes[] = 'hide';
-
-			return $classes;
-		}
-
-		/**
-		 * Init.
-		 */
-		public function init() {
-			global $pagenow;
-
-			if ( isset( $_POST['action'] ) && 'redux_demo_customizer_save' === $_POST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification
-				return;
-			}
-
-			$this->parent->transients['run_compiler'] = false;
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$this->profiles = apply_filters( 'redux/users/' . $this->parent->args['opt_name'] . '/profiles', $this->profiles, $this->parent->args['opt_name'] );
-
-			if ( empty( $this->profiles ) && class_exists( 'Redux_Users' ) ) {
-				$this->profiles = Redux_Users::construct_profiles( $this->parent->args['opt_name'] );
-			}
-
-			if ( empty( $this->profiles ) || ! is_array( $this->profiles ) ) {
-				return;
-			}
-
-			foreach ( $this->profiles as $bk => $profile ) {
-				$profile['roles'] = isset( $profile['roles'] ) ? (array) $profile['roles'] : array( 'read' );
-
-				if ( ! empty( $profile['sections'] ) ) {
-					$this->sections = $profile['sections'];
-
-					$this->users_roles = wp_parse_args( $this->users_roles, $profile['roles'] );
-
-					// Checking to override the parent variables.
-					$add_field = false;
-
-					foreach ( $profile['roles'] as $role ) {
-						if ( $this->users_role === $role ) {
-							$add_field = true;
-						}
-					}
-
-					// Replacing all the fields.
-					if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
-						foreach ( $profile['sections'] as $sk => $section ) {
-							if ( ! empty( $section['fields'] ) ) {
-								foreach ( $section['fields'] as $fk => $field ) {
-									if ( ! isset( $field['class'] ) ) {
-										$field['class'] = '';
-
-										$this->profiles[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
-									}
-
-									$this->parent->required_class->check_dependencies( $field );
-
-									if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
-										if ( empty( $field['id'] ) ) {
-											continue;
-										}
-
-										if ( isset( $field['default'] ) ) {
-											$this->options_defaults[ $field['id'] ] = $field['default'];
-										} else {
-											$this->options_defaults[ $field['id'] ] = $this->field_default( $field );
-										}
-
-										foreach ( $profile['roles'] as $type ) {
-											$this->profile_fields[ $type ][ $field['id'] ] = 1;
-										}
-
-										if ( ! empty( $field['output'] ) ) {
-											$this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
-										}
-
-										// Detect what field types are being used.
-										if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
-											$this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
-										} else {
-											$this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
-										}
-
-										if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
-											$this->to_replace[ $field['id'] ] = $field;
-										}
-									}
-
-									if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
-										$this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
-									}
-
-									if ( ! isset( $this->meta[ $field['id'] ] ) ) {
-										$this->meta[ $field['id'] ] = $this->options_defaults[ $field['id'] ];
-									}
-
-									// Only override if it exists, and it's not the default.
-									/** If ( isset( $this->meta[ $field['id'] ] ) && isset( $field['default'] ) && $this->meta[ $field['id'] ] === $field['default'] ) {
-									 *    // unset($this->meta[$this->tag_id][$field['id']]);
-									 *  }
-									 */
-								}
-							}
-						}
-					}
-				}
-			}
-
-			$this->parent_options = array();
-
-			if ( ! empty( $this->to_replace ) ) {
-				foreach ( $this->to_replace as $id => $field ) {
-					add_filter( "redux/options/{$this->parent->args['opt_name']}/field/$id/register", array( $this, 'replace_field' ) );
-				}
-			}
-
-			add_filter( "redux/options/{$this->parent->args['opt_name']}/options", array( $this, 'override_options' ) );
-
-			if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) {
-				$priority = $this->parent->args['user_priority'] ?? 3;
-
-				add_action( 'show_user_profile', array( $this, 'add_profiles' ), $priority );
-				add_action( 'edit_user_profile', array( $this, 'add_profiles' ), $priority );
-				add_action( 'user_new_form', array( $this, 'add_profiles' ), $priority );
-			}
-		}
-
-		/**
-		 * Replace field.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return mixed
-		 */
-		public function replace_field( array $field ) {
-			if ( isset( $this->to_replace[ $field['id'] ] ) ) {
-				$field = $this->to_replace[ $field['id'] ];
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Output CSS.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return array
-		 */
-		public function output_css( array $field ): array {
-			if ( isset( $this->output[ $field['id'] ] ) ) {
-				$field['output'] = $this->output[ $field['id'] ];
-			}
-
-			return $field;
-		}
-
-		/**
-		 * Make sure the defaults are the defaults
-		 *
-		 * @param array $options Option array.
-		 *
-		 * @return array
-		 */
-		public function override_options( array $options ): array {
-			$this->parent->options_class->default_values();
-			$this->parent_defaults = $this->parent->options_defaults;
-
-			if ( empty( $this->meta ) ) {
-				// phpcs:ignore WordPress.Security.NonceVerification
-				$user       = isset( $_GET['user_id'] ) ? sanitize_text_field( wp_unslash( $_GET['user_id'] ) ) : get_current_user_id();
-				$this->meta = Redux_Users::get_user_meta( array( 'user' => $user ) );
-			}
-
-			$data = wp_parse_args( $this->meta, $this->options_defaults );
-
-			foreach ( $data as $key => $value ) {
-				if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
-					$data[ $key ] = $meta[ $key ];
-					continue;
-				}
-
-				if ( isset( $options[ $key ] ) ) {
-					$data[ $key ] = $options[ $key ];
-				}
-			}
-
-			$this->parent->options_defaults = wp_parse_args( $this->options_defaults, $this->parent->options_defaults );
-
-			return wp_parse_args( $data, $options );
-		}
-
-		/**
-		 * Sanitize Query.
-		 *
-		 * @param array $queries Queries.
-		 *
-		 * @return array
-		 */
-		public function sanitize_query( array $queries ): array {
-			$clean_queries = array();
-
-			foreach ( $queries as $key => $query ) {
-				if ( 'relation' === $key ) {
-					$relation = $query;
-
-				} elseif ( ! is_array( $query ) ) {
-					$clean_queries[ $key ]['values'] = array( $query );
-
-					// First-order clause.
-				} elseif ( $this->is_first_order_clause( $query ) ) {
-					print( 'h3' );
-					if ( isset( $query['value'] ) && array() === $query['value'] ) {
-						unset( $query['value'] );
-					}
-
-					$clean_queries[ $key ] = $query;
-
-					// Otherwise, it's a nested query, so we recurse.
-				} else {
-					print( 'h4' );
-					$cleaned_query = $this->sanitize_query( $query );
-
-					if ( ! empty( $cleaned_query ) ) {
-						$clean_queries[ $key ] = $cleaned_query;
-					}
-				}
-			}
-
-			if ( empty( $clean_queries ) ) {
-				return $clean_queries;
-			}
-
-			// Sanitize the 'relation' key provided in the query.
-			if ( isset( $relation ) && 'OR' === strtoupper( $relation ) ) {
-				$clean_queries['relation'] = 'OR';
-
-				/*
+    /**
+     * Main Redux_Extension_Users class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Extension_Users extends Redux_Extension_Abstract {
+
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.5.6';
+
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Users';
+
+
+        /**
+         * Profiles array.
+         *
+         * @var null|array
+         */
+        public ?array $profiles = array();
+
+        /**
+         * User roles array.
+         *
+         * @var null|array
+         */
+        public ?array $users_roles = array();
+
+        /**
+         * User role array.
+         *
+         * @var null|array
+         */
+        public ?array $users_role = array();
+
+        /**
+         * Sections array.
+         *
+         * @var null|array
+         */
+        public ?array $sections = array();
+
+        /**
+         * Original args array.
+         *
+         * @var null|array
+         */
+        public ?array $orig_args = array();
+
+        /**
+         * Output array.
+         *
+         * @var null|array
+         */
+        public ?array $output = array();
+
+        /**
+         * Parent options array.
+         *
+         * @var null|array
+         */
+        public ?array $parent_options = array();
+
+        /**
+         * Parent defaults.
+         *
+         * @var null|array
+         */
+        public ?array $parent_defaults = array();
+
+        /**
+         * Profile fields array.
+         *
+         * @var null|array
+         */
+        public ?array $profile_fields = array();
+
+        /**
+         * Options defaults.
+         *
+         * @var null|array
+         */
+        public ?array $options_defaults = array();
+
+        /**
+         * To replace array.
+         *
+         * @var null|array
+         */
+        public ?array $to_replace = array();
+
+        /**
+         * Meta array.
+         *
+         * @var null|array
+         */
+        public ?array $meta = array();
+
+        /**
+         * Array of page names.
+         *
+         * @var null|array
+         */
+        public ?array $pagenows;
+
+        /**
+         * Notices array.
+         *
+         * @var null|array
+         */
+        public ?array $notices;
+
+        /**
+         * Redux_Extension_Users constructor.
+         *
+         * @param object $redux ReduxFramework pointer.
+         */
+        public function __construct( $redux ) {
+            global $pagenow;
+
+            parent::__construct( $redux, __FILE__ );
+
+            $this->parent = $redux;
+
+            $this->add_field( 'users' );
+            $this->parent->extensions['users'] = $this;
+
+            $this->pagenows = array( 'user-new.php', 'profile.php', 'user-edit.php' );
+
+            require_once __DIR__ . '/redux-users-helpers.php';
+
+            add_action( 'admin_notices', array( $this, 'meta_profiles_show_errors' ), 0 );
+            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ), 20 );
+
+            if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) {
+                $this->init();
+
+                add_action( 'personal_options_update', array( $this, 'user_meta_save' ) );
+                add_action( 'edit_user_profile_update', array( $this, 'user_meta_save' ) );
+
+            }
+        }
+
+        /**
+         * Add term classes.
+         *
+         * @param array $classes Classes.
+         *
+         * @return array
+         */
+        public function add_user_classes( array $classes ): array {
+            $classes[] = 'redux-users';
+            $classes[] = 'redux-' . $this->parent->args['opt_name'];
+
+            if ( '' !== $this->parent->args['class'] ) {
+                $classes[] = $this->parent->args['class'];
+            }
+
+            return $classes;
+        }
+
+        /**
+         * Add hide term class.
+         *
+         * @param array $classes Classes.
+         *
+         * @return array
+         */
+        public function add_user_hide_class( array $classes ): array {
+            $classes[] = 'hide';
+
+            return $classes;
+        }
+
+        /**
+         * Init.
+         */
+        public function init() {
+            global $pagenow;
+
+            if ( isset( $_POST['action'] ) && 'redux_demo_customizer_save' === $_POST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+                return;
+            }
+
+            $this->parent->transients['run_compiler'] = false;
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $this->profiles = apply_filters( 'redux/users/' . $this->parent->args['opt_name'] . '/profiles', $this->profiles, $this->parent->args['opt_name'] );
+
+            if ( empty( $this->profiles ) && class_exists( 'Redux_Users' ) ) {
+                $this->profiles = Redux_Users::construct_profiles( $this->parent->args['opt_name'] );
+            }
+
+            if ( empty( $this->profiles ) || ! is_array( $this->profiles ) ) {
+                return;
+            }
+
+            foreach ( $this->profiles as $bk => $profile ) {
+                $profile['roles'] = isset( $profile['roles'] ) ? (array) $profile['roles'] : array( 'read' );
+
+                if ( ! empty( $profile['sections'] ) ) {
+                    $this->sections = $profile['sections'];
+
+                    $this->users_roles = wp_parse_args( $this->users_roles, $profile['roles'] );
+
+                    // Checking to override the parent variables.
+                    $add_field = false;
+
+                    foreach ( $profile['roles'] as $role ) {
+                        if ( $this->users_role === $role ) {
+                            $add_field = true;
+                        }
+                    }
+
+                    // Replacing all the fields.
+                    if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
+                        foreach ( $profile['sections'] as $sk => $section ) {
+                            if ( ! empty( $section['fields'] ) ) {
+                                foreach ( $section['fields'] as $fk => $field ) {
+                                    if ( ! isset( $field['class'] ) ) {
+                                        $field['class'] = '';
+
+                                        $this->profiles[ $bk ]['sections'][ $sk ]['fields'][ $fk ] = $field;
+                                    }
+
+                                    $this->parent->required_class->check_dependencies( $field );
+
+                                    if ( $add_field || ( ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) || ( ! is_admin() ) ) ) {
+                                        if ( empty( $field['id'] ) ) {
+                                            continue;
+                                        }
+
+                                        if ( isset( $field['default'] ) ) {
+                                            $this->options_defaults[ $field['id'] ] = $field['default'];
+                                        } else {
+                                            $this->options_defaults[ $field['id'] ] = $this->field_default( $field );
+                                        }
+
+                                        foreach ( $profile['roles'] as $type ) {
+                                            $this->profile_fields[ $type ][ $field['id'] ] = 1;
+                                        }
+
+                                        if ( ! empty( $field['output'] ) ) {
+                                            $this->output[ $field['id'] ] = isset( $this->output[ $field['id'] ] ) ? array_merge( $field['output'], $this->output[ $field['id'] ] ) : $field['output'];
+                                        }
+
+                                        // Detect what field types are being used.
+                                        if ( ! isset( $this->parent->fields[ $field['type'] ][ $field['id'] ] ) ) {
+                                            $this->parent->fields[ $field['type'] ][ $field['id'] ] = 1;
+                                        } else {
+                                            $this->parent->fields[ $field['type'] ] = array( $field['id'] => 1 );
+                                        }
+
+                                        if ( isset( $this->options_defaults[ $field['id'] ] ) ) {
+                                            $this->to_replace[ $field['id'] ] = $field;
+                                        }
+                                    }
+
+                                    if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
+                                        $this->parent->sections[ ( count( $this->parent->sections ) - 1 ) ]['fields'][] = $field;
+                                    }
+
+                                    if ( ! isset( $this->meta[ $field['id'] ] ) ) {
+                                        $this->meta[ $field['id'] ] = $this->options_defaults[ $field['id'] ];
+                                    }
+
+                                    // Only override if it exists, and it's not the default.
+                                    /** If ( isset( $this->meta[ $field['id'] ] ) && isset( $field['default'] ) && $this->meta[ $field['id'] ] === $field['default'] ) {
+                                     *    // unset($this->meta[$this->tag_id][$field['id']]);
+                                     *  }
+                                     */
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            $this->parent_options = array();
+
+            if ( ! empty( $this->to_replace ) ) {
+                foreach ( $this->to_replace as $id => $field ) {
+                    add_filter( "redux/options/{$this->parent->args['opt_name']}/field/$id/register", array( $this, 'replace_field' ) );
+                }
+            }
+
+            add_filter( "redux/options/{$this->parent->args['opt_name']}/options", array( $this, 'override_options' ) );
+
+            if ( is_admin() && in_array( $pagenow, $this->pagenows, true ) ) {
+                $priority = $this->parent->args['user_priority'] ?? 3;
+
+                add_action( 'show_user_profile', array( $this, 'add_profiles' ), $priority );
+                add_action( 'edit_user_profile', array( $this, 'add_profiles' ), $priority );
+                add_action( 'user_new_form', array( $this, 'add_profiles' ), $priority );
+            }
+        }
+
+        /**
+         * Replace field.
+         *
+         * @param array $field Field array.
+         *
+         * @return mixed
+         */
+        public function replace_field( array $field ) {
+            if ( isset( $this->to_replace[ $field['id'] ] ) ) {
+                $field = $this->to_replace[ $field['id'] ];
+            }
+
+            return $field;
+        }
+
+        /**
+         * Output CSS.
+         *
+         * @param array $field Field array.
+         *
+         * @return array
+         */
+        public function output_css( array $field ): array {
+            if ( isset( $this->output[ $field['id'] ] ) ) {
+                $field['output'] = $this->output[ $field['id'] ];
+            }
+
+            return $field;
+        }
+
+        /**
+         * Make sure the defaults are the defaults
+         *
+         * @param array $options Option array.
+         *
+         * @return array
+         */
+        public function override_options( array $options ): array {
+            $this->parent->options_class->default_values();
+            $this->parent_defaults = $this->parent->options_defaults;
+
+            if ( empty( $this->meta ) ) {
+                // phpcs:ignore WordPress.Security.NonceVerification
+                $user       = isset( $_GET['user_id'] ) ? sanitize_text_field( wp_unslash( $_GET['user_id'] ) ) : get_current_user_id();
+                $this->meta = Redux_Users::get_user_meta( array( 'user' => $user ) );
+            }
+
+            $data = wp_parse_args( $this->meta, $this->options_defaults );
+
+            foreach ( $data as $key => $value ) {
+                if ( isset( $meta[ $key ] ) && '' !== $meta[ $key ] ) {
+                    $data[ $key ] = $meta[ $key ];
+                    continue;
+                }
+
+                if ( isset( $options[ $key ] ) ) {
+                    $data[ $key ] = $options[ $key ];
+                }
+            }
+
+            $this->parent->options_defaults = wp_parse_args( $this->options_defaults, $this->parent->options_defaults );
+
+            return wp_parse_args( $data, $options );
+        }
+
+        /**
+         * Sanitize Query.
+         *
+         * @param array $queries Queries.
+         *
+         * @return array
+         */
+        public function sanitize_query( array $queries ): array {
+            $clean_queries = array();
+
+            foreach ( $queries as $key => $query ) {
+                if ( 'relation' === $key ) {
+                    $relation = $query;
+
+                } elseif ( ! is_array( $query ) ) {
+                    $clean_queries[ $key ]['values'] = array( $query );
+
+                    // First-order clause.
+                } elseif ( $this->is_first_order_clause( $query ) ) {
+                    print( 'h3' );
+                    if ( isset( $query['value'] ) && array() === $query['value'] ) {
+                        unset( $query['value'] );
+                    }
+
+                    $clean_queries[ $key ] = $query;
+
+                    // Otherwise, it's a nested query, so we recurse.
+                } else {
+                    print( 'h4' );
+                    $cleaned_query = $this->sanitize_query( $query );
+
+                    if ( ! empty( $cleaned_query ) ) {
+                        $clean_queries[ $key ] = $cleaned_query;
+                    }
+                }
+            }
+
+            if ( empty( $clean_queries ) ) {
+                return $clean_queries;
+            }
+
+            // Sanitize the 'relation' key provided in the query.
+            if ( isset( $relation ) && 'OR' === strtoupper( $relation ) ) {
+                $clean_queries['relation'] = 'OR';
+
+                /*
 				 * If there is only a single clause, call the relation 'OR'.
 				 * This value will not be used to join clauses, but it
 				 * simplifies the logic around combining key-only queries.
 				 */
-			} elseif ( 1 === count( $clean_queries ) ) {
-				$clean_queries['relation'] = 'OR';
-
-				// Default to AND.
-			} else {
-				$clean_queries['relation'] = 'AND';
-			}
-
-			return $clean_queries;
-		}
-
-		/**
-		 * Is the first order clause.
-		 *
-		 * @param array $query Query array.
-		 *
-		 * @return bool
-		 */
-		protected function is_first_order_clause( array $query ): bool {
-			return isset( $query['key'] ) || isset( $query['value'] );
-		}
-
-		/**
-		 * Support file and field enqueue.
-		 */
-		public function enqueue() {
-			global $pagenow;
-
-			if ( in_array( $pagenow, $this->pagenows, true ) ) {
-
-				if ( 'user-new.php' === $pagenow ) {
-					$this->parent->args['disable_save_warn'] = true;
-				}
-
-				$this->parent->transients       = get_transient( $this->parent->args['opt_name'] . '-transients-users' );
-				$this->parent->transients_check = $this->parent->transients;
-
-				if ( isset( $this->parent->transients['notices'] ) ) {
-					$this->notices                              = $this->parent->transients['notices'];
-					$this->parent->transients['last_save_mode'] = 'users';
-				}
-
-				delete_transient( $this->parent->args['opt_name'] . '-transients-users' );
-
-				$this->parent->enqueue_class->init();
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				do_action( "redux/users/{$this->parent->args['opt_name']}/enqueue" );
-
-				/**
-				 * Redux users CSS
-				 * filter 'redux/page/{opt_name}/enqueue/redux-extension-users-css'
-				 */
-				if ( true === $this->parent->args['dev_mode'] ) {
-					wp_enqueue_style(
-						'redux-extension-users',
-						// phpcs:ignore WordPress.NamingConventions.ValidHookName
-						apply_filters( "redux/users/{$this->parent->args['opt_name']}/enqueue/redux-extension-users-css", $this->extension_url . 'redux-extension-users.css' ),
-						array(),
-						self::$version
-					);
-				}
-
-				/**
-				 * Redux users JS
-				 * filter 'redux/page/{opt_name}/enqueue/redux-extension-users-js
-				 */
-				wp_enqueue_script(
-					'redux-extension-users',
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					apply_filters( "redux/users/{$this->parent->args['opt_name']}/enqueue/redux-extension-users-js", $this->extension_url . 'redux-extension-users' . Redux_Functions::is_min() . '.js' ),
-					array( 'jquery', 'redux-js' ),
-					self::$version,
-					true
-				);
-
-				// Values used by the JavaScript.
-				wp_localize_script( 'redux-extension-users', 'reduxUsers', $this->users_roles );
-
-			}
-		}
-
-
-		/**
-		 * DEPRECATED
-		 */
-		public function default_values() {
-			if ( ! empty( $this->profiles ) && empty( $this->options_defaults ) ) {
-				foreach ( $this->profiles as $key => $profile ) {
-					if ( empty( $profile['sections'] ) ) {
-						continue;
-					}
-
-					// fill the cache.
-					foreach ( $profile['sections'] as $sk => $section ) {
-						if ( ! isset( $section['id'] ) ) {
-							if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
-								$section['id'] = $sk;
-							} else {
-								$section['id'] = sanitize_title( $section['title'], $sk );
-							}
-							$this->profiles[ $key ]['sections'][ $sk ] = $section;
-						}
-						if ( isset( $section['fields'] ) ) {
-							foreach ( $section['fields'] as $k => $field ) {
-								if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
-									continue;
-								}
-
-								if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
-									$this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
-									unset( $this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
-								}
-
-								if ( 'section' === $field['type'] && isset( $field['indent'] ) && true === $field['indent'] ) {
-									$field['class']  = $field['class'] ?? '';
-									$field['class'] .= 'redux-section-indent-start';
-
-									$this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
-								}
-
-								if ( ! isset( $this->parent->options_defaults_class ) ) {
-									$this->parent->options_defaults_class = new Redux_Options_Defaults();
-								}
-
-								$this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $field );
-
-								if ( 'repeater' === $field['type'] ) {
-									foreach ( $field['fields'] as $f ) {
-										$this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $f, null, true );
-									}
-								}
-
-								$this->parent->options_defaults = $this->parent->options_defaults_class->options_defaults;
-							}
-						}
-					}
-				}
-			}
-
-			if ( empty( $this->meta ) ) {
-				// phpcs:ignore WordPress.Security.NonceVerification
-				$user       = isset( $_GET['user_id'] ) ? sanitize_text_field( wp_unslash( $_GET['user_id'] ) ) : get_current_user_id();
-				$this->meta = Redux_Users::get_user_meta( array( 'user' => $user ) );
-			}
-		}
-
-		/**
-		 * Add Profiles.
-		 */
-		public function add_profiles() {
-			if ( empty( $this->profiles ) || ! is_array( $this->profiles ) ) {
-				return;
-			}
-
-			foreach ( $this->profiles as $key => $profile ) {
-				if ( empty( $profile['sections'] ) ) {
-					continue;
-				}
-
-				$defaults = array(
-					'id'         => "$key",
-					'section_id' => $key,
-					'profiles'   => array(),
-				);
-
-				$profile = wp_parse_args( $profile, $defaults );
-
-				// Override the parent args on a meta-term level.
-				if ( empty( $this->orig_args ) ) {
-					$this->orig_args = $this->parent->args;
-				}
-
-				if ( isset( $profile['args'] ) ) {
-					$this->parent->args = wp_parse_args( $profile['args'], $this->orig_args );
-				} elseif ( $this->parent->args !== $this->orig_args ) {
-					$this->parent->args = $this->orig_args;
-				}
-
-				if ( ! isset( $profile['class'] ) ) {
-					$profile['class'] = array();
-				}
-
-				if ( ! empty( $profile['class'] ) ) {
-					if ( ! is_array( $profile['class'] ) ) {
-						$profile['class'] = array( $profile['class'] );
-					}
-				}
-
-				$profile['class'] = $this->add_user_classes( $profile['class'] );
-
-				if ( isset( $profile['post_format'] ) ) {
-					$profile['class'] = $this->add_user_hide_class( $profile['class'] );
-				}
-
-				global $pagenow;
-				if ( strpos( $pagenow, 'edit-' ) !== false ) {
-
-					$profile['style']   = 'wp';
-					$profile['class'][] = ' edit-page';
-					$profile['class'][] = ' redux-wp-style';
-				}
-
-				$this->generate_profiles( array( 'args' => $profile ) );
-			}
-		}
-
-		/**
-		 * Field Default.
-		 *
-		 * @param array $field_id ID.
-		 *
-		 * @return mixed|string
-		 */
-		public function field_default( array $field_id ) {
-			if ( ! isset( $this->parent->options_defaults ) ) {
-				$this->parent->options_defaults = $this->parent->default_values();
-			}
-
-			if ( ! isset( $this->parent->options ) || empty( $this->parent->options ) ) {
-				if ( ! isset( $this->parent->options_class ) ) {
-					$this->parent->options_class = new Redux_Options_Constructor( $this->parent );
-				}
-
-				$this->parent->options_class->get();
-			}
-
-			if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
-				return $this->parent->options[ $field_id['id'] ];
-			} else {
-				if ( empty( $this->options_defaults ) ) {
-					$this->default_values(); // fill cache.
-				}
-
-				$data = '';
-				if ( ! empty( $this->options_defaults ) ) {
-					$data = $this->options_defaults[ $field_id['id'] ] ?? '';
-				}
-
-				if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
-					$data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
-				}
-
-				return $data;
-			}
-		}
-
-		/**
-		 * Function to get and cache the post-meta.
-		 *
-		 * @param string $id ID.
-		 *
-		 * @return array
-		 */
-		private function get_meta( string $id ): array {
-			if ( ! isset( $this->meta[ $id ] ) ) {
-				$this->meta[ $id ] = array();
-				$o_data            = get_post_meta( $id );
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$o_data = apply_filters( "redux/users/{$this->parent->args['opt_name']}/get_meta", $o_data );
-
-				if ( ! empty( $o_data ) ) {
-					foreach ( $o_data as $key => $value ) {
-						if ( count( $value ) === 1 ) {
-							$this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
-						} else {
-							$new_value = array_map( 'maybe_unserialize', $value );
-
-							$this->meta[ $id ][ $key ] = $new_value[0];
-						}
-					}
-				}
-
-				if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
-					$data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
-
-					foreach ( $data as $key => $value ) {
-						$this->meta[ $id ][ $key ] = $value;
-						update_post_meta( $id, $key, $value );
-					}
-
-					unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
-
-					delete_post_meta( $id, $this->parent->args['opt_name'] );
-				}
-			}
-
-			return $this->meta[ $id ];
-		}
-
-		/**
-		 * Get values.
-		 *
-		 * @param mixed  $the_post Post array.
-		 * @param string $meta_key Meta key.
-		 * @param string $def_val  Default value.
-		 *
-		 * @return mixed|string
-		 */
-		public function get_values( $the_post, string $meta_key = '', string $def_val = '' ) {
-
-			// Override these values if they differ from the admin panel defaults.  ;).
-			if ( isset( $the_post->users_role ) && in_array( $the_post->users_role, $this->users_roles, true ) ) {
-				if ( isset( $this->users_role_values[ $the_post->users_role ] ) ) {
-					$meta = $this->profile_fields[ $the_post->users_role ];
-				} else {
-					$defaults = array();
-					if ( ! empty( $this->profile_fields[ $the_post->users_role ] ) ) {
-						foreach ( $this->profile_fields[ $the_post->users_role ] as $key => $null ) {
-							if ( isset( $this->options_defaults[ $key ] ) ) {
-								$defaults[ $key ] = $this->options_defaults[ $key ];
-							}
-						}
-					}
-
-					$meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
-
-					$this->profile_fields[ $the_post->users_role ] = $meta;
-				}
-
-				if ( ! empty( $meta_key ) ) {
-					if ( ! isset( $meta[ $meta_key ] ) ) {
-						$meta[ $meta_key ] = $def_val;
-					}
-
-					return $meta[ $meta_key ];
-				} else {
-					return $meta;
-				}
-			}
-
-			return $def_val;
-		}
-
-		/**
-		 * Check Edit Visibility.
-		 *
-		 * @param array $params Array.
-		 *
-		 * @return bool
-		 */
-		private function check_edit_visibility( array $params = array() ): bool {
-			global $pagenow;
-
-			// Edit page visibility.
-			if ( strpos( $pagenow, 'edit-' ) !== false ) {
-				if ( isset( $params['fields'] ) ) {
-					foreach ( $params['fields'] as $field ) {
-						if ( in_array( $field['id'], Redux_Core::$fields_hidden, true ) ) { //phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
-							// Not visible.
-						} elseif ( isset( $field['add_visibility'] ) && $field['add_visibility'] ) {
-							return true;
-						}
-					}
-
-					return false;
-				}
-				if ( isset( $params['add_visibility'] ) && $params['add_visibility'] ) {
-					return true;
-				}
-
-				return false;
-			}
-
-			return true;
-		}
-
-		/**
-		 * Generate Profiles.
-		 *
-		 * @param array $metaterm Meta term.
-		 */
-		private function generate_profiles( array $metaterm ) {
-			if ( ! empty( $metaterm['args']['permissions'] ) && ! Redux_Helpers::current_user_can( $metaterm['args']['permissions'] ) ) {
-				return;
-			}
-
-			if ( isset( $metaterm['args']['style'] ) && in_array( $metaterm['args']['style'], array( 'wp', 'wordpress' ), true ) ) {
-				$container_class             = 'redux-wp-style';
-				$metaterm['args']['sidebar'] = false;
-			} elseif ( isset( $metaterm['args']['sidebar'] ) && ! $metaterm['args']['sidebar'] ) {
-				$container_class = 'redux-no-sections';
-			} else {
-				$container_class = 'redux-has-sections';
-			}
-
-			$class = implode( ' ', $metaterm['args']['class'] );
-			echo '<div class="' . esc_attr( $class ) . '">';
-
-			$sections = $metaterm['args']['sections'];
-
-			wp_nonce_field( 'redux_users_meta_nonce', 'redux_users_meta_nonce' );
-
-			wp_dequeue_script( 'json-view-js' );
-
-			$sidebar = true;
-			if ( count( $sections ) === 1 || ( isset( $metaterm['args']['sidebar'] ) && false === $metaterm['args']['sidebar'] ) ) {
-				$sidebar = false; // Show the section dividers or not.
-			}
-			?>
+            } elseif ( 1 === count( $clean_queries ) ) {
+                $clean_queries['relation'] = 'OR';
+
+                // Default to AND.
+            } else {
+                $clean_queries['relation'] = 'AND';
+            }
+
+            return $clean_queries;
+        }
+
+        /**
+         * Is the first order clause.
+         *
+         * @param array $query Query array.
+         *
+         * @return bool
+         */
+        protected function is_first_order_clause( array $query ): bool {
+            return isset( $query['key'] ) || isset( $query['value'] );
+        }
+
+        /**
+         * Support file and field enqueue.
+         */
+        public function enqueue() {
+            global $pagenow;
+
+            if ( in_array( $pagenow, $this->pagenows, true ) ) {
+
+                if ( 'user-new.php' === $pagenow ) {
+                    $this->parent->args['disable_save_warn'] = true;
+                }
+
+                $this->parent->transients       = get_transient( $this->parent->args['opt_name'] . '-transients-users' );
+                $this->parent->transients_check = $this->parent->transients;
+
+                if ( isset( $this->parent->transients['notices'] ) ) {
+                    $this->notices                              = $this->parent->transients['notices'];
+                    $this->parent->transients['last_save_mode'] = 'users';
+                }
+
+                delete_transient( $this->parent->args['opt_name'] . '-transients-users' );
+
+                $this->parent->enqueue_class->init();
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                do_action( "redux/users/{$this->parent->args['opt_name']}/enqueue" );
+
+                /**
+                 * Redux users CSS
+                 * filter 'redux/page/{opt_name}/enqueue/redux-extension-users-css'
+                 */
+                if ( true === $this->parent->args['dev_mode'] ) {
+                    wp_enqueue_style(
+                        'redux-extension-users',
+                        // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                        apply_filters( "redux/users/{$this->parent->args['opt_name']}/enqueue/redux-extension-users-css", $this->extension_url . 'redux-extension-users.css' ),
+                        array(),
+                        self::$version
+                    );
+                }
+
+                /**
+                 * Redux users JS
+                 * filter 'redux/page/{opt_name}/enqueue/redux-extension-users-js
+                 */
+                wp_enqueue_script(
+                    'redux-extension-users',
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    apply_filters( "redux/users/{$this->parent->args['opt_name']}/enqueue/redux-extension-users-js", $this->extension_url . 'redux-extension-users' . Redux_Functions::is_min() . '.js' ),
+                    array( 'jquery', 'redux-js' ),
+                    self::$version,
+                    true
+                );
+
+                // Values used by the JavaScript.
+                wp_localize_script( 'redux-extension-users', 'reduxUsers', $this->users_roles );
+
+            }
+        }
+
+
+        /**
+         * DEPRECATED
+         */
+        public function default_values() {
+            if ( ! empty( $this->profiles ) && empty( $this->options_defaults ) ) {
+                foreach ( $this->profiles as $key => $profile ) {
+                    if ( empty( $profile['sections'] ) ) {
+                        continue;
+                    }
+
+                    // fill the cache.
+                    foreach ( $profile['sections'] as $sk => $section ) {
+                        if ( ! isset( $section['id'] ) ) {
+                            if ( ! is_numeric( $sk ) || ! isset( $section['title'] ) ) {
+                                $section['id'] = $sk;
+                            } else {
+                                $section['id'] = sanitize_title( $section['title'], $sk );
+                            }
+                            $this->profiles[ $key ]['sections'][ $sk ] = $section;
+                        }
+                        if ( isset( $section['fields'] ) ) {
+                            foreach ( $section['fields'] as $k => $field ) {
+                                if ( empty( $field['id'] ) && empty( $field['type'] ) ) {
+                                    continue;
+                                }
+
+                                if ( 'ace_editor' === $field['type'] && isset( $field['options'] ) ) {
+                                    $this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ]['args'] = $field['options'];
+                                    unset( $this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ]['options'] );
+                                }
+
+                                if ( 'section' === $field['type'] && isset( $field['indent'] ) && true === $field['indent'] ) {
+                                    $field['class']  = $field['class'] ?? '';
+                                    $field['class'] .= 'redux-section-indent-start';
+
+                                    $this->profiles[ $key ]['sections'][ $sk ]['fields'][ $k ] = $field;
+                                }
+
+                                if ( ! isset( $this->parent->options_defaults_class ) ) {
+                                    $this->parent->options_defaults_class = new Redux_Options_Defaults();
+                                }
+
+                                $this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $field );
+
+                                if ( 'repeater' === $field['type'] ) {
+                                    foreach ( $field['fields'] as $f ) {
+                                        $this->parent->options_defaults_class->field_default_values( $this->parent->args['opt_name'], $f, null, true );
+                                    }
+                                }
+
+                                $this->parent->options_defaults = $this->parent->options_defaults_class->options_defaults;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ( empty( $this->meta ) ) {
+                // phpcs:ignore WordPress.Security.NonceVerification
+                $user       = isset( $_GET['user_id'] ) ? sanitize_text_field( wp_unslash( $_GET['user_id'] ) ) : get_current_user_id();
+                $this->meta = Redux_Users::get_user_meta( array( 'user' => $user ) );
+            }
+        }
+
+        /**
+         * Add Profiles.
+         */
+        public function add_profiles() {
+            if ( empty( $this->profiles ) || ! is_array( $this->profiles ) ) {
+                return;
+            }
+
+            foreach ( $this->profiles as $key => $profile ) {
+                if ( empty( $profile['sections'] ) ) {
+                    continue;
+                }
+
+                $defaults = array(
+                    'id'         => "$key",
+                    'section_id' => $key,
+                    'profiles'   => array(),
+                );
+
+                $profile = wp_parse_args( $profile, $defaults );
+
+                // Override the parent args on a meta-term level.
+                if ( empty( $this->orig_args ) ) {
+                    $this->orig_args = $this->parent->args;
+                }
+
+                if ( isset( $profile['args'] ) ) {
+                    $this->parent->args = wp_parse_args( $profile['args'], $this->orig_args );
+                } elseif ( $this->parent->args !== $this->orig_args ) {
+                    $this->parent->args = $this->orig_args;
+                }
+
+                if ( ! isset( $profile['class'] ) ) {
+                    $profile['class'] = array();
+                }
+
+                if ( ! empty( $profile['class'] ) ) {
+                    if ( ! is_array( $profile['class'] ) ) {
+                        $profile['class'] = array( $profile['class'] );
+                    }
+                }
+
+                $profile['class'] = $this->add_user_classes( $profile['class'] );
+
+                if ( isset( $profile['post_format'] ) ) {
+                    $profile['class'] = $this->add_user_hide_class( $profile['class'] );
+                }
+
+                global $pagenow;
+                if ( strpos( $pagenow, 'edit-' ) !== false ) {
+
+                    $profile['style']   = 'wp';
+                    $profile['class'][] = ' edit-page';
+                    $profile['class'][] = ' redux-wp-style';
+                }
+
+                $this->generate_profiles( array( 'args' => $profile ) );
+            }
+        }
+
+        /**
+         * Field Default.
+         *
+         * @param array $field_id ID.
+         *
+         * @return mixed|string
+         */
+        public function field_default( array $field_id ) {
+            if ( ! isset( $this->parent->options_defaults ) ) {
+                $this->parent->options_defaults = $this->parent->default_values();
+            }
+
+            if ( ! isset( $this->parent->options ) || empty( $this->parent->options ) ) {
+                if ( ! isset( $this->parent->options_class ) ) {
+                    $this->parent->options_class = new Redux_Options_Constructor( $this->parent );
+                }
+
+                $this->parent->options_class->get();
+            }
+
+            if ( isset( $this->parent->options[ $field_id['id'] ] ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) && $this->parent->options[ $field_id['id'] ] !== $this->parent->options_defaults[ $field_id['id'] ] ) {
+                return $this->parent->options[ $field_id['id'] ];
+            } else {
+                if ( empty( $this->options_defaults ) ) {
+                    $this->default_values(); // fill cache.
+                }
+
+                $data = '';
+                if ( ! empty( $this->options_defaults ) ) {
+                    $data = $this->options_defaults[ $field_id['id'] ] ?? '';
+                }
+
+                if ( empty( $data ) && isset( $this->parent->options_defaults[ $field_id['id'] ] ) ) {
+                    $data = $this->parent->options_defaults[ $field_id['id'] ] ?? '';
+                }
+
+                return $data;
+            }
+        }
+
+        /**
+         * Function to get and cache the post-meta.
+         *
+         * @param string $id ID.
+         *
+         * @return array
+         */
+        private function get_meta( string $id ): array {
+            if ( ! isset( $this->meta[ $id ] ) ) {
+                $this->meta[ $id ] = array();
+                $o_data            = get_post_meta( $id );
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $o_data = apply_filters( "redux/users/{$this->parent->args['opt_name']}/get_meta", $o_data );
+
+                if ( ! empty( $o_data ) ) {
+                    foreach ( $o_data as $key => $value ) {
+                        if ( count( $value ) === 1 ) {
+                            $this->meta[ $id ][ $key ] = maybe_unserialize( $value[0] );
+                        } else {
+                            $new_value = array_map( 'maybe_unserialize', $value );
+
+                            $this->meta[ $id ][ $key ] = $new_value[0];
+                        }
+                    }
+                }
+
+                if ( isset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] ) ) {
+                    $data = maybe_unserialize( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+
+                    foreach ( $data as $key => $value ) {
+                        $this->meta[ $id ][ $key ] = $value;
+                        update_post_meta( $id, $key, $value );
+                    }
+
+                    unset( $this->meta[ $id ][ $this->parent->args['opt_name'] ] );
+
+                    delete_post_meta( $id, $this->parent->args['opt_name'] );
+                }
+            }
+
+            return $this->meta[ $id ];
+        }
+
+        /**
+         * Get values.
+         *
+         * @param mixed  $the_post Post array.
+         * @param string $meta_key Meta key.
+         * @param string $def_val  Default value.
+         *
+         * @return mixed|string
+         */
+        public function get_values( $the_post, string $meta_key = '', string $def_val = '' ) {
+
+            // Override these values if they differ from the admin panel defaults.  ;).
+            if ( isset( $the_post->users_role ) && in_array( $the_post->users_role, $this->users_roles, true ) ) {
+                if ( isset( $this->users_role_values[ $the_post->users_role ] ) ) {
+                    $meta = $this->profile_fields[ $the_post->users_role ];
+                } else {
+                    $defaults = array();
+                    if ( ! empty( $this->profile_fields[ $the_post->users_role ] ) ) {
+                        foreach ( $this->profile_fields[ $the_post->users_role ] as $key => $null ) {
+                            if ( isset( $this->options_defaults[ $key ] ) ) {
+                                $defaults[ $key ] = $this->options_defaults[ $key ];
+                            }
+                        }
+                    }
+
+                    $meta = wp_parse_args( $this->get_meta( $the_post->ID ), $defaults );
+
+                    $this->profile_fields[ $the_post->users_role ] = $meta;
+                }
+
+                if ( ! empty( $meta_key ) ) {
+                    if ( ! isset( $meta[ $meta_key ] ) ) {
+                        $meta[ $meta_key ] = $def_val;
+                    }
+
+                    return $meta[ $meta_key ];
+                } else {
+                    return $meta;
+                }
+            }
+
+            return $def_val;
+        }
+
+        /**
+         * Check Edit Visibility.
+         *
+         * @param array $params Array.
+         *
+         * @return bool
+         */
+        private function check_edit_visibility( array $params = array() ): bool {
+            global $pagenow;
+
+            // Edit page visibility.
+            if ( strpos( $pagenow, 'edit-' ) !== false ) {
+                if ( isset( $params['fields'] ) ) {
+                    foreach ( $params['fields'] as $field ) {
+                        if ( in_array( $field['id'], Redux_Core::$fields_hidden, true ) ) { //phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
+                            // Not visible.
+                        } elseif ( isset( $field['add_visibility'] ) && $field['add_visibility'] ) {
+                            return true;
+                        }
+                    }
+
+                    return false;
+                }
+                if ( isset( $params['add_visibility'] ) && $params['add_visibility'] ) {
+                    return true;
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        /**
+         * Generate Profiles.
+         *
+         * @param array $metaterm Meta term.
+         */
+        private function generate_profiles( array $metaterm ) {
+            if ( ! empty( $metaterm['args']['permissions'] ) && ! Redux_Helpers::current_user_can( $metaterm['args']['permissions'] ) ) {
+                return;
+            }
+
+            if ( isset( $metaterm['args']['style'] ) && in_array( $metaterm['args']['style'], array( 'wp', 'wordpress' ), true ) ) {
+                $container_class             = 'redux-wp-style';
+                $metaterm['args']['sidebar'] = false;
+            } elseif ( isset( $metaterm['args']['sidebar'] ) && ! $metaterm['args']['sidebar'] ) {
+                $container_class = 'redux-no-sections';
+            } else {
+                $container_class = 'redux-has-sections';
+            }
+
+            $class = implode( ' ', $metaterm['args']['class'] );
+            echo '<div class="' . esc_attr( $class ) . '">';
+
+            $sections = $metaterm['args']['sections'];
+
+            wp_nonce_field( 'redux_users_meta_nonce', 'redux_users_meta_nonce' );
+
+            wp_dequeue_script( 'json-view-js' );
+
+            $sidebar = true;
+            if ( count( $sections ) === 1 || ( isset( $metaterm['args']['sidebar'] ) && false === $metaterm['args']['sidebar'] ) ) {
+                $sidebar = false; // Show the section dividers or not.
+            }
+            ?>
 			<div data-opt-name="<?php echo esc_attr( $this->parent->args['opt_name'] ); ?>"
 				class="redux-container <?php echo( esc_attr( $container_class ) ); ?> redux-term redux-box-normal redux-term-normal">
 				<div class="redux-notices">
@@ -857,292 +857,292 @@ 
 					</div>
 				</div>
 				<?php
-				echo '<a href="javascript:void(0);" class="expand_options hide" style="display:none;">' . esc_html__( 'Expand', 'redux-framework' ) . '</a>';
-				if ( $sidebar ) {
-					?>
+                echo '<a href="javascript:void(0);" class="expand_options hide" style="display:none;">' . esc_html__( 'Expand', 'redux-framework' ) . '</a>';
+                if ( $sidebar ) {
+                    ?>
 					<div class="redux-sidebar">
 						<ul class="redux-group-menu">
 							<?php
-							foreach ( $sections as $s_key => $section ) {
-								if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
-									continue;
-								}
-
-								// phpcs:ignore WordPress.Security.EscapeOutput
-								echo $this->parent->render_class->section_menu( $s_key, $section, '_' . $metaterm['args']['id'], $sections );
-							}
-							?>
+                            foreach ( $sections as $s_key => $section ) {
+                                if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
+                                    continue;
+                                }
+
+                                // phpcs:ignore WordPress.Security.EscapeOutput
+                                echo $this->parent->render_class->section_menu( $s_key, $section, '_' . $metaterm['args']['id'], $sections );
+                            }
+                            ?>
 						</ul>
 					</div>
 				<?php } ?>
 				<div class="redux-main">
 					<?php
 
-					foreach ( $sections as $s_key => $section ) {
-						if ( ! $this->check_edit_visibility( $section ) ) {
-							continue;
-						}
-
-						if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
-							continue;
-						}
-
-						if ( ! empty( $section['fields'] ) ) {
-							if ( isset( $section['args'] ) ) {
-								$this->parent->args = wp_parse_args( $section['args'], $this->orig_args );
-							} elseif ( $this->parent->args !== $this->orig_args ) {
-								$this->parent->args = $this->orig_args;
-							}
-
-							$hide             = $sidebar ? '' : ' display-group';
-							$section['class'] = isset( $section['class'] ) ? " {$section['class']}" : '';
-
-							// phpcs:ignore WordPress.Security.EscapeOutput
-							echo "<div id='{$s_key}_{$metaterm['args']['id']}_section_group' class='redux-group-tab{$section['class']} redux_metaterm_panel$hide'>";
-
-							if ( ! empty( $section['title'] ) ) {
-								echo '<h3 class="redux-section-title">' . wp_kses_post( $section['title'] ) . '</h3>';
-							}
-
-							if ( ! empty( $section['desc'] ) ) {
-								echo '<div class="redux-section-desc">' . wp_kses_post( $section['desc'] ) . '</div>';
-							}
-
-							echo '<table class="form-table"><tbody>';
-
-							foreach ( $section['fields'] as $field ) {
-								if ( ! $this->check_edit_visibility( $field ) ) {
-									continue;
-								}
-
-								if ( ! empty( $field['permissions'] ) && ! Redux_Helpers::current_user_can( $field['permissions'] ) ) {
-									continue;
-								}
-
-								$field['name'] = $this->parent->args['opt_name'] . '[' . $field['id'] . ']';
-
-								$is_hidden = false;
-								$ex_style  = '';
-								if ( isset( $field['hidden'] ) && $field['hidden'] ) {
-									$is_hidden = true;
-									$ex_style  = ' style="border-bottom: none;"';
-								}
-
-								echo '<tr valign="top"' . $ex_style . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
-
-								$th = $this->parent->render_class->get_header_html( $field );
-
-								if ( $is_hidden ) {
-									$str_pos = strpos( $th, 'redux_field_th' );
-
-									if ( $str_pos > - 1 ) {
-										$th = str_replace( 'redux_field_th', 'redux_field_th hide', $th );
-									}
-								}
-
-								if ( $sidebar ) {
-									if ( ! ( isset( $metaterm['args']['sections'] ) && count( $metaterm['args']['sections'] ) === 1 && isset( $metaterm['args']['sections'][0]['fields'] ) && count( $metaterm['args']['sections'][0]['fields'] ) === 1 ) && isset( $field['title'] ) ) {
-										echo '<th scope="row">';
-										if ( ! empty( $th ) ) {
-											echo $th; //phpcs:ignore WordPress.Security.EscapeOutput
-										}
-										echo '</th>';
-										echo '<td>';
-									}
-								} else {
-									echo '<td>' . $th; //phpcs:ignore WordPress.Security.EscapeOutput
-								}
-
-								if ( 'section' === $field['type'] && true === $field['indent'] ) {
-									$field['class']  = $field['class'] ?? '';
-									$field['class'] .= 'redux-section-indent-start';
-								}
-
-								if ( ! isset( $this->meta[ $field['id'] ] ) ) {
-									$this->meta[ $field['id'] ] = '';
-								}
-
-								$this->parent->render_class->field_input( $field, $this->meta[ $field['id'] ] );
-								echo '</td></tr>';
-							}
-							echo '</tbody></table>';
-							echo '</div>';
-						}
-					}
-					?>
+                    foreach ( $sections as $s_key => $section ) {
+                        if ( ! $this->check_edit_visibility( $section ) ) {
+                            continue;
+                        }
+
+                        if ( ! empty( $section['permissions'] ) && ! Redux_Helpers::current_user_can( $section['permissions'] ) ) {
+                            continue;
+                        }
+
+                        if ( ! empty( $section['fields'] ) ) {
+                            if ( isset( $section['args'] ) ) {
+                                $this->parent->args = wp_parse_args( $section['args'], $this->orig_args );
+                            } elseif ( $this->parent->args !== $this->orig_args ) {
+                                $this->parent->args = $this->orig_args;
+                            }
+
+                            $hide             = $sidebar ? '' : ' display-group';
+                            $section['class'] = isset( $section['class'] ) ? " {$section['class']}" : '';
+
+                            // phpcs:ignore WordPress.Security.EscapeOutput
+                            echo "<div id='{$s_key}_{$metaterm['args']['id']}_section_group' class='redux-group-tab{$section['class']} redux_metaterm_panel$hide'>";
+
+                            if ( ! empty( $section['title'] ) ) {
+                                echo '<h3 class="redux-section-title">' . wp_kses_post( $section['title'] ) . '</h3>';
+                            }
+
+                            if ( ! empty( $section['desc'] ) ) {
+                                echo '<div class="redux-section-desc">' . wp_kses_post( $section['desc'] ) . '</div>';
+                            }
+
+                            echo '<table class="form-table"><tbody>';
+
+                            foreach ( $section['fields'] as $field ) {
+                                if ( ! $this->check_edit_visibility( $field ) ) {
+                                    continue;
+                                }
+
+                                if ( ! empty( $field['permissions'] ) && ! Redux_Helpers::current_user_can( $field['permissions'] ) ) {
+                                    continue;
+                                }
+
+                                $field['name'] = $this->parent->args['opt_name'] . '[' . $field['id'] . ']';
+
+                                $is_hidden = false;
+                                $ex_style  = '';
+                                if ( isset( $field['hidden'] ) && $field['hidden'] ) {
+                                    $is_hidden = true;
+                                    $ex_style  = ' style="border-bottom: none;"';
+                                }
+
+                                echo '<tr valign="top"' . $ex_style . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
+
+                                $th = $this->parent->render_class->get_header_html( $field );
+
+                                if ( $is_hidden ) {
+                                    $str_pos = strpos( $th, 'redux_field_th' );
+
+                                    if ( $str_pos > - 1 ) {
+                                        $th = str_replace( 'redux_field_th', 'redux_field_th hide', $th );
+                                    }
+                                }
+
+                                if ( $sidebar ) {
+                                    if ( ! ( isset( $metaterm['args']['sections'] ) && count( $metaterm['args']['sections'] ) === 1 && isset( $metaterm['args']['sections'][0]['fields'] ) && count( $metaterm['args']['sections'][0]['fields'] ) === 1 ) && isset( $field['title'] ) ) {
+                                        echo '<th scope="row">';
+                                        if ( ! empty( $th ) ) {
+                                            echo $th; //phpcs:ignore WordPress.Security.EscapeOutput
+                                        }
+                                        echo '</th>';
+                                        echo '<td>';
+                                    }
+                                } else {
+                                    echo '<td>' . $th; //phpcs:ignore WordPress.Security.EscapeOutput
+                                }
+
+                                if ( 'section' === $field['type'] && true === $field['indent'] ) {
+                                    $field['class']  = $field['class'] ?? '';
+                                    $field['class'] .= 'redux-section-indent-start';
+                                }
+
+                                if ( ! isset( $this->meta[ $field['id'] ] ) ) {
+                                    $this->meta[ $field['id'] ] = '';
+                                }
+
+                                $this->parent->render_class->field_input( $field, $this->meta[ $field['id'] ] );
+                                echo '</td></tr>';
+                            }
+                            echo '</tbody></table>';
+                            echo '</div>';
+                        }
+                    }
+                    ?>
 				</div>
 				<div class="clear"></div>
 			</div>
 			<?php
 
-			echo '</div>';
-		}
-
-		/**
-		 * Save meta-profiles
-		 * Runs when a post is saved and does an action which to write panel save scripts can hook into.
-		 *
-		 * @access public
-		 *
-		 * @param mixed $user_id User ID.
-		 *
-		 * @return boolean
-		 */
-		public function user_meta_save( $user_id = 0 ): bool {
-			if ( ! current_user_can( 'edit_user', $user_id ) ) {
-				return false;
-			}
-
-			// Check if our nonce is set.
-			if ( ! isset( $_POST['redux_users_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
-				return false;
-			}
-
-			// Verify that the nonce is valid.
-			if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux_users_meta_nonce'] ) ), 'redux_users_meta_nonce' ) ) {
-				return false;
-			}
-
-			$check_user_id = sanitize_text_field( wp_unslash( $_POST['checkuser_id'] ?? 1 ) );
-
-			$user       = sanitize_text_field( wp_unslash( $_POST['user_id'] ?? get_current_user_id() ) );
-			$this->meta = Redux_Users::get_user_meta( array( 'user' => $user ) );
-
-			$to_save    = array();
-			$to_compare = array();
-			$to_delete  = array();
-			$dont_save  = true;
-
-			$field_args = Redux_Users::$fields[ $this->parent->args['opt_name'] ];
-
-			foreach ( $_POST[ $this->parent->args['opt_name'] ] as $key => $value ) { // phpcs:ignore WordPress.Security
-				$key = sanitize_text_field( wp_unslash( $key ) );
-
-				if ( ! empty( $field_args[ $key ]['permissions'] ) ) {
-					foreach ( (array) $field_args[ $key ]['permissions'] as $pv ) {
-
-						// Do not save anything the user doesn't have permissions for.
-						if ( isset( $field_args[ $key ] ) ) {
-							if ( user_can( $user_id, $pv ) && user_can( $check_user_id, $pv ) ) {
-								break;
-							}
-						}
-					}
-				}
-
-				// Have to remove the escaping for array comparison.
-				if ( is_array( $value ) ) {
-					foreach ( $value as $k => $v ) {
-						if ( ! is_array( $v ) ) {
-							$value[ $k ] = sanitize_text_field( wp_unslash( $v ) );
-						}
-					}
-				}
-
-				$save = true;
-
-				// parent_options.
-				if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
-					$save = false;
-				}
-
-				if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
-					$save = false;
-				}
-
-				if ( $save ) {
-					$to_save[ $key ]    = $value;
-					$to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
-				} else {
-					$to_delete[ $key ] = $value;
-				}
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$to_save = apply_filters( "redux/{$this->parent->args['opt_name']}/users/save/before_validate", $to_save, $to_compare, $this->sections );
-
-			$validate = $this->parent->validate_class->validate( $to_save, $to_compare, $this->sections );
-
-			// Validate fields (if needed).
-			foreach ( $to_save as $key => $value ) {
-				if ( isset( $validate[ $key ] ) && $validate[ $key ] !== $value ) {
-					if ( isset( $this->meta[ $key ] ) && $validate[ $key ] === $this->meta[ $key ] ) {
-						unset( $to_save[ $key ] );
-					} else {
-						$to_save[ $key ] = $validate[ $key ];
-					}
-				}
-			}
-
-			if ( ! empty( $this->parent->errors ) || ! empty( $this->parent->warnings ) ) {
-				$this->parent->transients['notices'] = ( isset( $this->parent->transients['notices'] ) && is_array( $this->parent->transients['notices'] ) ) ? $this->parent->transients['notices'] : array();
-
-				if ( ! isset( $this->parent->transients['notices']['errors'] ) || $this->parent->transients['notices']['errors'] !== $this->parent->errors ) {
-					$this->parent->transients['notices']['errors'] = $this->parent->errors;
-					$update_transients                             = true;
-				}
-
-				if ( ! isset( $this->parent->transients['notices']['warnings'] ) || $this->parent->transients['notices']['warnings'] !== $this->parent->warnings ) {
-					$this->parent->transients['notices']['warnings'] = $this->parent->warnings;
-					$update_transients                               = true;
-				}
-
-				if ( isset( $update_transients ) ) {
-					$this->parent->transients['notices']['override'] = 1;
-					set_transient( $this->parent->args['opt_name'] . '-transients-users', $this->parent->transients );
-				}
-			}
-
-			$check = $this->profile_fields;
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$to_save = apply_filters( 'redux/users/save', $to_save, $to_compare, $this->sections );
-
-			foreach ( $to_save as $key => $value ) {
-				$prev_value = $this->meta[ $key ] ?? '';
-
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
-				}
-
-				update_user_meta( $user_id, $key, $value, $prev_value );
-			}
-
-			foreach ( $to_delete as $key => $value ) {
-				if ( isset( $check[ $key ] ) ) {
-					unset( $check[ $key ] );
-				}
-
-				$prev_value = $this->meta[ $key ] ?? '';
-				delete_user_meta( $user_id, $key, $prev_value );
-			}
-			if ( ! empty( $check ) ) {
-				foreach ( $check as $key => $value ) {
-					delete_user_meta( $user_id, $key );
-				}
-			}
-
-			return true;
-		}
-
-		/**
-		 * Show any stored error messages.
-		 *
-		 * @access public
-		 * @return void
-		 */
-		public function meta_profiles_show_errors() {
-			if ( isset( $this->notices['errors'] ) && ! empty( $this->notices['errors'] ) ) {
-				echo '<div id="redux_users_errors" class="error fade">';
-				echo '<p><strong><span></span> ' . count( $this->notices['errors'] ) . ' ' . esc_html__( 'error(s) were found!', 'redux-framework' ) . '</strong></p>';
-				echo '</div>';
-			}
-
-			if ( isset( $this->notices['warnings'] ) && ! empty( $this->notices['warnings'] ) ) {
-				echo '<div id="redux_users_warnings" class="error fade" style="border-left-color: #E8E20C;">';
-				echo '<p><strong><span></span> ' . count( $this->notices['warnings'] ) . ' ' . esc_html__( 'warnings(s) were found!', 'redux-framework' ) . '</strong></p>';
-				echo '</div>';
-			}
-		}
-	}
+            echo '</div>';
+        }
+
+        /**
+         * Save meta-profiles
+         * Runs when a post is saved and does an action which to write panel save scripts can hook into.
+         *
+         * @access public
+         *
+         * @param mixed $user_id User ID.
+         *
+         * @return boolean
+         */
+        public function user_meta_save( $user_id = 0 ): bool {
+            if ( ! current_user_can( 'edit_user', $user_id ) ) {
+                return false;
+            }
+
+            // Check if our nonce is set.
+            if ( ! isset( $_POST['redux_users_meta_nonce'] ) || ! isset( $_POST[ $this->parent->args['opt_name'] ] ) ) {
+                return false;
+            }
+
+            // Verify that the nonce is valid.
+            if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux_users_meta_nonce'] ) ), 'redux_users_meta_nonce' ) ) {
+                return false;
+            }
+
+            $check_user_id = sanitize_text_field( wp_unslash( $_POST['checkuser_id'] ?? 1 ) );
+
+            $user       = sanitize_text_field( wp_unslash( $_POST['user_id'] ?? get_current_user_id() ) );
+            $this->meta = Redux_Users::get_user_meta( array( 'user' => $user ) );
+
+            $to_save    = array();
+            $to_compare = array();
+            $to_delete  = array();
+            $dont_save  = true;
+
+            $field_args = Redux_Users::$fields[ $this->parent->args['opt_name'] ];
+
+            foreach ( $_POST[ $this->parent->args['opt_name'] ] as $key => $value ) { // phpcs:ignore WordPress.Security
+                $key = sanitize_text_field( wp_unslash( $key ) );
+
+                if ( ! empty( $field_args[ $key ]['permissions'] ) ) {
+                    foreach ( (array) $field_args[ $key ]['permissions'] as $pv ) {
+
+                        // Do not save anything the user doesn't have permissions for.
+                        if ( isset( $field_args[ $key ] ) ) {
+                            if ( user_can( $user_id, $pv ) && user_can( $check_user_id, $pv ) ) {
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // Have to remove the escaping for array comparison.
+                if ( is_array( $value ) ) {
+                    foreach ( $value as $k => $v ) {
+                        if ( ! is_array( $v ) ) {
+                            $value[ $k ] = sanitize_text_field( wp_unslash( $v ) );
+                        }
+                    }
+                }
+
+                $save = true;
+
+                // parent_options.
+                if ( ! $dont_save && isset( $this->options_defaults[ $key ] ) && $value === $this->options_defaults[ $key ] ) {
+                    $save = false;
+                }
+
+                if ( $save && isset( $this->parent_options[ $key ] ) && $this->parent_options[ $key ] !== $value ) {
+                    $save = false;
+                }
+
+                if ( $save ) {
+                    $to_save[ $key ]    = $value;
+                    $to_compare[ $key ] = $this->parent->options[ $key ] ?? '';
+                } else {
+                    $to_delete[ $key ] = $value;
+                }
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $to_save = apply_filters( "redux/{$this->parent->args['opt_name']}/users/save/before_validate", $to_save, $to_compare, $this->sections );
+
+            $validate = $this->parent->validate_class->validate( $to_save, $to_compare, $this->sections );
+
+            // Validate fields (if needed).
+            foreach ( $to_save as $key => $value ) {
+                if ( isset( $validate[ $key ] ) && $validate[ $key ] !== $value ) {
+                    if ( isset( $this->meta[ $key ] ) && $validate[ $key ] === $this->meta[ $key ] ) {
+                        unset( $to_save[ $key ] );
+                    } else {
+                        $to_save[ $key ] = $validate[ $key ];
+                    }
+                }
+            }
+
+            if ( ! empty( $this->parent->errors ) || ! empty( $this->parent->warnings ) ) {
+                $this->parent->transients['notices'] = ( isset( $this->parent->transients['notices'] ) && is_array( $this->parent->transients['notices'] ) ) ? $this->parent->transients['notices'] : array();
+
+                if ( ! isset( $this->parent->transients['notices']['errors'] ) || $this->parent->transients['notices']['errors'] !== $this->parent->errors ) {
+                    $this->parent->transients['notices']['errors'] = $this->parent->errors;
+                    $update_transients                             = true;
+                }
+
+                if ( ! isset( $this->parent->transients['notices']['warnings'] ) || $this->parent->transients['notices']['warnings'] !== $this->parent->warnings ) {
+                    $this->parent->transients['notices']['warnings'] = $this->parent->warnings;
+                    $update_transients                               = true;
+                }
+
+                if ( isset( $update_transients ) ) {
+                    $this->parent->transients['notices']['override'] = 1;
+                    set_transient( $this->parent->args['opt_name'] . '-transients-users', $this->parent->transients );
+                }
+            }
+
+            $check = $this->profile_fields;
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $to_save = apply_filters( 'redux/users/save', $to_save, $to_compare, $this->sections );
+
+            foreach ( $to_save as $key => $value ) {
+                $prev_value = $this->meta[ $key ] ?? '';
+
+                if ( isset( $check[ $key ] ) ) {
+                    unset( $check[ $key ] );
+                }
+
+                update_user_meta( $user_id, $key, $value, $prev_value );
+            }
+
+            foreach ( $to_delete as $key => $value ) {
+                if ( isset( $check[ $key ] ) ) {
+                    unset( $check[ $key ] );
+                }
+
+                $prev_value = $this->meta[ $key ] ?? '';
+                delete_user_meta( $user_id, $key, $prev_value );
+            }
+            if ( ! empty( $check ) ) {
+                foreach ( $check as $key => $value ) {
+                    delete_user_meta( $user_id, $key );
+                }
+            }
+
+            return true;
+        }
+
+        /**
+         * Show any stored error messages.
+         *
+         * @access public
+         * @return void
+         */
+        public function meta_profiles_show_errors() {
+            if ( isset( $this->notices['errors'] ) && ! empty( $this->notices['errors'] ) ) {
+                echo '<div id="redux_users_errors" class="error fade">';
+                echo '<p><strong><span></span> ' . count( $this->notices['errors'] ) . ' ' . esc_html__( 'error(s) were found!', 'redux-framework' ) . '</strong></p>';
+                echo '</div>';
+            }
+
+            if ( isset( $this->notices['warnings'] ) && ! empty( $this->notices['warnings'] ) ) {
+                echo '<div id="redux_users_warnings" class="error fade" style="border-left-color: #E8E20C;">';
+                echo '<p><strong><span></span> ' . count( $this->notices['warnings'] ) . ' ' . esc_html__( 'warnings(s) were found!', 'redux-framework' ) . '</strong></p>';
+                echo '</div>';
+            }
+        }
+    }
 }

redux-templates/classes/class-templates.php

Indentation +151 added lines, -151 removed lines

@@ -17,155 +17,155 @@
  */
 class Templates {
 
-	/**
-	 * Default container width.
-	 *
-	 * @var int
-	 */
-	public static int $content_width = 1200;
-
-	/**
-	 * ReduxTemplates Template.
-	 *
-	 * @since 4.0.0
-	 */
-	public function __construct() {
-		global $pagenow;
-
-		if ( 'widgets.php' === $pagenow ) {
-			return;
-		}
-
-		if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && ( class_exists( 'Classic_Editor' ) || defined( 'DISABLE_GUTENBERG_FILE' ) || class_exists( 'CodePopular_disable_gutenberg' ) ) ) {
-
-			// We don't want to add templates unless it's a gutenberg page.
-			return;
-		}
-
-		// Include ReduxTemplates default template without a wrapper.
-		add_filter( 'template_include', array( $this, 'template_include' ) );
-
-		// Override the default content-width when using Redux templates so the template doesn't look like shit.
-		add_action( 'wp', array( $this, 'modify_template_content_width' ) );
-
-		// Add ReduxTemplates supported Post types in page template.
-		$post_types = get_post_types( array(), 'object' );
-
-		if ( ! empty( $post_types ) ) {
-			foreach ( $post_types as $post_type ) {
-				if ( isset( $post_type->name ) && isset( $post_type->show_in_rest ) && true === $post_type->show_in_rest ) {
-					add_filter( "theme_{$post_type->name}_templates", array( $this, 'add_templates' ) );
-				}
-			}
-		}
-
-		add_filter( 'admin_body_class', array( $this, 'add_body_class' ), 999 );
-	}
-
-	/**
-	 * Add the redux-template class to the admin body if a redux-templates page type is selected.
-	 *
-	 * @param string|null $classes Classes string for the admin panel.
-	 *
-	 * @return string|null
-	 * @since 4.1.19
-	 */
-	public function add_body_class( ?string $classes ): ?string {
-		global $post;
-
-		$screen = get_current_screen();
-
-		if ( 'post' === $screen->base && get_current_screen()->is_block_editor() ) {
-			$check = get_post_meta( $post->ID, '_wp_page_template', true );
-
-			if ( strpos( $check, 'redux-templates_' ) !== false ) {
-				$classes .= ' redux-template';
-			}
-		}
-
-		return $classes;
-	}
-
-	/**
-	 * Override the $content_width variable for themes, so our templates work properly and don't look squished.
-	 *
-	 * @param array $to_find Template keys to check against.
-	 *
-	 * @return bool
-	 * @since 4.0.0
-	 */
-	public function check_template( array $to_find = array() ): bool {
-		global $post;
-
-		if ( ! empty( $post ) ) {
-			$template = get_page_template_slug( $post->ID );
-
-			if ( false !== strpos( $template, 'redux' ) ) {
-				$test = mb_strtolower( preg_replace( '/[^A-Za-z0-9 ]/', '', $template ) );
-
-				foreach ( $to_find as $key ) {
-					if ( false !== strpos( $test, $key ) ) {
-						return true;
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Override the $content_width variable for themes, so our templates work properly and don't look squished.
-	 *
-	 * @since 4.0.0
-	 */
-	public function modify_template_content_width() {
-		$to_find = array( 'cover', 'canvas', 'fullwidth' );
-		if ( $this->check_template( $to_find ) ) {
-			global $content_width;
-			if ( $content_width < 1000 ) {
-				$content_width = get_option( '_redux_content_width', self::$content_width );
-			}
-		}
-	}
-
-	/**
-	 * Include the template
-	 *
-	 * @param string|null $template Template type.
-	 *
-	 * @return string|null
-	 * @since 4.0.0
-	 */
-	public function template_include( ?string $template ): ?string {
-		if ( is_singular() ) {
-			$page_template = get_post_meta( get_the_ID(), '_wp_page_template', true );
-
-			if ( 'redux-templates_full_width' === $page_template ) {
-				$template = REDUXTEMPLATES_DIR_PATH . 'classes/templates/template-full-width.php';
-			} elseif ( 'redux-templates_contained' === $page_template ) {
-				$template = REDUXTEMPLATES_DIR_PATH . 'classes/templates/template-contained.php';
-			} elseif ( 'redux-templates_canvas' === $page_template ) {
-				$template = REDUXTEMPLATES_DIR_PATH . 'classes/templates/template-canvas.php';
-			}
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Hook to add the templates to the dropdown
-	 *
-	 * @param array $post_templates Default post template array.
-	 *
-	 * @return array
-	 * @since 4.0.0
-	 */
-	public function add_templates( array $post_templates ): array {
-		$post_templates['redux-templates_contained']  = __( 'Redux Contained', 'redux-framework' );
-		$post_templates['redux-templates_full_width'] = __( 'Redux Full Width', 'redux-framework' );
-		$post_templates['redux-templates_canvas']     = __( 'Redux Canvas', 'redux-framework' );
-
-		return $post_templates;
-	}
+    /**
+     * Default container width.
+     *
+     * @var int
+     */
+    public static int $content_width = 1200;
+
+    /**
+     * ReduxTemplates Template.
+     *
+     * @since 4.0.0
+     */
+    public function __construct() {
+        global $pagenow;
+
+        if ( 'widgets.php' === $pagenow ) {
+            return;
+        }
+
+        if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && ( class_exists( 'Classic_Editor' ) || defined( 'DISABLE_GUTENBERG_FILE' ) || class_exists( 'CodePopular_disable_gutenberg' ) ) ) {
+
+            // We don't want to add templates unless it's a gutenberg page.
+            return;
+        }
+
+        // Include ReduxTemplates default template without a wrapper.
+        add_filter( 'template_include', array( $this, 'template_include' ) );
+
+        // Override the default content-width when using Redux templates so the template doesn't look like shit.
+        add_action( 'wp', array( $this, 'modify_template_content_width' ) );
+
+        // Add ReduxTemplates supported Post types in page template.
+        $post_types = get_post_types( array(), 'object' );
+
+        if ( ! empty( $post_types ) ) {
+            foreach ( $post_types as $post_type ) {
+                if ( isset( $post_type->name ) && isset( $post_type->show_in_rest ) && true === $post_type->show_in_rest ) {
+                    add_filter( "theme_{$post_type->name}_templates", array( $this, 'add_templates' ) );
+                }
+            }
+        }
+
+        add_filter( 'admin_body_class', array( $this, 'add_body_class' ), 999 );
+    }
+
+    /**
+     * Add the redux-template class to the admin body if a redux-templates page type is selected.
+     *
+     * @param string|null $classes Classes string for the admin panel.
+     *
+     * @return string|null
+     * @since 4.1.19
+     */
+    public function add_body_class( ?string $classes ): ?string {
+        global $post;
+
+        $screen = get_current_screen();
+
+        if ( 'post' === $screen->base && get_current_screen()->is_block_editor() ) {
+            $check = get_post_meta( $post->ID, '_wp_page_template', true );
+
+            if ( strpos( $check, 'redux-templates_' ) !== false ) {
+                $classes .= ' redux-template';
+            }
+        }
+
+        return $classes;
+    }
+
+    /**
+     * Override the $content_width variable for themes, so our templates work properly and don't look squished.
+     *
+     * @param array $to_find Template keys to check against.
+     *
+     * @return bool
+     * @since 4.0.0
+     */
+    public function check_template( array $to_find = array() ): bool {
+        global $post;
+
+        if ( ! empty( $post ) ) {
+            $template = get_page_template_slug( $post->ID );
+
+            if ( false !== strpos( $template, 'redux' ) ) {
+                $test = mb_strtolower( preg_replace( '/[^A-Za-z0-9 ]/', '', $template ) );
+
+                foreach ( $to_find as $key ) {
+                    if ( false !== strpos( $test, $key ) ) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Override the $content_width variable for themes, so our templates work properly and don't look squished.
+     *
+     * @since 4.0.0
+     */
+    public function modify_template_content_width() {
+        $to_find = array( 'cover', 'canvas', 'fullwidth' );
+        if ( $this->check_template( $to_find ) ) {
+            global $content_width;
+            if ( $content_width < 1000 ) {
+                $content_width = get_option( '_redux_content_width', self::$content_width );
+            }
+        }
+    }
+
+    /**
+     * Include the template
+     *
+     * @param string|null $template Template type.
+     *
+     * @return string|null
+     * @since 4.0.0
+     */
+    public function template_include( ?string $template ): ?string {
+        if ( is_singular() ) {
+            $page_template = get_post_meta( get_the_ID(), '_wp_page_template', true );
+
+            if ( 'redux-templates_full_width' === $page_template ) {
+                $template = REDUXTEMPLATES_DIR_PATH . 'classes/templates/template-full-width.php';
+            } elseif ( 'redux-templates_contained' === $page_template ) {
+                $template = REDUXTEMPLATES_DIR_PATH . 'classes/templates/template-contained.php';
+            } elseif ( 'redux-templates_canvas' === $page_template ) {
+                $template = REDUXTEMPLATES_DIR_PATH . 'classes/templates/template-canvas.php';
+            }
+        }
+
+        return $template;
+    }
+
+    /**
+     * Hook to add the templates to the dropdown
+     *
+     * @param array $post_templates Default post template array.
+     *
+     * @return array
+     * @since 4.0.0
+     */
+    public function add_templates( array $post_templates ): array {
+        $post_templates['redux-templates_contained']  = __( 'Redux Contained', 'redux-framework' );
+        $post_templates['redux-templates_full_width'] = __( 'Redux Full Width', 'redux-framework' );
+        $post_templates['redux-templates_canvas']     = __( 'Redux Canvas', 'redux-framework' );
+
+        return $post_templates;
+    }
 }

redux-core/framework.php

Spacing +6 added lines, -6 removed lines

@@ -452,7 +452,7 @@ 
 		 *
 		 * @deprecated 4.0.0
 		 */
-		public static bool $_as_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+		public static bool $_as_plugin = false; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
 		/**
 		 * Deprecated shim for v3 as plugin check.
@@ -461,7 +461,7 @@ 
 		 *
 		 * @deprecated 4.0.0
 		 */
-		public static bool $_is_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+		public static bool $_is_plugin = false; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
 		/**
 		 * Cloning is forbidden.
@@ -507,7 +507,7 @@ 
 				return;
 			}
 
-			if ( ! isset( Redux::$init[ $args['opt_name'] ] ) ) {
+			if ( ! isset( Redux::$init[$args['opt_name']] ) ) {
 				// Let's go back to the Redux API instead of having it run directly.
 				Redux_Functions_Ex::record_caller( $args['opt_name'] );
 				Redux::set_args( $args['opt_name'], $args );
@@ -517,7 +517,7 @@ 
 				$sections = Redux::construct_sections( $args['opt_name'] );
 				$args     = Redux::construct_args( $args['opt_name'] );
 				Redux::set_defaults( $args['opt_name'] );
-				Redux::$init[ $args['opt_name'] ] = 1;
+				Redux::$init[$args['opt_name']] = 1;
 			}
 
 			$args             = new Redux_Args( $this, $args );
@@ -913,7 +913,7 @@ 
 		 * @return      mixed
 		 */
 		public function get( string $opt_name, $defaults = null ) {
-			return ( ! empty( $this->options[ $opt_name ] ) ) ? $this->options[ $opt_name ] : $this->options_class->get_default( $opt_name, $defaults );
+			return ( ! empty( $this->options[$opt_name] ) ) ? $this->options[$opt_name] : $this->options_class->get_default( $opt_name, $defaults );
 		}
 
 		/**
@@ -929,7 +929,7 @@ 
 		 */
 		public function set( string $opt_name = '', $values = array() ) {
 			if ( ! empty( $opt_name ) && is_array( $values ) ) {
-				$this->options[ $opt_name ] = $values;
+				$this->options[$opt_name] = $values;
 				$this->options_class->set( $values );
 			}
 		}

Indentation +850 added lines, -850 removed lines

@@ -39,854 +39,854 @@
 // Don't duplicate me!
 if ( ! class_exists( 'ReduxFramework', false ) ) {
 
-	/**
-	 * Main ReduxFramework class
-	 *
-	 * @since       1.0.0
-	 */
-	class ReduxFramework {
-
-		/**
-		 * ReduxFramework instance storage.
-		 *
-		 * @var null|ReduxFramework
-		 * @access public
-		 */
-		public static ?ReduxFramework $instance;
-
-		/**
-		 * Redux current version.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_version = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Absolute directory of the Redux instance.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Full URL of the Redux instance.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_url = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Current WordPress upload directory.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_upload_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Current WordPress upload URL
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_upload_url; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Init
-		 *
-		 * Backward compatibility for previous versions of Redux.
-		 */
-		public static function init() {
-
-			// Backward compatibility for extensions.
-			self::$_version    = Redux_Core::$version;
-			self::$_dir        = Redux_Core::$dir;
-			self::$_url        = Redux_Core::$url;
-			self::$_upload_dir = Redux_Core::$upload_dir;
-			self::$_upload_url = Redux_Core::$upload_url;
-			self::$_as_plugin  = Redux_Core::$as_plugin;
-			self::$_is_plugin  = Redux_Core::$is_plugin;
-		}
-
-		/**
-		 * Array of field arrays.
-		 *
-		 * @var null|array
-		 */
-		public ?array $fields = array();
-
-		/**
-		 * Array of field sections.
-		 *
-		 * @var null|array
-		 */
-		public ?array $field_sections = array();
-
-		/**
-		 * Array of field types.
-		 *
-		 * @var null|array
-		 */
-		public ?array $field_types = array();
-
-		/**
-		 * Array of field heads.
-		 *
-		 * @var null|array
-		 */
-		public ?array $field_head = array();
-
-		/**
-		 * Array of extensions by type used in the panel.
-		 *
-		 * @var null|array
-		 */
-		public ?array $extensions = array();
-
-		/**
-		 * Array of sections and fields arrays.
-		 *
-		 * @var null|array
-		 */
-		public ?array $sections = array();
-
-		/**
-		 * Array of generated errors from the panel for localization.
-		 *
-		 * @var null|array
-		 */
-		public ?array $errors = array();
-
-		/**
-		 * Array of generated warnings from the panel for localization.
-		 *
-		 * @var null|array
-		 */
-		public ?array $warnings = array();
-
-		/**
-		 * Array of generated sanitize notices from the panel for localization.
-		 *
-		 * @var null|array
-		 */
-		public ?array $sanitize = array();
-
-		/**
-		 * Array of current option values.
-		 *
-		 * @var null|array
-		 */
-		public ?array $options = array();
-
-		/**
-		 * Array of option defaults.
-		 *
-		 * @var null|array
-		 */
-		public ?array $options_defaults = null;
-
-		/**
-		 * Array of fields set to trigger the compiler hook.
-		 *
-		 * @var null|array
-		 */
-		public ?array $compiler_fields = array();
-
-		/**
-		 * Array of fields with CSS output selectors.
-		 *
-		 * @var null|array
-		 */
-		public ?array $output = array();
-
-		/**
-		 * Autogenerated CSS appended to the header (snake case maintained for backward compatibility).
-		 *
-		 * @var null|string
-		 */
-		public ?string $outputCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
-
-		/**
-		 * Autogenerated variables appended to dynamic output.
-		 *
-		 * @var null|array
-		 */
-		public ?array $output_variables = array();
-
-		/**
-		 * CSS sent to the compiler hook (snake case maintained for backward compatibility).
-		 *
-		 * @var null|string
-		 */
-		public ?string $compilerCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
-
-		/**
-		 * Array of global arguments.
-		 *
-		 * @var array|null
-		 */
-		public ?array $args = array();
-
-		/**
-		 * Used in customizer hooks.
-		 *
-		 * @var null|string
-		 */
-		public ?string $old_opt_name = '';
-
-		/**
-		 * Pointer to the Redux_Options_Default class.
-		 *
-		 * @var null|Redux_Options_Defaults
-		 */
-		public ?Redux_Options_Defaults $options_defaults_class = null;
-
-		/**
-		 * Pointer to the Redux_Options class.
-		 *
-		 * @var null|Redux_Options_Constructor
-		 */
-		public ?Redux_Options_Constructor $options_class = null;
-
-		/**
-		 * Pointer to the Redux_Required class
-		 *
-		 * @var null|Redux_Required
-		 */
-		public ?Redux_Required $required_class = null;
-
-		/**
-		 * Pointer to the Redux_Output class.
-		 *
-		 * @var null|Redux_Output
-		 */
-		public ?Redux_Output $output_class = null;
-
-		/**
-		 * Pointer to the Redux_Page_Render class.
-		 *
-		 * @var null|Redux_Page_Render
-		 */
-		public ?Redux_Page_Render $render_class = null;
-
-		/**
-		 * Pointer to the Redux_Enqueue class.
-		 *
-		 * @var null|Redux_Enqueue
-		 */
-		public ?Redux_Enqueue $enqueue_class = null;
-
-		/**
-		 * Pointer to the Redux_Transients class.
-		 *
-		 * @var null|Redux_Transients
-		 */
-		public ?Redux_Transients $transient_class = null;
-
-		/**
-		 * Pointer to the Redux_wordPress_Data class.
-		 *
-		 * @var null|Redux_WordPress_Data
-		 */
-		public ?Redux_WordPress_Data $wordpress_data = null;
-
-		/**
-		 * Pointer to the Redux_Validation class.
-		 *
-		 * @var null|Redux_Validation
-		 */
-		public ?Redux_Validation $validate_class = null;
-
-		/**
-		 * Pointer to the Redux_Sanitize class.
-		 *
-		 * @var null|Redux_Sanitize
-		 */
-		public ?Redux_Sanitize $sanitize_class = null;
-
-		/**
-		 * Pointer to the Redux_Args class.
-		 *
-		 * @var null|Redux_Args
-		 */
-		public ?Redux_Args $args_class = null;
-
-		/**
-		 * Array of active transients used by Redux.
-		 *
-		 * @var null|mixed
-		 */
-		public $transients = array();
-
-		/**
-		 * Array of localized repeater data.
-		 *
-		 * @var null|array
-		 */
-		public ?array $repeater_data = array();
-
-		/**
-		 * Array of localized data.
-		 *
-		 * @var null|array
-		 */
-		public ?array $localize_data = array();
-
-		/**
-		 * Array of checked transients used by Redux.
-		 *
-		 * @var null|mixed
-		 */
-		public $transients_check = array();
-
-		/**
-		 * Never save to DB flag for metaboxes.
-		 *
-		 * @var bool
-		 */
-		public bool $never_save_to_db;
-
-		/**
-		 * File system object used for I/O file operations.  Done the WordPress way.
-		 *
-		 * @var null|object
-		 *
-		 * @deprecated 4.5.1
-		 */
-		public ?object $filesystem;
-
-		/**
-		 * Deprecated shim for v3 templates.
-		 *
-		 * @var null|array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public ?array $hidden_perm_sections = array();
-
-		/**
-		 * Deprecated shim for v3 as plugin check.
-		 *
-		 * @var bool
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static bool $_as_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Deprecated shim for v3 as plugin check.
-		 *
-		 * @var bool
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static bool $_is_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Cloning is forbidden.
-		 *
-		 * @since 4.0.0
-		 */
-		public function __clone() {
-			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
-		}
-
-		/**
-		 * Un-serializing instances of this class are forbidden.
-		 *
-		 * @since 4.0.0
-		 */
-		public function __wakeup() {
-			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
-		}
-
-		/**
-		 * Add a deprecating notice for all the old themes that still use this method..
-		 *
-		 * @param object $filesystem Filesystem object.
-		 *
-		 * @since 4.0.0
-		 */
-		private function deprecated_filesystem( $filesystem ) {
-			//_deprecated_function( esc_html__( 'The global variable "$filesystem" of the ReduxFramework object', 'redux-framework' ), '4.5.1', 'Redux_Core::$filesystem' );
-
-			return $filesystem;
-		}
-
-		/**
-		 * Class Constructor. Defines the args for the theme options class
-		 *
-		 * @param array $sections Panel sections.
-		 * @param array $args     Class constructor arguments.
-		 *
-		 * @throws ReflectionException Exception.
-		 * @since       1.0.0
-		 */
-		public function __construct( array $sections = array(), array $args = array() ) {
-			global $pagenow;
-
-			if ( Redux_Core::is_heartbeat() ) {
-				return;
-			}
-
-			$args['load_on_cron'] = $args['load_on_cron'] ?? false;
-
-			if ( false === $args['load_on_cron'] && 'wp-cron.php' === $pagenow ) {
-				return;
-			}
-
-			if ( empty( $args ) || ( empty( $args['opt_name'] ) ) ) {
-				return;
-			}
-
-			if ( ! isset( Redux::$init[ $args['opt_name'] ] ) ) {
-				// Let's go back to the Redux API instead of having it run directly.
-				Redux_Functions_Ex::record_caller( $args['opt_name'] );
-				Redux::set_args( $args['opt_name'], $args );
-				if ( ! empty( $sections ) ) {
-					Redux::set_sections( $args['opt_name'], $sections );
-				}
-				$sections = Redux::construct_sections( $args['opt_name'] );
-				$args     = Redux::construct_args( $args['opt_name'] );
-				Redux::set_defaults( $args['opt_name'] );
-				Redux::$init[ $args['opt_name'] ] = 1;
-			}
-
-			$args             = new Redux_Args( $this, $args );
-			$this->args_class = $args;
-			$this->args       = $args->get;
-
-			Redux_Core::core_construct( $this );
-
-			new Redux_Admin_Notices( $this );
-
-			if ( ! empty( $this->args['opt_name'] ) ) {
-				new Redux_Instances( $this );
-
-				Redux_Core::$filesystem = Redux_Filesystem::get_instance( $this );
-
-				$this->filesystem = $this->deprecated_filesystem( Redux_Core::$filesystem );
-
-				/**
-				 * Filter 'redux/options/{opt_name}/sections'
-				 *
-				 * @param  array $sections field option sections
-				 */
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$this->sections = apply_filters( "redux/options/{$this->args['opt_name']}/sections", $sections );
-
-				/**
-				 * Construct hook
-				 * action 'redux/construct'
-				 *
-				 * @param object $this ReduxFramework
-				 */
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				do_action( 'redux/construct', $this );
-
-				// Internationalization.
-				new Redux_I18n( $this, __FILE__ );
-
-				$this->required_class  = new Redux_Required( $this );
-				$this->transient_class = new Redux_Transients( $this );
-				$this->wordpress_data  = new Redux_WordPress_Data( $this );
-				$this->validate_class  = new Redux_Validation( $this );
-				$this->sanitize_class  = new Redux_Sanitize( $this );
-
-				// Register extra extensions.
-				new Redux_Extensions( $this );
-
-				// Grab database values.
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-				$this->options_class->get();
-
-				$this->output_class  = new Redux_Output( $this );
-				$this->render_class  = new Redux_Page_Render( $this );
-				$this->enqueue_class = new Redux_Enqueue( $this );
-
-				new Redux_AJAX_Save( $this );
-				new Redux_AJAX_Typography( $this );
-				new Redux_AJAX_Select2( $this );
-			}
-
-			/**
-			 * Loaded hook
-			 * action 'redux/loaded'
-			 *
-			 * @param  object $this ReduxFramework
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( 'redux/loaded', $this );
-		}
-
-		/**
-		 * Begin backward compatibility shims for Redux v3 configs and extensions.
-		 */
-
-		/**
-		 * SHIM: _register_settings
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _register_settings() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->register()' );
-
-			$this->options_class->register();
-		}
-
-		/**
-		 * SHIM: _field_input
-		 *
-		 * @param array        $field Field array.
-		 * @param string|array $v     Field values.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _field_input( array $field, $v = null ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->field_input( $field, $value )' );
-
-			$this->render_class->field_input( $field, $v );
-		}
-
-		/**
-		 * SHIM: field_default_values
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function field_default_values( array $field ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_defaults_class->field_default_values( $opt_name, $field )' );
-
-			$this->options_defaults_class->field_default_values( '', $field );
-		}
-
-		/**
-		 * SHIM: set_options
-		 *
-		 * @param string|array $value Option values.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function set_options( $value ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->set( $value )' );
-
-			$this->options_class->set( $value );
-		}
-
-		/**
-		 * SHIM: get_options
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_options() {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get()' );
-
-			$this->options_class->get();
-		}
-
-		/**
-		 * SHIM: _default_values
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _default_values() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->default_values()' );
-
-			return $this->default_values();
-		}
-
-		/**
-		 * Get default values.
-		 *
-		 * @return array
-		 */
-		public function default_values() {
-			if ( ! isset( $this->options_class ) ) {
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-			}
-
-			return $this->options_class->default_values();
-		}
-
-		/**
-		 * SHIM: check_dependencies
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function check_dependencies( array $field ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'required_class->check_dependencies( $field )' );
-
-			$this->required_class->check_dependencies( $field );
-		}
-
-		/**
-		 * SHIM: _enqueue_output
-		 *
-		 * @throws ReflectionException Exception.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _enqueue_output() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'output_class->enqueue()' );
-
-			if ( empty( $this->output_class ) ) {
-				$obj          = new ReduxFramework( $this->sections, $this->args );
-				$obj->options = $this->options;
-				$obj->output_class->enqueue();
-				$this->outputCSS = $obj->outputCSS; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
-			} else {
-				$this->output_class->enqueue();
-			}
-		}
-
-		/**
-		 * SHIM: _enqueue
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _enqueue() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'enqueue_class->init()' );
-
-			$this->enqueue_class->init();
-		}
-
-		/**
-		 * _enqueue replacement.
-		 *
-		 * @return void
-		 */
-		public function init_enqueue() {
-			$this->enqueue_class->init();
-		}
-
-		/**
-		 * SHIM: generate_panel
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function generate_panel() {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->generate_panel()' );
-
-			$this->render_class->generate_panel();
-		}
-
-		/**
-		 * SHIM: get_default_values
-		 *
-		 * @param string $key       Key value.
-		 * @param bool   $array_key Flag to determine array status.
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_default_values( $key, $array_key = false ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
-
-			if ( ! isset( $this->options_class ) ) {
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-			}
-
-			return $this->options_class->get_default_value( $key, $array_key );
-		}
-
-		/**
-		 * SHIM: get_default_value
-		 *
-		 * @param string $key       Key value.
-		 * @param bool   $array_key Flag to determine array status.
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_default_value( $key, $array_key = false ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
-
-			if ( ! isset( $this->options_class ) ) {
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-			}
-
-			return $this->options_class->get_default_value( $key, $array_key );
-		}
-
-		/**
-		 * SHIM: get_wordpress_data
-		 *
-		 * @param bool         $type data type.
-		 * @param array        $args args to pass to WordPress API.
-		 * @param string|array $current_value Current value.
-		 *
-		 * @return array|mixed|string|void
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_wordpress_data( $type = false, $args = array(), $current_value = null ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'wordpress_data->get( $type, $args, $opt_name, $value )' );
-
-			return $this->wordpress_data->get( $type, $args, $this->args['opt_name'], $current_value );
-		}
-
-		/**
-		 * SHIM: _validate_values
-		 *
-		 * @param array $plugin_options Current panel options.
-		 * @param array $options        Options to validate.
-		 * @param array $sections       Sections array.
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _validate_values( $plugin_options, $options, $sections ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'validate_class->validate( $plugin_options, $options, $sections )' );
-
-			if ( ! isset( $this->validate_class ) ) {
-				$this->validate_class = new Redux_Validation( $this );
-			}
-
-			return $this->validate_class->validate( $plugin_options, $options, $sections );
-		}
-
-		/**
-		 * SHIM: set_transients
-		 *
-		 * @return void
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function set_transients() {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'Please update the extension that uses this deprecated function.' );
-		}
-
-		/**
-		 * SHIM: section_menu
-		 *
-		 * @param int    $k        Array Key.
-		 * @param array  $section  Section array.
-		 * @param string $suffix   Unique string.
-		 * @param array  $sections Section array.
-		 *
-		 * @return string
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function section_menu( $k, $section, $suffix = '', $sections = array() ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->section_menu( $index, $section, $suffix, $sections )' );
-
-			return $this->render_class->section_menu( $k, $section, $suffix, $sections );
-		}
-
-		/**
-		 * SHIM: get_header_html
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return string
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_header_html( $field ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->get_header_html( $field )' );
-
-			return $this->render_class->get_header_html( $field );
-		}
-
-		/**
-		 * SHIM: current_user_can
-		 *
-		 * @param string $permission User permission.
-		 *
-		 * @return bool
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function current_user_can( $permission ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'Redux_Helpers::current_user_can' );
-
-			return Redux_Helpers::current_user_can( $permission );
-		}
-
-		/**
-		 * End backward compatibility shims for Redux v3 configs and extensions.
-		 */
-
-		/**
-		 * Pointer to the ReduxFramework instance.
-		 *
-		 * @return ReduxFramework|null
-		 */
-		public function get_instance(): ?ReduxFramework {
-			return self::$instance;
-		}
-
-		/**
-		 * →get(); This is used to return and option value from the option array
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       string $opt_name The option name to return.
-		 * @param       mixed  $defaults (null) The value to return if an option isn't set.
-		 *
-		 * @return      mixed
-		 */
-		public function get( string $opt_name, $defaults = null ) {
-			return ( ! empty( $this->options[ $opt_name ] ) ) ? $this->options[ $opt_name ] : $this->options_class->get_default( $opt_name, $defaults );
-		}
-
-		/**
-		 * →set(); This is used to set an arbitrary option in the option array
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       string $opt_name The name of the option being added.
-		 * @param       mixed  $values   The value of the option being added.
-		 *
-		 * @return      void
-		 */
-		public function set( string $opt_name = '', $values = array() ) {
-			if ( ! empty( $opt_name ) && is_array( $values ) ) {
-				$this->options[ $opt_name ] = $values;
-				$this->options_class->set( $values );
-			}
-		}
-	}
-
-	ReduxFramework::init();
-
-	/**
-	 * Action 'redux/init'
-	 */
-	do_action( 'redux/init' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+    /**
+     * Main ReduxFramework class
+     *
+     * @since       1.0.0
+     */
+    class ReduxFramework {
+
+        /**
+         * ReduxFramework instance storage.
+         *
+         * @var null|ReduxFramework
+         * @access public
+         */
+        public static ?ReduxFramework $instance;
+
+        /**
+         * Redux current version.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_version = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Absolute directory of the Redux instance.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Full URL of the Redux instance.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_url = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Current WordPress upload directory.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_upload_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Current WordPress upload URL
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_upload_url; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Init
+         *
+         * Backward compatibility for previous versions of Redux.
+         */
+        public static function init() {
+
+            // Backward compatibility for extensions.
+            self::$_version    = Redux_Core::$version;
+            self::$_dir        = Redux_Core::$dir;
+            self::$_url        = Redux_Core::$url;
+            self::$_upload_dir = Redux_Core::$upload_dir;
+            self::$_upload_url = Redux_Core::$upload_url;
+            self::$_as_plugin  = Redux_Core::$as_plugin;
+            self::$_is_plugin  = Redux_Core::$is_plugin;
+        }
+
+        /**
+         * Array of field arrays.
+         *
+         * @var null|array
+         */
+        public ?array $fields = array();
+
+        /**
+         * Array of field sections.
+         *
+         * @var null|array
+         */
+        public ?array $field_sections = array();
+
+        /**
+         * Array of field types.
+         *
+         * @var null|array
+         */
+        public ?array $field_types = array();
+
+        /**
+         * Array of field heads.
+         *
+         * @var null|array
+         */
+        public ?array $field_head = array();
+
+        /**
+         * Array of extensions by type used in the panel.
+         *
+         * @var null|array
+         */
+        public ?array $extensions = array();
+
+        /**
+         * Array of sections and fields arrays.
+         *
+         * @var null|array
+         */
+        public ?array $sections = array();
+
+        /**
+         * Array of generated errors from the panel for localization.
+         *
+         * @var null|array
+         */
+        public ?array $errors = array();
+
+        /**
+         * Array of generated warnings from the panel for localization.
+         *
+         * @var null|array
+         */
+        public ?array $warnings = array();
+
+        /**
+         * Array of generated sanitize notices from the panel for localization.
+         *
+         * @var null|array
+         */
+        public ?array $sanitize = array();
+
+        /**
+         * Array of current option values.
+         *
+         * @var null|array
+         */
+        public ?array $options = array();
+
+        /**
+         * Array of option defaults.
+         *
+         * @var null|array
+         */
+        public ?array $options_defaults = null;
+
+        /**
+         * Array of fields set to trigger the compiler hook.
+         *
+         * @var null|array
+         */
+        public ?array $compiler_fields = array();
+
+        /**
+         * Array of fields with CSS output selectors.
+         *
+         * @var null|array
+         */
+        public ?array $output = array();
+
+        /**
+         * Autogenerated CSS appended to the header (snake case maintained for backward compatibility).
+         *
+         * @var null|string
+         */
+        public ?string $outputCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+        /**
+         * Autogenerated variables appended to dynamic output.
+         *
+         * @var null|array
+         */
+        public ?array $output_variables = array();
+
+        /**
+         * CSS sent to the compiler hook (snake case maintained for backward compatibility).
+         *
+         * @var null|string
+         */
+        public ?string $compilerCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+        /**
+         * Array of global arguments.
+         *
+         * @var array|null
+         */
+        public ?array $args = array();
+
+        /**
+         * Used in customizer hooks.
+         *
+         * @var null|string
+         */
+        public ?string $old_opt_name = '';
+
+        /**
+         * Pointer to the Redux_Options_Default class.
+         *
+         * @var null|Redux_Options_Defaults
+         */
+        public ?Redux_Options_Defaults $options_defaults_class = null;
+
+        /**
+         * Pointer to the Redux_Options class.
+         *
+         * @var null|Redux_Options_Constructor
+         */
+        public ?Redux_Options_Constructor $options_class = null;
+
+        /**
+         * Pointer to the Redux_Required class
+         *
+         * @var null|Redux_Required
+         */
+        public ?Redux_Required $required_class = null;
+
+        /**
+         * Pointer to the Redux_Output class.
+         *
+         * @var null|Redux_Output
+         */
+        public ?Redux_Output $output_class = null;
+
+        /**
+         * Pointer to the Redux_Page_Render class.
+         *
+         * @var null|Redux_Page_Render
+         */
+        public ?Redux_Page_Render $render_class = null;
+
+        /**
+         * Pointer to the Redux_Enqueue class.
+         *
+         * @var null|Redux_Enqueue
+         */
+        public ?Redux_Enqueue $enqueue_class = null;
+
+        /**
+         * Pointer to the Redux_Transients class.
+         *
+         * @var null|Redux_Transients
+         */
+        public ?Redux_Transients $transient_class = null;
+
+        /**
+         * Pointer to the Redux_wordPress_Data class.
+         *
+         * @var null|Redux_WordPress_Data
+         */
+        public ?Redux_WordPress_Data $wordpress_data = null;
+
+        /**
+         * Pointer to the Redux_Validation class.
+         *
+         * @var null|Redux_Validation
+         */
+        public ?Redux_Validation $validate_class = null;
+
+        /**
+         * Pointer to the Redux_Sanitize class.
+         *
+         * @var null|Redux_Sanitize
+         */
+        public ?Redux_Sanitize $sanitize_class = null;
+
+        /**
+         * Pointer to the Redux_Args class.
+         *
+         * @var null|Redux_Args
+         */
+        public ?Redux_Args $args_class = null;
+
+        /**
+         * Array of active transients used by Redux.
+         *
+         * @var null|mixed
+         */
+        public $transients = array();
+
+        /**
+         * Array of localized repeater data.
+         *
+         * @var null|array
+         */
+        public ?array $repeater_data = array();
+
+        /**
+         * Array of localized data.
+         *
+         * @var null|array
+         */
+        public ?array $localize_data = array();
+
+        /**
+         * Array of checked transients used by Redux.
+         *
+         * @var null|mixed
+         */
+        public $transients_check = array();
+
+        /**
+         * Never save to DB flag for metaboxes.
+         *
+         * @var bool
+         */
+        public bool $never_save_to_db;
+
+        /**
+         * File system object used for I/O file operations.  Done the WordPress way.
+         *
+         * @var null|object
+         *
+         * @deprecated 4.5.1
+         */
+        public ?object $filesystem;
+
+        /**
+         * Deprecated shim for v3 templates.
+         *
+         * @var null|array
+         *
+         * @deprecated 4.0.0
+         */
+        public ?array $hidden_perm_sections = array();
+
+        /**
+         * Deprecated shim for v3 as plugin check.
+         *
+         * @var bool
+         *
+         * @deprecated 4.0.0
+         */
+        public static bool $_as_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Deprecated shim for v3 as plugin check.
+         *
+         * @var bool
+         *
+         * @deprecated 4.0.0
+         */
+        public static bool $_is_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Cloning is forbidden.
+         *
+         * @since 4.0.0
+         */
+        public function __clone() {
+            _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
+        }
+
+        /**
+         * Un-serializing instances of this class are forbidden.
+         *
+         * @since 4.0.0
+         */
+        public function __wakeup() {
+            _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
+        }
+
+        /**
+         * Add a deprecating notice for all the old themes that still use this method..
+         *
+         * @param object $filesystem Filesystem object.
+         *
+         * @since 4.0.0
+         */
+        private function deprecated_filesystem( $filesystem ) {
+            //_deprecated_function( esc_html__( 'The global variable "$filesystem" of the ReduxFramework object', 'redux-framework' ), '4.5.1', 'Redux_Core::$filesystem' );
+
+            return $filesystem;
+        }
+
+        /**
+         * Class Constructor. Defines the args for the theme options class
+         *
+         * @param array $sections Panel sections.
+         * @param array $args     Class constructor arguments.
+         *
+         * @throws ReflectionException Exception.
+         * @since       1.0.0
+         */
+        public function __construct( array $sections = array(), array $args = array() ) {
+            global $pagenow;
+
+            if ( Redux_Core::is_heartbeat() ) {
+                return;
+            }
+
+            $args['load_on_cron'] = $args['load_on_cron'] ?? false;
+
+            if ( false === $args['load_on_cron'] && 'wp-cron.php' === $pagenow ) {
+                return;
+            }
+
+            if ( empty( $args ) || ( empty( $args['opt_name'] ) ) ) {
+                return;
+            }
+
+            if ( ! isset( Redux::$init[ $args['opt_name'] ] ) ) {
+                // Let's go back to the Redux API instead of having it run directly.
+                Redux_Functions_Ex::record_caller( $args['opt_name'] );
+                Redux::set_args( $args['opt_name'], $args );
+                if ( ! empty( $sections ) ) {
+                    Redux::set_sections( $args['opt_name'], $sections );
+                }
+                $sections = Redux::construct_sections( $args['opt_name'] );
+                $args     = Redux::construct_args( $args['opt_name'] );
+                Redux::set_defaults( $args['opt_name'] );
+                Redux::$init[ $args['opt_name'] ] = 1;
+            }
+
+            $args             = new Redux_Args( $this, $args );
+            $this->args_class = $args;
+            $this->args       = $args->get;
+
+            Redux_Core::core_construct( $this );
+
+            new Redux_Admin_Notices( $this );
+
+            if ( ! empty( $this->args['opt_name'] ) ) {
+                new Redux_Instances( $this );
+
+                Redux_Core::$filesystem = Redux_Filesystem::get_instance( $this );
+
+                $this->filesystem = $this->deprecated_filesystem( Redux_Core::$filesystem );
+
+                /**
+                 * Filter 'redux/options/{opt_name}/sections'
+                 *
+                 * @param  array $sections field option sections
+                 */
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $this->sections = apply_filters( "redux/options/{$this->args['opt_name']}/sections", $sections );
+
+                /**
+                 * Construct hook
+                 * action 'redux/construct'
+                 *
+                 * @param object $this ReduxFramework
+                 */
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                do_action( 'redux/construct', $this );
+
+                // Internationalization.
+                new Redux_I18n( $this, __FILE__ );
+
+                $this->required_class  = new Redux_Required( $this );
+                $this->transient_class = new Redux_Transients( $this );
+                $this->wordpress_data  = new Redux_WordPress_Data( $this );
+                $this->validate_class  = new Redux_Validation( $this );
+                $this->sanitize_class  = new Redux_Sanitize( $this );
+
+                // Register extra extensions.
+                new Redux_Extensions( $this );
+
+                // Grab database values.
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+                $this->options_class->get();
+
+                $this->output_class  = new Redux_Output( $this );
+                $this->render_class  = new Redux_Page_Render( $this );
+                $this->enqueue_class = new Redux_Enqueue( $this );
+
+                new Redux_AJAX_Save( $this );
+                new Redux_AJAX_Typography( $this );
+                new Redux_AJAX_Select2( $this );
+            }
+
+            /**
+             * Loaded hook
+             * action 'redux/loaded'
+             *
+             * @param  object $this ReduxFramework
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( 'redux/loaded', $this );
+        }
+
+        /**
+         * Begin backward compatibility shims for Redux v3 configs and extensions.
+         */
+
+        /**
+         * SHIM: _register_settings
+         *
+         * @deprecated 4.0.0
+         */
+        public function _register_settings() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->register()' );
+
+            $this->options_class->register();
+        }
+
+        /**
+         * SHIM: _field_input
+         *
+         * @param array        $field Field array.
+         * @param string|array $v     Field values.
+         *
+         * @deprecated 4.0.0
+         */
+        public function _field_input( array $field, $v = null ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->field_input( $field, $value )' );
+
+            $this->render_class->field_input( $field, $v );
+        }
+
+        /**
+         * SHIM: field_default_values
+         *
+         * @param array $field Field array.
+         *
+         * @deprecated 4.0.0
+         */
+        public function field_default_values( array $field ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_defaults_class->field_default_values( $opt_name, $field )' );
+
+            $this->options_defaults_class->field_default_values( '', $field );
+        }
+
+        /**
+         * SHIM: set_options
+         *
+         * @param string|array $value Option values.
+         *
+         * @deprecated 4.0.0
+         */
+        public function set_options( $value ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->set( $value )' );
+
+            $this->options_class->set( $value );
+        }
+
+        /**
+         * SHIM: get_options
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_options() {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get()' );
+
+            $this->options_class->get();
+        }
+
+        /**
+         * SHIM: _default_values
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function _default_values() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->default_values()' );
+
+            return $this->default_values();
+        }
+
+        /**
+         * Get default values.
+         *
+         * @return array
+         */
+        public function default_values() {
+            if ( ! isset( $this->options_class ) ) {
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+            }
+
+            return $this->options_class->default_values();
+        }
+
+        /**
+         * SHIM: check_dependencies
+         *
+         * @param array $field Field array.
+         *
+         * @deprecated 4.0.0
+         */
+        public function check_dependencies( array $field ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'required_class->check_dependencies( $field )' );
+
+            $this->required_class->check_dependencies( $field );
+        }
+
+        /**
+         * SHIM: _enqueue_output
+         *
+         * @throws ReflectionException Exception.
+         *
+         * @deprecated 4.0.0
+         */
+        public function _enqueue_output() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'output_class->enqueue()' );
+
+            if ( empty( $this->output_class ) ) {
+                $obj          = new ReduxFramework( $this->sections, $this->args );
+                $obj->options = $this->options;
+                $obj->output_class->enqueue();
+                $this->outputCSS = $obj->outputCSS; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+            } else {
+                $this->output_class->enqueue();
+            }
+        }
+
+        /**
+         * SHIM: _enqueue
+         *
+         * @deprecated 4.0.0
+         */
+        public function _enqueue() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'enqueue_class->init()' );
+
+            $this->enqueue_class->init();
+        }
+
+        /**
+         * _enqueue replacement.
+         *
+         * @return void
+         */
+        public function init_enqueue() {
+            $this->enqueue_class->init();
+        }
+
+        /**
+         * SHIM: generate_panel
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         *
+         * @deprecated 4.0.0
+         */
+        public function generate_panel() {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->generate_panel()' );
+
+            $this->render_class->generate_panel();
+        }
+
+        /**
+         * SHIM: get_default_values
+         *
+         * @param string $key       Key value.
+         * @param bool   $array_key Flag to determine array status.
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_default_values( $key, $array_key = false ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
+
+            if ( ! isset( $this->options_class ) ) {
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+            }
+
+            return $this->options_class->get_default_value( $key, $array_key );
+        }
+
+        /**
+         * SHIM: get_default_value
+         *
+         * @param string $key       Key value.
+         * @param bool   $array_key Flag to determine array status.
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_default_value( $key, $array_key = false ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
+
+            if ( ! isset( $this->options_class ) ) {
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+            }
+
+            return $this->options_class->get_default_value( $key, $array_key );
+        }
+
+        /**
+         * SHIM: get_wordpress_data
+         *
+         * @param bool         $type data type.
+         * @param array        $args args to pass to WordPress API.
+         * @param string|array $current_value Current value.
+         *
+         * @return array|mixed|string|void
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_wordpress_data( $type = false, $args = array(), $current_value = null ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'wordpress_data->get( $type, $args, $opt_name, $value )' );
+
+            return $this->wordpress_data->get( $type, $args, $this->args['opt_name'], $current_value );
+        }
+
+        /**
+         * SHIM: _validate_values
+         *
+         * @param array $plugin_options Current panel options.
+         * @param array $options        Options to validate.
+         * @param array $sections       Sections array.
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function _validate_values( $plugin_options, $options, $sections ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'validate_class->validate( $plugin_options, $options, $sections )' );
+
+            if ( ! isset( $this->validate_class ) ) {
+                $this->validate_class = new Redux_Validation( $this );
+            }
+
+            return $this->validate_class->validate( $plugin_options, $options, $sections );
+        }
+
+        /**
+         * SHIM: set_transients
+         *
+         * @return void
+         *
+         * @deprecated 4.0.0
+         */
+        public function set_transients() {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'Please update the extension that uses this deprecated function.' );
+        }
+
+        /**
+         * SHIM: section_menu
+         *
+         * @param int    $k        Array Key.
+         * @param array  $section  Section array.
+         * @param string $suffix   Unique string.
+         * @param array  $sections Section array.
+         *
+         * @return string
+         *
+         * @deprecated 4.0.0
+         */
+        public function section_menu( $k, $section, $suffix = '', $sections = array() ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->section_menu( $index, $section, $suffix, $sections )' );
+
+            return $this->render_class->section_menu( $k, $section, $suffix, $sections );
+        }
+
+        /**
+         * SHIM: get_header_html
+         *
+         * @param array $field Field array.
+         *
+         * @return string
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_header_html( $field ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->get_header_html( $field )' );
+
+            return $this->render_class->get_header_html( $field );
+        }
+
+        /**
+         * SHIM: current_user_can
+         *
+         * @param string $permission User permission.
+         *
+         * @return bool
+         *
+         * @deprecated 4.0.0
+         */
+        public function current_user_can( $permission ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'Redux_Helpers::current_user_can' );
+
+            return Redux_Helpers::current_user_can( $permission );
+        }
+
+        /**
+         * End backward compatibility shims for Redux v3 configs and extensions.
+         */
+
+        /**
+         * Pointer to the ReduxFramework instance.
+         *
+         * @return ReduxFramework|null
+         */
+        public function get_instance(): ?ReduxFramework {
+            return self::$instance;
+        }
+
+        /**
+         * →get(); This is used to return and option value from the option array
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       string $opt_name The option name to return.
+         * @param       mixed  $defaults (null) The value to return if an option isn't set.
+         *
+         * @return      mixed
+         */
+        public function get( string $opt_name, $defaults = null ) {
+            return ( ! empty( $this->options[ $opt_name ] ) ) ? $this->options[ $opt_name ] : $this->options_class->get_default( $opt_name, $defaults );
+        }
+
+        /**
+         * →set(); This is used to set an arbitrary option in the option array
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       string $opt_name The name of the option being added.
+         * @param       mixed  $values   The value of the option being added.
+         *
+         * @return      void
+         */
+        public function set( string $opt_name = '', $values = array() ) {
+            if ( ! empty( $opt_name ) && is_array( $values ) ) {
+                $this->options[ $opt_name ] = $values;
+                $this->options_class->set( $values );
+            }
+        }
+    }
+
+    ReduxFramework::init();
+
+    /**
+     * Action 'redux/init'
+     */
+    do_action( 'redux/init' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
 }

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

Indentation +71 added lines, -71 removed lines

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