reduxframework / redux-framework

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 +849 added lines, -849 removed lines

@@ -39,853 +39,853 @@
 // 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' );

redux-core/inc/welcome/class-redux-welcome.php

Indentation +150 added lines, -150 removed lines

@@ -8,111 +8,111 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'Redux_Welcome', false ) ) {
 
-	/**
-	 * Class Redux_Welcome
-	 */
-	class Redux_Welcome {
-
-		/**
-		 * Min capacity.
-		 *
-		 * @var string The capability users should have to view the page
-		 */
-		public string $minimum_capability = 'manage_options';
-
-		/**
-		 * Display version.
-		 *
-		 * @var string
-		 */
-		public string $display_version = '';
-
-		/**
-		 * Is loaded.
-		 *
-		 * @var bool
-		 */
-		public bool $redux_loaded = false;
-
-		/**
-		 * Get things started
-		 *
-		 * @since 1.4
-		 */
-		public function __construct() {
-			// Load the welcome page even if a Redux panel isn't running.
-			add_action( 'init', array( $this, 'init' ), 999 );
-		}
-
-		/**
-		 * Class init.
-		 */
-		public function init() {
-			if ( $this->redux_loaded ) {
-				return;
-			}
-
-			$this->redux_loaded = true;
-			add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-
-			if ( isset( $_GET['page'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				if ( 'redux-' === substr( sanitize_text_field( wp_unslash( $_GET['page'] ) ), 0, 6 ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-					$version               = explode( '.', Redux_Core::$version );
-					$this->display_version = $version[0] . '.' . $version[1];
-					add_filter( 'admin_footer_text', array( $this, 'change_wp_footer' ) );
-					add_action( 'admin_head', array( $this, 'admin_head' ) );
-				}
-			}
-		}
-
-		/**
-		 * Do Redirect.
-		 */
-		public function do_redirect() {
-			if ( ! defined( 'WP_CLI' ) ) {
-				wp_safe_redirect( esc_url( admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) ) ) );
-				exit();
-			}
-		}
-
-		/**
-		 * Change Footer.
-		 */
-		public function change_wp_footer() {
-			echo esc_html__( 'If you like', 'redux-framework' ) . ' <strong>Redux</strong> ' . esc_html__( 'please leave us a', 'redux-framework' ) . ' <a href="https://wordpress.org/support/view/plugin-reviews/redux-framework?filter=5#postform" target="_blank" class="redux-rating-link" data-rated="Thanks :)">&#9733;&#9733;&#9733;&#9733;&#9733;</a> ' . esc_html__( 'rating. A huge thank you in advance!', 'redux-framework' );
-		}
-
-
-
-		/**
-		 * Register the Dashboard Pages which are later hidden but these pages
-		 * are used to render the What's Redux pages.
-		 *
-		 * @access public
-		 * @since  1.4
-		 * @return void
-		 */
-		public function admin_menus() {
-			$page = 'add_options_page';
-
-			// About Page.
-			$page( esc_html__( 'What is Redux Framework?', 'redux-framework' ), esc_html__( 'Redux', 'redux-framework' ), $this->minimum_capability, 'redux-framework', array( $this, 'about_screen' ) );
-		}
-
-		/**
-		 * Hide Individual Dashboard Pages
-		 *
-		 * @access public
-		 * @since  1.4
-		 * @return void
-		 */
-		public function admin_head() {
-			?>
+    /**
+     * Class Redux_Welcome
+     */
+    class Redux_Welcome {
+
+        /**
+         * Min capacity.
+         *
+         * @var string The capability users should have to view the page
+         */
+        public string $minimum_capability = 'manage_options';
+
+        /**
+         * Display version.
+         *
+         * @var string
+         */
+        public string $display_version = '';
+
+        /**
+         * Is loaded.
+         *
+         * @var bool
+         */
+        public bool $redux_loaded = false;
+
+        /**
+         * Get things started
+         *
+         * @since 1.4
+         */
+        public function __construct() {
+            // Load the welcome page even if a Redux panel isn't running.
+            add_action( 'init', array( $this, 'init' ), 999 );
+        }
+
+        /**
+         * Class init.
+         */
+        public function init() {
+            if ( $this->redux_loaded ) {
+                return;
+            }
+
+            $this->redux_loaded = true;
+            add_action( 'admin_menu', array( $this, 'admin_menus' ) );
+
+            if ( isset( $_GET['page'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                if ( 'redux-' === substr( sanitize_text_field( wp_unslash( $_GET['page'] ) ), 0, 6 ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                    $version               = explode( '.', Redux_Core::$version );
+                    $this->display_version = $version[0] . '.' . $version[1];
+                    add_filter( 'admin_footer_text', array( $this, 'change_wp_footer' ) );
+                    add_action( 'admin_head', array( $this, 'admin_head' ) );
+                }
+            }
+        }
+
+        /**
+         * Do Redirect.
+         */
+        public function do_redirect() {
+            if ( ! defined( 'WP_CLI' ) ) {
+                wp_safe_redirect( esc_url( admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) ) ) );
+                exit();
+            }
+        }
+
+        /**
+         * Change Footer.
+         */
+        public function change_wp_footer() {
+            echo esc_html__( 'If you like', 'redux-framework' ) . ' <strong>Redux</strong> ' . esc_html__( 'please leave us a', 'redux-framework' ) . ' <a href="https://wordpress.org/support/view/plugin-reviews/redux-framework?filter=5#postform" target="_blank" class="redux-rating-link" data-rated="Thanks :)">&#9733;&#9733;&#9733;&#9733;&#9733;</a> ' . esc_html__( 'rating. A huge thank you in advance!', 'redux-framework' );
+        }
+
+
+
+        /**
+         * Register the Dashboard Pages which are later hidden but these pages
+         * are used to render the What's Redux pages.
+         *
+         * @access public
+         * @since  1.4
+         * @return void
+         */
+        public function admin_menus() {
+            $page = 'add_options_page';
+
+            // About Page.
+            $page( esc_html__( 'What is Redux Framework?', 'redux-framework' ), esc_html__( 'Redux', 'redux-framework' ), $this->minimum_capability, 'redux-framework', array( $this, 'about_screen' ) );
+        }
+
+        /**
+         * Hide Individual Dashboard Pages
+         *
+         * @access public
+         * @since  1.4
+         * @return void
+         */
+        public function admin_head() {
+            ?>
 			<link
 				rel='stylesheet' id='elusive-icons' <?php // phpcs:ignore WordPress.WP.EnqueuedResources ?>
 				href='<?php echo esc_url( Redux_Core::$url ); ?>assets/css/vendor/elusive-icons.css'
@@ -133,19 +133,19 @@ 
 				}
 			</style>
 			<?php
-		}
-
-		/**
-		 * Navigation tabs
-		 *
-		 * @access public
-		 * @since  1.9
-		 * @return void
-		 */
-		public function tabs() {
-			$selected = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : 'redux-framework'; // phpcs:ignore WordPress.Security.NonceVerification
-
-			?>
+        }
+
+        /**
+         * Navigation tabs
+         *
+         * @access public
+         * @since  1.9
+         * @return void
+         */
+        public function tabs() {
+            $selected = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : 'redux-framework'; // phpcs:ignore WordPress.Security.NonceVerification
+
+            ?>
 			<h2 class="nav-tab-wrapper">
 				<a
 					class="nav-tab <?php echo( 'redux-framework' === $selected ? 'nav-tab-active' : '' ); ?>"
@@ -154,27 +154,27 @@ 
 				</a>
 			</h2>
 			<?php
-		}
-
-		/**
-		 * Render About Screen
-		 *
-		 * @access public
-		 * @since  1.4
-		 * @return void
-		 */
-		public function about_screen() {
-			// Stupid hack for WordPress alerts and warnings.
-			echo '<div class="wrap" style="height:0;overflow:hidden;"><h2></h2></div>';
-
-			require_once 'views/about.php';
-		}
-
-		/**
-		 * Action.
-		 */
-		public function actions() {
-			?>
+        }
+
+        /**
+         * Render About Screen
+         *
+         * @access public
+         * @since  1.4
+         * @return void
+         */
+        public function about_screen() {
+            // Stupid hack for WordPress alerts and warnings.
+            echo '<div class="wrap" style="height:0;overflow:hidden;"><h2></h2></div>';
+
+            require_once 'views/about.php';
+        }
+
+        /**
+         * Action.
+         */
+        public function actions() {
+            ?>
 			<p class="redux-actions">
 				<a href="https://devs.redux.io/" class="docs button button-primary">Docs</a>
 				<a
@@ -189,30 +189,30 @@ 
 					data-via="ReduxFramework" data-size="large" data-hashtags="Redux">Tweet</a>
 				<?php
 
-				$options = Redux_Helpers::get_plugin_options();
-				$nonce   = wp_create_nonce( 'redux_framework_demo' );
+                $options = Redux_Helpers::get_plugin_options();
+                $nonce   = wp_create_nonce( 'redux_framework_demo' );
 
-				$query_args = array(
-					'page'                   => 'redux-framework',
-					'redux-framework-plugin' => 'demo',
-					'nonce'                  => $nonce,
-				);
+                $query_args = array(
+                    'page'                   => 'redux-framework',
+                    'redux-framework-plugin' => 'demo',
+                    'nonce'                  => $nonce,
+                );
 
-				if ( $options['demo'] ) {
-					?>
+                if ( $options['demo'] ) {
+                    ?>
 					<a
 						href="<?php echo esc_url( admin_url( add_query_arg( $query_args, 'options-general.php' ) ) ); ?>"
 						class=" button-text button-demo"><?php echo esc_html__( 'Disable Panel Demo', 'redux-framework' ); ?></a>
 					<?php
-				} else {
-					?>
+                } else {
+                    ?>
 					<a
 						href="<?php echo esc_url( admin_url( add_query_arg( $query_args, 'options-general.php' ) ) ); ?>"
 						class=" button-text button-demo active"><?php echo esc_html__( 'Enable Panel Demo', 'redux-framework' ); ?></a>
 					<?php
-				}
+                }
 
-				?>
+                ?>
 				<script>
 					!function( d, s, id ) {
 						let js;
@@ -229,6 +229,6 @@ 
 				</script>
 			</p>
 			<?php
-		}
-	}
+        }
+    }
 }

redux-core/inc/themecheck/checks/class-redux-embedded.php

Indentation +54 added lines, -54 removed lines

@@ -14,67 +14,67 @@
  */
 class Redux_Embedded implements themecheck {
 
-	/**
-	 * Error array.
-	 *
-	 * @var array
-	 */
-	protected array $error = array();
+    /**
+     * Error array.
+     *
+     * @var array
+     */
+    protected array $error = array();
 
-	/**
-	 * Run checker.
-	 *
-	 * @param array $php_files - Files to check.
-	 * @param array $css_files - Files to check.
-	 * @param array $other_files - Files to check.
-	 *
-	 * @return bool
-	 */
-	public function check( $php_files, $css_files, $other_files ): bool {
+    /**
+     * Run checker.
+     *
+     * @param array $php_files - Files to check.
+     * @param array $css_files - Files to check.
+     * @param array $other_files - Files to check.
+     *
+     * @return bool
+     */
+    public function check( $php_files, $css_files, $other_files ): bool {
 
-		$ret   = true;
-		$check = Redux_ThemeCheck::get_instance();
-		$redux = $check::get_redux_details( $php_files );
+        $ret   = true;
+        $check = Redux_ThemeCheck::get_instance();
+        $redux = $check::get_redux_details( $php_files );
 
-		if ( $redux ) {
-			checkcount();
+        if ( $redux ) {
+            checkcount();
 
-			if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
-				$ret           = false;
-			} else {
-				// TODO Granular WP.org tests!!!
-				// Check for Tracking.
-				$tracking = $redux['dir'] . 'inc/tracking.php';
-				if ( file_exists( $tracking ) ) {
-					$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
-					$ret           = false;
-				}
+            if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
+                $ret           = false;
+            } else {
+                // TODO Granular WP.org tests!!!
+                // Check for Tracking.
+                $tracking = $redux['dir'] . 'inc/tracking.php';
+                if ( file_exists( $tracking ) ) {
+                    $this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
+                    $ret           = false;
+                }
 
-				// Embedded CDN package
-				// use_cdn
-				// Arguments.
-				$args          = '<ol>';
-				$args         .= "<li><code>'save_defaults' => false</code></li>";
-				$args         .= "<li><code>'use_cdn' => false</code></li>";
-				$args         .= "<li><code>'customizer_only' => true</code> Non-Customizer Based Panels are Prohibited within WP.org Themes</li>";
-				$args         .= "<li><code>'database' => 'theme_mods'</code> (' . esc_html__( 'Optional', 'redux-framework' ) . ')</li>";
-				$args         .= '</ol>';
-				$this->error[] = '<div class="redux-error"><span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'The following arguments MUST be used for WP.org submissions, or you will be rejected because of your Redux configuration.', 'redux-framework' ) . $args . '</div>';
-			}
-		}
+                // Embedded CDN package
+                // use_cdn
+                // Arguments.
+                $args          = '<ol>';
+                $args         .= "<li><code>'save_defaults' => false</code></li>";
+                $args         .= "<li><code>'use_cdn' => false</code></li>";
+                $args         .= "<li><code>'customizer_only' => true</code> Non-Customizer Based Panels are Prohibited within WP.org Themes</li>";
+                $args         .= "<li><code>'database' => 'theme_mods'</code> (' . esc_html__( 'Optional', 'redux-framework' ) . ')</li>";
+                $args         .= '</ol>';
+                $this->error[] = '<div class="redux-error"><span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'The following arguments MUST be used for WP.org submissions, or you will be rejected because of your Redux configuration.', 'redux-framework' ) . $args . '</div>';
+            }
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
-	/**
-	 * Return error array.
-	 *
-	 * @return array
-	 */
-	public function getError(): array {
-		return $this->error;
-	}
+    /**
+     * Return error array.
+     *
+     * @return array
+     */
+    public function getError(): array {
+        return $this->error;
+    }
 }
 
 $themechecks[] = new Redux_Embedded();

redux-core/inc/lib/redux-instances.php

Indentation +4 added lines, -4 removed lines

@@ -17,9 +17,9 @@ 
  * @return ReduxFramework                ReduxFramework
  */
 function get_redux_instance( string $opt_name ): ReduxFramework {
-	_deprecated_function( __FUNCTION__, '4.0', 'Redux::instance($opt_name)' );
+    _deprecated_function( __FUNCTION__, '4.0', 'Redux::instance($opt_name)' );
 
-	return Redux::instance( $opt_name );
+    return Redux::instance( $opt_name );
 }
 
 /**
@@ -30,7 +30,7 @@ 
  * @return array        format ['opt_name' => $ReduxFramework]
  */
 function get_all_redux_instances(): array {
-	_deprecated_function( __FUNCTION__, '4.0', 'Redux::all_instances()' );
+    _deprecated_function( __FUNCTION__, '4.0', 'Redux::all_instances()' );
 
-	return Redux::all_instances();
+    return Redux::all_instances();
 }

redux-core/inc/lib/elusive-icons.php

Indentation +300 added lines, -300 removed lines

@@ -16,304 +16,304 @@
  * @return array
  */
 function redux_get_font_icons(): array {
-	return array(
-		'el el-address-book-alt',
-		'el el-address-book',
-		'el el-adjust-alt',
-		'el el-adjust',
-		'el el-adult',
-		'el el-align-center',
-		'el el-align-justify',
-		'el el-align-left',
-		'el el-align-right',
-		'el el-arrow-down',
-		'el el-arrow-left',
-		'el el-arrow-right',
-		'el el-arrow-up',
-		'el el-asl',
-		'el el-asterisk',
-		'el el-backward',
-		'el el-ban-circle',
-		'el el-barcode',
-		'el el-behance',
-		'el el-bell',
-		'el el-blind',
-		'el el-blogger',
-		'el el-bold',
-		'el el-book',
-		'el el-bookmark-empty',
-		'el el-bookmark',
-		'el el-braille',
-		'el el-briefcase',
-		'el el-broom',
-		'el el-brush',
-		'el el-bulb',
-		'el el-bullhorn',
-		'el el-calendar-sign',
-		'el el-calendar',
-		'el el-camera',
-		'el el-car',
-		'el el-caret-down',
-		'el el-caret-left',
-		'el el-caret-right',
-		'el el-caret-up',
-		'el el-cc',
-		'el el-certificate',
-		'el el-check-empty',
-		'el el-check',
-		'el el-chevron-down',
-		'el el-chevron-left',
-		'el el-chevron-right',
-		'el el-chevron-up',
-		'el el-child',
-		'el el-circle-arrow-down',
-		'el el-circle-arrow-left',
-		'el el-circle-arrow-right',
-		'el el-circle-arrow-up',
-		'el el-cloud-alt',
-		'el el-cloud',
-		'el el-cog-alt',
-		'el el-cog',
-		'el el-cogs',
-		'el el-comment-alt',
-		'el el-comment',
-		'el el-compass-alt',
-		'el el-compass',
-		'el el-credit-card',
-		'el el-css',
-		'el el-dashboard',
-		'el el-delicious',
-		'el el-deviantart',
-		'el el-digg',
-		'el el-download-alt',
-		'el el-download',
-		'el el-dribbble',
-		'el el-edit',
-		'el el-eject',
-		'el el-envelope-alt',
-		'el el-envelope',
-		'el el-error-alt',
-		'el el-error',
-		'el el-eur',
-		'el el-exclamation-sign',
-		'el el-eye-close',
-		'el el-eye-open',
-		'el el-facebook',
-		'el el-facetime-video',
-		'el el-fast-backward',
-		'el el-fast-forward',
-		'el el-female',
-		'el el-file-alt',
-		'el el-file-edit-alt',
-		'el el-file-edit',
-		'el el-file-new-alt',
-		'el el-file-new',
-		'el el-file',
-		'el el-film',
-		'el el-filter',
-		'el el-fire',
-		'el el-flag-alt',
-		'el el-flag',
-		'el el-flickr',
-		'el el-folder-close',
-		'el el-folder-open',
-		'el el-folder-sign',
-		'el el-folder',
-		'el el-font',
-		'el el-fontsize',
-		'el el-fork',
-		'el el-forward-alt',
-		'el el-forward',
-		'el el-foursquare',
-		'el el-friendfeed-rect',
-		'el el-friendfeed',
-		'el el-fullscreen',
-		'el el-gbp',
-		'el el-gift',
-		'el el-github-text',
-		'el el-github',
-		'el el-glass',
-		'el el-glasses',
-		'el el-globe-alt',
-		'el el-globe',
-		'el el-googleplus',
-		'el el-graph-alt',
-		'el el-graph',
-		'el el-group-alt',
-		'el el-group',
-		'el el-guidedog',
-		'el el-hand-down',
-		'el el-hand-left',
-		'el el-hand-right',
-		'el el-hand-up',
-		'el el-hdd',
-		'el el-headphones',
-		'el el-hearing-impaired',
-		'el el-heart-alt',
-		'el el-heart-empty',
-		'el el-heart',
-		'el el-home-alt',
-		'el el-home',
-		'el el-hourglass',
-		'el el-idea-alt',
-		'el el-idea',
-		'el el-inbox-alt',
-		'el el-inbox-box',
-		'el el-inbox',
-		'el el-indent-left',
-		'el el-indent-right',
-		'el el-info-circle',
-		'el el-instagram',
-		'el el-iphone-home',
-		'el el-italic',
-		'el el-key',
-		'el el-laptop-alt',
-		'el el-laptop',
-		'el el-lastfm',
-		'el el-leaf',
-		'el el-lines',
-		'el el-link',
-		'el el-linkedin',
-		'el el-list-alt',
-		'el el-list',
-		'el el-livejournal',
-		'el el-lock-alt',
-		'el el-lock',
-		'el el-magic',
-		'el el-magnet',
-		'el el-male',
-		'el el-map-marker-alt',
-		'el el-map-marker',
-		'el el-mic-alt',
-		'el el-mic',
-		'el el-minus-sign',
-		'el el-minus',
-		'el el-move',
-		'el el-music',
-		'el el-myspace',
-		'el el-network',
-		'el el-off',
-		'el el-ok-circle',
-		'el el-ok-sign',
-		'el el-ok',
-		'el el-opensource',
-		'el el-paper-clip-alt',
-		'el el-paper-clip',
-		'el el-path',
-		'el el-pause-alt',
-		'el el-pause',
-		'el el-pencil-alt',
-		'el el-pencil',
-		'el el-person',
-		'el el-phone-alt',
-		'el el-phone',
-		'el el-photo-alt',
-		'el el-photo',
-		'el el-picasa',
-		'el el-picture',
-		'el el-plane',
-		'el el-play-alt',
-		'el el-play-circle',
-		'el el-play',
-		'el el-plus-sign',
-		'el el-plus',
-		'el el-podcast',
-		'el el-print',
-		'el el-puzzle',
-		'el el-qrcode',
-		'el el-question-sign',
-		'el el-question',
-		'el el-quote-alt',
-		'el el-quotes',
-		'el el-random',
-		'el el-record',
-		'el el-reddit',
-		'el el-refresh',
-		'el el-remove-circle',
-		'el el-remove-sign',
-		'el el-remove',
-		'el el-repeat-alt',
-		'el el-repeat',
-		'el el-resize-full',
-		'el el-resize-horizontal',
-		'el el-resize-small',
-		'el el-resize-vertical',
-		'el el-return-key',
-		'el el-retweet',
-		'el el-reverse-alt',
-		'el el-road',
-		'el el-rss',
-		'el el-scissors',
-		'el el-screen-alt',
-		'el el-screen',
-		'el el-screenshot',
-		'el el-search-alt',
-		'el el-search',
-		'el el-share-alt',
-		'el el-share',
-		'el el-shopping-cart-sign',
-		'el el-shopping-cart',
-		'el el-signal',
-		'el el-skype',
-		'el el-slideshare',
-		'el el-smiley-alt',
-		'el el-smiley',
-		'el el-soundcloud',
-		'el el-speaker',
-		'el el-spotify',
-		'el el-stackoverflow',
-		'el el-star-alt',
-		'el el-star-empty',
-		'el el-star',
-		'el el-step-backward',
-		'el el-step-forward',
-		'el el-stop-alt',
-		'el el-stop',
-		'el el-stumbleupon',
-		'el el-tag',
-		'el el-tags',
-		'el el-tasks',
-		'el el-text-height',
-		'el el-text-width',
-		'el el-th-large',
-		'el el-th-list',
-		'el el-th',
-		'el el-thumbs-down',
-		'el el-thumbs-up',
-		'el el-time-alt',
-		'el el-time',
-		'el el-tint',
-		'el el-torso',
-		'el el-trash-alt',
-		'el el-trash',
-		'el el-tumblr',
-		'el el-twitter',
-		'el el-universal-access',
-		'el el-unlock-alt',
-		'el el-unlock',
-		'el el-upload',
-		'el el-usd',
-		'el el-user',
-		'el el-viadeo',
-		'el el-video-alt',
-		'el el-video-chat',
-		'el el-video',
-		'el el-view-mode',
-		'el el-vimeo',
-		'el el-vkontakte',
-		'el el-volume-down',
-		'el el-volume-off',
-		'el el-volume-up',
-		'el el-w3c',
-		'el el-warning-sign',
-		'el el-website-alt',
-		'el el-website',
-		'el el-wheelchair',
-		'el el-wordpress',
-		'el el-wrench-alt',
-		'el el-wrench',
-		'el el-youtube',
-		'el el-zoom-in',
-		'el el-zoom-out',
-	);
+    return array(
+        'el el-address-book-alt',
+        'el el-address-book',
+        'el el-adjust-alt',
+        'el el-adjust',
+        'el el-adult',
+        'el el-align-center',
+        'el el-align-justify',
+        'el el-align-left',
+        'el el-align-right',
+        'el el-arrow-down',
+        'el el-arrow-left',
+        'el el-arrow-right',
+        'el el-arrow-up',
+        'el el-asl',
+        'el el-asterisk',
+        'el el-backward',
+        'el el-ban-circle',
+        'el el-barcode',
+        'el el-behance',
+        'el el-bell',
+        'el el-blind',
+        'el el-blogger',
+        'el el-bold',
+        'el el-book',
+        'el el-bookmark-empty',
+        'el el-bookmark',
+        'el el-braille',
+        'el el-briefcase',
+        'el el-broom',
+        'el el-brush',
+        'el el-bulb',
+        'el el-bullhorn',
+        'el el-calendar-sign',
+        'el el-calendar',
+        'el el-camera',
+        'el el-car',
+        'el el-caret-down',
+        'el el-caret-left',
+        'el el-caret-right',
+        'el el-caret-up',
+        'el el-cc',
+        'el el-certificate',
+        'el el-check-empty',
+        'el el-check',
+        'el el-chevron-down',
+        'el el-chevron-left',
+        'el el-chevron-right',
+        'el el-chevron-up',
+        'el el-child',
+        'el el-circle-arrow-down',
+        'el el-circle-arrow-left',
+        'el el-circle-arrow-right',
+        'el el-circle-arrow-up',
+        'el el-cloud-alt',
+        'el el-cloud',
+        'el el-cog-alt',
+        'el el-cog',
+        'el el-cogs',
+        'el el-comment-alt',
+        'el el-comment',
+        'el el-compass-alt',
+        'el el-compass',
+        'el el-credit-card',
+        'el el-css',
+        'el el-dashboard',
+        'el el-delicious',
+        'el el-deviantart',
+        'el el-digg',
+        'el el-download-alt',
+        'el el-download',
+        'el el-dribbble',
+        'el el-edit',
+        'el el-eject',
+        'el el-envelope-alt',
+        'el el-envelope',
+        'el el-error-alt',
+        'el el-error',
+        'el el-eur',
+        'el el-exclamation-sign',
+        'el el-eye-close',
+        'el el-eye-open',
+        'el el-facebook',
+        'el el-facetime-video',
+        'el el-fast-backward',
+        'el el-fast-forward',
+        'el el-female',
+        'el el-file-alt',
+        'el el-file-edit-alt',
+        'el el-file-edit',
+        'el el-file-new-alt',
+        'el el-file-new',
+        'el el-file',
+        'el el-film',
+        'el el-filter',
+        'el el-fire',
+        'el el-flag-alt',
+        'el el-flag',
+        'el el-flickr',
+        'el el-folder-close',
+        'el el-folder-open',
+        'el el-folder-sign',
+        'el el-folder',
+        'el el-font',
+        'el el-fontsize',
+        'el el-fork',
+        'el el-forward-alt',
+        'el el-forward',
+        'el el-foursquare',
+        'el el-friendfeed-rect',
+        'el el-friendfeed',
+        'el el-fullscreen',
+        'el el-gbp',
+        'el el-gift',
+        'el el-github-text',
+        'el el-github',
+        'el el-glass',
+        'el el-glasses',
+        'el el-globe-alt',
+        'el el-globe',
+        'el el-googleplus',
+        'el el-graph-alt',
+        'el el-graph',
+        'el el-group-alt',
+        'el el-group',
+        'el el-guidedog',
+        'el el-hand-down',
+        'el el-hand-left',
+        'el el-hand-right',
+        'el el-hand-up',
+        'el el-hdd',
+        'el el-headphones',
+        'el el-hearing-impaired',
+        'el el-heart-alt',
+        'el el-heart-empty',
+        'el el-heart',
+        'el el-home-alt',
+        'el el-home',
+        'el el-hourglass',
+        'el el-idea-alt',
+        'el el-idea',
+        'el el-inbox-alt',
+        'el el-inbox-box',
+        'el el-inbox',
+        'el el-indent-left',
+        'el el-indent-right',
+        'el el-info-circle',
+        'el el-instagram',
+        'el el-iphone-home',
+        'el el-italic',
+        'el el-key',
+        'el el-laptop-alt',
+        'el el-laptop',
+        'el el-lastfm',
+        'el el-leaf',
+        'el el-lines',
+        'el el-link',
+        'el el-linkedin',
+        'el el-list-alt',
+        'el el-list',
+        'el el-livejournal',
+        'el el-lock-alt',
+        'el el-lock',
+        'el el-magic',
+        'el el-magnet',
+        'el el-male',
+        'el el-map-marker-alt',
+        'el el-map-marker',
+        'el el-mic-alt',
+        'el el-mic',
+        'el el-minus-sign',
+        'el el-minus',
+        'el el-move',
+        'el el-music',
+        'el el-myspace',
+        'el el-network',
+        'el el-off',
+        'el el-ok-circle',
+        'el el-ok-sign',
+        'el el-ok',
+        'el el-opensource',
+        'el el-paper-clip-alt',
+        'el el-paper-clip',
+        'el el-path',
+        'el el-pause-alt',
+        'el el-pause',
+        'el el-pencil-alt',
+        'el el-pencil',
+        'el el-person',
+        'el el-phone-alt',
+        'el el-phone',
+        'el el-photo-alt',
+        'el el-photo',
+        'el el-picasa',
+        'el el-picture',
+        'el el-plane',
+        'el el-play-alt',
+        'el el-play-circle',
+        'el el-play',
+        'el el-plus-sign',
+        'el el-plus',
+        'el el-podcast',
+        'el el-print',
+        'el el-puzzle',
+        'el el-qrcode',
+        'el el-question-sign',
+        'el el-question',
+        'el el-quote-alt',
+        'el el-quotes',
+        'el el-random',
+        'el el-record',
+        'el el-reddit',
+        'el el-refresh',
+        'el el-remove-circle',
+        'el el-remove-sign',
+        'el el-remove',
+        'el el-repeat-alt',
+        'el el-repeat',
+        'el el-resize-full',
+        'el el-resize-horizontal',
+        'el el-resize-small',
+        'el el-resize-vertical',
+        'el el-return-key',
+        'el el-retweet',
+        'el el-reverse-alt',
+        'el el-road',
+        'el el-rss',
+        'el el-scissors',
+        'el el-screen-alt',
+        'el el-screen',
+        'el el-screenshot',
+        'el el-search-alt',
+        'el el-search',
+        'el el-share-alt',
+        'el el-share',
+        'el el-shopping-cart-sign',
+        'el el-shopping-cart',
+        'el el-signal',
+        'el el-skype',
+        'el el-slideshare',
+        'el el-smiley-alt',
+        'el el-smiley',
+        'el el-soundcloud',
+        'el el-speaker',
+        'el el-spotify',
+        'el el-stackoverflow',
+        'el el-star-alt',
+        'el el-star-empty',
+        'el el-star',
+        'el el-step-backward',
+        'el el-step-forward',
+        'el el-stop-alt',
+        'el el-stop',
+        'el el-stumbleupon',
+        'el el-tag',
+        'el el-tags',
+        'el el-tasks',
+        'el el-text-height',
+        'el el-text-width',
+        'el el-th-large',
+        'el el-th-list',
+        'el el-th',
+        'el el-thumbs-down',
+        'el el-thumbs-up',
+        'el el-time-alt',
+        'el el-time',
+        'el el-tint',
+        'el el-torso',
+        'el el-trash-alt',
+        'el el-trash',
+        'el el-tumblr',
+        'el el-twitter',
+        'el el-universal-access',
+        'el el-unlock-alt',
+        'el el-unlock',
+        'el el-upload',
+        'el el-usd',
+        'el el-user',
+        'el el-viadeo',
+        'el el-video-alt',
+        'el el-video-chat',
+        'el el-video',
+        'el el-view-mode',
+        'el el-vimeo',
+        'el el-vkontakte',
+        'el el-volume-down',
+        'el el-volume-off',
+        'el el-volume-up',
+        'el el-w3c',
+        'el el-warning-sign',
+        'el el-website-alt',
+        'el el-website',
+        'el el-wheelchair',
+        'el el-wordpress',
+        'el el-wrench-alt',
+        'el el-wrench',
+        'el el-youtube',
+        'el el-zoom-in',
+        'el el-zoom-out',
+    );
 }