reduxframework / redux-framework

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

Indentation +38 added lines, -38 removed lines

@@ -12,46 +12,46 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Divide', false ) ) {
 
-	/**
-	 * Main Redux_divide class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Divide extends Redux_Field {
+    /**
+     * Main Redux_divide class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Divide 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() {
-			echo '</td></tr></table>';
-			echo '<div data-id="' . esc_attr( $this->field['id'] ) . '" id="divide-' . esc_attr( $this->field['id'] ) . '" class="divide ' . esc_attr( $this->field['class'] ) . '"><div class="inner"><span>&nbsp;</span></div></div>';
-			echo '<table class="form-table no-border"><tbody><tr><th></th><td>';
-		}
+        /**
+         * 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 '</td></tr></table>';
+            echo '<div data-id="' . esc_attr( $this->field['id'] ) . '" id="divide-' . esc_attr( $this->field['id'] ) . '" class="divide ' . esc_attr( $this->field['class'] ) . '"><div class="inner"><span>&nbsp;</span></div></div>';
+            echo '<table class="form-table no-border"><tbody><tr><th></th><td>';
+        }
 
-		/**
-		 * 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-divide',
-					Redux_Core::$url . 'inc/fields/divide/redux-divide.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-divide',
+                    Redux_Core::$url . 'inc/fields/divide/redux-divide.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Divide', 'ReduxFramework_Divide' );

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 			$cb_disabled = '';
 
 			// Get selected.
-			if ( 1 === (int) $this->value ) {
+			if ( 1 === ( int ) $this->value ) {
 				$cb_enabled = ' selected';
 			} else {
 				$cb_disabled = ' selected';

Indentation +53 added lines, -53 removed lines

@@ -11,66 +11,66 @@
 
 if ( ! class_exists( 'Redux_Switch', false ) ) {
 
-	/**
-	 * Class Redux_Switch
-	 */
-	class Redux_Switch extends Redux_Field {
+    /**
+     * Class Redux_Switch
+     */
+    class Redux_Switch extends Redux_Field {
 
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 0.0.4
-		 */
-		public function render() {
-			$cb_enabled  = '';
-			$cb_disabled = '';
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 0.0.4
+         */
+        public function render() {
+            $cb_enabled  = '';
+            $cb_disabled = '';
 
-			// Get selected.
-			if ( 1 === (int) $this->value ) {
-				$cb_enabled = ' selected';
-			} else {
-				$cb_disabled = ' selected';
-			}
+            // Get selected.
+            if ( 1 === (int) $this->value ) {
+                $cb_enabled = ' selected';
+            } else {
+                $cb_disabled = ' selected';
+            }
 
-			// Label ON.
-			$this->field['on'] = $this->field['on'] ?? esc_html__( 'On', 'redux-framework' );
+            // Label ON.
+            $this->field['on'] = $this->field['on'] ?? esc_html__( 'On', 'redux-framework' );
 
-			// Label OFF.
-			$this->field['off'] = $this->field['off'] ?? esc_html__( 'Off', 'redux-framework' );
+            // Label OFF.
+            $this->field['off'] = $this->field['off'] ?? esc_html__( 'Off', 'redux-framework' );
 
-			echo '<div class="switch-options">';
-			echo '<div class="cb-enable label' . esc_attr( $cb_enabled ) . '" data-id="' . esc_attr( $this->field['id'] ) . '"><span>' . esc_html( $this->field['on'] ) . '</span></div>';
-			echo '<div class="cb-disable label' . esc_attr( $cb_disabled ) . '" data-id="' . esc_attr( $this->field['id'] ) . '"><span>' . esc_html( $this->field['off'] ) . '</span></div>';
-			echo '<input type="hidden" class="checkbox checkbox-input ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" value="' . esc_attr( $this->value ) . '" />';
-			echo '</div>';
-		}
+            echo '<div class="switch-options">';
+            echo '<div class="cb-enable label' . esc_attr( $cb_enabled ) . '" data-id="' . esc_attr( $this->field['id'] ) . '"><span>' . esc_html( $this->field['on'] ) . '</span></div>';
+            echo '<div class="cb-disable label' . esc_attr( $cb_disabled ) . '" data-id="' . esc_attr( $this->field['id'] ) . '"><span>' . esc_html( $this->field['off'] ) . '</span></div>';
+            echo '<input type="hidden" class="checkbox checkbox-input ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" value="' . esc_attr( $this->value ) . '" />';
+            echo '</div>';
+        }
 
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 0.0.4
-		 */
-		public function enqueue() {
-			wp_enqueue_script(
-				'redux-field-switch',
-				Redux_Core::$url . 'inc/fields/switch/redux-switch' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 0.0.4
+         */
+        public function enqueue() {
+            wp_enqueue_script(
+                'redux-field-switch',
+                Redux_Core::$url . 'inc/fields/switch/redux-switch' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
 
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-switch',
-					Redux_Core::$url . 'inc/fields/switch/redux-switch.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-switch',
+                    Redux_Core::$url . 'inc/fields/switch/redux-switch.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Switch', 'ReduxFramework_Switch' );

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

Indentation +76 added lines, -76 removed lines

@@ -11,67 +11,67 @@ 
 
 if ( ! class_exists( 'Redux_Password', false ) ) {
 
-	/**
-	 * Class Redux_Password
-	 */
-	class Redux_Password extends Redux_Field {
+    /**
+     * Class Redux_Password
+     */
+    class Redux_Password extends Redux_Field {
 
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.1
-		 */
-		public function render() {
-			if ( ! empty( $this->field['username'] ) && true === $this->field['username'] ) {
-				$this->render_combined_field();
-			} else {
-				$this->render_single_field();
-			}
-		}
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.1
+         */
+        public function render() {
+            if ( ! empty( $this->field['username'] ) && true === $this->field['username'] ) {
+                $this->render_combined_field();
+            } else {
+                $this->render_single_field();
+            }
+        }
 
-		/**
-		 * This will render a combined User/Password field
-		 *
-		 * @since ReduxFramework 3.0.9
-		 * @example
-		 *        <code>
-		 *        array(
-		 *        'id'          => 'smtp_account',
-		 *        'type'        => 'password',
-		 *        'username'    => true,
-		 *        'title'       => 'SMTP Account',
-		 *        'placeholder' => array('username' => 'Username')
-		 *        )
-		 *        </code>
-		 */
-		private function render_combined_field() {
-			$defaults = array(
-				'username'    => '',
-				'password'    => '',
-				'placeholder' => array(
-					'password' => esc_html__( 'Password', 'redux-framework' ),
-					'username' => esc_html__( 'Username', 'redux-framework' ),
-				),
-			);
+        /**
+         * This will render a combined User/Password field
+         *
+         * @since ReduxFramework 3.0.9
+         * @example
+         *        <code>
+         *        array(
+         *        'id'          => 'smtp_account',
+         *        'type'        => 'password',
+         *        'username'    => true,
+         *        'title'       => 'SMTP Account',
+         *        'placeholder' => array('username' => 'Username')
+         *        )
+         *        </code>
+         */
+        private function render_combined_field() {
+            $defaults = array(
+                'username'    => '',
+                'password'    => '',
+                'placeholder' => array(
+                    'password' => esc_html__( 'Password', 'redux-framework' ),
+                    'username' => esc_html__( 'Username', 'redux-framework' ),
+                ),
+            );
 
-			$this->value = wp_parse_args( $this->value, $defaults );
+            $this->value = wp_parse_args( $this->value, $defaults );
 
-			if ( ! empty( $this->field['placeholder'] ) ) {
-				if ( is_array( $this->field['placeholder'] ) ) {
-					if ( ! empty( $this->field['placeholder']['password'] ) ) {
-						$this->value['placeholder']['password'] = $this->field['placeholder']['password'];
-					}
-					if ( ! empty( $this->field['placeholder']['username'] ) ) {
-						$this->value['placeholder']['username'] = $this->field['placeholder']['username'];
-					}
-				} else {
-					$this->value['placeholder']['password'] = $this->field['placeholder'];
-				}
-			}
+            if ( ! empty( $this->field['placeholder'] ) ) {
+                if ( is_array( $this->field['placeholder'] ) ) {
+                    if ( ! empty( $this->field['placeholder']['password'] ) ) {
+                        $this->value['placeholder']['password'] = $this->field['placeholder']['password'];
+                    }
+                    if ( ! empty( $this->field['placeholder']['username'] ) ) {
+                        $this->value['placeholder']['username'] = $this->field['placeholder']['username'];
+                    }
+                } else {
+                    $this->value['placeholder']['password'] = $this->field['placeholder'];
+                }
+            }
 
-			// Username field.
-			echo '<input 
+            // Username field.
+            echo '<input 
 					type="text" 
 					autocomplete="off" 
 					placeholder="' . esc_attr( $this->value['placeholder']['username'] ) . '" 
@@ -80,8 +80,8 @@ 
 					value="' . esc_attr( $this->value['username'] ) . '" 
 					class="' . esc_attr( $this->field['class'] ) . '" />&nbsp;';
 
-			// Password field.
-			echo '<input 
+            // Password field.
+            echo '<input 
 					type="password" 
 					autocomplete="off" 
 					placeholder="' . esc_attr( $this->value['placeholder']['password'] ) . '" 
@@ -89,30 +89,30 @@ 
 					name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[password]" 
 					value="' . esc_attr( $this->value['password'] ) . '" 
 					class="' . esc_attr( $this->field['class'] ) . '" />';
-		}
+        }
 
-		/**
-		 * This will render a single Password field
-		 *
-		 * @since ReduxFramework 3.0.9
-		 * @example
-		 *        <code>
-		 *        array(
-		 *        'id'    => 'smtp_password',
-		 *        'type'  => 'password',
-		 *        'title' => 'SMTP Password'
-		 *        )
-		 *        </code>
-		 */
-		private function render_single_field() {
-			echo '<input 
+        /**
+         * This will render a single Password field
+         *
+         * @since ReduxFramework 3.0.9
+         * @example
+         *        <code>
+         *        array(
+         *        'id'    => 'smtp_password',
+         *        'type'  => 'password',
+         *        'title' => 'SMTP Password'
+         *        )
+         *        </code>
+         */
+        private function render_single_field() {
+            echo '<input 
 					type="password" 
 					id="' . esc_attr( $this->field['id'] ) . '" 
 					name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" 
 					value="' . esc_attr( $this->value ) . '" 
 					class="' . esc_attr( $this->field['class'] ) . '" />';
-		}
-	}
+        }
+    }
 }
 
 class_alias( 'Redux_Password', 'ReduxFramework_Password' );

redux-core/inc/fields/button_set/class-redux-button-set.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 				}
 			}
 
-			$is_multi = isset( $this->field['multi'] ) && true === (bool) $this->field['multi'];
+			$is_multi = isset( $this->field['multi'] ) && true === ( bool ) $this->field['multi'];
 
 			$name = $this->field['name'] . $this->field['name_suffix'];
 
@@ -82,7 +82,7 @@ 
 						$this->value = array( $this->value );
 					}
 
-					if ( is_array( $this->value ) && in_array( (string) $k, $this->value, true ) ) {
+					if ( is_array( $this->value ) && in_array( ( string ) $k, $this->value, true ) ) {
 						$selected   = 'checked="checked"';
 						$post_value = $k;
 					}

Indentation +126 added lines, -126 removed lines

@@ -12,132 +12,132 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Button_Set', false ) ) {
 
-	/**
-	 * Main Redux_button_set class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Button_Set extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'options' => array(),
-				'multi'   => false,
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
-				if ( empty( $this->field['args'] ) ) {
-					$this->field['args'] = array();
-				}
-
-				$this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
-
-				if ( empty( $this->field['options'] ) ) {
-					return;
-				}
-			}
-
-			$is_multi = isset( $this->field['multi'] ) && true === (bool) $this->field['multi'];
-
-			$name = $this->field['name'] . $this->field['name_suffix'];
-
-			// multi => true renders the field multi-selectable (checkbox vs radio).
-			echo '<div class="buttonset ui-buttonset">';
-
-			if ( $is_multi ) {
-				$s = '';
-
-				if ( empty( $this->value ) ) {
-					$s = $name;
-				}
-
-				echo '<input type="hidden" data-name="' . esc_attr( $name ) . '" class="buttonset-empty" name="' . esc_attr( $s ) . '" value=""/>';
-
-				$name = $name . '[]';
-			}
-
-			foreach ( $this->field['options'] as $k => $v ) {
-				$selected = '';
-
-				if ( $is_multi ) {
-					$post_value = '';
-					$type       = 'checkbox';
-
-					if ( ! empty( $this->value ) && ! is_array( $this->value ) ) {
-						$this->value = array( $this->value );
-					}
-
-					if ( is_array( $this->value ) && in_array( (string) $k, $this->value, true ) ) {
-						$selected   = 'checked="checked"';
-						$post_value = $k;
-					}
-				} else {
-					$type = 'radio';
-
-					if ( is_scalar( $this->value ) ) {
-						$selected = checked( $this->value, $k, false );
-					}
-				}
-
-				$the_val     = $k;
-				$the_name    = $name;
-				$data_val    = '';
-				$multi_class = '';
-
-				if ( $is_multi ) {
-					$the_val     = '';
-					$the_name    = '';
-					$data_val    = ' data-val=' . $k;
-					$hidden_name = $name;
-					$multi_class = 'multi ';
-
-					if ( '' === $post_value ) {
-						$hidden_name = '';
-					}
-
-					echo '<input type="hidden" class="buttonset-check" id="' . esc_attr( $this->field['id'] ) . '-buttonset' . esc_attr( $k ) . '-hidden" name="' . esc_attr( $hidden_name ) . '" value="' . esc_attr( $post_value ) . '"/>';
-				}
-
-				echo '<input' . esc_attr( $data_val ) . ' data-id="' . esc_attr( $this->field['id'] ) . '" type="' . esc_attr( $type ) . '" id="' . esc_attr( $this->field['id'] ) . '-buttonset' . esc_attr( $k ) . '" name="' . esc_attr( $the_name ) . '" class="buttonset-item ' . esc_attr( $multi_class ) . esc_attr( $this->field['class'] ) . '" value="' . esc_attr( $the_val ) . '" ' . esc_html( $selected ) . '/>';
-				echo '<label for="' . esc_attr( $this->field['id'] ) . '-buttonset' . esc_attr( $k ) . '">' . esc_html( $v ) . '</label>';
-			}
-
-			echo '</div>';
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			wp_enqueue_script(
-				'redux-field-button-set',
-				Redux_Core::$url . 'inc/fields/button_set/redux-button-set' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'jquery-ui-core', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+    /**
+     * Main Redux_button_set class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Button_Set extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'options' => array(),
+                'multi'   => false,
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            if ( ! empty( $this->field['data'] ) && empty( $this->field['options'] ) ) {
+                if ( empty( $this->field['args'] ) ) {
+                    $this->field['args'] = array();
+                }
+
+                $this->field['options'] = $this->parent->wordpress_data->get( $this->field['data'], $this->field['args'], $this->parent->args['opt_name'], $this->value );
+
+                if ( empty( $this->field['options'] ) ) {
+                    return;
+                }
+            }
+
+            $is_multi = isset( $this->field['multi'] ) && true === (bool) $this->field['multi'];
+
+            $name = $this->field['name'] . $this->field['name_suffix'];
+
+            // multi => true renders the field multi-selectable (checkbox vs radio).
+            echo '<div class="buttonset ui-buttonset">';
+
+            if ( $is_multi ) {
+                $s = '';
+
+                if ( empty( $this->value ) ) {
+                    $s = $name;
+                }
+
+                echo '<input type="hidden" data-name="' . esc_attr( $name ) . '" class="buttonset-empty" name="' . esc_attr( $s ) . '" value=""/>';
+
+                $name = $name . '[]';
+            }
+
+            foreach ( $this->field['options'] as $k => $v ) {
+                $selected = '';
+
+                if ( $is_multi ) {
+                    $post_value = '';
+                    $type       = 'checkbox';
+
+                    if ( ! empty( $this->value ) && ! is_array( $this->value ) ) {
+                        $this->value = array( $this->value );
+                    }
+
+                    if ( is_array( $this->value ) && in_array( (string) $k, $this->value, true ) ) {
+                        $selected   = 'checked="checked"';
+                        $post_value = $k;
+                    }
+                } else {
+                    $type = 'radio';
+
+                    if ( is_scalar( $this->value ) ) {
+                        $selected = checked( $this->value, $k, false );
+                    }
+                }
+
+                $the_val     = $k;
+                $the_name    = $name;
+                $data_val    = '';
+                $multi_class = '';
+
+                if ( $is_multi ) {
+                    $the_val     = '';
+                    $the_name    = '';
+                    $data_val    = ' data-val=' . $k;
+                    $hidden_name = $name;
+                    $multi_class = 'multi ';
+
+                    if ( '' === $post_value ) {
+                        $hidden_name = '';
+                    }
+
+                    echo '<input type="hidden" class="buttonset-check" id="' . esc_attr( $this->field['id'] ) . '-buttonset' . esc_attr( $k ) . '-hidden" name="' . esc_attr( $hidden_name ) . '" value="' . esc_attr( $post_value ) . '"/>';
+                }
+
+                echo '<input' . esc_attr( $data_val ) . ' data-id="' . esc_attr( $this->field['id'] ) . '" type="' . esc_attr( $type ) . '" id="' . esc_attr( $this->field['id'] ) . '-buttonset' . esc_attr( $k ) . '" name="' . esc_attr( $the_name ) . '" class="buttonset-item ' . esc_attr( $multi_class ) . esc_attr( $this->field['class'] ) . '" value="' . esc_attr( $the_val ) . '" ' . esc_html( $selected ) . '/>';
+                echo '<label for="' . esc_attr( $this->field['id'] ) . '-buttonset' . esc_attr( $k ) . '">' . esc_html( $v ) . '</label>';
+            }
+
+            echo '</div>';
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            wp_enqueue_script(
+                'redux-field-button-set',
+                Redux_Core::$url . 'inc/fields/button_set/redux-button-set' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'jquery-ui-core', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Button_Set', 'ReduxFramework_Button_Set' );

redux-core/inc/validation/preg_replace/class-redux-validation-preg-replace.php

Indentation +17 added lines, -17 removed lines

@@ -12,23 +12,23 @@
 
 if ( ! class_exists( 'Redux_Validation_Preg_Replace', false ) ) {
 
-	/**
-	 * Class Redux_Validation_Preg_Replace
-	 */
-	class Redux_Validation_Preg_Replace extends Redux_Validate {
+    /**
+     * Class Redux_Validation_Preg_Replace
+     */
+    class Redux_Validation_Preg_Replace extends Redux_Validate {
 
-		/**
-		 * Field Validate Function.
-		 * Takes the vars and validates them
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function validate() {
-			$that                   = $this;
-			$this->value            = preg_replace( $this->field['preg']['pattern'], $that->field['preg']['replacement'], $this->value );
-			$this->field['current'] = $this->value;
+        /**
+         * Field Validate Function.
+         * Takes the vars and validates them
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function validate() {
+            $that                   = $this;
+            $this->value            = preg_replace( $this->field['preg']['pattern'], $that->field['preg']['replacement'], $this->value );
+            $this->field['current'] = $this->value;
 
-			$this->sanitize = $this->field;
-		}
-	}
+            $this->sanitize = $this->field;
+        }
+    }
 }

redux-core/inc/validation/str_replace/class-redux-validation-str-replace.php

Indentation +16 added lines, -16 removed lines

@@ -12,22 +12,22 @@
 
 if ( ! class_exists( 'Redux_Validation_Str_Replace', false ) ) {
 
-	/**
-	 * Class Redux_Validation_Str_Replace
-	 */
-	class Redux_Validation_Str_Replace extends Redux_Validate {
+    /**
+     * Class Redux_Validation_Str_Replace
+     */
+    class Redux_Validation_Str_Replace extends Redux_Validate {
 
-		/**
-		 * Field Validate Function.
-		 * Takes the vars and validates them
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function validate() {
-			$this->value = str_replace( $this->field['str']['search'], $this->field['str']['replacement'], $this->value );
+        /**
+         * Field Validate Function.
+         * Takes the vars and validates them
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function validate() {
+            $this->value = str_replace( $this->field['str']['search'], $this->field['str']['replacement'], $this->value );
 
-			$this->field['current'] = $this->value;
-			$this->sanitize         = $this->field;
-		}
-	}
+            $this->field['current'] = $this->value;
+            $this->sanitize         = $this->field;
+        }
+    }
 }

redux-core/inc/classes/class-redux-ajax-save.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 
 					// New method to avoid input_var nonsense.  Thanks, @harunbasic.
 					$values = Redux_Functions_Ex::parse_str( $post_data );
-					$values = $values[ $redux->args['opt_name'] ];
+					$values = $values[$redux->args['opt_name']];
 
 					if ( ! empty( $values ) ) {
 						try {
@@ -132,7 +132,7 @@ 
 				try {
 
 					// phpcs:ignore WordPress.NamingConventions.ValidVariableName
-					$compiler_css = $core->compilerCSS;  // Backward compatibility variable.
+					$compiler_css = $core->compilerCSS; // Backward compatibility variable.
 
 					/**
 					 * Action 'redux/options/{opt_name}/compiler'

Indentation +172 added lines, -172 removed lines

@@ -12,176 +12,176 @@
 
 if ( ! class_exists( 'Redux_AJAX_Save', false ) ) {
 
-	/**
-	 * Class Redux_AJAX_Save
-	 */
-	class Redux_AJAX_Save extends Redux_Class {
-
-		/**
-		 * Redux_AJAX_Save constructor.
-		 * array_merge_recursive_distinct
-		 *
-		 * @param object $redux ReduxFramework object.
-		 */
-		public function __construct( $redux ) {
-			parent::__construct( $redux );
-
-			add_action( 'wp_ajax_' . $this->args['opt_name'] . '_ajax_save', array( $this, 'save' ) );
-		}
-
-		/**
-		 * AJAX callback to save the option panel values.
-		 *
-		 * @throws ReflectionException Exception.
-		 */
-		public function save() {
-			$redux = null;
-
-			$core = $this->core();
-
-			if ( ! isset( $_REQUEST['nonce'] ) || ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['nonce'] ) ), 'redux_ajax_nonce' . $this->args['opt_name'] ) ) ) {
-				echo wp_json_encode(
-					array(
-						'status' => esc_html__( 'Invalid security credential.  Please reload the page and try again.', 'redux-framework' ),
-						'action' => '',
-					)
-				);
-				die();
-			}
-
-			if ( ! Redux_Helpers::current_user_can( $core->args['page_permissions'] ) ) {
-				echo wp_json_encode(
-					array(
-						'status' => esc_html__( 'Invalid user capability.  Please reload the page and try again.', 'redux-framework' ),
-						'action' => '',
-					)
-				);
-				die();
-			}
-
-			if ( isset( $_POST['opt_name'] ) && ! empty( $_POST['opt_name'] ) && isset( $_POST['data'] ) && ! empty( $_POST['data'] ) ) {
-				$redux = Redux::instance( sanitize_text_field( wp_unslash( $_POST['opt_name'] ) ) );
-
-				if ( ! empty( $redux->args['opt_name'] ) ) {
-
-					$post_data = wp_unslash( $_POST['data'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
-
-					// New method to avoid input_var nonsense.  Thanks, @harunbasic.
-					$values = Redux_Functions_Ex::parse_str( $post_data );
-					$values = $values[ $redux->args['opt_name'] ];
-
-					if ( ! empty( $values ) ) {
-						try {
-							if ( true === Redux_Core::$validation_ran ) {
-								Redux_Core::$validation_ran = false;
-							}
-
-							$redux->options_class->set( $redux->options_class->validate_options( $values ) );
-
-							$do_reload = false;
-							if ( isset( $core->required_class->reload_fields ) && ! empty( $core->required_class->reload_fields ) ) {
-								if ( ! empty( $core->transients['changed_values'] ) ) {
-									foreach ( $core->required_class->reload_fields as $val ) {
-										if ( array_key_exists( $val, $core->transients['changed_values'] ) ) {
-											$do_reload = true;
-										}
-									}
-								}
-							}
-
-							if ( $do_reload || ( isset( $values['defaults'] ) && ! empty( $values['defaults'] ) ) || ( isset( $values['defaults-section'] ) && ! empty( $values['defaults-section'] ) ) || ( isset( $values['import_code'] ) && ! empty( $values['import_code'] ) ) || ( isset( $values['import_link'] ) && ! empty( $values['import_link'] ) ) ) {
-								echo wp_json_encode(
-									array(
-										'status' => 'success',
-										'action' => 'reload',
-									)
-								);
-								die();
-							}
-
-							$redux->enqueue_class->get_warnings_and_errors_array();
-
-							$return_array = array(
-								'status'   => 'success',
-								'options'  => $redux->options,
-								'errors'   => $redux->enqueue_class->localize_data['errors'] ?? null,
-								'warnings' => $redux->enqueue_class->localize_data['warnings'] ?? null,
-								'sanitize' => $redux->enqueue_class->localize_data['sanitize'] ?? null,
-							);
-						} catch ( Exception $e ) {
-							$return_array = array( 'status' => $e->getMessage() );
-						}
-					} else {
-						echo wp_json_encode(
-							array(
-								'status' => esc_html__( 'Your panel has no fields. Nothing to save.', 'redux-framework' ),
-							)
-						);
-						die();
-					}
-				}
-			}
-
-			if ( isset( $core->transients['run_compiler'] ) && $core->transients['run_compiler'] ) {
-				Redux_Core::$no_output = true;
-				$temp                  = $core->args['output_variables_prefix'];
-
-				// Allow the override of variable's prefix for use by SCSS or LESS.
-				if ( isset( $core->args['compiler_output_variables_prefix'] ) ) {
-					$core->args['output_variables_prefix'] = $core->args['compiler_output_variables_prefix'];
-				}
-
-				$core->output_class->enqueue();
-				$core->args['output_variables_prefix'] = $temp;
-
-				try {
-
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName
-					$compiler_css = $core->compilerCSS;  // Backward compatibility variable.
-
-					/**
-					 * Action 'redux/options/{opt_name}/compiler'
-					 *
-					 * @param array  $options Global options.
-					 * @param string $css CSS that get sent to the compiler hook.
-					 * @param array  $changed_values Changed option values.
-					 * @param array  $output_variables Output variables.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( 'redux/options/' . $core->args['opt_name'] . '/compiler', $core->options, $compiler_css, $core->transients['changed_values'], $core->output_variables );
-
-					/**
-					 * Action 'redux/options/{opt_name}/compiler/advanced'
-					 *
-					 * @param object $redux ReduxFramework object.
-					 */
-
-					// phpcs:ignore WordPress.NamingConventions.ValidHookName
-					do_action( 'redux/options/' . $core->args['opt_name'] . '/compiler/advanced', $core );
-				} catch ( Exception $e ) {
-					$return_array = array( 'status' => $e->getMessage() );
-				}
-
-				unset( $core->transients['run_compiler'] );
-				$core->transient_class->set();
-			}
-
-			if ( isset( $return_array ) ) {
-				if ( 'success' === $return_array['status'] ) {
-					$panel = new Redux_Panel( $redux );
-					ob_start();
-					$panel->notification_bar();
-					$notification_bar = ob_get_contents();
-					ob_end_clean();
-					$return_array['notification_bar'] = $notification_bar;
-				}
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				echo wp_json_encode( apply_filters( 'redux/options/' . $core->args['opt_name'] . '/ajax_save/response', $return_array ) );
-			}
-
-			die();
-		}
-	}
+    /**
+     * Class Redux_AJAX_Save
+     */
+    class Redux_AJAX_Save extends Redux_Class {
+
+        /**
+         * Redux_AJAX_Save constructor.
+         * array_merge_recursive_distinct
+         *
+         * @param object $redux ReduxFramework object.
+         */
+        public function __construct( $redux ) {
+            parent::__construct( $redux );
+
+            add_action( 'wp_ajax_' . $this->args['opt_name'] . '_ajax_save', array( $this, 'save' ) );
+        }
+
+        /**
+         * AJAX callback to save the option panel values.
+         *
+         * @throws ReflectionException Exception.
+         */
+        public function save() {
+            $redux = null;
+
+            $core = $this->core();
+
+            if ( ! isset( $_REQUEST['nonce'] ) || ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['nonce'] ) ), 'redux_ajax_nonce' . $this->args['opt_name'] ) ) ) {
+                echo wp_json_encode(
+                    array(
+                        'status' => esc_html__( 'Invalid security credential.  Please reload the page and try again.', 'redux-framework' ),
+                        'action' => '',
+                    )
+                );
+                die();
+            }
+
+            if ( ! Redux_Helpers::current_user_can( $core->args['page_permissions'] ) ) {
+                echo wp_json_encode(
+                    array(
+                        'status' => esc_html__( 'Invalid user capability.  Please reload the page and try again.', 'redux-framework' ),
+                        'action' => '',
+                    )
+                );
+                die();
+            }
+
+            if ( isset( $_POST['opt_name'] ) && ! empty( $_POST['opt_name'] ) && isset( $_POST['data'] ) && ! empty( $_POST['data'] ) ) {
+                $redux = Redux::instance( sanitize_text_field( wp_unslash( $_POST['opt_name'] ) ) );
+
+                if ( ! empty( $redux->args['opt_name'] ) ) {
+
+                    $post_data = wp_unslash( $_POST['data'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+
+                    // New method to avoid input_var nonsense.  Thanks, @harunbasic.
+                    $values = Redux_Functions_Ex::parse_str( $post_data );
+                    $values = $values[ $redux->args['opt_name'] ];
+
+                    if ( ! empty( $values ) ) {
+                        try {
+                            if ( true === Redux_Core::$validation_ran ) {
+                                Redux_Core::$validation_ran = false;
+                            }
+
+                            $redux->options_class->set( $redux->options_class->validate_options( $values ) );
+
+                            $do_reload = false;
+                            if ( isset( $core->required_class->reload_fields ) && ! empty( $core->required_class->reload_fields ) ) {
+                                if ( ! empty( $core->transients['changed_values'] ) ) {
+                                    foreach ( $core->required_class->reload_fields as $val ) {
+                                        if ( array_key_exists( $val, $core->transients['changed_values'] ) ) {
+                                            $do_reload = true;
+                                        }
+                                    }
+                                }
+                            }
+
+                            if ( $do_reload || ( isset( $values['defaults'] ) && ! empty( $values['defaults'] ) ) || ( isset( $values['defaults-section'] ) && ! empty( $values['defaults-section'] ) ) || ( isset( $values['import_code'] ) && ! empty( $values['import_code'] ) ) || ( isset( $values['import_link'] ) && ! empty( $values['import_link'] ) ) ) {
+                                echo wp_json_encode(
+                                    array(
+                                        'status' => 'success',
+                                        'action' => 'reload',
+                                    )
+                                );
+                                die();
+                            }
+
+                            $redux->enqueue_class->get_warnings_and_errors_array();
+
+                            $return_array = array(
+                                'status'   => 'success',
+                                'options'  => $redux->options,
+                                'errors'   => $redux->enqueue_class->localize_data['errors'] ?? null,
+                                'warnings' => $redux->enqueue_class->localize_data['warnings'] ?? null,
+                                'sanitize' => $redux->enqueue_class->localize_data['sanitize'] ?? null,
+                            );
+                        } catch ( Exception $e ) {
+                            $return_array = array( 'status' => $e->getMessage() );
+                        }
+                    } else {
+                        echo wp_json_encode(
+                            array(
+                                'status' => esc_html__( 'Your panel has no fields. Nothing to save.', 'redux-framework' ),
+                            )
+                        );
+                        die();
+                    }
+                }
+            }
+
+            if ( isset( $core->transients['run_compiler'] ) && $core->transients['run_compiler'] ) {
+                Redux_Core::$no_output = true;
+                $temp                  = $core->args['output_variables_prefix'];
+
+                // Allow the override of variable's prefix for use by SCSS or LESS.
+                if ( isset( $core->args['compiler_output_variables_prefix'] ) ) {
+                    $core->args['output_variables_prefix'] = $core->args['compiler_output_variables_prefix'];
+                }
+
+                $core->output_class->enqueue();
+                $core->args['output_variables_prefix'] = $temp;
+
+                try {
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+                    $compiler_css = $core->compilerCSS;  // Backward compatibility variable.
+
+                    /**
+                     * Action 'redux/options/{opt_name}/compiler'
+                     *
+                     * @param array  $options Global options.
+                     * @param string $css CSS that get sent to the compiler hook.
+                     * @param array  $changed_values Changed option values.
+                     * @param array  $output_variables Output variables.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( 'redux/options/' . $core->args['opt_name'] . '/compiler', $core->options, $compiler_css, $core->transients['changed_values'], $core->output_variables );
+
+                    /**
+                     * Action 'redux/options/{opt_name}/compiler/advanced'
+                     *
+                     * @param object $redux ReduxFramework object.
+                     */
+
+                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                    do_action( 'redux/options/' . $core->args['opt_name'] . '/compiler/advanced', $core );
+                } catch ( Exception $e ) {
+                    $return_array = array( 'status' => $e->getMessage() );
+                }
+
+                unset( $core->transients['run_compiler'] );
+                $core->transient_class->set();
+            }
+
+            if ( isset( $return_array ) ) {
+                if ( 'success' === $return_array['status'] ) {
+                    $panel = new Redux_Panel( $redux );
+                    ob_start();
+                    $panel->notification_bar();
+                    $notification_bar = ob_get_contents();
+                    ob_end_clean();
+                    $return_array['notification_bar'] = $notification_bar;
+                }
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                echo wp_json_encode( apply_filters( 'redux/options/' . $core->args['opt_name'] . '/ajax_save/response', $return_array ) );
+            }
+
+            die();
+        }
+    }
 }

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

Indentation +115 added lines, -115 removed lines

@@ -11,119 +11,119 @@
 
 if ( ! class_exists( 'Redux_Sanitize', false ) ) {
 
-	/**
-	 * Class Redux_Sanitize
-	 */
-	class Redux_Sanitize extends Redux_Class {
-
-		/**
-		 * Sanitize values from options form (used in settings api validate function)
-		 *
-		 * @since       4.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 sanitize( array $plugin_options, array $options, array $sections ): array {
-			$core = $this->core();
-
-			foreach ( $sections as $k => $section ) {
-				if ( isset( $section['fields'] ) ) {
-					foreach ( $section['fields'] as $field ) {
-
-						if ( is_array( $field ) ) {
-							$field['section_id'] = $k;
-						}
-
-						if ( isset( $field['type'] ) && ( 'text' === $field['type'] || 'textarea' === $field['type'] || 'multi_text' === $field['type'] ) ) {
-
-							// Make sure 'sanitize' field is set.
-							if ( isset( $field['sanitize'] ) ) {
-
-								// Can we make this an array of validations?
-								$val_arr = array();
-
-								if ( is_array( $field['sanitize'] ) ) {
-									$val_arr = $field['sanitize'];
-								} else {
-									$val_arr[] = $field['sanitize'];
-								}
-
-								foreach ( $val_arr as $function ) {
-
-									// Check for empty id value.
-									if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
-										continue;
-									}
-
-									if ( function_exists( $function ) ) {
-										if ( empty( $options[ $field['id'] ] ) ) {
-											$options[ $field['id'] ] = '';
-										}
-
-										if ( 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 ];
-												}
-
-												$value = call_user_func( $function, $before );
-
-												if ( false !== $value ) {
-													$plugin_options[ $field['id'] ][ $key ] = $value;
-												} else {
-													unset( $plugin_options[ $field['id'] ][ $key ] );
-												}
-
-												$field['current'] = $value;
-
-												$core->sanitize[] = $field;
-											}
-										} 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;
-											}
-
-											$value = call_user_func( $function, $pofi );
-
-											$plugin_options[ $field['id'] ] = $value;
-
-											$field['current'] = $value;
-
-											$core->sanitize[] = $field;
-										}
-
-										break;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			return $plugin_options;
-		}
-	}
+    /**
+     * Class Redux_Sanitize
+     */
+    class Redux_Sanitize extends Redux_Class {
+
+        /**
+         * Sanitize values from options form (used in settings api validate function)
+         *
+         * @since       4.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 sanitize( array $plugin_options, array $options, array $sections ): array {
+            $core = $this->core();
+
+            foreach ( $sections as $k => $section ) {
+                if ( isset( $section['fields'] ) ) {
+                    foreach ( $section['fields'] as $field ) {
+
+                        if ( is_array( $field ) ) {
+                            $field['section_id'] = $k;
+                        }
+
+                        if ( isset( $field['type'] ) && ( 'text' === $field['type'] || 'textarea' === $field['type'] || 'multi_text' === $field['type'] ) ) {
+
+                            // Make sure 'sanitize' field is set.
+                            if ( isset( $field['sanitize'] ) ) {
+
+                                // Can we make this an array of validations?
+                                $val_arr = array();
+
+                                if ( is_array( $field['sanitize'] ) ) {
+                                    $val_arr = $field['sanitize'];
+                                } else {
+                                    $val_arr[] = $field['sanitize'];
+                                }
+
+                                foreach ( $val_arr as $function ) {
+
+                                    // Check for empty id value.
+                                    if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+                                        continue;
+                                    }
+
+                                    if ( function_exists( $function ) ) {
+                                        if ( empty( $options[ $field['id'] ] ) ) {
+                                            $options[ $field['id'] ] = '';
+                                        }
+
+                                        if ( 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 ];
+                                                }
+
+                                                $value = call_user_func( $function, $before );
+
+                                                if ( false !== $value ) {
+                                                    $plugin_options[ $field['id'] ][ $key ] = $value;
+                                                } else {
+                                                    unset( $plugin_options[ $field['id'] ][ $key ] );
+                                                }
+
+                                                $field['current'] = $value;
+
+                                                $core->sanitize[] = $field;
+                                            }
+                                        } 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;
+                                            }
+
+                                            $value = call_user_func( $function, $pofi );
+
+                                            $plugin_options[ $field['id'] ] = $value;
+
+                                            $field['current'] = $value;
+
+                                            $core->sanitize[] = $field;
+                                        }
+
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return $plugin_options;
+        }
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -56,38 +56,38 @@ 
 								foreach ( $val_arr as $function ) {
 
 									// 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']] ) ) {
 										continue;
 									}
 
 									if ( function_exists( $function ) ) {
-										if ( empty( $options[ $field['id'] ] ) ) {
-											$options[ $field['id'] ] = '';
+										if ( empty( $options[$field['id']] ) ) {
+											$options[$field['id']] = '';
 										}
 
-										if ( is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-											foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+										if ( 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];
 												}
 
 												$value = call_user_func( $function, $before );
 
 												if ( false !== $value ) {
-													$plugin_options[ $field['id'] ][ $key ] = $value;
+													$plugin_options[$field['id']][$key] = $value;
 												} else {
-													unset( $plugin_options[ $field['id'] ][ $key ] );
+													unset( $plugin_options[$field['id']][$key] );
 												}
 
 												$field['current'] = $value;
@@ -95,11 +95,11 @@ 
 												$core->sanitize[] = $field;
 											}
 										} 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;
@@ -107,7 +107,7 @@ 
 
 											$value = call_user_func( $function, $pofi );
 
-											$plugin_options[ $field['id'] ] = $value;
+											$plugin_options[$field['id']] = $value;
 
 											$field['current'] = $value;
 

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

Spacing +4 added lines, -4 removed lines

@@ -136,10 +136,10 @@ 
 			$result = $defaults;
 
 			foreach ( $arr as $k => $v ) {
-				if ( is_array( $v ) && isset( $result[ $k ] ) ) {
-					$result[ $k ] = self::parse_args( $v, $result[ $k ] );
+				if ( is_array( $v ) && isset( $result[$k] ) ) {
+					$result[$k] = self::parse_args( $v, $result[$k] );
 				} else {
-					$result[ $k ] = $v;
+					$result[$k] = $v;
 				}
 			}
 
@@ -534,7 +534,7 @@ 
 
 			$result = preg_replace_callback(
 				'/[A-Z]/',
-				function ( $matches ) {
+				function( $matches ) {
 					return '-' . Redux_Core::strtolower( $matches[0] );
 				},
 				$keys

Indentation +356 added lines, -356 removed lines

@@ -13,360 +13,360 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Functions', false ) ) {
 
-	/**
-	 * Redux Functions Class
-	 * A Class of useful functions that can/should be shared among all Redux files.
-	 *
-	 * @since       3.0.0
-	 */
-	class Redux_Functions {
-
-		/**
-		 * ReduxFramework object pointer.
-		 *
-		 * @var object
-		 */
-		public static $parent;
-
-		/**
-		 * ReduxFramework shim object pointer.
-		 *
-		 * @var object
-		 */
-		public static $_parent; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
-
-		/**
-		 * Check for the existence of class name via an array of class names.
-		 *
-		 * @param array $class_names Array of class names.
-		 *
-		 * @return string|bool
-		 */
-		public static function class_exists_ex( array $class_names = array() ) {
-			foreach ( $class_names as $class_name ) {
-				if ( class_exists( $class_name ) ) {
-					return $class_name;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Check for the existence of file name via an array of file names.
-		 *
-		 * @param array $file_names Array of file names.
-		 *
-		 * @return string|bool
-		 */
-		public static function file_exists_ex( array $file_names = array() ) {
-			foreach ( $file_names as $file_name ) {
-				if ( file_exists( $file_name ) ) {
-					return $file_name;
-				}
-			}
-
-			return false;
-		}
-
-		/** Extract data:
-		 * $field = field_array
-		 * $value = field values
-		 * $core = Redux instance */
-
-		/**
-		 * Parse args to handle deep arrays.  The WP one does not.
-		 *
-		 * @param array|string $args     Array of args.
-		 * @param array        $defaults Defaults array.
-		 *
-		 * @return array
-		 */
-		public static function parse_args( $args, array $defaults ): array {
-			$arr = array();
-
-			if ( ! is_array( $args ) ) {
-				$arr[] = $args;
-			} else {
-				$arr = $args;
-			}
-
-			$result = $defaults;
-
-			foreach ( $arr as $k => $v ) {
-				if ( is_array( $v ) && isset( $result[ $k ] ) ) {
-					$result[ $k ] = self::parse_args( $v, $result[ $k ] );
-				} else {
-					$result[ $k ] = $v;
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Deprecated: Return min tag for JS and CSS files in dev_mode.
-		 *
-		 * @deprecated No longer using camelCase naming conventions.
-		 *
-		 * @return string
-		 */
-		public static function isMin(): string { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
-			return self::is_min();
-		}
-
-		/**
-		 * Return min tag for JS and CSS files in dev_mode.
-		 *
-		 * @return string
-		 */
-		public static function is_min(): string {
-			$min      = '.min';
-			$dev_mode = false;
-
-			$instances = Redux::all_instances();
-
-			if ( ! empty( $instances ) ) {
-				foreach ( $instances as $instance ) {
-
-					if ( empty( self::$parent ) ) {
-						self::$parent  = $instance;
-						self::$_parent = self::$parent;
-					}
-					if ( ! empty( $instance->args['dev_mode'] ) ) {
-						$dev_mode      = true;
-						self::$parent  = $instance;
-						self::$_parent = self::$parent;
-					}
-				}
-				if ( $dev_mode ) {
-					$min = '';
-				}
-			}
-
-			return $min;
-		}
-
-		/**
-		 * Parse CSS from an output/compiler array
-		 *
-		 * @param array  $css_array CSS data.
-		 * @param string $style     CSS style.
-		 * @param string $value     CSS values.
-		 *
-		 * @return string CSS string
-		 * @since       3.2.8
-		 * @access      private
-		 */
-		public static function parse_css( array $css_array = array(), string $style = '', string $value = '' ): string {
-
-			// Something wrong happened.
-			if ( 0 === count( $css_array ) ) {
-				return '';
-			} else {
-				$css       = '';
-				$important = false;
-
-				if ( isset( $css_array['important'] ) && true === $css_array['important'] ) {
-					$important = '!important';
-
-					unset( $css_array['important'] );
-				}
-
-				foreach ( $css_array as $element => $selector ) {
-
-					// The old way.
-					if ( 0 === $element ) {
-						return self::the_old_way( $css_array, $style );
-					}
-
-					// New way continued.
-					$css_style = $element . ':' . $value . $important . ';';
-
-					$css .= $selector . '{' . $css_style . '}';
-				}
-			}
-
-			return $css;
-		}
-
-		/**
-		 * Parse CSS shim.
-		 *
-		 * @param array  $css_array CSS data.
-		 * @param string $style     CSS style.
-		 * @param string $value     CSS values.
-		 *
-		 * @deprecated 4.0
-		 *
-		 * @return string CSS string
-		 * @since       4.0.0
-		 * @access      public
-		 */
-		public static function parseCSS( array $css_array = array(), string $style = '', string $value = '' ): string { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
-			_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', __CLASS__ . '::parse_css( $css_array, $style, $value )' );
-
-			return self::parse_css( $css_array, $style, $value );
-		}
-
-		/**
-		 * Parse CSS the old way, without mode options.
-		 *
-		 * @param array  $css_array CSS data.
-		 * @param string $style     CSS style.
-		 *
-		 * @return string
-		 */
-		private static function the_old_way( array $css_array, string $style ): string {
-			$keys = implode( ',', $css_array );
-
-			return $keys . '{' . $style . '}';
-		}
-
-		/**
-		 * Return s.
-		 *
-		 * @access public
-		 * @since 4.0.0
-		 * @return string
-		 */
-		public static function gs(): string {
-			return get_option( 're' . 'dux_p' . 'ro_lic' . 'ense_key', '' ); // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
-		}
-
-		/**
-		 * Deprecated Initialized the WordPress filesystem, if it already isn't.
-		 *
-		 * @since       3.2.3
-		 * @access      public
-		 * @deprecated NO longer using camelCase naming conventions.
-		 *
-		 * @return      void
-		 */
-		public static function initWpFilesystem() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
-			// phpcs:ignore Squiz.Commenting.InlineComment.InvalidEndChar
-			_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', __CLASS__ . '::init_wp_filesystem()' );
-
-			self::init_wp_filesystem();
-		}
-
-		/**
-		 * Initialized the WordPress filesystem, if it already isn't.
-		 *
-		 * @since       3.2.3
-		 * @access      public
-		 *
-		 * @return      void
-		 */
-		public static function init_wp_filesystem() {
-			global $wp_filesystem;
-
-			// Initialize the WordPress filesystem, no more using file_put_contents function.
-			if ( empty( $wp_filesystem ) ) {
-				require_once ABSPATH . '/wp-includes/pluggable.php';
-				require_once ABSPATH . '/wp-admin/includes/file.php';
-
-				WP_Filesystem();
-			}
-		}
-
-		/**
-		 * TRU.
-		 *
-		 * @param string $string .
-		 * @param string $opt_name .
-		 *
-		 * @deprecated Ad Remover extension no longer necessary.
-		 *
-		 * @return void
-		 */
-		public static function tru( string $string, string $opt_name ) {
-			_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
-		}
-
-		/**
-		 * DAT.
-		 *
-		 * @param string $fname .
-		 * @param string $opt_name .
-		 *
-		 * @deprecated Ad Remover extension no longer necessary.
-		 *
-		 * @return void
-		 */
-		public static function dat( string $fname, string $opt_name ) {
-			_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
-		}
-
-		/**
-		 * BUB.
-		 *
-		 * @param string $fname    .
-		 * @param string $opt_name .
-		 *
-		 * @deprecated Ad Remover extension no longer necessary.
-		 *
-		 * @return void
-		 */
-		public static function bub( string $fname, string $opt_name ) {
-			_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
-		}
-
-		/**
-		 * YO.
-		 *
-		 * @param string $fname    .
-		 * @param string $opt_name .
-		 *
-		 * @deprecated Ad Remover extension no longer necessary.
-		 *
-		 * @return void
-		 */
-		public static function yo( string $fname, string $opt_name ) {
-			_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
-		}
-
-		/**
-		 * Sanitize camelCase keys in an array, makes then snake_case.
-		 *
-		 * @param array $arr Array of keys.
-		 *
-		 * @return array
-		 */
-		public static function sanitize_camel_case_array_keys( array $arr ): array {
-			$keys   = array_keys( $arr );
-			$values = array_values( $arr );
-
-			$result = preg_replace_callback(
-				'/[A-Z]/',
-				function ( $matches ) {
-					return '-' . Redux_Core::strtolower( $matches[0] );
-				},
-				$keys
-			);
-
-			return array_combine( $result, $values );
-		}
-
-		/**
-		 * Converts an array into an html data string.
-		 *
-		 * @param array $data example input: array('id'=>'true').
-		 *
-		 * @return string $data_string example output: data-id='true'
-		 */
-		public static function create_data_string( array $data = array() ): string {
-			$data_string = '';
-
-			foreach ( $data as $key => $value ) {
-				if ( is_array( $value ) ) {
-					$value = implode( '|', $value );
-				}
-
-				$data_string .= ' data-' . $key . '=' . Redux_Helpers::make_bool_str( $value ) . ' ';
-			}
-
-			return $data_string;
-		}
-	}
+    /**
+     * Redux Functions Class
+     * A Class of useful functions that can/should be shared among all Redux files.
+     *
+     * @since       3.0.0
+     */
+    class Redux_Functions {
+
+        /**
+         * ReduxFramework object pointer.
+         *
+         * @var object
+         */
+        public static $parent;
+
+        /**
+         * ReduxFramework shim object pointer.
+         *
+         * @var object
+         */
+        public static $_parent; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
+
+        /**
+         * Check for the existence of class name via an array of class names.
+         *
+         * @param array $class_names Array of class names.
+         *
+         * @return string|bool
+         */
+        public static function class_exists_ex( array $class_names = array() ) {
+            foreach ( $class_names as $class_name ) {
+                if ( class_exists( $class_name ) ) {
+                    return $class_name;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Check for the existence of file name via an array of file names.
+         *
+         * @param array $file_names Array of file names.
+         *
+         * @return string|bool
+         */
+        public static function file_exists_ex( array $file_names = array() ) {
+            foreach ( $file_names as $file_name ) {
+                if ( file_exists( $file_name ) ) {
+                    return $file_name;
+                }
+            }
+
+            return false;
+        }
+
+        /** Extract data:
+         * $field = field_array
+         * $value = field values
+         * $core = Redux instance */
+
+        /**
+         * Parse args to handle deep arrays.  The WP one does not.
+         *
+         * @param array|string $args     Array of args.
+         * @param array        $defaults Defaults array.
+         *
+         * @return array
+         */
+        public static function parse_args( $args, array $defaults ): array {
+            $arr = array();
+
+            if ( ! is_array( $args ) ) {
+                $arr[] = $args;
+            } else {
+                $arr = $args;
+            }
+
+            $result = $defaults;
+
+            foreach ( $arr as $k => $v ) {
+                if ( is_array( $v ) && isset( $result[ $k ] ) ) {
+                    $result[ $k ] = self::parse_args( $v, $result[ $k ] );
+                } else {
+                    $result[ $k ] = $v;
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Deprecated: Return min tag for JS and CSS files in dev_mode.
+         *
+         * @deprecated No longer using camelCase naming conventions.
+         *
+         * @return string
+         */
+        public static function isMin(): string { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
+            return self::is_min();
+        }
+
+        /**
+         * Return min tag for JS and CSS files in dev_mode.
+         *
+         * @return string
+         */
+        public static function is_min(): string {
+            $min      = '.min';
+            $dev_mode = false;
+
+            $instances = Redux::all_instances();
+
+            if ( ! empty( $instances ) ) {
+                foreach ( $instances as $instance ) {
+
+                    if ( empty( self::$parent ) ) {
+                        self::$parent  = $instance;
+                        self::$_parent = self::$parent;
+                    }
+                    if ( ! empty( $instance->args['dev_mode'] ) ) {
+                        $dev_mode      = true;
+                        self::$parent  = $instance;
+                        self::$_parent = self::$parent;
+                    }
+                }
+                if ( $dev_mode ) {
+                    $min = '';
+                }
+            }
+
+            return $min;
+        }
+
+        /**
+         * Parse CSS from an output/compiler array
+         *
+         * @param array  $css_array CSS data.
+         * @param string $style     CSS style.
+         * @param string $value     CSS values.
+         *
+         * @return string CSS string
+         * @since       3.2.8
+         * @access      private
+         */
+        public static function parse_css( array $css_array = array(), string $style = '', string $value = '' ): string {
+
+            // Something wrong happened.
+            if ( 0 === count( $css_array ) ) {
+                return '';
+            } else {
+                $css       = '';
+                $important = false;
+
+                if ( isset( $css_array['important'] ) && true === $css_array['important'] ) {
+                    $important = '!important';
+
+                    unset( $css_array['important'] );
+                }
+
+                foreach ( $css_array as $element => $selector ) {
+
+                    // The old way.
+                    if ( 0 === $element ) {
+                        return self::the_old_way( $css_array, $style );
+                    }
+
+                    // New way continued.
+                    $css_style = $element . ':' . $value . $important . ';';
+
+                    $css .= $selector . '{' . $css_style . '}';
+                }
+            }
+
+            return $css;
+        }
+
+        /**
+         * Parse CSS shim.
+         *
+         * @param array  $css_array CSS data.
+         * @param string $style     CSS style.
+         * @param string $value     CSS values.
+         *
+         * @deprecated 4.0
+         *
+         * @return string CSS string
+         * @since       4.0.0
+         * @access      public
+         */
+        public static function parseCSS( array $css_array = array(), string $style = '', string $value = '' ): string { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
+            _deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', __CLASS__ . '::parse_css( $css_array, $style, $value )' );
+
+            return self::parse_css( $css_array, $style, $value );
+        }
+
+        /**
+         * Parse CSS the old way, without mode options.
+         *
+         * @param array  $css_array CSS data.
+         * @param string $style     CSS style.
+         *
+         * @return string
+         */
+        private static function the_old_way( array $css_array, string $style ): string {
+            $keys = implode( ',', $css_array );
+
+            return $keys . '{' . $style . '}';
+        }
+
+        /**
+         * Return s.
+         *
+         * @access public
+         * @since 4.0.0
+         * @return string
+         */
+        public static function gs(): string {
+            return get_option( 're' . 'dux_p' . 'ro_lic' . 'ense_key', '' ); // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
+        }
+
+        /**
+         * Deprecated Initialized the WordPress filesystem, if it already isn't.
+         *
+         * @since       3.2.3
+         * @access      public
+         * @deprecated NO longer using camelCase naming conventions.
+         *
+         * @return      void
+         */
+        public static function initWpFilesystem() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName
+            // phpcs:ignore Squiz.Commenting.InlineComment.InvalidEndChar
+            _deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', __CLASS__ . '::init_wp_filesystem()' );
+
+            self::init_wp_filesystem();
+        }
+
+        /**
+         * Initialized the WordPress filesystem, if it already isn't.
+         *
+         * @since       3.2.3
+         * @access      public
+         *
+         * @return      void
+         */
+        public static function init_wp_filesystem() {
+            global $wp_filesystem;
+
+            // Initialize the WordPress filesystem, no more using file_put_contents function.
+            if ( empty( $wp_filesystem ) ) {
+                require_once ABSPATH . '/wp-includes/pluggable.php';
+                require_once ABSPATH . '/wp-admin/includes/file.php';
+
+                WP_Filesystem();
+            }
+        }
+
+        /**
+         * TRU.
+         *
+         * @param string $string .
+         * @param string $opt_name .
+         *
+         * @deprecated Ad Remover extension no longer necessary.
+         *
+         * @return void
+         */
+        public static function tru( string $string, string $opt_name ) {
+            _deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
+        }
+
+        /**
+         * DAT.
+         *
+         * @param string $fname .
+         * @param string $opt_name .
+         *
+         * @deprecated Ad Remover extension no longer necessary.
+         *
+         * @return void
+         */
+        public static function dat( string $fname, string $opt_name ) {
+            _deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
+        }
+
+        /**
+         * BUB.
+         *
+         * @param string $fname    .
+         * @param string $opt_name .
+         *
+         * @deprecated Ad Remover extension no longer necessary.
+         *
+         * @return void
+         */
+        public static function bub( string $fname, string $opt_name ) {
+            _deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
+        }
+
+        /**
+         * YO.
+         *
+         * @param string $fname    .
+         * @param string $opt_name .
+         *
+         * @deprecated Ad Remover extension no longer necessary.
+         *
+         * @return void
+         */
+        public static function yo( string $fname, string $opt_name ) {
+            _deprecated_function( __CLASS__ . '::' . __FUNCTION__, '4.0', '' );
+        }
+
+        /**
+         * Sanitize camelCase keys in an array, makes then snake_case.
+         *
+         * @param array $arr Array of keys.
+         *
+         * @return array
+         */
+        public static function sanitize_camel_case_array_keys( array $arr ): array {
+            $keys   = array_keys( $arr );
+            $values = array_values( $arr );
+
+            $result = preg_replace_callback(
+                '/[A-Z]/',
+                function ( $matches ) {
+                    return '-' . Redux_Core::strtolower( $matches[0] );
+                },
+                $keys
+            );
+
+            return array_combine( $result, $values );
+        }
+
+        /**
+         * Converts an array into an html data string.
+         *
+         * @param array $data example input: array('id'=>'true').
+         *
+         * @return string $data_string example output: data-id='true'
+         */
+        public static function create_data_string( array $data = array() ): string {
+            $data_string = '';
+
+            foreach ( $data as $key => $value ) {
+                if ( is_array( $value ) ) {
+                    $value = implode( '|', $value );
+                }
+
+                $data_string .= ' data-' . $key . '=' . Redux_Helpers::make_bool_str( $value ) . ' ';
+            }
+
+            return $data_string;
+        }
+    }
 }