reduxframework / redux-framework

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

Spacing +7 added lines, -7 removed lines

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

Indentation +237 added lines, -237 removed lines

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

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

Indentation +212 added lines, -212 removed lines

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

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

Indentation +44 added lines, -44 removed lines

@@ -13,25 +13,25 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Date', false ) ) {
 
-	/**
-	 * Main Redux_date class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Date extends Redux_Field {
+    /**
+     * Main Redux_date class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Date extends Redux_Field {
 
-		/**
-		 * 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() {
-			$placeholder = $this->field['placeholder'] ?? '';
+        /**
+         * 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() {
+            $placeholder = $this->field['placeholder'] ?? '';
 
-			echo '<input
+            echo '<input
 					data-id="' . esc_attr( $this->field['id'] ) . '"
 					type="text"
 					id="' . esc_attr( $this->field['id'] ) . '-date"
@@ -39,35 +39,35 @@ 
 					value="' . esc_attr( $this->value ) . '"
 					placeholder="' . esc_attr( $placeholder ) . '"
 					class="redux-datepicker regular-text ' . esc_attr( $this->field['class'] ) . '" />';
-		}
+        }
 
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since         1.0.0
-		 * @access        public
-		 * @return        void
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-date',
-					Redux_Core::$url . 'inc/fields/date/redux-date.css',
-					array(),
-					$this->timestamp
-				);
-			}
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since         1.0.0
+         * @access        public
+         * @return        void
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-date',
+                    Redux_Core::$url . 'inc/fields/date/redux-date.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
 
-			wp_enqueue_script(
-				'redux-field-date',
-				Redux_Core::$url . 'inc/fields/date/redux-date' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+            wp_enqueue_script(
+                'redux-field-date',
+                Redux_Core::$url . 'inc/fields/date/redux-date' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Date', 'ReduxFramework_Date' );

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

Indentation +200 added lines, -200 removed lines

@@ -11,206 +11,206 @@
 
 if ( ! class_exists( 'Redux_Spinner', false ) ) {
 
-	/**
-	 * Class Redux_Spinner
-	 */
-	class Redux_Spinner extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$params = array(
-				'min'     => 0,
-				'max'     => 1,
-				'step'    => 1,
-				'default' => '',
-				'edit'    => true,
-				'plus'    => '+',
-				'minus'   => '-',
-				'format'  => '',
-				'prefix'  => '',
-				'suffix'  => '',
-				'point'   => '.',
-				'places'  => null,
-			);
-
-			$this->field = wp_parse_args( $this->field, $params );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function render() {
-			$data_string = '';
-
-			foreach ( $this->field as $key => $val ) {
-				if ( in_array( $key, array( 'min', 'max', 'step', 'default', 'plus', 'minus', 'prefix', 'suffix', 'point', 'places' ), true ) ) {
-					$data_string .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			}
-
-			$data_string .= ' data-val=' . $this->value;
-
-			// Don't allow input edit if there's a step.
-			$readonly = '';
-			if ( isset( $this->field['edit'] ) && false === $this->field['edit'] ) {
-				$readonly = ' readonly="readonly"';
-			}
-
-			echo '<div id="' . esc_attr( $this->field['id'] ) . '-spinner" class="redux_spinner" rel="' . esc_attr( $this->field['id'] ) . '">';
-
-			echo '<input type="text" ' . $data_string . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" id="' . esc_attr( $this->field['id'] ) . '" value="' . esc_attr( $this->value ) . '" class="mini spinner-input ' . esc_attr( $this->field['class'] ) . '"' . $readonly . '/>'; // phpcs:ignore WordPress.Security.EscapeOutput
-
-			echo '</div>';
-		}
-
-		/**
-		 * Clean the field data to the fields defaults given the parameters.
-		 *
-		 * @since Redux_Framework 3.1.1
-		 */
-		private function clean() {
-			if ( empty( $this->field['min'] ) ) {
-				$this->field['min'] = 0;
-			} else {
-				$this->field['min'] = intval( $this->field['min'] );
-			}
-
-			if ( empty( $this->field['max'] ) ) {
-				$this->field['max'] = $this->field['min'] + 1;
-			} else {
-				$this->field['max'] = intval( $this->field['max'] );
-			}
-
-			if ( empty( $this->field['step'] ) || $this->field['step'] > $this->field['max'] ) {
-				$this->field['step'] = 1;
-			} else {
-				$this->field['step'] = intval( $this->field['step'] );
-			}
-
-			if ( empty( $this->value ) && ! empty( $this->field['default'] ) && $this->field['min'] >= 1 ) {
-				$this->value = intval( $this->field['default'] );
-			}
-
-			if ( empty( $this->value ) && $this->field['min'] >= 1 ) {
-				$this->value = $this->field['min'];
-			}
-
-			if ( empty( $this->value ) ) {
-				$this->value = 0;
-			}
-
-			// Extra Validation.
-			if ( $this->value < $this->field['min'] ) {
-				$this->value = $this->field['min'];
-			} elseif ( $this->value > $this->field['max'] ) {
-				$this->value = $this->field['max'];
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function enqueue() {
-			wp_enqueue_script(
-				'redux-field-spinner-custom',
-				Redux_Core::$url . 'inc/fields/spinner/vendor/jquery.ui.spinner' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			wp_enqueue_script(
-				'redux-field-spinner',
-				Redux_Core::$url . 'inc/fields/spinner/redux-spinner' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-field-spinner-custom', 'jquery-ui-core', 'jquery-ui-dialog', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-spinner',
-					Redux_Core::$url . 'inc/fields/spinner/redux-spinner.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * CSS/compiler output.
-		 *
-		 * @param string|null|array $style CSS styles.
-		 */
-		public function output( $style = '' ) {
-			if ( ! empty( $this->value ) ) {
-				if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
-					$css                      = $this->parse_css( $this->value, $this->field['output'] );
-					$this->parent->outputCSS .= esc_attr( $css );
-				}
-
-				if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
-					$css                        = $this->parse_css( $this->value, $this->field['compiler'] );
-					$this->parent->compilerCSS .= esc_attr( $css );
-				}
-			}
-		}
-
-		/**
-		 * Compile CSS data for output.
-		 *
-		 * @param mixed $value Value.
-		 * @param mixed $output .
-		 *
-		 * @return string
-		 */
-		private function parse_css( $value, $output ): string {
-			// No notices.
-			$css = '';
-
-			$unit = $this->field['output_unit'] ?? 'px';
-
-			// Must be an array.
-			if ( is_array( $output ) ) {
-				foreach ( $output as $selector => $mode ) {
-					if ( '' !== $mode && '' !== $selector ) {
-						$css .= $selector . '{' . $mode . ':' . $value . $unit . ';}';
-					}
-				}
-			}
-
-			return $css;
-		}
-
-		/**
-		 * Generate CSS style (unused, but needed).
-		 *
-		 * @param string $data Field data.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			return '';
-		}
-
-		/**
-		 * 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 Redux_Spinner
+     */
+    class Redux_Spinner extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $params = array(
+                'min'     => 0,
+                'max'     => 1,
+                'step'    => 1,
+                'default' => '',
+                'edit'    => true,
+                'plus'    => '+',
+                'minus'   => '-',
+                'format'  => '',
+                'prefix'  => '',
+                'suffix'  => '',
+                'point'   => '.',
+                'places'  => null,
+            );
+
+            $this->field = wp_parse_args( $this->field, $params );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function render() {
+            $data_string = '';
+
+            foreach ( $this->field as $key => $val ) {
+                if ( in_array( $key, array( 'min', 'max', 'step', 'default', 'plus', 'minus', 'prefix', 'suffix', 'point', 'places' ), true ) ) {
+                    $data_string .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $val ) . '" ';
+                }
+            }
+
+            $data_string .= ' data-val=' . $this->value;
+
+            // Don't allow input edit if there's a step.
+            $readonly = '';
+            if ( isset( $this->field['edit'] ) && false === $this->field['edit'] ) {
+                $readonly = ' readonly="readonly"';
+            }
+
+            echo '<div id="' . esc_attr( $this->field['id'] ) . '-spinner" class="redux_spinner" rel="' . esc_attr( $this->field['id'] ) . '">';
+
+            echo '<input type="text" ' . $data_string . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" id="' . esc_attr( $this->field['id'] ) . '" value="' . esc_attr( $this->value ) . '" class="mini spinner-input ' . esc_attr( $this->field['class'] ) . '"' . $readonly . '/>'; // phpcs:ignore WordPress.Security.EscapeOutput
+
+            echo '</div>';
+        }
+
+        /**
+         * Clean the field data to the fields defaults given the parameters.
+         *
+         * @since Redux_Framework 3.1.1
+         */
+        private function clean() {
+            if ( empty( $this->field['min'] ) ) {
+                $this->field['min'] = 0;
+            } else {
+                $this->field['min'] = intval( $this->field['min'] );
+            }
+
+            if ( empty( $this->field['max'] ) ) {
+                $this->field['max'] = $this->field['min'] + 1;
+            } else {
+                $this->field['max'] = intval( $this->field['max'] );
+            }
+
+            if ( empty( $this->field['step'] ) || $this->field['step'] > $this->field['max'] ) {
+                $this->field['step'] = 1;
+            } else {
+                $this->field['step'] = intval( $this->field['step'] );
+            }
+
+            if ( empty( $this->value ) && ! empty( $this->field['default'] ) && $this->field['min'] >= 1 ) {
+                $this->value = intval( $this->field['default'] );
+            }
+
+            if ( empty( $this->value ) && $this->field['min'] >= 1 ) {
+                $this->value = $this->field['min'];
+            }
+
+            if ( empty( $this->value ) ) {
+                $this->value = 0;
+            }
+
+            // Extra Validation.
+            if ( $this->value < $this->field['min'] ) {
+                $this->value = $this->field['min'];
+            } elseif ( $this->value > $this->field['max'] ) {
+                $this->value = $this->field['max'];
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function enqueue() {
+            wp_enqueue_script(
+                'redux-field-spinner-custom',
+                Redux_Core::$url . 'inc/fields/spinner/vendor/jquery.ui.spinner' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            wp_enqueue_script(
+                'redux-field-spinner',
+                Redux_Core::$url . 'inc/fields/spinner/redux-spinner' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-field-spinner-custom', 'jquery-ui-core', 'jquery-ui-dialog', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-spinner',
+                    Redux_Core::$url . 'inc/fields/spinner/redux-spinner.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * CSS/compiler output.
+         *
+         * @param string|null|array $style CSS styles.
+         */
+        public function output( $style = '' ) {
+            if ( ! empty( $this->value ) ) {
+                if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
+                    $css                      = $this->parse_css( $this->value, $this->field['output'] );
+                    $this->parent->outputCSS .= esc_attr( $css );
+                }
+
+                if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
+                    $css                        = $this->parse_css( $this->value, $this->field['compiler'] );
+                    $this->parent->compilerCSS .= esc_attr( $css );
+                }
+            }
+        }
+
+        /**
+         * Compile CSS data for output.
+         *
+         * @param mixed $value Value.
+         * @param mixed $output .
+         *
+         * @return string
+         */
+        private function parse_css( $value, $output ): string {
+            // No notices.
+            $css = '';
+
+            $unit = $this->field['output_unit'] ?? 'px';
+
+            // Must be an array.
+            if ( is_array( $output ) ) {
+                foreach ( $output as $selector => $mode ) {
+                    if ( '' !== $mode && '' !== $selector ) {
+                        $css .= $selector . '{' . $mode . ':' . $value . $unit . ';}';
+                    }
+                }
+            }
+
+            return $css;
+        }
+
+        /**
+         * Generate CSS style (unused, but needed).
+         *
+         * @param string $data Field data.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            return '';
+        }
+
+        /**
+         * 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_Spinner', 'ReduxFramework_Spinner' );

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

Indentation +36 added lines, -36 removed lines

@@ -12,53 +12,53 @@
 
 if ( ! class_exists( 'Redux_Radio', false ) ) {
 
-	/**
-	 * Class Redux_Radio
-	 */
-	class Redux_Radio extends Redux_Field {
+    /**
+     * Class Redux_Radio
+     */
+    class Redux_Radio extends Redux_Field {
 
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
-				if ( empty( $this->field['args'] ) ) {
-					$this->field['args'] = array();
-				}
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
+                if ( empty( $this->field['args'] ) ) {
+                    $this->field['args'] = array();
+                }
 
-				if ( is_array( $this->field['data'] ) ) {
-					$this->field['options'] = $this->field['data'];
-				} else {
-					$this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
-				}
-			}
+                if ( is_array( $this->field['data'] ) ) {
+                    $this->field['options'] = $this->field['data'];
+                } else {
+                    $this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
+                }
+            }
 
-			$this->field['data_class'] = ( isset( $this->field['multi_layout'] ) ) ? 'data-' . $this->field['multi_layout'] : 'data-full';
+            $this->field['data_class'] = ( isset( $this->field['multi_layout'] ) ) ? 'data-' . $this->field['multi_layout'] : 'data-full';
 
-			if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
-				echo '<ul class="' . esc_attr( $this->field['data_class'] ) . '">';
+            if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
+                echo '<ul class="' . esc_attr( $this->field['data_class'] ) . '">';
 
-				foreach ( $this->field['options'] as $k => $v ) {
-					echo '<li>';
-					echo '<label for="' . esc_attr( $this->field['id'] . '_' . array_search( $k, array_keys( $this->field['options'] ), true ) ) . '">';
-					echo '<input
+                foreach ( $this->field['options'] as $k => $v ) {
+                    echo '<li>';
+                    echo '<label for="' . esc_attr( $this->field['id'] . '_' . array_search( $k, array_keys( $this->field['options'] ), true ) ) . '">';
+                    echo '<input
 							type="radio"
 							class="radio ' . esc_attr( $this->field['class'] ) . '"
 							id="' . esc_attr( $this->field['id'] . '_' . array_search( $k, array_keys( $this->field['options'] ), true ) ) . '"
 							name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"
 							value="' . esc_attr( $k ) . '" ' . ( ! is_array( $this->value ) ? checked( $this->value, $k, false ) : '' ) . '/>';
-					echo ' <span>' . wp_kses_post( $v ) . '</span>';
-					echo '</label>';
-					echo '</li>';
-				}
+                    echo ' <span>' . wp_kses_post( $v ) . '</span>';
+                    echo '</label>';
+                    echo '</li>';
+                }
 
-				echo '</ul>';
-			}
-		}
-	}
+                echo '</ul>';
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Radio', 'ReduxFramework_Radio' );

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

Indentation +88 added lines, -88 removed lines

@@ -12,94 +12,94 @@
 
 if ( ! class_exists( 'Redux_Text', false ) ) {
 
-	/**
-	 * Class Redux_Text
-	 */
-	class Redux_Text extends Redux_Field {
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
-				if ( empty( $this->field['args'] ) ) {
-					$this->field['args'] = array();
-				}
-
-				$this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
-				$this->field['class']  .= ' hasOptions ';
-			}
-
-			if ( empty( $this->value ) && ! empty( $this->field['data'] ) && ! empty( $this->field['options'] ) ) {
-				$this->value = $this->field['options'];
-			}
-
-			$qtip_title = isset( $this->field['text_hint']['title'] ) ? 'qtip-title="' . $this->field['text_hint']['title'] . '" ' : '';
-			$qtip_text  = isset( $this->field['text_hint']['content'] ) ? 'qtip-content="' . $this->field['text_hint']['content'] . '" ' : '';
-
-			$readonly     = ( isset( $this->field['readonly'] ) && $this->field['readonly'] ) ? ' readonly="readonly"' : '';
-			$autocomplete = ( isset( $this->field['autocomplete'] ) && false === $this->field['autocomplete'] ) ? ' autocomplete="off"' : '';
-
-			if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
-				$placeholder = '';
-
-				if ( isset( $this->field['placeholder'] ) ) {
-					$placeholder = $this->field['placeholder'];
-				}
-
-				foreach ( $this->field['options'] as $k => $v ) {
-					if ( ! empty( $placeholder ) ) {
-						$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
-					}
-
-					echo '<div class="input_wrapper">';
-					echo '<label for="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '">' . esc_html( $v ) . '</label> ';
-
-					$value = $this->value[ $k ] ?? '';
-					$value = ! empty( $this->value[ $k ] ) ? $this->value[ $k ] : '';
-
-					// phpcs:ignore WordPress.Security.EscapeOutput
-					echo '<input type="text" id="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '" ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) ) . ']" ' . $placeholder . ' value="' . esc_attr( $value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '" ' . esc_html( $readonly ) . esc_html( $autocomplete ) . '/><br />';
-					echo '</div>';
-				}
-			} else {
-				$placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
-
-				// phpcs:ignore WordPress.Security.EscapeOutput
-				echo '<input ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . 'type="text" id="' . esc_attr( $this->field['id'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" ' . $placeholder . 'value="' . esc_attr( $this->value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '"' . esc_html( $readonly ) . esc_html( $autocomplete ) . ' />';
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-text',
-					Redux_Core::$url . 'inc/fields/text/redux-text.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * 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 Redux_Text
+     */
+    class Redux_Text extends Redux_Field {
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
+                if ( empty( $this->field['args'] ) ) {
+                    $this->field['args'] = array();
+                }
+
+                $this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
+                $this->field['class']  .= ' hasOptions ';
+            }
+
+            if ( empty( $this->value ) && ! empty( $this->field['data'] ) && ! empty( $this->field['options'] ) ) {
+                $this->value = $this->field['options'];
+            }
+
+            $qtip_title = isset( $this->field['text_hint']['title'] ) ? 'qtip-title="' . $this->field['text_hint']['title'] . '" ' : '';
+            $qtip_text  = isset( $this->field['text_hint']['content'] ) ? 'qtip-content="' . $this->field['text_hint']['content'] . '" ' : '';
+
+            $readonly     = ( isset( $this->field['readonly'] ) && $this->field['readonly'] ) ? ' readonly="readonly"' : '';
+            $autocomplete = ( isset( $this->field['autocomplete'] ) && false === $this->field['autocomplete'] ) ? ' autocomplete="off"' : '';
+
+            if ( isset( $this->field['options'] ) && ! empty( $this->field['options'] ) ) {
+                $placeholder = '';
+
+                if ( isset( $this->field['placeholder'] ) ) {
+                    $placeholder = $this->field['placeholder'];
+                }
+
+                foreach ( $this->field['options'] as $k => $v ) {
+                    if ( ! empty( $placeholder ) ) {
+                        $placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
+                    }
+
+                    echo '<div class="input_wrapper">';
+                    echo '<label for="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '">' . esc_html( $v ) . '</label> ';
+
+                    $value = $this->value[ $k ] ?? '';
+                    $value = ! empty( $this->value[ $k ] ) ? $this->value[ $k ] : '';
+
+                    // phpcs:ignore WordPress.Security.EscapeOutput
+                    echo '<input type="text" id="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '" ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) ) . ']" ' . $placeholder . ' value="' . esc_attr( $value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '" ' . esc_html( $readonly ) . esc_html( $autocomplete ) . '/><br />';
+                    echo '</div>';
+                }
+            } else {
+                $placeholder = ( isset( $this->field['placeholder'] ) && ! is_array( $this->field['placeholder'] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'] ) . '" ' : '';
+
+                // phpcs:ignore WordPress.Security.EscapeOutput
+                echo '<input ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . 'type="text" id="' . esc_attr( $this->field['id'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" ' . $placeholder . 'value="' . esc_attr( $this->value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '"' . esc_html( $readonly ) . esc_html( $autocomplete ) . ' />';
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-text',
+                    Redux_Core::$url . 'inc/fields/text/redux-text.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * 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_Text', 'ReduxFramework_Text' );

Spacing +3 added lines, -3 removed lines

@@ -52,14 +52,14 @@
 
 				foreach ( $this->field['options'] as $k => $v ) {
 					if ( ! empty( $placeholder ) ) {
-						$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][ $k ] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][ $k ] ) . '" ' : '';
+						$placeholder = ( is_array( $this->field['placeholder'] ) && isset( $this->field['placeholder'][$k] ) ) ? ' placeholder="' . esc_attr( $this->field['placeholder'][$k] ) . '" ' : '';
 					}
 
 					echo '<div class="input_wrapper">';
 					echo '<label for="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '">' . esc_html( $v ) . '</label> ';
 
-					$value = $this->value[ $k ] ?? '';
-					$value = ! empty( $this->value[ $k ] ) ? $this->value[ $k ] : '';
+					$value = $this->value[$k] ?? '';
+					$value = ! empty( $this->value[$k] ) ? $this->value[$k] : '';
 
 					// phpcs:ignore WordPress.Security.EscapeOutput
 					echo '<input type="text" id="' . esc_attr( $this->field['id'] . '-text-' . $k ) . '" ' . esc_attr( $qtip_title ) . esc_attr( $qtip_text ) . ' name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) ) . ']" ' . $placeholder . ' value="' . esc_attr( $value ) . '" class="regular-text ' . esc_attr( $this->field['class'] ) . '" ' . esc_html( $readonly ) . esc_html( $autocomplete ) . '/><br />';

redux-templates/classes/class-init.php

Indentation +30 added lines, -30 removed lines

@@ -19,36 +19,36 @@
  */
 class Init {
 
-	/**
-	 * Init constructor.
-	 *
-	 * @access public
-	 */
-	public function __construct() {
-		global $pagenow;
-
-		if ( 'widgets.php' === $pagenow ) {
-			return;
-		}
-
-		require_once REDUXTEMPLATES_DIR_PATH . 'classes/class-templates.php';
-
-		add_action( 'init', array( $this, 'load' ) );
-
-		if ( did_action( 'init' ) ) { // In case the devs load it at the wrong place.
-			$this->load();
-		}
-	}
-
-	/**
-	 * Load everything up after init.
-	 *
-	 * @access public
-	 * @since 4.0.0
-	 */
-	public static function load() {
-		new ReduxTemplates\Templates();
-	}
+    /**
+     * Init constructor.
+     *
+     * @access public
+     */
+    public function __construct() {
+        global $pagenow;
+
+        if ( 'widgets.php' === $pagenow ) {
+            return;
+        }
+
+        require_once REDUXTEMPLATES_DIR_PATH . 'classes/class-templates.php';
+
+        add_action( 'init', array( $this, 'load' ) );
+
+        if ( did_action( 'init' ) ) { // In case the devs load it at the wrong place.
+            $this->load();
+        }
+    }
+
+    /**
+     * Load everything up after init.
+     *
+     * @access public
+     * @since 4.0.0
+     */
+    public static function load() {
+        new ReduxTemplates\Templates();
+    }
 }
 
 new Init();

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

Indentation +33 added lines, -33 removed lines

@@ -11,37 +11,37 @@ 
 
 if ( ! class_exists( 'Redux_Textarea', false ) ) {
 
-	/**
-	 * Class Redux_Textarea
-	 */
-	class Redux_Textarea extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'placeholder'  => '',
-				'rows'         => 6,
-				'autocomplete' => false,
-				'readonly'     => false,
-				'class'        => '',
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 * */
-		public function render() {
-			$readonly     = ( true === boolval( $this->field['readonly'] ) ) ? ' readonly' : '';
-			$autocomplete = ( true === boolval( $this->field['autocomplete'] ) ) ? 'on' : 'off';
-
-			?>
+    /**
+     * Class Redux_Textarea
+     */
+    class Redux_Textarea extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'placeholder'  => '',
+                'rows'         => 6,
+                'autocomplete' => false,
+                'readonly'     => false,
+                'class'        => '',
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         * */
+        public function render() {
+            $readonly     = ( true === boolval( $this->field['readonly'] ) ) ? ' readonly' : '';
+            $autocomplete = ( true === boolval( $this->field['autocomplete'] ) ) ? 'on' : 'off';
+
+            ?>
 			<label for="<?php echo esc_attr( $this->field['id'] ); ?>-textarea"></label>
 			<textarea <?php echo esc_html( $readonly ); ?>
 					name="<?php echo esc_attr( $this->field['name'] . $this->field['name_suffix'] ); ?>"
@@ -51,8 +51,8 @@ 
 					class="large-text <?php echo esc_attr( $this->field['class'] ); ?>"
 					rows="<?php echo esc_attr( $this->field['rows'] ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
 			<?php
-		}
-	}
+        }
+    }
 }
 
 class_alias( 'Redux_Textarea', 'ReduxFramework_Textarea' );

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

Indentation +406 added lines, -406 removed lines

@@ -12,396 +12,396 @@ 
 
 if ( ! class_exists( 'Redux_Panel', false ) ) {
 
-	/**
-	 * Class Redux_Panel
-	 */
-	class Redux_Panel {
-
-		/**
-		 * ReduxFramework object pointer.
-		 *
-		 * @var object
-		 */
-		public $parent = null;
-
-		/**
-		 * Path to templates dir.
-		 *
-		 * @var null|string
-		 */
-		public $template_path = null;
-
-		/**
-		 * Original template path.
-		 *
-		 * @var null
-		 */
-		public $original_path = null;
-
-		/**
-		 * Sets the path from the arg or via filter. Also calls the panel template function.
-		 *
-		 * @param object $redux ReduxFramework pointer.
-		 */
-		public function __construct( $redux ) {
-			$this->parent        = $redux;
-			$this->template_path = Redux_Core::$dir . 'templates/panel/';
-			$this->original_path = Redux_Core::$dir . 'templates/panel/';
-
-			if ( ! empty( $this->parent->args['templates_path'] ) ) {
-				$this->template_path = trailingslashit( $this->parent->args['templates_path'] );
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$this->template_path = trailingslashit( apply_filters( "redux/{$this->parent->args['opt_name']}/panel/templates_path", $this->template_path ) );
-		}
-
-		/**
-		 * Class init.
-		 */
-		public function init() {
-			$this->panel_template();
-		}
-
-		/**
-		 * Loads the panel templates where needed and provides the container for Redux
-		 */
-		private function panel_template() {
-			if ( $this->parent->args['dev_mode'] ) {
-				$this->template_file_check_notice();
-			}
-
-			/**
-			 * Action 'redux/{opt_name}/panel/before'
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/before" );
-
-			echo '<div class="wrap"><h2></h2></div>'; // Stupid hack for WordPress alerts and warnings.
-
-			echo '<div class="clear"></div>';
-			echo '<div class="wrap redux-wrap-div" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '">';
-
-			// Do we support JS?
-			echo '<noscript><div class="no-js">' . esc_html__( 'Warning- This options panel will not work properly without javascript!', 'redux-framework' ) . '</div></noscript>';
-
-			// Security is vital!
-			echo '<input type="hidden" class="redux-ajax-security" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '" id="ajaxsecurity" name="security" value="' . esc_attr( wp_create_nonce( 'redux_ajax_nonce' . $this->parent->args['opt_name'] ) ) . '" />';
-
-			/**
-			 * Action 'redux/page/{opt_name}/form/before'
-			 *
-			 * @param object $this ReduxFramework
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/page/{$this->parent->args['opt_name']}/form/before", $this );
-
-			if ( is_rtl() ) {
-				$this->parent->args['class'] = ' redux-rtl';
-			}
-
-			$this->get_template( 'container.tpl.php' );
-
-			/**
-			 * Action 'redux/page/{opt_name}/form/after'
-			 *
-			 * @param object $this ReduxFramework
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/page/{$this->parent->args['opt_name']}/form/after", $this );
-
-			echo '<div class="clear"></div>';
-			echo '</div>';
-
-			if ( true === $this->parent->args['dev_mode'] ) {
-				echo '<br /><div class="redux-timer">' . esc_html( get_num_queries() ) . ' queries in ' . esc_html( timer_stop() ) . ' seconds<br/>Redux is currently set to developer mode.</div>';
-			}
-
-			/**
-			 * Action 'redux/{opt_name}/panel/after'
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/after" );
-		}
-
-		/**
-		 * Calls the various notification bars and sets the appropriate templates.
-		 */
-		public function notification_bar() {
-			if ( isset( $this->parent->transients['last_save_mode'] ) ) {
-
-				if ( 'import' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/import'
-					 *
-					 * @param object $this ReduxFramework
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/import", $this, $this->parent->transients['changed_values'] );
-
-					echo '<div class="admin-notice notice-blue saved_notice">';
-
-					/**
-					 * Filter 'redux-imported-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings imported" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-imported-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Imported!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				} elseif ( 'defaults' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/reset'
-					 *
-					 * @param object $this ReduxFramework
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/reset", $this );
-
-					echo '<div class="saved_notice admin-notice notice-yellow">';
-
-					/**
-					 * Filter 'redux-defaults-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings imported" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-defaults-text-{$this->parent->args['opt_name']}", esc_html__( 'All Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				} elseif ( 'defaults_section' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/section/reset'
-					 *
-					 * @param object $this ReduxFramework
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/section/reset", $this );
-
-					echo '<div class="saved_notice admin-notice notice-yellow">';
-
-					/**
-					 * Filter 'redux-defaults-section-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings imported" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-defaults-section-text-{$this->parent->args['opt_name']}", esc_html__( 'Section Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				} elseif ( 'normal' === $this->parent->transients['last_save_mode'] ) {
-					/**
-					 * Action 'redux/options/{opt_name}/saved'
-					 *
-					 * @param mixed $value set/saved option value
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( "redux/options/{$this->parent->args['opt_name']}/saved", $this->parent->options, $this->parent->transients['changed_values'] );
-
-					echo '<div class="saved_notice admin-notice notice-green">';
-
-					/**
-					 * Filter 'redux-saved-text-{opt_name}'
-					 *
-					 * @param string $text Translated "settings saved" text.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					echo '<strong>' . esc_html( apply_filters( "redux-saved-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Saved!', 'redux-framework' ) ) ) . '</strong>';
-					echo '</div>';
-				}
-
-				unset( $this->parent->transients['last_save_mode'] );
-
-				$this->parent->transient_class->set();
-			}
-
-			/**
-			 * Action 'redux/options/{opt_name}/settings/changes'
-			 *
-			 * @param mixed $value set/saved option value
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/options/{$this->parent->args['opt_name']}/settings/change", $this->parent->options, $this->parent->transients['changed_values'] );
-
-			echo '<div class="redux-save-warn notice-yellow">';
-
-			/**
-			 * Filter 'redux-changed-text-{opt_name}'
-			 *
-			 * @param string $text Translated "settings have changed" text.
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			echo '<strong>' . esc_html( apply_filters( "redux-changed-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings have changed, you should save them!', 'redux-framework' ) ) ) . '</strong>';
-			echo '</div>';
-
-			/**
-			 * Action 'redux/options/{opt_name}/errors'
-			 *
-			 * @param array $this ->errors error information
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/options/{$this->parent->args['opt_name']}/errors", $this->parent->errors );
-
-			echo '<div class="redux-field-errors notice-red">';
-			echo '<strong>';
-			echo '<span></span> ' . esc_html__( 'error(s) were found!', 'redux-framework' );
-			echo '</strong>';
-			echo '</div>';
-
-			/**
-			 * Action 'redux/options/{opt_name}/warnings'
-			 *
-			 * @param array $this ->warnings warning information
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/options/{$this->parent->args['opt_name']}/warnings", $this->parent->warnings );
-
-			echo '<div class="redux-field-warnings notice-yellow">';
-			echo '<strong>';
-			echo '<span></span> ' . esc_html__( 'warning(s) were found!', 'redux-framework' );
-			echo '</strong>';
-			echo '</div>';
-		}
-
-		/**
-		 * Used to initialize the settings fields for this panel. Required for saving and redirect.
-		 */
-		private function init_settings_fields() {
-			// Must run or the page won't redirect properly.
-			settings_fields( "{$this->parent->args['opt_name']}_group" );
-		}
-
-		/**
-		 * Enable file deprecate warning from core.  This is necessary because the function is considered private.
-		 *
-		 * @return bool
-		 */
-		public function tick_file_deprecate_warning(): bool {
-			return true;
-		}
-
-		/**
-		 * Used to select the proper template. If it doesn't exist in the path, then the original template file is used.
-		 *
-		 * @param string $file Path to template file.
-		 */
-		public function get_template( string $file ) {
-			if ( empty( $file ) ) {
-				return;
-			}
-
-			if ( file_exists( $this->template_path . $file ) ) {
-				$path = $this->template_path . $file;
-			} else {
-				$path = $this->original_path . $file;
-			}
-
-			// Shim for v3 templates.
-			if ( ! file_exists( $path ) ) {
-				$old_file = $file;
-
-				add_filter( 'deprecated_file_trigger_error', array( $this, 'tick_file_deprecate_warning' ) );
-
-				$file = str_replace( '_', '-', $file );
-
-				_deprecated_file( esc_html( $old_file ), '4.0', esc_html( $file ), 'Please replace this outdated template with the current one from the Redux core.' );
-
-				if ( file_exists( $this->template_path . $file ) ) {
-					$path = $this->template_path . $file;
-				} else {
-					$path = $this->original_path . $file;
-				}
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/before' );
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$path = apply_filters( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file, $path );
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/after' );
-
-			if ( file_exists( $path ) ) {
-				if ( is_readable( $path ) ) {
-					require $path;
-				} else {
-					// translators: %1$s: template path.
-					echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s cannot be read. Please check the permissions for this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
-				}
-			} elseif ( file_exists( Redux_Core::$dir . 'templates/panel/' . $file ) ) {
-					require Redux_Core::$dir . 'templates/panel/' . $file;
-			} else {
-				// translators: %1$s: template path.
-				echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s does not exist. Please reinstall Redux to replace this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
-			}
-		}
-
-		/**
-		 * Scan the template files.
-		 *
-		 * @param string $template_path Path to template file.
-		 *
-		 * @return array
-		 */
-		public function scan_template_files( string $template_path ): array {
-			$files  = scandir( $template_path );
-			$result = array();
-			if ( $files ) {
-				foreach ( $files as $value ) {
-					if ( ! in_array( $value, array( '.', '..' ), true ) ) {
-						if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
-							$sub_files = self::scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
-							foreach ( $sub_files as $sub_file ) {
-								$result[] = $value . DIRECTORY_SEPARATOR . $sub_file;
-							}
-						} else {
-							$result[] = $value;
-						}
-					}
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Show a notice highlighting bad template files
-		 */
-		public function template_file_check_notice() {
-			if ( $this->original_path === $this->template_path ) {
-				return;
-			}
-
-			$core_templates = $this->scan_template_files( $this->original_path );
-
-			foreach ( $core_templates as $file ) {
-				$developer_theme_file = false;
-
-				if ( file_exists( $this->template_path . $file ) ) {
-					$developer_theme_file = $this->template_path . $file;
-				}
-
-				if ( $developer_theme_file ) {
-					$core_version      = Redux_Helpers::get_template_version( $this->original_path . $file );
-					$developer_version = Redux_Helpers::get_template_version( $developer_theme_file );
-
-					if ( $core_version && $developer_version && version_compare( $developer_version, $core_version, '<' ) ) {
-						?>
+    /**
+     * Class Redux_Panel
+     */
+    class Redux_Panel {
+
+        /**
+         * ReduxFramework object pointer.
+         *
+         * @var object
+         */
+        public $parent = null;
+
+        /**
+         * Path to templates dir.
+         *
+         * @var null|string
+         */
+        public $template_path = null;
+
+        /**
+         * Original template path.
+         *
+         * @var null
+         */
+        public $original_path = null;
+
+        /**
+         * Sets the path from the arg or via filter. Also calls the panel template function.
+         *
+         * @param object $redux ReduxFramework pointer.
+         */
+        public function __construct( $redux ) {
+            $this->parent        = $redux;
+            $this->template_path = Redux_Core::$dir . 'templates/panel/';
+            $this->original_path = Redux_Core::$dir . 'templates/panel/';
+
+            if ( ! empty( $this->parent->args['templates_path'] ) ) {
+                $this->template_path = trailingslashit( $this->parent->args['templates_path'] );
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $this->template_path = trailingslashit( apply_filters( "redux/{$this->parent->args['opt_name']}/panel/templates_path", $this->template_path ) );
+        }
+
+        /**
+         * Class init.
+         */
+        public function init() {
+            $this->panel_template();
+        }
+
+        /**
+         * Loads the panel templates where needed and provides the container for Redux
+         */
+        private function panel_template() {
+            if ( $this->parent->args['dev_mode'] ) {
+                $this->template_file_check_notice();
+            }
+
+            /**
+             * Action 'redux/{opt_name}/panel/before'
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/before" );
+
+            echo '<div class="wrap"><h2></h2></div>'; // Stupid hack for WordPress alerts and warnings.
+
+            echo '<div class="clear"></div>';
+            echo '<div class="wrap redux-wrap-div" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '">';
+
+            // Do we support JS?
+            echo '<noscript><div class="no-js">' . esc_html__( 'Warning- This options panel will not work properly without javascript!', 'redux-framework' ) . '</div></noscript>';
+
+            // Security is vital!
+            echo '<input type="hidden" class="redux-ajax-security" data-opt-name="' . esc_attr( $this->parent->args['opt_name'] ) . '" id="ajaxsecurity" name="security" value="' . esc_attr( wp_create_nonce( 'redux_ajax_nonce' . $this->parent->args['opt_name'] ) ) . '" />';
+
+            /**
+             * Action 'redux/page/{opt_name}/form/before'
+             *
+             * @param object $this ReduxFramework
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/page/{$this->parent->args['opt_name']}/form/before", $this );
+
+            if ( is_rtl() ) {
+                $this->parent->args['class'] = ' redux-rtl';
+            }
+
+            $this->get_template( 'container.tpl.php' );
+
+            /**
+             * Action 'redux/page/{opt_name}/form/after'
+             *
+             * @param object $this ReduxFramework
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/page/{$this->parent->args['opt_name']}/form/after", $this );
+
+            echo '<div class="clear"></div>';
+            echo '</div>';
+
+            if ( true === $this->parent->args['dev_mode'] ) {
+                echo '<br /><div class="redux-timer">' . esc_html( get_num_queries() ) . ' queries in ' . esc_html( timer_stop() ) . ' seconds<br/>Redux is currently set to developer mode.</div>';
+            }
+
+            /**
+             * Action 'redux/{opt_name}/panel/after'
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/after" );
+        }
+
+        /**
+         * Calls the various notification bars and sets the appropriate templates.
+         */
+        public function notification_bar() {
+            if ( isset( $this->parent->transients['last_save_mode'] ) ) {
+
+                if ( 'import' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/import'
+                     *
+                     * @param object $this ReduxFramework
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/import", $this, $this->parent->transients['changed_values'] );
+
+                    echo '<div class="admin-notice notice-blue saved_notice">';
+
+                    /**
+                     * Filter 'redux-imported-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings imported" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-imported-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Imported!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                } elseif ( 'defaults' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/reset'
+                     *
+                     * @param object $this ReduxFramework
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/reset", $this );
+
+                    echo '<div class="saved_notice admin-notice notice-yellow">';
+
+                    /**
+                     * Filter 'redux-defaults-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings imported" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-defaults-text-{$this->parent->args['opt_name']}", esc_html__( 'All Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                } elseif ( 'defaults_section' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/section/reset'
+                     *
+                     * @param object $this ReduxFramework
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/section/reset", $this );
+
+                    echo '<div class="saved_notice admin-notice notice-yellow">';
+
+                    /**
+                     * Filter 'redux-defaults-section-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings imported" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-defaults-section-text-{$this->parent->args['opt_name']}", esc_html__( 'Section Defaults Restored!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                } elseif ( 'normal' === $this->parent->transients['last_save_mode'] ) {
+                    /**
+                     * Action 'redux/options/{opt_name}/saved'
+                     *
+                     * @param mixed $value set/saved option value
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( "redux/options/{$this->parent->args['opt_name']}/saved", $this->parent->options, $this->parent->transients['changed_values'] );
+
+                    echo '<div class="saved_notice admin-notice notice-green">';
+
+                    /**
+                     * Filter 'redux-saved-text-{opt_name}'
+                     *
+                     * @param string $text Translated "settings saved" text.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    echo '<strong>' . esc_html( apply_filters( "redux-saved-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings Saved!', 'redux-framework' ) ) ) . '</strong>';
+                    echo '</div>';
+                }
+
+                unset( $this->parent->transients['last_save_mode'] );
+
+                $this->parent->transient_class->set();
+            }
+
+            /**
+             * Action 'redux/options/{opt_name}/settings/changes'
+             *
+             * @param mixed $value set/saved option value
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/options/{$this->parent->args['opt_name']}/settings/change", $this->parent->options, $this->parent->transients['changed_values'] );
+
+            echo '<div class="redux-save-warn notice-yellow">';
+
+            /**
+             * Filter 'redux-changed-text-{opt_name}'
+             *
+             * @param string $text Translated "settings have changed" text.
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            echo '<strong>' . esc_html( apply_filters( "redux-changed-text-{$this->parent->args['opt_name']}", esc_html__( 'Settings have changed, you should save them!', 'redux-framework' ) ) ) . '</strong>';
+            echo '</div>';
+
+            /**
+             * Action 'redux/options/{opt_name}/errors'
+             *
+             * @param array $this ->errors error information
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/options/{$this->parent->args['opt_name']}/errors", $this->parent->errors );
+
+            echo '<div class="redux-field-errors notice-red">';
+            echo '<strong>';
+            echo '<span></span> ' . esc_html__( 'error(s) were found!', 'redux-framework' );
+            echo '</strong>';
+            echo '</div>';
+
+            /**
+             * Action 'redux/options/{opt_name}/warnings'
+             *
+             * @param array $this ->warnings warning information
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/options/{$this->parent->args['opt_name']}/warnings", $this->parent->warnings );
+
+            echo '<div class="redux-field-warnings notice-yellow">';
+            echo '<strong>';
+            echo '<span></span> ' . esc_html__( 'warning(s) were found!', 'redux-framework' );
+            echo '</strong>';
+            echo '</div>';
+        }
+
+        /**
+         * Used to initialize the settings fields for this panel. Required for saving and redirect.
+         */
+        private function init_settings_fields() {
+            // Must run or the page won't redirect properly.
+            settings_fields( "{$this->parent->args['opt_name']}_group" );
+        }
+
+        /**
+         * Enable file deprecate warning from core.  This is necessary because the function is considered private.
+         *
+         * @return bool
+         */
+        public function tick_file_deprecate_warning(): bool {
+            return true;
+        }
+
+        /**
+         * Used to select the proper template. If it doesn't exist in the path, then the original template file is used.
+         *
+         * @param string $file Path to template file.
+         */
+        public function get_template( string $file ) {
+            if ( empty( $file ) ) {
+                return;
+            }
+
+            if ( file_exists( $this->template_path . $file ) ) {
+                $path = $this->template_path . $file;
+            } else {
+                $path = $this->original_path . $file;
+            }
+
+            // Shim for v3 templates.
+            if ( ! file_exists( $path ) ) {
+                $old_file = $file;
+
+                add_filter( 'deprecated_file_trigger_error', array( $this, 'tick_file_deprecate_warning' ) );
+
+                $file = str_replace( '_', '-', $file );
+
+                _deprecated_file( esc_html( $old_file ), '4.0', esc_html( $file ), 'Please replace this outdated template with the current one from the Redux core.' );
+
+                if ( file_exists( $this->template_path . $file ) ) {
+                    $path = $this->template_path . $file;
+                } else {
+                    $path = $this->original_path . $file;
+                }
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/before' );
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $path = apply_filters( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file, $path );
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( "redux/{$this->parent->args['opt_name']}/panel/template/" . $file . '/after' );
+
+            if ( file_exists( $path ) ) {
+                if ( is_readable( $path ) ) {
+                    require $path;
+                } else {
+                    // translators: %1$s: template path.
+                    echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s cannot be read. Please check the permissions for this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
+                }
+            } elseif ( file_exists( Redux_Core::$dir . 'templates/panel/' . $file ) ) {
+                    require Redux_Core::$dir . 'templates/panel/' . $file;
+            } else {
+                // translators: %1$s: template path.
+                echo '<div class="error"><p>' . sprintf( esc_html__( 'Redux Panel Template %1$s does not exist. Please reinstall Redux to replace this file.', 'redux-framework' ), '<code>' . esc_html( $path ) . '</code>' ) . '</p></div>';
+            }
+        }
+
+        /**
+         * Scan the template files.
+         *
+         * @param string $template_path Path to template file.
+         *
+         * @return array
+         */
+        public function scan_template_files( string $template_path ): array {
+            $files  = scandir( $template_path );
+            $result = array();
+            if ( $files ) {
+                foreach ( $files as $value ) {
+                    if ( ! in_array( $value, array( '.', '..' ), true ) ) {
+                        if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
+                            $sub_files = self::scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
+                            foreach ( $sub_files as $sub_file ) {
+                                $result[] = $value . DIRECTORY_SEPARATOR . $sub_file;
+                            }
+                        } else {
+                            $result[] = $value;
+                        }
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Show a notice highlighting bad template files
+         */
+        public function template_file_check_notice() {
+            if ( $this->original_path === $this->template_path ) {
+                return;
+            }
+
+            $core_templates = $this->scan_template_files( $this->original_path );
+
+            foreach ( $core_templates as $file ) {
+                $developer_theme_file = false;
+
+                if ( file_exists( $this->template_path . $file ) ) {
+                    $developer_theme_file = $this->template_path . $file;
+                }
+
+                if ( $developer_theme_file ) {
+                    $core_version      = Redux_Helpers::get_template_version( $this->original_path . $file );
+                    $developer_version = Redux_Helpers::get_template_version( $developer_theme_file );
+
+                    if ( $core_version && $developer_version && version_compare( $developer_version, $core_version, '<' ) ) {
+                        ?>
 						<div id="message" class="error redux-message" style="display:block!important">
 							<p>
 								<strong><?php esc_html_e( 'Your panel has bundled copies of Redux Framework template files that are outdated!', 'redux-framework' ); ?></strong>&nbsp;&nbsp;<?php esc_html_e( 'Please ask the author of this theme to update them as functionality issues could arise.', 'redux-framework' ); ?>
@@ -409,23 +409,23 @@ 
 						</div>
 						<?php
 
-						return;
-					}
-				}
-			}
-		}
-
-		/**
-		 * Outputs the HTML for a given section using the WordPress settings API.
-		 *
-		 * @param mixed $k Section number of settings panel to display.
-		 */
-		private function output_section( $k ) {
-			do_settings_sections( $this->parent->args['opt_name'] . $k . '_section_group' );
-		}
-	}
+                        return;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Outputs the HTML for a given section using the WordPress settings API.
+         *
+         * @param mixed $k Section number of settings panel to display.
+         */
+        private function output_section( $k ) {
+            do_settings_sections( $this->parent->args['opt_name'] . $k . '_section_group' );
+        }
+    }
 }
 
 if ( ! class_exists( 'reduxCorePanel' ) ) {
-	class_alias( 'Redux_Panel', 'reduxCorePanel' );
+    class_alias( 'Redux_Panel', 'reduxCorePanel' );
 }