reduxframework / redux-framework

redux-templates/classes/templates/template-contained.php

Indentation +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@
 echo '<style id="redux-template-overrides">' . ReduxTemplates\Template_Overrides::get_overrides() . '</style>';
 
 while ( have_posts() ) :
-	the_post();
-	the_content();
+    the_post();
+    the_content();
 
-	// If comments are open, or we have at least one comment, load up the comment template.
-	if ( comments_open() || get_comments_number() ) :
-		comments_template();
-	endif;
+    // If comments are open, or we have at least one comment, load up the comment template.
+    if ( comments_open() || get_comments_number() ) :
+        comments_template();
+    endif;
 endwhile; // End of the loop.
 
 get_footer();

redux-core/inc/extensions/widget_areas/class-redux-widget-areas.php

Spacing +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@ 
 				if ( ! is_numeric( $counter ) ) {
 					$new_name = $name . ' 1';
 				} else {
-					$new_name = substr( $name, 0, - 1 ) . ( (int) $counter + 1 );
+					$new_name = substr( $name, 0, - 1 ) . ( ( int ) $counter + 1 );
 				}
 
 				$name = $this->check_widget_area_name( $new_name );
@@ -252,7 +252,7 @@ 
 					$key                = array_search( $name, $this->widget_areas, true );
 
 					if ( $key >= 0 ) {
-						unset( $this->widget_areas[ $key ] );
+						unset( $this->widget_areas[$key] );
 						$this->save_widget_areas();
 					}
 

Indentation +265 added lines, -265 removed lines

@@ -12,84 +12,84 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Widget_Areas' ) ) {
 
-	/**
-	 * Main ReduxFramework customizer extension class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Widget_Areas {
-
-		/**
-		 * Extension URI.
-		 *
-		 * @var null|string
-		 */
-		private ?string $extension_url;
-
-		/** Extension directory.
-		 *
-		 * @var string
-		 */
-		private string $extension_dir;
-
-		/**
-		 * Array of enabled widget_areas
-		 *
-		 * @since    1.0.0
-		 * @var      array
-		 */
-		protected array $widget_areas = array();
-
-		/**
-		 * Widget array.
-		 *
-		 * @var array
-		 */
-		protected array $orig = array();
-
-		/**
-		 * ReduxFramework object.
-		 *
-		 * @var ReduxFramework
-		 */
-		private ReduxFramework $parent;
-
-		/**
-		 * Redux_Widget_Areas constructor.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework pointer.
-		 */
-		public function __construct( ReduxFramework $redux ) {
-			global $pagenow;
-
-			$this->parent = $redux;
-
-			if ( empty( $this->extension_dir ) ) {
-				$this->extension_dir = trailingslashit( str_replace( '\\', '/', __DIR__ ) );
-				$this->extension_url = site_url( str_replace( trailingslashit( str_replace( '\\', '/', ABSPATH ) ), '', $this->extension_dir ) );
-			}
-
-			add_action( 'init', array( &$this, 'register_custom_widget_areas' ), 1000 );
-
-			if ( 'widgets.php' === $pagenow ) {
-				if ( true === $redux->args['widget_area'] ) {
-					add_action( 'admin_print_scripts', array( $this, 'add_new_widget_area_box' ) );
-				}
-				add_action( 'load-widgets.php', array( $this, 'add_widget_area_area' ), 100 );
-				add_action( 'load-widgets.php', array( $this, 'enqueue' ), 100 );
-			}
-		}
-
-		/**
-		 * Function to create the HTML used to create widget_areas.
-		 *
-		 * @since     1.0.0
-		 */
-		public function add_new_widget_area_box() {
-			$nonce     = wp_create_nonce( 'add-redux-widget_area-nonce' );
-			$del_nonce = wp_create_nonce( 'delete-redux-widget_area-nonce' );
-
-			?>
+    /**
+     * Main ReduxFramework customizer extension class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Widget_Areas {
+
+        /**
+         * Extension URI.
+         *
+         * @var null|string
+         */
+        private ?string $extension_url;
+
+        /** Extension directory.
+         *
+         * @var string
+         */
+        private string $extension_dir;
+
+        /**
+         * Array of enabled widget_areas
+         *
+         * @since    1.0.0
+         * @var      array
+         */
+        protected array $widget_areas = array();
+
+        /**
+         * Widget array.
+         *
+         * @var array
+         */
+        protected array $orig = array();
+
+        /**
+         * ReduxFramework object.
+         *
+         * @var ReduxFramework
+         */
+        private ReduxFramework $parent;
+
+        /**
+         * Redux_Widget_Areas constructor.
+         *
+         * @param ReduxFramework $redux ReduxFramework pointer.
+         */
+        public function __construct( ReduxFramework $redux ) {
+            global $pagenow;
+
+            $this->parent = $redux;
+
+            if ( empty( $this->extension_dir ) ) {
+                $this->extension_dir = trailingslashit( str_replace( '\\', '/', __DIR__ ) );
+                $this->extension_url = site_url( str_replace( trailingslashit( str_replace( '\\', '/', ABSPATH ) ), '', $this->extension_dir ) );
+            }
+
+            add_action( 'init', array( &$this, 'register_custom_widget_areas' ), 1000 );
+
+            if ( 'widgets.php' === $pagenow ) {
+                if ( true === $redux->args['widget_area'] ) {
+                    add_action( 'admin_print_scripts', array( $this, 'add_new_widget_area_box' ) );
+                }
+                add_action( 'load-widgets.php', array( $this, 'add_widget_area_area' ), 100 );
+                add_action( 'load-widgets.php', array( $this, 'enqueue' ), 100 );
+            }
+        }
+
+        /**
+         * Function to create the HTML used to create widget_areas.
+         *
+         * @since     1.0.0
+         */
+        public function add_new_widget_area_box() {
+            $nonce     = wp_create_nonce( 'add-redux-widget_area-nonce' );
+            $del_nonce = wp_create_nonce( 'delete-redux-widget_area-nonce' );
+
+            ?>
 			<script type="text/html" id="redux-add-widget-template">
 				<div id="redux-add-widget" class="widgets-holder-wrap">
 					<div class="">
@@ -122,191 +122,191 @@ 
 				</div>
 			</script>
 			<?php
-		}
-
-		/**
-		 * Add widget area.
-		 */
-		public function add_widget_area_area() {
-			if ( isset( $_POST ) && isset( $_POST['redux-add-widget-nonce'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux-add-widget-nonce'] ) ), 'add-redux-widget_area-nonce' ) ) {
-				if ( ! empty( $_POST['redux-add-widget-input'] ) ) {
-					$this->widget_areas = $this->get_widget_areas();
-
-					$this->widget_areas[] = $this->check_widget_area_name( sanitize_text_field( wp_unslash( $_POST['redux-add-widget-input'] ) ) );
-
-					$this->save_widget_areas();
-
-					wp_safe_redirect( admin_url( 'widgets.php' ) );
-
-					die();
-				}
-			}
-		}
-
-		/**
-		 * Before we create a new widget_area, verify it doesn't already exist. If it does, append a number to the name.
-		 *
-		 * @param    string $name Name of the widget_area to be created.
-		 *
-		 * @return    string|void     $name Name of the new widget_area just created.
-		 * @since     1.0.0
-		 */
-		private function check_widget_area_name( string $name ) {
-			if ( empty( $GLOBALS['wp_registered_widget_areas'] ) ) {
-				return $name;
-			}
-
-			$taken = array();
-
-			foreach ( $GLOBALS['wp_registered_widget_areas'] as $widget_area ) {
-				$taken[] = $widget_area['name'];
-			}
-
-			$taken = array_merge( $taken, $this->widget_areas );
-
-			if ( in_array( $name, $taken, true ) ) {
-				$counter = substr( $name, - 1 );
-
-				if ( ! is_numeric( $counter ) ) {
-					$new_name = $name . ' 1';
-				} else {
-					$new_name = substr( $name, 0, - 1 ) . ( (int) $counter + 1 );
-				}
-
-				$name = $this->check_widget_area_name( $new_name );
-			}
-
-			echo $name; // phpcs:disable WordPress.Security.EscapeOutput
-
-			exit();
-		}
-
-		/**
-		 * Save Widget Areas.
-		 */
-		private function save_widget_areas() {
-			set_theme_mod( 'redux-widget-areas', array_unique( $this->widget_areas ) );
-		}
-
-		/**
-		 * Register and display the custom widget_area areas we have set.
-		 *
-		 * @since     1.0.0
-		 */
-		public function register_custom_widget_areas() {
-
-			// If the single instance hasn't been set, set it now.
-			if ( empty( $this->widget_areas ) ) {
-				$this->widget_areas = $this->get_widget_areas();
-			}
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$this->orig = array_unique( apply_filters( 'redux/' . $this->parent->args['opt_name'] . '/widget_areas', array() ) );
-
-			if ( ! empty( $this->orig ) && $this->orig !== $this->widget_areas ) {
-				$this->widget_areas = array_unique( array_merge( $this->widget_areas, $this->orig ) );
-				$this->save_widget_areas();
-			}
-
-			$options = array(
-				'before_title'  => '<h3 class="widgettitle">',
-				'after_title'   => '</h3>',
-				'before_widget' => '<div id="%1$s" class="widget clearfix %2$s">',
-				'after_widget'  => '</div>',
-			);
-
-			$options = apply_filters( 'redux_custom_widget_args', $options );
-
-			foreach ( array_unique( $this->widget_areas ) as $widget_area ) {
-				$options['class'] = 'redux-custom';
-				$options['name']  = $widget_area;
-				$options['id']    = sanitize_key( $widget_area );
-
-				register_sidebar( $options );
-			}
-		}
-
-
-		/**
-		 * Return the widget_areas array.
-		 *
-		 * @since     1.0.0
-		 * @return    array    If not empty, active redux widget_areas are returned.
-		 */
-		public function get_widget_areas(): array {
-
-			// If the single instance hasn't been set, set it now.
-			if ( ! empty( $this->widget_areas ) ) {
-				return $this->widget_areas;
-			}
-
-			$db = get_theme_mod( 'redux-widget-areas' );
-
-			if ( ! empty( $db ) ) {
-				$this->widget_areas = array_unique( array_merge( $this->widget_areas, $db ) );
-			}
-
-			return $this->widget_areas;
-		}
-
-		/**
-		 * Delete widget area.
-		 */
-		public function redux_delete_widget_area_area() {
-			if ( isset( $_POST ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_POST['_wpnonce'] ) ), 'delete-redux-widget_area-nonce' ) ) {
-				if ( isset( $_POST['name'] ) && ! empty( sanitize_text_field( wp_unslash( $_POST['name'] ) ) ) ) {
-					$name               = sanitize_text_field( wp_unslash( $_POST['name'] ) );
-					$this->widget_areas = $this->get_widget_areas();
-					$key                = array_search( $name, $this->widget_areas, true );
-
-					if ( $key >= 0 ) {
-						unset( $this->widget_areas[ $key ] );
-						$this->save_widget_areas();
-					}
-
-					echo 'widget_area-deleted';
-				}
-			}
-
-			die();
-		}
-
-		/**
-		 * Enqueue support files.
-		 */
-		public function enqueue() {
-			$min = Redux_Functions::is_min();
-
-			wp_enqueue_style( 'dashicons' );
-
-			wp_enqueue_script(
-				'redux-widget-areas',
-				$this->extension_url . 'redux-extension-widget-areas' . $min . '.js',
-				array( 'jquery' ),
-				Redux_Extension_Widget_Areas::$version,
-				true
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-widget-areas',
-					$this->extension_url . 'redux-extension-widget-areas.css',
-					array(),
-					Redux_Extension_Widget_Areas::$version
-				);
-			}
-
-			// Localize script.
-			wp_localize_script(
-				'redux-widget-areas',
-				'reduxWidgetAreasLocalize',
-				array(
-					'count'   => count( $this->orig ),
-					'delete'  => esc_html__( 'Delete', 'redux-framework' ),
-					'confirm' => esc_html__( 'Confirm', 'redux-framework' ),
-					'cancel'  => esc_html__( 'Cancel', 'redux-framework' ),
-				)
-			);
-		}
-	}
+        }
+
+        /**
+         * Add widget area.
+         */
+        public function add_widget_area_area() {
+            if ( isset( $_POST ) && isset( $_POST['redux-add-widget-nonce'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_POST['redux-add-widget-nonce'] ) ), 'add-redux-widget_area-nonce' ) ) {
+                if ( ! empty( $_POST['redux-add-widget-input'] ) ) {
+                    $this->widget_areas = $this->get_widget_areas();
+
+                    $this->widget_areas[] = $this->check_widget_area_name( sanitize_text_field( wp_unslash( $_POST['redux-add-widget-input'] ) ) );
+
+                    $this->save_widget_areas();
+
+                    wp_safe_redirect( admin_url( 'widgets.php' ) );
+
+                    die();
+                }
+            }
+        }
+
+        /**
+         * Before we create a new widget_area, verify it doesn't already exist. If it does, append a number to the name.
+         *
+         * @param    string $name Name of the widget_area to be created.
+         *
+         * @return    string|void     $name Name of the new widget_area just created.
+         * @since     1.0.0
+         */
+        private function check_widget_area_name( string $name ) {
+            if ( empty( $GLOBALS['wp_registered_widget_areas'] ) ) {
+                return $name;
+            }
+
+            $taken = array();
+
+            foreach ( $GLOBALS['wp_registered_widget_areas'] as $widget_area ) {
+                $taken[] = $widget_area['name'];
+            }
+
+            $taken = array_merge( $taken, $this->widget_areas );
+
+            if ( in_array( $name, $taken, true ) ) {
+                $counter = substr( $name, - 1 );
+
+                if ( ! is_numeric( $counter ) ) {
+                    $new_name = $name . ' 1';
+                } else {
+                    $new_name = substr( $name, 0, - 1 ) . ( (int) $counter + 1 );
+                }
+
+                $name = $this->check_widget_area_name( $new_name );
+            }
+
+            echo $name; // phpcs:disable WordPress.Security.EscapeOutput
+
+            exit();
+        }
+
+        /**
+         * Save Widget Areas.
+         */
+        private function save_widget_areas() {
+            set_theme_mod( 'redux-widget-areas', array_unique( $this->widget_areas ) );
+        }
+
+        /**
+         * Register and display the custom widget_area areas we have set.
+         *
+         * @since     1.0.0
+         */
+        public function register_custom_widget_areas() {
+
+            // If the single instance hasn't been set, set it now.
+            if ( empty( $this->widget_areas ) ) {
+                $this->widget_areas = $this->get_widget_areas();
+            }
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $this->orig = array_unique( apply_filters( 'redux/' . $this->parent->args['opt_name'] . '/widget_areas', array() ) );
+
+            if ( ! empty( $this->orig ) && $this->orig !== $this->widget_areas ) {
+                $this->widget_areas = array_unique( array_merge( $this->widget_areas, $this->orig ) );
+                $this->save_widget_areas();
+            }
+
+            $options = array(
+                'before_title'  => '<h3 class="widgettitle">',
+                'after_title'   => '</h3>',
+                'before_widget' => '<div id="%1$s" class="widget clearfix %2$s">',
+                'after_widget'  => '</div>',
+            );
+
+            $options = apply_filters( 'redux_custom_widget_args', $options );
+
+            foreach ( array_unique( $this->widget_areas ) as $widget_area ) {
+                $options['class'] = 'redux-custom';
+                $options['name']  = $widget_area;
+                $options['id']    = sanitize_key( $widget_area );
+
+                register_sidebar( $options );
+            }
+        }
+
+
+        /**
+         * Return the widget_areas array.
+         *
+         * @since     1.0.0
+         * @return    array    If not empty, active redux widget_areas are returned.
+         */
+        public function get_widget_areas(): array {
+
+            // If the single instance hasn't been set, set it now.
+            if ( ! empty( $this->widget_areas ) ) {
+                return $this->widget_areas;
+            }
+
+            $db = get_theme_mod( 'redux-widget-areas' );
+
+            if ( ! empty( $db ) ) {
+                $this->widget_areas = array_unique( array_merge( $this->widget_areas, $db ) );
+            }
+
+            return $this->widget_areas;
+        }
+
+        /**
+         * Delete widget area.
+         */
+        public function redux_delete_widget_area_area() {
+            if ( isset( $_POST ) && isset( $_POST['_wpnonce'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_POST['_wpnonce'] ) ), 'delete-redux-widget_area-nonce' ) ) {
+                if ( isset( $_POST['name'] ) && ! empty( sanitize_text_field( wp_unslash( $_POST['name'] ) ) ) ) {
+                    $name               = sanitize_text_field( wp_unslash( $_POST['name'] ) );
+                    $this->widget_areas = $this->get_widget_areas();
+                    $key                = array_search( $name, $this->widget_areas, true );
+
+                    if ( $key >= 0 ) {
+                        unset( $this->widget_areas[ $key ] );
+                        $this->save_widget_areas();
+                    }
+
+                    echo 'widget_area-deleted';
+                }
+            }
+
+            die();
+        }
+
+        /**
+         * Enqueue support files.
+         */
+        public function enqueue() {
+            $min = Redux_Functions::is_min();
+
+            wp_enqueue_style( 'dashicons' );
+
+            wp_enqueue_script(
+                'redux-widget-areas',
+                $this->extension_url . 'redux-extension-widget-areas' . $min . '.js',
+                array( 'jquery' ),
+                Redux_Extension_Widget_Areas::$version,
+                true
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-widget-areas',
+                    $this->extension_url . 'redux-extension-widget-areas.css',
+                    array(),
+                    Redux_Extension_Widget_Areas::$version
+                );
+            }
+
+            // Localize script.
+            wp_localize_script(
+                'redux-widget-areas',
+                'reduxWidgetAreasLocalize',
+                array(
+                    'count'   => count( $this->orig ),
+                    'delete'  => esc_html__( 'Delete', 'redux-framework' ),
+                    'confirm' => esc_html__( 'Confirm', 'redux-framework' ),
+                    'cancel'  => esc_html__( 'Cancel', 'redux-framework' ),
+                )
+            );
+        }
+    }
 }

sample/sections/extensions/google-maps.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 				'full_width'   => true,
 				'default'      => array(
 					'latitude'  => 38.8976758,
-					'longitude' => - 77.03648229999999,
+					'longitude' => -77.03648229999999,
 					'zoom'      => 7,
 				),
 			),

Indentation +37 added lines, -37 removed lines

@@ -10,42 +10,42 @@
 defined( 'ABSPATH' ) || exit;
 
 Redux::set_section(
-	$opt_name,
-	array(
-		'title'      => esc_html__( 'Google Maps', 'your-textdomain-here' ),
-		'desc'       => esc_html__( 'For full documentation on this field, visit: ', 'your-textdomain-here' ) . '<a href="https://devs.redux.io/core-extensions/google-maps.html" target="_blank">https://devs.redux.io/core-extensions/google-maps.html</a>',
-		'subsection' => true,
-		'fields'     => array(
-			array(
-				'id'           => 'location_geocode',
-				'type'         => 'google_maps',
-				'title'        => esc_html__( 'Google Maps', 'your-textdomain-here' ),
-				'subtitle'     => esc_html__( 'This map is set using only address information with a zoom factor of 3.  Lat/Long is returned automatically.', 'your-textdomain-here' ),
-				'show_api_key' => true,
-				'default'      => array(
-					'zoom'                        => '17', // Zoom far: 3 zoom close 17.
-					'street_number'               => '1600', // Address.
-					'route'                       => 'Pennsylvania Avenue', // STREET.
-					'locality'                    => 'Washington', // CITY.
-					'administrative_area_level_1' => 'DC', // STATE.
-					'postal_code'                 => '20500',
-					'country'                     => 'United States',
-				),
-			),
-			array(
-				'id'           => 'location_geocode2',
-				'type'         => 'google_maps',
-				'title'        => esc_html__( 'Google Maps', 'your-textdomain-here' ),
-				'subtitle'     => esc_html__( 'This map is set using only latitude and longitude with a zoom factor of 7.  When setting a Google map using lat/long, address information will not be returned.', 'your-textdomain-here' ),
-				'show_api_key' => false,
-				'full_width'   => true,
-				'default'      => array(
-					'latitude'  => 38.8976758,
-					'longitude' => - 77.03648229999999,
-					'zoom'      => 7,
-				),
-			),
-		),
-	)
+    $opt_name,
+    array(
+        'title'      => esc_html__( 'Google Maps', 'your-textdomain-here' ),
+        'desc'       => esc_html__( 'For full documentation on this field, visit: ', 'your-textdomain-here' ) . '<a href="https://devs.redux.io/core-extensions/google-maps.html" target="_blank">https://devs.redux.io/core-extensions/google-maps.html</a>',
+        'subsection' => true,
+        'fields'     => array(
+            array(
+                'id'           => 'location_geocode',
+                'type'         => 'google_maps',
+                'title'        => esc_html__( 'Google Maps', 'your-textdomain-here' ),
+                'subtitle'     => esc_html__( 'This map is set using only address information with a zoom factor of 3.  Lat/Long is returned automatically.', 'your-textdomain-here' ),
+                'show_api_key' => true,
+                'default'      => array(
+                    'zoom'                        => '17', // Zoom far: 3 zoom close 17.
+                    'street_number'               => '1600', // Address.
+                    'route'                       => 'Pennsylvania Avenue', // STREET.
+                    'locality'                    => 'Washington', // CITY.
+                    'administrative_area_level_1' => 'DC', // STATE.
+                    'postal_code'                 => '20500',
+                    'country'                     => 'United States',
+                ),
+            ),
+            array(
+                'id'           => 'location_geocode2',
+                'type'         => 'google_maps',
+                'title'        => esc_html__( 'Google Maps', 'your-textdomain-here' ),
+                'subtitle'     => esc_html__( 'This map is set using only latitude and longitude with a zoom factor of 7.  When setting a Google map using lat/long, address information will not be returned.', 'your-textdomain-here' ),
+                'show_api_key' => false,
+                'full_width'   => true,
+                'default'      => array(
+                    'latitude'  => 38.8976758,
+                    'longitude' => - 77.03648229999999,
+                    'zoom'      => 7,
+                ),
+            ),
+        ),
+    )
 );
 // phpcs:enable

redux-core/inc/extensions/google_maps/google_maps/class-redux-google-maps.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 				'street_number'               => $def_street_number,
 				'route'                       => $def_route,
 				'locality'                    => $def_locality,
-				'administrative_area_level_1' => $def_state,    // <-dickheads at google. lol, srsly...wtf?
+				'administrative_area_level_1' => $def_state, // <-dickheads at google. lol, srsly...wtf?
 				// level_1 huh? maybe It's for multiple planets one day.
 				'postal_code'                 => $def_postal,
 				'country'                     => $def_country,

Indentation +187 added lines, -187 removed lines

@@ -11,145 +11,145 @@ 
 
 if ( ! class_exists( 'Redux_Google_Maps' ) ) {
 
-	/**
-	 * Main ReduxFramework_google_maps class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Google_Maps extends Redux_Field {
-
-		/**
-		 * API Key.
-		 *
-		 * @var string|null
-		 */
-		private ?string $api_key = '';
-
-		/**
-		 * Get field defaults.
-		 */
-		public function set_defaults() {
-			$field = array(
-				'api_key'     => '',
-				'map_version' => 'weekly',
-			);
-
-			$this->field = wp_parse_args( $this->field, $field );
-
-			$this->api_key = null;
-
-			$this->field['api_key'] = $this->field['api_key'] ?? '';
-
-			if ( empty( $this->field['api_key'] ) ) {
-				$redux         = get_option( $this->parent->args['opt_name'] );
-				$this->api_key = $redux['google_map_api_key'] ?? '';
-			} else {
-				$this->api_key = $this->field['api_key'];
-			}
-
-			// Necessary, in case the user doesn't fill out a default array.
-			$def_street_number = $this->field['default']['street_number'] ?? '';
-			$def_route         = $this->field['default']['route'] ?? '';
-			$def_locality      = $this->field['default']['locality'] ?? '';
-			$def_state         = $this->field['default']['administrative_area_level_1'] ?? '';
-			$def_postal        = $this->field['default']['postal_code'] ?? '';
-			$def_country       = $this->field['default']['country'] ?? '';
-			$def_lat           = $this->field['default']['latitude'] ?? '';
-			$def_long          = $this->field['default']['longitude'] ?? '';
-			$def_marker_info   = $this->field['default']['marker_info'] ?? '';
-			$def_zoom          = $this->field['default']['zoom'] ?? '';
-
-			$defaults = array(
-				'latitude'                    => $def_lat,
-				'longitude'                   => $def_long,
-				'street_number'               => $def_street_number,
-				'route'                       => $def_route,
-				'locality'                    => $def_locality,
-				'administrative_area_level_1' => $def_state,    // <-dickheads at google. lol, srsly...wtf?
-				// level_1 huh? maybe It's for multiple planets one day.
-				'postal_code'                 => $def_postal,
-				'country'                     => $def_country,
-				'marker_info'                 => $def_marker_info,
-				'zoom'                        => $def_zoom,
-			);
-
-			$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       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function render() {
-
-			// Set default or saved zoom
-			// USA: 39.11676722061108,-100.47761000000003
-			// Zoom far: 3
-			// zoom close 17.
-			if ( empty( $this->value['zoom'] ) ) {
-				if ( $this->value['street_number'] ) {
-					$the_zoom = 17; // make it close if the street is included.
-				} else {
-					$the_zoom = 3; // make it far if it's not.
-				}
-			} else {
-				$the_zoom = $this->value['zoom'];
-			}
-
-			// Make full address.
-			$locality = ! empty( $this->value['locality'] ) ? $this->value['locality'] . ', ' : '';
-			$route    = ! empty( $this->value['route'] ) ? $this->value['route'] . ', ' : '';
-			$country  = ! empty( $this->value['country'] ) ? ', ' . $this->value['country'] : '';
-
-			$full      = $this->value['street_number'] . ' ' . $route . ' ' . $locality . $this->value['administrative_area_level_1'] . ' ' . $this->value['postal_code'] . $country;
-			$data_full = rawurlencode( $full );
-
-			// Hide/show various input fields.
-			$show_address     = $this->field['show_address'] ?? true;
-			$show_city        = $this->field['show_city'] ?? true;
-			$show_state       = $this->field['show_state'] ?? true;
-			$show_postal      = $this->field['show_postal'] ?? true;
-			$show_country     = $this->field['show_country'] ?? true;
-			$show_lat         = $this->field['show_latitude'] ?? true;
-			$show_long        = $this->field['show_longitude'] ?? true;
-			$show_marker_info = $this->field['show_marker_info'] ?? true;
-			$show_controls    = $this->field['show_controls'] ?? true;
-
-			$this->field['placeholder']         = $this->field['placeholder'] ?? esc_html__( 'Enter your address', 'redux-framework' );
-			$this->field['marker_tooltip']      = $this->field['marker_tooltip'] ?? esc_html__( 'Left mouse down on top of me to move me!', 'redux-framework' );
-			$this->field['no_geometry_alert']   = $this->field['no_geometry_alert'] ?? esc_html__( 'The returned place contains no geometric data.', 'redux-framework' );
-			$this->field['delay_render']        = $this->field['delay_render'] ?? false;
-			$this->field['class']               = $this->field['class'] ?? '';
-			$this->field['show_api_key']        = $this->field['show_api_key'] ?? true;
-			$this->field['street_view_control'] = $this->field['street_view_control'] ?? true;
-			$this->field['map_type_control']    = $this->field['map_type_control'] ?? true;
-			$this->field['scroll_wheel']        = $this->field['scroll_wheel'] ?? false;
-			$this->field['map_height']          = $this->field['map_height'] ?? '';
-
-			$map_height = '';
-
-			if ( ! empty( $this->field['map_height'] ) ) {
-				$map_height = 'style="height:' . esc_attr( $this->field['map_height'] ) . ';"';
-			}
-
-			$geo_alert = rawurlencode( $this->field['no_geometry_alert'] );
-
-			// admin defined.
-			$the_lat        = $this->value['latitude'];
-			$the_long       = $this->value['longitude'];
-			$marker_tooltip = rawurlencode( $this->field['marker_tooltip'] );
-
-			if ( ! empty( $the_lat ) && ! empty( $the_long ) ) {
-				$full = '';
-			}
-
-			$hidden_style = ' style="display: none!important;" ';
-			?>
+    /**
+     * Main ReduxFramework_google_maps class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Google_Maps extends Redux_Field {
+
+        /**
+         * API Key.
+         *
+         * @var string|null
+         */
+        private ?string $api_key = '';
+
+        /**
+         * Get field defaults.
+         */
+        public function set_defaults() {
+            $field = array(
+                'api_key'     => '',
+                'map_version' => 'weekly',
+            );
+
+            $this->field = wp_parse_args( $this->field, $field );
+
+            $this->api_key = null;
+
+            $this->field['api_key'] = $this->field['api_key'] ?? '';
+
+            if ( empty( $this->field['api_key'] ) ) {
+                $redux         = get_option( $this->parent->args['opt_name'] );
+                $this->api_key = $redux['google_map_api_key'] ?? '';
+            } else {
+                $this->api_key = $this->field['api_key'];
+            }
+
+            // Necessary, in case the user doesn't fill out a default array.
+            $def_street_number = $this->field['default']['street_number'] ?? '';
+            $def_route         = $this->field['default']['route'] ?? '';
+            $def_locality      = $this->field['default']['locality'] ?? '';
+            $def_state         = $this->field['default']['administrative_area_level_1'] ?? '';
+            $def_postal        = $this->field['default']['postal_code'] ?? '';
+            $def_country       = $this->field['default']['country'] ?? '';
+            $def_lat           = $this->field['default']['latitude'] ?? '';
+            $def_long          = $this->field['default']['longitude'] ?? '';
+            $def_marker_info   = $this->field['default']['marker_info'] ?? '';
+            $def_zoom          = $this->field['default']['zoom'] ?? '';
+
+            $defaults = array(
+                'latitude'                    => $def_lat,
+                'longitude'                   => $def_long,
+                'street_number'               => $def_street_number,
+                'route'                       => $def_route,
+                'locality'                    => $def_locality,
+                'administrative_area_level_1' => $def_state,    // <-dickheads at google. lol, srsly...wtf?
+                // level_1 huh? maybe It's for multiple planets one day.
+                'postal_code'                 => $def_postal,
+                'country'                     => $def_country,
+                'marker_info'                 => $def_marker_info,
+                'zoom'                        => $def_zoom,
+            );
+
+            $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       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function render() {
+
+            // Set default or saved zoom
+            // USA: 39.11676722061108,-100.47761000000003
+            // Zoom far: 3
+            // zoom close 17.
+            if ( empty( $this->value['zoom'] ) ) {
+                if ( $this->value['street_number'] ) {
+                    $the_zoom = 17; // make it close if the street is included.
+                } else {
+                    $the_zoom = 3; // make it far if it's not.
+                }
+            } else {
+                $the_zoom = $this->value['zoom'];
+            }
+
+            // Make full address.
+            $locality = ! empty( $this->value['locality'] ) ? $this->value['locality'] . ', ' : '';
+            $route    = ! empty( $this->value['route'] ) ? $this->value['route'] . ', ' : '';
+            $country  = ! empty( $this->value['country'] ) ? ', ' . $this->value['country'] : '';
+
+            $full      = $this->value['street_number'] . ' ' . $route . ' ' . $locality . $this->value['administrative_area_level_1'] . ' ' . $this->value['postal_code'] . $country;
+            $data_full = rawurlencode( $full );
+
+            // Hide/show various input fields.
+            $show_address     = $this->field['show_address'] ?? true;
+            $show_city        = $this->field['show_city'] ?? true;
+            $show_state       = $this->field['show_state'] ?? true;
+            $show_postal      = $this->field['show_postal'] ?? true;
+            $show_country     = $this->field['show_country'] ?? true;
+            $show_lat         = $this->field['show_latitude'] ?? true;
+            $show_long        = $this->field['show_longitude'] ?? true;
+            $show_marker_info = $this->field['show_marker_info'] ?? true;
+            $show_controls    = $this->field['show_controls'] ?? true;
+
+            $this->field['placeholder']         = $this->field['placeholder'] ?? esc_html__( 'Enter your address', 'redux-framework' );
+            $this->field['marker_tooltip']      = $this->field['marker_tooltip'] ?? esc_html__( 'Left mouse down on top of me to move me!', 'redux-framework' );
+            $this->field['no_geometry_alert']   = $this->field['no_geometry_alert'] ?? esc_html__( 'The returned place contains no geometric data.', 'redux-framework' );
+            $this->field['delay_render']        = $this->field['delay_render'] ?? false;
+            $this->field['class']               = $this->field['class'] ?? '';
+            $this->field['show_api_key']        = $this->field['show_api_key'] ?? true;
+            $this->field['street_view_control'] = $this->field['street_view_control'] ?? true;
+            $this->field['map_type_control']    = $this->field['map_type_control'] ?? true;
+            $this->field['scroll_wheel']        = $this->field['scroll_wheel'] ?? false;
+            $this->field['map_height']          = $this->field['map_height'] ?? '';
+
+            $map_height = '';
+
+            if ( ! empty( $this->field['map_height'] ) ) {
+                $map_height = 'style="height:' . esc_attr( $this->field['map_height'] ) . ';"';
+            }
+
+            $geo_alert = rawurlencode( $this->field['no_geometry_alert'] );
+
+            // admin defined.
+            $the_lat        = $this->value['latitude'];
+            $the_long       = $this->value['longitude'];
+            $marker_tooltip = rawurlencode( $this->field['marker_tooltip'] );
+
+            if ( ! empty( $the_lat ) && ! empty( $the_long ) ) {
+                $full = '';
+            }
+
+            $hidden_style = ' style="display: none!important;" ';
+            ?>
 
 			<div
 				class="redux_framework_google_maps <?php echo esc_attr( $this->field['class'] ); ?>"
@@ -317,12 +317,12 @@ 
 						<div class="google_m_api_key_wrapper">
 							<p class="description" id="google_m_api_key_description">
 								<?php
-								$api_key_site     = ' ' . sprintf( '<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank">%s</a>', esc_html__( 'Get an API Key', 'redux-framework' ) ) . ' ';
-								$usage_limit_site = ' ' . sprintf( '<a href="https://developers.google.com/maps/documentation/javascript/usage" target="_blank">%s</a>', esc_html__( 'Google Map Usage Limits', 'redux-framework' ) ) . ' ';
+                                $api_key_site     = ' ' . sprintf( '<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank">%s</a>', esc_html__( 'Get an API Key', 'redux-framework' ) ) . ' ';
+                                $usage_limit_site = ' ' . sprintf( '<a href="https://developers.google.com/maps/documentation/javascript/usage" target="_blank">%s</a>', esc_html__( 'Google Map Usage Limits', 'redux-framework' ) ) . ' ';
 
-								// translators: %1$s: Google Maps API Key url. %2$s: Google Maps Usage URL.
-								echo sprintf( esc_html__( 'Google Maps supports 25,000 free map loads per 24 hours for 90 consecutive days.  In the events you run a high volume site, you may need to obtain an API Key to continue using Google Map output beyond the free quota.  To sign up for an API Key, please visit the %1$s site.  For more information about Google Map usage limits, please visit the %2$s guide.', 'redux-framework' ), $api_key_site, $usage_limit_site ) . '<br><br>' . esc_html__( 'Once you have obtained an API Key, please enter it in the text box below and save the options panel.', 'redux-framework' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-								?>
+                                // translators: %1$s: Google Maps API Key url. %2$s: Google Maps Usage URL.
+                                echo sprintf( esc_html__( 'Google Maps supports 25,000 free map loads per 24 hours for 90 consecutive days.  In the events you run a high volume site, you may need to obtain an API Key to continue using Google Map output beyond the free quota.  To sign up for an API Key, please visit the %1$s site.  For more information about Google Map usage limits, please visit the %2$s guide.', 'redux-framework' ), $api_key_site, $usage_limit_site ) . '<br><br>' . esc_html__( 'Once you have obtained an API Key, please enter it in the text box below and save the options panel.', 'redux-framework' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                                ?>
 							</p>
 							<label for="google_m_api_key_input"><?php esc_html_e( 'API Key', 'redux-framework' ); ?></label>
 							<input
@@ -336,51 +336,51 @@ 
 			</div>
 
 			<?php
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			$min = Redux_Functions::isMin();
-
-			$api_key = '';
-			if ( ! empty( $this->api_key ) ) {
-				$api_key = $this->api_key;
-			}
-
-			wp_register_script(
-				'redux-field-google-maps',
-				$this->url . 'redux-google-maps' . $min . '.js',
-				array( 'jquery', 'redux-js' ),
-				Redux_Extension_Google_Maps::$version,
-				true
-			);
-
-			if ( ! wp_script_is( 'redux-field-google-maps' ) ) {
-				$script = '(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
+        }
+
+        /**
+         * 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::isMin();
+
+            $api_key = '';
+            if ( ! empty( $this->api_key ) ) {
+                $api_key = $this->api_key;
+            }
+
+            wp_register_script(
+                'redux-field-google-maps',
+                $this->url . 'redux-google-maps' . $min . '.js',
+                array( 'jquery', 'redux-js' ),
+                Redux_Extension_Google_Maps::$version,
+                true
+            );
+
+            if ( ! wp_script_is( 'redux-field-google-maps' ) ) {
+                $script = '(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
 					key:"' . $api_key . '",
 					v:"' . $this->field['map_version'] . '",
 				});';
 
-				wp_add_inline_script( 'redux-field-google-maps', $script );
-			}
-
-			wp_enqueue_script( 'redux-field-google-maps' );
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-google-maps',
-					$this->url . 'redux-google-maps.css',
-					array(),
-					Redux_Extension_Google_Maps::$version
-				);
-			}
-		}
-	}
+                wp_add_inline_script( 'redux-field-google-maps', $script );
+            }
+
+            wp_enqueue_script( 'redux-field-google-maps' );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-google-maps',
+                    $this->url . 'redux-google-maps.css',
+                    array(),
+                    Redux_Extension_Google_Maps::$version
+                );
+            }
+        }
+    }
 }

redux-core/inc/extensions/custom_fonts/custom_fonts/class-redux-custom-fonts.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 			$nonce = wp_create_nonce( 'redux_custom_fonts' );
 
-			$this->field['custom_fonts'] = apply_filters( "redux/{$this->parent->args[ 'opt_name' ]}/field/typography/custom_fonts", array() ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+			$this->field['custom_fonts'] = apply_filters( "redux/{$this->parent->args['opt_name']}/field/typography/custom_fonts", array() ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
 
 			if ( $can_convert ) {
 				echo '<div class="">';

Indentation +185 added lines, -185 removed lines

@@ -11,194 +11,194 @@
 
 if ( ! class_exists( 'Redux_Custom_Fonts' ) ) {
 
-	/**
-	 * Main ReduxFramework_custom_fonts class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Custom_Fonts extends Redux_Field {
-
-		/**
-		 * Set field defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'convert' => false,
-				'eot'     => false,
-				'svg'     => false,
-				'ttf'     => false,
-				'woff'    => true,
-				'woff2'   => true,
-			);
-
-			$this->value = wp_parse_args( $this->value, $defaults );
-		}
-
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      public
-		 */
-		public function render() {
-			echo '</fieldset></td></tr>';
-			echo '<tr>';
-			echo '<td colspan="2">';
-			echo '<fieldset
+    /**
+     * Main ReduxFramework_custom_fonts class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Custom_Fonts extends Redux_Field {
+
+        /**
+         * Set field defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'convert' => false,
+                'eot'     => false,
+                'svg'     => false,
+                'ttf'     => false,
+                'woff'    => true,
+                'woff2'   => true,
+            );
+
+            $this->value = wp_parse_args( $this->value, $defaults );
+        }
+
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      public
+         */
+        public function render() {
+            echo '</fieldset></td></tr>';
+            echo '<tr>';
+            echo '<td colspan="2">';
+            echo '<fieldset
                     class="redux-field-container redux-field redux-field-init redux-container-custom_font"
                     data-type="' . esc_attr( $this->field['type'] ) . '"
                     data-id="' . esc_attr( $this->field['id'] ) . '"
                   >';
 
-			$can_convert = true;
-
-			$nonce = wp_create_nonce( 'redux_custom_fonts' );
-
-			$this->field['custom_fonts'] = apply_filters( "redux/{$this->parent->args[ 'opt_name' ]}/field/typography/custom_fonts", array() ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
-
-			if ( $can_convert ) {
-				echo '<div class="">';
-				echo '<label for="custom-font-convert">';
-				echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] ) . '[convert]" value="' . esc_attr( $this->value['convert'] ) . '"/>';
-				echo '<input type="checkbox" class="checkbox" id="custom-font-convert" value="1"' . checked( $this->value['convert'], '1', false ) . '">';
-				echo 'Enable font conversion';
-				echo '</label>';
-				echo '</div>';
-				echo '</div>';
-			}
-
-			if ( ! empty( $this->field['custom_fonts'] ) ) {
-				foreach ( $this->field['custom_fonts'] as $section => $fonts ) {
-					if ( empty( $fonts ) ) {
-						continue;
-					}
-
-					echo '<h3>' . esc_html( $section ) . '</h3>';
-					echo '<div class="font-error" style="display: none;"><p><strong>' . esc_html__( 'Error', 'redux-framework' ) . '</strong>: <span></span></p></div>';
-
-					echo '<table class="wp-list-table widefat plugins" style="border-spacing:0;"><tbody>';
-
-					foreach ( $fonts as $font => $pieces ) {
-						echo '<tr class="active">';
-						echo '<td class="plugin-title" style="min-width: 40%"><strong>' . esc_html( $font ) . '</strong></td>';
-						echo '<td class="column-description desc">';
-						echo '<div class="plugin-description">';
-
-						if ( is_array( $pieces ) && ! empty( $pieces ) ) {
-							foreach ( $pieces as $piece ) {
-								echo '<span class="button button-primary button-small font-pieces">' . esc_html( $piece ) . '</span>';
-							}
-						}
-
-						echo '</div>';
-						echo '</td>';
-						echo '<td style="width: 140px;"><div class="action-row visible">';
-						echo '<span style="display:none;"><a href="#" class="rename">Rename</a> | </span>';
-						echo '<a href="#" class="fontDelete delete" data-section="' . esc_attr( $section ) . '" data-name="' . esc_attr( $font ) . '" data-type="delete">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>';
-						echo '<span class="spinner" style="display:none; visibility: visible;"></span>';
-						echo '</div>';
-						echo '</td>';
-						echo '</tr>';
-					}
-
-					echo '</tbody></table>';
-				}
-
-				echo '<div class="upload_button_div"><span class="button media_add_font" data-nonce="' . esc_attr( $nonce ) . '" id="' . esc_attr( $this->field['id'] ) . '-custom_fonts">' . esc_html__( 'Add Font', 'redux-framework' ) . '</span></div><br />';
-			} else {
-				echo '<h3>' . esc_html__( 'No Custom Fonts Found', 'redux-framework' ) . '</h3>';
-				echo '<div class="upload_button_div"><span class="button media_add_font" data-nonce="' . esc_attr( $nonce ) . '" id="' . esc_attr( $this->field['id'] ) . '-custom_fonts">' . esc_html__( 'Add Font', 'redux-framework' ) . '</span></div>';
-			}
-
-			echo '</fieldset></td></tr>';
-		}
-
-		/**
-		 * Functions to pass data from the PHP to the JS at render time.
-		 *
-		 * @param array  $field Field.
-		 * @param string $value Value.
-		 *
-		 * @return array
-		 */
-		public function localize( $field, $value = '' ): array {
-			$params = array();
-
-			if ( ! isset( $field['mode'] ) ) {
-				$field['mode'] = 'image';
-			}
-
-			$params['mode'] = $field['mode'];
-
-			if ( empty( $value ) && isset( $this->value ) ) {
-				$value = $this->value;
-			}
-
-			$params['val'] = $value;
-
-			return $params;
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @return      void
-		 * @since       1.0.0
-		 * @access      public
-		 */
-		public function enqueue() {
-			$min = Redux_Functions::isMin();
-
-			wp_enqueue_script(
-				'redux-field-custom-fonts',
-				$this->url . '/redux-custom-fonts' . $min . '.js',
-				array( 'jquery', 'redux-block-ui' ),
-				Redux_Extension_Custom_Fonts::$version,
-				true
-			);
-
-			wp_localize_script(
-				'redux-field-custom-fonts',
-				'redux_custom_fonts_l10',
-				apply_filters(
-					'redux_custom_fonts_localized_data',
-					array(
-						'delete_error' => esc_html__( 'There was an error deleting your font:', 'redux-framework' ),
-						'unzip'        => esc_html__( 'Unzipping archive and generating any missing font files.', 'redux-framework' ),
-						'convert'      => esc_html__( 'Converting font file(s)...', 'redux-framework' ),
-						'partial'      => esc_html__( 'The only file(s) imported were those uploaded.  Please refresh the page to continue (making note of any errors before doing so, please).', 'redux-framework' ),
-						'unknown'      => esc_html__( 'An unknown error occurred. Please try again.', 'redux-framework' ),
-						'complete'     => esc_html__( 'Conversion complete.  Refreshing page...', 'redux-framework' ),
-						'media_title'  => esc_html__( 'Choose Font file or ZIP of font files.', 'redux-framework' ),
-						'media_button' => esc_html__( 'Update', 'redux-framework' ),
-					)
-				)
-			);
-
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-custom-fonts',
-					$this->url . 'redux-custom-fonts.css',
-					array(),
-					Redux_Extension_Custom_Fonts::$version
-				);
-			}
-
-			$class = Redux_Extension_Custom_Fonts::$instance;
-
-			if ( ! empty( $class->custom_fonts ) ) {
-				if ( file_exists( $class->upload_dir . 'fonts.css' ) ) {
-					wp_enqueue_style(
-						'redux-custom_fonts',
-						$class->upload_url . 'fonts.css',
-						array(),
-						filemtime( $class->upload_dir . 'fonts.css' )
-					);
-				}
-			}
-		}
-	}
+            $can_convert = true;
+
+            $nonce = wp_create_nonce( 'redux_custom_fonts' );
+
+            $this->field['custom_fonts'] = apply_filters( "redux/{$this->parent->args[ 'opt_name' ]}/field/typography/custom_fonts", array() ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+
+            if ( $can_convert ) {
+                echo '<div class="">';
+                echo '<label for="custom-font-convert">';
+                echo '<input type="hidden" class="checkbox-check" data-val="1" name="' . esc_attr( $this->field['name'] ) . '[convert]" value="' . esc_attr( $this->value['convert'] ) . '"/>';
+                echo '<input type="checkbox" class="checkbox" id="custom-font-convert" value="1"' . checked( $this->value['convert'], '1', false ) . '">';
+                echo 'Enable font conversion';
+                echo '</label>';
+                echo '</div>';
+                echo '</div>';
+            }
+
+            if ( ! empty( $this->field['custom_fonts'] ) ) {
+                foreach ( $this->field['custom_fonts'] as $section => $fonts ) {
+                    if ( empty( $fonts ) ) {
+                        continue;
+                    }
+
+                    echo '<h3>' . esc_html( $section ) . '</h3>';
+                    echo '<div class="font-error" style="display: none;"><p><strong>' . esc_html__( 'Error', 'redux-framework' ) . '</strong>: <span></span></p></div>';
+
+                    echo '<table class="wp-list-table widefat plugins" style="border-spacing:0;"><tbody>';
+
+                    foreach ( $fonts as $font => $pieces ) {
+                        echo '<tr class="active">';
+                        echo '<td class="plugin-title" style="min-width: 40%"><strong>' . esc_html( $font ) . '</strong></td>';
+                        echo '<td class="column-description desc">';
+                        echo '<div class="plugin-description">';
+
+                        if ( is_array( $pieces ) && ! empty( $pieces ) ) {
+                            foreach ( $pieces as $piece ) {
+                                echo '<span class="button button-primary button-small font-pieces">' . esc_html( $piece ) . '</span>';
+                            }
+                        }
+
+                        echo '</div>';
+                        echo '</td>';
+                        echo '<td style="width: 140px;"><div class="action-row visible">';
+                        echo '<span style="display:none;"><a href="#" class="rename">Rename</a> | </span>';
+                        echo '<a href="#" class="fontDelete delete" data-section="' . esc_attr( $section ) . '" data-name="' . esc_attr( $font ) . '" data-type="delete">' . esc_html__( 'Delete', 'redux-framework' ) . '</a>';
+                        echo '<span class="spinner" style="display:none; visibility: visible;"></span>';
+                        echo '</div>';
+                        echo '</td>';
+                        echo '</tr>';
+                    }
+
+                    echo '</tbody></table>';
+                }
+
+                echo '<div class="upload_button_div"><span class="button media_add_font" data-nonce="' . esc_attr( $nonce ) . '" id="' . esc_attr( $this->field['id'] ) . '-custom_fonts">' . esc_html__( 'Add Font', 'redux-framework' ) . '</span></div><br />';
+            } else {
+                echo '<h3>' . esc_html__( 'No Custom Fonts Found', 'redux-framework' ) . '</h3>';
+                echo '<div class="upload_button_div"><span class="button media_add_font" data-nonce="' . esc_attr( $nonce ) . '" id="' . esc_attr( $this->field['id'] ) . '-custom_fonts">' . esc_html__( 'Add Font', 'redux-framework' ) . '</span></div>';
+            }
+
+            echo '</fieldset></td></tr>';
+        }
+
+        /**
+         * Functions to pass data from the PHP to the JS at render time.
+         *
+         * @param array  $field Field.
+         * @param string $value Value.
+         *
+         * @return array
+         */
+        public function localize( $field, $value = '' ): array {
+            $params = array();
+
+            if ( ! isset( $field['mode'] ) ) {
+                $field['mode'] = 'image';
+            }
+
+            $params['mode'] = $field['mode'];
+
+            if ( empty( $value ) && isset( $this->value ) ) {
+                $value = $this->value;
+            }
+
+            $params['val'] = $value;
+
+            return $params;
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @return      void
+         * @since       1.0.0
+         * @access      public
+         */
+        public function enqueue() {
+            $min = Redux_Functions::isMin();
+
+            wp_enqueue_script(
+                'redux-field-custom-fonts',
+                $this->url . '/redux-custom-fonts' . $min . '.js',
+                array( 'jquery', 'redux-block-ui' ),
+                Redux_Extension_Custom_Fonts::$version,
+                true
+            );
+
+            wp_localize_script(
+                'redux-field-custom-fonts',
+                'redux_custom_fonts_l10',
+                apply_filters(
+                    'redux_custom_fonts_localized_data',
+                    array(
+                        'delete_error' => esc_html__( 'There was an error deleting your font:', 'redux-framework' ),
+                        'unzip'        => esc_html__( 'Unzipping archive and generating any missing font files.', 'redux-framework' ),
+                        'convert'      => esc_html__( 'Converting font file(s)...', 'redux-framework' ),
+                        'partial'      => esc_html__( 'The only file(s) imported were those uploaded.  Please refresh the page to continue (making note of any errors before doing so, please).', 'redux-framework' ),
+                        'unknown'      => esc_html__( 'An unknown error occurred. Please try again.', 'redux-framework' ),
+                        'complete'     => esc_html__( 'Conversion complete.  Refreshing page...', 'redux-framework' ),
+                        'media_title'  => esc_html__( 'Choose Font file or ZIP of font files.', 'redux-framework' ),
+                        'media_button' => esc_html__( 'Update', 'redux-framework' ),
+                    )
+                )
+            );
+
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-custom-fonts',
+                    $this->url . 'redux-custom-fonts.css',
+                    array(),
+                    Redux_Extension_Custom_Fonts::$version
+                );
+            }
+
+            $class = Redux_Extension_Custom_Fonts::$instance;
+
+            if ( ! empty( $class->custom_fonts ) ) {
+                if ( file_exists( $class->upload_dir . 'fonts.css' ) ) {
+                    wp_enqueue_style(
+                        'redux-custom_fonts',
+                        $class->upload_url . 'fonts.css',
+                        array(),
+                        filemtime( $class->upload_dir . 'fonts.css' )
+                    );
+                }
+            }
+        }
+    }
 }

redux-core/inc/lib/dashicons.php

Indentation +351 added lines, -351 removed lines

@@ -16,355 +16,355 @@
  * @return array
  */
 function redux_get_dashicons(): array {
-	return array(
-		'dashicons dashicons-admin-appearance',
-		'dashicons dashicons-admin-collapse',
-		'dashicons dashicons-admin-comments',
-		'dashicons dashicons-admin-customizer',
-		'dashicons dashicons-admin-generic',
-		'dashicons dashicons-admin-home',
-		'dashicons dashicons-admin-links',
-		'dashicons dashicons-admin-media',
-		'dashicons dashicons-admin-multisite',
-		'dashicons dashicons-admin-network',
-		'dashicons dashicons-admin-page',
-		'dashicons dashicons-admin-plugins',
-		'dashicons dashicons-admin-post',
-		'dashicons dashicons-admin-settings',
-		'dashicons dashicons-admin-site-alt',
-		'dashicons dashicons-admin-site-alt2',
-		'dashicons dashicons-admin-site-alt3',
-		'dashicons dashicons-admin-site',
-		'dashicons dashicons-admin-tools',
-		'dashicons dashicons-admin-users',
-		'dashicons dashicons-airplane',
-		'dashicons dashicons-album',
-		'dashicons dashicons-align-center',
-		'dashicons dashicons-align-full-width',
-		'dashicons dashicons-align-left',
-		'dashicons dashicons-align-none',
-		'dashicons dashicons-align-pull-left',
-		'dashicons dashicons-align-pull-right',
-		'dashicons dashicons-align-right',
-		'dashicons dashicons-align-wide',
-		'dashicons dashicons-amazon',
-		'dashicons dashicons-analytics',
-		'dashicons dashicons-archive',
-		'dashicons dashicons-arrow-down-alt',
-		'dashicons dashicons-arrow-down-alt2',
-		'dashicons dashicons-arrow-down',
-		'dashicons dashicons-arrow-left-alt',
-		'dashicons dashicons-arrow-left-alt2',
-		'dashicons dashicons-arrow-left',
-		'dashicons dashicons-arrow-right-alt',
-		'dashicons dashicons-arrow-right-alt2',
-		'dashicons dashicons-arrow-right',
-		'dashicons dashicons-arrow-up-alt',
-		'dashicons dashicons-arrow-up-alt2',
-		'dashicons dashicons-arrow-up-duplicate',
-		'dashicons dashicons-arrow-up',
-		'dashicons dashicons-art',
-		'dashicons dashicons-awards',
-		'dashicons dashicons-backup',
-		'dashicons dashicons-bank',
-		'dashicons dashicons-beer',
-		'dashicons dashicons-bell',
-		'dashicons dashicons-block-default',
-		'dashicons dashicons-book-alt',
-		'dashicons dashicons-book',
-		'dashicons dashicons-buddicons-activity',
-		'dashicons dashicons-buddicons-bbpress-logo',
-		'dashicons dashicons-buddicons-buddypress-logo',
-		'dashicons dashicons-buddicons-community',
-		'dashicons dashicons-buddicons-forums',
-		'dashicons dashicons-buddicons-friends',
-		'dashicons dashicons-buddicons-groups',
-		'dashicons dashicons-buddicons-pm',
-		'dashicons dashicons-buddicons-replies',
-		'dashicons dashicons-buddicons-topics',
-		'dashicons dashicons-buddicons-tracking',
-		'dashicons dashicons-building',
-		'dashicons dashicons-businessman',
-		'dashicons dashicons-businessperson',
-		'dashicons dashicons-businesswoman',
-		'dashicons dashicons-button',
-		'dashicons dashicons-calculator',
-		'dashicons dashicons-calendar-alt',
-		'dashicons dashicons-calendar',
-		'dashicons dashicons-camera-alt',
-		'dashicons dashicons-camera',
-		'dashicons dashicons-car',
-		'dashicons dashicons-carrot',
-		'dashicons dashicons-cart',
-		'dashicons dashicons-category',
-		'dashicons dashicons-chart-area',
-		'dashicons dashicons-chart-bar',
-		'dashicons dashicons-chart-line',
-		'dashicons dashicons-chart-pie',
-		'dashicons dashicons-clipboard',
-		'dashicons dashicons-clock',
-		'dashicons dashicons-cloud-saved',
-		'dashicons dashicons-cloud-upload',
-		'dashicons dashicons-cloud',
-		'dashicons dashicons-code-standards',
-		'dashicons dashicons-coffee',
-		'dashicons dashicons-color-picker',
-		'dashicons dashicons-columns',
-		'dashicons dashicons-controls-back',
-		'dashicons dashicons-controls-forward',
-		'dashicons dashicons-controls-pause',
-		'dashicons dashicons-controls-play',
-		'dashicons dashicons-controls-repeat',
-		'dashicons dashicons-controls-skipback',
-		'dashicons dashicons-controls-skipforward',
-		'dashicons dashicons-controls-volumeoff',
-		'dashicons dashicons-controls-volumeon',
-		'dashicons dashicons-cover-image',
-		'dashicons dashicons-dashboard',
-		'dashicons dashicons-database-add',
-		'dashicons dashicons-database-export',
-		'dashicons dashicons-database-import',
-		'dashicons dashicons-database-remove',
-		'dashicons dashicons-database-view',
-		'dashicons dashicons-database',
-		'dashicons dashicons-desktop',
-		'dashicons dashicons-dismiss',
-		'dashicons dashicons-download',
-		'dashicons dashicons-drumstick',
-		'dashicons dashicons-edit-large',
-		'dashicons dashicons-edit-page',
-		'dashicons dashicons-edit',
-		'dashicons dashicons-editor-aligncenter',
-		'dashicons dashicons-editor-alignleft',
-		'dashicons dashicons-editor-alignright',
-		'dashicons dashicons-editor-bold',
-		'dashicons dashicons-editor-break',
-		'dashicons dashicons-editor-code-duplicate',
-		'dashicons dashicons-editor-code',
-		'dashicons dashicons-editor-contract',
-		'dashicons dashicons-editor-customchar',
-		'dashicons dashicons-editor-expand',
-		'dashicons dashicons-editor-help',
-		'dashicons dashicons-editor-indent',
-		'dashicons dashicons-editor-insertmore',
-		'dashicons dashicons-editor-italic',
-		'dashicons dashicons-editor-justify',
-		'dashicons dashicons-editor-kitchensink',
-		'dashicons dashicons-editor-ltr',
-		'dashicons dashicons-editor-ol-rtl',
-		'dashicons dashicons-editor-ol',
-		'dashicons dashicons-editor-outdent',
-		'dashicons dashicons-editor-paragraph',
-		'dashicons dashicons-editor-paste-text',
-		'dashicons dashicons-editor-paste-word',
-		'dashicons dashicons-editor-quote',
-		'dashicons dashicons-editor-removeformatting',
-		'dashicons dashicons-editor-rtl',
-		'dashicons dashicons-editor-spellcheck',
-		'dashicons dashicons-editor-strikethrough',
-		'dashicons dashicons-editor-table',
-		'dashicons dashicons-editor-textcolor',
-		'dashicons dashicons-editor-ul',
-		'dashicons dashicons-editor-underline',
-		'dashicons dashicons-editor-unlink',
-		'dashicons dashicons-editor-video',
-		'dashicons dashicons-ellipsis',
-		'dashicons dashicons-email-alt',
-		'dashicons dashicons-email-alt2',
-		'dashicons dashicons-email',
-		'dashicons dashicons-embed-audio',
-		'dashicons dashicons-embed-generic',
-		'dashicons dashicons-embed-photo',
-		'dashicons dashicons-embed-post',
-		'dashicons dashicons-embed-video',
-		'dashicons dashicons-excerpt-view',
-		'dashicons dashicons-exit',
-		'dashicons dashicons-external',
-		'dashicons dashicons-facebook-alt',
-		'dashicons dashicons-facebook',
-		'dashicons dashicons-feedback',
-		'dashicons dashicons-filter',
-		'dashicons dashicons-flag',
-		'dashicons dashicons-food',
-		'dashicons dashicons-format-aside',
-		'dashicons dashicons-format-audio',
-		'dashicons dashicons-format-chat',
-		'dashicons dashicons-format-gallery',
-		'dashicons dashicons-format-image',
-		'dashicons dashicons-format-quote',
-		'dashicons dashicons-format-status',
-		'dashicons dashicons-format-video',
-		'dashicons dashicons-forms',
-		'dashicons dashicons-fullscreen-alt',
-		'dashicons dashicons-fullscreen-exit-alt',
-		'dashicons dashicons-games',
-		'dashicons dashicons-google',
-		'dashicons dashicons-googleplus',
-		'dashicons dashicons-grid-view',
-		'dashicons dashicons-groups',
-		'dashicons dashicons-hammer',
-		'dashicons dashicons-heading',
-		'dashicons dashicons-heart',
-		'dashicons dashicons-hidden',
-		'dashicons dashicons-hourglass',
-		'dashicons dashicons-html',
-		'dashicons dashicons-id-alt',
-		'dashicons dashicons-id',
-		'dashicons dashicons-image-crop',
-		'dashicons dashicons-image-filter',
-		'dashicons dashicons-image-flip-horizontal',
-		'dashicons dashicons-image-flip-vertical',
-		'dashicons dashicons-image-rotate-left',
-		'dashicons dashicons-image-rotate-right',
-		'dashicons dashicons-image-rotate',
-		'dashicons dashicons-images-alt',
-		'dashicons dashicons-images-alt2',
-		'dashicons dashicons-index-card',
-		'dashicons dashicons-info-outline',
-		'dashicons dashicons-info',
-		'dashicons dashicons-insert-after',
-		'dashicons dashicons-insert-before',
-		'dashicons dashicons-insert',
-		'dashicons dashicons-instagram',
-		'dashicons dashicons-laptop',
-		'dashicons dashicons-layout',
-		'dashicons dashicons-leftright',
-		'dashicons dashicons-lightbulb',
-		'dashicons dashicons-linkedin',
-		'dashicons dashicons-list-view',
-		'dashicons dashicons-location-alt',
-		'dashicons dashicons-location',
-		'dashicons dashicons-lock-duplicate',
-		'dashicons dashicons-lock',
-		'dashicons dashicons-marker',
-		'dashicons dashicons-media-archive',
-		'dashicons dashicons-media-audio',
-		'dashicons dashicons-media-code',
-		'dashicons dashicons-media-default',
-		'dashicons dashicons-media-document',
-		'dashicons dashicons-media-interactive',
-		'dashicons dashicons-media-spreadsheet',
-		'dashicons dashicons-media-text',
-		'dashicons dashicons-media-video',
-		'dashicons dashicons-megaphone',
-		'dashicons dashicons-menu-alt',
-		'dashicons dashicons-menu-alt2',
-		'dashicons dashicons-menu-alt3',
-		'dashicons dashicons-menu',
-		'dashicons dashicons-microphone',
-		'dashicons dashicons-migrate',
-		'dashicons dashicons-minus',
-		'dashicons dashicons-money-alt',
-		'dashicons dashicons-money',
-		'dashicons dashicons-move',
-		'dashicons dashicons-nametag',
-		'dashicons dashicons-networking',
-		'dashicons dashicons-no-alt',
-		'dashicons dashicons-no',
-		'dashicons dashicons-open-folder',
-		'dashicons dashicons-palmtree',
-		'dashicons dashicons-paperclip',
-		'dashicons dashicons-pdf',
-		'dashicons dashicons-performance',
-		'dashicons dashicons-pets',
-		'dashicons dashicons-phone',
-		'dashicons dashicons-pinterest',
-		'dashicons dashicons-playlist-audio',
-		'dashicons dashicons-playlist-video',
-		'dashicons dashicons-plugins-checked',
-		'dashicons dashicons-plus-alt',
-		'dashicons dashicons-plus-alt2',
-		'dashicons dashicons-plus',
-		'dashicons dashicons-podio',
-		'dashicons dashicons-portfolio',
-		'dashicons dashicons-post-status',
-		'dashicons dashicons-pressthis',
-		'dashicons dashicons-printer',
-		'dashicons dashicons-privacy',
-		'dashicons dashicons-products',
-		'dashicons dashicons-randomize',
-		'dashicons dashicons-reddit',
-		'dashicons dashicons-redo',
-		'dashicons dashicons-remove',
-		'dashicons dashicons-rest-api',
-		'dashicons dashicons-rss',
-		'dashicons dashicons-saved',
-		'dashicons dashicons-schedule',
-		'dashicons dashicons-screenoptions',
-		'dashicons dashicons-search',
-		'dashicons dashicons-share-alt',
-		'dashicons dashicons-share-alt2',
-		'dashicons dashicons-share',
-		'dashicons dashicons-shield-alt',
-		'dashicons dashicons-shield',
-		'dashicons dashicons-shortcode',
-		'dashicons dashicons-slides',
-		'dashicons dashicons-smartphone',
-		'dashicons dashicons-smiley',
-		'dashicons dashicons-sort',
-		'dashicons dashicons-sos',
-		'dashicons dashicons-spotify',
-		'dashicons dashicons-star-empty',
-		'dashicons dashicons-star-filled',
-		'dashicons dashicons-star-half',
-		'dashicons dashicons-sticky',
-		'dashicons dashicons-store',
-		'dashicons dashicons-superhero-alt',
-		'dashicons dashicons-superhero',
-		'dashicons dashicons-table-col-after',
-		'dashicons dashicons-table-col-before',
-		'dashicons dashicons-table-col-delete',
-		'dashicons dashicons-table-row-after',
-		'dashicons dashicons-table-row-before',
-		'dashicons dashicons-table-row-delete',
-		'dashicons dashicons-tablet',
-		'dashicons dashicons-tag',
-		'dashicons dashicons-tagcloud',
-		'dashicons dashicons-testimonial',
-		'dashicons dashicons-text-page',
-		'dashicons dashicons-text',
-		'dashicons dashicons-thumbs-down',
-		'dashicons dashicons-thumbs-up',
-		'dashicons dashicons-tickets-alt',
-		'dashicons dashicons-tickets',
-		'dashicons dashicons-tide',
-		'dashicons dashicons-translation',
-		'dashicons dashicons-trash',
-		'dashicons dashicons-twitch',
-		'dashicons dashicons-twitter-alt',
-		'dashicons dashicons-twitter',
-		'dashicons dashicons-undo',
-		'dashicons dashicons-universal-access-alt',
-		'dashicons dashicons-universal-access',
-		'dashicons dashicons-unlock',
-		'dashicons dashicons-update-alt',
-		'dashicons dashicons-update',
-		'dashicons dashicons-upload',
-		'dashicons dashicons-vault',
-		'dashicons dashicons-video-alt',
-		'dashicons dashicons-video-alt2',
-		'dashicons dashicons-video-alt3',
-		'dashicons dashicons-visibility',
-		'dashicons dashicons-warning',
-		'dashicons dashicons-welcome-add-page',
-		'dashicons dashicons-welcome-comments',
-		'dashicons dashicons-welcome-learn-more',
-		'dashicons dashicons-welcome-view-site',
-		'dashicons dashicons-welcome-widgets-menus',
-		'dashicons dashicons-welcome-write-blog',
-		'dashicons dashicons-whatsapp',
-		'dashicons dashicons-wordpress-alt',
-		'dashicons dashicons-wordpress',
-		'dashicons dashicons-xing',
-		'dashicons dashicons-yes-alt',
-		'dashicons dashicons-yes',
-		'dashicons dashicons-youtube',
-		'dashicons dashicons-editor-distractionfree',
-		'dashicons dashicons-exerpt-view',
-		'dashicons dashicons-format-links',
-		'dashicons dashicons-format-standard',
-		'dashicons dashicons-post-trash',
-		'dashicons dashicons-share1',
-		'dashicons dashicons-welcome-edit-page',
-	);
+    return array(
+        'dashicons dashicons-admin-appearance',
+        'dashicons dashicons-admin-collapse',
+        'dashicons dashicons-admin-comments',
+        'dashicons dashicons-admin-customizer',
+        'dashicons dashicons-admin-generic',
+        'dashicons dashicons-admin-home',
+        'dashicons dashicons-admin-links',
+        'dashicons dashicons-admin-media',
+        'dashicons dashicons-admin-multisite',
+        'dashicons dashicons-admin-network',
+        'dashicons dashicons-admin-page',
+        'dashicons dashicons-admin-plugins',
+        'dashicons dashicons-admin-post',
+        'dashicons dashicons-admin-settings',
+        'dashicons dashicons-admin-site-alt',
+        'dashicons dashicons-admin-site-alt2',
+        'dashicons dashicons-admin-site-alt3',
+        'dashicons dashicons-admin-site',
+        'dashicons dashicons-admin-tools',
+        'dashicons dashicons-admin-users',
+        'dashicons dashicons-airplane',
+        'dashicons dashicons-album',
+        'dashicons dashicons-align-center',
+        'dashicons dashicons-align-full-width',
+        'dashicons dashicons-align-left',
+        'dashicons dashicons-align-none',
+        'dashicons dashicons-align-pull-left',
+        'dashicons dashicons-align-pull-right',
+        'dashicons dashicons-align-right',
+        'dashicons dashicons-align-wide',
+        'dashicons dashicons-amazon',
+        'dashicons dashicons-analytics',
+        'dashicons dashicons-archive',
+        'dashicons dashicons-arrow-down-alt',
+        'dashicons dashicons-arrow-down-alt2',
+        'dashicons dashicons-arrow-down',
+        'dashicons dashicons-arrow-left-alt',
+        'dashicons dashicons-arrow-left-alt2',
+        'dashicons dashicons-arrow-left',
+        'dashicons dashicons-arrow-right-alt',
+        'dashicons dashicons-arrow-right-alt2',
+        'dashicons dashicons-arrow-right',
+        'dashicons dashicons-arrow-up-alt',
+        'dashicons dashicons-arrow-up-alt2',
+        'dashicons dashicons-arrow-up-duplicate',
+        'dashicons dashicons-arrow-up',
+        'dashicons dashicons-art',
+        'dashicons dashicons-awards',
+        'dashicons dashicons-backup',
+        'dashicons dashicons-bank',
+        'dashicons dashicons-beer',
+        'dashicons dashicons-bell',
+        'dashicons dashicons-block-default',
+        'dashicons dashicons-book-alt',
+        'dashicons dashicons-book',
+        'dashicons dashicons-buddicons-activity',
+        'dashicons dashicons-buddicons-bbpress-logo',
+        'dashicons dashicons-buddicons-buddypress-logo',
+        'dashicons dashicons-buddicons-community',
+        'dashicons dashicons-buddicons-forums',
+        'dashicons dashicons-buddicons-friends',
+        'dashicons dashicons-buddicons-groups',
+        'dashicons dashicons-buddicons-pm',
+        'dashicons dashicons-buddicons-replies',
+        'dashicons dashicons-buddicons-topics',
+        'dashicons dashicons-buddicons-tracking',
+        'dashicons dashicons-building',
+        'dashicons dashicons-businessman',
+        'dashicons dashicons-businessperson',
+        'dashicons dashicons-businesswoman',
+        'dashicons dashicons-button',
+        'dashicons dashicons-calculator',
+        'dashicons dashicons-calendar-alt',
+        'dashicons dashicons-calendar',
+        'dashicons dashicons-camera-alt',
+        'dashicons dashicons-camera',
+        'dashicons dashicons-car',
+        'dashicons dashicons-carrot',
+        'dashicons dashicons-cart',
+        'dashicons dashicons-category',
+        'dashicons dashicons-chart-area',
+        'dashicons dashicons-chart-bar',
+        'dashicons dashicons-chart-line',
+        'dashicons dashicons-chart-pie',
+        'dashicons dashicons-clipboard',
+        'dashicons dashicons-clock',
+        'dashicons dashicons-cloud-saved',
+        'dashicons dashicons-cloud-upload',
+        'dashicons dashicons-cloud',
+        'dashicons dashicons-code-standards',
+        'dashicons dashicons-coffee',
+        'dashicons dashicons-color-picker',
+        'dashicons dashicons-columns',
+        'dashicons dashicons-controls-back',
+        'dashicons dashicons-controls-forward',
+        'dashicons dashicons-controls-pause',
+        'dashicons dashicons-controls-play',
+        'dashicons dashicons-controls-repeat',
+        'dashicons dashicons-controls-skipback',
+        'dashicons dashicons-controls-skipforward',
+        'dashicons dashicons-controls-volumeoff',
+        'dashicons dashicons-controls-volumeon',
+        'dashicons dashicons-cover-image',
+        'dashicons dashicons-dashboard',
+        'dashicons dashicons-database-add',
+        'dashicons dashicons-database-export',
+        'dashicons dashicons-database-import',
+        'dashicons dashicons-database-remove',
+        'dashicons dashicons-database-view',
+        'dashicons dashicons-database',
+        'dashicons dashicons-desktop',
+        'dashicons dashicons-dismiss',
+        'dashicons dashicons-download',
+        'dashicons dashicons-drumstick',
+        'dashicons dashicons-edit-large',
+        'dashicons dashicons-edit-page',
+        'dashicons dashicons-edit',
+        'dashicons dashicons-editor-aligncenter',
+        'dashicons dashicons-editor-alignleft',
+        'dashicons dashicons-editor-alignright',
+        'dashicons dashicons-editor-bold',
+        'dashicons dashicons-editor-break',
+        'dashicons dashicons-editor-code-duplicate',
+        'dashicons dashicons-editor-code',
+        'dashicons dashicons-editor-contract',
+        'dashicons dashicons-editor-customchar',
+        'dashicons dashicons-editor-expand',
+        'dashicons dashicons-editor-help',
+        'dashicons dashicons-editor-indent',
+        'dashicons dashicons-editor-insertmore',
+        'dashicons dashicons-editor-italic',
+        'dashicons dashicons-editor-justify',
+        'dashicons dashicons-editor-kitchensink',
+        'dashicons dashicons-editor-ltr',
+        'dashicons dashicons-editor-ol-rtl',
+        'dashicons dashicons-editor-ol',
+        'dashicons dashicons-editor-outdent',
+        'dashicons dashicons-editor-paragraph',
+        'dashicons dashicons-editor-paste-text',
+        'dashicons dashicons-editor-paste-word',
+        'dashicons dashicons-editor-quote',
+        'dashicons dashicons-editor-removeformatting',
+        'dashicons dashicons-editor-rtl',
+        'dashicons dashicons-editor-spellcheck',
+        'dashicons dashicons-editor-strikethrough',
+        'dashicons dashicons-editor-table',
+        'dashicons dashicons-editor-textcolor',
+        'dashicons dashicons-editor-ul',
+        'dashicons dashicons-editor-underline',
+        'dashicons dashicons-editor-unlink',
+        'dashicons dashicons-editor-video',
+        'dashicons dashicons-ellipsis',
+        'dashicons dashicons-email-alt',
+        'dashicons dashicons-email-alt2',
+        'dashicons dashicons-email',
+        'dashicons dashicons-embed-audio',
+        'dashicons dashicons-embed-generic',
+        'dashicons dashicons-embed-photo',
+        'dashicons dashicons-embed-post',
+        'dashicons dashicons-embed-video',
+        'dashicons dashicons-excerpt-view',
+        'dashicons dashicons-exit',
+        'dashicons dashicons-external',
+        'dashicons dashicons-facebook-alt',
+        'dashicons dashicons-facebook',
+        'dashicons dashicons-feedback',
+        'dashicons dashicons-filter',
+        'dashicons dashicons-flag',
+        'dashicons dashicons-food',
+        'dashicons dashicons-format-aside',
+        'dashicons dashicons-format-audio',
+        'dashicons dashicons-format-chat',
+        'dashicons dashicons-format-gallery',
+        'dashicons dashicons-format-image',
+        'dashicons dashicons-format-quote',
+        'dashicons dashicons-format-status',
+        'dashicons dashicons-format-video',
+        'dashicons dashicons-forms',
+        'dashicons dashicons-fullscreen-alt',
+        'dashicons dashicons-fullscreen-exit-alt',
+        'dashicons dashicons-games',
+        'dashicons dashicons-google',
+        'dashicons dashicons-googleplus',
+        'dashicons dashicons-grid-view',
+        'dashicons dashicons-groups',
+        'dashicons dashicons-hammer',
+        'dashicons dashicons-heading',
+        'dashicons dashicons-heart',
+        'dashicons dashicons-hidden',
+        'dashicons dashicons-hourglass',
+        'dashicons dashicons-html',
+        'dashicons dashicons-id-alt',
+        'dashicons dashicons-id',
+        'dashicons dashicons-image-crop',
+        'dashicons dashicons-image-filter',
+        'dashicons dashicons-image-flip-horizontal',
+        'dashicons dashicons-image-flip-vertical',
+        'dashicons dashicons-image-rotate-left',
+        'dashicons dashicons-image-rotate-right',
+        'dashicons dashicons-image-rotate',
+        'dashicons dashicons-images-alt',
+        'dashicons dashicons-images-alt2',
+        'dashicons dashicons-index-card',
+        'dashicons dashicons-info-outline',
+        'dashicons dashicons-info',
+        'dashicons dashicons-insert-after',
+        'dashicons dashicons-insert-before',
+        'dashicons dashicons-insert',
+        'dashicons dashicons-instagram',
+        'dashicons dashicons-laptop',
+        'dashicons dashicons-layout',
+        'dashicons dashicons-leftright',
+        'dashicons dashicons-lightbulb',
+        'dashicons dashicons-linkedin',
+        'dashicons dashicons-list-view',
+        'dashicons dashicons-location-alt',
+        'dashicons dashicons-location',
+        'dashicons dashicons-lock-duplicate',
+        'dashicons dashicons-lock',
+        'dashicons dashicons-marker',
+        'dashicons dashicons-media-archive',
+        'dashicons dashicons-media-audio',
+        'dashicons dashicons-media-code',
+        'dashicons dashicons-media-default',
+        'dashicons dashicons-media-document',
+        'dashicons dashicons-media-interactive',
+        'dashicons dashicons-media-spreadsheet',
+        'dashicons dashicons-media-text',
+        'dashicons dashicons-media-video',
+        'dashicons dashicons-megaphone',
+        'dashicons dashicons-menu-alt',
+        'dashicons dashicons-menu-alt2',
+        'dashicons dashicons-menu-alt3',
+        'dashicons dashicons-menu',
+        'dashicons dashicons-microphone',
+        'dashicons dashicons-migrate',
+        'dashicons dashicons-minus',
+        'dashicons dashicons-money-alt',
+        'dashicons dashicons-money',
+        'dashicons dashicons-move',
+        'dashicons dashicons-nametag',
+        'dashicons dashicons-networking',
+        'dashicons dashicons-no-alt',
+        'dashicons dashicons-no',
+        'dashicons dashicons-open-folder',
+        'dashicons dashicons-palmtree',
+        'dashicons dashicons-paperclip',
+        'dashicons dashicons-pdf',
+        'dashicons dashicons-performance',
+        'dashicons dashicons-pets',
+        'dashicons dashicons-phone',
+        'dashicons dashicons-pinterest',
+        'dashicons dashicons-playlist-audio',
+        'dashicons dashicons-playlist-video',
+        'dashicons dashicons-plugins-checked',
+        'dashicons dashicons-plus-alt',
+        'dashicons dashicons-plus-alt2',
+        'dashicons dashicons-plus',
+        'dashicons dashicons-podio',
+        'dashicons dashicons-portfolio',
+        'dashicons dashicons-post-status',
+        'dashicons dashicons-pressthis',
+        'dashicons dashicons-printer',
+        'dashicons dashicons-privacy',
+        'dashicons dashicons-products',
+        'dashicons dashicons-randomize',
+        'dashicons dashicons-reddit',
+        'dashicons dashicons-redo',
+        'dashicons dashicons-remove',
+        'dashicons dashicons-rest-api',
+        'dashicons dashicons-rss',
+        'dashicons dashicons-saved',
+        'dashicons dashicons-schedule',
+        'dashicons dashicons-screenoptions',
+        'dashicons dashicons-search',
+        'dashicons dashicons-share-alt',
+        'dashicons dashicons-share-alt2',
+        'dashicons dashicons-share',
+        'dashicons dashicons-shield-alt',
+        'dashicons dashicons-shield',
+        'dashicons dashicons-shortcode',
+        'dashicons dashicons-slides',
+        'dashicons dashicons-smartphone',
+        'dashicons dashicons-smiley',
+        'dashicons dashicons-sort',
+        'dashicons dashicons-sos',
+        'dashicons dashicons-spotify',
+        'dashicons dashicons-star-empty',
+        'dashicons dashicons-star-filled',
+        'dashicons dashicons-star-half',
+        'dashicons dashicons-sticky',
+        'dashicons dashicons-store',
+        'dashicons dashicons-superhero-alt',
+        'dashicons dashicons-superhero',
+        'dashicons dashicons-table-col-after',
+        'dashicons dashicons-table-col-before',
+        'dashicons dashicons-table-col-delete',
+        'dashicons dashicons-table-row-after',
+        'dashicons dashicons-table-row-before',
+        'dashicons dashicons-table-row-delete',
+        'dashicons dashicons-tablet',
+        'dashicons dashicons-tag',
+        'dashicons dashicons-tagcloud',
+        'dashicons dashicons-testimonial',
+        'dashicons dashicons-text-page',
+        'dashicons dashicons-text',
+        'dashicons dashicons-thumbs-down',
+        'dashicons dashicons-thumbs-up',
+        'dashicons dashicons-tickets-alt',
+        'dashicons dashicons-tickets',
+        'dashicons dashicons-tide',
+        'dashicons dashicons-translation',
+        'dashicons dashicons-trash',
+        'dashicons dashicons-twitch',
+        'dashicons dashicons-twitter-alt',
+        'dashicons dashicons-twitter',
+        'dashicons dashicons-undo',
+        'dashicons dashicons-universal-access-alt',
+        'dashicons dashicons-universal-access',
+        'dashicons dashicons-unlock',
+        'dashicons dashicons-update-alt',
+        'dashicons dashicons-update',
+        'dashicons dashicons-upload',
+        'dashicons dashicons-vault',
+        'dashicons dashicons-video-alt',
+        'dashicons dashicons-video-alt2',
+        'dashicons dashicons-video-alt3',
+        'dashicons dashicons-visibility',
+        'dashicons dashicons-warning',
+        'dashicons dashicons-welcome-add-page',
+        'dashicons dashicons-welcome-comments',
+        'dashicons dashicons-welcome-learn-more',
+        'dashicons dashicons-welcome-view-site',
+        'dashicons dashicons-welcome-widgets-menus',
+        'dashicons dashicons-welcome-write-blog',
+        'dashicons dashicons-whatsapp',
+        'dashicons dashicons-wordpress-alt',
+        'dashicons dashicons-wordpress',
+        'dashicons dashicons-xing',
+        'dashicons dashicons-yes-alt',
+        'dashicons dashicons-yes',
+        'dashicons dashicons-youtube',
+        'dashicons dashicons-editor-distractionfree',
+        'dashicons dashicons-exerpt-view',
+        'dashicons dashicons-format-links',
+        'dashicons dashicons-format-standard',
+        'dashicons dashicons-post-trash',
+        'dashicons dashicons-share1',
+        'dashicons dashicons-welcome-edit-page',
+    );
 }

redux-core/inc/extensions/js_button/js_button/class-redux-js-button.php

Indentation +104 added lines, -104 removed lines

@@ -11,126 +11,126 @@
 
 if ( ! class_exists( 'Redux_Js_Button' ) ) {
 
-	/**
-	 * Main ReduxFramework_Js_Button class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Js_Button 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() {
-			$field_id = $this->field['id'];
-
-			// primary container.
-			echo '<div
+    /**
+     * Main ReduxFramework_Js_Button class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Js_Button 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() {
+            $field_id = $this->field['id'];
+
+            // primary container.
+            echo '<div
 	                class="redux-js-button-container ' . esc_attr( $this->field['class'] ) . '"
 	                id="' . esc_attr( $field_id ) . '_container"
 	                data-id="' . esc_attr( $field_id ) . '"
 	                style="width: 0px;"
 	            >';
 
-			// Button render.
-			if ( isset( $this->field['buttons'] ) && is_array( $this->field['buttons'] ) ) {
-				echo '<div
+            // Button render.
+            if ( isset( $this->field['buttons'] ) && is_array( $this->field['buttons'] ) ) {
+                echo '<div
 	                    class="redux-js-button-button-container"
 	                    id="redux-js-button-button-container"
 	                    style="display: inline-flex;"
 	                >';
 
-				foreach ( $this->field['buttons'] as $idx => $arr ) {
-					$button_text  = $arr['text'];
-					$button_class = $arr['class'];
-					$button_func  = $arr['function'];
+                foreach ( $this->field['buttons'] as $idx => $arr ) {
+                    $button_text  = $arr['text'];
+                    $button_class = $arr['class'];
+                    $button_func  = $arr['function'];
 
-					echo '<input
+                    echo '<input
 	                        id="' . esc_attr( $field_id ) . '_input-' . intval( $idx ) . '"
 	                        class="hide-if-no-js button ' . esc_attr( $button_class ) . '"
 	                        type="button"
 	                        data-function="' . esc_attr( $button_func ) . '"
 	                        value="' . esc_attr( $button_text ) . '"
 	                    />&nbsp;&nbsp;';
-				}
-
-				echo '</div>';
-			}
-
-			// Close container.
-			echo '</div>';
-		}
-
-
-		/**
-		 * Do enqueue for every field instance.
-		 *
-		 * @return void
-		 */
-		public function always_enqueue() {
-			// Make sure script data exists first.
-			if ( isset( $this->field['script'] ) && ! empty( $this->field['script'] ) ) {
-
-				// URI location of script to enqueue.
-				$script_url = $this->field['script']['url'] ?? '';
-
-				// Get deps, if any.
-				$script_dep = $this->field['script']['dep'] ?? array();
-
-				// Get ver, if any.
-				$script_ver = $this->field['script']['ver'] ?? time();
-
-				// Script location in HTML.
-				$script_footer = $this->field['script']['in_footer'] ?? true;
-
-				// If a script exists, enqueue it.
-				if ( '' !== $script_url ) {
-					wp_enqueue_script(
-						'redux-js-button-' . $this->field['id'],
-						$script_url,
-						$script_dep,
-						$script_ver,
-						$script_footer
-					);
-				}
-
-				if ( isset( $this->field['enqueue_ajax'] ) && $this->field['enqueue_ajax'] ) {
-					wp_localize_script(
-						'redux-js-button-' . $this->field['id'],
-						'redux_ajax_script',
-						array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) )
-					);
-				}
-			}
-		}
-
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-
-			// Set up min files for dev_mode = false.
-			$min = Redux_Functions::isMin();
-
-			// Field dependent JS.
-			wp_enqueue_script(
-				'redux-field-js-button',
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				apply_filters( "redux/js_button/{$this->parent->args['opt_name']}/enqueue/redux-field-js-button-js", $this->url . 'redux-js-button' . $min . '.js' ),
-				array( 'jquery' ),
-				Redux_Extension_Js_Button::$version,
-				true
-			);
-		}
-	}
+                }
+
+                echo '</div>';
+            }
+
+            // Close container.
+            echo '</div>';
+        }
+
+
+        /**
+         * Do enqueue for every field instance.
+         *
+         * @return void
+         */
+        public function always_enqueue() {
+            // Make sure script data exists first.
+            if ( isset( $this->field['script'] ) && ! empty( $this->field['script'] ) ) {
+
+                // URI location of script to enqueue.
+                $script_url = $this->field['script']['url'] ?? '';
+
+                // Get deps, if any.
+                $script_dep = $this->field['script']['dep'] ?? array();
+
+                // Get ver, if any.
+                $script_ver = $this->field['script']['ver'] ?? time();
+
+                // Script location in HTML.
+                $script_footer = $this->field['script']['in_footer'] ?? true;
+
+                // If a script exists, enqueue it.
+                if ( '' !== $script_url ) {
+                    wp_enqueue_script(
+                        'redux-js-button-' . $this->field['id'],
+                        $script_url,
+                        $script_dep,
+                        $script_ver,
+                        $script_footer
+                    );
+                }
+
+                if ( isset( $this->field['enqueue_ajax'] ) && $this->field['enqueue_ajax'] ) {
+                    wp_localize_script(
+                        'redux-js-button-' . $this->field['id'],
+                        'redux_ajax_script',
+                        array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) )
+                    );
+                }
+            }
+        }
+
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+
+            // Set up min files for dev_mode = false.
+            $min = Redux_Functions::isMin();
+
+            // Field dependent JS.
+            wp_enqueue_script(
+                'redux-field-js-button',
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                apply_filters( "redux/js_button/{$this->parent->args['opt_name']}/enqueue/redux-field-js-button-js", $this->url . 'redux-js-button' . $min . '.js' ),
+                array( 'jquery' ),
+                Redux_Extension_Js_Button::$version,
+                true
+            );
+        }
+    }
 }

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

Indentation +86 added lines, -86 removed lines

@@ -12,76 +12,76 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Section', false ) ) {
 
-	/**
-	 * Main Redux_heading class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Section extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			// No errors please.
-			$defaults = array(
-				'indent'   => true,
-				'style'    => '',
-				'class'    => '',
-				'title'    => '',
-				'subtitle' => '',
-			);
-
-			$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() {
-			$guid = uniqid();
-
-			if ( true === $this->field['indent'] ) {
-				$this->field['class'] .= ' redux-section-indent-start';
-			}
-
-			$add_class = '';
-			if ( isset( $this->field['indent'] ) && true === $this->field['indent'] ) {
-				$add_class = ' form-table-section-indented';
-			} elseif ( ! isset( $this->field['indent'] ) || ( isset( $this->field['indent'] ) && false !== $this->field['indent'] ) ) {
-				$add_class = ' hide';
-			}
-
-			echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '-marker"></td></tr></table>';
-
-			if ( isset( $this->field['indent'] ) && true === $this->field['indent'] ) {
-				echo '<div class="indent-section-container">';
-			}
-
-			echo '<div id="section-' . esc_attr( $this->field['id'] ) . '" class="redux-section-field redux-field ' . esc_attr( $this->field['style'] ) . ' ' . esc_attr( $this->field['class'] ) . ' ">';
-
-			if ( ! empty( $this->field['title'] ) ) {
-				echo '<h3>' . wp_kses_post( $this->field['title'] ) . '</h3>';
-			}
-
-			if ( ! empty( $this->field['subtitle'] ) ) {
-				echo '<div class="redux-section-desc">' . wp_kses_post( $this->field['subtitle'] ) . '</div>';
-			}
-
-			echo '</div>';
-
-			if ( isset( $this->field['indent'] ) && true === $this->field['indent'] ) {
-				echo '</div>';
-			}
-
-			echo '<table id="section-table-' . esc_attr( $this->field['id'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '" class="form-table form-table-section no-border' . esc_attr( $add_class ) . '"><tbody><tr><th></th><td id="' . esc_attr( $guid ) . '">';
-
-			?>
+    /**
+     * Main Redux_heading class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Section extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            // No errors please.
+            $defaults = array(
+                'indent'   => true,
+                'style'    => '',
+                'class'    => '',
+                'title'    => '',
+                'subtitle' => '',
+            );
+
+            $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() {
+            $guid = uniqid();
+
+            if ( true === $this->field['indent'] ) {
+                $this->field['class'] .= ' redux-section-indent-start';
+            }
+
+            $add_class = '';
+            if ( isset( $this->field['indent'] ) && true === $this->field['indent'] ) {
+                $add_class = ' form-table-section-indented';
+            } elseif ( ! isset( $this->field['indent'] ) || ( isset( $this->field['indent'] ) && false !== $this->field['indent'] ) ) {
+                $add_class = ' hide';
+            }
+
+            echo '<input type="hidden" id="' . esc_attr( $this->field['id'] ) . '-marker"></td></tr></table>';
+
+            if ( isset( $this->field['indent'] ) && true === $this->field['indent'] ) {
+                echo '<div class="indent-section-container">';
+            }
+
+            echo '<div id="section-' . esc_attr( $this->field['id'] ) . '" class="redux-section-field redux-field ' . esc_attr( $this->field['style'] ) . ' ' . esc_attr( $this->field['class'] ) . ' ">';
+
+            if ( ! empty( $this->field['title'] ) ) {
+                echo '<h3>' . wp_kses_post( $this->field['title'] ) . '</h3>';
+            }
+
+            if ( ! empty( $this->field['subtitle'] ) ) {
+                echo '<div class="redux-section-desc">' . wp_kses_post( $this->field['subtitle'] ) . '</div>';
+            }
+
+            echo '</div>';
+
+            if ( isset( $this->field['indent'] ) && true === $this->field['indent'] ) {
+                echo '</div>';
+            }
+
+            echo '<table id="section-table-' . esc_attr( $this->field['id'] ) . '" data-id="' . esc_attr( $this->field['id'] ) . '" class="form-table form-table-section no-border' . esc_attr( $add_class ) . '"><tbody><tr><th></th><td id="' . esc_attr( $guid ) . '">';
+
+            ?>
 			<script type="text/javascript">
 				jQuery( document ).ready(
 					function() {
@@ -107,22 +107,22 @@ 
 				);
 			</script>
 			<?php
-		}
-
-		/**
-		 * Enqueue Script and styles.
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-section',
-					Redux_Core::$url . 'inc/fields/section/redux-section.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+        }
+
+        /**
+         * Enqueue Script and styles.
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-section',
+                    Redux_Core::$url . 'inc/fields/section/redux-section.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Section', 'ReduxFramework_Section' );

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

Indentation +135 added lines, -135 removed lines

@@ -12,144 +12,144 @@
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Info', false ) ) {
 
-	/**
-	 * Main Redux_info class
-	 *
-	 * @since       1.0.0
-	 */
-	class Redux_Info extends Redux_Field {
-
-		/**
-		 * Set field and value defaults.
-		 */
-		public function set_defaults() {
-			$defaults = array(
-				'title'  => '',
-				'desc'   => '',
-				'indent' => false,
-				'notice' => true,
-				'style'  => '',
-				'color'  => '',
-			);
-
-			$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() {
-			$styles = array(
-				'normal',
-				'info',
-				'warning',
-				'success',
-				'critical',
-				'custom',
-			);
-
-			if ( ! in_array( $this->field['style'], $styles, true ) ) {
-				$this->field['style'] = 'normal';
-			}
-
-			if ( 'custom' === $this->field['style'] ) {
-				if ( ! empty( $this->field['color'] ) ) {
-					$this->field['color'] = 'border-color:' . $this->field['color'] . ';';
-				} else {
-					$this->field['style'] = 'normal';
-					$this->field['color'] = '';
-				}
-			} else {
-				$this->field['color'] = '';
-			}
-
-			if ( empty( $this->field['desc'] ) && ! empty( $this->field['default'] ) ) {
-				$this->field['desc'] = $this->field['default'];
-				unset( $this->field['default'] );
-			}
-
-			if ( empty( $this->field['desc'] ) && ! empty( $this->field['subtitle'] ) ) {
-				$this->field['desc'] = $this->field['subtitle'];
-				unset( $this->field['subtitle'] );
-			}
-
-			if ( empty( $this->field['desc'] ) ) {
-				$this->field['desc'] = '';
-			}
-
-			if ( empty( $this->field['raw_html'] ) ) {
-				if ( true === $this->field['notice'] ) {
-					$this->field['class'] .= ' redux-notice-field';
-				} else {
-					$this->field['class'] .= ' redux-info-field';
-				}
-
-				$this->field['style'] = 'redux-' . $this->field['style'] . ' ';
-			}
-
-			// Old shim, deprecated arg.
-			if ( isset( $this->field['sectionIndent'] ) ) {
-				$this->field['indent'] = $this->field['sectionIndent'];
-			}
-			$indent = ( isset( $this->field['indent'] ) && $this->field['indent'] ) ? ' form-table-section-indented' : '';
-
-			echo '</td></tr></table>';
-			echo '<div
+    /**
+     * Main Redux_info class
+     *
+     * @since       1.0.0
+     */
+    class Redux_Info extends Redux_Field {
+
+        /**
+         * Set field and value defaults.
+         */
+        public function set_defaults() {
+            $defaults = array(
+                'title'  => '',
+                'desc'   => '',
+                'indent' => false,
+                'notice' => true,
+                'style'  => '',
+                'color'  => '',
+            );
+
+            $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() {
+            $styles = array(
+                'normal',
+                'info',
+                'warning',
+                'success',
+                'critical',
+                'custom',
+            );
+
+            if ( ! in_array( $this->field['style'], $styles, true ) ) {
+                $this->field['style'] = 'normal';
+            }
+
+            if ( 'custom' === $this->field['style'] ) {
+                if ( ! empty( $this->field['color'] ) ) {
+                    $this->field['color'] = 'border-color:' . $this->field['color'] . ';';
+                } else {
+                    $this->field['style'] = 'normal';
+                    $this->field['color'] = '';
+                }
+            } else {
+                $this->field['color'] = '';
+            }
+
+            if ( empty( $this->field['desc'] ) && ! empty( $this->field['default'] ) ) {
+                $this->field['desc'] = $this->field['default'];
+                unset( $this->field['default'] );
+            }
+
+            if ( empty( $this->field['desc'] ) && ! empty( $this->field['subtitle'] ) ) {
+                $this->field['desc'] = $this->field['subtitle'];
+                unset( $this->field['subtitle'] );
+            }
+
+            if ( empty( $this->field['desc'] ) ) {
+                $this->field['desc'] = '';
+            }
+
+            if ( empty( $this->field['raw_html'] ) ) {
+                if ( true === $this->field['notice'] ) {
+                    $this->field['class'] .= ' redux-notice-field';
+                } else {
+                    $this->field['class'] .= ' redux-info-field';
+                }
+
+                $this->field['style'] = 'redux-' . $this->field['style'] . ' ';
+            }
+
+            // Old shim, deprecated arg.
+            if ( isset( $this->field['sectionIndent'] ) ) {
+                $this->field['indent'] = $this->field['sectionIndent'];
+            }
+            $indent = ( isset( $this->field['indent'] ) && $this->field['indent'] ) ? ' form-table-section-indented' : '';
+
+            echo '</td></tr></table>';
+            echo '<div
 					id="info-' . esc_attr( $this->field['id'] ) . '"
 					class="' . ( isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ? 'hasIcon ' : '' ) . esc_attr( $this->field['style'] ) . ' ' . esc_attr( $this->field['class'] ) . ' redux-field-' . esc_attr( $this->field['type'] ) . esc_attr( $indent ) . '"' . ( ! empty( $this->field['color'] ) ? ' style="' . esc_attr( $this->field['color'] ) . '"' : '' ) . '>';
 
-			if ( ! empty( $this->field['raw_html'] ) && $this->field['raw_html'] ) {
-				echo wp_kses_post( $this->field['desc'] );
-			} else {
-				if ( isset( $this->field['title'] ) && ! empty( $this->field['title'] ) ) {
-					$this->field['title'] = '<b>' . wp_kses_post( $this->field['title'] ) . '</b><br/>';
-				}
-
-				if ( isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ) {
-					echo '<p class="redux-info-icon"><i class="' . esc_attr( $this->field['icon'] ) . ' icon-large"></i></p>';
-				}
-
-				if ( isset( $this->field['raw'] ) && ! empty( $this->field['raw'] ) ) {
-					echo wp_kses_post( $this->field['raw'] );
-				}
-
-				if ( ! empty( $this->field['title'] ) || ! empty( $this->field['desc'] ) ) {
-					echo '<p class="redux-info-desc">' . wp_kses_post( $this->field['title'] ) . wp_kses_post( $this->field['desc'] ) . '</p>';
-				}
-			}
-
-			echo '</div>';
-			echo '<table class="form-table no-border" style="margin-top: 0;">';
-			echo '<tbody>';
-			echo '<tr style="border-bottom:0; display:none;">';
-			echo '<th style="padding-top:0;"></th>';
-			echo '<td style="padding-top:0;">';
-		}
-
-		/**
-		 * 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-info',
-					Redux_Core::$url . 'inc/fields/info/redux-info.css',
-					array(),
-					$this->timestamp
-				);
-			}
-		}
-	}
+            if ( ! empty( $this->field['raw_html'] ) && $this->field['raw_html'] ) {
+                echo wp_kses_post( $this->field['desc'] );
+            } else {
+                if ( isset( $this->field['title'] ) && ! empty( $this->field['title'] ) ) {
+                    $this->field['title'] = '<b>' . wp_kses_post( $this->field['title'] ) . '</b><br/>';
+                }
+
+                if ( isset( $this->field['icon'] ) && ! empty( $this->field['icon'] ) && true !== $this->field['icon'] ) {
+                    echo '<p class="redux-info-icon"><i class="' . esc_attr( $this->field['icon'] ) . ' icon-large"></i></p>';
+                }
+
+                if ( isset( $this->field['raw'] ) && ! empty( $this->field['raw'] ) ) {
+                    echo wp_kses_post( $this->field['raw'] );
+                }
+
+                if ( ! empty( $this->field['title'] ) || ! empty( $this->field['desc'] ) ) {
+                    echo '<p class="redux-info-desc">' . wp_kses_post( $this->field['title'] ) . wp_kses_post( $this->field['desc'] ) . '</p>';
+                }
+            }
+
+            echo '</div>';
+            echo '<table class="form-table no-border" style="margin-top: 0;">';
+            echo '<tbody>';
+            echo '<tr style="border-bottom:0; display:none;">';
+            echo '<th style="padding-top:0;"></th>';
+            echo '<td style="padding-top:0;">';
+        }
+
+        /**
+         * 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-info',
+                    Redux_Core::$url . 'inc/fields/info/redux-info.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
+        }
+    }
 }
 
 class_alias( 'Redux_Info', 'ReduxFramework_Info' );