reduxframework / redux-framework

redux-core/inc/welcome/views/about.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
 				foreach ( $plugin_data as $key => $data ) {
 					$key_slug                  = explode( '/', $key );
 					$key_slug                  = $key_slug[0];
-					$plugin_index[ $key_slug ] = $key;
+					$plugin_index[$key_slug] = $key;
 				}
 
 				foreach ( $sysinfo as $project_type => $products ) {
@@ -115,11 +115,11 @@ 
 
 					} else {
 						foreach ( $products as $product => $data ) {
-							if ( ! isset( $plugin_index[ $product ] ) ) {
+							if ( ! isset( $plugin_index[$product] ) ) {
 								continue;
 							}
 
-							$plugin_path = Redux_Functions_Ex::wp_normalize_path( WP_PLUGIN_DIR . '/' . $plugin_index[ $product ] );
+							$plugin_path = Redux_Functions_Ex::wp_normalize_path( WP_PLUGIN_DIR . '/' . $plugin_index[$product] );
 							$plugin_data = get_plugin_data( $plugin_path );
 
 							?>

Indentation +66 added lines, -66 removed lines

@@ -30,50 +30,50 @@ 
 	<hr>
 	<?php
 
-	$sysinfo = Redux_Helpers::process_redux_callers();
+    $sysinfo = Redux_Helpers::process_redux_callers();
 
-	?>
+    ?>
 
 	<div class="feature-section <?php echo empty( $sysinfo ) ? 'one-col' : 'two-col'; ?>">
 		<div class="<?php echo ! empty( $sysinfo ) ? 'col' : ''; ?>">
 			<h2 style="text-align:left;"><?php echo esc_html__( 'Did I install this?', 'redux-framework' ); ?></h2>
 			<h3>
 				<?php
-				if ( ! empty( $sysinfo ) ) {
-					esc_html_e( 'Maybe not! These items are using Redux. If you want to keep using them, Redux will need to remain installed and activated.', 'redux-framework' );
-				} else {
-					$nonce = wp_create_nonce( 'redux_framework_demo' );
-
-					$query_args = array(
-						'page'                   => 'redux-framework',
-						'redux-framework-plugin' => 'demo',
-						'nonce'                  => $nonce,
-					);
-
-					// translators: %1$s: URL, %2$s: close tag.
-					printf( esc_html__( 'Maybe not! If you want to see what Redux is all about, click here to %1$sActivate Demo Mode%2$s.', 'redux-framework' ), '<a href="' . esc_url( admin_url( add_query_arg( $query_args, 'options-general.php' ) ) ) . '">', '</a>' );
-				}
-
-				?>
+                if ( ! empty( $sysinfo ) ) {
+                    esc_html_e( 'Maybe not! These items are using Redux. If you want to keep using them, Redux will need to remain installed and activated.', 'redux-framework' );
+                } else {
+                    $nonce = wp_create_nonce( 'redux_framework_demo' );
+
+                    $query_args = array(
+                        'page'                   => 'redux-framework',
+                        'redux-framework-plugin' => 'demo',
+                        'nonce'                  => $nonce,
+                    );
+
+                    // translators: %1$s: URL, %2$s: close tag.
+                    printf( esc_html__( 'Maybe not! If you want to see what Redux is all about, click here to %1$sActivate Demo Mode%2$s.', 'redux-framework' ), '<a href="' . esc_url( admin_url( add_query_arg( $query_args, 'options-general.php' ) ) ) . '">', '</a>' );
+                }
+
+                ?>
 			</h3>
 		</div>
 		<div class="col">
 			<?php
-			if ( ! empty( $sysinfo ) && is_array( $sysinfo ) ) {
-				$plugin_index = array();
-				$plugin_data  = get_plugins();
+            if ( ! empty( $sysinfo ) && is_array( $sysinfo ) ) {
+                $plugin_index = array();
+                $plugin_data  = get_plugins();
 
-				foreach ( $plugin_data as $key => $data ) {
-					$key_slug                  = explode( '/', $key );
-					$key_slug                  = $key_slug[0];
-					$plugin_index[ $key_slug ] = $key;
-				}
+                foreach ( $plugin_data as $key => $data ) {
+                    $key_slug                  = explode( '/', $key );
+                    $key_slug                  = $key_slug[0];
+                    $plugin_index[ $key_slug ] = $key;
+                }
 
-				foreach ( $sysinfo as $project_type => $products ) {
-					if ( 'theme' === $project_type ) {
-						$my_theme = wp_get_theme();
+                foreach ( $sysinfo as $project_type => $products ) {
+                    if ( 'theme' === $project_type ) {
+                        $my_theme = wp_get_theme();
 
-						?>
+                        ?>
 						<div class="redux-product">
 							<h2 class="name"><?php echo esc_html( $my_theme->get( 'Name' ) ); ?>
 								<?php if ( ! empty( $my_theme->get( 'Version' ) ) ) { ?>
@@ -96,33 +96,33 @@ 
 							<p class="author">
 								<small>
 									<?php
-									foreach ( $products as $slug => $data ) {
-										foreach ( $data as $opt_name => $callers ) {
-											echo '<span><strong>opt_name</strong>: <code>' . esc_html( $opt_name ) . '</code></span><br />';
-
-											foreach ( $callers as $caller ) {
-												echo '<span>~/' . esc_html( $caller['basename'] ) . '</span><br />';
-											}
-
-											echo '<br />';
-										}
-									}
-									?>
+                                    foreach ( $products as $slug => $data ) {
+                                        foreach ( $data as $opt_name => $callers ) {
+                                            echo '<span><strong>opt_name</strong>: <code>' . esc_html( $opt_name ) . '</code></span><br />';
+
+                                            foreach ( $callers as $caller ) {
+                                                echo '<span>~/' . esc_html( $caller['basename'] ) . '</span><br />';
+                                            }
+
+                                            echo '<br />';
+                                        }
+                                    }
+                                    ?>
 								</small>
 							</p>
 						</div>
 						<?php
 
-					} else {
-						foreach ( $products as $product => $data ) {
-							if ( ! isset( $plugin_index[ $product ] ) ) {
-								continue;
-							}
+                    } else {
+                        foreach ( $products as $product => $data ) {
+                            if ( ! isset( $plugin_index[ $product ] ) ) {
+                                continue;
+                            }
 
-							$plugin_path = Redux_Functions_Ex::wp_normalize_path( WP_PLUGIN_DIR . '/' . $plugin_index[ $product ] );
-							$plugin_data = get_plugin_data( $plugin_path );
+                            $plugin_path = Redux_Functions_Ex::wp_normalize_path( WP_PLUGIN_DIR . '/' . $plugin_index[ $product ] );
+                            $plugin_data = get_plugin_data( $plugin_path );
 
-							?>
+                            ?>
 							<div class="redux-product">
 								<h2 class="name">
 									<?php echo esc_html( $plugin_data['Name'] ); ?>
@@ -132,9 +132,9 @@ 
 								</h2>
 								<p class="author">
 									<?php
-									if ( ! empty( $plugin_data['Author'] ) ) {
-										$plugin_url = ! empty( $plugin_data['AuthorURI'] ) ? $plugin_data['AuthorURI'] : $plugin_data['PluginURI'];
-										?>
+                                    if ( ! empty( $plugin_data['Author'] ) ) {
+                                        $plugin_url = ! empty( $plugin_data['AuthorURI'] ) ? $plugin_data['AuthorURI'] : $plugin_data['PluginURI'];
+                                        ?>
 										<?php echo esc_html__( 'By', 'redux-framework' ); ?>
 										<a href="<?php echo esc_attr( $plugin_url ); ?>">
 											<?php echo esc_html( trim( wp_strip_all_tags( $plugin_data['Author'] ) ) ); ?>
@@ -148,23 +148,23 @@ 
 								<p class="author">
 									<small>
 										<?php
-										foreach ( $data as $opt_name => $callers ) {
-											echo '<span><strong>opt_name</strong>: <code>' . esc_html( $opt_name ) . '</code></span><br />';
-
-											foreach ( $callers as $caller ) {
-												echo '<span>~/' . esc_html( $caller['basename'] ) . '</span><br />';
-											}
-										}
-										?>
+                                        foreach ( $data as $opt_name => $callers ) {
+                                            echo '<span><strong>opt_name</strong>: <code>' . esc_html( $opt_name ) . '</code></span><br />';
+
+                                            foreach ( $callers as $caller ) {
+                                                echo '<span>~/' . esc_html( $caller['basename'] ) . '</span><br />';
+                                            }
+                                        }
+                                        ?>
 									</small>
 								</p>
 							</div>
 							<?php
-						}
-					}
-				}
-			}
-			?>
+                        }
+                    }
+                }
+            }
+            ?>
 		</div>
 	</div>
 </div>

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

Indentation +59 added lines, -59 removed lines

@@ -12,73 +12,73 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Editor', false ) ) {
 
-	/**
-	 * Main Redux_editor class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Editor extends Redux_Field {
+    /**
+     * Main Redux_editor class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Editor 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() {
-			if ( ! isset( $this->field['args'] ) ) {
-				$this->field['args'] = array();
-			}
+        /**
+         * 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 ( ! isset( $this->field['args'] ) ) {
+                $this->field['args'] = array();
+            }
 
-			$this->field['args']['onchange_callback'] = "alert('here')";
+            $this->field['args']['onchange_callback'] = "alert('here')";
 
-			// Setup up default args.
-			$defaults = array(
-				'textarea_name' => esc_attr( $this->field['name'] . $this->field['name_suffix'] ),
-				'editor_class'  => esc_attr( $this->field['class'] ),
-				'textarea_rows' => 10, // Wordpress default.
-				'teeny'         => true,
-			);
+            // Setup up default args.
+            $defaults = array(
+                'textarea_name' => esc_attr( $this->field['name'] . $this->field['name_suffix'] ),
+                'editor_class'  => esc_attr( $this->field['class'] ),
+                'textarea_rows' => 10, // Wordpress default.
+                'teeny'         => true,
+            );
 
-			if ( isset( $this->field['editor_options'] ) && empty( $this->field['args'] ) ) {
-				$this->field['args'] = $this->field['editor_options'];
-				unset( $this->field['editor_options'] );
-			}
+            if ( isset( $this->field['editor_options'] ) && empty( $this->field['args'] ) ) {
+                $this->field['args'] = $this->field['editor_options'];
+                unset( $this->field['editor_options'] );
+            }
 
-			$this->field['args'] = wp_parse_args( $this->field['args'], $defaults );
+            $this->field['args'] = wp_parse_args( $this->field['args'], $defaults );
 
-			wp_editor( $this->value, $this->field['id'], $this->field['args'] );
-		}
+            wp_editor( $this->value, $this->field['id'], $this->field['args'] );
+        }
 
-		/**
-		 * 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-editor',
-					Redux_Core::$url . 'inc/fields/editor/redux-editor.css',
-					array(),
-					$this->timestamp
-				);
-			}
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-editor',
+                    Redux_Core::$url . 'inc/fields/editor/redux-editor.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
 
-			wp_enqueue_script(
-				'redux-field-editor',
-				Redux_Core::$url . 'inc/fields/editor/redux-editor' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+            wp_enqueue_script(
+                'redux-field-editor',
+                Redux_Core::$url . 'inc/fields/editor/redux-editor' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Editor', 'ReduxFramework_Editor' );

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

Indentation +78 added lines, -78 removed lines

@@ -11,90 +11,90 @@
 
 if ( ! class_exists( 'Redux_Palette', false ) ) {
 
-	/**
-	 * Class Redux_Palette
-	 */
-	class Redux_Palette 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() {
-			if ( ! isset( $this->field['palettes'] ) && empty( $this->field['palettes'] ) ) {
-				echo 'No palettes have been set.';
-
-				return;
-			}
-
-			echo '<div id="' . esc_attr( $this->field['id'] ) . '" class="buttonset">';
-
-			foreach ( $this->field['palettes'] as $value => $color_set ) {
-				$checked = checked( $this->value, $value, false );
-
-				echo '<input
+    /**
+     * Class Redux_Palette
+     */
+    class Redux_Palette 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() {
+            if ( ! isset( $this->field['palettes'] ) && empty( $this->field['palettes'] ) ) {
+                echo 'No palettes have been set.';
+
+                return;
+            }
+
+            echo '<div id="' . esc_attr( $this->field['id'] ) . '" class="buttonset">';
+
+            foreach ( $this->field['palettes'] as $value => $color_set ) {
+                $checked = checked( $this->value, $value, false );
+
+                echo '<input
 						type="radio"
 						value="' . esc_attr( $value ) . '"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"
 						class="redux-palette-set ' . esc_attr( $this->field['class'] ) . '"
 						id="' . esc_attr( $this->field['id'] . '-' . $value ) . '"' . esc_html( $checked ) . '>';
 
-				echo '<label for="' . esc_attr( $this->field['id'] . '-' . $value ) . '">';
-
-				foreach ( $color_set as $color ) {
-					echo '<span style=background:' . esc_attr( $color ) . '>' . esc_attr( $color ) . '</span>';
-				}
-
-				echo '</label>';
-				echo '</input>';
-			}
-
-			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() {
-			$min = Redux_Functions::is_min();
-
-			wp_enqueue_script(
-				'redux-field-palette',
-				Redux_Core::$url . 'inc/fields/palette/redux-palette' . $min . '.js',
-				array( 'jquery', 'redux-js', 'jquery-ui-button', 'jquery-ui-core' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-palette',
-					Redux_Core::$url . 'inc/fields/palette/redux-palette.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.
-		}
-	}
+                echo '<label for="' . esc_attr( $this->field['id'] . '-' . $value ) . '">';
+
+                foreach ( $color_set as $color ) {
+                    echo '<span style=background:' . esc_attr( $color ) . '>' . esc_attr( $color ) . '</span>';
+                }
+
+                echo '</label>';
+                echo '</input>';
+            }
+
+            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() {
+            $min = Redux_Functions::is_min();
+
+            wp_enqueue_script(
+                'redux-field-palette',
+                Redux_Core::$url . 'inc/fields/palette/redux-palette' . $min . '.js',
+                array( 'jquery', 'redux-js', 'jquery-ui-button', 'jquery-ui-core' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-palette',
+                    Redux_Core::$url . 'inc/fields/palette/redux-palette.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_Palette', 'ReduxFramework_Palette' );

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

Indentation +91 added lines, -91 removed lines

@@ -12,127 +12,127 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Multi_Text', false ) ) {
 
-	/**
-	 * Main Redux_multi_text class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Multi_Text extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'show_empty' => true,
-				'add_text'   => esc_html__( 'Add More', 'redux-framework' ),
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			echo '<ul id="' . esc_attr( $this->field['id'] ) . '-ul" class="redux-multi-text ' . esc_attr( $this->field['class'] ) . '">';
-
-			if ( isset( $this->value ) && is_array( $this->value ) ) {
-				foreach ( $this->value as $k => $value ) {
-					if ( '' !== $value || ( true === $this->field['show_empty'] ) ) {
-						echo '<li>';
-						echo '<input
+    /**
+     * Main Redux_multi_text class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Multi_Text extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'show_empty' => true,
+                'add_text'   => esc_html__( 'Add More', 'redux-framework' ),
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            echo '<ul id="' . esc_attr( $this->field['id'] ) . '-ul" class="redux-multi-text ' . esc_attr( $this->field['class'] ) . '">';
+
+            if ( isset( $this->value ) && is_array( $this->value ) ) {
+                foreach ( $this->value as $k => $value ) {
+                    if ( '' !== $value || ( true === $this->field['show_empty'] ) ) {
+                        echo '<li>';
+                        echo '<input
 								type="text"
 								id="' . esc_attr( $this->field['id'] . '-' . $k ) . '"
 								name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[]"
 								value="' . esc_attr( $value ) . '"
 								class="regular-text" /> ';
 
-						echo '<a
+                        echo '<a
 								data-id="' . esc_attr( $this->field['id'] ) . '-ul"
 								href="javascript:void(0);"
 								class="deletion redux-multi-text-remove">' .
-								esc_html__( 'Remove', 'redux-framework' ) . '</a>';
-						echo '</li>';
-					}
-				}
-			} elseif ( true === $this->field['show_empty'] ) {
-				echo '<li>';
-				echo '<input
+                                esc_html__( 'Remove', 'redux-framework' ) . '</a>';
+                        echo '</li>';
+                    }
+                }
+            } elseif ( true === $this->field['show_empty'] ) {
+                echo '<li>';
+                echo '<input
 						type="text"
 						id="' . esc_attr( $this->field['id'] . '-0' ) . '"
 						name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[]"
 						value=""
 						class="regular-text" /> ';
 
-				echo '<a
+                echo '<a
 						data-id="' . esc_attr( $this->field['id'] ) . '-ul"
 						href="javascript:void(0);"
 						class="deletion redux-multi-text-remove">' .
-						esc_html__( 'Remove', 'redux-framework' ) . '</a>';
+                        esc_html__( 'Remove', 'redux-framework' ) . '</a>';
 
-				echo '</li>';
-			}
+                echo '</li>';
+            }
 
-			$the_name = '';
-			if ( isset( $this->value ) && empty( $this->value ) && false === $this->field['show_empty'] ) {
-				$the_name = $this->field['name'] . $this->field['name_suffix'];
-			}
+            $the_name = '';
+            if ( isset( $this->value ) && empty( $this->value ) && false === $this->field['show_empty'] ) {
+                $the_name = $this->field['name'] . $this->field['name_suffix'];
+            }
 
-			echo '<li style="display:none;">';
-			echo '<input
+            echo '<li style="display:none;">';
+            echo '<input
 					type="text"
 					id="' . esc_attr( $this->field['id'] ) . '"
 					name="' . esc_attr( $the_name ) . '"
 					value=""
 					class="regular-text" /> ';
 
-			echo '<a
+            echo '<a
 					data-id="' . esc_attr( $this->field['id'] ) . '-ul"
 					href="javascript:void(0);"
 					class="deletion redux-multi-text-remove">' .
-					esc_html__( 'Remove', 'redux-framework' ) . '</a>';
-
-			echo '</li>';
-			echo '</ul>';
-
-			echo '<span style="clear:both;display:block;height:0;"></span>';
-			$this->field['add_number'] = ( isset( $this->field['add_number'] ) && is_numeric( $this->field['add_number'] ) ) ? $this->field['add_number'] : 1;
-			echo '<a href="javascript:void(0);" class="button button-primary redux-multi-text-add" data-add_number="' . esc_attr( $this->field['add_number'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '-ul" data-name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '">' . esc_html( $this->field['add_text'] ) . '</a><br/>';
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			wp_enqueue_script(
-				'redux-field-multi-text',
-				Redux_Core::$url . 'inc/fields/multi_text/redux-multi-text' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-multi-text',
-					Redux_Core::$url . 'inc/fields/multi_text/redux-multi-text.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+                    esc_html__( 'Remove', 'redux-framework' ) . '</a>';
+
+            echo '</li>';
+            echo '</ul>';
+
+            echo '<span style="clear:both;display:block;height:0;"></span>';
+            $this->field['add_number'] = ( isset( $this->field['add_number'] ) && is_numeric( $this->field['add_number'] ) ) ? $this->field['add_number'] : 1;
+            echo '<a href="javascript:void(0);" class="button button-primary redux-multi-text-add" data-add_number="' . esc_attr( $this->field['add_number'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '-ul" data-name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '">' . esc_html( $this->field['add_text'] ) . '</a><br/>';
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            wp_enqueue_script(
+                'redux-field-multi-text',
+                Redux_Core::$url . 'inc/fields/multi_text/redux-multi-text' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-multi-text',
+                    Redux_Core::$url . 'inc/fields/multi_text/redux-multi-text.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Multi_Text', 'ReduxFramework_Multi_Text' );

redux-core/inc/extensions/options_object/options_object/class-redux-options-object.php

Indentation +104 added lines, -104 removed lines

@@ -14,86 +14,86 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Options_Object', false ) ) {
 
-	/**
-	 * Main Redux_options_object class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Options_Object extends Redux_Field {
-
-		public $is_field;
-
-		/**
-		 * Redux_Options_Object constructor.
-		 *
-		 * @param array  $field Field array.
-		 * @param mixed  $value Value array.
-		 * @param object $parent ReduxFramework object.
-		 *
-		 * @throws ReflectionException .
-		 */
-		public function __construct( array $field, $value, $parent ) {
-			parent::__construct( $field, $value, $parent );
-
-			$this->is_field = $this->parent->extensions['options_object']->is_field;
-		}
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'options'          => array(),
-				'stylesheet'       => '',
-				'output'           => true,
-				'enqueue'          => true,
-				'enqueue_frontend' => true,
-			);
-
-			$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 ( version_compare( phpversion(), '5.3.0', '>=' ) ) {
-				$json = wp_json_encode( $this->parent->options, true );
-			} else {
-				$json = wp_json_encode( $this->parent->options );
-			}
-
-			$defaults = array(
-				'full_width' => true,
-				'overflow'   => 'inherit',
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			if ( $this->is_field ) {
-				$full_width = $this->field['full_width'];
-			}
-
-			$do_close = false;
-
-			$id = $this->parent->args['opt_name'] . '-' . $this->field['id'];
-
-			if ( ! $this->is_field || ( $this->is_field && false === $full_width ) ) {
-				?>
+    /**
+     * Main Redux_options_object class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Options_Object extends Redux_Field {
+
+        public $is_field;
+
+        /**
+         * Redux_Options_Object constructor.
+         *
+         * @param array  $field Field array.
+         * @param mixed  $value Value array.
+         * @param object $parent ReduxFramework object.
+         *
+         * @throws ReflectionException .
+         */
+        public function __construct( array $field, $value, $parent ) {
+            parent::__construct( $field, $value, $parent );
+
+            $this->is_field = $this->parent->extensions['options_object']->is_field;
+        }
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'options'          => array(),
+                'stylesheet'       => '',
+                'output'           => true,
+                'enqueue'          => true,
+                'enqueue_frontend' => true,
+            );
+
+            $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 ( version_compare( phpversion(), '5.3.0', '>=' ) ) {
+                $json = wp_json_encode( $this->parent->options, true );
+            } else {
+                $json = wp_json_encode( $this->parent->options );
+            }
+
+            $defaults = array(
+                'full_width' => true,
+                'overflow'   => 'inherit',
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            if ( $this->is_field ) {
+                $full_width = $this->field['full_width'];
+            }
+
+            $do_close = false;
+
+            $id = $this->parent->args['opt_name'] . '-' . $this->field['id'];
+
+            if ( ! $this->is_field || ( $this->is_field && false === $full_width ) ) {
+                ?>
 				<style>#<?php echo esc_html( $id ); ?>{padding: 0;}</style>
 				<?php // phpcs:ignore WordPress.CodeAnalysis.EmptyStatement ?>
 				<?php echo '</td></tr></table>'; ?>
 				<table id="<?php echo esc_attr( $id ); ?>" class="form-table no-border redux-group-table redux-raw-table" style=" overflow: <?php esc_attr( $this->field['overflow'] ); ?>;">
 				<tbody><tr><td>
 				<?php
-				$do_close = true;
-			}
-			?>
+                $do_close = true;
+            }
+            ?>
 			<fieldset
 					id="<?php echo esc_attr( $id ); ?>-fieldset"
 					class="redux-field redux-container-<?php echo esc_attr( $this->field['type'] ) . ' ' . esc_attr( $this->field['class'] ); ?>"
@@ -117,34 +117,34 @@ 
 						<td>
 			<?php } ?>
 			<?php
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			wp_enqueue_script(
-				'redux-extension-options-object',
-				$this->url . 'redux-options-object' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				Redux_Extension_Options_Object::$version,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-options-object',
-					$this->url . 'redux-options-object.css',
-					array(),
-					Redux_Extension_Options_Object::$version,
-					'all'
-				);
-			}
-		}
-	}
+        }
+
+        /**
+         * 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-extension-options-object',
+                $this->url . 'redux-options-object' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                Redux_Extension_Options_Object::$version,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-options-object',
+                    $this->url . 'redux-options-object.css',
+                    array(),
+                    Redux_Extension_Options_Object::$version,
+                    'all'
+                );
+            }
+        }
+    }
 }

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

Indentation +233 added lines, -233 removed lines

@@ -11,237 +11,237 @@
 
 if ( ! class_exists( 'Redux_Validation', false ) ) {
 
-	/**
-	 * Class Redux_Validation
-	 */
-	class Redux_Validation extends Redux_Class {
-
-		/**
-		 * Validate values from options form (used in settings api validate function)
-		 * calls the custom validation class for the field so authors can override with custom classes
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       array $plugin_options Plugin Options.
-		 * @param       array $options        Options.
-		 * @param       array $sections       Sections array.
-		 *
-		 * @return      array $plugin_options
-		 */
-		public function validate( array $plugin_options, array $options, array $sections ): array {
-			$core = $this->core();
-
-			foreach ( $sections as $k => $section ) {
-				if ( isset( $section['fields'] ) ) {
-					foreach ( $section['fields'] as $fkey => $field ) {
-						if ( is_array( $field ) ) {
-							$field['section_id'] = $k;
-						}
-
-						if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
-							if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
-								$plugin_options[ $field['id'] ] = 0;
-							}
-						}
-
-						// Part of Dovy's serialize typography effort.  Preserved here in case it becomes a thing. - kp.
-						/**
-						 * If ( isset ( $field['type'] ) && $field['type'] == 'typography' ) {
-						 *      if ( ! is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-						 *          $plugin_options[ $field['id'] ] = json_decode( $plugin_options[ $field['id'] ], true );
-						 *      }
-						 * }
-						 */
-
-						if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
-							$plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
-						}
-
-						// Make sure 'validate' field is set.
-						if ( isset( $field['validate'] ) ) {
-
-							// Can we make this an array of validations?
-							$val_arr = array();
-
-							if ( is_array( $field['validate'] ) ) {
-								$val_arr = $field['validate'];
-							} else {
-								$val_arr[] = $field['validate'];
-							}
-
-							foreach ( $val_arr as $idx => $val ) {
-								// shim for old *_not_empty validations.
-								if ( 'email_not_empty' === $val || 'numeric_not_empty' === $val ) {
-									$val = 'not_empty';
-								}
-
-								// Make sure 'validate field' is set to 'not_empty'.
-								$is_not_empty = false;
-
-								if ( 'not_empty' === $val ) {
-									// Set the flag.
-									$is_not_empty = true;
-								}
-
-								// Check for empty id value.
-								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
-
-									// If we are looking for an empty value, in the case of 'not_empty'
-									// then we need to keep processing.
-									if ( ! $is_not_empty ) {
-
-										// Empty id and not checking for 'not_empty'.  Bail out...
-										if ( ! isset( $field['validate_callback'] ) ) {
-											continue;
-										}
-									}
-								}
-
-								// Force validate of custom field types.
-								if ( isset( $field['type'] ) && ! isset( $val ) && ! isset( $field['validate_callback'] ) ) {
-									if ( 'color' === $field['type'] || 'color_gradient' === $field['type'] ) {
-										$val = 'color';
-									} elseif ( 'date' === $field['type'] ) {
-										$val = 'date';
-									}
-								}
-
-								// No need.  Spectrum self validates.
-								if ( 'color_rgba' === $field['type'] ) {
-									continue;
-								}
-
-								// Shim out old color rgba validators.
-								if ( 'color_rgba' === $val || 'colorrgba' === $val ) {
-									$val = 'color';
-								}
-
-								$validate = 'Redux_Validation_' . $val;
-
-								if ( ! class_exists( $validate ) ) {
-									$file = str_replace( '_', '-', $val );
-
-									/**
-									 * Filter 'redux/validate/{opt_name}/class/{field.validate}'
-									 *
-									 * @param string $validate   validation class file path
-									 */
-
-									// phpcs:ignore WordPress.NamingConventions.ValidHookName
-									$class_file = apply_filters( "redux/validate/{$core->args['opt_name']}/class/$val", Redux_Core::$dir . "inc/validation/$val/class-redux-validation-$file.php", $validate );
-
-									if ( $class_file ) {
-										if ( file_exists( $class_file ) ) {
-											require_once $class_file;
-										}
-									}
-								}
-
-								if ( class_exists( $validate ) ) {
-									if ( empty( $options[ $field['id'] ] ) ) {
-										$options[ $field['id'] ] = '';
-									}
-
-									if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-										foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
-											$before = null;
-											$after  = null;
-
-											if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
-													$before = $plugin_options[ $field['id'] ][ $key ];
-												} else {
-													$before = trim( $plugin_options[ $field['id'] ][ $key ] );
-												}
-											}
-
-											if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												$after = $options[ $field['id'] ][ $key ];
-											}
-
-											$validation = new $validate( $core, $field, $before, $after );
-
-											if ( ! empty( $validation->value ) || '0' === $validation->value ) {
-												$plugin_options[ $field['id'] ][ $key ] = $validation->value;
-											} else {
-												unset( $plugin_options[ $field['id'] ][ $key ] );
-											}
-
-											if ( ! empty( $validation->error ) ) {
-												$core->errors[] = $validation->error;
-											}
-
-											if ( ! empty( $validation->warning ) ) {
-												$core->warnings[] = $validation->warning;
-											}
-
-											if ( ! empty( $validation->sanitize ) ) {
-												$core->sanitize[] = $validation->sanitize;
-											}
-										}
-									} else {
-										if ( isset( $plugin_options[ $field['id'] ] ) ) {
-											if ( is_array( $plugin_options[ $field['id'] ] ) ) {
-												$pofi = $plugin_options[ $field['id'] ];
-											} else {
-												$pofi = trim( $plugin_options[ $field['id'] ] );
-											}
-										} else {
-											$pofi = null;
-										}
-
-										$validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
-										$plugin_options[ $field['id'] ] = $validation->value;
-
-										if ( ! empty( $validation->error ) ) {
-											$core->errors[] = $validation->error;
-										}
-
-										if ( ! empty( $validation->warning ) ) {
-											$core->warnings[] = $validation->warning;
-										}
-
-										if ( ! empty( $validation->sanitize ) ) {
-											$core->sanitize[] = $validation->sanitize;
-										}
-									}
-
-									break;
-								}
-							}
-						}
-
-						if ( isset( $field['validate_callback'] ) && ( is_callable( $field['validate_callback'] ) || ( is_string( $field['validate_callback'] ) && function_exists( $field['validate_callback'] ) ) ) ) {
-							$callback = $field['validate_callback'];
-							unset( $field['validate_callback'] );
-
-							$plugin_option = $plugin_options[ $field['id'] ] ?? null;
-							$option        = $options[ $field['id'] ] ?? null;
-
-							if ( null !== $plugin_option ) {
-								$callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
-
-								$plugin_options[ $field['id'] ] = $callbackvalues['value'];
-
-								if ( isset( $callbackvalues['error'] ) ) {
-									$core->errors[] = $callbackvalues['error'];
-								}
-
-								if ( isset( $callbackvalues['warning'] ) ) {
-									$core->warnings[] = $callbackvalues['warning'];
-								}
-
-								if ( isset( $callbackvalues['sanitize'] ) ) {
-									$core->sanitize[] = $callbackvalues['sanitize'];
-								}
-							}
-						}
-					}
-				}
-			}
-
-			return $plugin_options;
-		}
-	}
+    /**
+     * Class Redux_Validation
+     */
+    class Redux_Validation extends Redux_Class {
+
+        /**
+         * Validate values from options form (used in settings api validate function)
+         * calls the custom validation class for the field so authors can override with custom classes
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       array $plugin_options Plugin Options.
+         * @param       array $options        Options.
+         * @param       array $sections       Sections array.
+         *
+         * @return      array $plugin_options
+         */
+        public function validate( array $plugin_options, array $options, array $sections ): array {
+            $core = $this->core();
+
+            foreach ( $sections as $k => $section ) {
+                if ( isset( $section['fields'] ) ) {
+                    foreach ( $section['fields'] as $fkey => $field ) {
+                        if ( is_array( $field ) ) {
+                            $field['section_id'] = $k;
+                        }
+
+                        if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
+                            if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
+                                $plugin_options[ $field['id'] ] = 0;
+                            }
+                        }
+
+                        // Part of Dovy's serialize typography effort.  Preserved here in case it becomes a thing. - kp.
+                        /**
+                         * If ( isset ( $field['type'] ) && $field['type'] == 'typography' ) {
+                         *      if ( ! is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
+                         *          $plugin_options[ $field['id'] ] = json_decode( $plugin_options[ $field['id'] ], true );
+                         *      }
+                         * }
+                         */
+
+                        if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
+                            $plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
+                        }
+
+                        // Make sure 'validate' field is set.
+                        if ( isset( $field['validate'] ) ) {
+
+                            // Can we make this an array of validations?
+                            $val_arr = array();
+
+                            if ( is_array( $field['validate'] ) ) {
+                                $val_arr = $field['validate'];
+                            } else {
+                                $val_arr[] = $field['validate'];
+                            }
+
+                            foreach ( $val_arr as $idx => $val ) {
+                                // shim for old *_not_empty validations.
+                                if ( 'email_not_empty' === $val || 'numeric_not_empty' === $val ) {
+                                    $val = 'not_empty';
+                                }
+
+                                // Make sure 'validate field' is set to 'not_empty'.
+                                $is_not_empty = false;
+
+                                if ( 'not_empty' === $val ) {
+                                    // Set the flag.
+                                    $is_not_empty = true;
+                                }
+
+                                // Check for empty id value.
+                                if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+
+                                    // If we are looking for an empty value, in the case of 'not_empty'
+                                    // then we need to keep processing.
+                                    if ( ! $is_not_empty ) {
+
+                                        // Empty id and not checking for 'not_empty'.  Bail out...
+                                        if ( ! isset( $field['validate_callback'] ) ) {
+                                            continue;
+                                        }
+                                    }
+                                }
+
+                                // Force validate of custom field types.
+                                if ( isset( $field['type'] ) && ! isset( $val ) && ! isset( $field['validate_callback'] ) ) {
+                                    if ( 'color' === $field['type'] || 'color_gradient' === $field['type'] ) {
+                                        $val = 'color';
+                                    } elseif ( 'date' === $field['type'] ) {
+                                        $val = 'date';
+                                    }
+                                }
+
+                                // No need.  Spectrum self validates.
+                                if ( 'color_rgba' === $field['type'] ) {
+                                    continue;
+                                }
+
+                                // Shim out old color rgba validators.
+                                if ( 'color_rgba' === $val || 'colorrgba' === $val ) {
+                                    $val = 'color';
+                                }
+
+                                $validate = 'Redux_Validation_' . $val;
+
+                                if ( ! class_exists( $validate ) ) {
+                                    $file = str_replace( '_', '-', $val );
+
+                                    /**
+                                     * Filter 'redux/validate/{opt_name}/class/{field.validate}'
+                                     *
+                                     * @param string $validate   validation class file path
+                                     */
+
+                                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                                    $class_file = apply_filters( "redux/validate/{$core->args['opt_name']}/class/$val", Redux_Core::$dir . "inc/validation/$val/class-redux-validation-$file.php", $validate );
+
+                                    if ( $class_file ) {
+                                        if ( file_exists( $class_file ) ) {
+                                            require_once $class_file;
+                                        }
+                                    }
+                                }
+
+                                if ( class_exists( $validate ) ) {
+                                    if ( empty( $options[ $field['id'] ] ) ) {
+                                        $options[ $field['id'] ] = '';
+                                    }
+
+                                    if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
+                                        foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+                                            $before = null;
+                                            $after  = null;
+
+                                            if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                    $before = $plugin_options[ $field['id'] ][ $key ];
+                                                } else {
+                                                    $before = trim( $plugin_options[ $field['id'] ][ $key ] );
+                                                }
+                                            }
+
+                                            if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                $after = $options[ $field['id'] ][ $key ];
+                                            }
+
+                                            $validation = new $validate( $core, $field, $before, $after );
+
+                                            if ( ! empty( $validation->value ) || '0' === $validation->value ) {
+                                                $plugin_options[ $field['id'] ][ $key ] = $validation->value;
+                                            } else {
+                                                unset( $plugin_options[ $field['id'] ][ $key ] );
+                                            }
+
+                                            if ( ! empty( $validation->error ) ) {
+                                                $core->errors[] = $validation->error;
+                                            }
+
+                                            if ( ! empty( $validation->warning ) ) {
+                                                $core->warnings[] = $validation->warning;
+                                            }
+
+                                            if ( ! empty( $validation->sanitize ) ) {
+                                                $core->sanitize[] = $validation->sanitize;
+                                            }
+                                        }
+                                    } else {
+                                        if ( isset( $plugin_options[ $field['id'] ] ) ) {
+                                            if ( is_array( $plugin_options[ $field['id'] ] ) ) {
+                                                $pofi = $plugin_options[ $field['id'] ];
+                                            } else {
+                                                $pofi = trim( $plugin_options[ $field['id'] ] );
+                                            }
+                                        } else {
+                                            $pofi = null;
+                                        }
+
+                                        $validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
+                                        $plugin_options[ $field['id'] ] = $validation->value;
+
+                                        if ( ! empty( $validation->error ) ) {
+                                            $core->errors[] = $validation->error;
+                                        }
+
+                                        if ( ! empty( $validation->warning ) ) {
+                                            $core->warnings[] = $validation->warning;
+                                        }
+
+                                        if ( ! empty( $validation->sanitize ) ) {
+                                            $core->sanitize[] = $validation->sanitize;
+                                        }
+                                    }
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        if ( isset( $field['validate_callback'] ) && ( is_callable( $field['validate_callback'] ) || ( is_string( $field['validate_callback'] ) && function_exists( $field['validate_callback'] ) ) ) ) {
+                            $callback = $field['validate_callback'];
+                            unset( $field['validate_callback'] );
+
+                            $plugin_option = $plugin_options[ $field['id'] ] ?? null;
+                            $option        = $options[ $field['id'] ] ?? null;
+
+                            if ( null !== $plugin_option ) {
+                                $callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
+
+                                $plugin_options[ $field['id'] ] = $callbackvalues['value'];
+
+                                if ( isset( $callbackvalues['error'] ) ) {
+                                    $core->errors[] = $callbackvalues['error'];
+                                }
+
+                                if ( isset( $callbackvalues['warning'] ) ) {
+                                    $core->warnings[] = $callbackvalues['warning'];
+                                }
+
+                                if ( isset( $callbackvalues['sanitize'] ) ) {
+                                    $core->sanitize[] = $callbackvalues['sanitize'];
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return $plugin_options;
+        }
+    }
 }

Spacing +26 added lines, -26 removed lines

@@ -40,8 +40,8 @@ 
 						}
 
 						if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
-							if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
-								$plugin_options[ $field['id'] ] = 0;
+							if ( ! isset( $plugin_options[$field['id']] ) ) {
+								$plugin_options[$field['id']] = 0;
 							}
 						}
 
@@ -54,8 +54,8 @@ 
 						 * }
 						 */
 
-						if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
-							$plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
+						if ( isset( $core->extensions[$field['type']] ) && method_exists( $core->extensions[$field['type']], '_validate_values' ) ) {
+							$plugin_options = $core->extensions[$field['type']]->_validate_values( $plugin_options, $field, $sections );
 						}
 
 						// Make sure 'validate' field is set.
@@ -85,7 +85,7 @@ 
 								}
 
 								// Check for empty id value.
-								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[$field['id']] ) || ( '' === $plugin_options[$field['id']] ) ) {
 
 									// If we are looking for an empty value, in the case of 'not_empty'
 									// then we need to keep processing.
@@ -139,33 +139,33 @@ 
 								}
 
 								if ( class_exists( $validate ) ) {
-									if ( empty( $options[ $field['id'] ] ) ) {
-										$options[ $field['id'] ] = '';
+									if ( empty( $options[$field['id']] ) ) {
+										$options[$field['id']] = '';
 									}
 
-									if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-										foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+									if ( isset( $plugin_options[$field['id']] ) && is_array( $plugin_options[$field['id']] ) && ! empty( $plugin_options[$field['id']] ) ) {
+										foreach ( $plugin_options[$field['id']] as $key => $value ) {
 											$before = null;
 											$after  = null;
 
-											if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
-													$before = $plugin_options[ $field['id'] ][ $key ];
+											if ( isset( $plugin_options[$field['id']][$key] ) && ( ! empty( $plugin_options[$field['id']][$key] ) || '0' === $plugin_options[$field['id']][$key] ) ) {
+												if ( is_array( $plugin_options[$field['id']][$key] ) ) {
+													$before = $plugin_options[$field['id']][$key];
 												} else {
-													$before = trim( $plugin_options[ $field['id'] ][ $key ] );
+													$before = trim( $plugin_options[$field['id']][$key] );
 												}
 											}
 
-											if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												$after = $options[ $field['id'] ][ $key ];
+											if ( isset( $options[$field['id']][$key] ) && ( ! empty( $plugin_options[$field['id']][$key] ) || '0' === $plugin_options[$field['id']][$key] ) ) {
+												$after = $options[$field['id']][$key];
 											}
 
 											$validation = new $validate( $core, $field, $before, $after );
 
 											if ( ! empty( $validation->value ) || '0' === $validation->value ) {
-												$plugin_options[ $field['id'] ][ $key ] = $validation->value;
+												$plugin_options[$field['id']][$key] = $validation->value;
 											} else {
-												unset( $plugin_options[ $field['id'] ][ $key ] );
+												unset( $plugin_options[$field['id']][$key] );
 											}
 
 											if ( ! empty( $validation->error ) ) {
@@ -181,18 +181,18 @@ 
 											}
 										}
 									} else {
-										if ( isset( $plugin_options[ $field['id'] ] ) ) {
-											if ( is_array( $plugin_options[ $field['id'] ] ) ) {
-												$pofi = $plugin_options[ $field['id'] ];
+										if ( isset( $plugin_options[$field['id']] ) ) {
+											if ( is_array( $plugin_options[$field['id']] ) ) {
+												$pofi = $plugin_options[$field['id']];
 											} else {
-												$pofi = trim( $plugin_options[ $field['id'] ] );
+												$pofi = trim( $plugin_options[$field['id']] );
 											}
 										} else {
 											$pofi = null;
 										}
 
-										$validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
-										$plugin_options[ $field['id'] ] = $validation->value;
+										$validation                     = new $validate( $core, $field, $pofi, $options[$field['id']] );
+										$plugin_options[$field['id']] = $validation->value;
 
 										if ( ! empty( $validation->error ) ) {
 											$core->errors[] = $validation->error;
@@ -216,13 +216,13 @@ 
 							$callback = $field['validate_callback'];
 							unset( $field['validate_callback'] );
 
-							$plugin_option = $plugin_options[ $field['id'] ] ?? null;
-							$option        = $options[ $field['id'] ] ?? null;
+							$plugin_option = $plugin_options[$field['id']] ?? null;
+							$option        = $options[$field['id']] ?? null;
 
 							if ( null !== $plugin_option ) {
 								$callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
 
-								$plugin_options[ $field['id'] ] = $callbackvalues['value'];
+								$plugin_options[$field['id']] = $callbackvalues['value'];
 
 								if ( isset( $callbackvalues['error'] ) ) {
 									$core->errors[] = $callbackvalues['error'];

redux-core/inc/lib/gradient-filters/class-redux-gradient-filters.php

Indentation +256 added lines, -256 removed lines

@@ -11,260 +11,260 @@
 
 if ( ! class_exists( 'Redux_Gradient_Filters' ) ) {
 
-	/**
-	 * Class Redux_Gradient_Filters
-	 */
-	class Redux_Gradient_Filters {
-
-		/**
-		 * Render select boxes.
-		 *
-		 * @param array $data Data.
-		 *
-		 * @return string
-		 */
-		public static function render_select( array $data ): string {
-			extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
-
-			$output = '';
-
-			if ( $field['gradient-type'] ) {
-				$select2_default = array(
-					'width'                   => 'resolve',
-					'allowClear'              => false,
-					'theme'                   => 'default',
-					'minimumResultsForSearch' => 3,
-				);
-
-				$select2_default = Redux_Functions::sanitize_camel_case_array_keys( $select2_default );
-
-				$select2_data = Redux_Functions::create_data_string( $select2_default );
-
-				$output .= '<div class="redux-gradient-type">';
-				$output .= '<strong>' . esc_html__( 'Gradient Type ', 'redux-framework' ) . '</strong>&nbsp;';
-				$output .= '<select ';
-				$output .= 'class="redux-gradient-select select2-container"';
-				$output .= 'data-placeholder="' . esc_attr__( 'Type', 'redux-framework' ) . '" ' . $select2_data . ' ';
-				$output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-type]"';
-				$output .= 'data-value="' . esc_attr( $value['gradient-type'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '">';
-
-				$arr = array(
-					esc_html__( 'linear', 'redux-framework' ),
-					esc_html__( 'radial', 'redux-framework' ),
-				);
-
-				foreach ( $arr as $v ) {
-					$output .= '<option value="' . esc_attr( $v ) . '" ' . selected( $value['gradient-type'], $v, false ) . '>' . esc_html( ucfirst( $v ) ) . '</option>';
-				}
-
-				$output .= '</select>';
-				$output .= '</div>';
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Render sliders.
-		 *
-		 * @param array $data Data.
-		 *
-		 * @return string
-		 */
-		public static function render_sliders( array $data ): string {
-			extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
-
-			$output = '';
-
-			if ( $field['gradient-reach'] ) {
-				$output .= '<div class="slider-from-reach">';
-				$output .= '<div class="label">' . esc_html__( 'From Reach ', 'redux-framework' ) . ':  <strong>' . esc_html( $value['gradient-reach']['from'] ) . '%</strong></div>';
-				$output .= '<div ';
-				$output .= 'class="redux-gradient-slider redux-color-gradient redux-gradient-from-reach color-gradient-input ' . esc_attr( $field['class'] ) . '"';
-				$output .= 'id="' . esc_attr( $field['id'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '-from"';
-				$output .= 'data-min="0"';
-				$output .= 'data-max="100"';
-				$output .= 'data-step="1"';
-				$output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
-				$output .= 'data-label="' . esc_attr__( 'From Reach', 'redux-framework' ) . '"';
-				$output .= 'data-default = "' . esc_attr( $value['gradient-reach']['from'] ) . '">';
-				$output .= '</div>';
-				$output .= '<input ';
-				$output .= 'type="hidden"';
-				$output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-from"';
-				$output .= 'class="color-gradient-reach-from"';
-				$output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-reach][from]"';
-				$output .= 'value="' . esc_attr( $value['gradient-reach']['from'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
-				$output .= '/>';
-				$output .= '</div>';
-
-				$output .= '<div class="slider-to-reach">';
-				$output .= '<div class="label">' . esc_html__( 'To Reach', 'redux-framework' ) . ':  <strong>' . esc_html( $value['gradient-reach']['to'] ) . '%</strong></div>';
-				$output .= '<div ';
-				$output .= 'class="redux-gradient-slider redux-color-gradient redux-gradient-reach-to color-gradient-input ' . esc_attr( $field['class'] ) . '"';
-				$output .= 'id="' . esc_attr( $field['id'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '-to"';
-				$output .= 'data-min="0"';
-				$output .= 'data-max="100"';
-				$output .= 'data-step="1"';
-				$output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
-				$output .= 'data-label="' . esc_attr__( 'To Reach', 'redux-framework' ) . '"';
-				$output .= 'data-default = "' . esc_attr( $value['gradient-reach']['to'] ) . '">';
-				$output .= '</div>';
-				$output .= '<input ';
-				$output .= 'type="hidden"';
-				$output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-to"';
-				$output .= 'class="color-gradient-reach-to"';
-				$output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-reach][to]"';
-				$output .= 'value="' . esc_attr( $value['gradient-reach']['to'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
-				$output .= '/>';
-				$output .= '</div>';
-			}
-
-			if ( $field['gradient-angle'] ) {
-				$style = '';
-				if ( 'radial' === $value['gradient-type'] ) {
-					$style = 'style="display:none;"';
-				}
-
-				$output .= '<div class="slider-gradient-angle" ' . $style . '>';
-				$output .= '<div class="label">' . esc_html__( 'Gradient Angle', 'redux-framework' ) . ':  <strong>' . $value['gradient-angle'] . '&deg;</strong></div>';
-				$output .= '<div ';
-				$output .= 'class="redux-gradient-slider redux-color-gradient redux-gradient-angle color-gradient-input ' . esc_attr( $field['class'] ) . '"';
-				$output .= 'id="' . esc_attr( $field['id'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '-angle"';
-				$output .= 'data-min="0"';
-				$output .= 'data-max="360"';
-				$output .= 'data-step="1"';
-				$output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
-				$output .= 'data-label="' . esc_attr__( 'Gradient Angle', 'redux-framework' ) . '"';
-				$output .= 'data-default = "' . esc_attr( $value['gradient-angle'] ) . '">';
-				$output .= '</div>';
-				$output .= '<input ';
-				$output .= 'type="hidden"';
-				$output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-angle"';
-				$output .= 'class="color-gradient-angle"';
-				$output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-angle]"';
-				$output .= 'value="' . esc_attr( $value['gradient-angle'] ) . '"';
-				$output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
-				$output .= '/>';
-				$output .= '</div>';
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Render preview.
-		 *
-		 * @param array $data Data.
-		 *
-		 * @return string
-		 */
-		public static function render_preview( array $data ): string {
-			extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
-
-			$output = '';
-
-			$css = '';
-			if ( false === $field['preview'] ) {
-				$css .= 'display:none;';
-			}
-
-			$css .= self::get_output( $value );
-
-			$css .= 'height: ' . $field['preview_height'] . ';';
-
-			$output .= '<div class="redux-gradient-preview" style="' . esc_attr( $css ) . '"></div>';
-
-			return $output;
-		}
-
-		/**
-		 * Get CSS output.
-		 *
-		 * @param mixed $data Data.
-		 *
-		 * @return string
-		 */
-		public static function get_output( $data ): string {
-			if ( ! is_array( $data ) ) {
-				return $data;
-			}
-
-			$angle = $data['gradient-angle'];
-
-			$w3c_angle = abs( $angle - 450 ) % 360;
-
-			$colors = $data['from'] . ' ' . $data['gradient-reach']['from'] . '%, ' . $data['to'] . ' ' . $data['gradient-reach']['to'] . '%)';
-
-			if ( 'linear' === $data['gradient-type'] ) {
-				$result_w3c = 'linear-gradient(' . $w3c_angle . 'deg,' . $colors;
-				$result     = 'linear-gradient(' . $angle . 'deg,' . $colors;
-			} else {
-				$result_w3c = 'radial-gradient(center, ellipse cover, ' . $colors;
-				$result     = 'radial-gradient(center, ellipse cover,' . $colors;
-			}
-
-			return 'background:' . $result_w3c . ';background:-moz-' . $result . ';background:-webkit-' . $result . ';background:-o-' . $result . ';background:-ms-' . $result;
-		}
-
-		/**
-		 * Enqueue support files.
-		 *
-		 * @param array $field           Field array.
-		 * @param bool  $filters_enabled Enable filter bit.
-		 */
-		public static function enqueue( array $field, bool $filters_enabled ) {
-			$min = Redux_Functions::is_min();
-
-			if ( $filters_enabled ) {
-				if ( $field['gradient-type'] ) {
-					if ( ! wp_style_is( 'select2-css' ) ) {
-						wp_enqueue_style( 'select2-css' );
-					}
-
-					if ( ! wp_script_is( 'select2-js' ) ) {
-						wp_enqueue_script( 'select2-js' );
-					}
-				}
-
-				if ( ! wp_style_is( 'redux-nouislider' ) ) {
-					wp_enqueue_style(
-						'redux-nouislider',
-						Redux_Core::$url . 'assets/css/vendor/nouislider' . $min . '.css',
-						array(),
-						'5.0.0'
-					);
-
-					wp_enqueue_script(
-						'redux-nouislider',
-						Redux_Core::$url . 'assets/js/vendor/nouislider/redux.jquery.nouislider' . $min . '.js',
-						array( 'jquery' ),
-						'5.0.0',
-						true
-					);
-				}
-
-				wp_enqueue_script(
-					'redux-gradient-filters',
-					Redux_Core::$url . 'inc/lib/gradient-filters/gradient-filters' . Redux_Functions::isMin() . '.js',
-					array( 'jquery' ),
-					Redux_Core::$version,
-					true
-				);
-
-				wp_enqueue_style(
-					'redux-gradient-filters',
-					Redux_Core::$url . 'inc/lib/gradient-filters/gradient-filters.css',
-					array(),
-					Redux_Core::$version
-				);
-			}
-		}
-	}
+    /**
+     * Class Redux_Gradient_Filters
+     */
+    class Redux_Gradient_Filters {
+
+        /**
+         * Render select boxes.
+         *
+         * @param array $data Data.
+         *
+         * @return string
+         */
+        public static function render_select( array $data ): string {
+            extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
+
+            $output = '';
+
+            if ( $field['gradient-type'] ) {
+                $select2_default = array(
+                    'width'                   => 'resolve',
+                    'allowClear'              => false,
+                    'theme'                   => 'default',
+                    'minimumResultsForSearch' => 3,
+                );
+
+                $select2_default = Redux_Functions::sanitize_camel_case_array_keys( $select2_default );
+
+                $select2_data = Redux_Functions::create_data_string( $select2_default );
+
+                $output .= '<div class="redux-gradient-type">';
+                $output .= '<strong>' . esc_html__( 'Gradient Type ', 'redux-framework' ) . '</strong>&nbsp;';
+                $output .= '<select ';
+                $output .= 'class="redux-gradient-select select2-container"';
+                $output .= 'data-placeholder="' . esc_attr__( 'Type', 'redux-framework' ) . '" ' . $select2_data . ' ';
+                $output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-type]"';
+                $output .= 'data-value="' . esc_attr( $value['gradient-type'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '">';
+
+                $arr = array(
+                    esc_html__( 'linear', 'redux-framework' ),
+                    esc_html__( 'radial', 'redux-framework' ),
+                );
+
+                foreach ( $arr as $v ) {
+                    $output .= '<option value="' . esc_attr( $v ) . '" ' . selected( $value['gradient-type'], $v, false ) . '>' . esc_html( ucfirst( $v ) ) . '</option>';
+                }
+
+                $output .= '</select>';
+                $output .= '</div>';
+            }
+
+            return $output;
+        }
+
+        /**
+         * Render sliders.
+         *
+         * @param array $data Data.
+         *
+         * @return string
+         */
+        public static function render_sliders( array $data ): string {
+            extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
+
+            $output = '';
+
+            if ( $field['gradient-reach'] ) {
+                $output .= '<div class="slider-from-reach">';
+                $output .= '<div class="label">' . esc_html__( 'From Reach ', 'redux-framework' ) . ':  <strong>' . esc_html( $value['gradient-reach']['from'] ) . '%</strong></div>';
+                $output .= '<div ';
+                $output .= 'class="redux-gradient-slider redux-color-gradient redux-gradient-from-reach color-gradient-input ' . esc_attr( $field['class'] ) . '"';
+                $output .= 'id="' . esc_attr( $field['id'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '-from"';
+                $output .= 'data-min="0"';
+                $output .= 'data-max="100"';
+                $output .= 'data-step="1"';
+                $output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
+                $output .= 'data-label="' . esc_attr__( 'From Reach', 'redux-framework' ) . '"';
+                $output .= 'data-default = "' . esc_attr( $value['gradient-reach']['from'] ) . '">';
+                $output .= '</div>';
+                $output .= '<input ';
+                $output .= 'type="hidden"';
+                $output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-from"';
+                $output .= 'class="color-gradient-reach-from"';
+                $output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-reach][from]"';
+                $output .= 'value="' . esc_attr( $value['gradient-reach']['from'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
+                $output .= '/>';
+                $output .= '</div>';
+
+                $output .= '<div class="slider-to-reach">';
+                $output .= '<div class="label">' . esc_html__( 'To Reach', 'redux-framework' ) . ':  <strong>' . esc_html( $value['gradient-reach']['to'] ) . '%</strong></div>';
+                $output .= '<div ';
+                $output .= 'class="redux-gradient-slider redux-color-gradient redux-gradient-reach-to color-gradient-input ' . esc_attr( $field['class'] ) . '"';
+                $output .= 'id="' . esc_attr( $field['id'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '-to"';
+                $output .= 'data-min="0"';
+                $output .= 'data-max="100"';
+                $output .= 'data-step="1"';
+                $output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
+                $output .= 'data-label="' . esc_attr__( 'To Reach', 'redux-framework' ) . '"';
+                $output .= 'data-default = "' . esc_attr( $value['gradient-reach']['to'] ) . '">';
+                $output .= '</div>';
+                $output .= '<input ';
+                $output .= 'type="hidden"';
+                $output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-to"';
+                $output .= 'class="color-gradient-reach-to"';
+                $output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-reach][to]"';
+                $output .= 'value="' . esc_attr( $value['gradient-reach']['to'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
+                $output .= '/>';
+                $output .= '</div>';
+            }
+
+            if ( $field['gradient-angle'] ) {
+                $style = '';
+                if ( 'radial' === $value['gradient-type'] ) {
+                    $style = 'style="display:none;"';
+                }
+
+                $output .= '<div class="slider-gradient-angle" ' . $style . '>';
+                $output .= '<div class="label">' . esc_html__( 'Gradient Angle', 'redux-framework' ) . ':  <strong>' . $value['gradient-angle'] . '&deg;</strong></div>';
+                $output .= '<div ';
+                $output .= 'class="redux-gradient-slider redux-color-gradient redux-gradient-angle color-gradient-input ' . esc_attr( $field['class'] ) . '"';
+                $output .= 'id="' . esc_attr( $field['id'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '-angle"';
+                $output .= 'data-min="0"';
+                $output .= 'data-max="360"';
+                $output .= 'data-step="1"';
+                $output .= 'data-rtl="' . esc_attr( is_rtl() ) . '"';
+                $output .= 'data-label="' . esc_attr__( 'Gradient Angle', 'redux-framework' ) . '"';
+                $output .= 'data-default = "' . esc_attr( $value['gradient-angle'] ) . '">';
+                $output .= '</div>';
+                $output .= '<input ';
+                $output .= 'type="hidden"';
+                $output .= 'id="redux-slider-value-' . esc_attr( $field['id'] ) . '-angle"';
+                $output .= 'class="color-gradient-angle"';
+                $output .= 'name="' . esc_attr( $field['name'] . $field['name_suffix'] ) . '[gradient-angle]"';
+                $output .= 'value="' . esc_attr( $value['gradient-angle'] ) . '"';
+                $output .= 'data-id="' . esc_attr( $field['id'] ) . '"';
+                $output .= '/>';
+                $output .= '</div>';
+            }
+
+            return $output;
+        }
+
+        /**
+         * Render preview.
+         *
+         * @param array $data Data.
+         *
+         * @return string
+         */
+        public static function render_preview( array $data ): string {
+            extract( $data ); // phpcs:ignore WordPress.PHP.DontExtract
+
+            $output = '';
+
+            $css = '';
+            if ( false === $field['preview'] ) {
+                $css .= 'display:none;';
+            }
+
+            $css .= self::get_output( $value );
+
+            $css .= 'height: ' . $field['preview_height'] . ';';
+
+            $output .= '<div class="redux-gradient-preview" style="' . esc_attr( $css ) . '"></div>';
+
+            return $output;
+        }
+
+        /**
+         * Get CSS output.
+         *
+         * @param mixed $data Data.
+         *
+         * @return string
+         */
+        public static function get_output( $data ): string {
+            if ( ! is_array( $data ) ) {
+                return $data;
+            }
+
+            $angle = $data['gradient-angle'];
+
+            $w3c_angle = abs( $angle - 450 ) % 360;
+
+            $colors = $data['from'] . ' ' . $data['gradient-reach']['from'] . '%, ' . $data['to'] . ' ' . $data['gradient-reach']['to'] . '%)';
+
+            if ( 'linear' === $data['gradient-type'] ) {
+                $result_w3c = 'linear-gradient(' . $w3c_angle . 'deg,' . $colors;
+                $result     = 'linear-gradient(' . $angle . 'deg,' . $colors;
+            } else {
+                $result_w3c = 'radial-gradient(center, ellipse cover, ' . $colors;
+                $result     = 'radial-gradient(center, ellipse cover,' . $colors;
+            }
+
+            return 'background:' . $result_w3c . ';background:-moz-' . $result . ';background:-webkit-' . $result . ';background:-o-' . $result . ';background:-ms-' . $result;
+        }
+
+        /**
+         * Enqueue support files.
+         *
+         * @param array $field           Field array.
+         * @param bool  $filters_enabled Enable filter bit.
+         */
+        public static function enqueue( array $field, bool $filters_enabled ) {
+            $min = Redux_Functions::is_min();
+
+            if ( $filters_enabled ) {
+                if ( $field['gradient-type'] ) {
+                    if ( ! wp_style_is( 'select2-css' ) ) {
+                        wp_enqueue_style( 'select2-css' );
+                    }
+
+                    if ( ! wp_script_is( 'select2-js' ) ) {
+                        wp_enqueue_script( 'select2-js' );
+                    }
+                }
+
+                if ( ! wp_style_is( 'redux-nouislider' ) ) {
+                    wp_enqueue_style(
+                        'redux-nouislider',
+                        Redux_Core::$url . 'assets/css/vendor/nouislider' . $min . '.css',
+                        array(),
+                        '5.0.0'
+                    );
+
+                    wp_enqueue_script(
+                        'redux-nouislider',
+                        Redux_Core::$url . 'assets/js/vendor/nouislider/redux.jquery.nouislider' . $min . '.js',
+                        array( 'jquery' ),
+                        '5.0.0',
+                        true
+                    );
+                }
+
+                wp_enqueue_script(
+                    'redux-gradient-filters',
+                    Redux_Core::$url . 'inc/lib/gradient-filters/gradient-filters' . Redux_Functions::isMin() . '.js',
+                    array( 'jquery' ),
+                    Redux_Core::$version,
+                    true
+                );
+
+                wp_enqueue_style(
+                    'redux-gradient-filters',
+                    Redux_Core::$url . 'inc/lib/gradient-filters/gradient-filters.css',
+                    array(),
+                    Redux_Core::$version
+                );
+            }
+        }
+    }
 }

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

Indentation +181 added lines, -181 removed lines

@@ -11,200 +11,200 @@
 
 if ( ! class_exists( 'Redux_Sortable', false ) ) {
 
-	/**
-	 * Class Redux_Sortable
-	 */
-	class Redux_Sortable extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'options' => array(),
-				'label'   => false,
-				'mode'    => 'text',
-			);
-
-			$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 Redux_Options 2.0.1
-		 */
-		public function render() {
-			if ( empty( $this->field['mode'] ) ) {
-				$this->field['mode'] = 'text';
-			}
-
-			if ( 'checkbox' !== $this->field['mode'] && 'text' !== $this->field['mode'] && 'toggle' !== $this->field['mode'] ) {
-				$this->field['mode'] = 'text';
-			}
-
-			if ( 'toggle' === $this->field['mode'] ) {
-				$this->field['mode'] = 'checkbox';
-			}
-
-			$class   = ( isset( $this->field['class'] ) ) ? $this->field['class'] : '';
-			$options = $this->field['options'];
-
-			// This is to weed out missing options that might be in the default
-			// Why?  Who knows.  Call it a dummy check.
-			if ( ! empty( $this->value ) ) {
-				foreach ( $this->value as $k => $v ) {
-					if ( ! isset( $options[ $k ] ) ) {
-						unset( $this->value[ $k ] );
-					}
-				}
-			}
-
-			$no_sort = false;
-			if ( empty( $this->value ) && ! is_array( $this->value ) ) {
-				if ( ! empty( $this->field['options'] ) ) {
-					$this->value = $this->field['options'];
-				} else {
-					$this->value = array();
-				}
-			}
-			foreach ( $options as $k => $v ) {
-				if ( ! isset( $this->value[ $k ] ) ) {
-
-					// A save has previously been done.
-					if ( is_array( $this->value ) && array_key_exists( $k, $this->value ) ) {
-						$this->value[ $k ] = $v;
-
-						// Missing database entry, meaning no save has yet been done.
-					} else {
-						$no_sort           = true;
-						$this->value[ $k ] = '';
-					}
-				}
-			}
-
-			// If missing database entries are found, it means no save has been done
-			// and therefore no sort should be done.  Set the default array in the same
-			// order as the options array.  Why?  The sort order is based on the
-			// saved default array.  If entries are missing, the sort is messed up.
-			// - kp.
-			if ( true === $no_sort ) {
-				$dummy_arr = array();
-
-				foreach ( $options as $k => $v ) {
-					$dummy_arr[ $k ] = $this->value[ $k ];
-				}
-				unset( $this->value );
-				$this->value = $dummy_arr;
-				unset( $dummy_arr );
-			}
-
-			$use_labels  = false;
-			$label_class = ' checkbox';
-			if ( 'checkbox' !== $this->field['mode'] ) {
-				if ( ( isset( $this->field['label'] ) && true === $this->field['label'] ) ) {
-					$use_labels  = true;
-					$label_class = ' labeled';
-				}
-			}
-
-			echo '<ul id="' . esc_attr( $this->field['id'] ) . '-list" class="redux-sortable ' . esc_attr( $class ) . ' ' . esc_attr( $label_class ) . '">';
-
-			foreach ( $this->value as $k => $nicename ) {
-				$invisible = '';
-
-				if ( 'checkbox' === $this->field['mode'] ) {
-					if ( empty( $this->value[ $k ] ) ) {
-						$invisible = ' invisible';
-					}
-				}
-
-				echo '<li class="' . esc_attr( $invisible ) . '">';
-
-				$checked = '';
-				$name    = 'name="' . $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) . ']" ';
-
-				if ( 'checkbox' === $this->field['mode'] ) {
-					$value_display = $this->value[ $k ];
-
-					if ( ! empty( $this->value[ $k ] ) ) {
-						$checked = 'checked="checked" ';
-					}
-
-					$class .= ' checkbox_sortable';
-					$name   = '';
-
-					echo '<div class="checkbox-container">';
-					echo '<input
+    /**
+     * Class Redux_Sortable
+     */
+    class Redux_Sortable extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'options' => array(),
+                'label'   => false,
+                'mode'    => 'text',
+            );
+
+            $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 Redux_Options 2.0.1
+         */
+        public function render() {
+            if ( empty( $this->field['mode'] ) ) {
+                $this->field['mode'] = 'text';
+            }
+
+            if ( 'checkbox' !== $this->field['mode'] && 'text' !== $this->field['mode'] && 'toggle' !== $this->field['mode'] ) {
+                $this->field['mode'] = 'text';
+            }
+
+            if ( 'toggle' === $this->field['mode'] ) {
+                $this->field['mode'] = 'checkbox';
+            }
+
+            $class   = ( isset( $this->field['class'] ) ) ? $this->field['class'] : '';
+            $options = $this->field['options'];
+
+            // This is to weed out missing options that might be in the default
+            // Why?  Who knows.  Call it a dummy check.
+            if ( ! empty( $this->value ) ) {
+                foreach ( $this->value as $k => $v ) {
+                    if ( ! isset( $options[ $k ] ) ) {
+                        unset( $this->value[ $k ] );
+                    }
+                }
+            }
+
+            $no_sort = false;
+            if ( empty( $this->value ) && ! is_array( $this->value ) ) {
+                if ( ! empty( $this->field['options'] ) ) {
+                    $this->value = $this->field['options'];
+                } else {
+                    $this->value = array();
+                }
+            }
+            foreach ( $options as $k => $v ) {
+                if ( ! isset( $this->value[ $k ] ) ) {
+
+                    // A save has previously been done.
+                    if ( is_array( $this->value ) && array_key_exists( $k, $this->value ) ) {
+                        $this->value[ $k ] = $v;
+
+                        // Missing database entry, meaning no save has yet been done.
+                    } else {
+                        $no_sort           = true;
+                        $this->value[ $k ] = '';
+                    }
+                }
+            }
+
+            // If missing database entries are found, it means no save has been done
+            // and therefore no sort should be done.  Set the default array in the same
+            // order as the options array.  Why?  The sort order is based on the
+            // saved default array.  If entries are missing, the sort is messed up.
+            // - kp.
+            if ( true === $no_sort ) {
+                $dummy_arr = array();
+
+                foreach ( $options as $k => $v ) {
+                    $dummy_arr[ $k ] = $this->value[ $k ];
+                }
+                unset( $this->value );
+                $this->value = $dummy_arr;
+                unset( $dummy_arr );
+            }
+
+            $use_labels  = false;
+            $label_class = ' checkbox';
+            if ( 'checkbox' !== $this->field['mode'] ) {
+                if ( ( isset( $this->field['label'] ) && true === $this->field['label'] ) ) {
+                    $use_labels  = true;
+                    $label_class = ' labeled';
+                }
+            }
+
+            echo '<ul id="' . esc_attr( $this->field['id'] ) . '-list" class="redux-sortable ' . esc_attr( $class ) . ' ' . esc_attr( $label_class ) . '">';
+
+            foreach ( $this->value as $k => $nicename ) {
+                $invisible = '';
+
+                if ( 'checkbox' === $this->field['mode'] ) {
+                    if ( empty( $this->value[ $k ] ) ) {
+                        $invisible = ' invisible';
+                    }
+                }
+
+                echo '<li class="' . esc_attr( $invisible ) . '">';
+
+                $checked = '';
+                $name    = 'name="' . $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) . ']" ';
+
+                if ( 'checkbox' === $this->field['mode'] ) {
+                    $value_display = $this->value[ $k ];
+
+                    if ( ! empty( $this->value[ $k ] ) ) {
+                        $checked = 'checked="checked" ';
+                    }
+
+                    $class .= ' checkbox_sortable';
+                    $name   = '';
+
+                    echo '<div class="checkbox-container">';
+                    echo '<input
 							type="hidden"
 							name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[' . esc_attr( $k ) . ']"
 							id="' . esc_attr( $this->field['id'] . '-' . $k ) . '-hidden"
 							value="' . esc_attr( $value_display ) . '" />';
 
-				} else {
-					$value_display = $this->value[ $k ] ?? '';
-					$nicename      = $this->field['options'][ $k ];
-				}
+                } else {
+                    $value_display = $this->value[ $k ] ?? '';
+                    $nicename      = $this->field['options'][ $k ];
+                }
 
-				if ( 'checkbox' !== $this->field['mode'] ) {
-					if ( $use_labels ) {
-						echo '<label class="bugger" for="' . esc_attr( $this->field['id'] ) . '[' . esc_attr( $k ) . ']"><strong>' . esc_html( $k ) . '</strong></label>';
-						echo '<br />';
-					}
+                if ( 'checkbox' !== $this->field['mode'] ) {
+                    if ( $use_labels ) {
+                        echo '<label class="bugger" for="' . esc_attr( $this->field['id'] ) . '[' . esc_attr( $k ) . ']"><strong>' . esc_html( $k ) . '</strong></label>';
+                        echo '<br />';
+                    }
 
-					echo '<input
+                    echo '<input
 						rel="' . esc_attr( $this->field['id'] . '-' . $k ) . '-hidden"
 						class="' . esc_attr( $class ) . '" ' . esc_html( $checked ) . '
 						type="' . esc_attr( $this->field['mode'] ) . '"
 						' . $name . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-						'id="' . esc_attr( $this->field['id'] . '[' . $k ) . ']"
+                        'id="' . esc_attr( $this->field['id'] . '[' . $k ) . ']"
 						value="' . esc_attr( $value_display ) . '"
 						placeholder="' . esc_attr( $nicename ) . '" />';
-				}
-
-				echo '<span class="compact drag">';
-				echo '<i class="dashicons dashicons-menu icon-large"></i>';
-				echo '</span>';
-
-				if ( 'checkbox' === $this->field['mode'] ) {
-					echo '<i class="dashicons dashicons-visibility visibility"></i>';
-
-					echo '<strong>' . esc_html( $options[ $k ] ) . '</strong>';
-				}
-
-				if ( 'checkbox' === $this->field['mode'] ) {
-					echo '</div>';
-				}
-
-				echo '</li>';
-			}
-
-			echo '</ul>';
-		}
-
-		/**
-		 * Enqueue scripts and styles.
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-sortable',
-					Redux_Core::$url . 'inc/fields/sortable/redux-sortable.css',
-					array(),
-					$this->timestamp
-				);
-			}
-
-			wp_enqueue_script(
-				'redux-field-sortable',
-				Redux_Core::$url . 'inc/fields/sortable/redux-sortable' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js', 'jquery-ui-sortable' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+                }
+
+                echo '<span class="compact drag">';
+                echo '<i class="dashicons dashicons-menu icon-large"></i>';
+                echo '</span>';
+
+                if ( 'checkbox' === $this->field['mode'] ) {
+                    echo '<i class="dashicons dashicons-visibility visibility"></i>';
+
+                    echo '<strong>' . esc_html( $options[ $k ] ) . '</strong>';
+                }
+
+                if ( 'checkbox' === $this->field['mode'] ) {
+                    echo '</div>';
+                }
+
+                echo '</li>';
+            }
+
+            echo '</ul>';
+        }
+
+        /**
+         * Enqueue scripts and styles.
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-sortable',
+                    Redux_Core::$url . 'inc/fields/sortable/redux-sortable.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+
+            wp_enqueue_script(
+                'redux-field-sortable',
+                Redux_Core::$url . 'inc/fields/sortable/redux-sortable' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js', 'jquery-ui-sortable' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Sortable', 'ReduxFramework_Sortable' );

Spacing +12 added lines, -12 removed lines

@@ -55,8 +55,8 @@ 
 			// Why?  Who knows.  Call it a dummy check.
 			if ( ! empty( $this->value ) ) {
 				foreach ( $this->value as $k => $v ) {
-					if ( ! isset( $options[ $k ] ) ) {
-						unset( $this->value[ $k ] );
+					if ( ! isset( $options[$k] ) ) {
+						unset( $this->value[$k] );
 					}
 				}
 			}
@@ -70,16 +70,16 @@ 
 				}
 			}
 			foreach ( $options as $k => $v ) {
-				if ( ! isset( $this->value[ $k ] ) ) {
+				if ( ! isset( $this->value[$k] ) ) {
 
 					// A save has previously been done.
 					if ( is_array( $this->value ) && array_key_exists( $k, $this->value ) ) {
-						$this->value[ $k ] = $v;
+						$this->value[$k] = $v;
 
 						// Missing database entry, meaning no save has yet been done.
 					} else {
 						$no_sort           = true;
-						$this->value[ $k ] = '';
+						$this->value[$k] = '';
 					}
 				}
 			}
@@ -93,7 +93,7 @@ 
 				$dummy_arr = array();
 
 				foreach ( $options as $k => $v ) {
-					$dummy_arr[ $k ] = $this->value[ $k ];
+					$dummy_arr[$k] = $this->value[$k];
 				}
 				unset( $this->value );
 				$this->value = $dummy_arr;
@@ -115,7 +115,7 @@ 
 				$invisible = '';
 
 				if ( 'checkbox' === $this->field['mode'] ) {
-					if ( empty( $this->value[ $k ] ) ) {
+					if ( empty( $this->value[$k] ) ) {
 						$invisible = ' invisible';
 					}
 				}
@@ -126,9 +126,9 @@ 
 				$name    = 'name="' . $this->field['name'] . $this->field['name_suffix'] . '[' . esc_attr( $k ) . ']" ';
 
 				if ( 'checkbox' === $this->field['mode'] ) {
-					$value_display = $this->value[ $k ];
+					$value_display = $this->value[$k];
 
-					if ( ! empty( $this->value[ $k ] ) ) {
+					if ( ! empty( $this->value[$k] ) ) {
 						$checked = 'checked="checked" ';
 					}
 
@@ -143,8 +143,8 @@ 
 							value="' . esc_attr( $value_display ) . '" />';
 
 				} else {
-					$value_display = $this->value[ $k ] ?? '';
-					$nicename      = $this->field['options'][ $k ];
+					$value_display = $this->value[$k] ?? '';
+					$nicename      = $this->field['options'][$k];
 				}
 
 				if ( 'checkbox' !== $this->field['mode'] ) {
@@ -170,7 +170,7 @@ 
 				if ( 'checkbox' === $this->field['mode'] ) {
 					echo '<i class="dashicons dashicons-visibility visibility"></i>';
 
-					echo '<strong>' . esc_html( $options[ $k ] ) . '</strong>';
+					echo '<strong>' . esc_html( $options[$k] ) . '</strong>';
 				}
 
 				if ( 'checkbox' === $this->field['mode'] ) {

redux-core/inc/classes/class-redux-installer-muter.php

Indentation +19 added lines, -19 removed lines

@@ -4,24 +4,24 @@
 
 if ( ! class_exists( 'Redux_Installer_Muter', false ) ) {
 
-	/**
-	 * Redux_Installer_Muter.
-	 *
-	 * @since 4.0.0
-	 */
-	class Redux_Installer_Muter extends WP_Upgrader_Skin {
+    /**
+     * Redux_Installer_Muter.
+     *
+     * @since 4.0.0
+     */
+    class Redux_Installer_Muter extends WP_Upgrader_Skin {
 
-		/**
-		 * Suppress feedback.
-		 *
-		 * @param string|null $feedback  A string.
-		 * @param array|null  ...$args Passed args.
-		 *
-		 * @return void
-		 * @since 4.0.0
-		 */
-		public function feedback( $feedback, ...$args ) {
-			/* no output */
-		}
-	}
+        /**
+         * Suppress feedback.
+         *
+         * @param string|null $feedback  A string.
+         * @param array|null  ...$args Passed args.
+         *
+         * @return void
+         * @since 4.0.0
+         */
+        public function feedback( $feedback, ...$args ) {
+            /* no output */
+        }
+    }
 }