reduxframework / redux-framework

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

Spacing +4 added lines, -4 removed lines

@@ -59,8 +59,8 @@ 
 
 				foreach ( $this->field['options'] as $k => $v ) {
 
-					if ( empty( $this->value[ $k ] ) ) {
-						$this->value[ $k ] = '';
+					if ( empty( $this->value[$k] ) ) {
+						$this->value[$k] = '';
 					}
 
 					echo '<li>';
@@ -77,8 +77,8 @@ 
 					$id      = $ident_1 . '_' . $ident_2;
 
 					echo '<label for="' . esc_attr( $id ) . '">';
-					echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $k . ']' ) . '" value="' . esc_attr( $this->value[ $k ] ) . '"/>';
-					echo '<input type="checkbox" class="checkbox ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $id ) . '" value="1" ' . checked( $this->value[ $k ], '1', false ) . '/>';
+					echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $k . ']' ) . '" value="' . esc_attr( $this->value[$k] ) . '"/>';
+					echo '<input type="checkbox" class="checkbox ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $id ) . '" value="1" ' . checked( $this->value[$k], '1', false ) . '/>';
 					echo ' ' . esc_attr( $v ) . '</label>';
 					echo '</li>';
 				}

Indentation +129 added lines, -129 removed lines

@@ -12,135 +12,135 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Checkbox', false ) ) {
 
-	/**
-	 * Main Redux_checkbox class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Checkbox extends Redux_Field {
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			if ( ! 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;
-				}
-			}
-
-			$this->field['data_class'] = ( isset( $this->field['multi_layout'] ) ) ? 'data-' . $this->field['multi_layout'] : 'data-full';
-
-			if ( ! empty( $this->field['options'] ) && ( is_array( $this->field['options'] ) || is_array( $this->field['default'] ) ) ) {
-
-				echo '<ul class="' . esc_attr( $this->field['data_class'] ) . '">';
-
-				if ( ! isset( $this->value ) ) {
-					$this->value = array();
-				}
-
-				if ( ! is_array( $this->value ) ) {
-					$this->value = array();
-				}
-
-				if ( empty( $this->field['options'] ) && isset( $this->field['default'] ) && is_array( $this->field['default'] ) ) {
-					$this->field['options'] = $this->field['default'];
-				}
-
-				foreach ( $this->field['options'] as $k => $v ) {
-
-					if ( empty( $this->value[ $k ] ) ) {
-						$this->value[ $k ] = '';
-					}
-
-					echo '<li>';
-
-					$ident_1 = strtr(
-						$this->parent->args['opt_name'] . '[' . $this->field['id'] . '][' . $k . ']',
-						array(
-							'[' => '_',
-							']' => '',
-						)
-					);
-
-					$ident_2 = array_search( $k, array_keys( $this->field['options'] ), true );
-					$id      = $ident_1 . '_' . $ident_2;
-
-					echo '<label for="' . esc_attr( $id ) . '">';
-					echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $k . ']' ) . '" value="' . esc_attr( $this->value[ $k ] ) . '"/>';
-					echo '<input type="checkbox" class="checkbox ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $id ) . '" value="1" ' . checked( $this->value[ $k ], '1', false ) . '/>';
-					echo ' ' . esc_attr( $v ) . '</label>';
-					echo '</li>';
-				}
-
-				echo '</ul>';
-			} elseif ( empty( $this->field['data'] ) ) {
-				echo '<ul class="data-full">';
-				echo '<li>';
-
-				if ( ! empty( $this->field['label'] ) ) {
-					echo '<label>';
-				}
-
-				$ident_1 = strtr(
-					$this->parent->args['opt_name'] . '[' . $this->field['id'] . ']',
-					array(
-						'[' => '_',
-						']' => '',
-					)
-				);
-
-				// Got the "Checked" status as "0" or "1" then insert it as the "value" option.
-				echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" value="' . esc_attr( $this->value ) . '"/>';
-				echo '<input type="checkbox" id="' . esc_attr( $ident_1 ) . '" value="1" class="checkbox ' . esc_attr( $this->field['class'] ) . '" ' . checked( $this->value, '1', false ) . '/>';
-
-				if ( ! empty( $this->field['label'] ) ) {
-					echo ' ' . esc_html( $this->field['label'] );
-					echo '</label>';
-				}
-
-				echo '</li>';
-				echo '</ul>';
-			}
-		}
-
-		/**
-		 * 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-checkbox',
-					Redux_Core::$url . 'inc/fields/checkbox/redux-checkbox.css',
-					array(),
-					$this->timestamp
-				);
-			}
-
-			wp_enqueue_script(
-				'redux-field-checkbox',
-				Redux_Core::$url . 'inc/fields/checkbox/redux-checkbox' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+    /**
+     * Main Redux_checkbox class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Checkbox extends Redux_Field {
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            if ( ! 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;
+                }
+            }
+
+            $this->field['data_class'] = ( isset( $this->field['multi_layout'] ) ) ? 'data-' . $this->field['multi_layout'] : 'data-full';
+
+            if ( ! empty( $this->field['options'] ) && ( is_array( $this->field['options'] ) || is_array( $this->field['default'] ) ) ) {
+
+                echo '<ul class="' . esc_attr( $this->field['data_class'] ) . '">';
+
+                if ( ! isset( $this->value ) ) {
+                    $this->value = array();
+                }
+
+                if ( ! is_array( $this->value ) ) {
+                    $this->value = array();
+                }
+
+                if ( empty( $this->field['options'] ) && isset( $this->field['default'] ) && is_array( $this->field['default'] ) ) {
+                    $this->field['options'] = $this->field['default'];
+                }
+
+                foreach ( $this->field['options'] as $k => $v ) {
+
+                    if ( empty( $this->value[ $k ] ) ) {
+                        $this->value[ $k ] = '';
+                    }
+
+                    echo '<li>';
+
+                    $ident_1 = strtr(
+                        $this->parent->args['opt_name'] . '[' . $this->field['id'] . '][' . $k . ']',
+                        array(
+                            '[' => '_',
+                            ']' => '',
+                        )
+                    );
+
+                    $ident_2 = array_search( $k, array_keys( $this->field['options'] ), true );
+                    $id      = $ident_1 . '_' . $ident_2;
+
+                    echo '<label for="' . esc_attr( $id ) . '">';
+                    echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $k . ']' ) . '" value="' . esc_attr( $this->value[ $k ] ) . '"/>';
+                    echo '<input type="checkbox" class="checkbox ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $id ) . '" value="1" ' . checked( $this->value[ $k ], '1', false ) . '/>';
+                    echo ' ' . esc_attr( $v ) . '</label>';
+                    echo '</li>';
+                }
+
+                echo '</ul>';
+            } elseif ( empty( $this->field['data'] ) ) {
+                echo '<ul class="data-full">';
+                echo '<li>';
+
+                if ( ! empty( $this->field['label'] ) ) {
+                    echo '<label>';
+                }
+
+                $ident_1 = strtr(
+                    $this->parent->args['opt_name'] . '[' . $this->field['id'] . ']',
+                    array(
+                        '[' => '_',
+                        ']' => '',
+                    )
+                );
+
+                // Got the "Checked" status as "0" or "1" then insert it as the "value" option.
+                echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '" value="' . esc_attr( $this->value ) . '"/>';
+                echo '<input type="checkbox" id="' . esc_attr( $ident_1 ) . '" value="1" class="checkbox ' . esc_attr( $this->field['class'] ) . '" ' . checked( $this->value, '1', false ) . '/>';
+
+                if ( ! empty( $this->field['label'] ) ) {
+                    echo ' ' . esc_html( $this->field['label'] );
+                    echo '</label>';
+                }
+
+                echo '</li>';
+                echo '</ul>';
+            }
+        }
+
+        /**
+         * 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-checkbox',
+                    Redux_Core::$url . 'inc/fields/checkbox/redux-checkbox.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+
+            wp_enqueue_script(
+                'redux-field-checkbox',
+                Redux_Core::$url . 'inc/fields/checkbox/redux-checkbox' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Checkbox', 'ReduxFramework_Checkbox' );

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

Spacing +12 added lines, -12 removed lines

@@ -33,9 +33,9 @@ 
 						$slug = Redux_Core::strtolower( $name );
 						$slug = str_replace( ' ', '-', $slug );
 
-						$new_arr[ $slug ] = $name;
+						$new_arr[$slug] = $name;
 					} else {
-						$new_arr[ $id ] = $name;
+						$new_arr[$id] = $name;
 					}
 				}
 			}
@@ -78,7 +78,7 @@ 
 			}
 
 			if ( isset( $this->field['data'] ) ) {
-				$this->field['options'] = $this->parent->options_defaults[ $this->field['id'] ];
+				$this->field['options'] = $this->parent->options_defaults[$this->field['id']];
 			}
 
 			$this->field['repeater_id'] = $this->field['repeater_id'] ?? '';
@@ -105,8 +105,8 @@ 
 			if ( ! empty( $sortlists ) ) {
 				foreach ( $sortlists as $section => $arr ) {
 					$arr                     = $this->replace_id_with_slug( $arr );
-					$sortlists[ $section ]   = $arr;
-					$this->value[ $section ] = $arr;
+					$sortlists[$section]   = $arr;
+					$this->value[$section] = $arr;
 				}
 			}
 
@@ -122,9 +122,9 @@ 
 					if ( ! empty( $temp2 ) ) {
 						if ( ! array_key_exists( $k, $temp2 ) ) {
 							if ( isset( $sortlists['Disabled'] ) ) {
-								$sortlists['Disabled'][ $k ] = $v;
+								$sortlists['Disabled'][$k] = $v;
 							} else {
-								$sortlists['disabled'][ $k ] = $v;
+								$sortlists['disabled'][$k] = $v;
 							}
 						}
 					}
@@ -138,18 +138,18 @@ 
 						// k = id.
 						// v = name.
 						if ( ! array_key_exists( $k, $temp ) ) {
-							unset( $sortlist[ $k ] );
+							unset( $sortlist[$k] );
 						}
 					}
-					$sortlists[ $key ] = $sortlist;
+					$sortlists[$key] = $sortlist;
 				}
 
 				// assuming all synced, now get the correct naming for each block.
 				foreach ( $sortlists as $key => $sortlist ) {
 					foreach ( $sortlist as $k => $v ) {
-						$sortlist[ $k ] = $temp[ $k ];
+						$sortlist[$k] = $temp[$k];
 					}
-					$sortlists[ $key ] = $sortlist;
+					$sortlists[$key] = $sortlist;
 				}
 
 				if ( $sortlists ) {
@@ -158,7 +158,7 @@ 
 					foreach ( $sortlists as $group => $sortlist ) {
 						$filled = '';
 
-						if ( isset( $this->field['limits'][ $group ] ) && count( $sortlist ) >= $this->field['limits'][ $group ] ) {
+						if ( isset( $this->field['limits'][$group] ) && count( $sortlist ) >= $this->field['limits'][$group] ) {
 							$filled = ' filled';
 						}
 

Indentation +223 added lines, -223 removed lines

@@ -11,234 +11,234 @@
 
 if ( ! class_exists( 'Redux_Sorter', false ) ) {
 
-	/**
-	 * Class Redux_Sorter
-	 */
-	class Redux_Sorter extends Redux_Field {
-
-		/**
-		 * Replaced ID with slag.
-		 *
-		 * @param array $arr .
-		 *
-		 * @return array
-		 */
-		private function replace_id_with_slug( array $arr ): array {
-			$new_arr = array();
-
-			if ( ! empty( $arr ) ) {
-				foreach ( $arr as $id => $name ) {
-
-					if ( is_numeric( $id ) ) {
-						$slug = Redux_Core::strtolower( $name );
-						$slug = str_replace( ' ', '-', $slug );
-
-						$new_arr[ $slug ] = $name;
-					} else {
-						$new_arr[ $id ] = $name;
-					}
-				}
-			}
-
-			return $new_arr;
-		}
-
-		/**
-		 * Check for empty value.
-		 *
-		 * @param mixed $val Value to check.
-		 *
-		 * @return bool
-		 */
-		private function is_value_empty( $val ): bool {
-			if ( ! empty( $val ) ) {
-				foreach ( $val as $arr ) {
-					if ( ! empty( $arr ) ) {
-						return false;
-					}
-				}
-			}
-
-			return true;
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since 1.0.0
-		 */
-		public function render() {
-			if ( ! is_array( $this->value ) && isset( $this->field['options'] ) ) {
-				$this->value = $this->field['options'];
-			}
-
-			if ( ! isset( $this->field['args'] ) ) {
-				$this->field['args'] = array();
-			}
-
-			if ( isset( $this->field['data'] ) ) {
-				$this->field['options'] = $this->parent->options_defaults[ $this->field['id'] ];
-			}
-
-			$this->field['repeater_id'] = $this->field['repeater_id'] ?? '';
-
-			// Make sure to get list of all the default blocks first.
-			$all_blocks = ! empty( $this->field['options'] ) ? $this->field['options'] : array();
-			$temp       = array(); // holds default blocks.
-			$temp2      = array(); // holds saved blocks.
-
-			foreach ( $all_blocks as $blocks ) {
-				$temp = array_merge( $temp, $blocks );
-			}
-
-			$temp = $this->replace_id_with_slug( $temp );
-
-			if ( $this->is_value_empty( $this->value ) ) {
-				if ( ! empty( $this->field['options'] ) ) {
-					$this->value = $this->field['options'];
-				}
-			}
-
-			$sortlists = $this->value;
-
-			if ( ! empty( $sortlists ) ) {
-				foreach ( $sortlists as $section => $arr ) {
-					$arr                     = $this->replace_id_with_slug( $arr );
-					$sortlists[ $section ]   = $arr;
-					$this->value[ $section ] = $arr;
-				}
-			}
-
-			if ( is_array( $sortlists ) ) {
-				foreach ( $sortlists as $sortlist ) {
-					$temp2 = array_merge( $temp2, $sortlist );
-				}
-
-				// now let's compare if we have anything missing.
-				foreach ( $temp as $k => $v ) {
-					// k = id/slug.
-					// v = name.
-					if ( ! empty( $temp2 ) ) {
-						if ( ! array_key_exists( $k, $temp2 ) ) {
-							if ( isset( $sortlists['Disabled'] ) ) {
-								$sortlists['Disabled'][ $k ] = $v;
-							} else {
-								$sortlists['disabled'][ $k ] = $v;
-							}
-						}
-					}
-				}
-
-				// now check if saved blocks has blocks not registered under default blocks.
-				foreach ( $sortlists as $key => $sortlist ) {
-					// key = enabled, disabled, backup.
-					// sortlist = id => name.
-					foreach ( $sortlist as $k => $v ) {
-						// k = id.
-						// v = name.
-						if ( ! array_key_exists( $k, $temp ) ) {
-							unset( $sortlist[ $k ] );
-						}
-					}
-					$sortlists[ $key ] = $sortlist;
-				}
-
-				// assuming all synced, now get the correct naming for each block.
-				foreach ( $sortlists as $key => $sortlist ) {
-					foreach ( $sortlist as $k => $v ) {
-						$sortlist[ $k ] = $temp[ $k ];
-					}
-					$sortlists[ $key ] = $sortlist;
-				}
-
-				if ( $sortlists ) {
-					echo '<fieldset id="' . esc_attr( $this->field['id'] ) . '" class="redux-sorter-container redux-sorter ' . esc_attr( $this->field['class'] ) . '">';
-
-					foreach ( $sortlists as $group => $sortlist ) {
-						$filled = '';
-
-						if ( isset( $this->field['limits'][ $group ] ) && count( $sortlist ) >= $this->field['limits'][ $group ] ) {
-							$filled = ' filled';
-						}
-
-						echo '<ul id="' . esc_attr( $this->field['id'] . '_' . $group ) . '" class="sortlist_' . esc_attr( $this->field['id'] . $filled ) . '" data-id="' . esc_attr( $this->field['id'] ) . '" data-repeater-id="' . esc_attr( $this->field['repeater_id'] ) . '" data-suffix="' . esc_attr( $this->field['name_suffix'] ) . '" data-group-id="' . esc_attr( $group ) . '">';
-						echo '<h3>' . esc_html( $group ) . '</h3>';
-
-						if ( ! isset( $sortlist['placebo'] ) ) {
-							$sortlist['placebo'] = 'placebo';
-						}
-
-						foreach ( $sortlist as $key => $list ) {
-							echo '<input
+    /**
+     * Class Redux_Sorter
+     */
+    class Redux_Sorter extends Redux_Field {
+
+        /**
+         * Replaced ID with slag.
+         *
+         * @param array $arr .
+         *
+         * @return array
+         */
+        private function replace_id_with_slug( array $arr ): array {
+            $new_arr = array();
+
+            if ( ! empty( $arr ) ) {
+                foreach ( $arr as $id => $name ) {
+
+                    if ( is_numeric( $id ) ) {
+                        $slug = Redux_Core::strtolower( $name );
+                        $slug = str_replace( ' ', '-', $slug );
+
+                        $new_arr[ $slug ] = $name;
+                    } else {
+                        $new_arr[ $id ] = $name;
+                    }
+                }
+            }
+
+            return $new_arr;
+        }
+
+        /**
+         * Check for empty value.
+         *
+         * @param mixed $val Value to check.
+         *
+         * @return bool
+         */
+        private function is_value_empty( $val ): bool {
+            if ( ! empty( $val ) ) {
+                foreach ( $val as $arr ) {
+                    if ( ! empty( $arr ) ) {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since 1.0.0
+         */
+        public function render() {
+            if ( ! is_array( $this->value ) && isset( $this->field['options'] ) ) {
+                $this->value = $this->field['options'];
+            }
+
+            if ( ! isset( $this->field['args'] ) ) {
+                $this->field['args'] = array();
+            }
+
+            if ( isset( $this->field['data'] ) ) {
+                $this->field['options'] = $this->parent->options_defaults[ $this->field['id'] ];
+            }
+
+            $this->field['repeater_id'] = $this->field['repeater_id'] ?? '';
+
+            // Make sure to get list of all the default blocks first.
+            $all_blocks = ! empty( $this->field['options'] ) ? $this->field['options'] : array();
+            $temp       = array(); // holds default blocks.
+            $temp2      = array(); // holds saved blocks.
+
+            foreach ( $all_blocks as $blocks ) {
+                $temp = array_merge( $temp, $blocks );
+            }
+
+            $temp = $this->replace_id_with_slug( $temp );
+
+            if ( $this->is_value_empty( $this->value ) ) {
+                if ( ! empty( $this->field['options'] ) ) {
+                    $this->value = $this->field['options'];
+                }
+            }
+
+            $sortlists = $this->value;
+
+            if ( ! empty( $sortlists ) ) {
+                foreach ( $sortlists as $section => $arr ) {
+                    $arr                     = $this->replace_id_with_slug( $arr );
+                    $sortlists[ $section ]   = $arr;
+                    $this->value[ $section ] = $arr;
+                }
+            }
+
+            if ( is_array( $sortlists ) ) {
+                foreach ( $sortlists as $sortlist ) {
+                    $temp2 = array_merge( $temp2, $sortlist );
+                }
+
+                // now let's compare if we have anything missing.
+                foreach ( $temp as $k => $v ) {
+                    // k = id/slug.
+                    // v = name.
+                    if ( ! empty( $temp2 ) ) {
+                        if ( ! array_key_exists( $k, $temp2 ) ) {
+                            if ( isset( $sortlists['Disabled'] ) ) {
+                                $sortlists['Disabled'][ $k ] = $v;
+                            } else {
+                                $sortlists['disabled'][ $k ] = $v;
+                            }
+                        }
+                    }
+                }
+
+                // now check if saved blocks has blocks not registered under default blocks.
+                foreach ( $sortlists as $key => $sortlist ) {
+                    // key = enabled, disabled, backup.
+                    // sortlist = id => name.
+                    foreach ( $sortlist as $k => $v ) {
+                        // k = id.
+                        // v = name.
+                        if ( ! array_key_exists( $k, $temp ) ) {
+                            unset( $sortlist[ $k ] );
+                        }
+                    }
+                    $sortlists[ $key ] = $sortlist;
+                }
+
+                // assuming all synced, now get the correct naming for each block.
+                foreach ( $sortlists as $key => $sortlist ) {
+                    foreach ( $sortlist as $k => $v ) {
+                        $sortlist[ $k ] = $temp[ $k ];
+                    }
+                    $sortlists[ $key ] = $sortlist;
+                }
+
+                if ( $sortlists ) {
+                    echo '<fieldset id="' . esc_attr( $this->field['id'] ) . '" class="redux-sorter-container redux-sorter ' . esc_attr( $this->field['class'] ) . '">';
+
+                    foreach ( $sortlists as $group => $sortlist ) {
+                        $filled = '';
+
+                        if ( isset( $this->field['limits'][ $group ] ) && count( $sortlist ) >= $this->field['limits'][ $group ] ) {
+                            $filled = ' filled';
+                        }
+
+                        echo '<ul id="' . esc_attr( $this->field['id'] . '_' . $group ) . '" class="sortlist_' . esc_attr( $this->field['id'] . $filled ) . '" data-id="' . esc_attr( $this->field['id'] ) . '" data-repeater-id="' . esc_attr( $this->field['repeater_id'] ) . '" data-suffix="' . esc_attr( $this->field['name_suffix'] ) . '" data-group-id="' . esc_attr( $group ) . '">';
+                        echo '<h3>' . esc_html( $group ) . '</h3>';
+
+                        if ( ! isset( $sortlist['placebo'] ) ) {
+                            $sortlist['placebo'] = 'placebo';
+                        }
+
+                        foreach ( $sortlist as $key => $list ) {
+                            echo '<input
 									class="sorter-placebo"
 									type="hidden"
 									name="' . esc_attr( $this->field['name'] ) . esc_attr( $this->field['name_suffix'] ) . '[' . esc_html( $group ) . '][placebo]"
 									value="placebo">';
 
-							if ( 'placebo' !== $key ) {
-								echo '<li id="sortee-' . esc_attr( $key ) . '" class="sortee" data-id="' . esc_attr( $key ) . '">';
-								echo '<input class="position ' . esc_attr( $this->field['class'] ) . '" type="hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $group . '][' . $key . ']' ) . '" value="' . esc_attr( $list ) . '">';
-								echo esc_html( $list );
-								echo '</li>';
-							}
-						}
-
-						echo '</ul>';
-					}
-
-					echo '</fieldset>';
-				}
-			}
-		}
-
-		/**
-		 * Enqueue scripts and styles.
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-sorter',
-					Redux_Core::$url . 'inc/fields/sorter/redux-sorter.css',
-					array(),
-					$this->timestamp
-				);
-			}
-
-			wp_enqueue_script(
-				'redux-field-sorter',
-				Redux_Core::$url . 'inc/fields/sorter/redux-sorter' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js', 'jquery-ui-sortable' ),
-				$this->timestamp,
-				true
-			);
-		}
-
-		/**
-		 * Functions to pass data from the PHP to the JS at render time.
-		 *
-		 * @param array  $field Field values.
-		 * @param string $value Option values.
-		 *
-		 * @return array Params to be saved as a javascript object accessible to the UI.
-		 * @since  Redux_Framework 3.1.5
-		 */
-		public function localize( array $field, string $value = '' ): array {
-			$params = array();
-
-			if ( ! empty( $field['limits'] ) ) {
-				$params['limits'] = $field['limits'];
-			}
-
-			if ( empty( $value ) ) {
-				$value = $this->value;
-			}
-
-			$params['val'] = $value;
-
-			return $params;
-		}
-	}
+                            if ( 'placebo' !== $key ) {
+                                echo '<li id="sortee-' . esc_attr( $key ) . '" class="sortee" data-id="' . esc_attr( $key ) . '">';
+                                echo '<input class="position ' . esc_attr( $this->field['class'] ) . '" type="hidden" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $group . '][' . $key . ']' ) . '" value="' . esc_attr( $list ) . '">';
+                                echo esc_html( $list );
+                                echo '</li>';
+                            }
+                        }
+
+                        echo '</ul>';
+                    }
+
+                    echo '</fieldset>';
+                }
+            }
+        }
+
+        /**
+         * Enqueue scripts and styles.
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-sorter',
+                    Redux_Core::$url . 'inc/fields/sorter/redux-sorter.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+
+            wp_enqueue_script(
+                'redux-field-sorter',
+                Redux_Core::$url . 'inc/fields/sorter/redux-sorter' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js', 'jquery-ui-sortable' ),
+                $this->timestamp,
+                true
+            );
+        }
+
+        /**
+         * Functions to pass data from the PHP to the JS at render time.
+         *
+         * @param array  $field Field values.
+         * @param string $value Option values.
+         *
+         * @return array Params to be saved as a javascript object accessible to the UI.
+         * @since  Redux_Framework 3.1.5
+         */
+        public function localize( array $field, string $value = '' ): array {
+            $params = array();
+
+            if ( ! empty( $field['limits'] ) ) {
+                $params['limits'] = $field['limits'];
+            }
+
+            if ( empty( $value ) ) {
+                $value = $this->value;
+            }
+
+            $params['val'] = $value;
+
+            return $params;
+        }
+    }
 }
 
 class_alias( 'Redux_Sorter', 'ReduxFramework_Sorter' );

redux-core/inc/fields/color_gradient/class-redux-color-gradient.php

Spacing +3 added lines, -3 removed lines

@@ -108,10 +108,10 @@ 
 				echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
 				echo 'id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '"';
 				echo 'name="' . esc_attr( $this->field['name'] ) . esc_attr( $this->field['name_suffix'] ) . '[' . esc_attr( $mode ) . ']"';
-				echo 'value="' . esc_attr( $this->value[ $mode ] ) . '"';
+				echo 'value="' . esc_attr( $this->value[$mode] ) . '"';
 				echo 'class="color-picker redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
 				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default'][ $mode ] ) . '"';
+				echo 'data-default-color="' . esc_attr( $this->field['default'][$mode] ) . '"';
 
 				// Escaping done in function.
 				// phpcs:ignore WordPress.Security.EscapeOutput
@@ -124,7 +124,7 @@ 
 				if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
 					$trans_checked = '';
 
-					if ( 'transparent' === $this->value[ $mode ] ) {
+					if ( 'transparent' === $this->value[$mode] ) {
 						$trans_checked = ' checked="checked"';
 					}
 

Indentation +212 added lines, -212 removed lines

@@ -12,218 +12,218 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Color_Gradient', false ) ) {
 
-	/**
-	 * Main Redux_color_gradient class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Color_Gradient extends Redux_Field {
-
-		/**
-		 * Filters enabled flag.
-		 *
-		 * @var bool
-		 */
-		private $filters_enabled = false;
-
-		/**
-		 * Redux_Field constructor.
-		 *
-		 * @param array  $field  Field array.
-		 * @param string $value  Field values.
-		 * @param null   $redux  ReduxFramework object pointer.
-		 *
-		 * @throws ReflectionException Reflection.
-		 */
-		public function __construct( $field = array(), $value = null, $redux = null ) { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
-			parent::__construct( $field, $value, $redux );
-		}
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			// No errors please.
-			$defaults = array(
-				'from'           => '',
-				'to'             => '',
-				'gradient-type'  => 'linear',
-				'gradient-angle' => 0,
-				'gradient-reach' => array(
-					'from' => 0,
-					'to'   => 100,
-				),
-			);
-
-			$this->value = Redux_Functions::parse_args( $this->value, $defaults );
-
-			$defaults = array(
-				'preview'        => false,
-				'preview_height' => '150px',
-				'transparent'    => true,
-				'gradient-type'  => false,
-				'gradient-reach' => false,
-				'gradient-angle' => false,
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			include_once Redux_Core::$dir . 'inc/lib/gradient-filters/class-redux-gradient-filters.php';
-
-			if ( $this->field['gradient-reach'] || $this->field['gradient-angle'] || $this->field['gradient-type'] ) {
-				include_once Redux_Core::$dir . 'inc/lib/gradient-filters/class-redux-gradient-filters.php';
-				$this->filters_enabled = true;
-			}
-		}
-
-		/**
-		 * 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() {
-			$data = array(
-				'field' => $this->field,
-				'value' => $this->value,
-			);
-
-			// Escaping done in function.
-			// phpcs:ignore WordPress.Security.EscapeOutput
-			echo Redux_Gradient_Filters::render_select( $data );
-
-			$mode_arr = array(
-				'from',
-				'to',
-			);
-
-			foreach ( $mode_arr as $mode ) {
-				$uc_mode = ucfirst( $mode );
-
-				echo '<div class="colorGradient ' . esc_html( $mode ) . 'Label">';
-				echo '<strong>' . esc_html( $uc_mode . ' ' ) . '</strong>&nbsp;';
-				echo '<input ';
-				echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
-				echo 'id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '"';
-				echo 'name="' . esc_attr( $this->field['name'] ) . esc_attr( $this->field['name_suffix'] ) . '[' . esc_attr( $mode ) . ']"';
-				echo 'value="' . esc_attr( $this->value[ $mode ] ) . '"';
-				echo 'class="color-picker redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-				echo 'type="text"';
-				echo 'data-default-color="' . esc_attr( $this->field['default'][ $mode ] ) . '"';
-
-				// Escaping done in function.
-				// phpcs:ignore WordPress.Security.EscapeOutput
-				echo Redux_Functions_Ex::output_alpha_data( $data );
-
-				echo '>';
-
-				echo '<input type="hidden" class="redux-saved-color" id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '-saved-color" value="">';
-
-				if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
-					$trans_checked = '';
-
-					if ( 'transparent' === $this->value[ $mode ] ) {
-						$trans_checked = ' checked="checked"';
-					}
-
-					echo '<label for="' . esc_attr( $this->field['id'] ) . '-' . esc_html( $mode ) . '-transparency" class="color-transparency-check">';
-					echo '<input type="checkbox" class="checkbox color-transparency ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '-transparency" data-id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '" value="1"' . esc_html( $trans_checked ) . '> ' . esc_html__( 'Transparent', 'redux-framework' );
-					echo '</label>';
-				}
-
-				echo '</div>';
-			}
-
-			// Escaping done in function.
-			// phpcs:ignore WordPress.Security.EscapeOutput
-			echo Redux_Gradient_Filters::render_preview( $data );
-
-			// Escaping done in function.
-			// phpcs:ignore WordPress.Security.EscapeOutput
-			echo Redux_Gradient_Filters::render_sliders( $data );
-		}
-
-		/**
-		 * Do enqueue for each field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			Redux_Gradient_Filters::enqueue( $this->field, $this->filters_enabled );
-
-			if ( isset( $this->field['color_alpha'] ) && ( $this->field['color_alpha'] || ( $this->field['color_alpha']['from'] || $this->field['color_alpha']['to'] ) ) ) {
-				if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
-					wp_enqueue_script( 'redux-wp-color-picker-alpha' );
-				}
-			}
-		}
-
-		/**
-		 * 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_style( 'wp-color-picker' );
-
-			$min = Redux_Functions::isMin();
-
-			wp_enqueue_script(
-				'redux-field-color-gradient',
-				Redux_Core::$url . 'inc/fields/color_gradient/redux-color-gradient' . $min . '.js',
-				array( 'jquery', 'wp-color-picker', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->filters_enabled ) {
-				wp_enqueue_script(
-					'redux-field-color-gradient',
-					Redux_Core::$url . 'inc/fields/color_gradient/redux-color-gradient' . $min . '.js',
-					array( 'jquery', 'wp-color-picker' ),
-					Redux_Core::$version,
-					true
-				);
-			}
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style( 'redux-color-picker' );
-
-				wp_enqueue_style(
-					'redux-field-color_gradient',
-					Redux_Core::$url . 'inc/fields/color_gradient/redux-color-gradient.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Compile CSS styling for output.
-		 *
-		 * @param string $data CSS data.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			return Redux_Gradient_Filters::get_output( $data );
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+    /**
+     * Main Redux_color_gradient class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Color_Gradient extends Redux_Field {
+
+        /**
+         * Filters enabled flag.
+         *
+         * @var bool
+         */
+        private $filters_enabled = false;
+
+        /**
+         * Redux_Field constructor.
+         *
+         * @param array  $field  Field array.
+         * @param string $value  Field values.
+         * @param null   $redux  ReduxFramework object pointer.
+         *
+         * @throws ReflectionException Reflection.
+         */
+        public function __construct( $field = array(), $value = null, $redux = null ) { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
+            parent::__construct( $field, $value, $redux );
+        }
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            // No errors please.
+            $defaults = array(
+                'from'           => '',
+                'to'             => '',
+                'gradient-type'  => 'linear',
+                'gradient-angle' => 0,
+                'gradient-reach' => array(
+                    'from' => 0,
+                    'to'   => 100,
+                ),
+            );
+
+            $this->value = Redux_Functions::parse_args( $this->value, $defaults );
+
+            $defaults = array(
+                'preview'        => false,
+                'preview_height' => '150px',
+                'transparent'    => true,
+                'gradient-type'  => false,
+                'gradient-reach' => false,
+                'gradient-angle' => false,
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            include_once Redux_Core::$dir . 'inc/lib/gradient-filters/class-redux-gradient-filters.php';
+
+            if ( $this->field['gradient-reach'] || $this->field['gradient-angle'] || $this->field['gradient-type'] ) {
+                include_once Redux_Core::$dir . 'inc/lib/gradient-filters/class-redux-gradient-filters.php';
+                $this->filters_enabled = true;
+            }
+        }
+
+        /**
+         * 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() {
+            $data = array(
+                'field' => $this->field,
+                'value' => $this->value,
+            );
+
+            // Escaping done in function.
+            // phpcs:ignore WordPress.Security.EscapeOutput
+            echo Redux_Gradient_Filters::render_select( $data );
+
+            $mode_arr = array(
+                'from',
+                'to',
+            );
+
+            foreach ( $mode_arr as $mode ) {
+                $uc_mode = ucfirst( $mode );
+
+                echo '<div class="colorGradient ' . esc_html( $mode ) . 'Label">';
+                echo '<strong>' . esc_html( $uc_mode . ' ' ) . '</strong>&nbsp;';
+                echo '<input ';
+                echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
+                echo 'id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '"';
+                echo 'name="' . esc_attr( $this->field['name'] ) . esc_attr( $this->field['name_suffix'] ) . '[' . esc_attr( $mode ) . ']"';
+                echo 'value="' . esc_attr( $this->value[ $mode ] ) . '"';
+                echo 'class="color-picker redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+                echo 'type="text"';
+                echo 'data-default-color="' . esc_attr( $this->field['default'][ $mode ] ) . '"';
+
+                // Escaping done in function.
+                // phpcs:ignore WordPress.Security.EscapeOutput
+                echo Redux_Functions_Ex::output_alpha_data( $data );
+
+                echo '>';
+
+                echo '<input type="hidden" class="redux-saved-color" id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '-saved-color" value="">';
+
+                if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
+                    $trans_checked = '';
+
+                    if ( 'transparent' === $this->value[ $mode ] ) {
+                        $trans_checked = ' checked="checked"';
+                    }
+
+                    echo '<label for="' . esc_attr( $this->field['id'] ) . '-' . esc_html( $mode ) . '-transparency" class="color-transparency-check">';
+                    echo '<input type="checkbox" class="checkbox color-transparency ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '-transparency" data-id="' . esc_attr( $this->field['id'] ) . '-' . esc_attr( $mode ) . '" value="1"' . esc_html( $trans_checked ) . '> ' . esc_html__( 'Transparent', 'redux-framework' );
+                    echo '</label>';
+                }
+
+                echo '</div>';
+            }
+
+            // Escaping done in function.
+            // phpcs:ignore WordPress.Security.EscapeOutput
+            echo Redux_Gradient_Filters::render_preview( $data );
+
+            // Escaping done in function.
+            // phpcs:ignore WordPress.Security.EscapeOutput
+            echo Redux_Gradient_Filters::render_sliders( $data );
+        }
+
+        /**
+         * Do enqueue for each field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            Redux_Gradient_Filters::enqueue( $this->field, $this->filters_enabled );
+
+            if ( isset( $this->field['color_alpha'] ) && ( $this->field['color_alpha'] || ( $this->field['color_alpha']['from'] || $this->field['color_alpha']['to'] ) ) ) {
+                if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
+                    wp_enqueue_script( 'redux-wp-color-picker-alpha' );
+                }
+            }
+        }
+
+        /**
+         * 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_style( 'wp-color-picker' );
+
+            $min = Redux_Functions::isMin();
+
+            wp_enqueue_script(
+                'redux-field-color-gradient',
+                Redux_Core::$url . 'inc/fields/color_gradient/redux-color-gradient' . $min . '.js',
+                array( 'jquery', 'wp-color-picker', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->filters_enabled ) {
+                wp_enqueue_script(
+                    'redux-field-color-gradient',
+                    Redux_Core::$url . 'inc/fields/color_gradient/redux-color-gradient' . $min . '.js',
+                    array( 'jquery', 'wp-color-picker' ),
+                    Redux_Core::$version,
+                    true
+                );
+            }
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style( 'redux-color-picker' );
+
+                wp_enqueue_style(
+                    'redux-field-color_gradient',
+                    Redux_Core::$url . 'inc/fields/color_gradient/redux-color-gradient.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Compile CSS styling for output.
+         *
+         * @param string $data CSS data.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            return Redux_Gradient_Filters::get_output( $data );
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Color_Gradient', 'ReduxFramework_Color_Gradient' );

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

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 				'index' => '',
 			);
 
-			echo Redux_Functions_Ex::output_alpha_data( $data );  // phpcs:ignore WordPress.Security.EscapeOutput
+			echo Redux_Functions_Ex::output_alpha_data( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
 
 			echo '>';
 

Indentation +151 added lines, -151 removed lines

@@ -12,157 +12,157 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Color', false ) ) {
 
-	/**
-	 * Main Redux_color class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Color extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'transparent' => true,
-				'color_alpha' => 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 ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
-				$this->field['class'] = 'alpha-enabled';
-			}
-
-			echo '<input ';
-			echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
-			echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"';
-			echo 'id="' . esc_attr( $this->field['id'] ) . '-color"';
-			echo 'class="color-picker redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
-			echo 'type="text" value="' . esc_attr( $this->value ) . '"';
-			echo 'data-oldcolor=""';
-			echo 'data-default-color="' . ( isset( $this->field['default'] ) ? esc_attr( $this->field['default'] ) : '' ) . '"';
-
-			$data = array(
-				'field' => $this->field,
-				'index' => '',
-			);
-
-			echo Redux_Functions_Ex::output_alpha_data( $data );  // phpcs:ignore WordPress.Security.EscapeOutput
-
-			echo '>';
-
-			echo '<input type="hidden" class="redux-saved-color" id="' . esc_attr( $this->field['id'] ) . '-saved-color" value="">';
-
-			if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
-				$trans_checked = '';
-
-				if ( 'transparent' === $this->value ) {
-					$trans_checked = ' checked="checked"';
-				}
-
-				echo '<label for="' . esc_attr( $this->field['id'] ) . '-transparency" class="color-transparency-check">';
-				echo '<input type="checkbox" class="checkbox color-transparency ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '-transparency" data-id="' . esc_attr( $this->field['id'] ) . '-color" value="1"' . esc_html( $trans_checked ) . '>';
-				echo esc_html__( 'Transparent', 'redux-framework' );
-				echo '</label>';
-			}
-		}
-
-		/**
-		 * Do enqueue for each field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			if ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
-				if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
-					wp_enqueue_script( 'redux-wp-color-picker-alpha' );
-				}
-			}
-		}
-
-		/**
-		 * 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-color-picker' );
-			}
-
-			if ( ! wp_style_is( 'wp-color-picker' ) ) {
-				wp_enqueue_style( 'wp-color-picker' );
-			}
-
-			$dep_array = array( 'jquery', 'wp-color-picker', 'redux-js' );
-
-			wp_enqueue_script(
-				'redux-field-color',
-				Redux_Core::$url . 'inc/fields/color/redux-color' . Redux_Functions::is_min() . '.js',
-				$dep_array,
-				$this->timestamp,
-				true
-			);
-		}
-
-		/**
-		 * Generate CSS style (unused, but needed).
-		 *
-		 * @param string $data Field data.
-		 *
-		 * @return string
-		 */
-		public function css_style( $data ): string {
-			return '';
-		}
-
-		/**
-		 * Output CSS styling.
-		 *
-		 * @param string|null|array $style CSS style.
-		 */
-		public function output( $style = '' ) {
-			if ( ! empty( $this->value ) ) {
-				$mode = ( isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'color' );
-
-				$style = $mode . ':' . $this->value . ';';
-
-				if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
-					$css                      = Redux_Functions::parse_css( $this->field['output'], $style, $this->value );
-					$this->parent->outputCSS .= $css;
-				}
-
-				if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
-					$css                        = Redux_Functions::parse_css( $this->field['compiler'], $style, $this->value );
-					$this->parent->compilerCSS .= $css;
-				}
-			}
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+    /**
+     * Main Redux_color class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Color extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'transparent' => true,
+                'color_alpha' => 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 ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
+                $this->field['class'] = 'alpha-enabled';
+            }
+
+            echo '<input ';
+            echo 'data-id="' . esc_attr( $this->field['id'] ) . '"';
+            echo 'name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '"';
+            echo 'id="' . esc_attr( $this->field['id'] ) . '-color"';
+            echo 'class="color-picker redux-color redux-color-init ' . esc_attr( $this->field['class'] ) . '"';
+            echo 'type="text" value="' . esc_attr( $this->value ) . '"';
+            echo 'data-oldcolor=""';
+            echo 'data-default-color="' . ( isset( $this->field['default'] ) ? esc_attr( $this->field['default'] ) : '' ) . '"';
+
+            $data = array(
+                'field' => $this->field,
+                'index' => '',
+            );
+
+            echo Redux_Functions_Ex::output_alpha_data( $data );  // phpcs:ignore WordPress.Security.EscapeOutput
+
+            echo '>';
+
+            echo '<input type="hidden" class="redux-saved-color" id="' . esc_attr( $this->field['id'] ) . '-saved-color" value="">';
+
+            if ( ! isset( $this->field['transparent'] ) || false !== $this->field['transparent'] ) {
+                $trans_checked = '';
+
+                if ( 'transparent' === $this->value ) {
+                    $trans_checked = ' checked="checked"';
+                }
+
+                echo '<label for="' . esc_attr( $this->field['id'] ) . '-transparency" class="color-transparency-check">';
+                echo '<input type="checkbox" class="checkbox color-transparency ' . esc_attr( $this->field['class'] ) . '" id="' . esc_attr( $this->field['id'] ) . '-transparency" data-id="' . esc_attr( $this->field['id'] ) . '-color" value="1"' . esc_html( $trans_checked ) . '>';
+                echo esc_html__( 'Transparent', 'redux-framework' );
+                echo '</label>';
+            }
+        }
+
+        /**
+         * Do enqueue for each field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            if ( isset( $this->field['color_alpha'] ) && $this->field['color_alpha'] ) {
+                if ( ! wp_script_is( 'redux-wp-color-picker-alpha' ) ) {
+                    wp_enqueue_script( 'redux-wp-color-picker-alpha' );
+                }
+            }
+        }
+
+        /**
+         * 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-color-picker' );
+            }
+
+            if ( ! wp_style_is( 'wp-color-picker' ) ) {
+                wp_enqueue_style( 'wp-color-picker' );
+            }
+
+            $dep_array = array( 'jquery', 'wp-color-picker', 'redux-js' );
+
+            wp_enqueue_script(
+                'redux-field-color',
+                Redux_Core::$url . 'inc/fields/color/redux-color' . Redux_Functions::is_min() . '.js',
+                $dep_array,
+                $this->timestamp,
+                true
+            );
+        }
+
+        /**
+         * Generate CSS style (unused, but needed).
+         *
+         * @param string $data Field data.
+         *
+         * @return string
+         */
+        public function css_style( $data ): string {
+            return '';
+        }
+
+        /**
+         * Output CSS styling.
+         *
+         * @param string|null|array $style CSS style.
+         */
+        public function output( $style = '' ) {
+            if ( ! empty( $this->value ) ) {
+                $mode = ( isset( $this->field['mode'] ) && ! empty( $this->field['mode'] ) ? $this->field['mode'] : 'color' );
+
+                $style = $mode . ':' . $this->value . ';';
+
+                if ( ! empty( $this->field['output'] ) && is_array( $this->field['output'] ) ) {
+                    $css                      = Redux_Functions::parse_css( $this->field['output'], $style, $this->value );
+                    $this->parent->outputCSS .= $css;
+                }
+
+                if ( ! empty( $this->field['compiler'] ) && is_array( $this->field['compiler'] ) ) {
+                    $css                        = Redux_Functions::parse_css( $this->field['compiler'], $style, $this->value );
+                    $this->parent->compilerCSS .= $css;
+                }
+            }
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Color', 'ReduxFramework_Color' );

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

Spacing +5 added lines, -5 removed lines

@@ -86,10 +86,10 @@ 
 			}
 
 			$value = array(
-				'top'    => isset( $this->value[ $this->field['mode'] . '-top' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-top' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'right'  => isset( $this->value[ $this->field['mode'] . '-right' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-right' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'bottom' => isset( $this->value[ $this->field['mode'] . '-bottom' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-bottom' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'left'   => isset( $this->value[ $this->field['mode'] . '-left' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-left' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+				'top'    => isset( $this->value[$this->field['mode'] . '-top'] ) ? filter_var( $this->value[$this->field['mode'] . '-top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+				'right'  => isset( $this->value[$this->field['mode'] . '-right'] ) ? filter_var( $this->value[$this->field['mode'] . '-right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+				'bottom' => isset( $this->value[$this->field['mode'] . '-bottom'] ) ? filter_var( $this->value[$this->field['mode'] . '-bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+				'left'   => isset( $this->value[$this->field['mode'] . '-left'] ) ? filter_var( $this->value[$this->field['mode'] . '-left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
 			);
 
 			// if field units has a value and is NOT an array, then evaluate as needed.
@@ -343,7 +343,7 @@ 
 		public function css_style( $data ) {
 			$style = '';
 
-			$data = (array) $data;
+			$data = ( array ) $data;
 
 			if ( ! isset( $this->field ) ) {
 				return;

Indentation +287 added lines, -287 removed lines

@@ -11,152 +11,152 @@ 
 
 if ( ! class_exists( 'Redux_Spacing', false ) ) {
 
-	/**
-	 * Class Redux_Spacing
-	 */
-	class Redux_Spacing extends Redux_Field {
-
-		/**
-		 * Set field a value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'units'          => 'px',
-				'mode'           => 'padding',
-				'top'            => true,
-				'bottom'         => true,
-				'all'            => false,
-				'left'           => true,
-				'right'          => true,
-				'units_extended' => false,
-				'display_units'  => true,
-			);
-
-			$this->field = wp_parse_args( $this->field, $defaults );
-
-			// Set default values.
-			$defaults = array(
-				'top'    => '',
-				'right'  => '',
-				'bottom' => '',
-				'left'   => '',
-				'units'  => 'px',
-			);
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			/*
+    /**
+     * Class Redux_Spacing
+     */
+    class Redux_Spacing extends Redux_Field {
+
+        /**
+         * Set field a value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'units'          => 'px',
+                'mode'           => 'padding',
+                'top'            => true,
+                'bottom'         => true,
+                'all'            => false,
+                'left'           => true,
+                'right'          => true,
+                'units_extended' => false,
+                'display_units'  => true,
+            );
+
+            $this->field = wp_parse_args( $this->field, $defaults );
+
+            // Set default values.
+            $defaults = array(
+                'top'    => '',
+                'right'  => '',
+                'bottom' => '',
+                'left'   => '',
+                'units'  => 'px',
+            );
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            /*
 			 * Acceptable values checks.  If the passed variable doesn't pass muster, we unset them
 			 * and reset them with default values to avoid errors.
 			 */
 
-			$unit_arr = Redux_Helpers::$array_units;
-
-			$unit_check   = $unit_arr;
-			$unit_check[] = false;
-
-			// If units field has a value but is not an acceptable value, unset the variable.
-			if ( ! Redux_Helpers::array_in_array( $this->field['units'], $unit_check ) ) {
-				$this->field['units'] = 'px';
-			}
-
-			// If there is a default unit value  but is not an accepted value, unset the variable.
-			if ( ! Redux_Helpers::array_in_array( $this->value['units'], $unit_check ) ) {
-				$this->value['units'] = 'px';
-			}
-
-			if ( false === $this->field['units'] ) {
-				$this->value['units'] = '';
-			}
-
-			if ( ! in_array( $this->field['mode'], array( 'margin', 'padding' ), true ) ) {
-				if ( 'absolute' === $this->field['mode'] ) {
-					$this->field['mode'] = '';
-				} else {
-					$this->field['mode'] = 'padding';
-				}
-			}
-
-			$value = array(
-				'top'    => isset( $this->value[ $this->field['mode'] . '-top' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-top' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'right'  => isset( $this->value[ $this->field['mode'] . '-right' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-right' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'bottom' => isset( $this->value[ $this->field['mode'] . '-bottom' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-bottom' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-				'left'   => isset( $this->value[ $this->field['mode'] . '-left' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-left' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
-			);
-
-			// if field units has a value and is NOT an array, then evaluate as needed.
-			if ( ! is_array( $this->field['units'] ) ) {
-
-				// If units fields has a value and is not empty but units value does not then make units value the field value.
-				if ( '' === $this->value['units'] && ( '' !== $this->field['units'] || false === $this->field['units'] ) ) {
-					$this->value['units'] = $this->field['units'];
-
-					// If units field does NOT have a value and units value does NOT have a value, set both to blank (default?).
-				} elseif ( '' === $this->field['units'] && '' === $this->value['units'] ) {
-					$this->field['units'] = 'px';
-					$this->value['units'] = 'px';
-
-					// If units field has NO value but units value does, then set unit field to value field.
-				} elseif ( '' === $this->field['units'] && '' !== $this->value['units'] ) {
-					$this->field['units'] = $this->value['units'];
-
-					// if unit value is set and unit value doesn't equal unit field (coz who knows why)
-					// then set unit value to unit field.
-				} elseif ( '' !== $this->value['units'] && $this->field['units'] !== $this->value['units'] ) {
-					$this->value['units'] = $this->field['units'];
-				}
-
-				// do stuff based on unit field NOT set as an array.
-				// phpcs:ignore Generic.CodeAnalysis.EmptyStatement
-			} elseif ( ! empty( $this->field['units'] ) && is_array( $this->field['units'] ) ) {
-				// nothing to do here, but I'm leaving the construct just in case I have to debug this again.
-			}
-
-			if ( '' !== $this->field['units'] ) {
-				$value['units'] = $this->value['units'];
-			}
-
-			$this->value = $value;
-
-			if ( '' !== $this->field['mode'] ) {
-				$this->field['mode'] = $this->field['mode'] . '-';
-			}
-
-			if ( isset( $this->field['select2'] ) ) {
-				$this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
-			} else {
-				$this->field['select2'] = $this->select2_config;
-			}
-
-			$this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
-
-			$select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
-
-			echo '<input
+            $unit_arr = Redux_Helpers::$array_units;
+
+            $unit_check   = $unit_arr;
+            $unit_check[] = false;
+
+            // If units field has a value but is not an acceptable value, unset the variable.
+            if ( ! Redux_Helpers::array_in_array( $this->field['units'], $unit_check ) ) {
+                $this->field['units'] = 'px';
+            }
+
+            // If there is a default unit value  but is not an accepted value, unset the variable.
+            if ( ! Redux_Helpers::array_in_array( $this->value['units'], $unit_check ) ) {
+                $this->value['units'] = 'px';
+            }
+
+            if ( false === $this->field['units'] ) {
+                $this->value['units'] = '';
+            }
+
+            if ( ! in_array( $this->field['mode'], array( 'margin', 'padding' ), true ) ) {
+                if ( 'absolute' === $this->field['mode'] ) {
+                    $this->field['mode'] = '';
+                } else {
+                    $this->field['mode'] = 'padding';
+                }
+            }
+
+            $value = array(
+                'top'    => isset( $this->value[ $this->field['mode'] . '-top' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-top' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['top'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'right'  => isset( $this->value[ $this->field['mode'] . '-right' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-right' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['right'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'bottom' => isset( $this->value[ $this->field['mode'] . '-bottom' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-bottom' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['bottom'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+                'left'   => isset( $this->value[ $this->field['mode'] . '-left' ] ) ? filter_var( $this->value[ $this->field['mode'] . '-left' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) : filter_var( $this->value['left'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ),
+            );
+
+            // if field units has a value and is NOT an array, then evaluate as needed.
+            if ( ! is_array( $this->field['units'] ) ) {
+
+                // If units fields has a value and is not empty but units value does not then make units value the field value.
+                if ( '' === $this->value['units'] && ( '' !== $this->field['units'] || false === $this->field['units'] ) ) {
+                    $this->value['units'] = $this->field['units'];
+
+                    // If units field does NOT have a value and units value does NOT have a value, set both to blank (default?).
+                } elseif ( '' === $this->field['units'] && '' === $this->value['units'] ) {
+                    $this->field['units'] = 'px';
+                    $this->value['units'] = 'px';
+
+                    // If units field has NO value but units value does, then set unit field to value field.
+                } elseif ( '' === $this->field['units'] && '' !== $this->value['units'] ) {
+                    $this->field['units'] = $this->value['units'];
+
+                    // if unit value is set and unit value doesn't equal unit field (coz who knows why)
+                    // then set unit value to unit field.
+                } elseif ( '' !== $this->value['units'] && $this->field['units'] !== $this->value['units'] ) {
+                    $this->value['units'] = $this->field['units'];
+                }
+
+                // do stuff based on unit field NOT set as an array.
+                // phpcs:ignore Generic.CodeAnalysis.EmptyStatement
+            } elseif ( ! empty( $this->field['units'] ) && is_array( $this->field['units'] ) ) {
+                // nothing to do here, but I'm leaving the construct just in case I have to debug this again.
+            }
+
+            if ( '' !== $this->field['units'] ) {
+                $value['units'] = $this->value['units'];
+            }
+
+            $this->value = $value;
+
+            if ( '' !== $this->field['mode'] ) {
+                $this->field['mode'] = $this->field['mode'] . '-';
+            }
+
+            if ( isset( $this->field['select2'] ) ) {
+                $this->field['select2'] = wp_parse_args( $this->field['select2'], $this->select2_config );
+            } else {
+                $this->field['select2'] = $this->select2_config;
+            }
+
+            $this->field['select2'] = Redux_Functions::sanitize_camel_case_array_keys( $this->field['select2'] );
+
+            $select2_data = Redux_Functions::create_data_string( $this->field['select2'] );
+
+            echo '<input
 					type="hidden"
 					id="' . esc_attr( $this->field['id'] ) . '-units"
 					name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[units]"
 					class="field-units" value="' . esc_attr( $this->value['units'] ) . '">';
 
-			if ( true === $this->field['all'] ) {
-				$this->field['top']    = true;
-				$this->field['right']  = true;
-				$this->field['bottom'] = true;
-				$this->field['left']   = true;
+            if ( true === $this->field['all'] ) {
+                $this->field['top']    = true;
+                $this->field['right']  = true;
+                $this->field['bottom'] = true;
+                $this->field['left']   = true;
 
-				$this->value['bottom'] = $this->value['top'];
-				$this->value['left']   = $this->value['top'];
-				$this->value['right']  = $this->value['top'];
+                $this->value['bottom'] = $this->value['top'];
+                $this->value['left']   = $this->value['top'];
+                $this->value['right']  = $this->value['top'];
 
-				echo '<div class="field-spacing-input input-prepend">
+                echo '<div class="field-spacing-input input-prepend">
                         <span class="add-on">
                             <i class="el el-fullscreen icon-large"></i>
                         </span>
@@ -169,54 +169,54 @@ 
                             value="' . esc_attr( $this->value['top'] ) . '"
                         >
                       </div>';
-			}
+            }
 
-			if ( true === $this->field['top'] ) {
-				echo '<input
+            if ( true === $this->field['top'] ) {
+                echo '<input
                         type="hidden"
                         class="redux-spacing-value"
                         id="' . esc_attr( $this->field['id'] ) . '-top-hidden"
                         name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $this->field['mode'] ) . 'top]"
                         value="' . esc_attr( $this->value['top'] ) . ( ! empty( $this->value['top'] ) ? esc_attr( $this->value['units'] ) : '' ) . '"
                       >';
-			}
+            }
 
-			if ( true === $this->field['right'] ) {
-				echo '<input
+            if ( true === $this->field['right'] ) {
+                echo '<input
                         type="hidden"
                         class="redux-spacing-value"
                         id="' . esc_attr( $this->field['id'] ) . '-right-hidden"
                         name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $this->field['mode'] ) . 'right]"
                         value="' . esc_attr( $this->value['right'] ) . ( ! empty( $this->value['right'] ) ? esc_attr( $this->value['units'] ) : '' ) . '"
                       >';
-			}
+            }
 
-			if ( true === $this->field['bottom'] ) {
-				echo '<input
+            if ( true === $this->field['bottom'] ) {
+                echo '<input
                         type="hidden"
                         class="redux-spacing-value"
                         id="' . esc_attr( $this->field['id'] ) . '-bottom-hidden"
                         name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $this->field['mode'] ) . 'bottom]"
                         value="' . esc_attr( $this->value['bottom'] ) . ( ! empty( $this->value['bottom'] ) ? esc_attr( $this->value['units'] ) : '' ) . '"
                       >';
-			}
+            }
 
-			if ( true === $this->field['left'] ) {
-				echo '<input
+            if ( true === $this->field['left'] ) {
+                echo '<input
                         type="hidden"
                         class="redux-spacing-value"
                         id="' . esc_attr( $this->field['id'] ) . '-left-hidden"
                         name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] . '[' . $this->field['mode'] ) . 'left]"
                         value="' . esc_attr( $this->value['left'] ) . ( ! empty( $this->value['left'] ) ? esc_attr( $this->value['units'] ) : '' ) . '"
                       >';
-			}
-
-			if ( false === $this->field['all'] ) {
-				/**
-				 * Top
-				 * */
-				if ( true === $this->field['top'] ) {
-					echo '<div class="field-spacing-input input-prepend">
+            }
+
+            if ( false === $this->field['all'] ) {
+                /**
+                 * Top
+                 * */
+                if ( true === $this->field['top'] ) {
+                    echo '<div class="field-spacing-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-up icon-large"></i>
                             </span>
@@ -227,13 +227,13 @@ 
                                    rel="' . esc_attr( $this->field['id'] ) . '-top-hidden"
                                    value="' . esc_attr( $this->value['top'] ) . '"/>
                         </div>';
-				}
+                }
 
-				/**
-				 * Right
-				 * */
-				if ( true === $this->field['right'] ) {
-					echo '<div class="field-spacing-input input-prepend">
+                /**
+                 * Right
+                 * */
+                if ( true === $this->field['right'] ) {
+                    echo '<div class="field-spacing-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-right icon-large"></i>
                             </span>
@@ -244,13 +244,13 @@ 
                                    rel="' . esc_attr( $this->field['id'] ) . '-right-hidden"
                                    value="' . esc_attr( $this->value['right'] ) . '"/>
                         </div>';
-				}
+                }
 
-				/**
-				 * Bottom
-				 * */
-				if ( true === $this->field['bottom'] ) {
-					echo '<div class="field-spacing-input input-prepend">
+                /**
+                 * Bottom
+                 * */
+                if ( true === $this->field['bottom'] ) {
+                    echo '<div class="field-spacing-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-down icon-large"></i>
                             </span>
@@ -261,13 +261,13 @@ 
                                    rel="' . esc_attr( $this->field['id'] ) . '-bottom-hidden"
                                    value="' . esc_attr( $this->value['bottom'] ) . '">
                         </div>';
-				}
+                }
 
-				/**
-				 * Left
-				 * */
-				if ( true === $this->field['left'] ) {
-					echo '<div class="field-spacing-input input-prepend">
+                /**
+                 * Left
+                 * */
+                if ( true === $this->field['left'] ) {
+                    echo '<div class="field-spacing-input input-prepend">
                             <span class="add-on">
                                 <i class="el el-arrow-left icon-large"></i>
                             </span>
@@ -278,120 +278,120 @@ 
                                    rel="' . esc_attr( $this->field['id'] ) . '-left-hidden"
                                    value="' . esc_attr( $this->value['left'] ) . '"/>
                         </div>';
-				}
-			}
-
-			/**
-			 * Units
-			 * */
-			if ( false !== $this->field['units'] && true === $this->field['display_units'] ) {
-				echo '<div class="select_wrapper spacing-units" original-title="' . esc_html__( 'Units', 'redux-framework' ) . '">';
-				echo '<select data-placeholder="' . esc_html__( 'Units', 'redux-framework' ) . '" class="redux-spacing redux-spacing-units select ' . esc_attr( $this->field['class'] ) . '" original-title="' . esc_html__( 'Units', 'redux-framework' ) . '" id="' . esc_attr( $this->field['id'] ) . '_units"' . esc_attr( $select2_data ) . '>';
-
-				if ( $this->field['units_extended'] ) {
-					$test_units = $unit_arr;
-				} else {
-					$test_units = array( 'px', 'em', 'pt', 'rem', '%' );
-				}
-
-				if ( '' !== $this->field['units'] || is_array( $this->field['units'] ) ) {
-					$test_units = $this->field['units'];
-				}
-
-				echo '<option></option>';
-
-				if ( ! is_array( $this->field['units'] ) ) {
-					echo '<option value="' . esc_attr( $this->field['units'] ) . '" selected="selected">' . esc_attr( $this->field['units'] ) . '</option>';
-				} else {
-					foreach ( $test_units as $a_unit ) {
-						echo '<option value="' . esc_attr( $a_unit ) . '" ' . selected( $this->value['units'], $a_unit, false ) . '>' . esc_html( $a_unit ) . '</option>';
-					}
-				}
-
-				echo '</select></div>';
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function enqueue() {
-			wp_enqueue_style( 'select2-css' );
-
-			wp_enqueue_script(
-				'redux-field-spacing',
-				Redux_Core::$url . 'inc/fields/spacing/redux-spacing' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'select2-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-spacing',
-					Redux_Core::$url . 'inc/fields/spacing/redux-spacing.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-
-		/**
-		 * Compile CSS data for output.
-		 *
-		 * @param string $data CSS data.
-		 *
-		 * @return string|void
-		 */
-		public function css_style( $data ) {
-			$style = '';
-
-			$data = (array) $data;
-
-			if ( ! isset( $this->field ) ) {
-				return;
-			}
-
-			if ( ! in_array( $this->field['mode'], array( 'padding', 'absolute', 'margin' ), true ) ) {
-				$this->field['mode'] = 'padding';
-			}
-
-			$units = $data['units'] ?? '';
-
-			foreach ( $data as $key => $value ) {
-				if ( 'units' === $key ) {
-					continue;
-				}
-				$the_units = $units;
-
-				// Strip off any alpha for is_numeric test - kp.
-				$num_no_alpha = preg_replace( '/[^\d.-]/', '', $value );
-				if ( empty( $the_units ) ) {
-					$the_units = str_replace( $num_no_alpha, '', $value );
-				}
-
-				// Output if it's a numeric entry.
-				if ( isset( $value ) && is_numeric( $num_no_alpha ) ) {
-					$style .= $key . ':' . $num_no_alpha . $the_units . ';';
-				}
-			}
-
-			return $style;
-		}
-
-		/**
-		 * Enable output_variables to be generated.
-		 *
-		 * @since       4.0.3
-		 * @return void
-		 */
-		public function output_variables() {
-			// No code needed, just defining the method is enough.
-		}
-	}
+                }
+            }
+
+            /**
+             * Units
+             * */
+            if ( false !== $this->field['units'] && true === $this->field['display_units'] ) {
+                echo '<div class="select_wrapper spacing-units" original-title="' . esc_html__( 'Units', 'redux-framework' ) . '">';
+                echo '<select data-placeholder="' . esc_html__( 'Units', 'redux-framework' ) . '" class="redux-spacing redux-spacing-units select ' . esc_attr( $this->field['class'] ) . '" original-title="' . esc_html__( 'Units', 'redux-framework' ) . '" id="' . esc_attr( $this->field['id'] ) . '_units"' . esc_attr( $select2_data ) . '>';
+
+                if ( $this->field['units_extended'] ) {
+                    $test_units = $unit_arr;
+                } else {
+                    $test_units = array( 'px', 'em', 'pt', 'rem', '%' );
+                }
+
+                if ( '' !== $this->field['units'] || is_array( $this->field['units'] ) ) {
+                    $test_units = $this->field['units'];
+                }
+
+                echo '<option></option>';
+
+                if ( ! is_array( $this->field['units'] ) ) {
+                    echo '<option value="' . esc_attr( $this->field['units'] ) . '" selected="selected">' . esc_attr( $this->field['units'] ) . '</option>';
+                } else {
+                    foreach ( $test_units as $a_unit ) {
+                        echo '<option value="' . esc_attr( $a_unit ) . '" ' . selected( $this->value['units'], $a_unit, false ) . '>' . esc_html( $a_unit ) . '</option>';
+                    }
+                }
+
+                echo '</select></div>';
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function enqueue() {
+            wp_enqueue_style( 'select2-css' );
+
+            wp_enqueue_script(
+                'redux-field-spacing',
+                Redux_Core::$url . 'inc/fields/spacing/redux-spacing' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'select2-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-spacing',
+                    Redux_Core::$url . 'inc/fields/spacing/redux-spacing.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+
+        /**
+         * Compile CSS data for output.
+         *
+         * @param string $data CSS data.
+         *
+         * @return string|void
+         */
+        public function css_style( $data ) {
+            $style = '';
+
+            $data = (array) $data;
+
+            if ( ! isset( $this->field ) ) {
+                return;
+            }
+
+            if ( ! in_array( $this->field['mode'], array( 'padding', 'absolute', 'margin' ), true ) ) {
+                $this->field['mode'] = 'padding';
+            }
+
+            $units = $data['units'] ?? '';
+
+            foreach ( $data as $key => $value ) {
+                if ( 'units' === $key ) {
+                    continue;
+                }
+                $the_units = $units;
+
+                // Strip off any alpha for is_numeric test - kp.
+                $num_no_alpha = preg_replace( '/[^\d.-]/', '', $value );
+                if ( empty( $the_units ) ) {
+                    $the_units = str_replace( $num_no_alpha, '', $value );
+                }
+
+                // Output if it's a numeric entry.
+                if ( isset( $value ) && is_numeric( $num_no_alpha ) ) {
+                    $style .= $key . ':' . $num_no_alpha . $the_units . ';';
+                }
+            }
+
+            return $style;
+        }
+
+        /**
+         * Enable output_variables to be generated.
+         *
+         * @since       4.0.3
+         * @return void
+         */
+        public function output_variables() {
+            // No code needed, just defining the method is enough.
+        }
+    }
 }
 
 class_alias( 'Redux_Spacing', 'ReduxFramework_Spacing' );

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

Spacing +3 added lines, -3 removed lines

@@ -144,11 +144,11 @@ 
 
 						foreach ( $ex_arr as $ext ) {
 							if ( in_array( $ext, $lib_array, true ) ) {
-								$json_arr[ $ext ] = $type;
+								$json_arr[$ext] = $type;
 							}
 						}
 					} elseif ( in_array( $ext, $lib_array, true ) ) {
-						$json_arr[ $ext ] = $type;
+						$json_arr[$ext] = $type;
 					}
 				}
 
@@ -301,7 +301,7 @@ 
 		 * @return string|null
 		 */
 		public function css_style( $data ): string {
-			$data = (array) $data;
+			$data = ( array ) $data;
 
 			if ( isset( $data['filter'] ) ) {
 				return $this->get_filter_css( $data['filter'] );

Indentation +333 added lines, -333 removed lines

@@ -12,339 +12,339 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Media', false ) ) {
 
-	/**
-	 * Main Redux_media class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Media extends Redux_Field {
-
-		/**
-		 * Flag to filter file types.
-		 *
-		 * @var bool $filters_enabled .
-		 */
-		private $filters_enabled = false;
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			// No errors please.
-			$defaults = array(
-				'id'        => '',
-				'url'       => '',
-				'width'     => '',
-				'height'    => '',
-				'thumbnail' => '',
-				'filter'    => array(
-					'grayscale'  => array(
-						'checked' => false,
-						'value'   => 0,
-					),
-					'blur'       => array(
-						'checked' => false,
-						'value'   => 0,
-					),
-					'sepia'      => array(
-						'checked' => false,
-						'value'   => 0,
-					),
-					'saturate'   => array(
-						'checked' => false,
-						'value'   => 1,
-					),
-					'opacity'    => array(
-						'checked' => false,
-						'value'   => 1,
-					),
-					'brightness' => array(
-						'checked' => false,
-						'value'   => 100,
-					),
-					'contrast'   => array(
-						'checked' => false,
-						'value'   => 100,
-					),
-					'hue-rotate' => array(
-						'checked' => false,
-						'value'   => 0,
-					),
-					'invert'     => array(
-						'checked' => false,
-						'value'   => 0,
-					),
-				),
-			);
-
-			// Since value sub-arrays do not get parsed in wp_parse_args!
-			$this->value = Redux_Functions::parse_args( $this->value, $defaults );
-
-			$defaults = array(
-				'mode'         => 'image',
-				'preview'      => true,
-				'preview_size' => 'thumbnail',
-				'url'          => true,
-				'alt'          => '',
-				'placeholder'  => esc_html__( 'No media selected', 'redux-framework' ),
-				'readonly'     => true,
-				'class'        => '',
-				'filter'       => array(
-					'grayscale'  => false,
-					'blur'       => false,
-					'sepia'      => false,
-					'saturate'   => false,
-					'opacity'    => false,
-					'brightness' => false,
-					'contrast'   => false,
-					'hue-rotate' => false,
-					'invert'     => false,
-				),
-			);
-
-			$this->field = Redux_Functions::parse_args( $this->field, $defaults );
-
-			if ( false === $this->field['mode'] ) {
-				$this->field['mode'] = 0;
-			}
-
-			include_once Redux_Core::$dir . 'inc/lib/image-filters/class-redux-image-filters.php';
-			if ( in_array( true, $this->field['filter'], true ) ) {
-				$this->filters_enabled = true;
-				include_once Redux_Core::$dir . 'inc/lib/image-filters/class-redux-image-filters.php';
-			}
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-			if ( ! isset( $this->field['library_filter'] ) ) {
-				$lib_filter = '';
-			} else {
-				if ( ! is_array( $this->field['library_filter'] ) ) {
-					$this->field['library_filter'] = array( $this->field['library_filter'] );
-				}
-
-				$mime_types = get_allowed_mime_types();
-
-				$lib_array = $this->field['library_filter'];
-
-				$json_arr = array();
-
-				// Enum mime types.
-				foreach ( $mime_types as $ext => $type ) {
-					if ( strpos( $ext, '|' ) ) {
-						$ex_arr = explode( '|', $ext );
-
-						foreach ( $ex_arr as $ext ) {
-							if ( in_array( $ext, $lib_array, true ) ) {
-								$json_arr[ $ext ] = $type;
-							}
-						}
-					} elseif ( in_array( $ext, $lib_array, true ) ) {
-						$json_arr[ $ext ] = $type;
-					}
-				}
-
-				$lib_filter = rawurlencode( wp_json_encode( $json_arr ) );
-			}
-
-			if ( empty( $this->value ) && ! empty( $this->field['default'] ) ) { // If there are standard values and value is empty.
-				if ( is_array( $this->field['default'] ) ) {
-					if ( ! empty( $this->field['default']['id'] ) ) {
-						$this->value['id'] = $this->field['default']['id'];
-					}
-
-					if ( ! empty( $this->field['default']['url'] ) ) {
-						$this->value['url'] = $this->field['default']['url'];
-					}
-				} elseif ( is_numeric( $this->field['default'] ) ) {
-					// Check if it's an attachment ID.
-					$this->value['id'] = $this->field['default'];
-				} else { // Must be a URL.
-					$this->value['url'] = $this->field['default'];
-				}
-			}
-
-			if ( empty( $this->value['url'] ) && ! empty( $this->value['id'] ) ) {
-				$img                   = wp_get_attachment_image_src( $this->value['id'], 'full' );
-				$this->value['url']    = $img[0];
-				$this->value['width']  = $img[1];
-				$this->value['height'] = $img[2];
-			}
-
-			$hide = 'hide ';
-
-			if ( false === $this->field['preview'] ) {
-				$this->field['class'] .= ' noPreview';
-			}
-
-			if ( ( ! empty( $this->field['url'] ) && true === $this->field['url'] ) || false === $this->field['preview'] ) {
-				$hide = '';
-			}
-
-			$read_only = '';
-			if ( $this->field['readonly'] ) {
-				$read_only = ' readonly="readonly"';
-			}
-
-			echo '<input placeholder="' . esc_attr( $this->field['placeholder'] ) . '" type="text" class="' . esc_attr( $hide ) . 'upload large-text ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[url]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][url]" value="' . esc_attr( $this->value['url'] ) . '"' . esc_html( $read_only ) . '/>';
-			echo '<input type="hidden" class="data" data-preview-size="' . esc_attr( $this->field['preview_size'] ) . '" data-mode="' . esc_attr( $this->field['mode'] ) . '" />';
-			echo '<input type="hidden" class="library-filter" data-lib-filter="' . $lib_filter . '" />'; // phpcs:ignore WordPress.Security.EscapeOutput
-			echo '<input type="hidden" class="upload-id ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[id]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][id]" value="' . esc_attr( $this->value['id'] ) . '" />';
-			echo '<input type="hidden" class="upload-height" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[height]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][height]" value="' . esc_attr( $this->value['height'] ) . '" />';
-			echo '<input type="hidden" class="upload-width" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[width]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][width]" value="' . esc_attr( $this->value['width'] ) . '" />';
-			echo '<input type="hidden" class="upload-thumbnail" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[thumbnail]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][thumbnail]" value="' . esc_attr( $this->value['thumbnail'] ) . '" />';
-
-			// Preview.
-			$hide = '';
-
-			if ( ( false === $this->field['preview'] ) || empty( $this->value['url'] ) ) {
-				$hide .= 'display:none;';
-			}
-
-			if ( empty( $this->value['thumbnail'] ) && ! empty( $this->value['url'] ) ) { // Just in case.
-				if ( ! empty( $this->value['id'] ) ) {
-					$image = wp_get_attachment_image_src( $this->value['id'], array( 150, 150 ) );
-
-					if ( empty( $image[0] ) ) {
-						$this->value['thumbnail'] = $this->value['url'];
-					} else {
-						$this->value['thumbnail'] = $image[0];
-					}
-				} else {
-					$this->value['thumbnail'] = $this->value['url'];
-				}
-			}
-
-			$css = $this->get_filter_css( $this->value['filter'] );
-
-			$alt = wp_prepare_attachment_for_js( $this->value['id'] );
-			$alt = $alt['alt'] ?? '';
-
-			echo '<div class="screenshot" style="' . esc_attr( $hide ) . '">';
-			echo '<a class="of-uploaded-image" href="' . esc_url( $this->value['url'] ) . '" target="_blank">';
-			echo '<img class="redux-option-image" id="image_' . esc_attr( $this->field['id'] ) . '" src="' . esc_url( $this->value['thumbnail'] ) . '" alt="' . esc_attr( $alt ) . '" target="_blank" rel="external" style="' . $css . '" />'; // phpcs:ignore WordPress.Security.EscapeOutput
-			echo '</a>';
-			echo '</div>';
-
-			// Upload controls DIV.
-			echo '<div class="upload_button_div">';
-
-			// If the user has WP3.5+ show upload/remove button.
-			echo '<span class="button media_upload_button" id="' . esc_attr( $this->field['id'] ) . '-media">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
-
-			$hide = '';
-			if ( empty( $this->value['url'] ) || '' === $this->value['url'] ) {
-				$hide = ' hide';
-			}
-
-			echo '<span class="button remove-image' . esc_attr( $hide ) . '" id="reset_' . esc_attr( $this->field['id'] ) . '" rel="' . esc_attr( $this->field['id'] ) . '">' . esc_html__( 'Remove', 'redux-framework' ) . '</span>';
-			echo '</div>';
-
-			if ( $this->filters_enabled ) {
-				$data = array(
-					'parent' => $this->parent,
-					'field'  => $this->field,
-					'value'  => $this->value,
-					'mode'   => 'media',
-				);
-
-				echo Redux_Image_Filters::render( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
-			}
-		}
-
-		/**
-		 * Do enqueue for each field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			Redux_Image_Filters::enqueue( $this->filters_enabled );
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or CSS define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			if ( function_exists( 'wp_enqueue_media' ) ) {
-				wp_enqueue_media();
-			} else {
-				wp_enqueue_script( 'media-upload' );
-			}
-
-			wp_enqueue_script(
-				'redux-field-media',
-				Redux_Core::$url . 'assets/js/media/media' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style( 'redux-field-media' );
-			}
-		}
-
-		/**
-		 * Compile CSS styles for output.
-		 *
-		 * @param string $data CSS data.
-		 *
-		 * @return string|null
-		 */
-		public function css_style( $data ): string {
-			$data = (array) $data;
-
-			if ( isset( $data['filter'] ) ) {
-				return $this->get_filter_css( $data['filter'] );
-			}
-
-			return '';
-		}
-
-		/**
-		 * Get filter CSS.
-		 *
-		 * @param array $data Data.
-		 *
-		 * @return string
-		 */
-		private function get_filter_css( array $data ): string {
-			$css = '';
-
-			foreach ( $data as $filter => $values ) {
-				$checked = filter_var( $values['checked'], FILTER_VALIDATE_BOOLEAN );
-
-				if ( true === $checked ) {
-					$unit = Redux_Image_Filters::get_filter_unit( $filter );
-
-					if ( '&deg;' === $unit ) {
-						$unit = 'deg';
-					}
-
-					$css .= ' ' . $filter . '(' . $values['value'] . $unit . ')';
-				}
-			}
-
-			if ( '' !== $css ) {
-				return 'filter:' . $css . ';-webkit-filter:' . $css . ';';
-			}
-
-			return '';
-		}
-	}
+    /**
+     * Main Redux_media class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Media extends Redux_Field {
+
+        /**
+         * Flag to filter file types.
+         *
+         * @var bool $filters_enabled .
+         */
+        private $filters_enabled = false;
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            // No errors please.
+            $defaults = array(
+                'id'        => '',
+                'url'       => '',
+                'width'     => '',
+                'height'    => '',
+                'thumbnail' => '',
+                'filter'    => array(
+                    'grayscale'  => array(
+                        'checked' => false,
+                        'value'   => 0,
+                    ),
+                    'blur'       => array(
+                        'checked' => false,
+                        'value'   => 0,
+                    ),
+                    'sepia'      => array(
+                        'checked' => false,
+                        'value'   => 0,
+                    ),
+                    'saturate'   => array(
+                        'checked' => false,
+                        'value'   => 1,
+                    ),
+                    'opacity'    => array(
+                        'checked' => false,
+                        'value'   => 1,
+                    ),
+                    'brightness' => array(
+                        'checked' => false,
+                        'value'   => 100,
+                    ),
+                    'contrast'   => array(
+                        'checked' => false,
+                        'value'   => 100,
+                    ),
+                    'hue-rotate' => array(
+                        'checked' => false,
+                        'value'   => 0,
+                    ),
+                    'invert'     => array(
+                        'checked' => false,
+                        'value'   => 0,
+                    ),
+                ),
+            );
+
+            // Since value sub-arrays do not get parsed in wp_parse_args!
+            $this->value = Redux_Functions::parse_args( $this->value, $defaults );
+
+            $defaults = array(
+                'mode'         => 'image',
+                'preview'      => true,
+                'preview_size' => 'thumbnail',
+                'url'          => true,
+                'alt'          => '',
+                'placeholder'  => esc_html__( 'No media selected', 'redux-framework' ),
+                'readonly'     => true,
+                'class'        => '',
+                'filter'       => array(
+                    'grayscale'  => false,
+                    'blur'       => false,
+                    'sepia'      => false,
+                    'saturate'   => false,
+                    'opacity'    => false,
+                    'brightness' => false,
+                    'contrast'   => false,
+                    'hue-rotate' => false,
+                    'invert'     => false,
+                ),
+            );
+
+            $this->field = Redux_Functions::parse_args( $this->field, $defaults );
+
+            if ( false === $this->field['mode'] ) {
+                $this->field['mode'] = 0;
+            }
+
+            include_once Redux_Core::$dir . 'inc/lib/image-filters/class-redux-image-filters.php';
+            if ( in_array( true, $this->field['filter'], true ) ) {
+                $this->filters_enabled = true;
+                include_once Redux_Core::$dir . 'inc/lib/image-filters/class-redux-image-filters.php';
+            }
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+            if ( ! isset( $this->field['library_filter'] ) ) {
+                $lib_filter = '';
+            } else {
+                if ( ! is_array( $this->field['library_filter'] ) ) {
+                    $this->field['library_filter'] = array( $this->field['library_filter'] );
+                }
+
+                $mime_types = get_allowed_mime_types();
+
+                $lib_array = $this->field['library_filter'];
+
+                $json_arr = array();
+
+                // Enum mime types.
+                foreach ( $mime_types as $ext => $type ) {
+                    if ( strpos( $ext, '|' ) ) {
+                        $ex_arr = explode( '|', $ext );
+
+                        foreach ( $ex_arr as $ext ) {
+                            if ( in_array( $ext, $lib_array, true ) ) {
+                                $json_arr[ $ext ] = $type;
+                            }
+                        }
+                    } elseif ( in_array( $ext, $lib_array, true ) ) {
+                        $json_arr[ $ext ] = $type;
+                    }
+                }
+
+                $lib_filter = rawurlencode( wp_json_encode( $json_arr ) );
+            }
+
+            if ( empty( $this->value ) && ! empty( $this->field['default'] ) ) { // If there are standard values and value is empty.
+                if ( is_array( $this->field['default'] ) ) {
+                    if ( ! empty( $this->field['default']['id'] ) ) {
+                        $this->value['id'] = $this->field['default']['id'];
+                    }
+
+                    if ( ! empty( $this->field['default']['url'] ) ) {
+                        $this->value['url'] = $this->field['default']['url'];
+                    }
+                } elseif ( is_numeric( $this->field['default'] ) ) {
+                    // Check if it's an attachment ID.
+                    $this->value['id'] = $this->field['default'];
+                } else { // Must be a URL.
+                    $this->value['url'] = $this->field['default'];
+                }
+            }
+
+            if ( empty( $this->value['url'] ) && ! empty( $this->value['id'] ) ) {
+                $img                   = wp_get_attachment_image_src( $this->value['id'], 'full' );
+                $this->value['url']    = $img[0];
+                $this->value['width']  = $img[1];
+                $this->value['height'] = $img[2];
+            }
+
+            $hide = 'hide ';
+
+            if ( false === $this->field['preview'] ) {
+                $this->field['class'] .= ' noPreview';
+            }
+
+            if ( ( ! empty( $this->field['url'] ) && true === $this->field['url'] ) || false === $this->field['preview'] ) {
+                $hide = '';
+            }
+
+            $read_only = '';
+            if ( $this->field['readonly'] ) {
+                $read_only = ' readonly="readonly"';
+            }
+
+            echo '<input placeholder="' . esc_attr( $this->field['placeholder'] ) . '" type="text" class="' . esc_attr( $hide ) . 'upload large-text ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[url]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][url]" value="' . esc_attr( $this->value['url'] ) . '"' . esc_html( $read_only ) . '/>';
+            echo '<input type="hidden" class="data" data-preview-size="' . esc_attr( $this->field['preview_size'] ) . '" data-mode="' . esc_attr( $this->field['mode'] ) . '" />';
+            echo '<input type="hidden" class="library-filter" data-lib-filter="' . $lib_filter . '" />'; // phpcs:ignore WordPress.Security.EscapeOutput
+            echo '<input type="hidden" class="upload-id ' . esc_attr( $this->field['class'] ) . '" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[id]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][id]" value="' . esc_attr( $this->value['id'] ) . '" />';
+            echo '<input type="hidden" class="upload-height" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[height]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][height]" value="' . esc_attr( $this->value['height'] ) . '" />';
+            echo '<input type="hidden" class="upload-width" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[width]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][width]" value="' . esc_attr( $this->value['width'] ) . '" />';
+            echo '<input type="hidden" class="upload-thumbnail" name="' . esc_attr( $this->field['name'] . $this->field['name_suffix'] ) . '[thumbnail]" id="' . esc_attr( $this->parent->args['opt_name'] ) . '[' . esc_attr( $this->field['id'] ) . '][thumbnail]" value="' . esc_attr( $this->value['thumbnail'] ) . '" />';
+
+            // Preview.
+            $hide = '';
+
+            if ( ( false === $this->field['preview'] ) || empty( $this->value['url'] ) ) {
+                $hide .= 'display:none;';
+            }
+
+            if ( empty( $this->value['thumbnail'] ) && ! empty( $this->value['url'] ) ) { // Just in case.
+                if ( ! empty( $this->value['id'] ) ) {
+                    $image = wp_get_attachment_image_src( $this->value['id'], array( 150, 150 ) );
+
+                    if ( empty( $image[0] ) ) {
+                        $this->value['thumbnail'] = $this->value['url'];
+                    } else {
+                        $this->value['thumbnail'] = $image[0];
+                    }
+                } else {
+                    $this->value['thumbnail'] = $this->value['url'];
+                }
+            }
+
+            $css = $this->get_filter_css( $this->value['filter'] );
+
+            $alt = wp_prepare_attachment_for_js( $this->value['id'] );
+            $alt = $alt['alt'] ?? '';
+
+            echo '<div class="screenshot" style="' . esc_attr( $hide ) . '">';
+            echo '<a class="of-uploaded-image" href="' . esc_url( $this->value['url'] ) . '" target="_blank">';
+            echo '<img class="redux-option-image" id="image_' . esc_attr( $this->field['id'] ) . '" src="' . esc_url( $this->value['thumbnail'] ) . '" alt="' . esc_attr( $alt ) . '" target="_blank" rel="external" style="' . $css . '" />'; // phpcs:ignore WordPress.Security.EscapeOutput
+            echo '</a>';
+            echo '</div>';
+
+            // Upload controls DIV.
+            echo '<div class="upload_button_div">';
+
+            // If the user has WP3.5+ show upload/remove button.
+            echo '<span class="button media_upload_button" id="' . esc_attr( $this->field['id'] ) . '-media">' . esc_html__( 'Upload', 'redux-framework' ) . '</span>';
+
+            $hide = '';
+            if ( empty( $this->value['url'] ) || '' === $this->value['url'] ) {
+                $hide = ' hide';
+            }
+
+            echo '<span class="button remove-image' . esc_attr( $hide ) . '" id="reset_' . esc_attr( $this->field['id'] ) . '" rel="' . esc_attr( $this->field['id'] ) . '">' . esc_html__( 'Remove', 'redux-framework' ) . '</span>';
+            echo '</div>';
+
+            if ( $this->filters_enabled ) {
+                $data = array(
+                    'parent' => $this->parent,
+                    'field'  => $this->field,
+                    'value'  => $this->value,
+                    'mode'   => 'media',
+                );
+
+                echo Redux_Image_Filters::render( $data ); // phpcs:ignore WordPress.Security.EscapeOutput
+            }
+        }
+
+        /**
+         * Do enqueue for each field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            Redux_Image_Filters::enqueue( $this->filters_enabled );
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or CSS define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( function_exists( 'wp_enqueue_media' ) ) {
+                wp_enqueue_media();
+            } else {
+                wp_enqueue_script( 'media-upload' );
+            }
+
+            wp_enqueue_script(
+                'redux-field-media',
+                Redux_Core::$url . 'assets/js/media/media' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style( 'redux-field-media' );
+            }
+        }
+
+        /**
+         * Compile CSS styles for output.
+         *
+         * @param string $data CSS data.
+         *
+         * @return string|null
+         */
+        public function css_style( $data ): string {
+            $data = (array) $data;
+
+            if ( isset( $data['filter'] ) ) {
+                return $this->get_filter_css( $data['filter'] );
+            }
+
+            return '';
+        }
+
+        /**
+         * Get filter CSS.
+         *
+         * @param array $data Data.
+         *
+         * @return string
+         */
+        private function get_filter_css( array $data ): string {
+            $css = '';
+
+            foreach ( $data as $filter => $values ) {
+                $checked = filter_var( $values['checked'], FILTER_VALIDATE_BOOLEAN );
+
+                if ( true === $checked ) {
+                    $unit = Redux_Image_Filters::get_filter_unit( $filter );
+
+                    if ( '&deg;' === $unit ) {
+                        $unit = 'deg';
+                    }
+
+                    $css .= ' ' . $filter . '(' . $values['value'] . $unit . ')';
+                }
+            }
+
+            if ( '' !== $css ) {
+                return 'filter:' . $css . ';-webkit-filter:' . $css . ';';
+            }
+
+            return '';
+        }
+    }
 }
 
 class_alias( 'Redux_Media', 'ReduxFramework_Media' );

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

Spacing +2 added lines, -2 removed lines

@@ -40,8 +40,8 @@
 				'hour-max'      => 23,
 				'minute-min'    => 0,
 				'minute-max'    => 59,
-				'date-min'      => - 1,
-				'date-max'      => - 1,
+				'date-min'      => -1,
+				'date-max'      => -1,
 			);
 
 			$this->field = wp_parse_args( $this->field, $defaults );

Indentation +214 added lines, -214 removed lines

@@ -12,147 +12,147 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Datetime', false ) ) {
 
-	/**
-	 * Class Redux_Datetime
-	 */
-	class Redux_Datetime extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'date-format'   => 'mm-dd-yy',
-				'time-format'   => 'hh:mm TT z',
-				'split'         => false,
-				'separator'     => ' ',
-				'date-picker'   => true,
-				'time-picker'   => true,
-				'control-type'  => 'slider',
-				'num-of-months' => 1,
-
-				// DO NOT CHANGE THESE!!!!
-				// It will make this file's JavaScript sister
-				// cry like a deflowered virgin on prom night.
-				'timezone-list' => null,
-				'timezone'      => '0',
-				'hour-min'      => 0,
-				'hour-max'      => 23,
-				'minute-min'    => 0,
-				'minute-max'    => 59,
-				'date-min'      => - 1,
-				'date-max'      => - 1,
-			);
-
-			$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() {
-			$num_of_months = $this->field['num-of-months'];
-			if ( 0 === $num_of_months ) {
-				$num_of_months = 1;
-			}
-
-			// Validate min/max values.
-			$hour_min = $this->field['hour-min'];
-			$hour_max = $this->field['hour-max'];
-			$min_min  = $this->field['minute-min'];
-			$min_max  = $this->field['minute-max'];
-
-			if ( $hour_min < 0 || $hour_min > 23 ) {
-				$hour_min = 0;
-			}
-
-			if ( $hour_max < 0 || $hour_max > 23 ) {
-				$hour_max = 23;
-			}
-
-			if ( $min_min < 0 || $min_min > 59 ) {
-				$min_min = 0;
-			}
-
-			if ( $min_max < 0 || $min_max > 59 ) {
-				$min_max = 59;
-			}
-
-			// Validate min date month.
-			if ( is_array( $this->field['date-min'] ) ) {
-				if ( isset( $this->field['date-min']['month'] ) ) {
-					if ( $this->field['date-min']['month'] < 1 || $this->field['date-min']['month'] > 12 ) {
-						$this->field['date-min']['month'] = 1;
-					}
-				}
-
-				if ( isset( $this->field['date-min']['day'] ) ) {
-					if ( $this->field['date-min']['day'] < 1 || $this->field['date-min']['day'] > 31 ) {
-						$this->field['date-min']['day'] = 1;
-					}
-				}
-			}
-
-			// Validate max date month.
-			if ( is_array( $this->field['date-max'] ) ) {
-				if ( isset( $this->field['date-max']['month'] ) ) {
-					if ( $this->field['date-max']['month'] < 1 || $this->field['date-max']['month'] > 12 ) {
-						$this->field['date-max']['month'] = 1;
-					}
-				}
-
-				// Validate max date day (imperfect, so we'll just use 31).
-				if ( isset( $this->field['date-max']['day'] ) ) {
-					if ( $this->field['date-max']['day'] < 1 || $this->field['date-max']['day'] > 31 ) {
-						$this->field['date-max']['day'] = 1;
-					}
-				}
-			}
-
-			// Assignment, make it easier to read.
-			$field_id     = $this->field['id'];
-			$field_name   = $this->field['name'];
-			$split        = $this->field['split'];
-			$control_type = $this->field['control-type'];
-
-			// Sanitize width
-			// Sanitize default value.
-			if ( true === $split ) {
-				if ( ! is_array( $this->value ) ) {
-					$this->value         = array();
-					$this->value['time'] = '';
-					$this->value['date'] = '';
-				}
-			} elseif ( is_array( $this->value ) ) {
-					$this->value = '';
-			}
-
-			// Dummy check, in case something other than select or slider
-			// is entered.
-			switch ( $control_type ) {
-				case 'select':
-				case 'slider':
-					break;
-				default:
-					$control_type = 'slider';
-			}
-
-			// Set placeholder based on mode.
-			if ( true === $split ) {
-				$date_placeholder = $this->field['placeholder']['date'] ?? esc_html__( 'Date', 'redux-framework' );
-				$time_placeholder = $this->field['placeholder']['time'] ?? esc_html__( 'Time', 'redux-framework' );
-			} else {
-				$date_placeholder = $this->field['placeholder'] ?? esc_html__( 'Date / Time', 'redux-framework' );
-			}
-
-			// Output defaults to div, so JS can read it.
-			// Broken up for readability; coz I'm the one who has to debug it!
-			echo '<div id="' . esc_attr( $field_id ) . '" class="redux-datetime-container"
+    /**
+     * Class Redux_Datetime
+     */
+    class Redux_Datetime extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'date-format'   => 'mm-dd-yy',
+                'time-format'   => 'hh:mm TT z',
+                'split'         => false,
+                'separator'     => ' ',
+                'date-picker'   => true,
+                'time-picker'   => true,
+                'control-type'  => 'slider',
+                'num-of-months' => 1,
+
+                // DO NOT CHANGE THESE!!!!
+                // It will make this file's JavaScript sister
+                // cry like a deflowered virgin on prom night.
+                'timezone-list' => null,
+                'timezone'      => '0',
+                'hour-min'      => 0,
+                'hour-max'      => 23,
+                'minute-min'    => 0,
+                'minute-max'    => 59,
+                'date-min'      => - 1,
+                'date-max'      => - 1,
+            );
+
+            $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() {
+            $num_of_months = $this->field['num-of-months'];
+            if ( 0 === $num_of_months ) {
+                $num_of_months = 1;
+            }
+
+            // Validate min/max values.
+            $hour_min = $this->field['hour-min'];
+            $hour_max = $this->field['hour-max'];
+            $min_min  = $this->field['minute-min'];
+            $min_max  = $this->field['minute-max'];
+
+            if ( $hour_min < 0 || $hour_min > 23 ) {
+                $hour_min = 0;
+            }
+
+            if ( $hour_max < 0 || $hour_max > 23 ) {
+                $hour_max = 23;
+            }
+
+            if ( $min_min < 0 || $min_min > 59 ) {
+                $min_min = 0;
+            }
+
+            if ( $min_max < 0 || $min_max > 59 ) {
+                $min_max = 59;
+            }
+
+            // Validate min date month.
+            if ( is_array( $this->field['date-min'] ) ) {
+                if ( isset( $this->field['date-min']['month'] ) ) {
+                    if ( $this->field['date-min']['month'] < 1 || $this->field['date-min']['month'] > 12 ) {
+                        $this->field['date-min']['month'] = 1;
+                    }
+                }
+
+                if ( isset( $this->field['date-min']['day'] ) ) {
+                    if ( $this->field['date-min']['day'] < 1 || $this->field['date-min']['day'] > 31 ) {
+                        $this->field['date-min']['day'] = 1;
+                    }
+                }
+            }
+
+            // Validate max date month.
+            if ( is_array( $this->field['date-max'] ) ) {
+                if ( isset( $this->field['date-max']['month'] ) ) {
+                    if ( $this->field['date-max']['month'] < 1 || $this->field['date-max']['month'] > 12 ) {
+                        $this->field['date-max']['month'] = 1;
+                    }
+                }
+
+                // Validate max date day (imperfect, so we'll just use 31).
+                if ( isset( $this->field['date-max']['day'] ) ) {
+                    if ( $this->field['date-max']['day'] < 1 || $this->field['date-max']['day'] > 31 ) {
+                        $this->field['date-max']['day'] = 1;
+                    }
+                }
+            }
+
+            // Assignment, make it easier to read.
+            $field_id     = $this->field['id'];
+            $field_name   = $this->field['name'];
+            $split        = $this->field['split'];
+            $control_type = $this->field['control-type'];
+
+            // Sanitize width
+            // Sanitize default value.
+            if ( true === $split ) {
+                if ( ! is_array( $this->value ) ) {
+                    $this->value         = array();
+                    $this->value['time'] = '';
+                    $this->value['date'] = '';
+                }
+            } elseif ( is_array( $this->value ) ) {
+                    $this->value = '';
+            }
+
+            // Dummy check, in case something other than select or slider
+            // is entered.
+            switch ( $control_type ) {
+                case 'select':
+                case 'slider':
+                    break;
+                default:
+                    $control_type = 'slider';
+            }
+
+            // Set placeholder based on mode.
+            if ( true === $split ) {
+                $date_placeholder = $this->field['placeholder']['date'] ?? esc_html__( 'Date', 'redux-framework' );
+                $time_placeholder = $this->field['placeholder']['time'] ?? esc_html__( 'Time', 'redux-framework' );
+            } else {
+                $date_placeholder = $this->field['placeholder'] ?? esc_html__( 'Date / Time', 'redux-framework' );
+            }
+
+            // Output defaults to div, so JS can read it.
+            // Broken up for readability; coz I'm the one who has to debug it!
+            echo '<div id="' . esc_attr( $field_id ) . '" class="redux-datetime-container"
                        data-dev-mode="' . esc_attr( $this->parent->args['dev_mode'] ) . '"
                        data-version="' . esc_attr( Redux_Extension_Datetime::$version ) . '"
                        data-id="' . esc_attr( $field_id ) . '"
@@ -174,11 +174,11 @@ 
                        data-time-format="' . esc_attr( $this->field['time-format'] ) . '"
                        data-date-format="' . esc_attr( $this->field['date-format'] ) . '">';
 
-			// If split mode is on, output two text boxes.
-			if ( true === $split ) {
-				echo '<div class="redux-date-input input_wrapper">';
-				echo '<label for="' . esc_attr( $field_id ) . '-date" class="redux-date-input-label">' . esc_html( $date_placeholder ) . '</label>';
-				echo ' <input
+            // If split mode is on, output two text boxes.
+            if ( true === $split ) {
+                echo '<div class="redux-date-input input_wrapper">';
+                echo '<label for="' . esc_attr( $field_id ) . '-date" class="redux-date-input-label">' . esc_html( $date_placeholder ) . '</label>';
+                echo ' <input
 							data-id="' . esc_attr( $field_id ) . '"
 							type="text"
 							id="' . esc_attr( $field_id ) . '-date"
@@ -187,11 +187,11 @@ 
 							value="' . esc_attr( $this->value['date'] ) . '"
 							class="redux-date-picker ' . esc_attr( $this->field['class'] ) . '" />&nbsp;&nbsp;';
 
-				echo '</div>';
+                echo '</div>';
 
-				echo '<div class="redux-time-input input_wrapper">';
-				echo '<label for="' . esc_attr( $field_id ) . '-time" class="redux-time-input-label">' . esc_html( $time_placeholder ) . '</label>';
-				echo ' <input
+                echo '<div class="redux-time-input input_wrapper">';
+                echo '<label for="' . esc_attr( $field_id ) . '-time" class="redux-time-input-label">' . esc_html( $time_placeholder ) . '</label>';
+                echo ' <input
 							data-id="' . esc_attr( $field_id ) . '"
 							type="text"
 							id="' . esc_attr( $field_id ) . '-time"
@@ -200,11 +200,11 @@ 
 							value="' . esc_attr( $this->value['time'] ) . '"
 							class="redux-time-picker ' . esc_attr( $this->field['class'] ) . '" />';
 
-				// Otherwise, just one.
-			} else {
-				echo '<div class="redux-datetime-input single_wrapper">';
-				echo '<label for="' . esc_attr( $field_id ) . '-date" class="redux-datetime-input-label">' . esc_attr( $date_placeholder ) . '</label>';
-				echo ' <input
+                // Otherwise, just one.
+            } else {
+                echo '<div class="redux-datetime-input single_wrapper">';
+                echo '<label for="' . esc_attr( $field_id ) . '-date" class="redux-datetime-input-label">' . esc_attr( $date_placeholder ) . '</label>';
+                echo ' <input
 							data-id="' . esc_attr( $field_id ) . '"
 							type="text"
 							id="' . esc_attr( $field_id ) . '-date"
@@ -213,63 +213,63 @@ 
 							value="' . esc_attr( $this->value ) . '"
 							class="redux-date-picker ' . esc_attr( $this->field['class'] ) . '" />';
 
-			}
-
-			echo '</div>';
-
-			// Close da div, main!
-			echo '</div>';
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since         1.0.0
-		 * @access        public
-		 * @return        void
-		 */
-		public function enqueue() {
-			$min = Redux_Functions::is_min();
-
-			wp_enqueue_script(
-				'redux-datetime-slider',
-				$this->url . 'vendor/jquery-ui-sliderAccess' . $min . '.js',
-				array( 'jquery' ),
-				'0.3',
-				true
-			);
-
-			wp_enqueue_script(
-				'redux-datetime',
-				$this->url . 'vendor/jquery-ui-timepicker-addon' . $min . '.js',
-				array(
-					'jquery',
-					'jquery-ui-datepicker',
-					'jquery-ui-widget',
-					'jquery-ui-slider',
-					'redux-datetime-slider',
-				),
-				'1.6.3',
-				true
-			);
-
-			wp_enqueue_script(
-				'redux-field-datetime',
-				$this->url . 'redux-datetime' . $min . '.js',
-				array( 'jquery', 'redux-datetime', 'redux-js' ),
-				Redux_Extension_Datetime::$version,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-datetime',
-					$this->url . 'redux-datetime.css',
-					array(),
-					Redux_Extension_Datetime::$version,
-				);
-			}
-		}
-	}
+            }
+
+            echo '</div>';
+
+            // Close da div, main!
+            echo '</div>';
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since         1.0.0
+         * @access        public
+         * @return        void
+         */
+        public function enqueue() {
+            $min = Redux_Functions::is_min();
+
+            wp_enqueue_script(
+                'redux-datetime-slider',
+                $this->url . 'vendor/jquery-ui-sliderAccess' . $min . '.js',
+                array( 'jquery' ),
+                '0.3',
+                true
+            );
+
+            wp_enqueue_script(
+                'redux-datetime',
+                $this->url . 'vendor/jquery-ui-timepicker-addon' . $min . '.js',
+                array(
+                    'jquery',
+                    'jquery-ui-datepicker',
+                    'jquery-ui-widget',
+                    'jquery-ui-slider',
+                    'redux-datetime-slider',
+                ),
+                '1.6.3',
+                true
+            );
+
+            wp_enqueue_script(
+                'redux-field-datetime',
+                $this->url . 'redux-datetime' . $min . '.js',
+                array( 'jquery', 'redux-datetime', 'redux-js' ),
+                Redux_Extension_Datetime::$version,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-datetime',
+                    $this->url . 'redux-datetime.css',
+                    array(),
+                    Redux_Extension_Datetime::$version,
+                );
+            }
+        }
+    }
 }

redux-core/inc/extensions/social_profiles/social_profiles/inc/class-redux-social-profiles-widget.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 		 * @param null             $param  Who knows.
 		 */
 		public function register( $widget, $param = null ) {
-			$this->widgets[ $widget ] = new $widget( $param );
+			$this->widgets[$widget] = new $widget( $param );
 		}
 	}
 
@@ -125,7 +125,7 @@ 
 			$title         = $instance['title'];
 			$redux_options = get_option( $this->parent->args['opt_name'] );
 
-			$social_items = $redux_options[ $this->field_id ];
+			$social_items = $redux_options[$this->field_id];
 
 			echo $before_widget; // phpcs:ignore WordPress.Security.EscapeOutput
 
@@ -190,7 +190,7 @@ 
 				'title' => esc_html__( 'Social', 'redux-framework' ),
 			);
 
-			$instance = wp_parse_args( (array) $instance, $defaults );
+			$instance = wp_parse_args( ( array ) $instance, $defaults );
 			?>
 			<p>
 				<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>">

Indentation +183 added lines, -183 removed lines

@@ -13,187 +13,187 @@ 
 
 if ( ! class_exists( 'Redux_Social_Profiles_Widget' ) ) {
 
-	/**
-	 * Class Redux_Social_Profiles_Widget
-	 */
-	class Redux_Social_Profiles_Widget {
-
-		/**
-		 * Field ID.
-		 *
-		 * @var string|null
-		 */
-		public ?string $field_id = '';
-
-		/**
-		 * ReduxFramework object pointer.
-		 *
-		 * @var ReduxFramework|null
-		 */
-		public ?ReduxFramework $parent = null;
-
-		/**
-		 * Redux_Social_Profiles_Widget constructor.
-		 *
-		 * @param ReduxFramework $redux    ReduxFramework object.
-		 * @param string         $field_id Field ID.
-		 */
-		public function __construct( ReduxFramework $redux, string $field_id ) {
-			return;
-
-			$this->parent   = $redux;
-			$this->field_id = $field_id;
-
-
-			$this->params = array(
-				'parent'   => $this->parent,
-				'field_id' => $this->field_id,
-			);
-
-			add_action( 'widgets_init', array( $this, 'load_widget' ), 0 );
-		}
-
-		/**
-		 * Load widget
-		 */
-		public function load_widget() {
-			$x = new Extend_WP_Widget_Factory();
-			$x->register( 'Redux_Social_Widget_Display', $this->params );
-		}
-	}
-
-	/**
-	 * Class Extend_WP_Widget_Factory
-	 */
-	// phpcs:ignore Generic.Files.OneClassPerFile
-	class Extend_WP_Widget_Factory extends WP_Widget_Factory {
-		/**
-		 * Register widget.
-		 *
-		 * @param string|WP_Widget $widget Widget class.
-		 * @param null             $param  Who knows.
-		 */
-		public function register( $widget, $param = null ) {
-			$this->widgets[ $widget ] = new $widget( $param );
-		}
-	}
-
-	/**
-	 * Class Redux_Social_Widget_Display
-	 */
-	class Redux_Social_Widget_Display extends WP_Widget {
-
-		public $show_instance_in_rest = true;
-
-		/**
-		 * Redux_Social_Widget_Display constructor.
-		 *
-		 * @param array $params Params.
-		 */
-		public function __construct( $params ) {
-
-			extract( $params ); // phpcs:ignore WordPress.PHP.DontExtract
-
-			$this->parent   = $parent;
-			$this->field_id = $field_id;
-
-			$widget_ops = array(
-				'classname'   => 'redux-social-icons-display',
-				'description' => __( 'Display social media links', 'redux-framework' ),
-				'show_instance_in_rest' => true
-			);
-
-			$control_ops = array(
-				'width'                 => 250,
-				'height'                => 200,
-				'id_base'               => 'redux-social-icons-display',
-				'show_instance_in_rest' => true,
-			);
-
-			parent::__construct( 'redux-social-icons-display', 'Redux Social Widget', $widget_ops, $control_ops );
-		}
-
-		/**
-		 * Widget render.
-		 *
-		 * @param array $args Args.
-		 * @param array $instance Instance.
-		 */
-		public function widget( $args, $instance ) {
-			include_once 'class-redux-social-profiles-functions.php';
-
-			extract( $args, EXTR_SKIP ); // phpcs:ignore WordPress.PHP.DontExtract
-
-			$title         = $instance['title'];
-			$redux_options = get_option( $this->parent->args['opt_name'] );
-
-			$social_items = $redux_options[ $this->field_id ];
-
-			echo $before_widget; // phpcs:ignore WordPress.Security.EscapeOutput
-
-			if ( $title ) {
-				echo $before_title . esc_html( $title ) . $after_title; // phpcs:ignore WordPress.Security.EscapeOutput
-			}
-
-			?>
+    /**
+     * Class Redux_Social_Profiles_Widget
+     */
+    class Redux_Social_Profiles_Widget {
+
+        /**
+         * Field ID.
+         *
+         * @var string|null
+         */
+        public ?string $field_id = '';
+
+        /**
+         * ReduxFramework object pointer.
+         *
+         * @var ReduxFramework|null
+         */
+        public ?ReduxFramework $parent = null;
+
+        /**
+         * Redux_Social_Profiles_Widget constructor.
+         *
+         * @param ReduxFramework $redux    ReduxFramework object.
+         * @param string         $field_id Field ID.
+         */
+        public function __construct( ReduxFramework $redux, string $field_id ) {
+            return;
+
+            $this->parent   = $redux;
+            $this->field_id = $field_id;
+
+
+            $this->params = array(
+                'parent'   => $this->parent,
+                'field_id' => $this->field_id,
+            );
+
+            add_action( 'widgets_init', array( $this, 'load_widget' ), 0 );
+        }
+
+        /**
+         * Load widget
+         */
+        public function load_widget() {
+            $x = new Extend_WP_Widget_Factory();
+            $x->register( 'Redux_Social_Widget_Display', $this->params );
+        }
+    }
+
+    /**
+     * Class Extend_WP_Widget_Factory
+     */
+    // phpcs:ignore Generic.Files.OneClassPerFile
+    class Extend_WP_Widget_Factory extends WP_Widget_Factory {
+        /**
+         * Register widget.
+         *
+         * @param string|WP_Widget $widget Widget class.
+         * @param null             $param  Who knows.
+         */
+        public function register( $widget, $param = null ) {
+            $this->widgets[ $widget ] = new $widget( $param );
+        }
+    }
+
+    /**
+     * Class Redux_Social_Widget_Display
+     */
+    class Redux_Social_Widget_Display extends WP_Widget {
+
+        public $show_instance_in_rest = true;
+
+        /**
+         * Redux_Social_Widget_Display constructor.
+         *
+         * @param array $params Params.
+         */
+        public function __construct( $params ) {
+
+            extract( $params ); // phpcs:ignore WordPress.PHP.DontExtract
+
+            $this->parent   = $parent;
+            $this->field_id = $field_id;
+
+            $widget_ops = array(
+                'classname'   => 'redux-social-icons-display',
+                'description' => __( 'Display social media links', 'redux-framework' ),
+                'show_instance_in_rest' => true
+            );
+
+            $control_ops = array(
+                'width'                 => 250,
+                'height'                => 200,
+                'id_base'               => 'redux-social-icons-display',
+                'show_instance_in_rest' => true,
+            );
+
+            parent::__construct( 'redux-social-icons-display', 'Redux Social Widget', $widget_ops, $control_ops );
+        }
+
+        /**
+         * Widget render.
+         *
+         * @param array $args Args.
+         * @param array $instance Instance.
+         */
+        public function widget( $args, $instance ) {
+            include_once 'class-redux-social-profiles-functions.php';
+
+            extract( $args, EXTR_SKIP ); // phpcs:ignore WordPress.PHP.DontExtract
+
+            $title         = $instance['title'];
+            $redux_options = get_option( $this->parent->args['opt_name'] );
+
+            $social_items = $redux_options[ $this->field_id ];
+
+            echo $before_widget; // phpcs:ignore WordPress.Security.EscapeOutput
+
+            if ( $title ) {
+                echo $before_title . esc_html( $title ) . $after_title; // phpcs:ignore WordPress.Security.EscapeOutput
+            }
+
+            ?>
 			<ul class="redux-social-media-list clearfix">
 				<?php
-				if ( is_array( $social_items ) ) {
-					foreach ( $social_items as $social_item ) {
-						if ( $social_item['enabled'] ) {
-							$icon       = $social_item['icon'];
-							$color      = $social_item['color'];
-							$background = $social_item['background'];
-							$base_url   = $social_item['url'];
-							$id         = $social_item['id'];
-
-							// phpcs:ignore WordPress.NamingConventions.ValidHookName
-							$url = apply_filters( 'redux/extensions/social_profiles/' . $this->parent->args['opt_name'] . '/icon_url', $id, $base_url );
-
-							echo '<li>';
-							echo '<a href="' . esc_url( $url ) . '">';
-							Redux_Social_Profiles_Functions::render_icon( $icon, $color, $background, '' );
-							echo '</a>';
-							echo '</li>';
-						}
-					}
-				}
-				?>
+                if ( is_array( $social_items ) ) {
+                    foreach ( $social_items as $social_item ) {
+                        if ( $social_item['enabled'] ) {
+                            $icon       = $social_item['icon'];
+                            $color      = $social_item['color'];
+                            $background = $social_item['background'];
+                            $base_url   = $social_item['url'];
+                            $id         = $social_item['id'];
+
+                            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                            $url = apply_filters( 'redux/extensions/social_profiles/' . $this->parent->args['opt_name'] . '/icon_url', $id, $base_url );
+
+                            echo '<li>';
+                            echo '<a href="' . esc_url( $url ) . '">';
+                            Redux_Social_Profiles_Functions::render_icon( $icon, $color, $background, '' );
+                            echo '</a>';
+                            echo '</li>';
+                        }
+                    }
+                }
+                ?>
 			</ul>
 			<?php
 
-			echo $after_widget; // phpcs:ignore WordPress.Security.EscapeOutput
-		}
-
-		/**
-		 * Update Widget.
-		 *
-		 * @param array $new_instance New instance.
-		 * @param array $old_instance Old instance.
-		 *
-		 * @return array
-		 */
-		public function update( $new_instance, $old_instance ): array {
-			$instance          = $old_instance;
-			$instance['title'] = wp_strip_all_tags( $new_instance['title'] ?? '' );
-
-			return $instance;
-		}
-
-		/**
-		 * Render widget form.
-		 *
-		 * @param array $instance Instance.
-		 *
-		 * @return void
-		 */
-		public function form( $instance ) {
-			$defaults = array(
-				'title' => esc_html__( 'Social', 'redux-framework' ),
-			);
-
-			$instance = wp_parse_args( (array) $instance, $defaults );
-			?>
+            echo $after_widget; // phpcs:ignore WordPress.Security.EscapeOutput
+        }
+
+        /**
+         * Update Widget.
+         *
+         * @param array $new_instance New instance.
+         * @param array $old_instance Old instance.
+         *
+         * @return array
+         */
+        public function update( $new_instance, $old_instance ): array {
+            $instance          = $old_instance;
+            $instance['title'] = wp_strip_all_tags( $new_instance['title'] ?? '' );
+
+            return $instance;
+        }
+
+        /**
+         * Render widget form.
+         *
+         * @param array $instance Instance.
+         *
+         * @return void
+         */
+        public function form( $instance ) {
+            $defaults = array(
+                'title' => esc_html__( 'Social', 'redux-framework' ),
+            );
+
+            $instance = wp_parse_args( (array) $instance, $defaults );
+            ?>
 			<p>
 				<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>">
 					<?php esc_html_e( 'Title', 'redux-framework' ); ?>
@@ -206,15 +206,15 @@ 
 				</label>
 				<label for="redux-social-icons-info">
 					<?php
-					$tab  = Redux_Helpers::tab_from_field( $this->parent, 'social_profiles' );
-					$slug = $this->parent->args['page_slug'];
+                    $tab  = Redux_Helpers::tab_from_field( $this->parent, 'social_profiles' );
+                    $slug = $this->parent->args['page_slug'];
 
-					// translators: %1$s: Settings page URL.  %2$s: Closing a tag.
-					printf( esc_html__( 'Control which icons are displayed and their urls on the %1$sssettings page%2$s', 'redux-framework' ), '<a href="' . esc_url( admin_url( 'admin.php?page=' . esc_attr( $slug ) . '&tab=' . esc_attr( $tab ) ) ) . '">', '</a>' );
-					?>
+                    // translators: %1$s: Settings page URL.  %2$s: Closing a tag.
+                    printf( esc_html__( 'Control which icons are displayed and their urls on the %1$sssettings page%2$s', 'redux-framework' ), '<a href="' . esc_url( admin_url( 'admin.php?page=' . esc_attr( $slug ) . '&tab=' . esc_attr( $tab ) ) ) . '">', '</a>' );
+                    ?>
 				</label>
 			</p>
 			<?php
-		}
-	}
+        }
+    }
 }

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