reduxframework / redux-framework

uninstall.php

Indentation +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 // If uninstall, not called from WordPress, then exit.
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-	exit;
+    exit;
 }
 
 // TODO: Define uninstall functionality here.

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

Indentation +23 added lines, -23 removed lines

@@ -11,31 +11,31 @@
 
 if ( ! class_exists( 'Redux_Transients', false ) ) {
 
-	/**
-	 * Class Redux_Transients
-	 */
-	class Redux_Transients extends Redux_Class {
+    /**
+     * Class Redux_Transients
+     */
+    class Redux_Transients extends Redux_Class {
 
-		/**
-		 * Get transients from database.
-		 */
-		public function get() {
-			$core = $this->core();
+        /**
+         * Get transients from database.
+         */
+        public function get() {
+            $core = $this->core();
 
-			if ( empty( $core->transients ) ) {
-				$core->transients = get_option( $core->args['opt_name'] . '-transients', array() );
-			}
-		}
+            if ( empty( $core->transients ) ) {
+                $core->transients = get_option( $core->args['opt_name'] . '-transients', array() );
+            }
+        }
 
-		/**
-		 * Set transients in database.
-		 */
-		public function set() {
-			$core = $this->core();
+        /**
+         * Set transients in database.
+         */
+        public function set() {
+            $core = $this->core();
 
-			if ( ! isset( $core->transients ) || ! isset( $core->transients_check ) || $core->transients_check !== $core->transients ) {
-				update_option( $core->args['opt_name'] . '-transients', $core->transients );
-			}
-		}
-	}
+            if ( ! isset( $core->transients ) || ! isset( $core->transients_check ) || $core->transients_check !== $core->transients ) {
+                update_option( $core->args['opt_name'] . '-transients', $core->transients );
+            }
+        }
+    }
 }

redux-core/inc/themecheck/checks/class-redux-embedded.php

Indentation +54 added lines, -54 removed lines

@@ -14,67 +14,67 @@
  */
 class Redux_Embedded implements themecheck {
 
-	/**
-	 * Error array.
-	 *
-	 * @var array
-	 */
-	protected array $error = array();
+    /**
+     * Error array.
+     *
+     * @var array
+     */
+    protected array $error = array();
 
-	/**
-	 * Run checker.
-	 *
-	 * @param array $php_files - Files to check.
-	 * @param array $css_files - Files to check.
-	 * @param array $other_files - Files to check.
-	 *
-	 * @return bool
-	 */
-	public function check( $php_files, $css_files, $other_files ): bool {
+    /**
+     * Run checker.
+     *
+     * @param array $php_files - Files to check.
+     * @param array $css_files - Files to check.
+     * @param array $other_files - Files to check.
+     *
+     * @return bool
+     */
+    public function check( $php_files, $css_files, $other_files ): bool {
 
-		$ret   = true;
-		$check = Redux_ThemeCheck::get_instance();
-		$redux = $check::get_redux_details( $php_files );
+        $ret   = true;
+        $check = Redux_ThemeCheck::get_instance();
+        $redux = $check::get_redux_details( $php_files );
 
-		if ( $redux ) {
-			checkcount();
+        if ( $redux ) {
+            checkcount();
 
-			if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
-				$ret           = false;
-			} else {
-				// TODO Granular WP.org tests!!!
-				// Check for Tracking.
-				$tracking = $redux['dir'] . 'inc/tracking.php';
-				if ( file_exists( $tracking ) ) {
-					$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
-					$ret           = false;
-				}
+            if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
+                $ret           = false;
+            } else {
+                // TODO Granular WP.org tests!!!
+                // Check for Tracking.
+                $tracking = $redux['dir'] . 'inc/tracking.php';
+                if ( file_exists( $tracking ) ) {
+                    $this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
+                    $ret           = false;
+                }
 
-				// Embedded CDN package
-				// use_cdn
-				// Arguments.
-				$args          = '<ol>';
-				$args         .= "<li><code>'save_defaults' => false</code></li>";
-				$args         .= "<li><code>'use_cdn' => false</code></li>";
-				$args         .= "<li><code>'customizer_only' => true</code> Non-Customizer Based Panels are Prohibited within WP.org Themes</li>";
-				$args         .= "<li><code>'database' => 'theme_mods'</code> (' . esc_html__( 'Optional', 'redux-framework' ) . ')</li>";
-				$args         .= '</ol>';
-				$this->error[] = '<div class="redux-error"><span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'The following arguments MUST be used for WP.org submissions, or you will be rejected because of your Redux configuration.', 'redux-framework' ) . $args . '</div>';
-			}
-		}
+                // Embedded CDN package
+                // use_cdn
+                // Arguments.
+                $args          = '<ol>';
+                $args         .= "<li><code>'save_defaults' => false</code></li>";
+                $args         .= "<li><code>'use_cdn' => false</code></li>";
+                $args         .= "<li><code>'customizer_only' => true</code> Non-Customizer Based Panels are Prohibited within WP.org Themes</li>";
+                $args         .= "<li><code>'database' => 'theme_mods'</code> (' . esc_html__( 'Optional', 'redux-framework' ) . ')</li>";
+                $args         .= '</ol>';
+                $this->error[] = '<div class="redux-error"><span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'The following arguments MUST be used for WP.org submissions, or you will be rejected because of your Redux configuration.', 'redux-framework' ) . $args . '</div>';
+            }
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
-	/**
-	 * Return error array.
-	 *
-	 * @return array
-	 */
-	public function getError(): array {
-		return $this->error;
-	}
+    /**
+     * Return error array.
+     *
+     * @return array
+     */
+    public function getError(): array {
+        return $this->error;
+    }
 
 }
 

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/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/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-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;
+        }
+    }
 }

redux-templates/classes/class-template-overrides.php

Indentation +95 added lines, -95 removed lines

@@ -18,50 +18,50 @@ 
  */
 class Template_Overrides {
 
-	/**
-	 * ReduxTemplates Template_Overrides.
-	 *
-	 * @since 4.0.0
-	 */
-	public function __construct() {
-	}
-
-	/**
-	 * Detects if the current page has blocks or not.
-	 *
-	 * @return bool
-	 * @since 4.0.0
-	 */
-	public static function is_gutenberg(): bool {
-		global $post;
-		if ( function_exists( 'has_blocks' ) && has_blocks( $post->ID ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Detects the current theme and provides overrides.
-	 *
-	 * @return string
-	 * @since 4.0.0
-	 */
-	public static function get_overrides(): string {
-
-		if ( ! self::is_gutenberg() ) {
-			return '';
-		}
-
-		$template = mb_strtolower( get_template() );
-
-		$css = '';
-		if ( method_exists( __CLASS__, $template ) ) {
-			$css = call_user_func( array( __CLASS__, $template ) );
-			$css = preg_replace( '/\s+/S', ' ', $css );
-		}
-
-		$css .= <<<'EOD'
+    /**
+     * ReduxTemplates Template_Overrides.
+     *
+     * @since 4.0.0
+     */
+    public function __construct() {
+    }
+
+    /**
+     * Detects if the current page has blocks or not.
+     *
+     * @return bool
+     * @since 4.0.0
+     */
+    public static function is_gutenberg(): bool {
+        global $post;
+        if ( function_exists( 'has_blocks' ) && has_blocks( $post->ID ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Detects the current theme and provides overrides.
+     *
+     * @return string
+     * @since 4.0.0
+     */
+    public static function get_overrides(): string {
+
+        if ( ! self::is_gutenberg() ) {
+            return '';
+        }
+
+        $template = mb_strtolower( get_template() );
+
+        $css = '';
+        if ( method_exists( __CLASS__, $template ) ) {
+            $css = call_user_func( array( __CLASS__, $template ) );
+            $css = preg_replace( '/\s+/S', ' ', $css );
+        }
+
+        $css .= <<<'EOD'
 			#main {
 				padding: unset !important;
 			}
@@ -78,68 +78,68 @@ 
 			}
 }
 EOD;
-		// Remove comments.
-		$css = preg_replace( '!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $css );
-		// Remove space after colons.
-		$css = str_replace( ': ', ':', $css );
-		// Remove space after commas.
-		$css = str_replace( ', ', ',', $css );
-		// Remove space after opening bracket.
-		$css = str_replace( ' {', '{', $css );
-		// Remove whitespace.
-		return str_replace( array( "\r\n", "\r", "\n", "\t", '  ', '    ', '    ' ), '', $css );
-	}
-
-	/**
-	 * Consulting theme overrides.
-	 *
-	 * @return string
-	 * @since 4.0.0
-	 */
-	public static function consulting(): string {
-		return <<<'EOD'
+        // Remove comments.
+        $css = preg_replace( '!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $css );
+        // Remove space after colons.
+        $css = str_replace( ': ', ':', $css );
+        // Remove space after commas.
+        $css = str_replace( ', ', ',', $css );
+        // Remove space after opening bracket.
+        $css = str_replace( ' {', '{', $css );
+        // Remove whitespace.
+        return str_replace( array( "\r\n", "\r", "\n", "\t", '  ', '    ', '    ' ), '', $css );
+    }
+
+    /**
+     * Consulting theme overrides.
+     *
+     * @return string
+     * @since 4.0.0
+     */
+    public static function consulting(): string {
+        return <<<'EOD'
 			#content-core {
 				max-width: 100%;
 			}
 EOD;
-	}
-
-	/**
-	 * Avada theme overrides.
-	 *
-	 * @return string
-	 * @since 4.0.0
-	 */
-	public static function avada(): string {
-		return <<<'EOD'
+    }
+
+    /**
+     * Avada theme overrides.
+     *
+     * @return string
+     * @since 4.0.0
+     */
+    public static function avada(): string {
+        return <<<'EOD'
 			#main .fusion-row {
 				max-width: unset;
 			}
 EOD;
-	}
-
-	/**
-	 * GeneratePress theme overrides.
-	 *
-	 * @return string
-	 * @since 4.1.24
-	 */
-	public static function generatepress(): string {
-		return <<<'EOD'
+    }
+
+    /**
+     * GeneratePress theme overrides.
+     *
+     * @return string
+     * @since 4.1.24
+     */
+    public static function generatepress(): string {
+        return <<<'EOD'
 			.site-content {
                             display: block!important;
                         }
 EOD;
-	}
-
-	/**
-	 * TwentyTwenty theme overrides.
-	 *
-	 * @return string
-	 * @since 4.0.0
-	 */
-	public static function twentytwenty(): string {
-		return <<<'EOD'
+    }
+
+    /**
+     * TwentyTwenty theme overrides.
+     *
+     * @return string
+     * @since 4.0.0
+     */
+    public static function twentytwenty(): string {
+        return <<<'EOD'
 			[class*="__inner-container"] > *:not(.alignwide):not(.alignfull):not(.alignleft):not(.alignright):not(.is-style-wide) {
 				max-width: unset !important;
 			}
@@ -148,6 +148,6 @@ 
 				margin-bottom: unset;
 			}
 EOD;
-	}
+    }
 
 }