reduxframework / redux-framework

redux-core/inc/extensions/customizer/inc/class-redux-customizer-control.php

Indentation +61 added lines, -61 removed lines

@@ -10,40 +10,40 @@ 
 
 if ( ! class_exists( 'Redux_Customizer_Control', false ) ) {
 
-	/**
-	 * Class Redux_Customizer_Control
-	 */
-	class Redux_Customizer_Control extends WP_Customize_Control {
+    /**
+     * Class Redux_Customizer_Control
+     */
+    class Redux_Customizer_Control extends WP_Customize_Control {
 
-		/**
-		 * Redux ID.
-		 *
-		 * @var string
-		 */
-		public string $redux_id = '';
+        /**
+         * Redux ID.
+         *
+         * @var string
+         */
+        public string $redux_id = '';
 
-		/**
-		 * Field render.
-		 */
-		public function render() {
+        /**
+         * Field render.
+         */
+        public function render() {
 
-			$this->redux_id = str_replace( 'customize-control-', '', 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) ) );
-			$class          = 'customize-control redux-group-tab redux-field customize-control-' . $this->type;
-			$opt_name_arr   = explode( '[', $this->id );
-			$opt_name       = $opt_name_arr[0];
-			$field_id       = str_replace( ']', '', $opt_name_arr[1] );
+            $this->redux_id = str_replace( 'customize-control-', '', 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) ) );
+            $class          = 'customize-control redux-group-tab redux-field customize-control-' . $this->type;
+            $opt_name_arr   = explode( '[', $this->id );
+            $opt_name       = $opt_name_arr[0];
+            $field_id       = str_replace( ']', '', $opt_name_arr[1] );
 
-			$section = Redux_Helpers::section_from_field_id( $opt_name, $field_id );
+            $section = Redux_Helpers::section_from_field_id( $opt_name, $field_id );
 
-			if ( isset( $section['disabled'] ) && true === $section['disabled'] ) {
-				$class .= ' disabled';
-			}
+            if ( isset( $section['disabled'] ) && true === $section['disabled'] ) {
+                $class .= ' disabled';
+            }
 
-			if ( isset( $section['hidden'] ) && true === $section['hidden'] ) {
-				$class .= ' hidden';
-			}
+            if ( isset( $section['hidden'] ) && true === $section['hidden'] ) {
+                $class .= ' hidden';
+            }
 
-			?>
+            ?>
 			<li id="<?php echo esc_attr( $this->redux_id ); ?>-li" class="<?php echo esc_attr( $class ); ?>">
 				<?php if ( 'repeater' !== $this->type ) { ?>
 					<input
@@ -57,42 +57,42 @@ 
 				<?php $this->render_content(); ?>
 			</li>
 			<?php
-		}
+        }
 
-		/**
-		 * Render content hook.
-		 */
-		public function render_content() {
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( 'redux/customizer/control/render/' . $this->redux_id, $this );
-		}
+        /**
+         * Render content hook.
+         */
+        public function render_content() {
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( 'redux/customizer/control/render/' . $this->redux_id, $this );
+        }
 
-		/**
-		 * Label output.
-		 */
-		public function label() {
-			// The label has already been sanitized in the Fields class, no need to re-sanitize it.
-			echo( $this->label ); // phpcs:ignore WordPress.Security.EscapeOutput
-		}
+        /**
+         * Label output.
+         */
+        public function label() {
+            // The label has already been sanitized in the Fields class, no need to re-sanitize it.
+            echo( $this->label ); // phpcs:ignore WordPress.Security.EscapeOutput
+        }
 
-		/**
-		 * Description output.
-		 */
-		public function description() {
-			if ( ! empty( $this->description ) ) {
-				// The description has already been sanitized in the Fields class, no need to re-sanitize it.
-				echo '<span class="description customize-control-description">' . esc_html( $this->description ) . '</span>';
-			}
-		}
+        /**
+         * Description output.
+         */
+        public function description() {
+            if ( ! empty( $this->description ) ) {
+                // The description has already been sanitized in the Fields class, no need to re-sanitize it.
+                echo '<span class="description customize-control-description">' . esc_html( $this->description ) . '</span>';
+            }
+        }
 
-		/**
-		 * Title output.
-		 */
-		public function title() {
-			echo '<span class="customize-control-title">';
-			$this->label();
-			$this->description();
-			echo '</span>';
-		}
-	}
+        /**
+         * Title output.
+         */
+        public function title() {
+            echo '<span class="customize-control-title">';
+            $this->label();
+            $this->description();
+            echo '</span>';
+        }
+    }
 }

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

Indentation +423 added lines, -423 removed lines

@@ -12,429 +12,429 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Background', false ) ) {
 
-	/**
-	 * Main Redux_background class
-	 *
-	 * @since       3.1.5
-	 */
-	class Redux_Background extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'background-color'      => true,
-				'background-repeat'     => true,
-				'background-attachment' => true,
-				'background-position'   => true,
-				'background-image'      => true,
-				'background-gradient'   => false,
-				'background-clip'       => false,
-				'background-origin'     => false,
-				'background-size'       => true,
-				'preview_media'         => false,
-				'preview'               => true,
-				'preview_height'        => '200px',
-				'transparent'           => true,
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			// No errors please.
-			$defaults = array(
-				'background-color'      => '',
-				'background-repeat'     => '',
-				'background-attachment' => '',
-				'background-position'   => '',
-				'background-image'      => '',
-				'background-clip'       => '',
-				'background-origin'     => '',
-				'background-size'       => '',
-				'media'                 => array(),
-			);
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-
-			$defaults = array(
-				'id'        => '',
-				'width'     => '',
-				'height'    => '',
-				'thumbnail' => '',
-			);
-
-			$this->value['media'] = wp_parse_args( $this->value['media'], $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() {
-			$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'] );
-
-			if ( true === $this->field['background-color'] ) {
-				if ( isset( $this->value['color'] ) && empty( $this->value['background-color'] ) ) {
-					$this->value['background-color'] = $this->value['color'];
-				}
-
-				$def_bg_color = $this->field['default']['background-color'] ?? '';
-
-				echo '<input ';
-				echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
-				echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-color]"';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-color"';
-				echo 'class="color-picker redux-color redux-background-input redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text" value="' . esc_attr( $this->value['background-color'] ) . '"';
-				echo 'data-default-color="' . esc_attr( $def_bg_color ) . '"';
-
-				$data = array(
-					'field' => $this->field,
-					'index' => 'color',
-				);
-
-				echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-
-				echo '>';
-
-				echo '<input type="hidden" class="redux-saved-color" id="' . esc_attr( $this->field['id'] ) . '-saved-color" value="">';
-
-				if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
-					$is_checked = '';
-					if ( 'transparent' === $this->value['background-color'] ) {
-						$is_checked = ' checked="checked"';
-					}
-					echo '<label for="' . esc_attr( $this->field['id'] ) . '-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency redux-background-input ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '-transparency" data-id="' . esc_attr( $this->field['id'] ) . '-color" value="1" ' . esc_html( $is_checked ) . '> ' . esc_html__( 'Transparent', 'redux-framework' ) . '</label>';
-				}
-
-				if ( true === $this->field['background-repeat'] || true === $this->field['background-position'] || true === $this->field['background-attachment'] ) {
-					echo '<br />';
-				}
-			}
-
-			if ( true === $this->field['background-repeat'] ) {
-				$array = array(
-					'no-repeat' => esc_html__( 'No Repeat', 'redux-framework' ),
-					'repeat'    => esc_html__( 'Repeat All', 'redux-framework' ),
-					'repeat-x'  => esc_html__( 'Repeat Horizontally', 'redux-framework' ),
-					'repeat-y'  => esc_html__( 'Repeat Vertically', 'redux-framework' ),
-					'inherit'   => esc_html__( 'Inherit', 'redux-framework' ),
-				);
-
-				echo '<select id="' . esc_attr( $this->field['id'] ) . '-repeat-select" data-placeholder="' . esc_html__( 'Background Repeat', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-repeat]" class="redux-select-item redux-background-input redux-background-repeat ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
-				echo '<option></option>';
-
-				foreach ( $array as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-repeat'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			}
-
-			if ( true === $this->field['background-clip'] ) {
-				$array = array(
-					'inherit'     => esc_html__( 'Inherit', 'redux-framework' ),
-					'border-box'  => esc_html__( 'Border Box', 'redux-framework' ),
-					'content-box' => esc_html__( 'Content Box', 'redux-framework' ),
-					'padding-box' => esc_html__( 'Padding Box', 'redux-framework' ),
-				);
-
-				echo '<select id="' . esc_attr( $this->field['id'] ) . '-clip-select" data-placeholder="' . esc_html__( 'Background Clip', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-clip]" class="redux-select-item redux-background-input redux-background-clip ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
-				echo '<option></option>';
-
-				foreach ( $array as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-clip'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			}
-
-			if ( true === $this->field['background-origin'] ) {
-				$array = array(
-					'inherit'     => esc_html__( 'Inherit', 'redux-framework' ),
-					'border-box'  => esc_html__( 'Border Box', 'redux-framework' ),
-					'content-box' => esc_html__( 'Content Box', 'redux-framework' ),
-					'padding-box' => esc_html__( 'Padding Box', 'redux-framework' ),
-				);
-
-				echo '<select id="' . esc_attr( $this->field['id'] ) . '-origin-select" data-placeholder="' . esc_html__( 'Background Origin', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-origin]" class="redux-select-item redux-background-input redux-background-origin ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
-				echo '<option></option>';
-
-				foreach ( $array as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-origin'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			}
-
-			if ( true === $this->field['background-size'] ) {
-				$array = array(
-					'inherit' => esc_html__( 'Inherit', 'redux-framework' ),
-					'cover'   => esc_html__( 'Cover', 'redux-framework' ),
-					'contain' => esc_html__( 'Contain', 'redux-framework' ),
-				);
-
-				echo '<select id="' . esc_attr( $this->field['id'] ) . '-size-select" data-placeholder="' . esc_html__( 'Background Size', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-size]" class="redux-select-item redux-background-input redux-background-size ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
-				echo '<option></option>';
-
-				foreach ( $array as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-size'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			}
-
-			if ( true === $this->field['background-attachment'] ) {
-				$array = array(
-					'fixed'   => esc_html__( 'Fixed', 'redux-framework' ),
-					'scroll'  => esc_html__( 'Scroll', 'redux-framework' ),
-					'inherit' => esc_html__( 'Inherit', 'redux-framework' ),
-				);
-
-				echo '<select id="' . esc_attr( $this->field['id'] ) . '-attachment-select" data-placeholder="' . esc_html__( 'Background Attachment', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-attachment]" class="redux-select-item redux-background-input redux-background-attachment ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
-				echo '<option></option>';
-
-				foreach ( $array as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-attachment'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			}
-
-			if ( true === $this->field['background-position'] ) {
-				$array = array(
-					'left top'      => esc_html__( 'Left Top', 'redux-framework' ),
-					'left center'   => esc_html__( 'Left center', 'redux-framework' ),
-					'left bottom'   => esc_html__( 'Left Bottom', 'redux-framework' ),
-					'center top'    => esc_html__( 'Center Top', 'redux-framework' ),
-					'center center' => esc_html__( 'Center Center', 'redux-framework' ),
-					'center bottom' => esc_html__( 'Center Bottom', 'redux-framework' ),
-					'right top'     => esc_html__( 'Right Top', 'redux-framework' ),
-					'right center'  => esc_html__( 'Right center', 'redux-framework' ),
-					'right bottom'  => esc_html__( 'Right Bottom', 'redux-framework' ),
-				);
-
-				echo '<select id="' . esc_attr( $this->field['id'] ) . '-position-select" data-placeholder="' . esc_html__( 'Background Position', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-position]" class="redux-select-item redux-background-input redux-background-position ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
-				echo '<option></option>';
-
-				foreach ( $array as $k => $v ) {
-					echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-position'], $k, false ) . '>' . esc_html( $v ) . '</option>';
-				}
-
-				echo '</select>';
-			}
-
-			if ( $this->field['background-image'] ) {
-				echo '<br />';
-
-				if ( empty( $this->value ) && ! empty( $this->field['default'] ) ) {
-					if ( is_array( $this->field['default'] ) ) {
-						if ( ! empty( $this->field['default']['media']['id'] ) ) {
-							$this->value['media']['id'] = $this->field['default']['media']['id'];
-						} elseif ( ! empty( $this->field['default']['id'] ) ) {
-							$this->value['media']['id'] = $this->field['default']['id'];
-						}
-
-						if ( ! empty( $this->field['default']['url'] ) ) {
-							$this->value['background-image'] = $this->field['default']['url'];
-						} elseif ( ! empty( $this->field['default']['media']['url'] ) ) {
-							$this->value['background-image'] = $this->field['default']['media']['url'];
-						} elseif ( ! empty( $this->field['default']['background-image'] ) ) {
-							$this->value['background-image'] = $this->field['default']['background-image'];
-						}
-					} elseif ( is_numeric( $this->field['default'] ) ) {
-						// Check if it's an attachment ID.
-							$this->value['media']['id'] = $this->field['default'];
-					} else { // Must be a URL.
-						$this->value['background-image'] = $this->field['default'];
-					}
-				}
-
-				if ( empty( $this->value['background-image'] ) && ! empty( $this->value['media']['id'] ) ) {
-					$img                             = wp_get_attachment_image_src( $this->value['media']['id'], 'full' );
-					$this->value['background-image'] = $img[0];
-					$this->value['media']['width']   = $img[1];
-					$this->value['media']['height']  = $img[2];
-				}
-
-				$hide = 'hide ';
-
-				if ( ( isset( $this->field['preview_media'] ) && false === $this->field['preview_media'] ) ) {
-					$this->field['class'] .= ' noPreview';
-				}
-
-				if ( ( ! empty( $this->field['background-image'] ) && true === $this->field['background-image'] ) || ( isset( $this->field['preview'] ) && false === $this->field['preview'] ) ) {
-					$hide = '';
-				}
-
-				$placeholder = $this->field['placeholder'] ?? esc_html__( 'No media selected', 'redux-framework' );
-
-				echo '<input placeholder="' . esc_html( $placeholder ) . '" type="text" class="redux-background-input ' . esc_attr( $hide ) . 'upload ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-image]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][background-image]" value="' . esc_url( $this->value['background-image'] ) . '" />';
-				echo '<input type="hidden" class="upload-id ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][id]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][id]" value="' . esc_attr( $this->value['media']['id'] ) . '" />';
-				echo '<input type="hidden" class="upload-height" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][height]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][height]" value="' . esc_attr( $this->value['media']['height'] ) . '" />';
-				echo '<input type="hidden" class="upload-width" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][width]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][width]" value="' . esc_attr( $this->value['media']['width'] ) . '" />';
-				echo '<input type="hidden" class="upload-thumbnail" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][thumbnail]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][thumbnail]" value="' . esc_url( $this->value['media']['thumbnail'] ) . '" />';
-
-				// Preview.
-				$hide = '';
-
-				if ( ( isset( $this->field['preview_media'] ) && false === $this->field['preview_media'] ) || empty( $this->value['background-image'] ) ) {
-					$hide = 'hide ';
-				}
-
-				if ( empty( $this->value['media']['thumbnail'] ) && ! empty( $this->value['background-image'] ) ) { // Just in case.
-					if ( ! empty( $this->value['media']['id'] ) ) {
-						$image = wp_get_attachment_image_src(
-							$this->value['media']['id'],
-							array(
-								150,
-								150,
-							)
-						);
-
-						$this->value['media']['thumbnail'] = $image[0];
-					} else {
-						$this->value['media']['thumbnail'] = $this->value['background-image'];
-					}
-				}
-
-				echo '<div class="' . esc_attr( $hide ) . 'screenshot">';
-				echo '<a class="of-uploaded-image" href="' . esc_url( $this->value['background-image'] ) . '" target="_blank">';
-
-				$alt = wp_prepare_attachment_for_js( $this->value['media']['id'] );
-				$alt = $alt['alt'] ?? '';
-
-				echo '<img class="redux-option-image" id="image_' . esc_attr( $this->value['media']['id'] ) . '" src="' . esc_url( $this->value['media']['thumbnail'] ) . '" alt="' . esc_attr( $alt ) . '" target="_blank" rel="external" />';
-				echo '</a>';
-				echo '</div>';
-
-				// Upload controls DIV.
-				echo '<div class="upload_button_div">';
-
-				// If the user has WP3.5+ show upload/remove button.
-				echo '<span class="button redux-background-upload" id="' . esc_attr( $this->field['id'] ) . '-media">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
-
-				$hide = '';
-				if ( empty( $this->value['background-image'] ) || '' === $this->value['background-image'] ) {
-					$hide = ' hide';
-				}
-
-				echo '<span class="button removeCSS redux-remove-background' . esc_attr( $hide ) . '" id="reset_' . esc_attr( $this->field['id'] ) . '" rel="' . esc_attr( $this->field['id'] ) . '">' . esc_html__( 'Remove', 'redux-framework' ) . '</span>';
-
-				echo '</div>';
-			}
-
-			/**
-			 * Preview
-			 * */
-			if ( ! isset( $this->field['preview'] ) || false !== $this->field['preview'] ) {
-				$css = $this->css_style( $this->value );
-
-				$is_bg = strpos( $css, 'background-image' );
-
-				if ( empty( $css ) || ! $is_bg ) {
-					$css = 'display:none;';
-				}
-
-				$css .= 'height: ' . esc_attr( $this->field['preview_height'] ) . ';';
-				echo '<p class="clear ' . esc_attr( $this->field['id'] ) . '_previewer background-preview" style="' . esc_attr( $css ) . '">&nbsp;</p>';
-			}
-		}
-
-		/**
-		 * 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();
-			} elseif ( ! wp_script_is( 'media-upload' ) ) {
-				wp_enqueue_script( 'media-upload' );
-			}
-
-			if ( ! wp_style_is( 'select2-css' ) ) {
-				wp_enqueue_style( 'select2-css' );
-			}
-
-			if ( ! wp_style_is( 'wp-color-picker' ) ) {
-				wp_enqueue_style( 'wp-color-picker' );
-			}
-
-			$dep_array = array( 'jquery', 'wp-color-picker', 'select2-js', 'redux-js' );
-
-			wp_enqueue_script(
-				'redux-field-background',
-				Redux_Core::$url . 'inc/fields/background/redux-background' . Redux_Functions::is_min() . '.js',
-				$dep_array,
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-background',
-					Redux_Core::$url . 'inc/fields/background/redux-background.css',
-					array(),
-					$this->timestamp
-				);
-
-				wp_enqueue_style( 'redux-color-picker' );
-			}
-		}
-
-		/**
-		 * Output CSS styling.
-		 *
-		 * @param array $data Value array.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data = array() ): string {
-			$css = '';
-
-			if ( ! empty( $data ) && is_array( $data ) ) {
-				foreach ( $data as $key => $val ) {
-					if ( ! empty( $val ) && 'media' !== $key ) {
-						if ( 'background-image' === $key ) {
-							$css .= $key . ":url('" . esc_url( $val ) . "');";
-						} else {
-							$css .= $key . ':' . esc_attr( $val ) . ';';
-						}
-					}
-				}
-			}
-
-			return $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.
-		}
-	}
+    /**
+     * Main Redux_background class
+     *
+     * @since       3.1.5
+     */
+    class Redux_Background extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'background-color'      => true,
+                'background-repeat'     => true,
+                'background-attachment' => true,
+                'background-position'   => true,
+                'background-image'      => true,
+                'background-gradient'   => false,
+                'background-clip'       => false,
+                'background-origin'     => false,
+                'background-size'       => true,
+                'preview_media'         => false,
+                'preview'               => true,
+                'preview_height'        => '200px',
+                'transparent'           => true,
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            // No errors please.
+            $defaults = array(
+                'background-color'      => '',
+                'background-repeat'     => '',
+                'background-attachment' => '',
+                'background-position'   => '',
+                'background-image'      => '',
+                'background-clip'       => '',
+                'background-origin'     => '',
+                'background-size'       => '',
+                'media'                 => array(),
+            );
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+
+            $defaults = array(
+                'id'        => '',
+                'width'     => '',
+                'height'    => '',
+                'thumbnail' => '',
+            );
+
+            $this->value['media'] = wp_parse_args( $this->value['media'], $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() {
+            $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'] );
+
+            if ( true === $this->field['background-color'] ) {
+                if ( isset( $this->value['color'] ) && empty( $this->value['background-color'] ) ) {
+                    $this->value['background-color'] = $this->value['color'];
+                }
+
+                $def_bg_color = $this->field['default']['background-color'] ?? '';
+
+                echo '<input ';
+                echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
+                echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-color]"';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-color"';
+                echo 'class="color-picker redux-color redux-background-input redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text" value="' . esc_attr( $this->value['background-color'] ) . '"';
+                echo 'data-default-color="' . esc_attr( $def_bg_color ) . '"';
+
+                $data = array(
+                    'field' => $this->field,
+                    'index' => 'color',
+                );
+
+                echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+                echo '>';
+
+                echo '<input type="hidden" class="redux-saved-color" id="' . esc_attr( $this->field['id'] ) . '-saved-color" value="">';
+
+                if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
+                    $is_checked = '';
+                    if ( 'transparent' === $this->value['background-color'] ) {
+                        $is_checked = ' checked="checked"';
+                    }
+                    echo '<label for="' . esc_attr( $this->field['id'] ) . '-transparency" class="color-transparency-check"><input type="checkbox" class="checkbox color-transparency redux-background-input ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '-transparency" data-id="' . esc_attr( $this->field['id'] ) . '-color" value="1" ' . esc_html( $is_checked ) . '> ' . esc_html__( 'Transparent', 'redux-framework' ) . '</label>';
+                }
+
+                if ( true === $this->field['background-repeat'] || true === $this->field['background-position'] || true === $this->field['background-attachment'] ) {
+                    echo '<br />';
+                }
+            }
+
+            if ( true === $this->field['background-repeat'] ) {
+                $array = array(
+                    'no-repeat' => esc_html__( 'No Repeat', 'redux-framework' ),
+                    'repeat'    => esc_html__( 'Repeat All', 'redux-framework' ),
+                    'repeat-x'  => esc_html__( 'Repeat Horizontally', 'redux-framework' ),
+                    'repeat-y'  => esc_html__( 'Repeat Vertically', 'redux-framework' ),
+                    'inherit'   => esc_html__( 'Inherit', 'redux-framework' ),
+                );
+
+                echo '<select id="' . esc_attr( $this->field['id'] ) . '-repeat-select" data-placeholder="' . esc_html__( 'Background Repeat', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-repeat]" class="redux-select-item redux-background-input redux-background-repeat ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
+                echo '<option></option>';
+
+                foreach ( $array as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-repeat'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            }
+
+            if ( true === $this->field['background-clip'] ) {
+                $array = array(
+                    'inherit'     => esc_html__( 'Inherit', 'redux-framework' ),
+                    'border-box'  => esc_html__( 'Border Box', 'redux-framework' ),
+                    'content-box' => esc_html__( 'Content Box', 'redux-framework' ),
+                    'padding-box' => esc_html__( 'Padding Box', 'redux-framework' ),
+                );
+
+                echo '<select id="' . esc_attr( $this->field['id'] ) . '-clip-select" data-placeholder="' . esc_html__( 'Background Clip', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-clip]" class="redux-select-item redux-background-input redux-background-clip ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
+                echo '<option></option>';
+
+                foreach ( $array as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-clip'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            }
+
+            if ( true === $this->field['background-origin'] ) {
+                $array = array(
+                    'inherit'     => esc_html__( 'Inherit', 'redux-framework' ),
+                    'border-box'  => esc_html__( 'Border Box', 'redux-framework' ),
+                    'content-box' => esc_html__( 'Content Box', 'redux-framework' ),
+                    'padding-box' => esc_html__( 'Padding Box', 'redux-framework' ),
+                );
+
+                echo '<select id="' . esc_attr( $this->field['id'] ) . '-origin-select" data-placeholder="' . esc_html__( 'Background Origin', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-origin]" class="redux-select-item redux-background-input redux-background-origin ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
+                echo '<option></option>';
+
+                foreach ( $array as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-origin'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            }
+
+            if ( true === $this->field['background-size'] ) {
+                $array = array(
+                    'inherit' => esc_html__( 'Inherit', 'redux-framework' ),
+                    'cover'   => esc_html__( 'Cover', 'redux-framework' ),
+                    'contain' => esc_html__( 'Contain', 'redux-framework' ),
+                );
+
+                echo '<select id="' . esc_attr( $this->field['id'] ) . '-size-select" data-placeholder="' . esc_html__( 'Background Size', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-size]" class="redux-select-item redux-background-input redux-background-size ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
+                echo '<option></option>';
+
+                foreach ( $array as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-size'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            }
+
+            if ( true === $this->field['background-attachment'] ) {
+                $array = array(
+                    'fixed'   => esc_html__( 'Fixed', 'redux-framework' ),
+                    'scroll'  => esc_html__( 'Scroll', 'redux-framework' ),
+                    'inherit' => esc_html__( 'Inherit', 'redux-framework' ),
+                );
+
+                echo '<select id="' . esc_attr( $this->field['id'] ) . '-attachment-select" data-placeholder="' . esc_html__( 'Background Attachment', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-attachment]" class="redux-select-item redux-background-input redux-background-attachment ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
+                echo '<option></option>';
+
+                foreach ( $array as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-attachment'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            }
+
+            if ( true === $this->field['background-position'] ) {
+                $array = array(
+                    'left top'      => esc_html__( 'Left Top', 'redux-framework' ),
+                    'left center'   => esc_html__( 'Left center', 'redux-framework' ),
+                    'left bottom'   => esc_html__( 'Left Bottom', 'redux-framework' ),
+                    'center top'    => esc_html__( 'Center Top', 'redux-framework' ),
+                    'center center' => esc_html__( 'Center Center', 'redux-framework' ),
+                    'center bottom' => esc_html__( 'Center Bottom', 'redux-framework' ),
+                    'right top'     => esc_html__( 'Right Top', 'redux-framework' ),
+                    'right center'  => esc_html__( 'Right center', 'redux-framework' ),
+                    'right bottom'  => esc_html__( 'Right Bottom', 'redux-framework' ),
+                );
+
+                echo '<select id="' . esc_attr( $this->field['id'] ) . '-position-select" data-placeholder="' . esc_html__( 'Background Position', 'redux-framework' ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-position]" class="redux-select-item redux-background-input redux-background-position ' . esc_attr( $this->field['class'] ) . '"' . esc_attr( $select2_data ) . '>';
+                echo '<option></option>';
+
+                foreach ( $array as $k => $v ) {
+                    echo '<option value="' . esc_attr( $k ) . '" ' . selected( $this->value['background-position'], $k, false ) . '>' . esc_html( $v ) . '</option>';
+                }
+
+                echo '</select>';
+            }
+
+            if ( $this->field['background-image'] ) {
+                echo '<br />';
+
+                if ( empty( $this->value ) && ! empty( $this->field['default'] ) ) {
+                    if ( is_array( $this->field['default'] ) ) {
+                        if ( ! empty( $this->field['default']['media']['id'] ) ) {
+                            $this->value['media']['id'] = $this->field['default']['media']['id'];
+                        } elseif ( ! empty( $this->field['default']['id'] ) ) {
+                            $this->value['media']['id'] = $this->field['default']['id'];
+                        }
+
+                        if ( ! empty( $this->field['default']['url'] ) ) {
+                            $this->value['background-image'] = $this->field['default']['url'];
+                        } elseif ( ! empty( $this->field['default']['media']['url'] ) ) {
+                            $this->value['background-image'] = $this->field['default']['media']['url'];
+                        } elseif ( ! empty( $this->field['default']['background-image'] ) ) {
+                            $this->value['background-image'] = $this->field['default']['background-image'];
+                        }
+                    } elseif ( is_numeric( $this->field['default'] ) ) {
+                        // Check if it's an attachment ID.
+                            $this->value['media']['id'] = $this->field['default'];
+                    } else { // Must be a URL.
+                        $this->value['background-image'] = $this->field['default'];
+                    }
+                }
+
+                if ( empty( $this->value['background-image'] ) && ! empty( $this->value['media']['id'] ) ) {
+                    $img                             = wp_get_attachment_image_src( $this->value['media']['id'], 'full' );
+                    $this->value['background-image'] = $img[0];
+                    $this->value['media']['width']   = $img[1];
+                    $this->value['media']['height']  = $img[2];
+                }
+
+                $hide = 'hide ';
+
+                if ( ( isset( $this->field['preview_media'] ) && false === $this->field['preview_media'] ) ) {
+                    $this->field['class'] .= ' noPreview';
+                }
+
+                if ( ( ! empty( $this->field['background-image'] ) && true === $this->field['background-image'] ) || ( isset( $this->field['preview'] ) && false === $this->field['preview'] ) ) {
+                    $hide = '';
+                }
+
+                $placeholder = $this->field['placeholder'] ?? esc_html__( 'No media selected', 'redux-framework' );
+
+                echo '<input placeholder="' . esc_html( $placeholder ) . '" type="text" class="redux-background-input ' . esc_attr( $hide ) . 'upload ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[background-image]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][background-image]" value="' . esc_url( $this->value['background-image'] ) . '" />';
+                echo '<input type="hidden" class="upload-id ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][id]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][id]" value="' . esc_attr( $this->value['media']['id'] ) . '" />';
+                echo '<input type="hidden" class="upload-height" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][height]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][height]" value="' . esc_attr( $this->value['media']['height'] ) . '" />';
+                echo '<input type="hidden" class="upload-width" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][width]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][width]" value="' . esc_attr( $this->value['media']['width'] ) . '" />';
+                echo '<input type="hidden" class="upload-thumbnail" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[media][thumbnail]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][media][thumbnail]" value="' . esc_url( $this->value['media']['thumbnail'] ) . '" />';
+
+                // Preview.
+                $hide = '';
+
+                if ( ( isset( $this->field['preview_media'] ) && false === $this->field['preview_media'] ) || empty( $this->value['background-image'] ) ) {
+                    $hide = 'hide ';
+                }
+
+                if ( empty( $this->value['media']['thumbnail'] ) && ! empty( $this->value['background-image'] ) ) { // Just in case.
+                    if ( ! empty( $this->value['media']['id'] ) ) {
+                        $image = wp_get_attachment_image_src(
+                            $this->value['media']['id'],
+                            array(
+                                150,
+                                150,
+                            )
+                        );
+
+                        $this->value['media']['thumbnail'] = $image[0];
+                    } else {
+                        $this->value['media']['thumbnail'] = $this->value['background-image'];
+                    }
+                }
+
+                echo '<div class="' . esc_attr( $hide ) . 'screenshot">';
+                echo '<a class="of-uploaded-image" href="' . esc_url( $this->value['background-image'] ) . '" target="_blank">';
+
+                $alt = wp_prepare_attachment_for_js( $this->value['media']['id'] );
+                $alt = $alt['alt'] ?? '';
+
+                echo '<img class="redux-option-image" id="image_' . esc_attr( $this->value['media']['id'] ) . '" src="' . esc_url( $this->value['media']['thumbnail'] ) . '" alt="' . esc_attr( $alt ) . '" target="_blank" rel="external" />';
+                echo '</a>';
+                echo '</div>';
+
+                // Upload controls DIV.
+                echo '<div class="upload_button_div">';
+
+                // If the user has WP3.5+ show upload/remove button.
+                echo '<span class="button redux-background-upload" id="' . esc_attr( $this->field['id'] ) . '-media">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
+
+                $hide = '';
+                if ( empty( $this->value['background-image'] ) || '' === $this->value['background-image'] ) {
+                    $hide = ' hide';
+                }
+
+                echo '<span class="button removeCSS redux-remove-background' . esc_attr( $hide ) . '" id="reset_' . esc_attr( $this->field['id'] ) . '" rel="' . esc_attr( $this->field['id'] ) . '">' . esc_html__( 'Remove', 'redux-framework' ) . '</span>';
+
+                echo '</div>';
+            }
+
+            /**
+             * Preview
+             * */
+            if ( ! isset( $this->field['preview'] ) || false !== $this->field['preview'] ) {
+                $css = $this->css_style( $this->value );
+
+                $is_bg = strpos( $css, 'background-image' );
+
+                if ( empty( $css ) || ! $is_bg ) {
+                    $css = 'display:none;';
+                }
+
+                $css .= 'height: ' . esc_attr( $this->field['preview_height'] ) . ';';
+                echo '<p class="clear ' . esc_attr( $this->field['id'] ) . '_previewer background-preview" style="' . esc_attr( $css ) . '">&nbsp;</p>';
+            }
+        }
+
+        /**
+         * 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();
+            } elseif ( ! wp_script_is( 'media-upload' ) ) {
+                wp_enqueue_script( 'media-upload' );
+            }
+
+            if ( ! wp_style_is( 'select2-css' ) ) {
+                wp_enqueue_style( 'select2-css' );
+            }
+
+            if ( ! wp_style_is( 'wp-color-picker' ) ) {
+                wp_enqueue_style( 'wp-color-picker' );
+            }
+
+            $dep_array = array( 'jquery', 'wp-color-picker', 'select2-js', 'redux-js' );
+
+            wp_enqueue_script(
+                'redux-field-background',
+                Redux_Core::$url . 'inc/fields/background/redux-background' . Redux_Functions::is_min() . '.js',
+                $dep_array,
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-background',
+                    Redux_Core::$url . 'inc/fields/background/redux-background.css',
+                    array(),
+                    $this->timestamp
+                );
+
+                wp_enqueue_style( 'redux-color-picker' );
+            }
+        }
+
+        /**
+         * Output CSS styling.
+         *
+         * @param array $data Value array.
+         *
+         * @return string
+         */
+        public function css_style( $data = array() ): string {
+            $css = '';
+
+            if ( ! empty( $data ) && is_array( $data ) ) {
+                foreach ( $data as $key => $val ) {
+                    if ( ! empty( $val ) && 'media' !== $key ) {
+                        if ( 'background-image' === $key ) {
+                            $css .= $key . ":url('" . esc_url( $val ) . "');";
+                        } else {
+                            $css .= $key . ':' . esc_attr( $val ) . ';';
+                        }
+                    }
+                }
+            }
+
+            return $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_Background', 'ReduxFramework_Background' );

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

Spacing +32 added lines, -32 removed lines

@@ -42,7 +42,7 @@ 
 		 *
 		 * @var array|null
 		 */
-		public static ?array $field;
+		public static ? array $field;
 
 		/**
 		 * WP Upload directory.
@@ -63,7 +63,7 @@ 
 		 *
 		 * @var array|null
 		 */
-		public static ?array $select;
+		public static ? array $select;
 
 		/**
 		 * Class init.
@@ -399,8 +399,8 @@ 
 				$html .= '<select name="' . self::$parent->args['opt_name'] . '[' . self::$field_id . '][' . $id . ']" id="redux-color-scheme-opt-select-' . $id . '"' . $width . ' class="redux-color-scheme-opt-select">';
 
 				foreach ( $v['options'] as $opt_id => $opt_val ) {
-					$data[ $id ]['value'] = $data[ $id ]['value'] ?? '';
-					$html                .= '<option value="' . $opt_id . '" ' . selected( $opt_id, $data[ $id ]['value'], false ) . '>' . $opt_val . '</option>';
+					$data[$id]['value'] = $data[$id]['value'] ?? '';
+					$html                .= '<option value="' . $opt_id . '" ' . selected( $opt_id, $data[$id]['value'], false ) . '>' . $opt_val . '</option>';
 				}
 
 				$html .= '</select>';
@@ -545,7 +545,7 @@ 
 						$val['rgba']  = $val['rgba'] ?? $res;
 						$val['group'] = $val['group'] ?? '';
 
-						$scheme[ $val['id'] ] = $val;
+						$scheme[$val['id']] = $val;
 					}
 				}
 
@@ -579,9 +579,9 @@ 
 					foreach ( self::$select as $sel_arr ) {
 						$sel_grp = $sel_arr['group'];
 						if ( ! array_key_exists( $sel_grp, $sel_grps ) ) {
-							$sel_grps[ $sel_grp ] = array();
+							$sel_grps[$sel_grp] = array();
 						}
-						$sel_grps[ $sel_grp ][] = $sel_arr;
+						$sel_grps[$sel_grp][] = $sel_arr;
 					}
 				}
 
@@ -589,19 +589,19 @@ 
 				$group_arr = self::get_group_names();
 
 				foreach ( $group_arr as $group_name => $description ) {
-					$groups[ $group_name ] = array();
+					$groups[$group_name] = array();
 
 					if ( is_array( $description ) ) {
-						$grp_desc[ $group_name ]           = $description['desc'] ?? '';
-						$grp_grpdesc[ $group_name ]        = $description['group_desc'] ?? '';
-						$grp_hidden[ $group_name ]         = $description['hidden'] ?? false;
-						$grp_accordion_open[ $group_name ] = $description['accordion_open'] ?? false;
+						$grp_desc[$group_name]           = $description['desc'] ?? '';
+						$grp_grpdesc[$group_name]        = $description['group_desc'] ?? '';
+						$grp_hidden[$group_name]         = $description['hidden'] ?? false;
+						$grp_accordion_open[$group_name] = $description['accordion_open'] ?? false;
 
 					} else {
-						$grp_desc[ $group_name ]           = $description;
-						$grp_hidden[ $group_name ]         = false;
-						$grp_accordion_open[ $group_name ] = false;
-						$grp_grpdesc[ $group_name ]        = false;
+						$grp_desc[$group_name]           = $description;
+						$grp_hidden[$group_name]         = false;
+						$grp_accordion_open[$group_name] = false;
+						$grp_grpdesc[$group_name]        = false;
 					}
 				}
 
@@ -610,7 +610,7 @@ 
 					if ( is_array( $arr ) ) {
 						if ( ! empty( $arr['group'] ) ) {
 							if ( array_key_exists( $arr['group'], $group_arr ) ) {
-								$groups[ $arr['group'] ][] = $arr;
+								$groups[$arr['group']][] = $arr;
 							} else {
 								$groups[''][] = $arr;
 							}
@@ -656,10 +656,10 @@ 
 					$class_hide = '';
 					$is_open    = '';
 
-					if ( isset( $grp_hidden[ $title ] ) && '' !== $grp_hidden[ $title ] ) {
-						$is_hidden  = $grp_hidden[ $title ];
+					if ( isset( $grp_hidden[$title] ) && '' !== $grp_hidden[$title] ) {
+						$is_hidden  = $grp_hidden[$title];
 						$class_hide = ( true === $is_hidden ) ? ' hidden ' : '';
-						$is_open    = $grp_accordion_open[ $title ];
+						$is_open    = $grp_accordion_open[$title];
 					}
 
 					$add_class = '';
@@ -689,8 +689,8 @@ 
 						}
 
 						// apply group description, if any.
-						if ( isset( $grp_desc[ $title ] ) && '' !== $grp_desc[ $title ] ) {
-							$html  .= '<span class="redux-label redux-layout-group-desc-label' . $icon_class . '">' . esc_attr( $grp_desc[ $title ] ) . '</label>';
+						if ( isset( $grp_desc[$title] ) && '' !== $grp_desc[$title] ) {
+							$html  .= '<span class="redux-label redux-layout-group-desc-label' . $icon_class . '">' . esc_attr( $grp_desc[$title] ) . '</label>';
 							$add_hr = true;
 
 							if ( $is_accordion ) {
@@ -716,14 +716,14 @@ 
 							$html .= '<div class="redux-color-scheme-accordion-section" data-state="' . esc_attr( $is_open ) . '">';
 							if ( false !== $grp_grpdesc ) {
 								$html .= '<div class="redux-color-scheme-group-desc">';
-								$html .= esc_attr( $grp_grpdesc[ $title ] );
+								$html .= esc_attr( $grp_grpdesc[$title] );
 								$html .= '</div>';
 							}
 						}
 
 						// Select box render.
 						if ( array_key_exists( $title, $sel_grps ) ) {
-							$html .= self::render_selects( $sel_grps[ $title ], $scheme );
+							$html .= self::render_selects( $sel_grps[$title], $scheme );
 						}
 					} elseif ( $is_accordion ) {
 						$html .= '<div class="redux-color-scheme-accordion-section">';
@@ -798,7 +798,7 @@ 
 								return '';
 							}
 
-							$picker_data = $scheme_data[ $v['id'] ];
+							$picker_data = $scheme_data[$v['id']];
 
 							// Hidden input for data string.
 							$html .= '<input
@@ -962,7 +962,7 @@ 
 				return false;
 			}
 
-			return $data[ $scheme_name ];
+			return $data[$scheme_name];
 		}
 
 		/**
@@ -989,7 +989,7 @@ 
 				// Enum through values and assign them to new array.
 				foreach ( $arr as $val ) {
 					if ( isset( $val['id'] ) ) {
-						$new_scheme[ $val['id'] ] = $val;
+						$new_scheme[$val['id']] = $val;
 					}
 				}
 
@@ -1001,12 +1001,12 @@ 
 					$schemes = array();
 				}
 
-				$scheme_data = $schemes[ $name ] ?? '';
+				$scheme_data = $schemes[$name] ?? '';
 
 				if ( $scheme_data !== $new_scheme ) {
 
 					// Add new scheme to array that will be saved.
-					$schemes[ $name ] = $new_scheme;
+					$schemes[$name] = $new_scheme;
 
 					// Write the data to the JSON file.
 					return self::write_scheme_file( $schemes );
@@ -1076,9 +1076,9 @@ 
 					if ( isset( $v['type'] ) ) {
 						$val = $v['value'];
 
-						unset( $data[ $k ] );
+						unset( $data[$k] );
 
-						$data[ $k ] = $val;
+						$data[$k] = $val;
 					}
 				}
 			}
@@ -1111,7 +1111,7 @@ 
 			}
 
 			// Append ID to variable that holds the current scheme ID data.
-			$redux_options[ self::$field_id ] = $data;
+			$redux_options[self::$field_id] = $data;
 
 			// Save the modified settings.
 			update_option( $opt_name, $redux_options );

Indentation +1082 added lines, -1082 removed lines

@@ -11,773 +11,773 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( ! class_exists( 'Redux_Color_Scheme_Functions' ) ) {
-	/**
-	 * Class Redux_Color_Scheme_Functions
-	 */
-	class Redux_Color_Scheme_Functions {
-
-		/**
-		 * ReduxFramework object.
-		 *
-		 * @var null|ReduxFramework
-		 */
-		public static ?ReduxFramework $parent;
-
-		/**
-		 * Field ID
-		 *
-		 * @var string|null
-		 */
-		public static ?string $field_id;
-
-		/**
-		 * Field class.
-		 *
-		 * @var string|null
-		 */
-		public static ?string $field_class;
-
-		/**
-		 * Field array.
-		 *
-		 * @var array|null
-		 */
-		public static ?array $field;
-
-		/**
-		 * WP Upload directory.
-		 *
-		 * @var string|null
-		 */
-		public static ?string $upload_dir = '';
-
-		/**
-		 * WP Upload URI
-		 *
-		 * @var string|null
-		 */
-		public static ?string $upload_url = '';
-
-		/**
-		 * Select fields.
-		 *
-		 * @var array|null
-		 */
-		public static ?array $select;
-
-		/**
-		 * Class init.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework object.
-		 */
-		public static function init( ReduxFramework $redux ) {
-			self::$parent = $redux;
-
-			if ( empty( self::$field_id ) ) {
-				self::$field = self::get_field( $redux );
-
-				if ( ! is_array( self::$field ) ) {
-					return;
-				}
-
-				self::$field_id = self::$field['id'];
-			}
-
-			// Make sanitized upload dir DIR.
-			self::$upload_dir = Redux_Functions_Ex::wp_normalize_path( ReduxFramework::$_upload_dir . 'color-schemes/' );
-
-			// Make sanitized upload dir URL.
-			self::$upload_url = Redux_Functions_Ex::wp_normalize_path( ReduxFramework::$_upload_url . 'color-schemes/' );
-
-			Redux_Functions::init_wp_filesystem();
-		}
-
-		/**
-		 * Checks if tooltips are in use.
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return bool
-		 */
-		public static function tooltips_in_use( array $field ): bool {
-			$blocks = $field['default'];
-
-			foreach ( $blocks as $arr ) {
-				if ( isset( $arr['tooltip'] ) ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Convert DB values.
-		 */
-		public static function convert_to_db() {
-			$upload_dir = Redux_Functions_Ex::wp_normalize_path( ReduxFramework::$_upload_dir . 'color-schemes/' );
-
-			$cur_scheme_file = Redux_Functions_Ex::wp_normalize_path( $upload_dir . '/' . self::$parent->args['opt_name'] . '_' . self::$field_id . '.json' );
-
-			if ( is_dir( $upload_dir ) ) {
-				if ( file_exists( $cur_scheme_file ) ) {
-					$data = Redux_Core::$filesystem->execute( 'get_contents', $cur_scheme_file );
-					if ( ! empty( $data ) ) {
-						$data = json_decode( $data, true );
-
-						update_option( self::get_scheme_key(), $data );
-
-						Redux_Core::$filesystem->execute( 'delete', $cur_scheme_file );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Get scheme key.
-		 *
-		 * @return string
-		 */
-		public static function get_scheme_key(): string {
-			return 'redux_cs_' . self::$parent->args['opt_name'] . '_' . self::$field_id;
-		}
-
-		/**
-		 * Get the list of groups names for the color scheme table.
-		 *
-		 * @since       2.0.0
-		 * @access      public static
-		 * @return      array Array of group names.
-		 */
-		public static function get_group_names(): array {
-			if ( empty( self::$field ) ) {
-				self::$field = self::get_field();
-			}
-
-			if ( isset( self::$field['groups'] ) ) {
-				if ( is_array( self::$field['groups'] ) && ! empty( self::$field['groups'] ) ) {
-					return self::$field['groups'];
-				}
-			}
-
-			return array();
-		}
-
-		/**
-		 * Get output transparent value.
-		 *
-		 * @return mixed
-		 */
-		public static function get_output_transparent_val() {
-			if ( empty( self::$field ) ) {
-				self::$field = self::get_field();
-			}
-
-			if ( isset( self::$field['output_transparent'] ) ) {
-				if ( ! empty( self::$field['output_transparent'] ) ) {
-					return self::$field['output_transparent'];
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Get select field name.
-		 *
-		 * @return array
-		 */
-		private static function get_select_names(): array {
-			if ( empty( self::$field ) ) {
-				self::$field = self::get_field();
-			}
-
-			if ( isset( self::$field['select'] ) ) {
-				if ( is_array( self::$field['select'] ) && ! empty( self::$field['select'] ) ) {
-					return self::$field['select'];
-				}
-			}
-
-			return array();
-		}
-
-		/**
-		 * Get color scheme field.
-		 *
-		 * @param ReduxFramework|null $redux pointer.
-		 *
-		 * @return mixed
-		 */
-		public static function get_field( ?ReduxFramework $redux = null ) {
-			if ( ! is_null( $redux ) ) {
-				self::$parent = $redux;
-			}
-
-			if ( isset( $redux->field_sections['color_scheme'] ) ) {
-				return reset( $redux->field_sections['color_scheme'] );
-			}
-
-			$arr = self::$parent;
-
-			foreach ( $arr as $part => $bla ) {
-				if ( 'sections' === $part ) {
-					foreach ( $bla as $field ) {
-						foreach ( $field as $arg => $val ) {
-							if ( 'fields' === $arg ) {
-								foreach ( $val as $v ) {
-									if ( ! empty( $v ) ) {
-										foreach ( $v as $id => $x ) {
-											if ( 'type' === $id ) {
-												if ( 'color_scheme' === $x ) {
-													return $v;
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
-		/**
-		 * Output scheme dropdown selector.
-		 *
-		 * @param       string $selected Selected scheme name.
-		 *
-		 * @return      string HTML of dropdown selector.
-		 * @since       1.0.0
-		 * @access      public static
-		 */
-		public static function get_scheme_select_html( string $selected ): string {
-
-			$html  = '<select name="' . esc_attr( self::$parent->args['opt_name'] ) . '[redux-scheme-select]" id="redux-scheme-select-' . esc_attr( self::$field_id ) . '" class="redux-scheme-select">';
-			$html .= self::get_scheme_list_html( $selected );
-			$html .= '</select>';
-
-			return $html;
-		}
-
-		/**
-		 * Set current scheme ID, if one isn't specified.
-		 *
-		 * @param       string $id Scheme name to set.
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      public static
-		 */
-		public static function set_current_scheme_id( string $id ) {
-
-			// Get opt name, for database.
-			$opt_name = self::$parent->args['opt_name'];
-
-			// Get all options from database.
-			$redux_options = get_option( $opt_name, array() );
-			if ( ! is_array( $redux_options ) ) {
-				$redux_options = array();
-			}
-			// Append ID to variable that holds the current scheme ID data.
-			$redux_options['redux-scheme-select'] = $id;
-
-			// Save the modified settings.
-			update_option( $opt_name, $redux_options );
-		}
-
-		/**
-		 * Get tooltip toggle state.
-		 *
-		 * @return bool
-		 */
-		public static function get_tooltip_toggle_state(): bool {
-
-			// Retrieve the opt_name, needed for database.
-			$opt_name = self::$parent->args['opt_name'];
-
-			// Get the entire options array.
-			$redux_options = get_option( $opt_name );
-
-			return $redux_options['redux-color-scheme-tooltip-toggle'] ?? true;
-		}
-
-		/**
-		 * Gets the current schem ID from the database.
-		 *
-		 * @since       1.0.0
-		 * @access      public static
-		 *
-		 * @return      string Current scheme ID.
-		 */
-		public static function get_current_scheme_id(): string {
-
-			// Retrieve the opt_name, needed for databasae.
-			$opt_name = self::$parent->args['opt_name'];
-
-			// Get the entire options array.
-			$redux_options = get_option( $opt_name );
-
-			// If the current scheme key exists...
-			return $redux_options['redux-scheme-select'] ?? 'Default';
-		}
-
-		/**
-		 * Get the list of schemes for the selector.
-		 *
-		 * @param       string $sel Scheme name to select.
-		 *
-		 * @return      string HTML option values.
-		 * @since       1.0.0
-		 * @access      static private
-		 */
-		private static function get_scheme_list_html( string $sel = '' ): string {
-			// no errors, please.
-			$html = '';
-
-			// Retrieves the list of saved schemes into an array variable.
-			$dropdown_values = self::get_scheme_names();
-
-			// If the dropdown array has items...
-			if ( ! empty( $dropdown_values ) ) {
-
-				// Sort them alphbetically.
-				asort( $dropdown_values );
-			}
-
-			// trim the selected item.
-			$sel = trim( $sel );
-
-			// If it's empty.
-			if ( '' === $sel ) {
-
-				// Make the current scheme id the selected value.
-				$selected = self::get_current_scheme_id();
-			} else {
-
-				// Otherwise, set it to the value passed to this function.
-				$selected = $sel;
-			}
-
-			// Enum through the dropdown array and append the necessary HTML for the selector.
-			foreach ( $dropdown_values as $k ) {
-				$html .= '<option value="' . $k . '" ' . selected( $k, $selected, false ) . '>' . $k . '</option>';
-			}
-
-			// Send it all packin'.
-			return $html;
-		}
-
-		/**
-		 * Returns select HTML.
-		 *
-		 * @param array $arr  Array of select fields to render.
-		 * @param array $data Array of scheme data.
-		 *
-		 * @return      string HTML of select fields.
-		 * @since       1.0.4
-		 * @access      static private
-		 */
-		private static function render_selects( array $arr, array $data ): string {
-
-			$html = '';
-			foreach ( $arr as $v ) {
-				$id = $v['id'];
-
-				if ( isset( $v['width'] ) && ! empty( $v['width'] ) ) {
-					$size = $v['width'];
-				} else {
-					$size = '40%';
-				}
-
-				$width = ' style="width: ' . $size . ';"';
-
-				$html .= '<span class="redux-label redux-color-scheme-opt-select-title">' . $v['title'] . '</span>';
-
-				$html .= '<select name="' . self::$parent->args['opt_name'] . '[' . self::$field_id . '][' . $id . ']" id="redux-color-scheme-opt-select-' . $id . '"' . $width . ' class="redux-color-scheme-opt-select">';
-
-				foreach ( $v['options'] as $opt_id => $opt_val ) {
-					$data[ $id ]['value'] = $data[ $id ]['value'] ?? '';
-					$html                .= '<option value="' . $opt_id . '" ' . selected( $opt_id, $data[ $id ]['value'], false ) . '>' . $opt_val . '</option>';
-				}
-
-				$html .= '</select>';
-				$html .= '<span class="redux-label redux-color-scheme-opt-select-desc">' . $v['desc'] . '</span>';
-				$html .= '<hr class="redux-color-scheme-select-close-hr">';
-				$html .= '<br/>';
-			}
-
-			return $html;
-		}
-
-		/**
-		 * Do diff.
-		 *
-		 * @param array $first_array  Array one.
-		 * @param array $second_array Array two.
-		 *
-		 * @return array
-		 */
-		private static function do_diff( array $first_array, array $second_array ): array {
-
-			/**
-			 * Serialize callback.
-			 *
-			 * @param array $arr Array.
-			 */
-			function my_serialize( array &$arr ) {
-				$arr = maybe_serialize( $arr );
-			}
-
-			/**
-			 * Unserialize callback.
-			 *
-			 * @param array $arr Array.
-			 */
-			function my_unserialize( &$arr ) {
-				$arr = maybe_unserialize( $arr );
-			}
-
-			// make a copy.
-			$first_array_s  = $first_array;
-			$second_array_s = $second_array;
-
-			// serialize all sub-arrays.
-			array_walk( $first_array_s, 'my_serialize' );
-			array_walk( $second_array_s, 'my_serialize' );
-
-			// array_diff the serialized versions.
-			$diff = array_diff( $first_array_s, $second_array_s );
-
-			// unserialize the result.
-			array_walk( $diff, 'my_unserialize' );
-
-			// you've got it!
-			return $diff;
-		}
-
-		/**
-		 * Returns colour pickers HTML table.
-		 *
-		 * @since       1.0.0
-		 * @access      public static
-		 *
-		 * @param       string $scheme_id Scheme name of HTML to return.
-		 *
-		 * @return      string HTML of colour picker table.
-		 */
-		public static function get_current_color_scheme_html( $scheme_id = false ): string {
-
-			// If scheme_id is false.
-			if ( ! $scheme_id ) {
-
-				// Attempt to get the current scheme.
-				$scheme_id = self::get_current_scheme_id();
-
-				// dummy check, because this shit happens!
-				$arr_schemes = self::get_scheme_names();
-
-				if ( ! in_array( $scheme_id, $arr_schemes, true ) ) {
-					$scheme_id = 'Default';
-					self::set_current_scheme_id( 'Default' );
-				}
-			}
-
-			// Set oft used variables.
-			$opt_name    = esc_attr( self::$parent->args['opt_name'] );
-			$field_id    = esc_attr( self::$field_id );
-			$field_class = esc_attr( self::$field_class );
-
-			// Get the default options.
-			$field = self::get_field();
-
-			$field['output_transparent'] = $field['output_transparent'] ?? '';
-			$is_accordion                = $field['accordion'] ?? true;
-
-			$def_opts = $field['default'];
-
-			// Create array of element ids from default options.
-			if ( ! empty( $def_opts ) ) {
-				$id_arr = array();
-
-				foreach ( $def_opts as $vv ) {
-					$id_arr[] = $vv['id'];
-				}
-			}
-
-			// Get last saved default.
-			$saved_def = get_option( 'redux_' . $opt_name . '_' . $field_id . '_color_scheme' );
-
-			// Compare key counts between saved and current defaults to check
-			// for changes in color scheme.
-			if ( false !== $saved_def && is_array( $saved_def ) ) {
-
-				// Get the new color inputs.
-				$arr_diff = self::do_diff( $def_opts, $saved_def );
-
-				if ( ! empty( $arr_diff ) ) {
-					update_option( 'redux_' . $opt_name . '_' . $field_id . '_color_scheme', $def_opts );
-				}                //}
-			} else {
-				update_option( 'redux_' . $opt_name . '_' . $field_id . '_color_scheme', $def_opts );
-			}
-
-			// get current scheme data.
-			$scheme = self::get_scheme_data( $scheme_id );
-
-			if ( false === $scheme ) {
-				return '';
-			}
-
-			// If new color inputs exist...
-			if ( ! empty( $arr_diff ) ) {
-				foreach ( $arr_diff as $val ) {
-					if ( ! empty( $val ) && isset( $val['id'] ) ) {
-
-						$val['title'] = $val['title'] ?? $val['id'];
-						$val['color'] = $val['color'] ?? '';
-						$val['alpha'] = $val['alpha'] ?? 1;
-
-						$trans        = $field['output_transparent'];
-						$res          = ( '' === $val['color'] || 'transparent' === $val['color'] ) ? $trans : Redux_Helpers::hex2rgba( $val['color'], $val['alpha'] );
-						$val['rgba']  = $val['rgba'] ?? $res;
-						$val['group'] = $val['group'] ?? '';
-
-						$scheme[ $val['id'] ] = $val;
-					}
-				}
-
-				// Get list of scheme names.
-				$scheme_names = self::get_scheme_names();
-
-				// Update is saved scheme with new picker data.
-				foreach ( $scheme_names as $name ) {
-					self::set_scheme_data( $name, $scheme );
-				}
-
-				// update the database.
-				self::set_database_data( $scheme_id );
-			}
-
-			// If it's not empty then...
-			if ( ! empty( $scheme ) ) {
-
-				// init arrays.
-				$groups     = array();
-				$grp_desc   = array();
-				$groups[''] = array();
-				$sel_grps   = array();
-
-				if ( ! isset( self::$select ) ) {
-					self::$select = self::get_select_names();
-				}
-
-				// Enum select fields into groups array for later render.
-				if ( isset( self::$select ) ) {
-					foreach ( self::$select as $sel_arr ) {
-						$sel_grp = $sel_arr['group'];
-						if ( ! array_key_exists( $sel_grp, $sel_grps ) ) {
-							$sel_grps[ $sel_grp ] = array();
-						}
-						$sel_grps[ $sel_grp ][] = $sel_arr;
-					}
-				}
-
-				// Enum groups names.
-				$group_arr = self::get_group_names();
-
-				foreach ( $group_arr as $group_name => $description ) {
-					$groups[ $group_name ] = array();
-
-					if ( is_array( $description ) ) {
-						$grp_desc[ $group_name ]           = $description['desc'] ?? '';
-						$grp_grpdesc[ $group_name ]        = $description['group_desc'] ?? '';
-						$grp_hidden[ $group_name ]         = $description['hidden'] ?? false;
-						$grp_accordion_open[ $group_name ] = $description['accordion_open'] ?? false;
-
-					} else {
-						$grp_desc[ $group_name ]           = $description;
-						$grp_hidden[ $group_name ]         = false;
-						$grp_accordion_open[ $group_name ] = false;
-						$grp_grpdesc[ $group_name ]        = false;
-					}
-				}
-
-				// Assign color pickers to their specified group.
-				foreach ( $scheme as $arr ) {
-					if ( is_array( $arr ) ) {
-						if ( ! empty( $arr['group'] ) ) {
-							if ( array_key_exists( $arr['group'], $group_arr ) ) {
-								$groups[ $arr['group'] ][] = $arr;
-							} else {
-								$groups[''][] = $arr;
-							}
-						} else {
-							$groups[''][] = $arr;
-						}
-					}
-				}
-
-				$open_icon  = '';
-				$close_icon = '';
-
-				if ( $is_accordion ) {
-					$open_icon  = apply_filters( 'redux/extension/color_scheme/' . self::$parent->args['opt_name'] . '/icon/open', 'dashicons dashicons-arrow-down' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
-					$close_icon = apply_filters( 'redux/extension/color_scheme/' . self::$parent->args['opt_name'] . '/icon/close', 'dashicons dashicons-arrow-up' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
-				}
-
-				// open the list.
-				$html = '<ul class="redux-scheme-layout" data-open-icon="' . $open_icon . '" data-close-icon="' . $close_icon . '">';
-
-				// Enumerate groups.
-				foreach ( $groups as $title => $scheme_arr ) {
-
-					if ( '' === $title ) {
-						if ( empty( $scheme_arr ) ) {
-							continue;
-						}
-
-						$kill_me = false;
-						foreach ( $scheme_arr as $data ) {
-							if ( ! array_key_exists( 'color', $data ) ) {
-								$kill_me = true;
-								break;
-							}
-						}
-						if ( $kill_me ) {
-							continue;
-						}
-					}
-
-					$add_hr     = false;
-					$is_hidden  = false;
-					$class_hide = '';
-					$is_open    = '';
-
-					if ( isset( $grp_hidden[ $title ] ) && '' !== $grp_hidden[ $title ] ) {
-						$is_hidden  = $grp_hidden[ $title ];
-						$class_hide = ( true === $is_hidden ) ? ' hidden ' : '';
-						$is_open    = $grp_accordion_open[ $title ];
-					}
-
-					$add_class = '';
-					if ( $is_accordion ) {
-						$add_class = ' accordion ';
-					}
-
-					$html .= '<div class="redux-color-scheme-group' . $add_class . $class_hide . '">';
-
-					if ( ! $is_hidden ) {
-
-						if ( $is_accordion ) {
-							$html .= '<div class="redux-color-scheme-accordion">';
-						}
-						$icon_class = '';
-
-						// apply group title, if any.
-						if ( '' !== $title ) {
-							$html .= '<br><span class="redux-label redux-layout-group-label">' . esc_attr( $title ) . '</span>';
-
-							if ( $is_accordion ) {
-								$icon_class = ' titled';
-							}
-							$add_hr = true;
-						} elseif ( $is_accordion ) {
-							$icon_class = ' not-titled';
-						}
-
-						// apply group description, if any.
-						if ( isset( $grp_desc[ $title ] ) && '' !== $grp_desc[ $title ] ) {
-							$html  .= '<span class="redux-label redux-layout-group-desc-label' . $icon_class . '">' . esc_attr( $grp_desc[ $title ] ) . '</label>';
-							$add_hr = true;
-
-							if ( $is_accordion ) {
-								$icon_class .= ' subtitled';
-							}
-						} else {
-							$icon_class .= ' not-subtitled';
-						}
-
-						if ( $is_accordion ) {
-							$html .= '<span class="' . esc_attr( $open_icon ) . $icon_class . '"></span>';
-						}
-
-						// Add HR, if needed.
-						if ( true === $add_hr ) {
-							if ( ! $is_accordion ) {
-								$html .= '<hr>';
-							}
-						}
-
-						if ( $is_accordion ) {
-							$html .= '</div>';
-							$html .= '<div class="redux-color-scheme-accordion-section" data-state="' . esc_attr( $is_open ) . '">';
-							if ( false !== $grp_grpdesc ) {
-								$html .= '<div class="redux-color-scheme-group-desc">';
-								$html .= esc_attr( $grp_grpdesc[ $title ] );
-								$html .= '</div>';
-							}
-						}
-
-						// Select box render.
-						if ( array_key_exists( $title, $sel_grps ) ) {
-							$html .= self::render_selects( $sel_grps[ $title ], $scheme );
-						}
-					} elseif ( $is_accordion ) {
-						$html .= '<div class="redux-color-scheme-accordion-section">';
-					}
-
-					$html .= "<ul class='redux-scheme-layout'>";
-
-					// Enum through each element/id.
-					foreach ( $scheme_arr as $v ) {
-						if ( in_array( $v['id'], $id_arr, true ) ) {
-
-							// If no title, use ID.
-							$v['title'] = $v['title'] ?? $v['id'];
-
-							// If no alpha, use 1 (solid).
-							$v['alpha'] = $v['alpha'] ?? 1;
-
-							// Fuck forbid no colour, set to white.
-							$v['color'] = $v['color'] ?? '';
-
-							// RGBA..
-							$trans     = $field['output_transparent'];
-							$res       = ( '' === $v['color'] || 'transparent' === $v['color'] ) ? $trans : Redux_Helpers::hex2rgba( $v['color'], $v['alpha'] );
-							$v['rgba'] = $v['rgba'] ?? $res;
-
-							// group name.
-							$v['group'] = $v['group'] ?? '';
-
-							$v['class'] = self::get_color_block_class( $field, $v['id'] );
-
-							$block_hide = self::get_block_hidden( $field, $v['id'] ) ? 'hidden' : '';
-
-							// tooltips.
-							$tip_title = '';
-							$tip_text  = '';
-
-							$tooltip_data = self::get_tooltip_data( $field, $v['id'] );
-							if ( false !== $tooltip_data ) {
-								$tip_title = $tooltip_data['title'] ?? '';
-								$tip_text  = $tooltip_data['text'] ?? '';
-							}
-
-							// Begin the layout.
-							$html .= '<li class="redux-scheme-layout ' . $class_hide . ' redux-cs-qtip ' . $block_hide . '" qtip-title="' . esc_attr( $tip_title ) . '" qtip-content="' . esc_attr( $tip_text ) . '">';
-							$html .= '<div class="redux-scheme-layout-container" data-id="' . $field_id . '-' . $v['id'] . '">';
-
-							if ( '' === $v['color'] || 'transparent' === $v['color'] ) {
-								$color = '';
-							} else {
-								$color = 'rgba(' . $v['rgba'] . ')';
-							}
-
-							// colour picker dropdown.
-							$html .= '<input
+    /**
+     * Class Redux_Color_Scheme_Functions
+     */
+    class Redux_Color_Scheme_Functions {
+
+        /**
+         * ReduxFramework object.
+         *
+         * @var null|ReduxFramework
+         */
+        public static ?ReduxFramework $parent;
+
+        /**
+         * Field ID
+         *
+         * @var string|null
+         */
+        public static ?string $field_id;
+
+        /**
+         * Field class.
+         *
+         * @var string|null
+         */
+        public static ?string $field_class;
+
+        /**
+         * Field array.
+         *
+         * @var array|null
+         */
+        public static ?array $field;
+
+        /**
+         * WP Upload directory.
+         *
+         * @var string|null
+         */
+        public static ?string $upload_dir = '';
+
+        /**
+         * WP Upload URI
+         *
+         * @var string|null
+         */
+        public static ?string $upload_url = '';
+
+        /**
+         * Select fields.
+         *
+         * @var array|null
+         */
+        public static ?array $select;
+
+        /**
+         * Class init.
+         *
+         * @param ReduxFramework $redux ReduxFramework object.
+         */
+        public static function init( ReduxFramework $redux ) {
+            self::$parent = $redux;
+
+            if ( empty( self::$field_id ) ) {
+                self::$field = self::get_field( $redux );
+
+                if ( ! is_array( self::$field ) ) {
+                    return;
+                }
+
+                self::$field_id = self::$field['id'];
+            }
+
+            // Make sanitized upload dir DIR.
+            self::$upload_dir = Redux_Functions_Ex::wp_normalize_path( ReduxFramework::$_upload_dir . 'color-schemes/' );
+
+            // Make sanitized upload dir URL.
+            self::$upload_url = Redux_Functions_Ex::wp_normalize_path( ReduxFramework::$_upload_url . 'color-schemes/' );
+
+            Redux_Functions::init_wp_filesystem();
+        }
+
+        /**
+         * Checks if tooltips are in use.
+         *
+         * @param array $field Field array.
+         *
+         * @return bool
+         */
+        public static function tooltips_in_use( array $field ): bool {
+            $blocks = $field['default'];
+
+            foreach ( $blocks as $arr ) {
+                if ( isset( $arr['tooltip'] ) ) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Convert DB values.
+         */
+        public static function convert_to_db() {
+            $upload_dir = Redux_Functions_Ex::wp_normalize_path( ReduxFramework::$_upload_dir . 'color-schemes/' );
+
+            $cur_scheme_file = Redux_Functions_Ex::wp_normalize_path( $upload_dir . '/' . self::$parent->args['opt_name'] . '_' . self::$field_id . '.json' );
+
+            if ( is_dir( $upload_dir ) ) {
+                if ( file_exists( $cur_scheme_file ) ) {
+                    $data = Redux_Core::$filesystem->execute( 'get_contents', $cur_scheme_file );
+                    if ( ! empty( $data ) ) {
+                        $data = json_decode( $data, true );
+
+                        update_option( self::get_scheme_key(), $data );
+
+                        Redux_Core::$filesystem->execute( 'delete', $cur_scheme_file );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Get scheme key.
+         *
+         * @return string
+         */
+        public static function get_scheme_key(): string {
+            return 'redux_cs_' . self::$parent->args['opt_name'] . '_' . self::$field_id;
+        }
+
+        /**
+         * Get the list of groups names for the color scheme table.
+         *
+         * @since       2.0.0
+         * @access      public static
+         * @return      array Array of group names.
+         */
+        public static function get_group_names(): array {
+            if ( empty( self::$field ) ) {
+                self::$field = self::get_field();
+            }
+
+            if ( isset( self::$field['groups'] ) ) {
+                if ( is_array( self::$field['groups'] ) && ! empty( self::$field['groups'] ) ) {
+                    return self::$field['groups'];
+                }
+            }
+
+            return array();
+        }
+
+        /**
+         * Get output transparent value.
+         *
+         * @return mixed
+         */
+        public static function get_output_transparent_val() {
+            if ( empty( self::$field ) ) {
+                self::$field = self::get_field();
+            }
+
+            if ( isset( self::$field['output_transparent'] ) ) {
+                if ( ! empty( self::$field['output_transparent'] ) ) {
+                    return self::$field['output_transparent'];
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Get select field name.
+         *
+         * @return array
+         */
+        private static function get_select_names(): array {
+            if ( empty( self::$field ) ) {
+                self::$field = self::get_field();
+            }
+
+            if ( isset( self::$field['select'] ) ) {
+                if ( is_array( self::$field['select'] ) && ! empty( self::$field['select'] ) ) {
+                    return self::$field['select'];
+                }
+            }
+
+            return array();
+        }
+
+        /**
+         * Get color scheme field.
+         *
+         * @param ReduxFramework|null $redux pointer.
+         *
+         * @return mixed
+         */
+        public static function get_field( ?ReduxFramework $redux = null ) {
+            if ( ! is_null( $redux ) ) {
+                self::$parent = $redux;
+            }
+
+            if ( isset( $redux->field_sections['color_scheme'] ) ) {
+                return reset( $redux->field_sections['color_scheme'] );
+            }
+
+            $arr = self::$parent;
+
+            foreach ( $arr as $part => $bla ) {
+                if ( 'sections' === $part ) {
+                    foreach ( $bla as $field ) {
+                        foreach ( $field as $arg => $val ) {
+                            if ( 'fields' === $arg ) {
+                                foreach ( $val as $v ) {
+                                    if ( ! empty( $v ) ) {
+                                        foreach ( $v as $id => $x ) {
+                                            if ( 'type' === $id ) {
+                                                if ( 'color_scheme' === $x ) {
+                                                    return $v;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        /**
+         * Output scheme dropdown selector.
+         *
+         * @param       string $selected Selected scheme name.
+         *
+         * @return      string HTML of dropdown selector.
+         * @since       1.0.0
+         * @access      public static
+         */
+        public static function get_scheme_select_html( string $selected ): string {
+
+            $html  = '<select name="' . esc_attr( self::$parent->args['opt_name'] ) . '[redux-scheme-select]" id="redux-scheme-select-' . esc_attr( self::$field_id ) . '" class="redux-scheme-select">';
+            $html .= self::get_scheme_list_html( $selected );
+            $html .= '</select>';
+
+            return $html;
+        }
+
+        /**
+         * Set current scheme ID, if one isn't specified.
+         *
+         * @param       string $id Scheme name to set.
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      public static
+         */
+        public static function set_current_scheme_id( string $id ) {
+
+            // Get opt name, for database.
+            $opt_name = self::$parent->args['opt_name'];
+
+            // Get all options from database.
+            $redux_options = get_option( $opt_name, array() );
+            if ( ! is_array( $redux_options ) ) {
+                $redux_options = array();
+            }
+            // Append ID to variable that holds the current scheme ID data.
+            $redux_options['redux-scheme-select'] = $id;
+
+            // Save the modified settings.
+            update_option( $opt_name, $redux_options );
+        }
+
+        /**
+         * Get tooltip toggle state.
+         *
+         * @return bool
+         */
+        public static function get_tooltip_toggle_state(): bool {
+
+            // Retrieve the opt_name, needed for database.
+            $opt_name = self::$parent->args['opt_name'];
+
+            // Get the entire options array.
+            $redux_options = get_option( $opt_name );
+
+            return $redux_options['redux-color-scheme-tooltip-toggle'] ?? true;
+        }
+
+        /**
+         * Gets the current schem ID from the database.
+         *
+         * @since       1.0.0
+         * @access      public static
+         *
+         * @return      string Current scheme ID.
+         */
+        public static function get_current_scheme_id(): string {
+
+            // Retrieve the opt_name, needed for databasae.
+            $opt_name = self::$parent->args['opt_name'];
+
+            // Get the entire options array.
+            $redux_options = get_option( $opt_name );
+
+            // If the current scheme key exists...
+            return $redux_options['redux-scheme-select'] ?? 'Default';
+        }
+
+        /**
+         * Get the list of schemes for the selector.
+         *
+         * @param       string $sel Scheme name to select.
+         *
+         * @return      string HTML option values.
+         * @since       1.0.0
+         * @access      static private
+         */
+        private static function get_scheme_list_html( string $sel = '' ): string {
+            // no errors, please.
+            $html = '';
+
+            // Retrieves the list of saved schemes into an array variable.
+            $dropdown_values = self::get_scheme_names();
+
+            // If the dropdown array has items...
+            if ( ! empty( $dropdown_values ) ) {
+
+                // Sort them alphbetically.
+                asort( $dropdown_values );
+            }
+
+            // trim the selected item.
+            $sel = trim( $sel );
+
+            // If it's empty.
+            if ( '' === $sel ) {
+
+                // Make the current scheme id the selected value.
+                $selected = self::get_current_scheme_id();
+            } else {
+
+                // Otherwise, set it to the value passed to this function.
+                $selected = $sel;
+            }
+
+            // Enum through the dropdown array and append the necessary HTML for the selector.
+            foreach ( $dropdown_values as $k ) {
+                $html .= '<option value="' . $k . '" ' . selected( $k, $selected, false ) . '>' . $k . '</option>';
+            }
+
+            // Send it all packin'.
+            return $html;
+        }
+
+        /**
+         * Returns select HTML.
+         *
+         * @param array $arr  Array of select fields to render.
+         * @param array $data Array of scheme data.
+         *
+         * @return      string HTML of select fields.
+         * @since       1.0.4
+         * @access      static private
+         */
+        private static function render_selects( array $arr, array $data ): string {
+
+            $html = '';
+            foreach ( $arr as $v ) {
+                $id = $v['id'];
+
+                if ( isset( $v['width'] ) && ! empty( $v['width'] ) ) {
+                    $size = $v['width'];
+                } else {
+                    $size = '40%';
+                }
+
+                $width = ' style="width: ' . $size . ';"';
+
+                $html .= '<span class="redux-label redux-color-scheme-opt-select-title">' . $v['title'] . '</span>';
+
+                $html .= '<select name="' . self::$parent->args['opt_name'] . '[' . self::$field_id . '][' . $id . ']" id="redux-color-scheme-opt-select-' . $id . '"' . $width . ' class="redux-color-scheme-opt-select">';
+
+                foreach ( $v['options'] as $opt_id => $opt_val ) {
+                    $data[ $id ]['value'] = $data[ $id ]['value'] ?? '';
+                    $html                .= '<option value="' . $opt_id . '" ' . selected( $opt_id, $data[ $id ]['value'], false ) . '>' . $opt_val . '</option>';
+                }
+
+                $html .= '</select>';
+                $html .= '<span class="redux-label redux-color-scheme-opt-select-desc">' . $v['desc'] . '</span>';
+                $html .= '<hr class="redux-color-scheme-select-close-hr">';
+                $html .= '<br/>';
+            }
+
+            return $html;
+        }
+
+        /**
+         * Do diff.
+         *
+         * @param array $first_array  Array one.
+         * @param array $second_array Array two.
+         *
+         * @return array
+         */
+        private static function do_diff( array $first_array, array $second_array ): array {
+
+            /**
+             * Serialize callback.
+             *
+             * @param array $arr Array.
+             */
+            function my_serialize( array &$arr ) {
+                $arr = maybe_serialize( $arr );
+            }
+
+            /**
+             * Unserialize callback.
+             *
+             * @param array $arr Array.
+             */
+            function my_unserialize( &$arr ) {
+                $arr = maybe_unserialize( $arr );
+            }
+
+            // make a copy.
+            $first_array_s  = $first_array;
+            $second_array_s = $second_array;
+
+            // serialize all sub-arrays.
+            array_walk( $first_array_s, 'my_serialize' );
+            array_walk( $second_array_s, 'my_serialize' );
+
+            // array_diff the serialized versions.
+            $diff = array_diff( $first_array_s, $second_array_s );
+
+            // unserialize the result.
+            array_walk( $diff, 'my_unserialize' );
+
+            // you've got it!
+            return $diff;
+        }
+
+        /**
+         * Returns colour pickers HTML table.
+         *
+         * @since       1.0.0
+         * @access      public static
+         *
+         * @param       string $scheme_id Scheme name of HTML to return.
+         *
+         * @return      string HTML of colour picker table.
+         */
+        public static function get_current_color_scheme_html( $scheme_id = false ): string {
+
+            // If scheme_id is false.
+            if ( ! $scheme_id ) {
+
+                // Attempt to get the current scheme.
+                $scheme_id = self::get_current_scheme_id();
+
+                // dummy check, because this shit happens!
+                $arr_schemes = self::get_scheme_names();
+
+                if ( ! in_array( $scheme_id, $arr_schemes, true ) ) {
+                    $scheme_id = 'Default';
+                    self::set_current_scheme_id( 'Default' );
+                }
+            }
+
+            // Set oft used variables.
+            $opt_name    = esc_attr( self::$parent->args['opt_name'] );
+            $field_id    = esc_attr( self::$field_id );
+            $field_class = esc_attr( self::$field_class );
+
+            // Get the default options.
+            $field = self::get_field();
+
+            $field['output_transparent'] = $field['output_transparent'] ?? '';
+            $is_accordion                = $field['accordion'] ?? true;
+
+            $def_opts = $field['default'];
+
+            // Create array of element ids from default options.
+            if ( ! empty( $def_opts ) ) {
+                $id_arr = array();
+
+                foreach ( $def_opts as $vv ) {
+                    $id_arr[] = $vv['id'];
+                }
+            }
+
+            // Get last saved default.
+            $saved_def = get_option( 'redux_' . $opt_name . '_' . $field_id . '_color_scheme' );
+
+            // Compare key counts between saved and current defaults to check
+            // for changes in color scheme.
+            if ( false !== $saved_def && is_array( $saved_def ) ) {
+
+                // Get the new color inputs.
+                $arr_diff = self::do_diff( $def_opts, $saved_def );
+
+                if ( ! empty( $arr_diff ) ) {
+                    update_option( 'redux_' . $opt_name . '_' . $field_id . '_color_scheme', $def_opts );
+                }                //}
+            } else {
+                update_option( 'redux_' . $opt_name . '_' . $field_id . '_color_scheme', $def_opts );
+            }
+
+            // get current scheme data.
+            $scheme = self::get_scheme_data( $scheme_id );
+
+            if ( false === $scheme ) {
+                return '';
+            }
+
+            // If new color inputs exist...
+            if ( ! empty( $arr_diff ) ) {
+                foreach ( $arr_diff as $val ) {
+                    if ( ! empty( $val ) && isset( $val['id'] ) ) {
+
+                        $val['title'] = $val['title'] ?? $val['id'];
+                        $val['color'] = $val['color'] ?? '';
+                        $val['alpha'] = $val['alpha'] ?? 1;
+
+                        $trans        = $field['output_transparent'];
+                        $res          = ( '' === $val['color'] || 'transparent' === $val['color'] ) ? $trans : Redux_Helpers::hex2rgba( $val['color'], $val['alpha'] );
+                        $val['rgba']  = $val['rgba'] ?? $res;
+                        $val['group'] = $val['group'] ?? '';
+
+                        $scheme[ $val['id'] ] = $val;
+                    }
+                }
+
+                // Get list of scheme names.
+                $scheme_names = self::get_scheme_names();
+
+                // Update is saved scheme with new picker data.
+                foreach ( $scheme_names as $name ) {
+                    self::set_scheme_data( $name, $scheme );
+                }
+
+                // update the database.
+                self::set_database_data( $scheme_id );
+            }
+
+            // If it's not empty then...
+            if ( ! empty( $scheme ) ) {
+
+                // init arrays.
+                $groups     = array();
+                $grp_desc   = array();
+                $groups[''] = array();
+                $sel_grps   = array();
+
+                if ( ! isset( self::$select ) ) {
+                    self::$select = self::get_select_names();
+                }
+
+                // Enum select fields into groups array for later render.
+                if ( isset( self::$select ) ) {
+                    foreach ( self::$select as $sel_arr ) {
+                        $sel_grp = $sel_arr['group'];
+                        if ( ! array_key_exists( $sel_grp, $sel_grps ) ) {
+                            $sel_grps[ $sel_grp ] = array();
+                        }
+                        $sel_grps[ $sel_grp ][] = $sel_arr;
+                    }
+                }
+
+                // Enum groups names.
+                $group_arr = self::get_group_names();
+
+                foreach ( $group_arr as $group_name => $description ) {
+                    $groups[ $group_name ] = array();
+
+                    if ( is_array( $description ) ) {
+                        $grp_desc[ $group_name ]           = $description['desc'] ?? '';
+                        $grp_grpdesc[ $group_name ]        = $description['group_desc'] ?? '';
+                        $grp_hidden[ $group_name ]         = $description['hidden'] ?? false;
+                        $grp_accordion_open[ $group_name ] = $description['accordion_open'] ?? false;
+
+                    } else {
+                        $grp_desc[ $group_name ]           = $description;
+                        $grp_hidden[ $group_name ]         = false;
+                        $grp_accordion_open[ $group_name ] = false;
+                        $grp_grpdesc[ $group_name ]        = false;
+                    }
+                }
+
+                // Assign color pickers to their specified group.
+                foreach ( $scheme as $arr ) {
+                    if ( is_array( $arr ) ) {
+                        if ( ! empty( $arr['group'] ) ) {
+                            if ( array_key_exists( $arr['group'], $group_arr ) ) {
+                                $groups[ $arr['group'] ][] = $arr;
+                            } else {
+                                $groups[''][] = $arr;
+                            }
+                        } else {
+                            $groups[''][] = $arr;
+                        }
+                    }
+                }
+
+                $open_icon  = '';
+                $close_icon = '';
+
+                if ( $is_accordion ) {
+                    $open_icon  = apply_filters( 'redux/extension/color_scheme/' . self::$parent->args['opt_name'] . '/icon/open', 'dashicons dashicons-arrow-down' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    $close_icon = apply_filters( 'redux/extension/color_scheme/' . self::$parent->args['opt_name'] . '/icon/close', 'dashicons dashicons-arrow-up' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                }
+
+                // open the list.
+                $html = '<ul class="redux-scheme-layout" data-open-icon="' . $open_icon . '" data-close-icon="' . $close_icon . '">';
+
+                // Enumerate groups.
+                foreach ( $groups as $title => $scheme_arr ) {
+
+                    if ( '' === $title ) {
+                        if ( empty( $scheme_arr ) ) {
+                            continue;
+                        }
+
+                        $kill_me = false;
+                        foreach ( $scheme_arr as $data ) {
+                            if ( ! array_key_exists( 'color', $data ) ) {
+                                $kill_me = true;
+                                break;
+                            }
+                        }
+                        if ( $kill_me ) {
+                            continue;
+                        }
+                    }
+
+                    $add_hr     = false;
+                    $is_hidden  = false;
+                    $class_hide = '';
+                    $is_open    = '';
+
+                    if ( isset( $grp_hidden[ $title ] ) && '' !== $grp_hidden[ $title ] ) {
+                        $is_hidden  = $grp_hidden[ $title ];
+                        $class_hide = ( true === $is_hidden ) ? ' hidden ' : '';
+                        $is_open    = $grp_accordion_open[ $title ];
+                    }
+
+                    $add_class = '';
+                    if ( $is_accordion ) {
+                        $add_class = ' accordion ';
+                    }
+
+                    $html .= '<div class="redux-color-scheme-group' . $add_class . $class_hide . '">';
+
+                    if ( ! $is_hidden ) {
+
+                        if ( $is_accordion ) {
+                            $html .= '<div class="redux-color-scheme-accordion">';
+                        }
+                        $icon_class = '';
+
+                        // apply group title, if any.
+                        if ( '' !== $title ) {
+                            $html .= '<br><span class="redux-label redux-layout-group-label">' . esc_attr( $title ) . '</span>';
+
+                            if ( $is_accordion ) {
+                                $icon_class = ' titled';
+                            }
+                            $add_hr = true;
+                        } elseif ( $is_accordion ) {
+                            $icon_class = ' not-titled';
+                        }
+
+                        // apply group description, if any.
+                        if ( isset( $grp_desc[ $title ] ) && '' !== $grp_desc[ $title ] ) {
+                            $html  .= '<span class="redux-label redux-layout-group-desc-label' . $icon_class . '">' . esc_attr( $grp_desc[ $title ] ) . '</label>';
+                            $add_hr = true;
+
+                            if ( $is_accordion ) {
+                                $icon_class .= ' subtitled';
+                            }
+                        } else {
+                            $icon_class .= ' not-subtitled';
+                        }
+
+                        if ( $is_accordion ) {
+                            $html .= '<span class="' . esc_attr( $open_icon ) . $icon_class . '"></span>';
+                        }
+
+                        // Add HR, if needed.
+                        if ( true === $add_hr ) {
+                            if ( ! $is_accordion ) {
+                                $html .= '<hr>';
+                            }
+                        }
+
+                        if ( $is_accordion ) {
+                            $html .= '</div>';
+                            $html .= '<div class="redux-color-scheme-accordion-section" data-state="' . esc_attr( $is_open ) . '">';
+                            if ( false !== $grp_grpdesc ) {
+                                $html .= '<div class="redux-color-scheme-group-desc">';
+                                $html .= esc_attr( $grp_grpdesc[ $title ] );
+                                $html .= '</div>';
+                            }
+                        }
+
+                        // Select box render.
+                        if ( array_key_exists( $title, $sel_grps ) ) {
+                            $html .= self::render_selects( $sel_grps[ $title ], $scheme );
+                        }
+                    } elseif ( $is_accordion ) {
+                        $html .= '<div class="redux-color-scheme-accordion-section">';
+                    }
+
+                    $html .= "<ul class='redux-scheme-layout'>";
+
+                    // Enum through each element/id.
+                    foreach ( $scheme_arr as $v ) {
+                        if ( in_array( $v['id'], $id_arr, true ) ) {
+
+                            // If no title, use ID.
+                            $v['title'] = $v['title'] ?? $v['id'];
+
+                            // If no alpha, use 1 (solid).
+                            $v['alpha'] = $v['alpha'] ?? 1;
+
+                            // Fuck forbid no colour, set to white.
+                            $v['color'] = $v['color'] ?? '';
+
+                            // RGBA..
+                            $trans     = $field['output_transparent'];
+                            $res       = ( '' === $v['color'] || 'transparent' === $v['color'] ) ? $trans : Redux_Helpers::hex2rgba( $v['color'], $v['alpha'] );
+                            $v['rgba'] = $v['rgba'] ?? $res;
+
+                            // group name.
+                            $v['group'] = $v['group'] ?? '';
+
+                            $v['class'] = self::get_color_block_class( $field, $v['id'] );
+
+                            $block_hide = self::get_block_hidden( $field, $v['id'] ) ? 'hidden' : '';
+
+                            // tooltips.
+                            $tip_title = '';
+                            $tip_text  = '';
+
+                            $tooltip_data = self::get_tooltip_data( $field, $v['id'] );
+                            if ( false !== $tooltip_data ) {
+                                $tip_title = $tooltip_data['title'] ?? '';
+                                $tip_text  = $tooltip_data['text'] ?? '';
+                            }
+
+                            // Begin the layout.
+                            $html .= '<li class="redux-scheme-layout ' . $class_hide . ' redux-cs-qtip ' . $block_hide . '" qtip-title="' . esc_attr( $tip_title ) . '" qtip-content="' . esc_attr( $tip_text ) . '">';
+                            $html .= '<div class="redux-scheme-layout-container" data-id="' . $field_id . '-' . $v['id'] . '">';
+
+                            if ( '' === $v['color'] || 'transparent' === $v['color'] ) {
+                                $color = '';
+                            } else {
+                                $color = 'rgba(' . $v['rgba'] . ')';
+                            }
+
+                            // colour picker dropdown.
+                            $html .= '<input
                                         id="' . $field_id . '-' . esc_attr( $v['id'] ) . '-color"
                                         class="' . $field_class . ' ' . esc_attr( $v['class'] ) . '"
                                         type="text"
@@ -793,15 +793,15 @@ 
                                         data-output-transparent="' . esc_attr( $field['output_transparent'] ) . '"
                                       />';
 
-							$scheme_data = self::get_scheme_data( $scheme_id );
-							if ( false === $scheme_data ) {
-								return '';
-							}
+                            $scheme_data = self::get_scheme_data( $scheme_id );
+                            if ( false === $scheme_data ) {
+                                return '';
+                            }
 
-							$picker_data = $scheme_data[ $v['id'] ];
+                            $picker_data = $scheme_data[ $v['id'] ];
 
-							// Hidden input for data string.
-							$html .= '<input
+                            // Hidden input for data string.
+                            $html .= '<input
                                         type="hidden"
                                         class="redux-hidden-data"
                                         name="' . esc_attr( $opt_name ) . '[' . esc_attr( $field_id ) . '][' . esc_attr( $v['id'] ) . '][data]"
@@ -809,312 +809,312 @@ 
                                         value="' . rawurlencode( wp_json_encode( $picker_data ) ) . '"
                                       />';
 
-							// closing html tags.
-							$html .= '</div>';
-							$html .= '<span class="redux-label redux-layout-label">' . esc_attr( $v['title'] ) . '</span>';
-							$html .= '</li>';
-						}
-					}
-					$html .= '</ul>';
-
-					$html .= '<hr class="redux-color-scheme-blank-hr">';
-
-					if ( $is_accordion ) {
-						$html .= '</div>';
-					}
-
-					$html .= '</div>';
-				}
-
-				// Close list.
-				$html .= '</ul>';
-			}
-
-			// html var not empty, return it.
-			if ( ! empty( $html ) ) {
-				return $html;
-			}
-
-			return '';
-		}
-
-		/**
-		 * Get color block class.
-		 *
-		 * @param array  $field Field array.
-		 * @param string $id    Field ID.
-		 *
-		 * @return string
-		 */
-		private static function get_color_block_class( array $field, string $id ): string {
-			$def = $field['default'];
-
-			if ( ! empty( $def ) ) {
-				foreach ( $def as $arr ) {
-					if ( $arr['id'] === $id ) {
-						if ( isset( $arr['class'] ) ) {
-							return $arr['class'];
-						}
-					}
-				}
-			}
-
-			return '';
-		}
-
-		/**
-		 * Get tooltip data.
-		 *
-		 * @param array  $field Field array.
-		 * @param string $id    Field ID.
-		 *
-		 * @return mixed
-		 */
-		private static function get_tooltip_data( array $field, string $id ) {
-			$def = $field['default'];
-
-			if ( ! empty( $def ) ) {
-				foreach ( $def as $arr ) {
-					if ( $arr['id'] === $id ) {
-						if ( isset( $arr['tooltip'] ) ) {
-							return $arr['tooltip'];
-						}
-					}
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Get hidden blocks.
-		 *
-		 * @param array  $field Field ID.
-		 * @param string $id    Field ID.
-		 *
-		 * @return bool
-		 */
-		private static function get_block_hidden( array $field, string $id ): bool {
-			$def = $field['default'];
-
-			if ( ! empty( $def ) ) {
-				foreach ( $def as $arr ) {
-					if ( $arr['id'] === $id ) {
-						if ( isset( $arr['hidden'] ) ) {
-							return $arr['hidden'];
-						}
-					}
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Returns scheme file contents.
-		 *
-		 * @since       1.0.0
-		 * @access      public static
-		 *
-		 * @return      array Array of scheme data.
-		 */
-		public static function read_scheme_file() {
-			$key  = self::get_scheme_key();
-			$data = get_option( $key );
-
-			if ( empty( $data ) ) {
-				$arr_data = false;
-			} else {
-				$arr_data = $data;
-			}
-
-			return $arr_data;
-		}
-
-		/**
-		 * Sets scheme file contents.
-		 *
-		 * @param       array $arr_data PHP array of data to encode.
-		 *
-		 * @return      bool Result of write function.
-		 * @since       1.0.0
-		 * @access      public static
-		 */
-		public static function write_scheme_file( array $arr_data ): bool {
-			$key = self::get_scheme_key();
-
-			return update_option( $key, $arr_data );
-		}
-
-		/**
-		 * Gets individual scheme data from scheme JSON file.
-		 *
-		 * @param       string $scheme_name Name of scheme.
-		 *
-		 * @return      mixed PHP array of scheme data.
-		 * @since       1.0.0
-		 * @access      public static
-		 */
-		public static function get_scheme_data( string $scheme_name ) {
-			$data = self::read_scheme_file();
-
-			if ( false === $data ) {
-				return false;
-			}
-
-			return $data[ $scheme_name ];
-		}
-
-		/**
-		 * Sets individual scheme data to scheme JSON file.
-		 *
-		 * @param string $name  Name of a scheme to save.
-		 * @param array  $arr   Scheme data to encode.
-		 *
-		 * @return      bool Result of file written.
-		 * @since       1.0.0
-		 * @access      public static
-		 */
-		public static function set_scheme_data( string $name, array $arr ): bool {
-
-			// Create blank array.
-			$new_scheme = array();
-
-			// If name is present.
-			if ( $name ) {
-
-				// then add the name at the new array's key.
-				$new_scheme['color_scheme_name'] = $name;
-
-				// Enum through values and assign them to new array.
-				foreach ( $arr as $val ) {
-					if ( isset( $val['id'] ) ) {
-						$new_scheme[ $val['id'] ] = $val;
-					}
-				}
-
-				// read the contents of the current scheme file.
-				$schemes = self::read_scheme_file();
-
-				// If returned false (not there) then create a new array.
-				if ( false === $schemes ) {
-					$schemes = array();
-				}
-
-				$scheme_data = $schemes[ $name ] ?? '';
-
-				if ( $scheme_data !== $new_scheme ) {
-
-					// Add new scheme to array that will be saved.
-					$schemes[ $name ] = $new_scheme;
-
-					// Write the data to the JSON file.
-					return self::write_scheme_file( $schemes );
-				}
-			}
-
-			// !success
-			return false;
-		}
-
-		/**
-		 * Enumerate the scheme names from the JSON store file.
-		 *
-		 * @since       1.0.0
-		 * @access      public static
-		 * @return      array Array of stored scheme names.
-		 */
-		public static function get_scheme_names(): array {
-
-			// Read the JSON file, which returns a PHP array.
-			$schemes = self::read_scheme_file();
-
-			// Create a new array.
-			$output = array();
-
-			if ( false !== $schemes ) {
-
-				// If the schemes array IS an array (versus false), then...
-				if ( is_array( $schemes ) ) {
-
-					// Enum them.
-					foreach ( $schemes as $scheme ) {
-
-						// If the color_scheme_name key is set...
-						if ( isset( $scheme['color_scheme_name'] ) ) {
-
-							// Push it onto the array stack.
-							$output[] = $scheme['color_scheme_name'];
-						}
-					}
-				}
-			}
-
-			// Kick the full array out the door.
-			return $output;
-		}
-
-		/**
-		 * Get data array from scheme.
-		 *
-		 * @param string $scheme Scheme name.
-		 *
-		 * @return array
-		 */
-		public static function data_array_from_scheme( string $scheme ): array {
-
-			// Get scheme data from JSON file.
-			$data = self::get_scheme_data( $scheme );
-			if ( false === $data ) {
-				return array();
-			}
-
-			// Don't need to save select arrays to database,
-			// just the id => value.
-			if ( ! empty( $data ) ) {
-				foreach ( $data as $k => $v ) {
-					if ( isset( $v['type'] ) ) {
-						$val = $v['value'];
-
-						unset( $data[ $k ] );
-
-						$data[ $k ] = $val;
-					}
-				}
-			}
-
-			return $data;
-		}
-
-		/**
-		 * Sets current scheme to database.
-		 *
-		 * @param       string $scheme Current scheme name.
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      private
-		 */
-		public static function set_database_data( string $scheme = 'Default' ) {
-
-			$data = self::data_array_from_scheme( $scheme );
-
-			// Get opt name, for database.
-			$opt_name = self::$parent->args['opt_name'];
-
-			// Get all options from database.
-			$redux_options = get_option( $opt_name );
-
-			if ( empty( self::$field_id ) ) {
-				self::$field    = self::get_field();
-				self::$field_id = self::$field['id'];
-			}
-
-			// Append ID to variable that holds the current scheme ID data.
-			$redux_options[ self::$field_id ] = $data;
-
-			// Save the modified settings.
-			update_option( $opt_name, $redux_options );
-		}
-	}
+                            // closing html tags.
+                            $html .= '</div>';
+                            $html .= '<span class="redux-label redux-layout-label">' . esc_attr( $v['title'] ) . '</span>';
+                            $html .= '</li>';
+                        }
+                    }
+                    $html .= '</ul>';
+
+                    $html .= '<hr class="redux-color-scheme-blank-hr">';
+
+                    if ( $is_accordion ) {
+                        $html .= '</div>';
+                    }
+
+                    $html .= '</div>';
+                }
+
+                // Close list.
+                $html .= '</ul>';
+            }
+
+            // html var not empty, return it.
+            if ( ! empty( $html ) ) {
+                return $html;
+            }
+
+            return '';
+        }
+
+        /**
+         * Get color block class.
+         *
+         * @param array  $field Field array.
+         * @param string $id    Field ID.
+         *
+         * @return string
+         */
+        private static function get_color_block_class( array $field, string $id ): string {
+            $def = $field['default'];
+
+            if ( ! empty( $def ) ) {
+                foreach ( $def as $arr ) {
+                    if ( $arr['id'] === $id ) {
+                        if ( isset( $arr['class'] ) ) {
+                            return $arr['class'];
+                        }
+                    }
+                }
+            }
+
+            return '';
+        }
+
+        /**
+         * Get tooltip data.
+         *
+         * @param array  $field Field array.
+         * @param string $id    Field ID.
+         *
+         * @return mixed
+         */
+        private static function get_tooltip_data( array $field, string $id ) {
+            $def = $field['default'];
+
+            if ( ! empty( $def ) ) {
+                foreach ( $def as $arr ) {
+                    if ( $arr['id'] === $id ) {
+                        if ( isset( $arr['tooltip'] ) ) {
+                            return $arr['tooltip'];
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Get hidden blocks.
+         *
+         * @param array  $field Field ID.
+         * @param string $id    Field ID.
+         *
+         * @return bool
+         */
+        private static function get_block_hidden( array $field, string $id ): bool {
+            $def = $field['default'];
+
+            if ( ! empty( $def ) ) {
+                foreach ( $def as $arr ) {
+                    if ( $arr['id'] === $id ) {
+                        if ( isset( $arr['hidden'] ) ) {
+                            return $arr['hidden'];
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Returns scheme file contents.
+         *
+         * @since       1.0.0
+         * @access      public static
+         *
+         * @return      array Array of scheme data.
+         */
+        public static function read_scheme_file() {
+            $key  = self::get_scheme_key();
+            $data = get_option( $key );
+
+            if ( empty( $data ) ) {
+                $arr_data = false;
+            } else {
+                $arr_data = $data;
+            }
+
+            return $arr_data;
+        }
+
+        /**
+         * Sets scheme file contents.
+         *
+         * @param       array $arr_data PHP array of data to encode.
+         *
+         * @return      bool Result of write function.
+         * @since       1.0.0
+         * @access      public static
+         */
+        public static function write_scheme_file( array $arr_data ): bool {
+            $key = self::get_scheme_key();
+
+            return update_option( $key, $arr_data );
+        }
+
+        /**
+         * Gets individual scheme data from scheme JSON file.
+         *
+         * @param       string $scheme_name Name of scheme.
+         *
+         * @return      mixed PHP array of scheme data.
+         * @since       1.0.0
+         * @access      public static
+         */
+        public static function get_scheme_data( string $scheme_name ) {
+            $data = self::read_scheme_file();
+
+            if ( false === $data ) {
+                return false;
+            }
+
+            return $data[ $scheme_name ];
+        }
+
+        /**
+         * Sets individual scheme data to scheme JSON file.
+         *
+         * @param string $name  Name of a scheme to save.
+         * @param array  $arr   Scheme data to encode.
+         *
+         * @return      bool Result of file written.
+         * @since       1.0.0
+         * @access      public static
+         */
+        public static function set_scheme_data( string $name, array $arr ): bool {
+
+            // Create blank array.
+            $new_scheme = array();
+
+            // If name is present.
+            if ( $name ) {
+
+                // then add the name at the new array's key.
+                $new_scheme['color_scheme_name'] = $name;
+
+                // Enum through values and assign them to new array.
+                foreach ( $arr as $val ) {
+                    if ( isset( $val['id'] ) ) {
+                        $new_scheme[ $val['id'] ] = $val;
+                    }
+                }
+
+                // read the contents of the current scheme file.
+                $schemes = self::read_scheme_file();
+
+                // If returned false (not there) then create a new array.
+                if ( false === $schemes ) {
+                    $schemes = array();
+                }
+
+                $scheme_data = $schemes[ $name ] ?? '';
+
+                if ( $scheme_data !== $new_scheme ) {
+
+                    // Add new scheme to array that will be saved.
+                    $schemes[ $name ] = $new_scheme;
+
+                    // Write the data to the JSON file.
+                    return self::write_scheme_file( $schemes );
+                }
+            }
+
+            // !success
+            return false;
+        }
+
+        /**
+         * Enumerate the scheme names from the JSON store file.
+         *
+         * @since       1.0.0
+         * @access      public static
+         * @return      array Array of stored scheme names.
+         */
+        public static function get_scheme_names(): array {
+
+            // Read the JSON file, which returns a PHP array.
+            $schemes = self::read_scheme_file();
+
+            // Create a new array.
+            $output = array();
+
+            if ( false !== $schemes ) {
+
+                // If the schemes array IS an array (versus false), then...
+                if ( is_array( $schemes ) ) {
+
+                    // Enum them.
+                    foreach ( $schemes as $scheme ) {
+
+                        // If the color_scheme_name key is set...
+                        if ( isset( $scheme['color_scheme_name'] ) ) {
+
+                            // Push it onto the array stack.
+                            $output[] = $scheme['color_scheme_name'];
+                        }
+                    }
+                }
+            }
+
+            // Kick the full array out the door.
+            return $output;
+        }
+
+        /**
+         * Get data array from scheme.
+         *
+         * @param string $scheme Scheme name.
+         *
+         * @return array
+         */
+        public static function data_array_from_scheme( string $scheme ): array {
+
+            // Get scheme data from JSON file.
+            $data = self::get_scheme_data( $scheme );
+            if ( false === $data ) {
+                return array();
+            }
+
+            // Don't need to save select arrays to database,
+            // just the id => value.
+            if ( ! empty( $data ) ) {
+                foreach ( $data as $k => $v ) {
+                    if ( isset( $v['type'] ) ) {
+                        $val = $v['value'];
+
+                        unset( $data[ $k ] );
+
+                        $data[ $k ] = $val;
+                    }
+                }
+            }
+
+            return $data;
+        }
+
+        /**
+         * Sets current scheme to database.
+         *
+         * @param       string $scheme Current scheme name.
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      private
+         */
+        public static function set_database_data( string $scheme = 'Default' ) {
+
+            $data = self::data_array_from_scheme( $scheme );
+
+            // Get opt name, for database.
+            $opt_name = self::$parent->args['opt_name'];
+
+            // Get all options from database.
+            $redux_options = get_option( $opt_name );
+
+            if ( empty( self::$field_id ) ) {
+                self::$field    = self::get_field();
+                self::$field_id = self::$field['id'];
+            }
+
+            // Append ID to variable that holds the current scheme ID data.
+            $redux_options[ self::$field_id ] = $data;
+
+            // Save the modified settings.
+            update_option( $opt_name, $redux_options );
+        }
+    }
 }

redux-core/inc/classes/class-redux-thirdparty-fixes.php

Indentation +113 added lines, -113 removed lines

@@ -11,117 +11,117 @@
 
 if ( ! class_exists( 'Redux_ThirdParty_Fixes', false ) ) {
 
-	/**
-	 * Class Redux_ThirdParty_Fixes
-	 */
-	class Redux_ThirdParty_Fixes extends Redux_Class {
-
-		/**
-		 * Redux_ThirdParty_Fixes constructor.
-		 *
-		 * @param object $redux ReduxFramework pointer.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux );
-
-			$this->gt3_page_builder();
-
-			// These are necessary to override an outdated extension embedded in themes
-			// that are loaded via the antiquated 'loader.php' method.
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/repeater', array( $this, 'repeater_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/metaboxes', array( $this, 'metaboxes_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/social_profiles', array( $this, 'social_profiles_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/widget_areas', array( $this, 'widget_areas_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/custom_fonts', array( $this, 'custom_fonts_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/icon_select', array( $this, 'icon_select_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/color_scheme', array( $this, 'color_scheme_extension_override' ) );
-			add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/accordion', array( $this, 'accordion_extension_override' ) );
-		}
-
-		/**
-		 * Search extension override.
-		 *
-		 * @return string
-		 */
-		public function accordion_extension_override(): string {
-			return Redux_Core::$dir . 'inc/extensions/accordion/class-redux-extension-accordion.php';
-		}
-
-		/**
-		 * Color Scheme extension override.
-		 *
-		 * @return string
-		 */
-		public function color_scheme_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/color_scheme/class-redux-extension-color-scheme.php';
-		}
-
-		/**
-		 * Icon Select extension override.
-		 *
-		 * @return string
-		 */
-		public function icon_select_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/icon_select/class-redux-extension-icon-select.php';
-		}
-
-		/**
-		 * Widget Area extension override.
-		 *
-		 * @return string
-		 */
-		public function custom_fonts_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/custom_fonts/class-redux-extension-custom-fonts.php';
-		}
-
-		/**
-		 * Widget Area extension override.
-		 *
-		 * @return string
-		 */
-		public function widget_areas_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/widget_areas/class-redux-extension-widget-areas.php';
-		}
-
-		/**
-		 * Repeater extension override.
-		 *
-		 * @return string
-		 */
-		public function repeater_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/repeater/class-redux-extension-repeater.php';
-		}
-
-		/**
-		 * Metaboxes extension override.
-		 *
-		 * @return string
-		 */
-		public function metaboxes_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/metaboxes/class-redux-extension-metaboxes.php';
-		}
-
-		/**
-		 * Social Profiles extension override.
-		 *
-		 * @return string
-		 */
-		public function social_profiles_extension_override(): string {
-			return Redux_core::$dir . 'inc/extensions/social_profiles/class-redux-extension-social-profiles.php';
-		}
-
-		/**
-		 * GT3 Page Builder fix.
-		 */
-		private function gt3_page_builder() {
-			// Fix for the GT3 page builder: http://www.gt3themes.com/wordpress-gt3-page-builder-plugin/.
-			if ( has_action( 'ecpt_field_options_' ) ) {
-				global $pagenow;
-
-				if ( 'admin.php' === $pagenow ) {
-					remove_action( 'admin_init', 'pb_admin_init' );
-				}
-			}
-		}
-	}
+    /**
+     * Class Redux_ThirdParty_Fixes
+     */
+    class Redux_ThirdParty_Fixes extends Redux_Class {
+
+        /**
+         * Redux_ThirdParty_Fixes constructor.
+         *
+         * @param object $redux ReduxFramework pointer.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux );
+
+            $this->gt3_page_builder();
+
+            // These are necessary to override an outdated extension embedded in themes
+            // that are loaded via the antiquated 'loader.php' method.
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/repeater', array( $this, 'repeater_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/metaboxes', array( $this, 'metaboxes_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/social_profiles', array( $this, 'social_profiles_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/widget_areas', array( $this, 'widget_areas_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/custom_fonts', array( $this, 'custom_fonts_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/icon_select', array( $this, 'icon_select_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/color_scheme', array( $this, 'color_scheme_extension_override' ) );
+            add_filter( 'redux/extension/' . $this->parent->args['opt_name'] . '/accordion', array( $this, 'accordion_extension_override' ) );
+        }
+
+        /**
+         * Search extension override.
+         *
+         * @return string
+         */
+        public function accordion_extension_override(): string {
+            return Redux_Core::$dir . 'inc/extensions/accordion/class-redux-extension-accordion.php';
+        }
+
+        /**
+         * Color Scheme extension override.
+         *
+         * @return string
+         */
+        public function color_scheme_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/color_scheme/class-redux-extension-color-scheme.php';
+        }
+
+        /**
+         * Icon Select extension override.
+         *
+         * @return string
+         */
+        public function icon_select_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/icon_select/class-redux-extension-icon-select.php';
+        }
+
+        /**
+         * Widget Area extension override.
+         *
+         * @return string
+         */
+        public function custom_fonts_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/custom_fonts/class-redux-extension-custom-fonts.php';
+        }
+
+        /**
+         * Widget Area extension override.
+         *
+         * @return string
+         */
+        public function widget_areas_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/widget_areas/class-redux-extension-widget-areas.php';
+        }
+
+        /**
+         * Repeater extension override.
+         *
+         * @return string
+         */
+        public function repeater_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/repeater/class-redux-extension-repeater.php';
+        }
+
+        /**
+         * Metaboxes extension override.
+         *
+         * @return string
+         */
+        public function metaboxes_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/metaboxes/class-redux-extension-metaboxes.php';
+        }
+
+        /**
+         * Social Profiles extension override.
+         *
+         * @return string
+         */
+        public function social_profiles_extension_override(): string {
+            return Redux_core::$dir . 'inc/extensions/social_profiles/class-redux-extension-social-profiles.php';
+        }
+
+        /**
+         * GT3 Page Builder fix.
+         */
+        private function gt3_page_builder() {
+            // Fix for the GT3 page builder: http://www.gt3themes.com/wordpress-gt3-page-builder-plugin/.
+            if ( has_action( 'ecpt_field_options_' ) ) {
+                global $pagenow;
+
+                if ( 'admin.php' === $pagenow ) {
+                    remove_action( 'admin_init', 'pb_admin_init' );
+                }
+            }
+        }
+    }
 }

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

Indentation +21 added lines, -21 removed lines

@@ -15,29 +15,29 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Search' ) ) {
 
-	/**
-	 * Class Redux_Extension_Search
-	 */
-	class Redux_Extension_Search extends Redux_Extension_Abstract {
+    /**
+     * Class Redux_Extension_Search
+     */
+    class Redux_Extension_Search extends Redux_Extension_Abstract {
 
-		/**
-		 * Extension Friendly Name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Search (Inactive Placeholder)';
+        /**
+         * Extension Friendly Name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Search (Inactive Placeholder)';
 
-		/**
-		 * Redux_Extension_Search constructor.
-		 *
-		 * @param object $redux ReduxFramework Object pointer.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux, __FILE__ );
+        /**
+         * Redux_Extension_Search constructor.
+         *
+         * @param object $redux ReduxFramework Object pointer.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux, __FILE__ );
 
-			// Nothing here.
-		}
-	}
+            // Nothing here.
+        }
+    }
 
-	class_alias( Redux_Extension_Search::class, 'ReduxFramework_Extension_search' );
+    class_alias( Redux_Extension_Search::class, 'ReduxFramework_Extension_search' );
 }

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

Indentation +26 added lines, -26 removed lines

@@ -17,34 +17,34 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Datetime', false ) ) {
 
-	/**
-	 * Class Redux_Extension_Datetime
-	 */
-	class Redux_Extension_Datetime extends Redux_Extension_Abstract {
+    /**
+     * Class Redux_Extension_Datetime
+     */
+    class Redux_Extension_Datetime extends Redux_Extension_Abstract {
 
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.3.15';
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.3.15';
 
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Date/Time';
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Date/Time';
 
-		/**
-		 * Redux_Extension_Datetime constructor.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework pointer.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux, __FILE__ );
+        /**
+         * Redux_Extension_Datetime constructor.
+         *
+         * @param ReduxFramework $redux ReduxFramework pointer.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux, __FILE__ );
 
-			$this->add_field( 'datetime' );
-		}
-	}
+            $this->add_field( 'datetime' );
+        }
+    }
 }

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

Indentation +39 added lines, -39 removed lines

@@ -16,43 +16,43 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Accordion' ) ) {
 
-	/**
-	 * Main ReduxFramework_Extension_Accordion extension class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Extension_Accordion extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.3.16';
-
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Accordion';
-
-		/**
-		 * Class Constructor. Defines the args for the extension 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( 'accordion' );
-		}
-	}
-
-	class_alias( Redux_Extension_Accordion::class, 'ReduxFramework_Extension_Accordion' );
+    /**
+     * Main ReduxFramework_Extension_Accordion extension class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Extension_Accordion extends Redux_Extension_Abstract {
+
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.3.16';
+
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Accordion';
+
+        /**
+         * Class Constructor. Defines the args for the extension 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( 'accordion' );
+        }
+    }
+
+    class_alias( Redux_Extension_Accordion::class, 'ReduxFramework_Extension_Accordion' );
 }

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

Indentation +39 added lines, -39 removed lines

@@ -13,43 +13,43 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Extension_Shortcodes' ) ) {
 
-	/**
-	 * Class Redux_Extension_Shortcodes
-	 */
-	class Redux_Extension_Shortcodes extends Redux_Extension_Abstract {
-
-		/**
-		 * Extension Version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.3.6';
-
-		/**
-		 * Extension Friendly Name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'Shortcodes';
-
-		/**
-		 * Redux_Extension_Shortcodes constructor.
-		 *
-		 * @param object $redux ReduxFramework Object pointer.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux, __FILE__ );
-
-			$this->add_field( 'shortcodes' );
-
-			if ( ! class_exists( 'Redux_Shortcodes' ) ) {
-				require_once __DIR__ . '/class-redux-shortcodes.php';
-				new Redux_Shortcodes();
-			}
-
-			// Allow users to extend if they want.
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( 'redux/shortcodes/' . $redux->args['opt_name'] . '/construct' );
-		}
-	}
+    /**
+     * Class Redux_Extension_Shortcodes
+     */
+    class Redux_Extension_Shortcodes extends Redux_Extension_Abstract {
+
+        /**
+         * Extension Version.
+         *
+         * @var string
+         */
+        public static $version = '4.3.6';
+
+        /**
+         * Extension Friendly Name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'Shortcodes';
+
+        /**
+         * Redux_Extension_Shortcodes constructor.
+         *
+         * @param object $redux ReduxFramework Object pointer.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux, __FILE__ );
+
+            $this->add_field( 'shortcodes' );
+
+            if ( ! class_exists( 'Redux_Shortcodes' ) ) {
+                require_once __DIR__ . '/class-redux-shortcodes.php';
+                new Redux_Shortcodes();
+            }
+
+            // Allow users to extend if they want.
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( 'redux/shortcodes/' . $redux->args['opt_name'] . '/construct' );
+        }
+    }
 }

redux-core/inc/extensions/js_button/class-redux-extension-js-button.php

Indentation +33 added lines, -33 removed lines

@@ -12,41 +12,41 @@
 
 if ( ! class_exists( 'Redux_Extension_Js_Button' ) ) {
 
-	/**
-	 * Main Redux_Extension_Js_Button extension class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Extension_Js_Button extends Redux_Extension_Abstract {
+    /**
+     * Main Redux_Extension_Js_Button extension class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Extension_Js_Button extends Redux_Extension_Abstract {
 
-		/**
-		 * Extension version.
-		 *
-		 * @var string
-		 */
-		public static $version = '4.3.16';
+        /**
+         * Extension version.
+         *
+         * @var string
+         */
+        public static $version = '4.3.16';
 
-		/**
-		 * Extension friendly name.
-		 *
-		 * @var string
-		 */
-		public string $extension_name = 'JS Button';
+        /**
+         * Extension friendly name.
+         *
+         * @var string
+         */
+        public string $extension_name = 'JS Button';
 
-		/**
-		 * 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__ );
+        /**
+         * 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( 'js_button' );
-		}
-	}
+            $this->add_field( 'js_button' );
+        }
+    }
 }