reduxframework / redux-framework

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

Spacing +14 added lines, -14 removed lines

@@ -129,19 +129,19 @@ 
 		 * @return array
 		 */
 		public function reset_defaults_section( array $defaults = array() ): array {
-			if ( isset( $_COOKIE[ 'redux_current_tab_' . $this->parent->args['opt_name'] ] ) ) {
-				$cur_tab = sanitize_title( wp_unslash( $_COOKIE[ 'redux_current_tab_' . $this->parent->args['opt_name'] ] ) );
-				$tab_num = strval( $this->parent->field_sections['social_profiles'][ $this->field_id ] );
+			if ( isset( $_COOKIE['redux_current_tab_' . $this->parent->args['opt_name']] ) ) {
+				$cur_tab = sanitize_title( wp_unslash( $_COOKIE['redux_current_tab_' . $this->parent->args['opt_name']] ) );
+				$tab_num = strval( $this->parent->field_sections['social_profiles'][$this->field_id] );
 
 				if ( $cur_tab === $tab_num ) {
-					if ( '' !== $this->field_id && isset( $this->parent->options_defaults[ $this->field_id ] ) ) {
+					if ( '' !== $this->field_id && isset( $this->parent->options_defaults[$this->field_id] ) ) {
 						$data = Redux_Social_Profiles_Functions::get_default_data();
 
 						Redux_Social_Profiles_Functions::write_data_file( $data );
 					}
 				}
 
-				$defaults[ $this->field_id ] = Redux_Social_Profiles_Functions::read_data_file();
+				$defaults[$this->field_id] = Redux_Social_Profiles_Functions::read_data_file();
 			}
 
 			return $defaults;
@@ -155,12 +155,12 @@ 
 		 * @return array
 		 */
 		public function reset_defaults( array $defaults = array() ): array {
-			if ( '' !== $this->field_id && isset( $this->parent->options_defaults[ $this->field_id ] ) ) {
+			if ( '' !== $this->field_id && isset( $this->parent->options_defaults[$this->field_id] ) ) {
 				$data = Redux_Social_Profiles_Functions::get_default_data();
 
 				Redux_Social_Profiles_Functions::write_data_file( $data );
 
-				$defaults[ $this->field_id ] = $data;
+				$defaults[$this->field_id] = $data;
 			}
 
 			return $defaults;
@@ -185,7 +185,7 @@ 
 
 				Redux_Social_Profiles_Functions::write_data_file( $data );
 
-				$this->parent->options[ $this->field_id ] = $data;
+				$this->parent->options[$this->field_id] = $data;
 			}
 
 			return $defaults;
@@ -205,7 +205,7 @@ 
 				$this->field_id = $this->field['id'];
 			}
 
-			if ( ! isset( $saved_options[ $this->field_id ] ) || empty( $saved_options[ $this->field_id ] ) || ( is_array( $saved_options[ $this->field_id ] ) && $saved_options === $changed_values ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
+			if ( ! isset( $saved_options[$this->field_id] ) || empty( $saved_options[$this->field_id] ) || ( is_array( $saved_options[$this->field_id] ) && $saved_options === $changed_values ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
 				return $saved_options;
 			}
 
@@ -214,10 +214,10 @@ 
 				return $saved_options;
 			}
 
-			$first_value = reset( $saved_options[ $this->field_id ] ); // First Element's Value.
+			$first_value = reset( $saved_options[$this->field_id] ); // First Element's Value.
 
 			if ( isset( $first_value['data'] ) ) {
-				$raw_data = $saved_options[ $this->field_id ];
+				$raw_data = $saved_options[$this->field_id];
 
 				$save_data = array();
 
@@ -247,11 +247,11 @@ 
 
 				$save_file = false;
 
-				if ( ! isset( $old_options[ $this->field_id ] ) || ( isset( $old_options[ $this->field_id ] ) && ! empty( $old_options[ $this->field_id ] ) ) ) {
+				if ( ! isset( $old_options[$this->field_id] ) || ( isset( $old_options[$this->field_id] ) && ! empty( $old_options[$this->field_id] ) ) ) {
 					$save_file = true;
 				}
 
-				if ( ! empty( $old_options[ $this->field_id ] ) && $old_options[ $this->field_id ] !== $saved_options[ $this->field_id ] ) {
+				if ( ! empty( $old_options[$this->field_id] ) && $old_options[$this->field_id] !== $saved_options[$this->field_id] ) {
 					$save_file = true;
 				}
 
@@ -259,7 +259,7 @@ 
 					Redux_Social_Profiles_Functions::write_data_file( $save_data );
 				}
 
-				$saved_options[ $this->field_id ] = $save_data;
+				$saved_options[$this->field_id] = $save_data;
 			}
 
 			return $saved_options;

Indentation +268 added lines, -268 removed lines

@@ -15,272 +15,272 @@
 if ( ! class_exists( 'Redux_Extension_Social_Profiles' ) ) {
 
 
-	/**
-	 * Main ReduxFramework social profiles extension class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Extension_Social_Profiles extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.5.8';
-
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Social Profiles';
-
-		/**
-		 * Field ID.
-		 *
-		 * @var mixed|null
-		 */
-		private $field_id = null;
-
-		/**
-		 * Field array.
-		 *
-		 * @var array|null
-		 */
-		public ?array $field = array();
-
-		/**
-		 * Panel opt_name.
-		 *
-		 * @var string
-		 */
-		public string $opt_name;
-
-		/**
-		 * Class Constructor. Defines the args for the extensions class
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       ReduxFramework $redux Parent settings.
-		 *
-		 * @return      void
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux, __FILE__ );
-
-			$this->add_field( 'social_profiles' );
-
-			require_once __DIR__ . '/redux-social-profiles-helpers.php';
-
-			include_once 'social_profiles/inc/class-redux-social-profiles-defaults.php';
-			include_once 'social_profiles/inc/class-redux-social-profiles-functions.php';
-
-			Redux_Social_Profiles_Functions::init( $redux );
-
-			$this->field = Redux_Social_Profiles_Functions::get_field( $redux );
-
-			if ( ! is_array( $this->field ) ) {
-				return;
-			}
-
-			$this->field_id = $this->field['id'];
-			$this->opt_name = $redux->args['opt_name'];
-
-			$upload_dir = Redux_Social_Profiles_Functions::$upload_dir;
-
-			if ( ! is_dir( $upload_dir ) ) {
-				Redux_Core::$filesystem->execute( 'mkdir', $upload_dir );
-			}
-
-			if ( ! class_exists( 'Redux_Social_Profiles_Widget' ) ) {
-				$enable = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/widget/enable', true ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
-
-				if ( $enable ) {
-					include_once 'social_profiles/inc/class-redux-social-profiles-widget.php';
-					new Redux_Social_Profiles_Widget( $redux, $this->field_id );
-				}
-			}
-
-			if ( ! class_exists( 'Redux_Social_Profiles_Shortcode' ) ) {
-				$enable = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/shortcode/enable', true ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
-
-				if ( $enable ) {
-					include_once 'social_profiles/inc/class-redux-social-profiles-shortcode.php';
-					new Redux_Social_Profiles_Shortcode( $redux, $this->field_id );
-				}
-			}
-
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-
-			add_filter( "redux/options/{$this->parent->args['opt_name']}/defaults", array( $this, 'set_defaults' ) );
-			add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/before_validation', array( $this, 'save_me' ), 0, 3 );
-			add_filter( 'redux/metaboxes/save/before_validate', array( $this, 'save_me' ), 0, 3 );
-
-			// Reset hooks.
-			add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults', array( $this, 'reset_defaults' ), 0, 3 );
-			add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults_section', array( $this, 'reset_defaults_section' ), 0, 3 );
-		}
-
-		/**
-		 * Reset section defaults.
-		 *
-		 * @param array $defaults Default values.
-		 *
-		 * @return array
-		 */
-		public function reset_defaults_section( array $defaults = array() ): array {
-			if ( isset( $_COOKIE[ 'redux_current_tab_' . $this->parent->args['opt_name'] ] ) ) {
-				$cur_tab = sanitize_title( wp_unslash( $_COOKIE[ 'redux_current_tab_' . $this->parent->args['opt_name'] ] ) );
-				$tab_num = strval( $this->parent->field_sections['social_profiles'][ $this->field_id ] );
-
-				if ( $cur_tab === $tab_num ) {
-					if ( '' !== $this->field_id && isset( $this->parent->options_defaults[ $this->field_id ] ) ) {
-						$data = Redux_Social_Profiles_Functions::get_default_data();
-
-						Redux_Social_Profiles_Functions::write_data_file( $data );
-					}
-				}
-
-				$defaults[ $this->field_id ] = Redux_Social_Profiles_Functions::read_data_file();
-			}
-
-			return $defaults;
-		}
-
-		/**
-		 * Reset defaults.
-		 *
-		 * @param array $defaults Default values.
-		 *
-		 * @return array
-		 */
-		public function reset_defaults( array $defaults = array() ): array {
-			if ( '' !== $this->field_id && isset( $this->parent->options_defaults[ $this->field_id ] ) ) {
-				$data = Redux_Social_Profiles_Functions::get_default_data();
-
-				Redux_Social_Profiles_Functions::write_data_file( $data );
-
-				$defaults[ $this->field_id ] = $data;
-			}
-
-			return $defaults;
-		}
-
-		/**
-		 * Set default values.
-		 *
-		 * @param array $defaults Default values.
-		 *
-		 * @return array
-		 */
-		public function set_defaults( array $defaults = array() ): array {
-			if ( empty( $this->field_id ) ) {
-				return $defaults;
-			}
-
-			$comp_file = Redux_Social_Profiles_Functions::get_data_path();
-
-			if ( ! file_exists( $comp_file ) ) {
-				$data = Redux_Social_Profiles_Functions::get_default_data();
-
-				Redux_Social_Profiles_Functions::write_data_file( $data );
-
-				$this->parent->options[ $this->field_id ] = $data;
-			}
-
-			return $defaults;
-		}
-
-		/**
-		 * Save Data.
-		 *
-		 * @param array $saved_options  Saved options.
-		 * @param array $changed_values Changed values.
-		 *
-		 * @return array
-		 */
-		public function save_me( array $saved_options = array(), array $changed_values = array() ): array {
-			if ( empty( $this->field ) ) {
-				$this->field    = Redux_Social_Profiles_Functions::get_field();
-				$this->field_id = $this->field['id'];
-			}
-
-			if ( ! isset( $saved_options[ $this->field_id ] ) || empty( $saved_options[ $this->field_id ] ) || ( is_array( $saved_options[ $this->field_id ] ) && $saved_options === $changed_values ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
-				return $saved_options;
-			}
-
-			// We'll use the reset hook instead.
-			if ( ! empty( $saved_options['defaults'] ) || ! empty( $saved_options['defaults-section'] ) ) {
-				return $saved_options;
-			}
-
-			$first_value = reset( $saved_options[ $this->field_id ] ); // First Element's Value.
-
-			if ( isset( $first_value['data'] ) ) {
-				$raw_data = $saved_options[ $this->field_id ];
-
-				$save_data = array();
-
-				// Enum through saved data.
-				foreach ( $raw_data as $val ) {
-					if ( is_array( $val ) ) {
-
-						if ( ! isset( $val['data'] ) ) {
-							return array();
-						}
-
-						$data = json_decode( rawurldecode( $val['data'] ), true );
-
-						$save_data[] = array(
-							'id'         => $data['id'],
-							'class'      => $data['class'] ?? 'fa',
-							'icon'       => $data['icon'],
-							'enabled'    => $data['enabled'],
-							'url'        => $data['url'],
-							'color'      => $data['color'],
-							'background' => $data['background'],
-							'order'      => $data['order'],
-							'name'       => $data['name'],
-							'label'      => $data['label'],
-						);
-					}
-				}
-
-				$save_file = false;
-
-				if ( ! isset( $old_options[ $this->field_id ] ) || ( isset( $old_options[ $this->field_id ] ) && ! empty( $old_options[ $this->field_id ] ) ) ) {
-					$save_file = true;
-				}
-
-				if ( ! empty( $old_options[ $this->field_id ] ) && $old_options[ $this->field_id ] !== $saved_options[ $this->field_id ] ) {
-					$save_file = true;
-				}
-
-				if ( $save_file ) {
-					Redux_Social_Profiles_Functions::write_data_file( $save_data );
-				}
-
-				$saved_options[ $this->field_id ] = $save_data;
-			}
-
-			return $saved_options;
-		}
-
-		/**
-		 * Enqueue scripts/styles.
-		 */
-		public function enqueue_styles() {
-			// Field CSS.
-			wp_enqueue_style(
-				'redux-field-social-profiles-frontend',
-				$this->extension_url . 'social_profiles/css/field_social_profiles_frontend.css',
-				array(),
-				self::$version
-			);
-		}
-	}
-
-	class_alias( Redux_Extension_Social_Profiles::class, 'ReduxFramework_Extension_social_profiles' );
+    /**
+     * Main ReduxFramework social profiles extension class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Extension_Social_Profiles extends Redux_Extension_Abstract {
+
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.5.8';
+
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Social Profiles';
+
+        /**
+         * Field ID.
+         *
+         * @var mixed|null
+         */
+        private $field_id = null;
+
+        /**
+         * Field array.
+         *
+         * @var array|null
+         */
+        public ?array $field = array();
+
+        /**
+         * Panel opt_name.
+         *
+         * @var string
+         */
+        public string $opt_name;
+
+        /**
+         * Class Constructor. Defines the args for the extensions class
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       ReduxFramework $redux Parent settings.
+         *
+         * @return      void
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux, __FILE__ );
+
+            $this->add_field( 'social_profiles' );
+
+            require_once __DIR__ . '/redux-social-profiles-helpers.php';
+
+            include_once 'social_profiles/inc/class-redux-social-profiles-defaults.php';
+            include_once 'social_profiles/inc/class-redux-social-profiles-functions.php';
+
+            Redux_Social_Profiles_Functions::init( $redux );
+
+            $this->field = Redux_Social_Profiles_Functions::get_field( $redux );
+
+            if ( ! is_array( $this->field ) ) {
+                return;
+            }
+
+            $this->field_id = $this->field['id'];
+            $this->opt_name = $redux->args['opt_name'];
+
+            $upload_dir = Redux_Social_Profiles_Functions::$upload_dir;
+
+            if ( ! is_dir( $upload_dir ) ) {
+                Redux_Core::$filesystem->execute( 'mkdir', $upload_dir );
+            }
+
+            if ( ! class_exists( 'Redux_Social_Profiles_Widget' ) ) {
+                $enable = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/widget/enable', true ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+
+                if ( $enable ) {
+                    include_once 'social_profiles/inc/class-redux-social-profiles-widget.php';
+                    new Redux_Social_Profiles_Widget( $redux, $this->field_id );
+                }
+            }
+
+            if ( ! class_exists( 'Redux_Social_Profiles_Shortcode' ) ) {
+                $enable = apply_filters( 'redux/extensions/social_profiles/' . $this->opt_name . '/shortcode/enable', true ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+
+                if ( $enable ) {
+                    include_once 'social_profiles/inc/class-redux-social-profiles-shortcode.php';
+                    new Redux_Social_Profiles_Shortcode( $redux, $this->field_id );
+                }
+            }
+
+            add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+
+            add_filter( "redux/options/{$this->parent->args['opt_name']}/defaults", array( $this, 'set_defaults' ) );
+            add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/before_validation', array( $this, 'save_me' ), 0, 3 );
+            add_filter( 'redux/metaboxes/save/before_validate', array( $this, 'save_me' ), 0, 3 );
+
+            // Reset hooks.
+            add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults', array( $this, 'reset_defaults' ), 0, 3 );
+            add_action( 'redux/validate/' . $this->parent->args['opt_name'] . '/defaults_section', array( $this, 'reset_defaults_section' ), 0, 3 );
+        }
+
+        /**
+         * Reset section defaults.
+         *
+         * @param array $defaults Default values.
+         *
+         * @return array
+         */
+        public function reset_defaults_section( array $defaults = array() ): array {
+            if ( isset( $_COOKIE[ 'redux_current_tab_' . $this->parent->args['opt_name'] ] ) ) {
+                $cur_tab = sanitize_title( wp_unslash( $_COOKIE[ 'redux_current_tab_' . $this->parent->args['opt_name'] ] ) );
+                $tab_num = strval( $this->parent->field_sections['social_profiles'][ $this->field_id ] );
+
+                if ( $cur_tab === $tab_num ) {
+                    if ( '' !== $this->field_id && isset( $this->parent->options_defaults[ $this->field_id ] ) ) {
+                        $data = Redux_Social_Profiles_Functions::get_default_data();
+
+                        Redux_Social_Profiles_Functions::write_data_file( $data );
+                    }
+                }
+
+                $defaults[ $this->field_id ] = Redux_Social_Profiles_Functions::read_data_file();
+            }
+
+            return $defaults;
+        }
+
+        /**
+         * Reset defaults.
+         *
+         * @param array $defaults Default values.
+         *
+         * @return array
+         */
+        public function reset_defaults( array $defaults = array() ): array {
+            if ( '' !== $this->field_id && isset( $this->parent->options_defaults[ $this->field_id ] ) ) {
+                $data = Redux_Social_Profiles_Functions::get_default_data();
+
+                Redux_Social_Profiles_Functions::write_data_file( $data );
+
+                $defaults[ $this->field_id ] = $data;
+            }
+
+            return $defaults;
+        }
+
+        /**
+         * Set default values.
+         *
+         * @param array $defaults Default values.
+         *
+         * @return array
+         */
+        public function set_defaults( array $defaults = array() ): array {
+            if ( empty( $this->field_id ) ) {
+                return $defaults;
+            }
+
+            $comp_file = Redux_Social_Profiles_Functions::get_data_path();
+
+            if ( ! file_exists( $comp_file ) ) {
+                $data = Redux_Social_Profiles_Functions::get_default_data();
+
+                Redux_Social_Profiles_Functions::write_data_file( $data );
+
+                $this->parent->options[ $this->field_id ] = $data;
+            }
+
+            return $defaults;
+        }
+
+        /**
+         * Save Data.
+         *
+         * @param array $saved_options  Saved options.
+         * @param array $changed_values Changed values.
+         *
+         * @return array
+         */
+        public function save_me( array $saved_options = array(), array $changed_values = array() ): array {
+            if ( empty( $this->field ) ) {
+                $this->field    = Redux_Social_Profiles_Functions::get_field();
+                $this->field_id = $this->field['id'];
+            }
+
+            if ( ! isset( $saved_options[ $this->field_id ] ) || empty( $saved_options[ $this->field_id ] ) || ( is_array( $saved_options[ $this->field_id ] ) && $saved_options === $changed_values ) || ! array_key_exists( $this->field_id, $saved_options ) ) {
+                return $saved_options;
+            }
+
+            // We'll use the reset hook instead.
+            if ( ! empty( $saved_options['defaults'] ) || ! empty( $saved_options['defaults-section'] ) ) {
+                return $saved_options;
+            }
+
+            $first_value = reset( $saved_options[ $this->field_id ] ); // First Element's Value.
+
+            if ( isset( $first_value['data'] ) ) {
+                $raw_data = $saved_options[ $this->field_id ];
+
+                $save_data = array();
+
+                // Enum through saved data.
+                foreach ( $raw_data as $val ) {
+                    if ( is_array( $val ) ) {
+
+                        if ( ! isset( $val['data'] ) ) {
+                            return array();
+                        }
+
+                        $data = json_decode( rawurldecode( $val['data'] ), true );
+
+                        $save_data[] = array(
+                            'id'         => $data['id'],
+                            'class'      => $data['class'] ?? 'fa',
+                            'icon'       => $data['icon'],
+                            'enabled'    => $data['enabled'],
+                            'url'        => $data['url'],
+                            'color'      => $data['color'],
+                            'background' => $data['background'],
+                            'order'      => $data['order'],
+                            'name'       => $data['name'],
+                            'label'      => $data['label'],
+                        );
+                    }
+                }
+
+                $save_file = false;
+
+                if ( ! isset( $old_options[ $this->field_id ] ) || ( isset( $old_options[ $this->field_id ] ) && ! empty( $old_options[ $this->field_id ] ) ) ) {
+                    $save_file = true;
+                }
+
+                if ( ! empty( $old_options[ $this->field_id ] ) && $old_options[ $this->field_id ] !== $saved_options[ $this->field_id ] ) {
+                    $save_file = true;
+                }
+
+                if ( $save_file ) {
+                    Redux_Social_Profiles_Functions::write_data_file( $save_data );
+                }
+
+                $saved_options[ $this->field_id ] = $save_data;
+            }
+
+            return $saved_options;
+        }
+
+        /**
+         * Enqueue scripts/styles.
+         */
+        public function enqueue_styles() {
+            // Field CSS.
+            wp_enqueue_style(
+                'redux-field-social-profiles-frontend',
+                $this->extension_url . 'social_profiles/css/field_social_profiles_frontend.css',
+                array(),
+                self::$version
+            );
+        }
+    }
+
+    class_alias( Redux_Extension_Social_Profiles::class, 'ReduxFramework_Extension_social_profiles' );
 }

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 		 */
 		public function redux_social_profiles(): string {
 			$redux_options = get_option( $this->parent->args['opt_name'] );
-			$social_items  = $redux_options[ $this->field_id ];
+			$social_items  = $redux_options[$this->field_id];
 
 			$html = '<ul class="redux-social-media-list clearfix">';
 

Indentation +59 added lines, -59 removed lines

@@ -11,73 +11,73 @@
 
 if ( ! class_exists( 'Redux_Social_Profiles_Shortcode' ) ) {
 
-	/**
-	 * Class Redux_Social_Profiles_Shortcode
-	 */
-	class Redux_Social_Profiles_Shortcode {
+    /**
+     * Class Redux_Social_Profiles_Shortcode
+     */
+    class Redux_Social_Profiles_Shortcode {
 
-		/**
-		 * ReduxFramework object pointer.
-		 *
-		 * @var ReduxFramework
-		 */
-		private ReduxFramework $parent;
+        /**
+         * ReduxFramework object pointer.
+         *
+         * @var ReduxFramework
+         */
+        private ReduxFramework $parent;
 
-		/**
-		 * Field ID.
-		 *
-		 * @var string
-		 */
-		private string $field_id;
+        /**
+         * Field ID.
+         *
+         * @var string
+         */
+        private string $field_id;
 
-		/**
-		 * Redux_Social_Profiles_Shortcode constructor.
-		 *
-		 * @param ReduxFramework $redux    ReduxFramework object.
-		 * @param string         $field_id Field ID.
-		 */
-		public function __construct( ReduxFramework $redux, string $field_id ) {
-			$this->parent   = $redux;
-			$this->field_id = $field_id;
+        /**
+         * Redux_Social_Profiles_Shortcode constructor.
+         *
+         * @param ReduxFramework $redux    ReduxFramework object.
+         * @param string         $field_id Field ID.
+         */
+        public function __construct( ReduxFramework $redux, string $field_id ) {
+            $this->parent   = $redux;
+            $this->field_id = $field_id;
 
-			add_shortcode( 'social_profiles', array( $this, 'redux_social_profiles' ) );
-		}
+            add_shortcode( 'social_profiles', array( $this, 'redux_social_profiles' ) );
+        }
 
-		/**
-		 * Render shortcode.
-		 *
-		 * @return string
-		 */
-		public function redux_social_profiles(): string {
-			$redux_options = get_option( $this->parent->args['opt_name'] );
-			$social_items  = $redux_options[ $this->field_id ];
+        /**
+         * Render shortcode.
+         *
+         * @return string
+         */
+        public function redux_social_profiles(): string {
+            $redux_options = get_option( $this->parent->args['opt_name'] );
+            $social_items  = $redux_options[ $this->field_id ];
 
-			$html = '<ul class="redux-social-media-list clearfix">';
+            $html = '<ul class="redux-social-media-list clearfix">';
 
-			if ( is_array( $social_items ) ) {
-				foreach ( $social_items as $social_item ) {
-					if ( $social_item['enabled'] ) {
-						$icon       = $social_item['icon'];
-						$class      = $social_item['class'] ?? 'fa';
-						$color      = $social_item['color'];
-						$background = $social_item['background'];
-						$base_url   = $social_item['url'];
-						$id         = $social_item['id'];
+            if ( is_array( $social_items ) ) {
+                foreach ( $social_items as $social_item ) {
+                    if ( $social_item['enabled'] ) {
+                        $icon       = $social_item['icon'];
+                        $class      = $social_item['class'] ?? 'fa';
+                        $color      = $social_item['color'];
+                        $background = $social_item['background'];
+                        $base_url   = $social_item['url'];
+                        $id         = $social_item['id'];
 
-						// phpcs:ignore WordPress.NamingConventions.ValidHookName
-						$url = apply_filters( 'redux/extensions/social_profiles/' . $this->parent->args['opt_name'] . '/icon_url', $id, $base_url );
+                        // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                        $url = apply_filters( 'redux/extensions/social_profiles/' . $this->parent->args['opt_name'] . '/icon_url', $id, $base_url );
 
-						$html .= '<li style="list-style: none;">';
-						$html .= "<a href='" . $url . "'>";
-						$html .= Redux_Social_Profiles_Functions::render_icon( $class, $icon, $color, $background, '', false );
-						$html .= '</a>';
-						$html .= '</li>';
-					}
-				}
-			}
-			$html .= '</ul>';
+                        $html .= '<li style="list-style: none;">';
+                        $html .= "<a href='" . $url . "'>";
+                        $html .= Redux_Social_Profiles_Functions::render_icon( $class, $icon, $color, $background, '', false );
+                        $html .= '</a>';
+                        $html .= '</li>';
+                    }
+                }
+            }
+            $html .= '</ul>';
 
-			return $html;
-		}
-	}
+            return $html;
+        }
+    }
 }

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

Spacing +4 added lines, -4 removed lines

@@ -28,13 +28,13 @@ 
 		$social_profiles = $redux->extensions['social_profiles'];
 
 		$redux_options = get_option( $social_profiles->opt_name );
-		$settings      = $redux_options[ $social_profiles->field_id ];
+		$settings      = $redux_options[$social_profiles->field_id];
 
 		foreach ( $settings as $arr ) {
 			if ( $id === $arr['id'] ) {
 				if ( $arr['enabled'] ) {
-					if ( isset( $arr[ $value ] ) ) {
-						return $arr[ $value ];
+					if ( isset( $arr[$value] ) ) {
+						return $arr[$value];
 					}
 				} else {
 					return '';
@@ -70,7 +70,7 @@ 
 		$social_profiles = $redux->extensions['social_profiles'];
 
 		$redux_options = get_option( $social_profiles->opt_name );
-		$settings      = $redux_options[ $social_profiles->field_id ];
+		$settings      = $redux_options[$social_profiles->field_id];
 
 		foreach ( $settings as $arr ) {
 			if ( $id === $arr['id'] ) {

Indentation +86 added lines, -86 removed lines

@@ -8,93 +8,93 @@
 defined( 'ABSPATH' ) || exit;
 
 if ( ! function_exists( 'redux_social_profile_value_from_id' ) ) {
-	/**
-	 * Returns social profile value from passed profile ID.
-	 *
-	 * @param string $opt_name Redux Framework opt_name.
-	 * @param string $id       Profile ID.
-	 * @param string $value    Social profile value to return (icon, name, class, background, color, url, or order).
-	 *
-	 * @return      string Returns HTML string when $echo is set to false.  Otherwise, true.
-	 * @since       1.0.0
-	 * @access      public
-	 */
-	function redux_social_profile_value_from_id( string $opt_name, string $id, string $value ): string {
-		if ( empty( $opt_name ) || empty( $id ) || empty( $value ) ) {
-			return '';
-		}
-
-		$redux           = ReduxFrameworkInstances::get_instance( $opt_name );
-		$social_profiles = $redux->extensions['social_profiles'];
-
-		$redux_options = get_option( $social_profiles->opt_name );
-		$settings      = $redux_options[ $social_profiles->field_id ];
-
-		foreach ( $settings as $arr ) {
-			if ( $id === $arr['id'] ) {
-				if ( $arr['enabled'] ) {
-					if ( isset( $arr[ $value ] ) ) {
-						return $arr[ $value ];
-					}
-				} else {
-					return '';
-				}
-			}
-		}
-
-		return '';
-	}
+    /**
+     * Returns social profile value from passed profile ID.
+     *
+     * @param string $opt_name Redux Framework opt_name.
+     * @param string $id       Profile ID.
+     * @param string $value    Social profile value to return (icon, name, class, background, color, url, or order).
+     *
+     * @return      string Returns HTML string when $echo is set to false.  Otherwise, true.
+     * @since       1.0.0
+     * @access      public
+     */
+    function redux_social_profile_value_from_id( string $opt_name, string $id, string $value ): string {
+        if ( empty( $opt_name ) || empty( $id ) || empty( $value ) ) {
+            return '';
+        }
+
+        $redux           = ReduxFrameworkInstances::get_instance( $opt_name );
+        $social_profiles = $redux->extensions['social_profiles'];
+
+        $redux_options = get_option( $social_profiles->opt_name );
+        $settings      = $redux_options[ $social_profiles->field_id ];
+
+        foreach ( $settings as $arr ) {
+            if ( $id === $arr['id'] ) {
+                if ( $arr['enabled'] ) {
+                    if ( isset( $arr[ $value ] ) ) {
+                        return $arr[ $value ];
+                    }
+                } else {
+                    return '';
+                }
+            }
+        }
+
+        return '';
+    }
 }
 
 if ( ! function_exists( 'redux_render_icon_from_id' ) ) {
-	/**
-	 * Renders social icon from passed profile ID.
-	 *
-	 * @param string  $opt_name Redux Framework opt_name.
-	 * @param string  $id       Profile ID.
-	 * @param boolean $output   Echos icon HTML when true.  Returns icon HTML when false.
-	 * @param string  $a_class  Class name for a tag.
-	 *
-	 * @return      string Returns HTML string when $echo is set to false.  Otherwise, true.
-	 * @since       1.0.0
-	 * @access      public
-	 */
-	function redux_render_icon_from_id( string $opt_name, string $id, bool $output = true, string $a_class = '' ) {
-		if ( empty( $opt_name ) || empty( $id ) ) {
-			return '';
-		}
-
-		include_once 'social_profiles/inc/class-redux-social-profiles-functions.php';
-
-		$redux           = ReduxFrameworkInstances::get_instance( $opt_name );
-		$social_profiles = $redux->extensions['social_profiles'];
-
-		$redux_options = get_option( $social_profiles->opt_name );
-		$settings      = $redux_options[ $social_profiles->field_id ];
-
-		foreach ( $settings as $arr ) {
-			if ( $id === $arr['id'] ) {
-				if ( $arr['enabled'] ) {
-					$arr['class'] = $arr['class'] ?? 'fa';
-
-					if ( $output ) {
-						echo '<a class="' . esc_attr( $a_class ) . '" href="' . esc_url( $arr['url'] ) . '">';
-						Redux_Social_Profiles_Functions::render_icon( $arr['class'], $arr['icon'], $arr['color'], $arr['background'], '' );
-						echo '</a>';
-
-						return true;
-					} else {
-						$html = '<a class="' . $a_class . '"href="' . $arr['url'] . '">';
-
-						$html .= Redux_Social_Profiles_Functions::render_icon( $arr['class'], $arr['icon'], $arr['color'], $arr['background'], '', false );
-						$html .= '</a>';
-
-						return $html;
-					}
-				}
-			}
-		}
-
-		return '';
-	}
+    /**
+     * Renders social icon from passed profile ID.
+     *
+     * @param string  $opt_name Redux Framework opt_name.
+     * @param string  $id       Profile ID.
+     * @param boolean $output   Echos icon HTML when true.  Returns icon HTML when false.
+     * @param string  $a_class  Class name for a tag.
+     *
+     * @return      string Returns HTML string when $echo is set to false.  Otherwise, true.
+     * @since       1.0.0
+     * @access      public
+     */
+    function redux_render_icon_from_id( string $opt_name, string $id, bool $output = true, string $a_class = '' ) {
+        if ( empty( $opt_name ) || empty( $id ) ) {
+            return '';
+        }
+
+        include_once 'social_profiles/inc/class-redux-social-profiles-functions.php';
+
+        $redux           = ReduxFrameworkInstances::get_instance( $opt_name );
+        $social_profiles = $redux->extensions['social_profiles'];
+
+        $redux_options = get_option( $social_profiles->opt_name );
+        $settings      = $redux_options[ $social_profiles->field_id ];
+
+        foreach ( $settings as $arr ) {
+            if ( $id === $arr['id'] ) {
+                if ( $arr['enabled'] ) {
+                    $arr['class'] = $arr['class'] ?? 'fa';
+
+                    if ( $output ) {
+                        echo '<a class="' . esc_attr( $a_class ) . '" href="' . esc_url( $arr['url'] ) . '">';
+                        Redux_Social_Profiles_Functions::render_icon( $arr['class'], $arr['icon'], $arr['color'], $arr['background'], '' );
+                        echo '</a>';
+
+                        return true;
+                    } else {
+                        $html = '<a class="' . $a_class . '"href="' . $arr['url'] . '">';
+
+                        $html .= Redux_Social_Profiles_Functions::render_icon( $arr['class'], $arr['icon'], $arr['color'], $arr['background'], '', false );
+                        $html .= '</a>';
+
+                        return $html;
+                    }
+                }
+            }
+        }
+
+        return '';
+    }
 }

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

Indentation +13 added lines, -13 removed lines

@@ -10,20 +10,20 @@
 // Helper function to bypass WordPress hook priorities.  ;).
 if ( ! function_exists( 'create_term_redux_users' ) ) {
 
-	/**
-	 * Create_term_redux_users.
-	 *
-	 * @param string $profile_id Profile ID.
-	 */
-	function create_term_redux_users( string $profile_id ) {
-		$instances = Redux::all_instances();
+    /**
+     * Create_term_redux_users.
+     *
+     * @param string $profile_id Profile ID.
+     */
+    function create_term_redux_users( string $profile_id ) {
+        $instances = Redux::all_instances();
 
-		foreach ( $_POST as $key => $value ) { // phpcs:ignore WordPress.Security.NonceVerification
-			if ( is_array( $value ) && isset( $instances[ $key ] ) ) {
-				$instances[ $key ]->extensions['users']->user_meta_save( $profile_id );
-			}
-		}
-	}
+        foreach ( $_POST as $key => $value ) { // phpcs:ignore WordPress.Security.NonceVerification
+            if ( is_array( $value ) && isset( $instances[ $key ] ) ) {
+                $instances[ $key ]->extensions['users']->user_meta_save( $profile_id );
+            }
+        }
+    }
 }
 
 add_action( 'create_term', 'create_term_redux_users', 4 );

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 		$instances = Redux::all_instances();
 
 		foreach ( $_POST as $key => $value ) { // phpcs:ignore WordPress.Security.NonceVerification
-			if ( is_array( $value ) && isset( $instances[ $key ] ) ) {
-				$instances[ $key ]->extensions['users']->user_meta_save( $profile_id );
+			if ( is_array( $value ) && isset( $instances[$key] ) ) {
+				$instances[$key]->extensions['users']->user_meta_save( $profile_id );
 			}
 		}
 	}

redux-core/inc/fields/link_color/class-redux-link-color.php

Indentation +341 added lines, -341 removed lines

@@ -12,347 +12,347 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Link_Color', false ) ) {
 
-	/**
-	 * Main Redux_link_color class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Link_Color extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'regular' => true,
-				'hover'   => true,
-				'visited' => false,
-				'active'  => true,
-				'focus'   => false,
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			$defaults = array(
-				'regular' => '',
-				'hover'   => '',
-				'visited' => '',
-				'active'  => '',
-				'focus'   => '',
-			);
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-
-			// In case user passes no default values.
-			if ( isset( $this->field['default'] ) ) {
-				$this->field['default'] = wp_parse_args( $this->field['default'], $defaults );
-			} else {
-				$this->field['default'] = $defaults;
-			}
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings.
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			if ( true === $this->field['regular'] && false !== $this->field['default']['regular'] ) {
-				echo '<span class="linkColor">';
-				echo '<strong>' . esc_html__( 'Regular', 'redux-framework' ) . '</strong>&nbsp;';
-				echo '<input ';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-regular" ';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[regular]"';
-				echo 'value="' . esc_attr( $this->value['regular'] ) . '"';
-				echo 'class="color-picker redux-color redux-color-regular redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default']['regular'] ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => 'regular',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-				echo '</span>';
-			}
-
-			if ( true === $this->field['hover'] && false !== $this->field['default']['hover'] ) {
-				echo '<span class="linkColor">';
-				echo '<strong>' . esc_html__( 'Hover', 'redux-framework' ) . '</strong>&nbsp;';
-				echo '<input ';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-hover"';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[hover]"';
-				echo 'value="' . esc_attr( $this->value['hover'] ) . '"';
-				echo 'class="color-picker redux-color redux-color-hover redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default']['hover'] ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => 'hover',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-				echo '</span>';
-			}
-
-			if ( true === $this->field['visited'] && false !== $this->field['default']['visited'] ) {
-				echo '<span class="linkColor">';
-				echo '<strong>' . esc_html__( 'Visited', 'redux-framework' ) . '</strong>&nbsp;';
-				echo '<input ';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-visited"';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[visited]"';
-				echo 'value="' . esc_attr( $this->value['visited'] ) . '"';
-				echo 'class="color-picker redux-color redux-color-visited redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default']['visited'] ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => 'visited',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-				echo '</span>';
-			}
-
-			if ( true === $this->field['active'] && false !== $this->field['default']['active'] ) {
-				echo '<span class="linkColor">';
-				echo '<strong>' . esc_html__( 'Active', 'redux-framework' ) . '</strong>&nbsp;';
-				echo '<input ';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-active"';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[active]"';
-				echo 'value="' . esc_attr( $this->value['active'] ) . '"';
-				echo 'class="color-picker redux-color redux-color-active redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default']['active'] ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => 'active',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-				echo '</span>';
-			}
-
-			if ( true === $this->field['focus'] && false !== $this->field['default']['focus'] ) {
-				echo '<span class="linkColor">';
-				echo '<strong>' . esc_html__( 'Focus', 'redux-framework' ) . '</strong>&nbsp;';
-				echo '<input ';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-focus"';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[focus]"';
-				echo 'value="' . esc_attr( $this->value['focus'] ) . '"';
-				echo 'class="color-picker redux-color redux-color-focus redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default']['focus'] ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => 'focus',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-				echo '</span>';
-			}
-		}
-
-
-		/**
-		 * Do enqueue for each field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			if ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
-				if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
-					wp_enqueue_script( 'redux-wp-color-picker-alpha' );
-				}
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or CSS define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			wp_enqueue_style( 'wp-color-picker' );
-
-			$dep_array = array( 'jquery', 'wp-color-picker', 'redux-js' );
-
-			wp_enqueue_script(
-				'redux-field-link-color',
-				Redux_Core::$url . 'inc/fields/link_color/redux-link-color' . Redux_Functions::is_min() . '.js',
-				$dep_array,
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style( 'redux-color-picker' );
-
-				wp_enqueue_style(
-					'redux-field-link_color',
-					Redux_Core::$url . 'inc/fields/link_color/redux-link-color.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Compile CSS data for output.
-		 *
-		 * @param string $data CSS data.
-		 *
-		 * @return array
-		 */
-		public function css_style( $data ): array {
-			$style = array();
-
-			if ( ! empty( $this->value['regular'] ) && true === $this->field['regular'] && false !== $this->field['default']['regular'] ) {
-				$style[] = 'color:' . $this->value['regular'] . ';';
-			}
-
-			if ( ! empty( $this->value['visited'] ) && true === $this->field['visited'] && false !== $this->field['default']['visited'] ) {
-				$style['visited'] = 'color:' . $this->value['visited'] . ';';
-			}
-
-			if ( ! empty( $this->value['hover'] ) && true === $this->field['hover'] && false !== $this->field['default']['hover'] ) {
-				$style['hover'] = 'color:' . $this->value['hover'] . ';';
-			}
-
-			if ( ! empty( $this->value['active'] ) && true === $this->field['active'] && false !== $this->field['default']['active'] ) {
-				$style['active'] = 'color:' . $this->value['active'] . ';';
-			}
-
-			if ( ! empty( $this->value['focus'] ) && true === $this->field['focus'] && false !== $this->field['default']['focus'] ) {
-				$style['focus'] = 'color:' . $this->value['focus'] . ';';
-			}
-
-			return $style;
-		}
-
-		/**
-		 * Output CSS/compiler.
-		 *
-		 * @param string|null|array $style Style to output.
-		 */
-		public function output( $style = '' ) {
-			if ( ! empty( $style ) ) {
-				if ( isset( $this->field['output'] ) && ! is_array( $this->field['output'] ) ) {
-					$this->field['output'] = array( $this->field['output'] );
-				}
-
-				if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
-					$style_string = '';
-
-					if ( isset( $this->field['output']['important'] ) ) {
-						if ( $this->field['output']['important'] ) {
-							$style = str_replace( ';', ' !important;', $style );
-						}
-						unset( $this->field['output']['important'] );
-					}
-
-					foreach ( $style as $key => $value ) {
-						if ( is_numeric( $key ) ) {
-							$style_string .= implode( ',', $this->field['output'] ) . '{' . $value . '}';
-						} elseif ( 1 === count( $this->field['output'] ) ) {
-								$elem = '';
-
-							foreach ( $this->field['output'] as $elem ) {
-								break;
-							}
-
-							if ( false !== strpos( $elem, ',' ) ) {
-								$selector_arr = explode( ',', $elem );
-								$sel_list     = '';
-
-								foreach ( $selector_arr as $selector ) {
-									$sel_list .= $selector . ':' . $key . ',';
-								}
-
-								$sel_list      = rtrim( $sel_list, ',' );
-								$style_string .= $sel_list . '{' . $value . '}';
-							} else {
-								$style_string .= $elem . ':' . $key . '{' . $value . '}';
-							}
-						} else {
-							$blah = '';
-							foreach ( $this->field['output'] as $sel ) {
-								$blah .= $sel . ':' . $key . ',';
-							}
-
-							$blah          = substr( $blah, 0, strlen( $blah ) - 1 );
-							$style_string .= $blah . '{' . $value . '}';
-						}
-					}
-
-					$this->parent->outputCSS .= $style_string;
-				}
-
-				if ( isset( $this->field['compiler'] ) && ! is_array( $this->field['compiler'] ) ) {
-					$this->field['compiler'] = array( $this->field['compiler'] );
-				}
-
-				if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
-					$style_string = '';
-
-					if ( isset( $this->field['compiler']['important'] ) ) {
-						if ( $this->field['compiler']['important'] ) {
-							$style = str_replace( ';', ' !important;', $style );
-						}
-						unset( $this->field['compiler']['important'] );
-					}
-
-					foreach ( $style as $key => $value ) {
-						if ( is_numeric( $key ) ) {
-							$style_string .= implode( ',', $this->field['compiler'] ) . '{' . $value . '}';
-						} elseif ( 1 === count( $this->field['compiler'] ) ) {
-								$style_string .= $this->field['compiler'][0] . ':' . $key . '{' . $value . '}';
-						} else {
-							$blah = '';
-							foreach ( $this->field['compiler'] as $sel ) {
-								$blah .= $sel . ':' . $key . ',';
-							}
-
-							$blah          = substr( $blah, 0, strlen( $blah ) - 1 );
-							$style_string .= $blah . '{' . $value . '}';
-						}
-					}
-					$this->parent->compilerCSS .= $style_string;
-				}
-			}
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+    /**
+     * Main Redux_link_color class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Link_Color extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'regular' => true,
+                'hover'   => true,
+                'visited' => false,
+                'active'  => true,
+                'focus'   => false,
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            $defaults = array(
+                'regular' => '',
+                'hover'   => '',
+                'visited' => '',
+                'active'  => '',
+                'focus'   => '',
+            );
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+
+            // In case user passes no default values.
+            if ( isset( $this->field['default'] ) ) {
+                $this->field['default'] = wp_parse_args( $this->field['default'], $defaults );
+            } else {
+                $this->field['default'] = $defaults;
+            }
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings.
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            if ( true === $this->field['regular'] && false !== $this->field['default']['regular'] ) {
+                echo '<span class="linkColor">';
+                echo '<strong>' . esc_html__( 'Regular', 'redux-framework' ) . '</strong>&nbsp;';
+                echo '<input ';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-regular" ';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[regular]"';
+                echo 'value="' . esc_attr( $this->value['regular'] ) . '"';
+                echo 'class="color-picker redux-color redux-color-regular redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'data-default-color="' . esc_attr( $this->field['default']['regular'] ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => 'regular',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+                echo '</span>';
+            }
+
+            if ( true === $this->field['hover'] && false !== $this->field['default']['hover'] ) {
+                echo '<span class="linkColor">';
+                echo '<strong>' . esc_html__( 'Hover', 'redux-framework' ) . '</strong>&nbsp;';
+                echo '<input ';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-hover"';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[hover]"';
+                echo 'value="' . esc_attr( $this->value['hover'] ) . '"';
+                echo 'class="color-picker redux-color redux-color-hover redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'data-default-color="' . esc_attr( $this->field['default']['hover'] ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => 'hover',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+                echo '</span>';
+            }
+
+            if ( true === $this->field['visited'] && false !== $this->field['default']['visited'] ) {
+                echo '<span class="linkColor">';
+                echo '<strong>' . esc_html__( 'Visited', 'redux-framework' ) . '</strong>&nbsp;';
+                echo '<input ';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-visited"';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[visited]"';
+                echo 'value="' . esc_attr( $this->value['visited'] ) . '"';
+                echo 'class="color-picker redux-color redux-color-visited redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'data-default-color="' . esc_attr( $this->field['default']['visited'] ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => 'visited',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+                echo '</span>';
+            }
+
+            if ( true === $this->field['active'] && false !== $this->field['default']['active'] ) {
+                echo '<span class="linkColor">';
+                echo '<strong>' . esc_html__( 'Active', 'redux-framework' ) . '</strong>&nbsp;';
+                echo '<input ';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-active"';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[active]"';
+                echo 'value="' . esc_attr( $this->value['active'] ) . '"';
+                echo 'class="color-picker redux-color redux-color-active redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'data-default-color="' . esc_attr( $this->field['default']['active'] ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => 'active',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+                echo '</span>';
+            }
+
+            if ( true === $this->field['focus'] && false !== $this->field['default']['focus'] ) {
+                echo '<span class="linkColor">';
+                echo '<strong>' . esc_html__( 'Focus', 'redux-framework' ) . '</strong>&nbsp;';
+                echo '<input ';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-focus"';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[focus]"';
+                echo 'value="' . esc_attr( $this->value['focus'] ) . '"';
+                echo 'class="color-picker redux-color redux-color-focus redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'data-default-color="' . esc_attr( $this->field['default']['focus'] ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => 'focus',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+                echo '</span>';
+            }
+        }
+
+
+        /**
+         * Do enqueue for each field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            if ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
+                if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
+                    wp_enqueue_script( 'redux-wp-color-picker-alpha' );
+                }
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or CSS define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            wp_enqueue_style( 'wp-color-picker' );
+
+            $dep_array = array( 'jquery', 'wp-color-picker', 'redux-js' );
+
+            wp_enqueue_script(
+                'redux-field-link-color',
+                Redux_Core::$url . 'inc/fields/link_color/redux-link-color' . Redux_Functions::is_min() . '.js',
+                $dep_array,
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style( 'redux-color-picker' );
+
+                wp_enqueue_style(
+                    'redux-field-link_color',
+                    Redux_Core::$url . 'inc/fields/link_color/redux-link-color.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Compile CSS data for output.
+         *
+         * @param string $data CSS data.
+         *
+         * @return array
+         */
+        public function css_style( $data ): array {
+            $style = array();
+
+            if ( ! empty( $this->value['regular'] ) && true === $this->field['regular'] && false !== $this->field['default']['regular'] ) {
+                $style[] = 'color:' . $this->value['regular'] . ';';
+            }
+
+            if ( ! empty( $this->value['visited'] ) && true === $this->field['visited'] && false !== $this->field['default']['visited'] ) {
+                $style['visited'] = 'color:' . $this->value['visited'] . ';';
+            }
+
+            if ( ! empty( $this->value['hover'] ) && true === $this->field['hover'] && false !== $this->field['default']['hover'] ) {
+                $style['hover'] = 'color:' . $this->value['hover'] . ';';
+            }
+
+            if ( ! empty( $this->value['active'] ) && true === $this->field['active'] && false !== $this->field['default']['active'] ) {
+                $style['active'] = 'color:' . $this->value['active'] . ';';
+            }
+
+            if ( ! empty( $this->value['focus'] ) && true === $this->field['focus'] && false !== $this->field['default']['focus'] ) {
+                $style['focus'] = 'color:' . $this->value['focus'] . ';';
+            }
+
+            return $style;
+        }
+
+        /**
+         * Output CSS/compiler.
+         *
+         * @param string|null|array $style Style to output.
+         */
+        public function output( $style = '' ) {
+            if ( ! empty( $style ) ) {
+                if ( isset( $this->field['output'] ) && ! is_array( $this->field['output'] ) ) {
+                    $this->field['output'] = array( $this->field['output'] );
+                }
+
+                if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
+                    $style_string = '';
+
+                    if ( isset( $this->field['output']['important'] ) ) {
+                        if ( $this->field['output']['important'] ) {
+                            $style = str_replace( ';', ' !important;', $style );
+                        }
+                        unset( $this->field['output']['important'] );
+                    }
+
+                    foreach ( $style as $key => $value ) {
+                        if ( is_numeric( $key ) ) {
+                            $style_string .= implode( ',', $this->field['output'] ) . '{' . $value . '}';
+                        } elseif ( 1 === count( $this->field['output'] ) ) {
+                                $elem = '';
+
+                            foreach ( $this->field['output'] as $elem ) {
+                                break;
+                            }
+
+                            if ( false !== strpos( $elem, ',' ) ) {
+                                $selector_arr = explode( ',', $elem );
+                                $sel_list     = '';
+
+                                foreach ( $selector_arr as $selector ) {
+                                    $sel_list .= $selector . ':' . $key . ',';
+                                }
+
+                                $sel_list      = rtrim( $sel_list, ',' );
+                                $style_string .= $sel_list . '{' . $value . '}';
+                            } else {
+                                $style_string .= $elem . ':' . $key . '{' . $value . '}';
+                            }
+                        } else {
+                            $blah = '';
+                            foreach ( $this->field['output'] as $sel ) {
+                                $blah .= $sel . ':' . $key . ',';
+                            }
+
+                            $blah          = substr( $blah, 0, strlen( $blah ) - 1 );
+                            $style_string .= $blah . '{' . $value . '}';
+                        }
+                    }
+
+                    $this->parent->outputCSS .= $style_string;
+                }
+
+                if ( isset( $this->field['compiler'] ) && ! is_array( $this->field['compiler'] ) ) {
+                    $this->field['compiler'] = array( $this->field['compiler'] );
+                }
+
+                if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
+                    $style_string = '';
+
+                    if ( isset( $this->field['compiler']['important'] ) ) {
+                        if ( $this->field['compiler']['important'] ) {
+                            $style = str_replace( ';', ' !important;', $style );
+                        }
+                        unset( $this->field['compiler']['important'] );
+                    }
+
+                    foreach ( $style as $key => $value ) {
+                        if ( is_numeric( $key ) ) {
+                            $style_string .= implode( ',', $this->field['compiler'] ) . '{' . $value . '}';
+                        } elseif ( 1 === count( $this->field['compiler'] ) ) {
+                                $style_string .= $this->field['compiler'][0] . ':' . $key . '{' . $value . '}';
+                        } else {
+                            $blah = '';
+                            foreach ( $this->field['compiler'] as $sel ) {
+                                $blah .= $sel . ':' . $key . ',';
+                            }
+
+                            $blah          = substr( $blah, 0, strlen( $blah ) - 1 );
+                            $style_string .= $blah . '{' . $value . '}';
+                        }
+                    }
+                    $this->parent->compilerCSS .= $style_string;
+                }
+            }
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Link_Color', 'ReduxFramework_Link_Color' );

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

Indentation +252 added lines, -252 removed lines

@@ -12,401 +12,401 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Slides', false ) ) {
 
-	/**
-	 * Main Redux_slides class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Slides extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'show'          => array(
-					'title'       => true,
-					'description' => true,
-					'url'         => true,
-				),
-				'content_title' => esc_html__( 'Slide', 'redux-framework' ),
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			// translators: New accordion title.
-			echo '<div class="redux-slides-accordion" data-new-content-title="' . esc_attr( sprintf( __( 'New %s', 'redux-framework' ), $this->field['content_title'] ) ) . '">';
-
-			$x = 0;
-
-			if ( is_array( $this->value ) && ! empty( $this->value ) ) {
-				$slides = $this->value;
-
-				foreach ( $slides as $slide ) {
-					if ( empty( $slide ) ) {
-						continue;
-					}
-
-					$defaults = array(
-						'title'         => '',
-						'description'   => '',
-						'sort'          => '',
-						'url'           => '',
-						'image'         => '',
-						'thumb'         => '',
-						'attachment_id' => '',
-						'height'        => '',
-						'width'         => '',
-						'select'        => array(),
-					);
-
-					$slide = wp_parse_args( $slide, $defaults );
-
-					if ( empty( $slide['thumb'] ) && ! empty( $slide['attachment_id'] ) ) {
-						$img             = wp_get_attachment_image_src( $slide['attachment_id'], 'full' );
-						$slide['image']  = $img[0];
-						$slide['width']  = $img[1];
-						$slide['height'] = $img[2];
-					}
-
-					echo '<div class="redux-slides-accordion-group"><fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '"><h3><span class="redux-slides-header">' . esc_html( $slide['title'] ) . '</span></h3><div>';
-
-					$hide = '';
-					if ( empty( $slide['image'] ) ) {
-						$hide = ' hide';
-					}
-
-					$alt = wp_prepare_attachment_for_js( $slide['attachment_id'] );
-					$alt = $alt['alt'] ?? '';
-
-					echo '<div class="screenshot' . esc_attr( $hide ) . '">';
-					echo '<a class="of-uploaded-image" href="' . esc_url( $slide['image'] ) . '">';
-					echo '<img
+    /**
+     * Main Redux_slides class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Slides extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'show'          => array(
+                    'title'       => true,
+                    'description' => true,
+                    'url'         => true,
+                ),
+                'content_title' => esc_html__( 'Slide', 'redux-framework' ),
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            // translators: New accordion title.
+            echo '<div class="redux-slides-accordion" data-new-content-title="' . esc_attr( sprintf( __( 'New %s', 'redux-framework' ), $this->field['content_title'] ) ) . '">';
+
+            $x = 0;
+
+            if ( is_array( $this->value ) && ! empty( $this->value ) ) {
+                $slides = $this->value;
+
+                foreach ( $slides as $slide ) {
+                    if ( empty( $slide ) ) {
+                        continue;
+                    }
+
+                    $defaults = array(
+                        'title'         => '',
+                        'description'   => '',
+                        'sort'          => '',
+                        'url'           => '',
+                        'image'         => '',
+                        'thumb'         => '',
+                        'attachment_id' => '',
+                        'height'        => '',
+                        'width'         => '',
+                        'select'        => array(),
+                    );
+
+                    $slide = wp_parse_args( $slide, $defaults );
+
+                    if ( empty( $slide['thumb'] ) && ! empty( $slide['attachment_id'] ) ) {
+                        $img             = wp_get_attachment_image_src( $slide['attachment_id'], 'full' );
+                        $slide['image']  = $img[0];
+                        $slide['width']  = $img[1];
+                        $slide['height'] = $img[2];
+                    }
+
+                    echo '<div class="redux-slides-accordion-group"><fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '"><h3><span class="redux-slides-header">' . esc_html( $slide['title'] ) . '</span></h3><div>';
+
+                    $hide = '';
+                    if ( empty( $slide['image'] ) ) {
+                        $hide = ' hide';
+                    }
+
+                    $alt = wp_prepare_attachment_for_js( $slide['attachment_id'] );
+                    $alt = $alt['alt'] ?? '';
+
+                    echo '<div class="screenshot' . esc_attr( $hide ) . '">';
+                    echo '<a class="of-uploaded-image" href="' . esc_url( $slide['image'] ) . '">';
+                    echo '<img
 							class="redux-slides-image"
 							id="image_image_id_' . esc_attr( $x ) . '" src="' . esc_url( $slide['thumb'] ) . '"
 							alt="' . esc_attr( $alt ) . '"
 							target="_blank" rel="external" />';
 
-					echo '</a>';
-					echo '</div>';
+                    echo '</a>';
+                    echo '</div>';
 
-					echo '<div class="redux_slides_add_remove">';
+                    echo '<div class="redux_slides_add_remove">';
 
-					echo '<span class="button media_upload_button" id="add_' . esc_attr( $x ) . '">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
+                    echo '<span class="button media_upload_button" id="add_' . esc_attr( $x ) . '">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
 
-					$hide = '';
-					if ( empty( $slide['image'] ) ) {
-						$hide = ' hide';
-					}
+                    $hide = '';
+                    if ( empty( $slide['image'] ) ) {
+                        $hide = ' hide';
+                    }
 
-					echo '<span
+                    echo '<span
 							class="button remove-image' . esc_attr( $hide ) . '"
 							id="reset_' . esc_attr( $x ) . '"
 							rel="' . esc_attr( $slide['attachment_id'] ) . '">' .
-							esc_html__( 'Remove', 'redux-framework' ) . '</span>';
+                            esc_html__( 'Remove', 'redux-framework' ) . '</span>';
 
-					echo '</div>' . "\n";
+                    echo '</div>' . "\n";
 
-					echo '<ul id="' . esc_attr( $this->field['id'] ) . '-ul" class="redux-slides-list">';
+                    echo '<ul id="' . esc_attr( $this->field['id'] ) . '-ul" class="redux-slides-list">';
 
-					if ( $this->field['show']['title'] ) {
-						$title_type = 'text';
-					} else {
-						$title_type = 'hidden';
-					}
+                    if ( $this->field['show']['title'] ) {
+                        $title_type = 'text';
+                    } else {
+                        $title_type = 'hidden';
+                    }
 
-					$placeholder = ( isset( $this->field['placeholder']['title'] ) ) ? esc_attr( $this->field['placeholder']['title'] ) : __( 'Title', 'redux-framework' );
-					echo '<li>';
-					echo '<input
+                    $placeholder = ( isset( $this->field['placeholder']['title'] ) ) ? esc_attr( $this->field['placeholder']['title'] ) : __( 'Title', 'redux-framework' );
+                    echo '<li>';
+                    echo '<input
 							type="' . esc_attr( $title_type ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-title_' . esc_attr( $x ) . '"
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][title]' . $this->field['name_suffix'] ) . '"
 							value="' . esc_attr( $slide['title'] ) . '"
 							placeholder="' . esc_attr( $placeholder ) . '" class="full-text slide-title" />';
 
-					echo '</li>';
+                    echo '</li>';
 
-					if ( $this->field['show']['description'] ) {
-						$placeholder = ( isset( $this->field['placeholder']['description'] ) ) ? esc_attr( $this->field['placeholder']['description'] ) : __( 'Description', 'redux-framework' );
-						echo '<li>';
-						echo '<textarea
+                    if ( $this->field['show']['description'] ) {
+                        $placeholder = ( isset( $this->field['placeholder']['description'] ) ) ? esc_attr( $this->field['placeholder']['description'] ) : __( 'Description', 'redux-framework' );
+                        echo '<li>';
+                        echo '<textarea
 								name="' . esc_attr( $this->field['name'] . '[' . $x . '][description]' . $this->field['name_suffix'] ) . '"
 								id="' . esc_attr( $this->field['id'] ) . '-description_' . esc_attr( $x ) . '"
 								placeholder="' . esc_attr( $placeholder ) . '"
 								class="large-text"
 								rows="6">' . esc_textarea( $slide['description'] ) . '</textarea>';
 
-						echo '</li>';
-					}
+                        echo '</li>';
+                    }
 
-					$placeholder = ( isset( $this->field['placeholder']['url'] ) ) ? esc_attr( $this->field['placeholder']['url'] ) : __( 'URL', 'redux-framework' );
-					if ( $this->field['show']['url'] ) {
-						$url_type = 'text';
-					} else {
-						$url_type = 'hidden';
-					}
+                    $placeholder = ( isset( $this->field['placeholder']['url'] ) ) ? esc_attr( $this->field['placeholder']['url'] ) : __( 'URL', 'redux-framework' );
+                    if ( $this->field['show']['url'] ) {
+                        $url_type = 'text';
+                    } else {
+                        $url_type = 'hidden';
+                    }
 
-					echo '<li>';
-					echo '<input
+                    echo '<li>';
+                    echo '<input
 							type="' . esc_attr( $url_type ) . '"
 							id="' . esc_attr( $this->field['id'] . '-url_' ) . esc_attr( $x ) . '"
 							name="' . esc_attr( $this->field['name'] . '[' . esc_attr( $x ) . '][url]' . $this->field['name_suffix'] ) . '"
 							value="' . esc_attr( $slide['url'] ) . '"
 							class="full-text" placeholder="' . esc_attr( $placeholder ) . '" />';
-					echo '</li>';
+                    echo '</li>';
 
-					echo '<li>';
-					echo '<input
+                    echo '<li>';
+                    echo '<input
 							type="hidden"
 							class="slide-sort"
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][sort]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-sort_' . esc_attr( $x ) . '"
 							value="' . esc_attr( $slide['sort'] ) . '" />';
 
-					echo '<li>';
-					echo '<input
+                    echo '<li>';
+                    echo '<input
 							type="hidden"
 							class="upload-id"
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][attachment_id]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-image_id_' . esc_attr( $x ) . '"
 							value="' . esc_attr( $slide['attachment_id'] ) . '" />';
 
-					echo '<input
+                    echo '<input
 							type="hidden"
 							class="upload" name="' . esc_attr( $this->field['name'] . '[' . $x . '][image]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-image_url_' . esc_attr( $x ) . '"
 							value="' . esc_attr( $slide['image'] ) . '" readonly="readonly" />';
 
-					echo '<input
+                    echo '<input
 							type="hidden"
 							class="upload-height"
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][height]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-image_height_' . esc_attr( $x ) . '"
 							value="' . esc_attr( $slide['height'] ) . '" />';
 
-					echo '<input
+                    echo '<input
 							type="hidden"
 							class="upload-width"
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][width]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-image_width_' . esc_attr( $x ) . '"
 							value="' . esc_attr( $slide['width'] ) . '" />';
 
-					echo '</li>';
+                    echo '</li>';
 
-					echo '<input
+                    echo '<input
 							type="hidden"
 							class="upload-thumbnail"
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][thumb]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] ) . '-thumb_url_' . esc_attr( $x ) . '"
 							value="' . esc_attr( $slide['thumb'] ) . '" readonly="readonly" />';
-					echo '</li>';
+                    echo '</li>';
 
-					echo '<li>';
-					echo '<a href="javascript:void(0);" class="button deletion redux-slides-remove">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>';
-					echo '</li>';
+                    echo '<li>';
+                    echo '<a href="javascript:void(0);" class="button deletion redux-slides-remove">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>';
+                    echo '</li>';
 
-					echo '</ul>';
-					echo '</div>';
-					echo '</fieldset>';
-					echo '</div>';
+                    echo '</ul>';
+                    echo '</div>';
+                    echo '</fieldset>';
+                    echo '</div>';
 
-					++$x;
-				}
-			}
+                    ++$x;
+                }
+            }
 
-			if ( 0 === $x ) {
-				echo '<div class="redux-slides-accordion-group">';
-				echo '<fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '">';
-				echo '<h3>';
+            if ( 0 === $x ) {
+                echo '<div class="redux-slides-accordion-group">';
+                echo '<fieldset class="redux-field" data-id="' . esc_attr( $this->field['id'] ) . '">';
+                echo '<h3>';
 
-				// translators:  Content title for new accordion.
-				echo '<span class="redux-slides-header">' . esc_html( sprintf( __( 'New %s', 'redux-framework' ), esc_attr( $this->field['content_title'] ) ) ) . '</span>';
-				echo '</h3>';
-				echo '<div>';
+                // translators:  Content title for new accordion.
+                echo '<span class="redux-slides-header">' . esc_html( sprintf( __( 'New %s', 'redux-framework' ), esc_attr( $this->field['content_title'] ) ) ) . '</span>';
+                echo '</h3>';
+                echo '<div>';
 
-				$hide = ' hide';
+                $hide = ' hide';
 
-				echo '<div class="screenshot' . esc_attr( $hide ) . '">';
-				echo '<a class="of-uploaded-image" href="">';
-				echo '<img class="redux-slides-image" id="image_image_id_' . esc_attr( $x ) . '" src="" alt="placeholder" target="_blank" rel="external" />';
-				echo '</a>';
-				echo '</div>';
+                echo '<div class="screenshot' . esc_attr( $hide ) . '">';
+                echo '<a class="of-uploaded-image" href="">';
+                echo '<img class="redux-slides-image" id="image_image_id_' . esc_attr( $x ) . '" src="" alt="placeholder" target="_blank" rel="external" />';
+                echo '</a>';
+                echo '</div>';
 
-				// Upload controls DIV.
-				echo '<div class="upload_button_div">';
+                // Upload controls DIV.
+                echo '<div class="upload_button_div">';
 
-				// If the user has WP3.5+ show upload/remove button.
-				echo '<span class="button media_upload_button" id="add_' . esc_attr( $x ) . '">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
+                // If the user has WP3.5+ show upload/remove button.
+                echo '<span class="button media_upload_button" id="add_' . esc_attr( $x ) . '">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
 
-				echo '<span class="button remove-image' . esc_attr( $hide ) . '" id="reset_' . esc_attr( $x ) . '" rel="' . esc_attr( $this->parent->args['opt_name'] . '[' . $this->field['id'] ) . '][attachment_id]">' . esc_html__( 'Remove', 'redux-framework' ) . '</span>';
+                echo '<span class="button remove-image' . esc_attr( $hide ) . '" id="reset_' . esc_attr( $x ) . '" rel="' . esc_attr( $this->parent->args['opt_name'] . '[' . $this->field['id'] ) . '][attachment_id]">' . esc_html__( 'Remove', 'redux-framework' ) . '</span>';
 
-				echo '</div>' . "\n";
+                echo '</div>' . "\n";
 
-				echo '<ul id="' . esc_attr( $this->field['id'] ) . '-ul" class="redux-slides-list">';
+                echo '<ul id="' . esc_attr( $this->field['id'] ) . '-ul" class="redux-slides-list">';
 
-				if ( $this->field['show']['title'] ) {
-					$title_type = 'text';
-				} else {
-					$title_type = 'hidden';
-				}
+                if ( $this->field['show']['title'] ) {
+                    $title_type = 'text';
+                } else {
+                    $title_type = 'hidden';
+                }
 
-				$placeholder = ( isset( $this->field['placeholder']['title'] ) ) ? esc_attr( $this->field['placeholder']['title'] ) : __( 'Title', 'redux-framework' );
+                $placeholder = ( isset( $this->field['placeholder']['title'] ) ) ? esc_attr( $this->field['placeholder']['title'] ) : __( 'Title', 'redux-framework' );
 
-				echo '<li>';
-				echo '<input
+                echo '<li>';
+                echo '<input
 						type="' . esc_attr( $title_type ) . '"
 						id="' . esc_attr( $this->field['id'] . '-title_' . $x ) . '"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][title]' . $this->field['name_suffix'] ) . '"
 						value=""
 						placeholder="' . esc_attr( $placeholder ) . '"
 						class="full-text slide-title" />';
-				echo '</li>';
+                echo '</li>';
 
-				if ( $this->field['show']['description'] ) {
-					$placeholder = ( isset( $this->field['placeholder']['description'] ) ) ? esc_attr( $this->field['placeholder']['description'] ) : __( 'Description', 'redux-framework' );
+                if ( $this->field['show']['description'] ) {
+                    $placeholder = ( isset( $this->field['placeholder']['description'] ) ) ? esc_attr( $this->field['placeholder']['description'] ) : __( 'Description', 'redux-framework' );
 
-					echo '<li>';
-					echo '<textarea
+                    echo '<li>';
+                    echo '<textarea
 							name="' . esc_attr( $this->field['name'] . '[' . $x . '][description]' . $this->field['name_suffix'] ) . '"
 							id="' . esc_attr( $this->field['id'] . '-description_' . $x ) . '"
 							placeholder="' . esc_attr( $placeholder ) . '"
 							class="large-text"
 							rows="6"></textarea>';
-					echo '</li>';
-				}
+                    echo '</li>';
+                }
 
-				$placeholder = ( isset( $this->field['placeholder']['url'] ) ) ? esc_attr( $this->field['placeholder']['url'] ) : __( 'URL', 'redux-framework' );
+                $placeholder = ( isset( $this->field['placeholder']['url'] ) ) ? esc_attr( $this->field['placeholder']['url'] ) : __( 'URL', 'redux-framework' );
 
-				if ( $this->field['show']['url'] ) {
-					$url_type = 'text';
-				} else {
-					$url_type = 'hidden';
-				}
+                if ( $this->field['show']['url'] ) {
+                    $url_type = 'text';
+                } else {
+                    $url_type = 'hidden';
+                }
 
-				echo '<li>';
-				echo '<input
+                echo '<li>';
+                echo '<input
 						type="' . esc_attr( $url_type ) . '"
 						id="' . esc_attr( $this->field['id'] . '-url_' . $x ) . '"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][url]' . $this->field['name_suffix'] ) . '"
 						value="" class="full-text" placeholder="' . esc_attr( $placeholder ) . '" />';
-				echo '</li>';
+                echo '</li>';
 
-				echo '<li>';
-				echo '<input
+                echo '<li>';
+                echo '<input
 						type="hidden"
 						class="slide-sort"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][sort]' . $this->field['name_suffix'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-sort_' . $x ) . '"
 						value="' . esc_attr( $x ) . '" />';
 
-				echo '<li>';
-				echo '<input
+                echo '<li>';
+                echo '<input
 						type="hidden"
 						class="upload-id"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][attachment_id]' . $this->field['name_suffix'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-image_id_' . $x ) . '"
 						value="" />';
 
-				echo '<input
+                echo '<input
 						type="hidden"
 						class="upload"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][image]' . $this->field['name_suffix'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-image_url_' . $x ) . '"
 						value="" readonly="readonly" />';
 
-				echo '<input
+                echo '<input
 						type="hidden"
 						class="upload-height"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][height]' . $this->field['name_suffix'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-image_height_' . $x ) . '"
 						value="" />';
 
-				echo '<input
+                echo '<input
 						type="hidden"
 						class="upload-width"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][width]' . $this->field['name_suffix'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-image_width_' . $x ) . '"
 						value="" />';
-				echo '</li>';
+                echo '</li>';
 
-				echo '<input
+                echo '<input
 						type="hidden"
 						class="upload-thumbnail"
 						name="' . esc_attr( $this->field['name'] . '[' . $x . '][thumb]' . $this->field['name_suffix'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-thumb_url_' . $x ) . '"
 						value="" />';
-				echo '</li>';
-
-				echo '<li>';
-				echo '<a href="javascript:void(0);" class="button deletion redux-slides-remove">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>';
-				echo '</li>';
-
-				echo '</ul>';
-				echo '</div>';
-				echo '</fieldset>';
-				echo '</div>';
-			}
-
-			echo '</div>';
-
-			// translators:  Content title for accordion.
-			echo '<a href="javascript:void(0);" class="button redux-slides-add button-primary" rel-id="' . esc_attr( $this->field['id'] ) . '-ul" rel-name="' . esc_attr( $this->field['name'] . '[title][]' . $this->field['name_suffix'] ) . '">' . esc_html( sprintf( __( 'Add %s', 'redux-framework' ), esc_html( $this->field['content_title'] ) ) ) . '</a>';
-			echo '<br/>';
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			if ( function_exists( 'wp_enqueue_media' ) ) {
-				wp_enqueue_media();
-			} else {
-				wp_enqueue_script( 'media-upload' );
-			}
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style( 'redux-field-media' );
-
-				wp_enqueue_style(
-					'redux-field-slides',
-					Redux_Core::$url . 'inc/fields/slides/redux-slides.css',
-					array(),
-					$this->timestamp
-				);
-			}
-
-			wp_enqueue_script(
-				'redux-field-media',
-				Redux_Core::$url . 'assets/js/media/media' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			wp_enqueue_script(
-				'redux-field-slides',
-				Redux_Core::$url . 'inc/fields/slides/redux-slides' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'jquery-ui-core', 'jquery-ui-accordion', 'jquery-ui-sortable', 'redux-field-media' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+                echo '</li>';
+
+                echo '<li>';
+                echo '<a href="javascript:void(0);" class="button deletion redux-slides-remove">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>';
+                echo '</li>';
+
+                echo '</ul>';
+                echo '</div>';
+                echo '</fieldset>';
+                echo '</div>';
+            }
+
+            echo '</div>';
+
+            // translators:  Content title for accordion.
+            echo '<a href="javascript:void(0);" class="button redux-slides-add button-primary" rel-id="' . esc_attr( $this->field['id'] ) . '-ul" rel-name="' . esc_attr( $this->field['name'] . '[title][]' . $this->field['name_suffix'] ) . '">' . esc_html( sprintf( __( 'Add %s', 'redux-framework' ), esc_html( $this->field['content_title'] ) ) ) . '</a>';
+            echo '<br/>';
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( function_exists( 'wp_enqueue_media' ) ) {
+                wp_enqueue_media();
+            } else {
+                wp_enqueue_script( 'media-upload' );
+            }
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style( 'redux-field-media' );
+
+                wp_enqueue_style(
+                    'redux-field-slides',
+                    Redux_Core::$url . 'inc/fields/slides/redux-slides.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+
+            wp_enqueue_script(
+                'redux-field-media',
+                Redux_Core::$url . 'assets/js/media/media' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            wp_enqueue_script(
+                'redux-field-slides',
+                Redux_Core::$url . 'inc/fields/slides/redux-slides' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'jquery-ui-core', 'jquery-ui-accordion', 'jquery-ui-sortable', 'redux-field-media' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Slides', 'ReduxFramework_Slides' );

redux-core/inc/fields/select_image/class-redux-select-image.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 						data-placeholder="' . esc_attr( $placeholder ) . '"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"
 						class="redux-select-item redux-select-images ' . esc_attr( $this->field['class'] ) . '"' .
-						$width . ' rows="6"' . esc_attr( $select2_data ) . '>';  // phpcs:ignore WordPress.Security.EscapeOutput
+						$width . ' rows="6"' . esc_attr( $select2_data ) . '>'; // phpcs:ignore WordPress.Security.EscapeOutput
 
 				echo '<option></option>';
 

Indentation +159 added lines, -159 removed lines

@@ -12,169 +12,169 @@
 
 if ( ! class_exists( 'Redux_Select_Image', false ) ) {
 
-	/**
-	 * Class Redux_Select_Image
-	 */
-	class Redux_Select_Image extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'options'     => array(),
-				'placeholder' => esc_html__( 'Select an item', 'redux-framework' ),
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-
-			// If options is NOT empty, the process.
-			if ( ! empty( $this->field['options'] ) ) {
-
-				// bean counter.
-				$x = 1;
-
-				// Process width.
-				if ( ! empty( $this->field['width'] ) ) {
-					$width = ' style="width:' . esc_attr( $this->field['width'] ) . ';"';
-				} else {
-					$width = ' style="width: 40%;"';
-				}
-
-				// Process placeholder.
-				$placeholder = esc_attr( $this->field['placeholder'] );
-
-				$this->select2_config['allowClear'] = true;
-
-				if ( isset( $this->field['select2'] ) ) {
-					$this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
-				} else {
-					$this->field['select2'] = $this->select2_config;
-				}
-
-				$this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
-
-				$select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
-
-				// Begin the <select> tag.
-				echo '<select
+    /**
+     * Class Redux_Select_Image
+     */
+    class Redux_Select_Image extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'options'     => array(),
+                'placeholder' => esc_html__( 'Select an item', 'redux-framework' ),
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+
+            // If options is NOT empty, the process.
+            if ( ! empty( $this->field['options'] ) ) {
+
+                // bean counter.
+                $x = 1;
+
+                // Process width.
+                if ( ! empty( $this->field['width'] ) ) {
+                    $width = ' style="width:' . esc_attr( $this->field['width'] ) . ';"';
+                } else {
+                    $width = ' style="width: 40%;"';
+                }
+
+                // Process placeholder.
+                $placeholder = esc_attr( $this->field['placeholder'] );
+
+                $this->select2_config['allowClear'] = true;
+
+                if ( isset( $this->field['select2'] ) ) {
+                    $this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
+                } else {
+                    $this->field['select2'] = $this->select2_config;
+                }
+
+                $this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
+
+                $select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
+
+                // Begin the <select> tag.
+                echo '<select
 						data-id="' . esc_attr( $this->field['id'] ) . '"
 						data-placeholder="' . esc_attr( $placeholder ) . '"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"
 						class="redux-select-item redux-select-images ' . esc_attr( $this->field['class'] ) . '"' .
-						$width . ' rows="6"' . esc_attr( $select2_data ) . '>';  // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '<option></option>';
-
-				// Enum through the options array.
-				foreach ( $this->field['options'] as $v ) {
-
-					// No array?  No problem!
-					if ( ! is_array( $v ) ) {
-						$v = array( 'img' => $v );
-					}
-
-					// No title set?  Make it blank.
-					if ( ! isset( $v['title'] ) ) {
-						$v['title'] = '';
-					}
-
-					// No alt?  Set it to title.  We do this so the alt tag shows
-					// something.  It also makes HTML/SEO purists happy.
-					if ( ! isset( $v['alt'] ) ) {
-						$v['alt'] = $v['title'];
-					}
-
-					// Set the selected entry.
-					$selected = selected( $this->value, $v['img'], false );
-
-					// If selected returns something other than a blank space, we
-					// found our default/saved name.  Save the array number in a
-					// variable to use later on when we want to extract its associated
-					// url.
-					if ( '' !== $selected ) {
-						$arr_num = $x;
-					}
-
-					// Add the option tag, with values.
-					echo '<option value="' . esc_url( $v['img'] ) . '" ' . esc_html( $selected ) . '>' . esc_attr( $v['alt'] ) . '</option>';
-
-					// Add a bean.
-					++$x;
-				}
-
-				// Close the <select> tag.
-				echo '</select>';
-
-				// Some space.
-				echo '<br /><br />';
-
-				// Show the preview image.
-				echo '<div>';
-
-				// just in case.  You never know.
-				if ( ! isset( $arr_num ) ) {
-					$this->value = '';
-				}
-
-				// Set the default image.  To get the url from the default name,
-				// we save the array count from the for/each loop, when the default image
-				// is mark as selected.  Since the for/each loop starts at one, we must
-				// subtract one from the saved array number.  We then pull the url
-				// out of the options array, and there we go.
-				if ( '' === $this->value ) {
-					// phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- No image/icon to enqueue.
-					echo '<img src="#" class="redux-preview-image" style="visibility:hidden;" id="image_' . esc_attr( $this->field['id'] ) . '">';
-				} else {
-					// phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- No image/icon to enqueue.
-					echo '<img src=' . esc_url( $this->value ) . ' class="redux-preview-image" id="image_' . esc_attr( $this->field['id'] ) . '">';
-				}
-
-				// Close the <div> tag.
-				echo '</div>';
-			} else {
-
-				// No options specified.  Really?
-				echo '<strong>' . esc_html__( 'No items of this type were found.', 'redux-framework' ) . '</strong>';
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function enqueue() {
-			wp_enqueue_style( 'select2-css' );
-
-			wp_enqueue_script(
-				'redux-field-select-image',
-				Redux_Core::$url . 'inc/fields/select_image/redux-select-image' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'select2-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-select-image',
-					Redux_Core::$url . 'inc/fields/select_image/redux-select-image.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+                        $width . ' rows="6"' . esc_attr( $select2_data ) . '>';  // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '<option></option>';
+
+                // Enum through the options array.
+                foreach ( $this->field['options'] as $v ) {
+
+                    // No array?  No problem!
+                    if ( ! is_array( $v ) ) {
+                        $v = array( 'img' => $v );
+                    }
+
+                    // No title set?  Make it blank.
+                    if ( ! isset( $v['title'] ) ) {
+                        $v['title'] = '';
+                    }
+
+                    // No alt?  Set it to title.  We do this so the alt tag shows
+                    // something.  It also makes HTML/SEO purists happy.
+                    if ( ! isset( $v['alt'] ) ) {
+                        $v['alt'] = $v['title'];
+                    }
+
+                    // Set the selected entry.
+                    $selected = selected( $this->value, $v['img'], false );
+
+                    // If selected returns something other than a blank space, we
+                    // found our default/saved name.  Save the array number in a
+                    // variable to use later on when we want to extract its associated
+                    // url.
+                    if ( '' !== $selected ) {
+                        $arr_num = $x;
+                    }
+
+                    // Add the option tag, with values.
+                    echo '<option value="' . esc_url( $v['img'] ) . '" ' . esc_html( $selected ) . '>' . esc_attr( $v['alt'] ) . '</option>';
+
+                    // Add a bean.
+                    ++$x;
+                }
+
+                // Close the <select> tag.
+                echo '</select>';
+
+                // Some space.
+                echo '<br /><br />';
+
+                // Show the preview image.
+                echo '<div>';
+
+                // just in case.  You never know.
+                if ( ! isset( $arr_num ) ) {
+                    $this->value = '';
+                }
+
+                // Set the default image.  To get the url from the default name,
+                // we save the array count from the for/each loop, when the default image
+                // is mark as selected.  Since the for/each loop starts at one, we must
+                // subtract one from the saved array number.  We then pull the url
+                // out of the options array, and there we go.
+                if ( '' === $this->value ) {
+                    // phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- No image/icon to enqueue.
+                    echo '<img src="#" class="redux-preview-image" style="visibility:hidden;" id="image_' . esc_attr( $this->field['id'] ) . '">';
+                } else {
+                    // phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- No image/icon to enqueue.
+                    echo '<img src=' . esc_url( $this->value ) . ' class="redux-preview-image" id="image_' . esc_attr( $this->field['id'] ) . '">';
+                }
+
+                // Close the <div> tag.
+                echo '</div>';
+            } else {
+
+                // No options specified.  Really?
+                echo '<strong>' . esc_html__( 'No items of this type were found.', 'redux-framework' ) . '</strong>';
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function enqueue() {
+            wp_enqueue_style( 'select2-css' );
+
+            wp_enqueue_script(
+                'redux-field-select-image',
+                Redux_Core::$url . 'inc/fields/select_image/redux-select-image' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'select2-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-select-image',
+                    Redux_Core::$url . 'inc/fields/select_image/redux-select-image.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Select_Image', 'ReduxFramework_Select_Image' );

redux-core/inc/fields/image_select/class-redux-image-select.php

Spacing +7 added lines, -7 removed lines

@@ -94,7 +94,7 @@ 
 
 					$the_value = $k;
 
-					if ( ! empty( $this->field['tiles'] ) && true === (bool) $this->field['tiles'] ) {
+					if ( ! empty( $this->field['tiles'] ) && true === ( bool ) $this->field['tiles'] ) {
 						$the_value = $v['img'];
 					}
 
@@ -123,14 +123,14 @@ 
 							} else {
 								foreach ( $v['presets'] as $pk => $pv ) {
 									if ( isset( $v['merge'] ) && false !== $v['merge'] ) {
-										if ( ( true === $v['merge'] || in_array( $pk, $v['merge'], true ) ) && is_array( $this->parent->options[ $pk ] ) ) {
-											$pv = array_merge( $this->parent->options[ $pk ], $pv );
+										if ( ( true === $v['merge'] || in_array( $pk, $v['merge'], true ) ) && is_array( $this->parent->options[$pk] ) ) {
+											$pv = array_merge( $this->parent->options[$pk], $pv );
 										}
 									}
 
-									if ( empty( $pv ) && isset( $this->parent->options[ $pk ] ) && ! empty( $this->parent->options[ $pk ] ) ) {
+									if ( empty( $pv ) && isset( $this->parent->options[$pk] ) && ! empty( $this->parent->options[$pk] ) ) {
 										$selected = false;
-									} elseif ( ! empty( $pv ) && ! isset( $this->parent->options[ $pk ] ) ) {
+									} elseif ( ! empty( $pv ) && ! isset( $this->parent->options[$pk] ) ) {
 										$selected = false;
 									}
 
@@ -227,10 +227,10 @@ 
 			if ( ! empty( $data ) && ! is_array( $data ) ) {
 				switch ( $mode ) {
 					case 'background-image':
-						if ( isset( $this->field['tiles'] ) && true === (bool) $this->field['tiles'] ) {
+						if ( isset( $this->field['tiles'] ) && true === ( bool ) $this->field['tiles'] ) {
 							$img = $data;
 						} else {
-							$img = $this->field['options'][ $data ]['img'] ?? '';
+							$img = $this->field['options'][$data]['img'] ?? '';
 						}
 
 						if ( '' !== $img ) {

Indentation +237 added lines, -237 removed lines

@@ -12,243 +12,243 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Image_Select', false ) ) {
 
-	/**
-	 * Main Redux_image_select class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Image_Select extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'tiles'   => false,
-				'mode'    => 'background-image',
-				'presets' => false,
-				'options' => array(),
-				'width'   => '',
-				'height'  => '',
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			if ( ! empty( $this->field['options'] ) ) {
-				echo '<div class="redux-table-container">';
-				echo '<ul class="redux-image-select">';
-
-				$x = 1;
-
-				foreach ( $this->field['options'] as $k => $v ) {
-
-					if ( ! is_array( $v ) ) {
-						$v = array( 'img' => $v );
-					}
-
-					if ( ! isset( $v['title'] ) ) {
-						$v['title'] = '';
-					}
-
-					if ( ! isset( $v['alt'] ) ) {
-						$v['alt'] = $v['title'];
-					}
-
-					if ( ! isset( $v['class'] ) ) {
-						$v['class'] = '';
-					}
-
-					$style = '';
-
-					if ( ! empty( $this->field['width'] ) ) {
-						$style .= 'width: ' . $this->field['width'];
-
-						if ( is_numeric( $this->field['width'] ) ) {
-							$style .= 'px';
-						}
-
-						$style .= ';';
-					} else {
-						$style .= ' width: 100%; ';
-					}
-
-					if ( ! empty( $this->field['height'] ) ) {
-						$style .= 'height: ' . $this->field['height'];
-
-						if ( is_numeric( $this->field['height'] ) ) {
-							$style .= 'px';
-						}
-
-						$style .= ';';
-					}
-
-					$the_value = $k;
-
-					if ( ! empty( $this->field['tiles'] ) && true === (bool) $this->field['tiles'] ) {
-						$the_value = $v['img'];
-					}
-
-					$selected = ( '' !== checked( $this->value, $the_value, false ) ) ? ' redux-image-select-selected' : '';
-
-					$presets   = '';
-					$is_preset = false;
-
-					$this->field['class']  = trim( str_replace( 'no-update', '', $this->field['class'] ) );
-					$this->field['class'] .= ' no-update ';
-
-					if ( isset( $this->field['presets'] ) && false !== $this->field['presets'] ) {
-						$this->field['class'] = trim( $this->field['class'] );
-						if ( ! isset( $v['presets'] ) ) {
-							$v['presets'] = array();
-						}
-
-						if ( ! is_array( $v['presets'] ) ) {
-							$v['presets'] = json_decode( $v['presets'], true );
-						}
-
-						// Only highlight the preset if it's the same.
-						if ( $selected ) {
-							if ( empty( $v['presets'] ) ) {
-								$selected = false;
-							} else {
-								foreach ( $v['presets'] as $pk => $pv ) {
-									if ( isset( $v['merge'] ) && false !== $v['merge'] ) {
-										if ( ( true === $v['merge'] || in_array( $pk, $v['merge'], true ) ) && is_array( $this->parent->options[ $pk ] ) ) {
-											$pv = array_merge( $this->parent->options[ $pk ], $pv );
-										}
-									}
-
-									if ( empty( $pv ) && isset( $this->parent->options[ $pk ] ) && ! empty( $this->parent->options[ $pk ] ) ) {
-										$selected = false;
-									} elseif ( ! empty( $pv ) && ! isset( $this->parent->options[ $pk ] ) ) {
-										$selected = false;
-									}
-
-									if ( ! $selected ) { // We're still not using the same preset. Let's unset that shall we?
-										$this->value = '';
-										break;
-									}
-								}
-							}
-						}
-
-						$v['presets']['redux-backup'] = 1;
-
-						$presets   = ' data-presets="' . esc_attr( htmlspecialchars( wp_json_encode( $v['presets'] ), ENT_QUOTES ) ) . '"';
-						$is_preset = true;
-
-						$this->field['class'] = trim( $this->field['class'] ) . ' redux-presets';
-					}
-
-					$is_preset_class = $is_preset ? '-preset-' : ' ';
-
-					$merge = '';
-					if ( isset( $v['merge'] ) && false !== $v['merge'] ) {
-						$merge = is_array( $v['merge'] ) ? implode( '|', $v['merge'] ) : 'true';
-						$merge = ' data-merge="' . esc_attr( htmlspecialchars( $merge, ENT_QUOTES ) ) . '"';
-					}
-
-					echo '<li class="redux-image-select">';
-					echo '<label class="' . esc_attr( $selected ) . ' redux-image-select' . esc_attr( $is_preset_class ) . esc_attr( $this->field['id'] . '_' . $x ) . '" for="' . esc_attr( $this->field['id'] . '_' . ( array_search( $k, array_keys( $this->field['options'] ), true ) + 1 ) ) . '">';
-					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-					echo '<input type="radio" class="' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] . '_' . ( array_search( $k, array_keys( $this->field['options'] ), true ) + 1 ) ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" value="' . esc_attr( $the_value ) . '" ' . checked( $this->value, $the_value, false ) . $presets . $merge . '/>';
-					if ( ! empty( $this->field['tiles'] ) && true === $this->field['tiles'] ) {
-						echo '<span class="tiles ' . esc_attr( $v['class'] ) . '" style="background-image: url(' . esc_url( $v['img'] ) . ');" rel="' . esc_url( $v['img'] ) . '"">&nbsp;</span>';
-					} else {
-						// phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- No image/icon to enqueue.
-						echo '<img src="' . esc_url( $v['img'] ) . '" title="' . esc_attr( $v['alt'] ) . '" alt="' . esc_attr( $v['alt'] ) . '" class="' . esc_attr( $v['class'] ) . '" style="' . esc_attr( $style ) . '"' . esc_attr( $presets ) . esc_attr( $merge ) . ' />';
-					}
-
-					if ( '' !== $v['title'] ) {
-						echo '<br /><span>' . wp_kses_post( ( $v['title'] ) ) . '</span>';
-					}
-
-					echo '</label>';
-					echo '</li>';
-
-					++$x;
-				}
-
-				echo '</ul>';
-				echo '</div>';
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-
-			wp_enqueue_script(
-				'redux-field-image-select',
-				Redux_Core::$url . 'inc/fields/image_select/redux-image-select' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-image-select',
-					Redux_Core::$url . 'inc/fields/image_select/redux-image-select.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Compile CSS data for output.
-		 *
-		 * @param string $data css string.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			$css    = '';
-			$output = '';
-
-			$mode = ( isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'background-image' );
-
-			if ( ! empty( $data ) && ! is_array( $data ) ) {
-				switch ( $mode ) {
-					case 'background-image':
-						if ( isset( $this->field['tiles'] ) && true === (bool) $this->field['tiles'] ) {
-							$img = $data;
-						} else {
-							$img = $this->field['options'][ $data ]['img'] ?? '';
-						}
-
-						if ( '' !== $img ) {
-							$output = "background-image: url('" . esc_url( $img ) . "');";
-						}
-						break;
-
-					default:
-						$output = $mode . ': ' . $data . ';';
-				}
-			}
-
-			$css .= $output;
-
-			return $css;
-		}
-	}
+    /**
+     * Main Redux_image_select class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Image_Select extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'tiles'   => false,
+                'mode'    => 'background-image',
+                'presets' => false,
+                'options' => array(),
+                'width'   => '',
+                'height'  => '',
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            if ( ! empty( $this->field['options'] ) ) {
+                echo '<div class="redux-table-container">';
+                echo '<ul class="redux-image-select">';
+
+                $x = 1;
+
+                foreach ( $this->field['options'] as $k => $v ) {
+
+                    if ( ! is_array( $v ) ) {
+                        $v = array( 'img' => $v );
+                    }
+
+                    if ( ! isset( $v['title'] ) ) {
+                        $v['title'] = '';
+                    }
+
+                    if ( ! isset( $v['alt'] ) ) {
+                        $v['alt'] = $v['title'];
+                    }
+
+                    if ( ! isset( $v['class'] ) ) {
+                        $v['class'] = '';
+                    }
+
+                    $style = '';
+
+                    if ( ! empty( $this->field['width'] ) ) {
+                        $style .= 'width: ' . $this->field['width'];
+
+                        if ( is_numeric( $this->field['width'] ) ) {
+                            $style .= 'px';
+                        }
+
+                        $style .= ';';
+                    } else {
+                        $style .= ' width: 100%; ';
+                    }
+
+                    if ( ! empty( $this->field['height'] ) ) {
+                        $style .= 'height: ' . $this->field['height'];
+
+                        if ( is_numeric( $this->field['height'] ) ) {
+                            $style .= 'px';
+                        }
+
+                        $style .= ';';
+                    }
+
+                    $the_value = $k;
+
+                    if ( ! empty( $this->field['tiles'] ) && true === (bool) $this->field['tiles'] ) {
+                        $the_value = $v['img'];
+                    }
+
+                    $selected = ( '' !== checked( $this->value, $the_value, false ) ) ? ' redux-image-select-selected' : '';
+
+                    $presets   = '';
+                    $is_preset = false;
+
+                    $this->field['class']  = trim( str_replace( 'no-update', '', $this->field['class'] ) );
+                    $this->field['class'] .= ' no-update ';
+
+                    if ( isset( $this->field['presets'] ) && false !== $this->field['presets'] ) {
+                        $this->field['class'] = trim( $this->field['class'] );
+                        if ( ! isset( $v['presets'] ) ) {
+                            $v['presets'] = array();
+                        }
+
+                        if ( ! is_array( $v['presets'] ) ) {
+                            $v['presets'] = json_decode( $v['presets'], true );
+                        }
+
+                        // Only highlight the preset if it's the same.
+                        if ( $selected ) {
+                            if ( empty( $v['presets'] ) ) {
+                                $selected = false;
+                            } else {
+                                foreach ( $v['presets'] as $pk => $pv ) {
+                                    if ( isset( $v['merge'] ) && false !== $v['merge'] ) {
+                                        if ( ( true === $v['merge'] || in_array( $pk, $v['merge'], true ) ) && is_array( $this->parent->options[ $pk ] ) ) {
+                                            $pv = array_merge( $this->parent->options[ $pk ], $pv );
+                                        }
+                                    }
+
+                                    if ( empty( $pv ) && isset( $this->parent->options[ $pk ] ) && ! empty( $this->parent->options[ $pk ] ) ) {
+                                        $selected = false;
+                                    } elseif ( ! empty( $pv ) && ! isset( $this->parent->options[ $pk ] ) ) {
+                                        $selected = false;
+                                    }
+
+                                    if ( ! $selected ) { // We're still not using the same preset. Let's unset that shall we?
+                                        $this->value = '';
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        $v['presets']['redux-backup'] = 1;
+
+                        $presets   = ' data-presets="' . esc_attr( htmlspecialchars( wp_json_encode( $v['presets'] ), ENT_QUOTES ) ) . '"';
+                        $is_preset = true;
+
+                        $this->field['class'] = trim( $this->field['class'] ) . ' redux-presets';
+                    }
+
+                    $is_preset_class = $is_preset ? '-preset-' : ' ';
+
+                    $merge = '';
+                    if ( isset( $v['merge'] ) && false !== $v['merge'] ) {
+                        $merge = is_array( $v['merge'] ) ? implode( '|', $v['merge'] ) : 'true';
+                        $merge = ' data-merge="' . esc_attr( htmlspecialchars( $merge, ENT_QUOTES ) ) . '"';
+                    }
+
+                    echo '<li class="redux-image-select">';
+                    echo '<label class="' . esc_attr( $selected ) . ' redux-image-select' . esc_attr( $is_preset_class ) . esc_attr( $this->field['id'] . '_' . $x ) . '" for="' . esc_attr( $this->field['id'] . '_' . ( array_search( $k, array_keys( $this->field['options'] ), true ) + 1 ) ) . '">';
+                    // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                    echo '<input type="radio" class="' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] . '_' . ( array_search( $k, array_keys( $this->field['options'] ), true ) + 1 ) ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" value="' . esc_attr( $the_value ) . '" ' . checked( $this->value, $the_value, false ) . $presets . $merge . '/>';
+                    if ( ! empty( $this->field['tiles'] ) && true === $this->field['tiles'] ) {
+                        echo '<span class="tiles ' . esc_attr( $v['class'] ) . '" style="background-image: url(' . esc_url( $v['img'] ) . ');" rel="' . esc_url( $v['img'] ) . '"">&nbsp;</span>';
+                    } else {
+                        // phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- No image/icon to enqueue.
+                        echo '<img src="' . esc_url( $v['img'] ) . '" title="' . esc_attr( $v['alt'] ) . '" alt="' . esc_attr( $v['alt'] ) . '" class="' . esc_attr( $v['class'] ) . '" style="' . esc_attr( $style ) . '"' . esc_attr( $presets ) . esc_attr( $merge ) . ' />';
+                    }
+
+                    if ( '' !== $v['title'] ) {
+                        echo '<br /><span>' . wp_kses_post( ( $v['title'] ) ) . '</span>';
+                    }
+
+                    echo '</label>';
+                    echo '</li>';
+
+                    ++$x;
+                }
+
+                echo '</ul>';
+                echo '</div>';
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+
+            wp_enqueue_script(
+                'redux-field-image-select',
+                Redux_Core::$url . 'inc/fields/image_select/redux-image-select' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-image-select',
+                    Redux_Core::$url . 'inc/fields/image_select/redux-image-select.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Compile CSS data for output.
+         *
+         * @param string $data css string.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            $css    = '';
+            $output = '';
+
+            $mode = ( isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'background-image' );
+
+            if ( ! empty( $data ) && ! is_array( $data ) ) {
+                switch ( $mode ) {
+                    case 'background-image':
+                        if ( isset( $this->field['tiles'] ) && true === (bool) $this->field['tiles'] ) {
+                            $img = $data;
+                        } else {
+                            $img = $this->field['options'][ $data ]['img'] ?? '';
+                        }
+
+                        if ( '' !== $img ) {
+                            $output = "background-image: url('" . esc_url( $img ) . "');";
+                        }
+                        break;
+
+                    default:
+                        $output = $mode . ': ' . $data . ';';
+                }
+            }
+
+            $css .= $output;
+
+            return $css;
+        }
+    }
 }
 
 class_alias( 'Redux_Image_Select', 'ReduxFramework_Image_Select' );

redux-core/inc/fields/color_rgba/class-redux-color-rgba.php

Indentation +212 added lines, -212 removed lines

@@ -12,67 +12,67 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Color_Rgba', false ) ) {
 
-	/**
-	 * Main Redux_color_rgba class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Color_Rgba extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'color' => '',
-				'alpha' => 1,
-				'rgba'  => '',
-			);
-
-			$option_defaults = array(
-				'show_input'             => true,
-				'show_initial'           => false,
-				'show_alpha'             => true,
-				'show_palette'           => false,
-				'show_palette_only'      => false,
-				'max_palette_size'       => 10,
-				'show_selection_palette' => false,
-				'allow_empty'            => true,
-				'clickout_fires_change'  => false,
-				'choose_text'            => esc_html__( 'Choose', 'redux-framework' ),
-				'cancel_text'            => esc_html__( 'Cancel', 'redux-framework' ),
-				'show_buttons'           => true,
-				'input_text'             => esc_html__( 'Select Color', 'redux-framework' ),
-				'palette'                => null,
-			);
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-
-			if ( isset( $this->field ) && ! is_array( $this->field ) ) {
-				return;
-			}
-
-			$this->field['options'] = isset( $this->field['options'] ) ? wp_parse_args( $this->field['options'], $option_defaults ) : $option_defaults;
-
-			// Convert an empty array to null, if there.
-			$this->field['options']['palette'] = empty( $this->field['options']['palette'] ) ? null : $this->field['options']['palette'];
-
-			$this->field['output_transparent'] = $this->field['output_transparent'] ?? false;
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			$field_id = $this->field['id'];
-
-			// Color picker container.
-			echo '<div
+    /**
+     * Main Redux_color_rgba class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Color_Rgba extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'color' => '',
+                'alpha' => 1,
+                'rgba'  => '',
+            );
+
+            $option_defaults = array(
+                'show_input'             => true,
+                'show_initial'           => false,
+                'show_alpha'             => true,
+                'show_palette'           => false,
+                'show_palette_only'      => false,
+                'max_palette_size'       => 10,
+                'show_selection_palette' => false,
+                'allow_empty'            => true,
+                'clickout_fires_change'  => false,
+                'choose_text'            => esc_html__( 'Choose', 'redux-framework' ),
+                'cancel_text'            => esc_html__( 'Cancel', 'redux-framework' ),
+                'show_buttons'           => true,
+                'input_text'             => esc_html__( 'Select Color', 'redux-framework' ),
+                'palette'                => null,
+            );
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+
+            if ( isset( $this->field ) && ! is_array( $this->field ) ) {
+                return;
+            }
+
+            $this->field['options'] = isset( $this->field['options'] ) ? wp_parse_args( $this->field['options'], $option_defaults ) : $option_defaults;
+
+            // Convert an empty array to null, if there.
+            $this->field['options']['palette'] = empty( $this->field['options']['palette'] ) ? null : $this->field['options']['palette'];
+
+            $this->field['output_transparent'] = $this->field['output_transparent'] ?? false;
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            $field_id = $this->field['id'];
+
+            // Color picker container.
+            echo '<div
                   class="redux-color-rgba-container ' . esc_attr( $this->field['class'] ) . '"
                   data-id="' . esc_attr( $field_id ) . '"
                   data-show-input="' . esc_attr( $this->field['options']['show_input'] ) . '"
@@ -91,18 +91,18 @@ 
                   data-palette="' . rawurlencode( wp_json_encode( $this->field['options']['palette'] ) ) . '"
               >';
 
-			// Colour picker layout.
-			if ( '' === $this->value['color'] || 'transparent' === $this->value['color'] ) {
-				$color = '';
-			} else {
-				$color = Redux_Helpers::hex2rgba( $this->value['color'], $this->value['alpha'] );
-			}
+            // Colour picker layout.
+            if ( '' === $this->value['color'] || 'transparent' === $this->value['color'] ) {
+                $color = '';
+            } else {
+                $color = Redux_Helpers::hex2rgba( $this->value['color'], $this->value['alpha'] );
+            }
 
-			if ( '' === $this->value['rgba'] && '' !== $this->value['color'] ) {
-				$this->value['rgba'] = Redux_Helpers::hex2rgba( $this->value['color'], $this->value['alpha'] );
-			}
+            if ( '' === $this->value['rgba'] && '' !== $this->value['color'] ) {
+                $this->value['rgba'] = Redux_Helpers::hex2rgba( $this->value['color'], $this->value['alpha'] );
+            }
 
-			echo '<input
+            echo '<input
                     name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[color]"
                     id="' . esc_attr( $field_id ) . '-color-display"
                     class="redux-color-rgba"
@@ -115,7 +115,7 @@ 
                     data-output-transparent="' . esc_attr( $this->field['output_transparent'] ) . '"
                   />';
 
-			echo '<input
+            echo '<input
                     type="hidden"
                     class="redux-hidden-color"
                     data-id="' . esc_attr( $field_id ) . '-color"
@@ -123,8 +123,8 @@ 
                     value="' . esc_attr( $this->value['color'] ) . '"
                   />';
 
-			// Hidden input for alpha channel.
-			echo '<input
+            // Hidden input for alpha channel.
+            echo '<input
                     type="hidden"
                     class="redux-hidden-alpha"
                     data-id="' . esc_attr( $field_id ) . '-alpha"
@@ -133,8 +133,8 @@ 
                     value="' . esc_attr( $this->value['alpha'] ) . '"
                   />';
 
-			// Hidden input for rgba.
-			echo '<input
+            // Hidden input for rgba.
+            echo '<input
                     type="hidden"
                     class="redux-hidden-rgba"
                     data-id="' . esc_attr( $field_id ) . '-rgba"
@@ -143,142 +143,142 @@ 
                     value="' . esc_attr( $this->value['rgba'] ) . '"
                   />';
 
-			echo '</div>';
-		}
-
-		/**
-		 * 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() {
-
-			// Set up min files for dev_mode = false.
-			$min = Redux_Functions::is_min();
-
-			// Field dependent JS.
-			wp_enqueue_script(
-				'redux-field-color-rgba',
-				Redux_Core::$url . 'inc/fields/color_rgba/redux-color-rgba' . $min . '.js',
-				array( 'jquery', 'redux-spectrum-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			// Spectrum CSS.
-			if ( ! wp_style_is( 'redux-spectrum-css' ) ) {
-				wp_enqueue_style( 'redux-spectrum-css' );
-			}
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-color-rgba',
-					Redux_Core::$url . 'inc/fields/color_rgba/redux-color-rgba.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * -> getColorVal.  Returns formatted color val in hex or rgba.
-		 * If this field requires any scripts or css, define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      private
-		 * @return      string
-		 */
-		private function get_color_val(): string {
-
-			// No notices.
-			$color = '';
-			$alpha = 1;
-			$rgba  = '';
-
-			// Must be an array.
-			if ( is_array( $this->value ) ) {
-
-				// Enum array to parse values.
-				foreach ( $this->value as $id => $val ) {
-
-					// Sanitize alpha.
-					if ( 'alpha' === $id ) {
-						$alpha = is_numeric( $val ) ? $val : 1;
-					} elseif ( 'color' === $id ) {
-						$color = ! empty( $val ) ? $val : '';
-					} elseif ( 'rgba' === $id ) {
-						$rgba = Redux_Helpers::hex2rgba( $color, $alpha );
-					}
-				}
-
-				// Only build rgba output if alpha ia less than 1.
-				if ( $alpha < 1 && '' !== $alpha ) {
-					$color = $rgba;
-				}
-			}
-
-			return $color;
-		}
-
-		/**
-		 * Generate CSS style.
-		 *
-		 * @param string $data Field data.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			return '';
-		}
-
-		/**
-		 * Output Function.
-		 * Used to enqueue to the front-end
-		 *
-		 * @since   1.0.0
-		 * @access  public
-		 *
-		 * @param   string|null|array $style css data.
-		 *
-		 * @return  void
-		 */
-		public function output( $style = '' ) {
-			if ( ! empty( $this->value ) ) {
-				$mode = ( isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'color' );
-
-				$color_val = $this->get_color_val();
-
-				$style = $mode . ':' . $color_val . ';';
-
-				if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
-					if ( ! empty( $color_val ) ) {
-						$css                      = Redux_Functions::parse_css( $this->field['output'], $style, $color_val );
-						$this->parent->outputCSS .= esc_attr( $css );
-					}
-				}
-
-				if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
-					if ( ! empty( $color_val ) ) {
-						$css                        = Redux_Functions::parse_css( $this->field['compiler'], $style, $color_val );
-						$this->parent->compilerCSS .= esc_attr( $css );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+            echo '</div>';
+        }
+
+        /**
+         * 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() {
+
+            // Set up min files for dev_mode = false.
+            $min = Redux_Functions::is_min();
+
+            // Field dependent JS.
+            wp_enqueue_script(
+                'redux-field-color-rgba',
+                Redux_Core::$url . 'inc/fields/color_rgba/redux-color-rgba' . $min . '.js',
+                array( 'jquery', 'redux-spectrum-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            // Spectrum CSS.
+            if ( ! wp_style_is( 'redux-spectrum-css' ) ) {
+                wp_enqueue_style( 'redux-spectrum-css' );
+            }
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-color-rgba',
+                    Redux_Core::$url . 'inc/fields/color_rgba/redux-color-rgba.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * -> getColorVal.  Returns formatted color val in hex or rgba.
+         * If this field requires any scripts or css, define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      private
+         * @return      string
+         */
+        private function get_color_val(): string {
+
+            // No notices.
+            $color = '';
+            $alpha = 1;
+            $rgba  = '';
+
+            // Must be an array.
+            if ( is_array( $this->value ) ) {
+
+                // Enum array to parse values.
+                foreach ( $this->value as $id => $val ) {
+
+                    // Sanitize alpha.
+                    if ( 'alpha' === $id ) {
+                        $alpha = is_numeric( $val ) ? $val : 1;
+                    } elseif ( 'color' === $id ) {
+                        $color = ! empty( $val ) ? $val : '';
+                    } elseif ( 'rgba' === $id ) {
+                        $rgba = Redux_Helpers::hex2rgba( $color, $alpha );
+                    }
+                }
+
+                // Only build rgba output if alpha ia less than 1.
+                if ( $alpha < 1 && '' !== $alpha ) {
+                    $color = $rgba;
+                }
+            }
+
+            return $color;
+        }
+
+        /**
+         * Generate CSS style.
+         *
+         * @param string $data Field data.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            return '';
+        }
+
+        /**
+         * Output Function.
+         * Used to enqueue to the front-end
+         *
+         * @since   1.0.0
+         * @access  public
+         *
+         * @param   string|null|array $style css data.
+         *
+         * @return  void
+         */
+        public function output( $style = '' ) {
+            if ( ! empty( $this->value ) ) {
+                $mode = ( isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'color' );
+
+                $color_val = $this->get_color_val();
+
+                $style = $mode . ':' . $color_val . ';';
+
+                if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
+                    if ( ! empty( $color_val ) ) {
+                        $css                      = Redux_Functions::parse_css( $this->field['output'], $style, $color_val );
+                        $this->parent->outputCSS .= esc_attr( $css );
+                    }
+                }
+
+                if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
+                    if ( ! empty( $color_val ) ) {
+                        $css                        = Redux_Functions::parse_css( $this->field['compiler'], $style, $color_val );
+                        $this->parent->compilerCSS .= esc_attr( $css );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Color_Rgba', 'ReduxFramework_Color_Rgba' );