lightspeeddevelopment / lsx-projects

classes/class-lsx-projects-frontend.php

Spacing +69 added lines, -69 removed lines

@@ -11,75 +11,75 @@ 
 class LSX_Projects_Frontend {
 
 	public function __construct() {
-		if ( function_exists( 'tour_operator' ) ) {
-			$this->options = get_option( '_lsx-to_settings', false );
+		if (function_exists('tour_operator')) {
+			$this->options = get_option('_lsx-to_settings', false);
 		} else {
-			$this->options = get_option( '_lsx_settings', false );
+			$this->options = get_option('_lsx_settings', false);
 
-			if ( false === $this->options ) {
-				$this->options = get_option( '_lsx_lsx-settings', false );
+			if (false === $this->options) {
+				$this->options = get_option('_lsx_lsx-settings', false);
 			}
 		}
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5 );
-		add_filter( 'wp_kses_allowed_html', array( $this, 'wp_kses_allowed_html' ), 10, 2 );
-		add_filter( 'template_include', array( $this, 'single_template_include' ), 99 );
-		add_filter( 'template_include', array( $this, 'archive_template_include' ), 99 );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5);
+		add_filter('wp_kses_allowed_html', array($this, 'wp_kses_allowed_html'), 10, 2);
+		add_filter('template_include', array($this, 'single_template_include'), 99);
+		add_filter('template_include', array($this, 'archive_template_include'), 99);
 
-		if ( ! empty( $this->options['display'] ) && ! empty( $this->options['display']['projects_disable_single'] ) ) {
-			add_action( 'template_redirect', array( $this, 'disable_single' ) );
+		if ( ! empty($this->options['display']) && ! empty($this->options['display']['projects_disable_single'])) {
+			add_action('template_redirect', array($this, 'disable_single'));
 		}
 
-		if ( is_admin() ) {
-			add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
+		if (is_admin()) {
+			add_filter('lsx_customizer_colour_selectors_body', array($this, 'customizer_body_colours_handler'), 15, 2);
 		}
 
-		add_filter( 'lsx_banner_title', array( $this, 'lsx_banner_archive_title' ), 15 );
+		add_filter('lsx_banner_title', array($this, 'lsx_banner_archive_title'), 15);
 
-		add_filter( 'excerpt_more_p', array( $this, 'change_excerpt_more' ) );
-		add_filter( 'excerpt_length', array( $this, 'change_excerpt_length' ) );
-		add_filter( 'excerpt_strip_tags', array( $this, 'change_excerpt_strip_tags' ) );
+		add_filter('excerpt_more_p', array($this, 'change_excerpt_more'));
+		add_filter('excerpt_length', array($this, 'change_excerpt_length'));
+		add_filter('excerpt_strip_tags', array($this, 'change_excerpt_strip_tags'));
 
-		add_filter( 'pre_get_posts', array( $this, 'posts_per_page' ) );
-		add_action( 'wp_footer', array( $this, 'add_form_modal' ) );
+		add_filter('pre_get_posts', array($this, 'posts_per_page'));
+		add_action('wp_footer', array($this, 'add_form_modal'));
 	}
 
 	public function enqueue_scripts() {
-		$has_slick = wp_script_is( 'slick', 'queue' );
+		$has_slick = wp_script_is('slick', 'queue');
 
-		if ( ! $has_slick ) {
-			wp_enqueue_style( 'slick', LSX_PROJECTS_URL . 'assets/css/vendor/slick.css', array(), LSX_PROJECTS_VER, null );
-			wp_enqueue_script( 'slick', LSX_PROJECTS_URL . 'assets/js/vendor/slick.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+		if ( ! $has_slick) {
+			wp_enqueue_style('slick', LSX_PROJECTS_URL . 'assets/css/vendor/slick.css', array(), LSX_PROJECTS_VER, null);
+			wp_enqueue_script('slick', LSX_PROJECTS_URL . 'assets/js/vendor/slick.min.js', array('jquery'), null, LSX_PROJECTS_VER, true);
 		}
 
-		$has_scrolltofixed = wp_script_is( 'scrolltofixed', 'queue' );
+		$has_scrolltofixed = wp_script_is('scrolltofixed', 'queue');
 
-		if ( ! $has_scrolltofixed ) {
-			wp_enqueue_script( 'scrolltofixed', LSX_PROJECTS_URL . 'assets/js/vendor/jquery-scrolltofixed-min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+		if ( ! $has_scrolltofixed) {
+			wp_enqueue_script('scrolltofixed', LSX_PROJECTS_URL . 'assets/js/vendor/jquery-scrolltofixed-min.js', array('jquery'), null, LSX_PROJECTS_VER, true);
 		}
 
-		$has_isotope = wp_script_is( 'isotope', 'queue' );
+		$has_isotope = wp_script_is('isotope', 'queue');
 
-		if ( ! $has_isotope ) {
-			wp_enqueue_script( 'isotope', LSX_PROJECTS_URL . 'assets/js/vendor/isotope.pkgd.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+		if ( ! $has_isotope) {
+			wp_enqueue_script('isotope', LSX_PROJECTS_URL . 'assets/js/vendor/isotope.pkgd.min.js', array('jquery'), null, LSX_PROJECTS_VER, true);
 		}
 
-		wp_enqueue_script( 'lsx-projects', LSX_PROJECTS_URL . 'assets/js/lsx-projects.min.js', array( 'jquery', 'slick', 'scrolltofixed', 'isotope' ), LSX_PROJECTS_VER, true );
+		wp_enqueue_script('lsx-projects', LSX_PROJECTS_URL . 'assets/js/lsx-projects.min.js', array('jquery', 'slick', 'scrolltofixed', 'isotope'), LSX_PROJECTS_VER, true);
 
-		$params = apply_filters( 'lsx_projects_js_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
+		$params = apply_filters('lsx_projects_js_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'),
 		));
 
-		wp_localize_script( 'lsx-projects', 'lsx_customizer_params', $params );
+		wp_localize_script('lsx-projects', 'lsx_customizer_params', $params);
 
-		wp_enqueue_style( 'lsx-projects', LSX_PROJECTS_URL . 'assets/css/lsx-projects.css', array(), LSX_PROJECTS_VER );
-		wp_style_add_data( 'lsx-projects', 'rtl', 'replace' );
+		wp_enqueue_style('lsx-projects', LSX_PROJECTS_URL . 'assets/css/lsx-projects.css', array(), LSX_PROJECTS_VER);
+		wp_style_add_data('lsx-projects', 'rtl', 'replace');
 	}
 
 	/**
 	 * Allow data params for Slick slider addon.
 	 */
-	public function wp_kses_allowed_html( $allowedtags, $context ) {
+	public function wp_kses_allowed_html($allowedtags, $context) {
 		$allowedtags['div']['data-slick'] = true;
 		return $allowedtags;
 	}
@@ -87,9 +87,9 @@ 
 	/**
 	 * Single template.
 	 */
-	public function single_template_include( $template ) {
-		if ( is_main_query() && is_singular( 'project' ) ) {
-			if ( empty( locate_template( array( 'single-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/single-projects.php' ) ) {
+	public function single_template_include($template) {
+		if (is_main_query() && is_singular('project')) {
+			if (empty(locate_template(array('single-projects.php'))) && file_exists(LSX_PROJECTS_PATH . 'templates/single-projects.php')) {
 				$template = LSX_PROJECTS_PATH . 'templates/single-projects.php';
 			}
 		}
@@ -100,9 +100,9 @@ 
 	/**
 	 * Archive template.
 	 */
-	public function archive_template_include( $template ) {
-		if ( is_main_query() && ( is_post_type_archive( 'project' ) || is_tax( 'project-group' ) ) ) {
-			if ( empty( locate_template( array( 'archive-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/archive-projects.php' ) ) {
+	public function archive_template_include($template) {
+		if (is_main_query() && (is_post_type_archive('project') || is_tax('project-group'))) {
+			if (empty(locate_template(array('archive-projects.php'))) && file_exists(LSX_PROJECTS_PATH . 'templates/archive-projects.php')) {
 				$template = LSX_PROJECTS_PATH . 'templates/archive-projects.php';
 			}
 		}
@@ -114,10 +114,10 @@ 
 	 * Removes access to single project member posts.
 	 */
 	public function disable_single() {
-		$queried_post_type = get_query_var( 'post_type' );
+		$queried_post_type = get_query_var('post_type');
 
-		if ( is_single() && 'project' === $queried_post_type ) {
-			wp_redirect( home_url(), 301 );
+		if (is_single() && 'project' === $queried_post_type) {
+			wp_redirect(home_url(), 301);
 			exit;
 		}
 	}
@@ -125,7 +125,7 @@ 
 	/**
 	 * Handle body colours that might be change by LSX Customiser
 	 */
-	public function customizer_body_colours_handler( $css, $colors ) {
+	public function customizer_body_colours_handler($css, $colors) {
 		$css .= '
 			@import "' . LSX_PROJECTS_PATH . '/assets/css/scss/customizer-projects-body-colours";
 
@@ -148,14 +148,14 @@ 
 	/**
 	 * Change the LSX Banners title for project archive.
 	 */
-	public function lsx_banner_archive_title( $title ) {
-		if ( is_main_query() && is_post_type_archive( 'project' ) ) {
-			$title = '<h1 class="page-title">' . esc_html__( 'Portfolio', 'lsx-projects' ) . '</h1>';
+	public function lsx_banner_archive_title($title) {
+		if (is_main_query() && is_post_type_archive('project')) {
+			$title = '<h1 class="page-title">' . esc_html__('Portfolio', 'lsx-projects') . '</h1>';
 		}
 
-		if ( is_main_query() && is_tax( 'project-group' ) ) {
+		if (is_main_query() && is_tax('project-group')) {
 			$tax = get_queried_object();
-			$title = '<h1 class="page-title">' . esc_html__( 'Project Type', 'lsx-projects' ) . ': ' . apply_filters( 'the_title', $tax->name ) . '</h1>';
+			$title = '<h1 class="page-title">' . esc_html__('Project Type', 'lsx-projects') . ': ' . apply_filters('the_title', $tax->name) . '</h1>';
 		}
 
 		return $title;
@@ -164,11 +164,11 @@ 
 	/**
 	 * Remove the "continue reading" when the single is disabled.
 	 */
-	public function change_excerpt_more( $excerpt_more ) {
+	public function change_excerpt_more($excerpt_more) {
 		global $post;
 
-		if ( 'project' === $post->post_type ) {
-			if ( ! empty( $this->options['display'] ) && ! empty( $this->options['display']['projects_disable_single'] ) ) {
+		if ('project' === $post->post_type) {
+			if ( ! empty($this->options['display']) && ! empty($this->options['display']['projects_disable_single'])) {
 				$excerpt_more = '';
 			}
 		}
@@ -179,14 +179,14 @@ 
 	/**
 	 * Change the word count when crop the content to excerpt (homepage widget).
 	 */
-	public function change_excerpt_length( $excerpt_word_count ) {
+	public function change_excerpt_length($excerpt_word_count) {
 		global $post;
 
-		if ( is_front_page() && 'project' === $post->post_type ) {
+		if (is_front_page() && 'project' === $post->post_type) {
 			$excerpt_word_count = 20;
 		}
 
-		if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
+		if (is_singular('project') && ('team' === $post->post_type || 'testimonial' === $post->post_type)) {
 			$excerpt_word_count = 20;
 		}
 
@@ -196,14 +196,14 @@ 
 	/**
 	 * Change the allowed tags crop the content to excerpt (homepage widget).
 	 */
-	public function change_excerpt_strip_tags( $allowed_tags ) {
+	public function change_excerpt_strip_tags($allowed_tags) {
 		global $post;
 
-		if ( is_front_page() && 'project' === $post->post_type ) {
+		if (is_front_page() && 'project' === $post->post_type) {
 			$allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
 		}
 
-		if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
+		if (is_singular('project') && ('team' === $post->post_type || 'testimonial' === $post->post_type)) {
 			$allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
 		}
 
@@ -213,10 +213,10 @@ 
 	/**
 	 * Change posts per page counter for archive.
 	 */
-	public function posts_per_page( $query ) {
-		if ( ! is_admin() && $query->is_main_query() ) {
-			if ( $query->is_post_type_archive( 'project' ) || $query->is_tax( 'project-group' ) ) {
-				$query->set( 'posts_per_page', -1 );
+	public function posts_per_page($query) {
+		if ( ! is_admin() && $query->is_main_query()) {
+			if ($query->is_post_type_archive('project') || $query->is_tax('project-group')) {
+				$query->set('posts_per_page', -1);
 			}
 		}
 
@@ -229,15 +229,15 @@ 
 	public function add_form_modal() {
 		global $lsx_projects;
 
-		if ( empty( $lsx_projects->options['display'] ) || empty( $lsx_projects->options['display']['projects_modal_enable'] ) ) {
+		if (empty($lsx_projects->options['display']) || empty($lsx_projects->options['display']['projects_modal_enable'])) {
 			return '';
 		}
 
-		if ( empty( $lsx_projects->options['display']['projects_modal_cta_label'] ) || empty( $lsx_projects->options['display']['projects_modal_form_id'] ) ) {
+		if (empty($lsx_projects->options['display']['projects_modal_cta_label']) || empty($lsx_projects->options['display']['projects_modal_form_id'])) {
 			return '';
 		}
 
-		if ( ! is_single( 'project' ) ) {
+		if ( ! is_single('project')) {
 			return '';
 		}
 		?>
@@ -247,11 +247,11 @@ 
 					<button type="button" class="close" data-dismiss="modal">&times;</button>
 
 					<div class="modal-header">
-						<h4 class="modal-title"><?php echo esc_html( $lsx_projects->options['display']['projects_modal_cta_label'] ); ?></h4>
+						<h4 class="modal-title"><?php echo esc_html($lsx_projects->options['display']['projects_modal_cta_label']); ?></h4>
 					</div>
 
 					<div class="modal-body">
-						<?php echo do_shortcode( '[caldera_form id="' . $lsx_projects->options['display']['projects_modal_form_id'] . '"]' ); ?>
+						<?php echo do_shortcode('[caldera_form id="' . $lsx_projects->options['display']['projects_modal_form_id'] . '"]'); ?>
 					</div>
 				</div>
 			</div>

lsx-projects.php

Spacing +5 added lines, -5 removed lines

@@ -13,14 +13,14 @@
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-define( 'LSX_PROJECTS_PATH', plugin_dir_path( __FILE__ ) );
-define( 'LSX_PROJECTS_CORE', __FILE__ );
-define( 'LSX_PROJECTS_URL', plugin_dir_url( __FILE__ ) );
-define( 'LSX_PROJECTS_VER', '1.1.3' );
+define('LSX_PROJECTS_PATH', plugin_dir_path(__FILE__));
+define('LSX_PROJECTS_CORE', __FILE__);
+define('LSX_PROJECTS_URL', plugin_dir_url(__FILE__));
+define('LSX_PROJECTS_VER', '1.1.3');
 
 /* ======================= Below is the Plugin Class init ========================= */
 

vendor/Custom-Meta-Boxes/custom-meta-boxes.php

Indentation +14 added lines, -14 removed lines

@@ -111,26 +111,26 @@
  */
 function cmb_fix_meta_query_order($query) {
 
-    $pattern = '/^SELECT (post_id|user_id), meta_key, meta_value FROM \w* WHERE post_id IN \([\d|,]*\)$/';
+	$pattern = '/^SELECT (post_id|user_id), meta_key, meta_value FROM \w* WHERE post_id IN \([\d|,]*\)$/';
 
-    if (
-            0 === strpos( $query, "SELECT post_id, meta_key, meta_value" ) &&
-            preg_match( $pattern, $query, $matches )
-    ) {
+	if (
+			0 === strpos( $query, "SELECT post_id, meta_key, meta_value" ) &&
+			preg_match( $pattern, $query, $matches )
+	) {
 
-            if ( isset( $matches[1] ) && 'user_id' == $matches[1] )
-                    $meta_id_column = 'umeta_id';
-            else
-                    $meta_id_column = 'meta_id';
+			if ( isset( $matches[1] ) && 'user_id' == $matches[1] )
+					$meta_id_column = 'umeta_id';
+			else
+					$meta_id_column = 'meta_id';
 
-            $meta_query_orderby = ' ORDER BY ' . $meta_id_column;
+			$meta_query_orderby = ' ORDER BY ' . $meta_id_column;
 
-            if ( false === strpos( $query, $meta_query_orderby ) )
-                    $query .= $meta_query_orderby;
+			if ( false === strpos( $query, $meta_query_orderby ) )
+					$query .= $meta_query_orderby;
 
-    }
+	}
 
-    return $query;
+	return $query;
 
 }
 

Spacing +28 added lines, -28 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if ( ! defined( 'CMB_DEV') )
-	define( 'CMB_DEV', false );
+if ( ! defined('CMB_DEV'))
+	define('CMB_DEV', false);
 
-if ( ! defined( 'CMB_PATH') )
-	define( 'CMB_PATH', plugin_dir_path( __FILE__ ) );
+if ( ! defined('CMB_PATH'))
+	define('CMB_PATH', plugin_dir_path(__FILE__));
 
-if ( ! defined( 'CMB_URL' ) )
-	define( 'CMB_URL', plugins_url( '', __FILE__ ) );
+if ( ! defined('CMB_URL'))
+	define('CMB_URL', plugins_url('', __FILE__));
 
-include_once( CMB_PATH . '/classes.fields.php' );
-include_once( CMB_PATH . '/class.cmb-meta-box.php' );
+include_once(CMB_PATH . '/classes.fields.php');
+include_once(CMB_PATH . '/class.cmb-meta-box.php');
 
 // Make it possible to add fields in locations other than post edit screen.
-include_once( CMB_PATH . '/fields-anywhere.php' );
+include_once(CMB_PATH . '/fields-anywhere.php');
 
 // include_once( CMB_PATH . '/example-functions.php' );
 
@@ -23,25 +23,25 @@ 
  */
 function cmb_init() {
 
-	if ( ! is_admin() )
+	if ( ! is_admin())
 		return;
 
 	// Load translations
 	$textdomain = 'cmb';
-	$locale = apply_filters( 'plugin_locale', get_locale(), $textdomain );
+	$locale = apply_filters('plugin_locale', get_locale(), $textdomain);
 
 	// By default, try to load language files from /wp-content/languages/custom-meta-boxes/
-	load_textdomain( $textdomain, WP_LANG_DIR . '/custom-meta-boxes/' . $textdomain . '-' . $locale . '.mo' );
-	load_textdomain( $textdomain, CMB_PATH . '/languages/' . $textdomain . '-' . $locale . '.mo' );
+	load_textdomain($textdomain, WP_LANG_DIR . '/custom-meta-boxes/' . $textdomain . '-' . $locale . '.mo');
+	load_textdomain($textdomain, CMB_PATH . '/languages/' . $textdomain . '-' . $locale . '.mo');
 
-	$meta_boxes = apply_filters( 'cmb_meta_boxes', array() );
+	$meta_boxes = apply_filters('cmb_meta_boxes', array());
 
-	if ( ! empty( $meta_boxes ) )
-		foreach ( $meta_boxes as $meta_box )
-			new CMB_Meta_Box( $meta_box );
+	if ( ! empty($meta_boxes))
+		foreach ($meta_boxes as $meta_box)
+			new CMB_Meta_Box($meta_box);
 
 }
-add_action( 'init', 'cmb_init', 50 );
+add_action('init', 'cmb_init', 50);
 
 /**
  * Return an array of built in available fields
@@ -53,7 +53,7 @@ 
  */
 function _cmb_available_fields() {
 
-	return apply_filters( 'cmb_field_types', array(
+	return apply_filters('cmb_field_types', array(
 		'text'				=> 'CMB_Text_Field',
 		'text_small' 		=> 'CMB_Text_Small_Field',
 		'text_url'			=> 'CMB_URL_Field',
@@ -78,7 +78,7 @@ 
 		'group'				=> 'CMB_Group_Field',
 		'gmap'				=> 'CMB_Gmap_Field',
 		'number'			=> 'CMB_Number_Field'
-	) );
+	));
 
 }
 
@@ -88,11 +88,11 @@ 
  * @param  string $type
  * @return string $class, or false if not found.
  */
-function _cmb_field_class_for_type( $type ) {
+function _cmb_field_class_for_type($type) {
 
 	$map = _cmb_available_fields();
 
-	if ( isset( $map[$type] ) )
+	if (isset($map[$type]))
 		return $map[$type];
 
 	return false;
@@ -114,18 +114,18 @@ 
     $pattern = '/^SELECT (post_id|user_id), meta_key, meta_value FROM \w* WHERE post_id IN \([\d|,]*\)$/';
 
     if (
-            0 === strpos( $query, "SELECT post_id, meta_key, meta_value" ) &&
-            preg_match( $pattern, $query, $matches )
+            0 === strpos($query, "SELECT post_id, meta_key, meta_value") &&
+            preg_match($pattern, $query, $matches)
     ) {
 
-            if ( isset( $matches[1] ) && 'user_id' == $matches[1] )
+            if (isset($matches[1]) && 'user_id' == $matches[1])
                     $meta_id_column = 'umeta_id';
             else
                     $meta_id_column = 'meta_id';
 
             $meta_query_orderby = ' ORDER BY ' . $meta_id_column;
 
-            if ( false === strpos( $query, $meta_query_orderby ) )
+            if (false === strpos($query, $meta_query_orderby))
                     $query .= $meta_query_orderby;
 
     }
@@ -134,5 +134,5 @@ 
 
 }
 
-if ( version_compare( get_bloginfo( 'version' ), '3.8', '<' ) )
-	add_filter( 'query', 'cmb_fix_meta_query_order', 1 );
\ No newline at end of file
+if (version_compare(get_bloginfo('version'), '3.8', '<'))
+	add_filter('query', 'cmb_fix_meta_query_order', 1);
\ No newline at end of file

Braces +26 added lines, -17 removed lines

@@ -1,12 +1,15 @@ 
 <?php
-if ( ! defined( 'CMB_DEV') )
+if ( ! defined( 'CMB_DEV') ) {
 	define( 'CMB_DEV', false );
+}
 
-if ( ! defined( 'CMB_PATH') )
+if ( ! defined( 'CMB_PATH') ) {
 	define( 'CMB_PATH', plugin_dir_path( __FILE__ ) );
+}
 
-if ( ! defined( 'CMB_URL' ) )
+if ( ! defined( 'CMB_URL' ) ) {
 	define( 'CMB_URL', plugins_url( '', __FILE__ ) );
+}
 
 include_once( CMB_PATH . '/classes.fields.php' );
 include_once( CMB_PATH . '/class.cmb-meta-box.php' );
@@ -23,8 +26,9 @@ 
  */
 function cmb_init() {
 
-	if ( ! is_admin() )
-		return;
+	if ( ! is_admin() ) {
+			return;
+	}
 
 	// Load translations
 	$textdomain = 'cmb';
@@ -36,9 +40,10 @@ 
 
 	$meta_boxes = apply_filters( 'cmb_meta_boxes', array() );
 
-	if ( ! empty( $meta_boxes ) )
-		foreach ( $meta_boxes as $meta_box )
+	if ( ! empty( $meta_boxes ) ) {
+			foreach ( $meta_boxes as $meta_box )
 			new CMB_Meta_Box( $meta_box );
+	}
 
 }
 add_action( 'init', 'cmb_init', 50 );
@@ -92,8 +97,9 @@ 
 
 	$map = _cmb_available_fields();
 
-	if ( isset( $map[$type] ) )
-		return $map[$type];
+	if ( isset( $map[$type] ) ) {
+			return $map[$type];
+	}
 
 	return false;
 
@@ -118,15 +124,17 @@ 
             preg_match( $pattern, $query, $matches )
     ) {
 
-            if ( isset( $matches[1] ) && 'user_id' == $matches[1] )
-                    $meta_id_column = 'umeta_id';
-            else
-                    $meta_id_column = 'meta_id';
+            if ( isset( $matches[1] ) && 'user_id' == $matches[1] ) {
+                                $meta_id_column = 'umeta_id';
+            } else {
+                                $meta_id_column = 'meta_id';
+            }
 
             $meta_query_orderby = ' ORDER BY ' . $meta_id_column;
 
-            if ( false === strpos( $query, $meta_query_orderby ) )
-                    $query .= $meta_query_orderby;
+            if ( false === strpos( $query, $meta_query_orderby ) ) {
+                                $query .= $meta_query_orderby;
+            }
 
     }
 
@@ -134,5 +142,6 @@ 
 
 }
 
-if ( version_compare( get_bloginfo( 'version' ), '3.8', '<' ) )
-	add_filter( 'query', 'cmb_fix_meta_query_order', 1 );
\ No newline at end of file
+if ( version_compare( get_bloginfo( 'version' ), '3.8', '<' ) ) {
+	add_filter( 'query', 'cmb_fix_meta_query_order', 1 );
+}

vendor/Custom-Meta-Boxes/classes.fields.php

Spacing +313 added lines, -313 removed lines

@@ -11,34 +11,34 @@ 
 	public $value;
 	public $field_index = 0;
 
-	public function __construct( $name, $title, array $values, $args = array() ) {
+	public function __construct($name, $title, array $values, $args = array()) {
 
-		$this->id 		= $name;
+		$this->id = $name;
 		$this->name		= $name . '[]';
-		$this->title 	= $title;
-		$this->args  = wp_parse_args( $args, $this->get_default_args() );
+		$this->title = $title;
+		$this->args  = wp_parse_args($args, $this->get_default_args());
 
 		// Deprecated argument: 'std'
-		if ( ! empty( $this->args['std'] ) && empty( $this->args['default'] ) ) {
+		if ( ! empty($this->args['std']) && empty($this->args['default'])) {
 			$this->args['default'] = $this->args['std'];
-			_deprecated_argument( 'CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead" );
+			_deprecated_argument('CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead");
 		}
 
-		if ( ! empty( $this->args['options'] ) && is_array( reset( $this->args['options'] ) ) ) {
+		if ( ! empty($this->args['options']) && is_array(reset($this->args['options']))) {
 			$re_format = array();
-			foreach ( $this->args['options'] as $option ) {
+			foreach ($this->args['options'] as $option) {
 				$re_format[$option['value']] = $option['name'];
 			}
 			$this->args['options'] = $re_format;
 		}
 
 		// If the field has a custom value populator callback
-		if ( ! empty( $args['values_callback'] ) )
-			$this->values = call_user_func( $args['values_callback'], get_the_id() );
+		if ( ! empty($args['values_callback']))
+			$this->values = call_user_func($args['values_callback'], get_the_id());
 		else
 			$this->values = $values;
 
-		$this->value = reset( $this->values );
+		$this->value = reset($this->values);
 
 	}
 
@@ -65,10 +65,10 @@ 
 				'class'               => '',
 				'data_delegate'       => null,
 				'save_callback'       => null,
-				'string-repeat-field' => __( 'Add New', 'cmb' ),
-				'string-delete-field' => __( 'Remove Field', 'cmb' ),
+				'string-repeat-field' => __('Add New', 'cmb'),
+				'string-delete-field' => __('Remove Field', 'cmb'),
 			),
-			get_class( $this )
+			get_class($this)
 		);
 	}
 
@@ -79,8 +79,8 @@ 
 	 */
 	public function enqueue_scripts() {
 
-		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] )
-			wp_enqueue_script( 'jquery-ui-sortable' );
+		if (isset($this->args['sortable']) && $this->args['sortable'])
+			wp_enqueue_script('jquery-ui-sortable');
 
 	}
 
@@ -100,9 +100,9 @@ 
 	 * @param  string $append
 	 * @return null
 	 */
-	public function id_attr( $append = null ) {
+	public function id_attr($append = null) {
 
-		printf( 'id="%s"', esc_attr( $this->get_the_id_attr( $append ) ) );
+		printf('id="%s"', esc_attr($this->get_the_id_attr($append)));
 
 	}
 
@@ -117,21 +117,21 @@ 
 	 * @param  string $append
 	 * @return null
 	 */
-	public function get_the_id_attr( $append = null ) {
+	public function get_the_id_attr($append = null) {
 
 		$id = $this->id;
 
-		if ( isset( $this->parent ) ) {
-			$parent_id = preg_replace( '/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_id_attr() );
+		if (isset($this->parent)) {
+			$parent_id = preg_replace('/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_id_attr());
 			$id = $parent_id . '[' . $id . ']';
 		}
 
 		$id .= '-cmb-field-' . $this->field_index;
 
-		if ( ! is_null( $append ) )
+		if ( ! is_null($append))
 			$id .= '-' . $append;
 
-		$id = str_replace( array( '[', ']', '--' ), '-', $id );
+		$id = str_replace(array('[', ']', '--'), '-', $id);
 
 		return $id;
 
@@ -146,41 +146,41 @@ 
 	 * @param  string $append
 	 * @return string id attribute value.
 	 */
-	public function for_attr( $append = null ) {
+	public function for_attr($append = null) {
 
-		printf( 'for="%s"', esc_attr( $this->get_the_id_attr( $append ) ) );
+		printf('for="%s"', esc_attr($this->get_the_id_attr($append)));
 
 	}
 
-	public function name_attr( $append = null ) {
+	public function name_attr($append = null) {
 
-		printf( 'name="%s"', esc_attr( $this->get_the_name_attr( $append ) ) );
+		printf('name="%s"', esc_attr($this->get_the_name_attr($append)));
 
 	}
 
-	public function get_the_name_attr( $append = null ) {
+	public function get_the_name_attr($append = null) {
 
-		$name = str_replace( '[]', '', $this->name );
+		$name = str_replace('[]', '', $this->name);
 
-		if ( isset( $this->parent ) ) {
-			$parent_name = preg_replace( '/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_name_attr() );
+		if (isset($this->parent)) {
+			$parent_name = preg_replace('/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_name_attr());
 			$name = $parent_name . '[' . $name . ']';
 		}
 
 		$name .= "[cmb-field-$this->field_index]";
 
-		if ( ! is_null( $append ) )
+		if ( ! is_null($append))
 			$name .= $append;
 
 		return $name;
 
 	}
 
-	public function class_attr( $classes = '' ) {
+	public function class_attr($classes = '') {
 
-		if ( $classes = implode( ' ', array_map( 'sanitize_html_class', array_filter( array_unique( explode( ' ', $classes . ' ' . $this->args['class'] ) ) ) ) ) ) { ?>
+		if ($classes = implode(' ', array_map('sanitize_html_class', array_filter(array_unique(explode(' ', $classes . ' ' . $this->args['class'])))))) { ?>
 
-			class="<?php echo esc_attr( $classes ); ?>"
+			class="<?php echo esc_attr($classes); ?>"
 
 		<?php }
 
@@ -193,22 +193,22 @@ 
 	 */
 	public function get_js_id() {
 
-		return str_replace( array( '-', '[', ']', '--' ),'_', $this->get_the_id_attr() ); // JS friendly ID
+		return str_replace(array('-', '[', ']', '--'), '_', $this->get_the_id_attr()); // JS friendly ID
 
 	}
 
-	public function boolean_attr( $attrs = array() ) {
+	public function boolean_attr($attrs = array()) {
 
-		if ( $this->args['readonly'] )
+		if ($this->args['readonly'])
 			$attrs[] = 'readonly';
 
-		if ( $this->args['disabled'] )
+		if ($this->args['disabled'])
 			$attrs[] = 'disabled';
 
-		$attrs = array_filter( array_unique( $attrs ) );
+		$attrs = array_filter(array_unique($attrs));
 
-		foreach ( $attrs as $attr )
-			echo esc_html( $attr ) . '="' . esc_attr( $attr ) . '"';
+		foreach ($attrs as $attr)
+			echo esc_html($attr) . '="' . esc_attr($attr) . '"';
 
 	}
 
@@ -228,26 +228,26 @@ 
 	 */
 	protected function get_delegate_data() {
 
-		if ( $this->args['data_delegate'] )
-			return call_user_func_array( $this->args['data_delegate'], array( $this ) );
+		if ($this->args['data_delegate'])
+			return call_user_func_array($this->args['data_delegate'], array($this));
 
 		return array();
 
 	}
 
 	public function get_value() {
-	   return ( $this->value || $this->value === '0' ) ? $this->value : $this->args['default'];
+	   return ($this->value || $this->value === '0') ? $this->value : $this->args['default'];
 	}
 
 	public function &get_values() {
 		return $this->values;
 	}
 
-	public function set_values( array $values ) {
+	public function set_values(array $values) {
 
 		$this->values = $values;
 
-		unset( $this->value );
+		unset($this->value);
 
 	}
 
@@ -259,48 +259,48 @@ 
 	 * @todo this surely only works for posts
 	 * @todo why do values need to be passed in, they can already be passed in on construct
 	 */
-	public function save( $post_id, $values ) {
+	public function save($post_id, $values) {
 
 		// Don't save readonly values.
-		if ( $this->args['readonly'] )
+		if ($this->args['readonly'])
 			return;
 
 		$this->values = $values;
 		$this->parse_save_values();
 
 		// Allow override from args
-		if ( ! empty( $this->args['save_callback'] ) ) {
+		if ( ! empty($this->args['save_callback'])) {
 
-			call_user_func( $this->args['save_callback'], $this->values, $post_id );
+			call_user_func($this->args['save_callback'], $this->values, $post_id);
 
 			return;
 
 		}
 
 		// If we are not on a post edit screen
-		if ( ! $post_id )
+		if ( ! $post_id)
 			return;
 
-		delete_post_meta( $post_id, $this->id );
+		delete_post_meta($post_id, $this->id);
 
-		foreach( $this->values as $v ) {
+		foreach ($this->values as $v) {
 
 			$this->value = $v;
 			$this->parse_save_value();
 
-			if ( $this->value || $this->value === '0' )
-				add_post_meta( $post_id, $this->id, $this->value );
+			if ($this->value || $this->value === '0')
+				add_post_meta($post_id, $this->id, $this->value);
 
 		}
 	}
 
 	public function title() {
 
-		if ( $this->title ) { ?>
+		if ($this->title) { ?>
 
 			<div class="field-title">
 				<label <?php $this->for_attr(); ?>>
-					<?php echo esc_html( $this->title ); ?>
+					<?php echo esc_html($this->title); ?>
 				</label>
 			</div>
 
@@ -310,10 +310,10 @@ 
 
 	public function description() {
 
-		if ( ! empty( $this->args['desc'] ) ) { ?>
+		if ( ! empty($this->args['desc'])) { ?>
 
 			<div class="cmb_metabox_description">
-				<?php echo wp_kses_post( $this->args['desc'] ); ?>
+				<?php echo wp_kses_post($this->args['desc']); ?>
 			</div>
 
 		<?php }
@@ -323,8 +323,8 @@ 
 	public function display() {
 
 		// If there are no values and it's not repeateble, we want to do one with empty string
-		if ( ! $this->get_values() && ! $this->args['repeatable'] )
-			$values = array( '' );
+		if ( ! $this->get_values() && ! $this->args['repeatable'])
+			$values = array('');
 		else
 			$values = $this->get_values();
 
@@ -333,18 +333,18 @@ 
 		$this->description();
 
 		$i = 0;
-		if( isset( $this->args['type'] ) && $this->args['type'] == 'gmap' ) {
-			$values = array( $values );
+		if (isset($this->args['type']) && $this->args['type'] == 'gmap') {
+			$values = array($values);
 		}
-		foreach ( $values as $key => $value ) {
+		foreach ($values as $key => $value) {
 
 			$this->field_index = $i;
 			$this->value = $value; ?>
 
-			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+			<div class="field-item" data-class="<?php echo esc_attr(get_class($this)); ?>" style="position: relative; <?php echo esc_attr($this->args['style']); ?>">
 
-			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
+			<?php if ($this->args['repeatable']) : ?>
+				<button class="cmb-delete-field" title="<?php echo esc_attr($this->args['string-delete-field']); ?>">
 					<span class="cmb-delete-field-icon">&times;</span>
 				</button>
 			<?php endif; ?>
@@ -360,17 +360,17 @@ 
 		}
 
 		// Insert a hidden one if it's repeatable
-		if ( $this->args['repeatable'] ) {
+		if ($this->args['repeatable']) {
 
 			$this->field_index = 'x'; // x used to distinguish hidden fields.
 			$this->value = ''; ?>
 
-			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+			<div class="field-item hidden" data-class="<?php echo esc_attr(get_class($this)); ?>" style="position: relative; <?php echo esc_attr($this->args['style']); ?>">
 
-			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
+			<?php if ($this->args['repeatable']) : ?>
+				<button class="cmb-delete-field" title="<?php echo esc_attr($this->args['string-delete-field']); ?>">
 					<span class="cmb-delete-field-icon">&times;</span>
-					<?php echo esc_html( $this->args['string-delete-field'] ); ?>
+					<?php echo esc_html($this->args['string-delete-field']); ?>
 				</button>
 			<?php endif; ?>
 
@@ -378,7 +378,7 @@ 
 
 			</div>
 
-			<button class="button repeat-field"><?php echo esc_html( $this->args['string-repeat-field'] ); ?></button>
+			<button class="button repeat-field"><?php echo esc_html($this->args['string-repeat-field']); ?></button>
 
 		<?php }
 
@@ -395,7 +395,7 @@ 
 
 	public function html() { ?>
 
-		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr($this->get_value()); ?>" />
 
 	<?php }
 }
@@ -427,7 +427,7 @@ 
 		return array_merge(
 			parent::get_default_args(),
 			array(
-				'library-type' => array( 'video', 'audio', 'text', 'application' )
+				'library-type' => array('video', 'audio', 'text', 'application')
 			)
 		);
 	}
@@ -439,39 +439,39 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_media( array( 'post' => $post_ID ));
-		wp_enqueue_script( 'cmb-file-upload', trailingslashit( CMB_URL ) . 'js/file-upload.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_media(array('post' => $post_ID));
+		wp_enqueue_script('cmb-file-upload', trailingslashit(CMB_URL) . 'js/file-upload.js', array('jquery', 'cmb-scripts'));
 
 	}
 
 	public function html() {
 
-		if ( $this->get_value() ) {
-			$src = wp_mime_type_icon( $this->get_value() );
-			$size = getimagesize( str_replace( site_url(), ABSPATH, $src ) );
+		if ($this->get_value()) {
+			$src = wp_mime_type_icon($this->get_value());
+			$size = getimagesize(str_replace(site_url(), ABSPATH, $src));
 			$icon_img = '<img src="' . $src . '" ' . $size[3] . ' />';
 		}
 
-		$data_type = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );
+		$data_type = ( ! empty($this->args['library-type']) ? implode(',', $this->args['library-type']) : null);
 
 		?>
 
-		<div class="cmb-file-wrap" <?php echo 'data-type="' . esc_attr( $data_type ) . '"'; ?>>
+		<div class="cmb-file-wrap" <?php echo 'data-type="' . esc_attr($data_type) . '"'; ?>>
 
 			<div class="cmb-file-wrap-placeholder"></div>
 
-			<button class="button cmb-file-upload <?php echo esc_attr( $this->get_value() ) ? 'hidden' : '' ?>">
-				<?php esc_html_e( 'Add File', 'cmb' ); ?>
+			<button class="button cmb-file-upload <?php echo esc_attr($this->get_value()) ? 'hidden' : '' ?>">
+				<?php esc_html_e('Add File', 'cmb'); ?>
 			</button>
 
 			<div class="cmb-file-holder type-file <?php echo $this->get_value() ? '' : 'hidden'; ?>">
 
-				<?php if ( $this->get_value() ) : ?>
+				<?php if ($this->get_value()) : ?>
 
-					<?php if ( isset( $icon_img ) ) echo $icon_img; ?>
+					<?php if (isset($icon_img)) echo $icon_img; ?>
 
 					<div class="cmb-file-name">
-						<strong><?php echo esc_html( basename( get_attached_file( $this->get_value() ) ) ); ?></strong>
+						<strong><?php echo esc_html(basename(get_attached_file($this->get_value()))); ?></strong>
 					</div>
 
 				<?php endif; ?>
@@ -479,13 +479,13 @@ 
 			</div>
 
 			<button class="cmb-remove-file button <?php echo $this->get_value() ? '' : 'hidden'; ?>">
-				<?php esc_html_e( 'Remove', 'cmb' ); ?>
+				<?php esc_html_e('Remove', 'cmb'); ?>
 			</button>
 
 			<input type="hidden"
-				<?php $this->class_attr( 'cmb-file-upload-input' ); ?>
+				<?php $this->class_attr('cmb-file-upload-input'); ?>
 				<?php $this->name_attr(); ?>
-				value="<?php echo esc_attr( $this->value ); ?>"
+				value="<?php echo esc_attr($this->value); ?>"
 			/>
 
 		</div>
@@ -506,7 +506,7 @@ 
 			parent::get_default_args(),
 			array(
 			'size' => 'thumbnail',
-			'library-type' => array( 'image' ),
+			'library-type' => array('image'),
 			'show_size' => false
 			)
 		);
@@ -514,52 +514,52 @@ 
 
 	public function html() {
 
-		if ( $this->get_value() )
-			$image = wp_get_attachment_image_src( $this->get_value(), $this->args['size'], true );
+		if ($this->get_value())
+			$image = wp_get_attachment_image_src($this->get_value(), $this->args['size'], true);
 
 		// Convert size arg to array of width, height, crop
-		$size = $this->parse_image_size( $this->args['size'] );
+		$size = $this->parse_image_size($this->args['size']);
 
 		// Inline styles
-		$styles              = sprintf( 'width: %1$dpx; height: %2$dpx; line-height: %2$dpx', intval( $size['width'] ), intval( $size['height'] ) );
-		$placeholder_styles  = sprintf( 'width: %dpx; height: %dpx;', intval( $size['width'] ) - 8, intval( $size['height'] ) - 8 );
+		$styles              = sprintf('width: %1$dpx; height: %2$dpx; line-height: %2$dpx', intval($size['width']), intval($size['height']));
+		$placeholder_styles  = sprintf('width: %dpx; height: %dpx;', intval($size['width']) - 8, intval($size['height']) - 8);
 
-		$data_type           = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );
+		$data_type           = ( ! empty($this->args['library-type']) ? implode(',', $this->args['library-type']) : null);
 
 		?>
 
-		<div class="cmb-file-wrap" style="<?php echo esc_attr( $styles ); ?>" data-type="<?php echo esc_attr( $data_type ); ?>">
+		<div class="cmb-file-wrap" style="<?php echo esc_attr($styles); ?>" data-type="<?php echo esc_attr($data_type); ?>">
 
-			<div class="cmb-file-wrap-placeholder" style="<?php echo esc_attr( $placeholder_styles ); ?>">
+			<div class="cmb-file-wrap-placeholder" style="<?php echo esc_attr($placeholder_styles); ?>">
 
-				<?php if ( $this->args['show_size'] ) : ?>
+				<?php if ($this->args['show_size']) : ?>
 					<span class="dimensions">
-						<?php printf( '%dpx &times; %dpx', intval( $size['width'] ), intval( $size['height'] ) ); ?>
+						<?php printf('%dpx &times; %dpx', intval($size['width']), intval($size['height'])); ?>
 					</span>
 				<?php endif; ?>
 
 			</div>
 
-			<button class="button cmb-file-upload <?php echo esc_attr( $this->get_value() ) ? 'hidden' : '' ?>" data-nonce="<?php echo wp_create_nonce( 'cmb-file-upload-nonce' ); ?>">
-				<?php esc_html_e( 'Select', 'cmb' ); ?>
+			<button class="button cmb-file-upload <?php echo esc_attr($this->get_value()) ? 'hidden' : '' ?>" data-nonce="<?php echo wp_create_nonce('cmb-file-upload-nonce'); ?>">
+				<?php esc_html_e('Select', 'cmb'); ?>
 			</button>
 
 			<div class="cmb-file-holder type-img <?php echo $this->get_value() ? '' : 'hidden'; ?>" data-crop="<?php echo (bool) $size['crop']; ?>">
 
-				<?php if ( ! empty( $image ) ) : ?>
-					<img src="<?php echo esc_url( $image[0] ); ?>" width="<?php echo intval( $image[1] ); ?>" height="<?php echo intval( $image[2] ); ?>" />
+				<?php if ( ! empty($image)) : ?>
+					<img src="<?php echo esc_url($image[0]); ?>" width="<?php echo intval($image[1]); ?>" height="<?php echo intval($image[2]); ?>" />
 				<?php endif; ?>
 
 			</div>
 
 			<button class="cmb-remove-file button <?php echo $this->get_value() ? '' : 'hidden'; ?>">
-				<?php esc_html_e( 'Remove', 'cmb' ); ?>
+				<?php esc_html_e('Remove', 'cmb'); ?>
 			</button>
 
 			<input type="hidden"
-				<?php $this->class_attr( 'cmb-file-upload-input' ); ?>
+				<?php $this->class_attr('cmb-file-upload-input'); ?>
 				<?php $this->name_attr(); ?>
-				value="<?php echo esc_attr( $this->value ); ?>"
+				value="<?php echo esc_attr($this->value); ?>"
 			/>
 
 		</div>
@@ -572,20 +572,20 @@ 
 	 * @param  string $size
 	 * @return array width, height, crop
 	 */
-	private function parse_image_size( $size ) {
+	private function parse_image_size($size) {
 
 		// Handle string for built-in image sizes
-		if ( is_string( $size ) && in_array( $size, array( 'thumbnail', 'medium', 'large' ) ) ) {
+		if (is_string($size) && in_array($size, array('thumbnail', 'medium', 'large'))) {
 			return array(
-				'width'  => get_option( $size . '_size_w' ),
-				'height' => get_option( $size . '_size_h' ),
-				'crop'   => get_option( $size . '_crop' )
+				'width'  => get_option($size . '_size_w'),
+				'height' => get_option($size . '_size_h'),
+				'crop'   => get_option($size . '_crop')
 			);
 		}
 
 		// Handle string for additional image sizes
 		global $_wp_additional_image_sizes;
-		if ( is_string( $size ) && isset( $_wp_additional_image_sizes[$size] ) ) {
+		if (is_string($size) && isset($_wp_additional_image_sizes[$size])) {
 			return array(
 				'width'  => $_wp_additional_image_sizes[$size]['width'],
 				'height' => $_wp_additional_image_sizes[$size]['height'],
@@ -594,14 +594,14 @@ 
 		}
 
 		// Handle default WP size format.
-		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) )
-			$size = array( 'width' => $size[0], 'height' => $size[1] );
+		if (is_array($size) && isset($size[0]) && isset($size[1]))
+			$size = array('width' => $size[0], 'height' => $size[1]);
 
-		return wp_parse_args( $size, array(
-			'width'  => get_option( 'thumbnail_size_w' ),
-			'height' => get_option( 'thumbnail_size_h' ),
-			'crop'   => get_option( 'thumbnail_crop' )
-		) );
+		return wp_parse_args($size, array(
+			'width'  => get_option('thumbnail_size_w'),
+			'height' => get_option('thumbnail_size_h'),
+			'crop'   => get_option('thumbnail_crop')
+		));
 
 	}
 
@@ -612,25 +612,25 @@ 
 	 */
 	static function request_image_ajax_callback() {
 
-		if ( ! ( isset( $_POST['nonce'] ) && wp_verify_nonce( $_POST['nonce'], 'cmb-file-upload-nonce' ) ) )
+		if ( ! (isset($_POST['nonce']) && wp_verify_nonce($_POST['nonce'], 'cmb-file-upload-nonce')))
 			return;
 
-		$id = intval( $_POST['id'] );
+		$id = intval($_POST['id']);
 
 		$size = array(
-			intval( $_POST['width'] ),
-			intval( $_POST['height'] ),
+			intval($_POST['width']),
+			intval($_POST['height']),
 			'crop' => (bool) $_POST['crop']
 		);
 
-		$image = wp_get_attachment_image_src( $id, $size );
-		echo reset( $image );
+		$image = wp_get_attachment_image_src($id, $size);
+		echo reset($image);
 
 		die(); // this is required to return a proper result
 	}
 
 }
-add_action( 'wp_ajax_cmb_request_image', array( 'CMB_Image_Field', 'request_image_ajax_callback' ) );
+add_action('wp_ajax_cmb_request_image', array('CMB_Image_Field', 'request_image_ajax_callback'));
 
 /**
  * Standard text meta box for a URL.
@@ -649,7 +649,7 @@ 
 
 	public function html() { ?>
 
-		<input step="<?php echo esc_attr( $this->args['step'] ); ?>" type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>" />
+		<input step="<?php echo esc_attr($this->args['step']); ?>" type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_number code'); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr($this->value); ?>" />
 
 	<?php }
 }
@@ -662,7 +662,7 @@ 
 
 	public function html() { ?>
 
-		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_url code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( esc_url( $this->value ) ); ?>" />
+		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_url code'); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr(esc_url($this->value)); ?>" />
 
 	<?php }
 }
@@ -677,14 +677,14 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style('cmb-jquery-ui', trailingslashit(CMB_URL) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3');
 
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script('cmb-datetime', trailingslashit(CMB_URL) . 'js/field.datetime.js', array('jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts'));
 	}
 
 	public function html() { ?>
 
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>" />
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_small cmb_datepicker'); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr($this->value); ?>" />
 
 	<?php }
 }
@@ -695,15 +695,15 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style('cmb-jquery-ui', trailingslashit(CMB_URL) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3');
 
-		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script('cmb-timepicker', trailingslashit(CMB_URL) . 'js/jquery.timePicker.min.js', array('jquery', 'cmb-scripts'));
+		wp_enqueue_script('cmb-datetime', trailingslashit(CMB_URL) . 'js/field.datetime.js', array('jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts'));
 	}
 
 	public function html() { ?>
 
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_timepicker' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>"/>
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_small cmb_timepicker'); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr($this->value); ?>"/>
 
 	<?php }
 
@@ -719,25 +719,25 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style('cmb-jquery-ui', trailingslashit(CMB_URL) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3');
 
-		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script('cmb-timepicker', trailingslashit(CMB_URL) . 'js/jquery.timePicker.min.js', array('jquery', 'cmb-scripts'));
+		wp_enqueue_script('cmb-datetime', trailingslashit(CMB_URL) . 'js/field.datetime.js', array('jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts'));
 
 	}
 
 	public function html() { ?>
 
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr(); ?>  value="<?php echo $this->value ? esc_attr( date( 'm\/d\/Y', $this->value ) ) : '' ?>" />
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_small cmb_datepicker'); ?> type="text" <?php $this->name_attr(); ?>  value="<?php echo $this->value ? esc_attr(date('m\/d\/Y', $this->value)) : '' ?>" />
 
 	<?php }
 
 	public function parse_save_values() {
 
-		foreach( $this->values as &$value )
-			$value = strtotime( $value );
+		foreach ($this->values as &$value)
+			$value = strtotime($value);
 
-		sort( $this->values );
+		sort($this->values);
 
 	}
 
@@ -753,16 +753,16 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style('cmb-jquery-ui', trailingslashit(CMB_URL) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3');
 
-		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script('cmb-timepicker', trailingslashit(CMB_URL) . 'js/jquery.timePicker.min.js', array('jquery', 'cmb-scripts'));
+		wp_enqueue_script('cmb-datetime', trailingslashit(CMB_URL) . 'js/field.datetime.js', array('jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts'));
 	}
 
 	public function html() { ?>
 
-		<input <?php $this->id_attr('date'); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr( '[date]' ); ?>  value="<?php echo $this->value ? esc_attr( date( 'm\/d\/Y', $this->value ) ) : '' ?>" />
-		<input <?php $this->id_attr('time'); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_timepicker' ); ?> type="text" <?php $this->name_attr( '[time]' ); ?> value="<?php echo $this->value ? esc_attr( date( 'h:i A', $this->value ) ) : '' ?>" />
+		<input <?php $this->id_attr('date'); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_small cmb_datepicker'); ?> type="text" <?php $this->name_attr('[date]'); ?>  value="<?php echo $this->value ? esc_attr(date('m\/d\/Y', $this->value)) : '' ?>" />
+		<input <?php $this->id_attr('time'); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_text_small cmb_timepicker'); ?> type="text" <?php $this->name_attr('[time]'); ?> value="<?php echo $this->value ? esc_attr(date('h:i A', $this->value)) : '' ?>" />
 
 	<?php }
 
@@ -770,15 +770,15 @@ 
 
 		// Convert all [date] and [time] values to a unix timestamp.
 		// If date is empty, assume delete. If time is empty, assume 00:00.
-		foreach( $this->values as $key => &$value ) {
-			if ( empty( $value['date'] ) )
-				unset( $this->values[$key] );
+		foreach ($this->values as $key => &$value) {
+			if (empty($value['date']))
+				unset($this->values[$key]);
 			else
-				$value = strtotime( $value['date'] . ' ' . $value['time'] );
+				$value = strtotime($value['date'] . ' ' . $value['time']);
 		}
 
-		$this->values = array_filter( $this->values );
-		sort( $this->values );
+		$this->values = array_filter($this->values);
+		sort($this->values);
 
 		parent::parse_save_values();
 
@@ -796,7 +796,7 @@ 
 
 	public function html() { ?>
 
-		<textarea <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> rows="<?php echo ! empty( $this->args['rows'] ) ? esc_attr( $this->args['rows'] ) : 4; ?>" <?php $this->name_attr(); ?>><?php echo esc_html( $this->value ); ?></textarea>
+		<textarea <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> rows="<?php echo ! empty($this->args['rows']) ? esc_attr($this->args['rows']) : 4; ?>" <?php $this->name_attr(); ?>><?php echo esc_html($this->value); ?></textarea>
 
 	<?php }
 
@@ -830,13 +830,13 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_script( 'cmb-colorpicker', trailingslashit( CMB_URL ) . 'js/field.colorpicker.js', array( 'jquery', 'wp-color-picker', 'cmb-scripts' ) );
-		wp_enqueue_style( 'wp-color-picker' );
+		wp_enqueue_script('cmb-colorpicker', trailingslashit(CMB_URL) . 'js/field.colorpicker.js', array('jquery', 'wp-color-picker', 'cmb-scripts'));
+		wp_enqueue_style('wp-color-picker');
 	}
 
 	public function html() { ?>
 
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_colorpicker cmb_text_small' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr('cmb_colorpicker cmb_text_small'); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr($this->get_value()); ?>" />
 
 	<?php }
 
@@ -866,14 +866,14 @@ 
 
 	public function html() {
 
-		if ( $this->has_data_delegate() )
+		if ($this->has_data_delegate())
 			$this->args['options'] = $this->get_delegate_data(); ?>
 
-			<?php foreach ( $this->args['options'] as $key => $value ): ?>
+			<?php foreach ($this->args['options'] as $key => $value): ?>
 
-			<input <?php $this->id_attr( 'item-' . $key ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="radio" <?php $this->name_attr(); ?>  value="<?php echo esc_attr( $key ); ?>" <?php checked( $key, $this->get_value() ); ?> />
-			<label <?php $this->for_attr( 'item-' . $key ); ?> style="margin-right: 20px;">
-				<?php echo esc_html( $value ); ?>
+			<input <?php $this->id_attr('item-' . $key); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="radio" <?php $this->name_attr(); ?>  value="<?php echo esc_attr($key); ?>" <?php checked($key, $this->get_value()); ?> />
+			<label <?php $this->for_attr('item-' . $key); ?> style="margin-right: 20px;">
+				<?php echo esc_html($value); ?>
 			</label>
 
 			<?php endforeach; ?>
@@ -906,22 +906,22 @@ 
 
 	public function html() {
 
-		if ( $this->has_data_delegate() )
+		if ($this->has_data_delegate())
 			$this->args['options'] = $this->get_delegate_data(); ?>
 
-			<?php foreach ( $this->args['options'] as $key => $value ): ?>
+			<?php foreach ($this->args['options'] as $key => $value): ?>
 			<div class="cmb-cell-2">
-			<input <?php $this->id_attr( 'item-' . $key ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="checkbox" <?php $this->name_attr(); ?>[]  value="<?php echo esc_attr( $key ); ?>" <?php checked( $key, $this->get_value() ); ?> />
-			<label <?php $this->for_attr( 'item-' . $key ); ?> style="margin-right: 20px;">
-				<?php echo esc_html( $value ); ?>
+			<input <?php $this->id_attr('item-' . $key); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="checkbox" <?php $this->name_attr(); ?>[]  value="<?php echo esc_attr($key); ?>" <?php checked($key, $this->get_value()); ?> />
+			<label <?php $this->for_attr('item-' . $key); ?> style="margin-right: 20px;">
+				<?php echo esc_html($value); ?>
 			</label>
 			</div>
 			<?php endforeach; ?>
 
 	<?php }
 
-	public function parse_save_values(){
-		$this->values = array( $this->values );
+	public function parse_save_values() {
+		$this->values = array($this->values);
 	}
 
 }
@@ -934,7 +934,7 @@ 
 
 	public function html() { ?>
 
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="checkbox" <?php $this->name_attr(); ?>  value="1" <?php checked( $this->get_value() ); ?> />
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="checkbox" <?php $this->name_attr(); ?>  value="1" <?php checked($this->get_value()); ?> />
 
 	<?php }
 
@@ -952,7 +952,7 @@ 
 
 		<div class="field-title">
 			<h3 <?php $this->class_attr(); ?>>
-				<?php echo esc_html( $this->title ); ?>
+				<?php echo esc_html($this->title); ?>
 			</h3>
 		</div>
 
@@ -988,7 +988,7 @@ 
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_script( 'cmb-wysiwyg', trailingslashit( CMB_URL ) . 'js/field-wysiwyg.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_script('cmb-wysiwyg', trailingslashit(CMB_URL) . 'js/field-wysiwyg.js', array('jquery', 'cmb-scripts'));
 	}
 
 	public function html() {
@@ -998,17 +998,17 @@ 
 
 		$field_id = $this->get_js_id();
 
-		printf( '<div class="cmb-wysiwyg" data-id="%s" data-name="%s" data-field-id="%s">', $id, $name, $field_id );
+		printf('<div class="cmb-wysiwyg" data-id="%s" data-name="%s" data-field-id="%s">', $id, $name, $field_id);
 
-		if ( $this->is_placeholder() ) 	{
+		if ($this->is_placeholder()) {
 
 			// For placeholder, output the markup for the editor in a JS var.
 			ob_start();
 			$this->args['options']['textarea_name'] = 'cmb-placeholder-name-' . $field_id;
-			wp_editor( '', 'cmb-placeholder-id-' . $field_id, $this->args['options'] );
+			wp_editor('', 'cmb-placeholder-id-' . $field_id, $this->args['options']);
 			$editor = ob_get_clean();
-			$editor = str_replace( array( "\n", "\r" ), "", $editor );
-			$editor = str_replace( array( "'" ), '"', $editor );
+			$editor = str_replace(array("\n", "\r"), "", $editor);
+			$editor = str_replace(array("'"), '"', $editor);
 
 			?>
 
@@ -1023,7 +1023,7 @@ 
 		} else {
 
 			$this->args['options']['textarea_name'] = $name;
-			echo wp_editor( $this->get_value(), $id, $this->args['options'] );
+			echo wp_editor($this->get_value(), $id, $this->args['options']);
 
 		}
 
@@ -1039,10 +1039,10 @@ 
 	 */
 	public function is_placeholder() {
 
-		if ( isset( $this->parent ) && ! is_int( $this->parent->field_index ) )
+		if (isset($this->parent) && ! is_int($this->parent->field_index))
 			return true;
 
-		else return ! is_int( $this->field_index );
+		else return ! is_int($this->field_index);
 
 	}
 
@@ -1063,7 +1063,7 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( 'parent', '__construct' ), $args );
+		call_user_func_array(array('parent', '__construct'), $args);
 
 	}
 
@@ -1084,16 +1084,16 @@ 
 		);
 	}
 
-	public function parse_save_values(){
+	public function parse_save_values() {
 
-		if ( isset( $this->parent ) && isset( $this->args['multiple'] ) && $this->args['multiple'] )
-			$this->values = array( $this->values );
+		if (isset($this->parent) && isset($this->args['multiple']) && $this->args['multiple'])
+			$this->values = array($this->values);
 
 	}
 
 	public function get_options() {
 
-		if ( $this->has_data_delegate() )
+		if ($this->has_data_delegate())
 			$this->args['options'] = $this->get_delegate_data();
 
 		return $this->args['options'];
@@ -1117,23 +1117,23 @@ 
 			'wc_product_retailer'
 		);
 
-		if ( ! in_array( $typenow, $no_enqueue ) ) {
-			wp_enqueue_script( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.js', array( 'jquery' ) );
+		if ( ! in_array($typenow, $no_enqueue)) {
+			wp_enqueue_script('select2', trailingslashit(CMB_URL) . 'js/vendor/select2/select2.js', array('jquery'));
 		}
 
-		wp_enqueue_script( 'field-select', trailingslashit( CMB_URL ) . 'js/field.select.js', array( 'jquery', 'select2', 'cmb-scripts' ) );
+		wp_enqueue_script('field-select', trailingslashit(CMB_URL) . 'js/field.select.js', array('jquery', 'select2', 'cmb-scripts'));
 	}
 
 	public function enqueue_styles() {
 
 		parent::enqueue_styles();
 
-		wp_enqueue_style( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.css' );
+		wp_enqueue_style('select2', trailingslashit(CMB_URL) . 'js/vendor/select2/select2.css');
 	}
 
 	public function html() {
 
-		if ( $this->has_data_delegate() )
+		if ($this->has_data_delegate())
 			$this->args['options'] = $this->get_delegate_data();
 
 		$this->output_field();
@@ -1147,28 +1147,28 @@ 
 		$val = (array) $this->get_value();
 
 		$name = $this->get_the_name_attr();
-		$name .= ! empty( $this->args['multiple'] ) ? '[]' : null;
+		$name .= ! empty($this->args['multiple']) ? '[]' : null;
 
-		$none = is_string( $this->args['allow_none'] ) ? $this->args['allow_none'] : __( 'None', 'cmb' );
+		$none = is_string($this->args['allow_none']) ? $this->args['allow_none'] : __('None', 'cmb');
 
 		?>
 
 		<select
 			<?php $this->id_attr(); ?>
 			<?php $this->boolean_attr(); ?>
-			<?php printf( 'name="%s"', esc_attr( $name ) ); ?>
-			<?php printf( 'data-field-id="%s" ', esc_attr( $this->get_js_id() ) ); ?>
-			<?php echo ! empty( $this->args['multiple'] ) ? 'multiple' : '' ?>
-			<?php $this->class_attr( 'cmb_select' ); ?>
+			<?php printf('name="%s"', esc_attr($name)); ?>
+			<?php printf('data-field-id="%s" ', esc_attr($this->get_js_id())); ?>
+			<?php echo ! empty($this->args['multiple']) ? 'multiple' : '' ?>
+			<?php $this->class_attr('cmb_select'); ?>
 			style="width: 100%"
 		>
 
-			<?php if ( $this->args['allow_none'] ) : ?>
+			<?php if ($this->args['allow_none']) : ?>
 				<option value=""><?php echo $none; ?></option>
 			<?php endif; ?>
 
-			<?php foreach ( $this->args['options'] as $value => $name ): ?>
-			   <option <?php selected( in_array( $value, $val ) ) ?> value="<?php echo esc_attr( $value ); ?>"><?php echo esc_html( $name ); ?></option>
+			<?php foreach ($this->args['options'] as $value => $name): ?>
+			   <option <?php selected(in_array($value, $val)) ?> value="<?php echo esc_attr($value); ?>"><?php echo esc_html($name); ?></option>
 			<?php endforeach; ?>
 
 		</select>
@@ -1178,10 +1178,10 @@ 
 
 	public function output_script() {
 
-		$options = wp_parse_args( $this->args['select2_options'], array(
-			'placeholder' => __( 'Type to search', 'cmb' ),
+		$options = wp_parse_args($this->args['select2_options'], array(
+			'placeholder' => __('Type to search', 'cmb'),
 			'allowClear'  => true,
-		) );
+		));
 
 		?>
 
@@ -1189,12 +1189,12 @@ 
 
 			(function($) {
 
-				var options = <?php echo  json_encode( $options ); ?>
+				var options = <?php echo  json_encode($options); ?>
 
 				if ( 'undefined' === typeof( window.cmb_select_fields ) )
 					window.cmb_select_fields = {};
 
-				var id = <?php echo json_encode( $this->get_js_id() ); ?>;
+				var id = <?php echo json_encode($this->get_js_id()); ?>;
 				window.cmb_select_fields[id] = options;
 
 			})( jQuery );
@@ -1228,9 +1228,9 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( 'parent', '__construct' ), $args );
+		call_user_func_array(array('parent', '__construct'), $args);
 
-		$this->args['data_delegate'] = array( $this, 'get_delegate_data' );
+		$this->args['data_delegate'] = array($this, 'get_delegate_data');
 
 	}
 
@@ -1238,13 +1238,13 @@ 
 
 		$terms = $this->get_terms();
 
-		if ( is_wp_error( $terms ) ) {
+		if (is_wp_error($terms)) {
 			return array();
 		}
 
 		$term_options = array();
 
-		foreach ( $terms as $term )
+		foreach ($terms as $term)
 			$term_options[$term->term_id] = $term->name;
 
 		return $term_options;
@@ -1253,7 +1253,7 @@ 
 
 	private function get_terms() {
 
-		return get_terms( $this->args['taxonomy'], array( 'hide_empty' => $this->args['hide_empty'] ) );
+		return get_terms($this->args['taxonomy'], array('hide_empty' => $this->args['hide_empty']));
 
 	}
 
@@ -1274,11 +1274,11 @@ 
 
 		$args = func_get_args();
 
-		call_user_func_array( array( 'parent', '__construct' ), $args );
+		call_user_func_array(array('parent', '__construct'), $args);
 
-		if ( ! $this->args['use_ajax'] ) {
+		if ( ! $this->args['use_ajax']) {
 
-			$this->args['data_delegate'] = array( $this, 'get_delegate_data' );
+			$this->args['data_delegate'] = array($this, 'get_delegate_data');
 
 		}
 
@@ -1304,8 +1304,8 @@ 
 
 		$data = array();
 
-		foreach ( $this->get_posts() as $post_id )
-			$data[$post_id] = get_the_title( $post_id );
+		foreach ($this->get_posts() as $post_id)
+			$data[$post_id] = get_the_title($post_id);
 
 		return $data;
 
@@ -1314,9 +1314,9 @@ 
 	private function get_posts() {
 
 		$this->args['query']['fields'] = 'ids';
-		$query = new WP_Query( $this->args['query'] );
+		$query = new WP_Query($this->args['query']);
 
-		return isset( $query->posts ) ? $query->posts : array();
+		return isset($query->posts) ? $query->posts : array();
 
 	}
 
@@ -1324,8 +1324,8 @@ 
 
 		// AJAX multi select2 data is submitted as a string of comma separated post IDs.
 		// If empty, set to false instead of empty array to ensure the meta entry is deleted.
-		if ( $this->args['use_ajax'] && $this->args['multiple'] ) {
-			$this->value = ( ! empty( $this->value ) ) ? explode( ',', $this->value ) : false;
+		if ($this->args['use_ajax'] && $this->args['multiple']) {
+			$this->value = ( ! empty($this->value)) ? explode(',', $this->value) : false;
 		}
 
 	}
@@ -1333,15 +1333,15 @@ 
 	public function output_field() {
 
 		// If AJAX, must use input type not standard select.
-		if ( $this->args['use_ajax'] ) :
+		if ($this->args['use_ajax']) :
 
 			?>
 
 			<input
 				<?php $this->id_attr(); ?>
-				<?php printf( 'value="%s" ', esc_attr( implode( ',' , (array) $this->value ) ) ); ?>
-				<?php printf( 'name="%s"', esc_attr( $this->get_the_name_attr() ) ); ?>
-				<?php printf( 'data-field-id="%s" ', esc_attr( $this->get_js_id() ) ); ?>
+				<?php printf('value="%s" ', esc_attr(implode(',', (array) $this->value))); ?>
+				<?php printf('name="%s"', esc_attr($this->get_the_name_attr())); ?>
+				<?php printf('data-field-id="%s" ', esc_attr($this->get_js_id())); ?>
 				<?php $this->boolean_attr(); ?>
 				class="cmb_select"
 				style="width: 100%"
@@ -1371,29 +1371,29 @@ 
 					return false;
 
 				// Get options for this field so we can modify it.
-				var id = <?php echo json_encode( $this->get_js_id() ); ?>;
+				var id = <?php echo json_encode($this->get_js_id()); ?>;
 				var options = window.cmb_select_fields[id];
 
-				<?php if ( $this->args['use_ajax'] && $this->args['multiple'] ) : ?>
+				<?php if ($this->args['use_ajax'] && $this->args['multiple']) : ?>
 					// The multiple setting is required when using ajax (because an input field is used instead of select)
 					options.multiple = true;
 				<?php endif; ?>
 
-				<?php if ( $this->args['use_ajax'] && ! empty( $this->value ) ) : ?>
+				<?php if ($this->args['use_ajax'] && ! empty($this->value)) : ?>
 
 					options.initSelection = function( element, callback ) {
 
 						var data = [];
 
-						<?php if ( $this->args['multiple'] ) : ?>
+						<?php if ($this->args['multiple']) : ?>
 
-							<?php foreach ( (array) $this->value as $post_id ) : ?>
-								data.push( <?php echo json_encode( array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) ); ?> );
+							<?php foreach ((array) $this->value as $post_id) : ?>
+								data.push( <?php echo json_encode(array('id' => $post_id, 'text' => html_entity_decode(get_the_title($post_id)))); ?> );
 							<?php endforeach; ?>
 
 						<?php else : ?>
 
-							data = <?php echo json_encode( array( 'id' => $this->value, 'text' => html_entity_decode( get_the_title( $this->get_value() ) ) ) ); ?>;
+							data = <?php echo json_encode(array('id' => $this->value, 'text' => html_entity_decode(get_the_title($this->get_value())))); ?>;
 
 						<?php endif; ?>
 
@@ -1403,19 +1403,19 @@ 
 
 				<?php endif; ?>
 
-				<?php if ( $this->args['use_ajax'] ) : ?>
+				<?php if ($this->args['use_ajax']) : ?>
 
 					<?php $this->args['query']['fields'] = 'ids'; ?>
 
 					var ajaxData = {
 						action  : 'cmb_post_select',
-						post_id : '<?php echo intval( get_the_id() ); ?>', // Used for user capabilty check.
-						nonce   : <?php echo json_encode( wp_create_nonce( 'cmb_select_field' ) ); ?>,
-						query   : <?php echo json_encode( $this->args['query'] ); ?>
+						post_id : '<?php echo intval(get_the_id()); ?>', // Used for user capabilty check.
+						nonce   : <?php echo json_encode(wp_create_nonce('cmb_select_field')); ?>,
+						query   : <?php echo json_encode($this->args['query']); ?>
 					};
 
 					options.ajax = {
-						url: <?php echo json_encode( esc_url( admin_url( 'admin-ajax.php' ) ) ); ?>,
+						url: <?php echo json_encode(esc_url(admin_url('admin-ajax.php'))); ?>,
 						type: 'POST',
 						dataType: 'json',
 						data: function( term, page ) {
@@ -1444,31 +1444,31 @@ 
 // TODO this should be in inside the class
 function cmb_ajax_post_select() {
 
-	$post_id = ! empty( $_POST['post_id'] ) ? intval( $_POST['post_id'] ) : false;
-	$nonce   = ! empty( $_POST['nonce'] ) ? $_POST['nonce'] : false;
-	$args    = ! empty( $_POST['query'] ) ? $_POST['query'] : array();
+	$post_id = ! empty($_POST['post_id']) ? intval($_POST['post_id']) : false;
+	$nonce   = ! empty($_POST['nonce']) ? $_POST['nonce'] : false;
+	$args    = ! empty($_POST['query']) ? $_POST['query'] : array();
 
-	if ( ! $nonce || ! wp_verify_nonce( $nonce, 'cmb_select_field' ) || ! current_user_can( 'edit_post', $post_id ) ) {
-		echo json_encode( array( 'total' => 0, 'posts' => array() ) );
+	if ( ! $nonce || ! wp_verify_nonce($nonce, 'cmb_select_field') || ! current_user_can('edit_post', $post_id)) {
+		echo json_encode(array('total' => 0, 'posts' => array()));
 		exit;
 	}
 
 	$args['fields'] = 'ids'; // Only need to retrieve post IDs.
 
-	$query = new WP_Query( $args );
+	$query = new WP_Query($args);
 
-	$json = array( 'total' => $query->found_posts, 'posts' => array() );
+	$json = array('total' => $query->found_posts, 'posts' => array());
 
-	foreach ( $query->posts as $post_id ) {
-		array_push( $json['posts'], array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) );
+	foreach ($query->posts as $post_id) {
+		array_push($json['posts'], array('id' => $post_id, 'text' => html_entity_decode(get_the_title($post_id))));
 	}
 
-	echo json_encode( $json );
+	echo json_encode($json);
 
 	exit;
 
 }
-add_action( 'wp_ajax_cmb_post_select', 'cmb_ajax_post_select' );
+add_action('wp_ajax_cmb_post_select', 'cmb_ajax_post_select');
 
 /**
  * Field to group child fieids
@@ -1485,13 +1485,13 @@ 
 	function __construct() {
 
 		$args = func_get_args(); // you can't just put func_get_args() into a function as a parameter
-		call_user_func_array( array( 'parent', '__construct' ), $args );
+		call_user_func_array(array('parent', '__construct'), $args);
 
-		if ( ! empty( $this->args['fields'] ) ) {
-			foreach ( $this->args['fields'] as $f ) {
+		if ( ! empty($this->args['fields'])) {
+			foreach ($this->args['fields'] as $f) {
 
-				$class = _cmb_field_class_for_type( $f['type'] );
-				$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
+				$class = _cmb_field_class_for_type($f['type']);
+				$this->add_field(new $class($f['id'], $f['name'], array(), $f));
 
 			}
 		}
@@ -1508,8 +1508,8 @@ 
 			parent::get_default_args(),
 			array(
 				'fields'              => array(),
-				'string-repeat-field' => __( 'Add New Group', 'cmb' ),
-				'string-delete-field' => __( 'Remove Group', 'cmb' ),
+				'string-repeat-field' => __('Add New Group', 'cmb'),
+				'string-delete-field' => __('Remove Group', 'cmb'),
 			)
 		);
 	}
@@ -1518,9 +1518,9 @@ 
 
 		parent::enqueue_scripts();
 
-		foreach ( $this->args['fields'] as $f ) {
-			$class = _cmb_field_class_for_type( $f['type'] );
-			$field = new $class( '', '', array(), $f );
+		foreach ($this->args['fields'] as $f) {
+			$class = _cmb_field_class_for_type($f['type']);
+			$field = new $class('', '', array(), $f);
 			$field->enqueue_scripts();
 		}
 
@@ -1530,9 +1530,9 @@ 
 
 		parent::enqueue_styles();
 
-		foreach ( $this->args['fields'] as $f ) {
-			$class = _cmb_field_class_for_type( $f['type'] );
-			$field = new $class( '', '', array(), $f );
+		foreach ($this->args['fields'] as $f) {
+			$class = _cmb_field_class_for_type($f['type']);
+			$field = new $class('', '', array(), $f);
 			$field->enqueue_styles();
 		}
 
@@ -1548,21 +1548,21 @@ 
 		$this->title();
 		$this->description();
 
-		if ( ! $this->args['repeatable'] && empty( $values ) ) {
-			$values = array( null );
+		if ( ! $this->args['repeatable'] && empty($values)) {
+			$values = array(null);
 		}
 
-		if ( $values ) {
+		if ($values) {
 
 			$i = 0;
-			foreach ( $values as $value ) {
+			foreach ($values as $value) {
 
 				$this->field_index = $i;
 				$this->value = $value;
 
 				?>
 
-				<div class="field-item" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
+				<div class="field-item" data-class="<?php echo esc_attr(get_class($this)) ?>" style="<?php echo esc_attr($this->args['style']); ?>">
 					<?php $this->html(); ?>
 				</div>
 
@@ -1574,20 +1574,20 @@ 
 
 		}
 
-		if ( $this->args['repeatable'] ) {
+		if ($this->args['repeatable']) {
 
 			$this->field_index = 'x'; // x used to distinguish hidden fields.
 			$this->value = '';
 
 			?>
 
-				<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
+				<div class="field-item hidden" data-class="<?php echo esc_attr(get_class($this)); ?>" style="<?php echo esc_attr($this->args['style']); ?>">
 					<?php $this->html(); ?>
 				</div>
 
 				<?php
 				$button_name = 'Group';
-				if(isset($this->args['single_name'])){
+				if (isset($this->args['single_name'])) {
 					$button_name = $this->args['single_name'];
 				}?>
 				<button class="button repeat-field">
@@ -1604,28 +1604,28 @@ 
 		$value  = $this->get_value();
 
 		// Reset all field values.
-		foreach ( $fields as $field ) {
-			$field->set_values( array() );
+		foreach ($fields as $field) {
+			$field->set_values(array());
 		}
 
 		// Set values for this field.
-		if ( ! empty( $value ) ) {
-			foreach ( $value as $field_id => $field_value ) {
-				$field_value = ( ! empty( $field_value ) ) ? $field_value : array();
-				if ( ! empty( $fields[$field_id] ) ) {
-					$fields[$field_id]->set_values( (array) $field_value );
+		if ( ! empty($value)) {
+			foreach ($value as $field_id => $field_value) {
+				$field_value = ( ! empty($field_value)) ? $field_value : array();
+				if ( ! empty($fields[$field_id])) {
+					$fields[$field_id]->set_values((array) $field_value);
 				}
 			}
 		}
 
 		?>
 
-		<?php if ( $this->args['repeatable'] ) : ?>
+		<?php if ($this->args['repeatable']) : ?>
 
 
 			<?php
 			$button_name = 'Group';
-			if(isset($this->args['single_name'])){
+			if (isset($this->args['single_name'])) {
 				$button_name = $this->args['single_name'];
 			}?>
 
@@ -1638,7 +1638,7 @@ 
 			</button>
 		<?php endif; ?>
 
-		<?php CMB_Meta_Box::layout_fields( $fields ); ?>
+		<?php CMB_Meta_Box::layout_fields($fields); ?>
 
 	<?php }
 
@@ -1647,30 +1647,30 @@ 
 		$fields = &$this->get_fields();
 		$values = &$this->get_values();
 
-		foreach ( $values as &$group_value ) {
-			foreach ( $group_value as $field_id => &$field_value ) {
+		foreach ($values as &$group_value) {
+			foreach ($group_value as $field_id => &$field_value) {
 
-				if ( ! isset( $fields[$field_id] ) ) {
+				if ( ! isset($fields[$field_id])) {
 					$field_value = array();
 					continue;
 				}
 
 				$field = $fields[$field_id];
-				$field->set_values( $field_value );
+				$field->set_values($field_value);
 				$field->parse_save_values();
 
 				$field_value = $field->get_values();
 
 				// if the field is a repeatable field, store the whole array of them, if it's not repeatble,
 				// just store the first (and only) one directly
-				if ( ! $field->args['repeatable'] )
-					$field_value = reset( $field_value );
+				if ( ! $field->args['repeatable'])
+					$field_value = reset($field_value);
 			}
 		}
 
 	}
 
-	public function add_field( CMB_Field $field ) {
+	public function add_field(CMB_Field $field) {
 		$field->parent = $this;
 		$this->fields[$field->id] = $field;
 	}
@@ -1679,19 +1679,19 @@ 
 		return $this->fields;
 	}
 
-	public function set_values( array $values ) {
+	public function set_values(array $values) {
 
 		$fields       = &$this->get_fields();
 		$this->values = $values;
 
 		// Reset all field values.
-		foreach ( $fields as $field ) {
-			$field->set_values( array() );
+		foreach ($fields as $field) {
+			$field->set_values(array());
 		}
 
-		foreach ( $values as $value ) {
-			foreach ( $value as $field_id => $field_value ) {
-				$fields[$field_id]->set_values( (array) $field_value );
+		foreach ($values as $value) {
+			foreach ($value as $field_id => $field_value) {
+				$fields[$field_id]->set_values((array) $field_value);
 			}
 		}
 
@@ -1724,7 +1724,7 @@ 
 				'default_lat'         => '-33.9296903',
 				'default_long'        => '18.4527097',
 				'default_zoom'        => '9',
-				'string-marker-title' => __( 'Drag to set the exact location', 'cmb' ),
+				'string-marker-title' => __('Drag to set the exact location', 'cmb'),
 			)
 		);
 	}
@@ -1733,14 +1733,14 @@ 
 
 		parent::enqueue_scripts();
 
-		$options = get_option('_lsx_lsx-settings',false);
+		$options = get_option('_lsx_lsx-settings', false);
 
-		if(false !== $options && isset($options['general']['googlemaps_key'])) {
+		if (false !== $options && isset($options['general']['googlemaps_key'])) {
 
-			wp_enqueue_script( 'cmb-google-maps', 'https://maps.googleapis.com/maps/api/js?key='.$options['general']['googlemaps_key'].'&libraries=places' );
-			wp_enqueue_script( 'cmb-google-maps-script', trailingslashit( CMB_URL ) . 'js/field-gmap.js', array( 'jquery', 'cmb-google-maps' ) );
+			wp_enqueue_script('cmb-google-maps', 'https://maps.googleapis.com/maps/api/js?key=' . $options['general']['googlemaps_key'] . '&libraries=places');
+			wp_enqueue_script('cmb-google-maps-script', trailingslashit(CMB_URL) . 'js/field-gmap.js', array('jquery', 'cmb-google-maps'));
 
-			wp_localize_script( 'cmb-google-maps-script', 'CMBGmaps', array(
+			wp_localize_script('cmb-google-maps-script', 'CMBGmaps', array(
 				'defaults' => array(
 					'latitude'  => $this->args['default_lat'],
 					'longitude' => $this->args['default_long'],
@@ -1749,7 +1749,7 @@ 
 				'strings'  => array(
 					'markerTitle' => $this->args['string-marker-title']
 				)
-			) );
+			));
 		}
 
 	}
@@ -1759,34 +1759,34 @@ 
 		// Ensure all args used are set
 		$value = wp_parse_args(
 			$this->get_value(),
-			array( 'address' => null,'lat' => null, 'long' => null,'zoom' => null, 'elevation' => null )
+			array('address' => null, 'lat' => null, 'long' => null, 'zoom' => null, 'elevation' => null)
 		);
 
 		$style = array(
-			sprintf( 'width: %s;', $this->args['field_width'] ),
-			sprintf( 'height: %s;', $this->args['field_height'] ),
+			sprintf('width: %s;', $this->args['field_width']),
+			sprintf('height: %s;', $this->args['field_height']),
 			'border: 1px solid #eee;',
 			'margin-top: 8px;'
 		);
 
 		?>
 
-		<input type="text" <?php $this->class_attr( 'map-search' ); ?> <?php $this->id_attr(); ?> placeholder="Enter an address" value="<?php echo esc_attr( $value['address'] ); ?>" />
-		<select <?php $this->class_attr( 'map-zoom' ); ?>>
+		<input type="text" <?php $this->class_attr('map-search'); ?> <?php $this->id_attr(); ?> placeholder="Enter an address" value="<?php echo esc_attr($value['address']); ?>" />
+		<select <?php $this->class_attr('map-zoom'); ?>>
 			<option value="">Zoom</option>
-			<?php foreach(array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21') as $zoom_level) {
-				if($zoom_level === $value['zoom']) { $selected='selected="selected"'; }else{$selected='';}
-				echo '<option '.$selected.' value="'.$zoom_level.'">'.$zoom_level.'</option>';
+			<?php foreach (array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21') as $zoom_level) {
+				if ($zoom_level === $value['zoom']) { $selected = 'selected="selected"'; } else {$selected = ''; }
+				echo '<option ' . $selected . ' value="' . $zoom_level . '">' . $zoom_level . '</option>';
 			}?>
 		</select>
 
-		<div class="map" style="<?php echo esc_attr( implode( ' ', $style ) ); ?>"></div>
+		<div class="map" style="<?php echo esc_attr(implode(' ', $style)); ?>"></div>
 
-		<input type="hidden" class="address"  <?php $this->name_attr( '[address]' ); ?>    value="<?php echo esc_attr( $value['address'] ); ?>" />
-		<input type="hidden" class="latitude"  <?php $this->name_attr( '[lat]' ); ?>       value="<?php echo esc_attr( $value['lat'] ); ?>" />
-		<input type="hidden" class="longitude" <?php $this->name_attr( '[long]' ); ?>      value="<?php echo esc_attr( $value['long'] ); ?>" />
-		<input type="hidden" class="zoom"	 <?php $this->name_attr( '[zoom]' ); ?> value="<?php echo esc_attr( $value['zoom'] ); ?>" />
-		<input type="hidden" class="elevation" <?php $this->name_attr( '[elevation]' ); ?> value="<?php echo esc_attr( $value['elevation'] ); ?>" />
+		<input type="hidden" class="address"  <?php $this->name_attr('[address]'); ?>    value="<?php echo esc_attr($value['address']); ?>" />
+		<input type="hidden" class="latitude"  <?php $this->name_attr('[lat]'); ?>       value="<?php echo esc_attr($value['lat']); ?>" />
+		<input type="hidden" class="longitude" <?php $this->name_attr('[long]'); ?>      value="<?php echo esc_attr($value['long']); ?>" />
+		<input type="hidden" class="zoom"	 <?php $this->name_attr('[zoom]'); ?> value="<?php echo esc_attr($value['zoom']); ?>" />
+		<input type="hidden" class="elevation" <?php $this->name_attr('[elevation]'); ?> value="<?php echo esc_attr($value['elevation']); ?>" />
 
 		<?php
 	}

Braces +101 added lines, -65 removed lines

@@ -33,10 +33,11 @@ 
 		}
 
 		// If the field has a custom value populator callback
-		if ( ! empty( $args['values_callback'] ) )
-			$this->values = call_user_func( $args['values_callback'], get_the_id() );
-		else
-			$this->values = $values;
+		if ( ! empty( $args['values_callback'] ) ) {
+					$this->values = call_user_func( $args['values_callback'], get_the_id() );
+		} else {
+					$this->values = $values;
+		}
 
 		$this->value = reset( $this->values );
 
@@ -79,8 +80,9 @@ 
 	 */
 	public function enqueue_scripts() {
 
-		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] )
-			wp_enqueue_script( 'jquery-ui-sortable' );
+		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] ) {
+					wp_enqueue_script( 'jquery-ui-sortable' );
+		}
 
 	}
 
@@ -128,8 +130,9 @@ 
 
 		$id .= '-cmb-field-' . $this->field_index;
 
-		if ( ! is_null( $append ) )
-			$id .= '-' . $append;
+		if ( ! is_null( $append ) ) {
+					$id .= '-' . $append;
+		}
 
 		$id = str_replace( array( '[', ']', '--' ), '-', $id );
 
@@ -169,8 +172,9 @@ 
 
 		$name .= "[cmb-field-$this->field_index]";
 
-		if ( ! is_null( $append ) )
-			$name .= $append;
+		if ( ! is_null( $append ) ) {
+					$name .= $append;
+		}
 
 		return $name;
 
@@ -199,16 +203,19 @@ 
 
 	public function boolean_attr( $attrs = array() ) {
 
-		if ( $this->args['readonly'] )
-			$attrs[] = 'readonly';
+		if ( $this->args['readonly'] ) {
+					$attrs[] = 'readonly';
+		}
 
-		if ( $this->args['disabled'] )
-			$attrs[] = 'disabled';
+		if ( $this->args['disabled'] ) {
+					$attrs[] = 'disabled';
+		}
 
 		$attrs = array_filter( array_unique( $attrs ) );
 
-		foreach ( $attrs as $attr )
-			echo esc_html( $attr ) . '="' . esc_attr( $attr ) . '"';
+		foreach ( $attrs as $attr ) {
+					echo esc_html( $attr ) . '="' . esc_attr( $attr ) . '"';
+		}
 
 	}
 
@@ -228,8 +235,9 @@ 
 	 */
 	protected function get_delegate_data() {
 
-		if ( $this->args['data_delegate'] )
-			return call_user_func_array( $this->args['data_delegate'], array( $this ) );
+		if ( $this->args['data_delegate'] ) {
+					return call_user_func_array( $this->args['data_delegate'], array( $this ) );
+		}
 
 		return array();
 
@@ -262,8 +270,9 @@ 
 	public function save( $post_id, $values ) {
 
 		// Don't save readonly values.
-		if ( $this->args['readonly'] )
-			return;
+		if ( $this->args['readonly'] ) {
+					return;
+		}
 
 		$this->values = $values;
 		$this->parse_save_values();
@@ -278,8 +287,9 @@ 
 		}
 
 		// If we are not on a post edit screen
-		if ( ! $post_id )
-			return;
+		if ( ! $post_id ) {
+					return;
+		}
 
 		delete_post_meta( $post_id, $this->id );
 
@@ -288,8 +298,9 @@ 
 			$this->value = $v;
 			$this->parse_save_value();
 
-			if ( $this->value || $this->value === '0' )
-				add_post_meta( $post_id, $this->id, $this->value );
+			if ( $this->value || $this->value === '0' ) {
+							add_post_meta( $post_id, $this->id, $this->value );
+			}
 
 		}
 	}
@@ -323,10 +334,11 @@ 
 	public function display() {
 
 		// If there are no values and it's not repeateble, we want to do one with empty string
-		if ( ! $this->get_values() && ! $this->args['repeatable'] )
-			$values = array( '' );
-		else
-			$values = $this->get_values();
+		if ( ! $this->get_values() && ! $this->args['repeatable'] ) {
+					$values = array( '' );
+		} else {
+					$values = $this->get_values();
+		}
 
 		$this->title();
 
@@ -468,7 +480,10 @@ 
 
 				<?php if ( $this->get_value() ) : ?>
 
-					<?php if ( isset( $icon_img ) ) echo $icon_img; ?>
+					<?php if ( isset( $icon_img ) ) {
+	echo $icon_img;
+}
+?>
 
 					<div class="cmb-file-name">
 						<strong><?php echo esc_html( basename( get_attached_file( $this->get_value() ) ) ); ?></strong>
@@ -514,8 +529,9 @@ 
 
 	public function html() {
 
-		if ( $this->get_value() )
-			$image = wp_get_attachment_image_src( $this->get_value(), $this->args['size'], true );
+		if ( $this->get_value() ) {
+					$image = wp_get_attachment_image_src( $this->get_value(), $this->args['size'], true );
+		}
 
 		// Convert size arg to array of width, height, crop
 		$size = $this->parse_image_size( $this->args['size'] );
@@ -594,8 +610,9 @@ 
 		}
 
 		// Handle default WP size format.
-		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) )
-			$size = array( 'width' => $size[0], 'height' => $size[1] );
+		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) ) {
+					$size = array( 'width' => $size[0], 'height' => $size[1] );
+		}
 
 		return wp_parse_args( $size, array(
 			'width'  => get_option( 'thumbnail_size_w' ),
@@ -612,8 +629,9 @@ 
 	 */
 	static function request_image_ajax_callback() {
 
-		if ( ! ( isset( $_POST['nonce'] ) && wp_verify_nonce( $_POST['nonce'], 'cmb-file-upload-nonce' ) ) )
-			return;
+		if ( ! ( isset( $_POST['nonce'] ) && wp_verify_nonce( $_POST['nonce'], 'cmb-file-upload-nonce' ) ) ) {
+					return;
+		}
 
 		$id = intval( $_POST['id'] );
 
@@ -734,8 +752,9 @@ 
 
 	public function parse_save_values() {
 
-		foreach( $this->values as &$value )
-			$value = strtotime( $value );
+		foreach( $this->values as &$value ) {
+					$value = strtotime( $value );
+		}
 
 		sort( $this->values );
 
@@ -771,10 +790,11 @@ 
 		// Convert all [date] and [time] values to a unix timestamp.
 		// If date is empty, assume delete. If time is empty, assume 00:00.
 		foreach( $this->values as $key => &$value ) {
-			if ( empty( $value['date'] ) )
-				unset( $this->values[$key] );
-			else
-				$value = strtotime( $value['date'] . ' ' . $value['time'] );
+			if ( empty( $value['date'] ) ) {
+							unset( $this->values[$key] );
+			} else {
+							$value = strtotime( $value['date'] . ' ' . $value['time'] );
+			}
 		}
 
 		$this->values = array_filter( $this->values );
@@ -866,8 +886,10 @@ 
 
 	public function html() {
 
-		if ( $this->has_data_delegate() )
-			$this->args['options'] = $this->get_delegate_data(); ?>
+		if ( $this->has_data_delegate() ) {
+					$this->args['options'] = $this->get_delegate_data();
+		}
+		?>
 
 			<?php foreach ( $this->args['options'] as $key => $value ): ?>
 
@@ -906,8 +928,10 @@ 
 
 	public function html() {
 
-		if ( $this->has_data_delegate() )
-			$this->args['options'] = $this->get_delegate_data(); ?>
+		if ( $this->has_data_delegate() ) {
+					$this->args['options'] = $this->get_delegate_data();
+		}
+		?>
 
 			<?php foreach ( $this->args['options'] as $key => $value ): ?>
 			<div class="cmb-cell-2">
@@ -1039,10 +1063,11 @@ 
 	 */
 	public function is_placeholder() {
 
-		if ( isset( $this->parent ) && ! is_int( $this->parent->field_index ) )
-			return true;
-
-		else return ! is_int( $this->field_index );
+		if ( isset( $this->parent ) && ! is_int( $this->parent->field_index ) ) {
+					return true;
+		} else {
+			return ! is_int( $this->field_index );
+		}
 
 	}
 
@@ -1086,15 +1111,17 @@ 
 
 	public function parse_save_values(){
 
-		if ( isset( $this->parent ) && isset( $this->args['multiple'] ) && $this->args['multiple'] )
-			$this->values = array( $this->values );
+		if ( isset( $this->parent ) && isset( $this->args['multiple'] ) && $this->args['multiple'] ) {
+					$this->values = array( $this->values );
+		}
 
 	}
 
 	public function get_options() {
 
-		if ( $this->has_data_delegate() )
-			$this->args['options'] = $this->get_delegate_data();
+		if ( $this->has_data_delegate() ) {
+					$this->args['options'] = $this->get_delegate_data();
+		}
 
 		return $this->args['options'];
 	}
@@ -1133,8 +1160,9 @@ 
 
 	public function html() {
 
-		if ( $this->has_data_delegate() )
-			$this->args['options'] = $this->get_delegate_data();
+		if ( $this->has_data_delegate() ) {
+					$this->args['options'] = $this->get_delegate_data();
+		}
 
 		$this->output_field();
 
@@ -1244,8 +1272,9 @@ 
 
 		$term_options = array();
 
-		foreach ( $terms as $term )
-			$term_options[$term->term_id] = $term->name;
+		foreach ( $terms as $term ) {
+					$term_options[$term->term_id] = $term->name;
+		}
 
 		return $term_options;
 
@@ -1304,8 +1333,9 @@ 
 
 		$data = array();
 
-		foreach ( $this->get_posts() as $post_id )
-			$data[$post_id] = get_the_title( $post_id );
+		foreach ( $this->get_posts() as $post_id ) {
+					$data[$post_id] = get_the_title( $post_id );
+		}
 
 		return $data;
 
@@ -1349,9 +1379,11 @@ 
 
 			<?php
 
-		else :
+		else {
+			:
 
 			parent::output_field();
+		}
 
 		endif;
 
@@ -1391,9 +1423,12 @@ 
 								data.push( <?php echo json_encode( array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) ); ?> );
 							<?php endforeach; ?>
 
-						<?php else : ?>
+						<?php else {
+	: ?>
 
-							data = <?php echo json_encode( array( 'id' => $this->value, 'text' => html_entity_decode( get_the_title( $this->get_value() ) ) ) ); ?>;
+							data = <?php echo json_encode( array( 'id' => $this->value, 'text' => html_entity_decode( get_the_title( $this->get_value() ) ) ) );
+}
+?>;
 
 						<?php endif; ?>
 
@@ -1663,8 +1698,9 @@ 
 
 				// if the field is a repeatable field, store the whole array of them, if it's not repeatble,
 				// just store the first (and only) one directly
-				if ( ! $field->args['repeatable'] )
-					$field_value = reset( $field_value );
+				if ( ! $field->args['repeatable'] ) {
+									$field_value = reset( $field_value );
+				}
 			}
 		}
 
@@ -1775,7 +1811,7 @@ 
 		<select <?php $this->class_attr( 'map-zoom' ); ?>>
 			<option value="">Zoom</option>
 			<?php foreach(array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21') as $zoom_level) {
-				if($zoom_level === $value['zoom']) { $selected='selected="selected"'; }else{$selected='';}
+				if($zoom_level === $value['zoom']) { $selected='selected="selected"'; } else{$selected='';}
 				echo '<option '.$selected.' value="'.$zoom_level.'">'.$zoom_level.'</option>';
 			}?>
 		</select>

vendor/Custom-Meta-Boxes/class.cmb-meta-box.php

Spacing +108 added lines, -108 removed lines

@@ -8,46 +8,46 @@ 
 	protected $_meta_box;
 	private $fields = array();
 
-	function __construct( $meta_box ) {
+	function __construct($meta_box) {
 
 		$this->_meta_box = $meta_box;
 
-		if ( empty( $this->_meta_box['id'] ) )
-			$this->_meta_box['id'] = sanitize_title( $this->_meta_box['title'] );
+		if (empty($this->_meta_box['id']))
+			$this->_meta_box['id'] = sanitize_title($this->_meta_box['title']);
 
-		add_action( 'add_meta_boxes', array( &$this, 'init_fields_for_post' ) );
-		add_action( 'cmb_init_fields', array( &$this, 'init_fields' ) );
+		add_action('add_meta_boxes', array(&$this, 'init_fields_for_post'));
+		add_action('cmb_init_fields', array(&$this, 'init_fields'));
 
-		add_action( 'admin_menu', array( &$this, 'add' ) );
-		add_action( 'save_post', array( &$this, 'save_for_post' ) );
-		add_action( 'edit_attachment', array( &$this, 'save_for_post' ) );
-		add_action( 'cmb_save_fields', array( &$this, 'save' ) );
+		add_action('admin_menu', array(&$this, 'add'));
+		add_action('save_post', array(&$this, 'save_for_post'));
+		add_action('edit_attachment', array(&$this, 'save_for_post'));
+		add_action('cmb_save_fields', array(&$this, 'save'));
 
-		add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_scripts' ), 9 );
-		add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_styles' ), 9 );
+		add_action('admin_enqueue_scripts', array(&$this, 'enqueue_scripts'), 9);
+		add_action('admin_enqueue_scripts', array(&$this, 'enqueue_styles'), 9);
 
 	}
 
-	public function init_fields( $post_id = 0 ) {
+	public function init_fields($post_id = 0) {
 
-		foreach ( $this->_meta_box['fields'] as $key => $field ) {
+		foreach ($this->_meta_box['fields'] as $key => $field) {
 
 			$values = array();
 
 			$args = $field;
-			unset( $args['id'] );
-			unset( $args['type'] );
-			unset( $args['name'] );
+			unset($args['id']);
+			unset($args['type']);
+			unset($args['name']);
 
-			$class = _cmb_field_class_for_type( $field['type'] );
+			$class = _cmb_field_class_for_type($field['type']);
 
 			// If we are on a post edit screen - get metadata value of the field for this post
-			if ( $post_id ) {
-				$values = (array) get_post_meta( $post_id, $field['id'], false );
+			if ($post_id) {
+				$values = (array) get_post_meta($post_id, $field['id'], false);
 			}
 
-			if ( class_exists( $class ) ) {
-				$this->fields[] = new $class( $field['id'], $field['name'], (array) $values, $args );
+			if (class_exists($class)) {
+				$this->fields[] = new $class($field['id'], $field['name'], (array) $values, $args);
 			}
 
 		}
@@ -59,33 +59,33 @@ 
 		global $post, $temp_ID;
 
 		// Get the current ID
-		if( isset( $_GET['post'] ) )
+		if (isset($_GET['post']))
 			$post_id = $_GET['post'];
 
-		elseif( isset( $_POST['post_ID'] ) )
+		elseif (isset($_POST['post_ID']))
 			$post_id = $_POST['post_ID'];
 
-		elseif ( ! empty( $post->ID ) )
+		elseif ( ! empty($post->ID))
 			$post_id = $post->ID;
 
-		if ( is_page() || ! isset( $post_id ) )
+		if (is_page() || ! isset($post_id))
 			return false;
 
-		$this->init_fields( (int) $post_id );
+		$this->init_fields((int) $post_id);
 
 	}
 
 	function enqueue_scripts() {
 
-		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
+		wp_enqueue_script('cmb-scripts', trailingslashit(CMB_URL) . 'js/cmb.js', array('jquery'));
 
-		wp_localize_script( 'cmb-scripts', 'CMBData', array(
+		wp_localize_script('cmb-scripts', 'CMBData', array(
 			'strings' => array(
-				'confirmDeleteField' => __( 'Are you sure you want to delete this field?', 'cmb' )
+				'confirmDeleteField' => __('Are you sure you want to delete this field?', 'cmb')
 			)
-		) );
+		));
 
-		foreach ( $this->fields as $field )
+		foreach ($this->fields as $field)
 			$field->enqueue_scripts();
 
 	}
@@ -94,12 +94,12 @@ 
 
 		$suffix = CMB_DEV ? '' : '.min';
 
-		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) )
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css" );
+		if (version_compare(get_bloginfo('version'), '3.8', '>='))
+			wp_enqueue_style('cmb-styles', trailingslashit(CMB_URL) . "css/dist/cmb$suffix.css");
 		else
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css' );
+			wp_enqueue_style('cmb-styles', trailingslashit(CMB_URL) . 'css/legacy.css');
 
-		foreach ( $this->fields as $field )
+		foreach ($this->fields as $field)
 			$field->enqueue_styles();
 
 	}
@@ -111,15 +111,15 @@ 
 		$this->_meta_box['priority'] = empty($this->_meta_box['priority']) ? 'low' : $this->_meta_box['priority'];
 
 		// Backwards compatablilty.
-		if ( isset( $this->_meta_box['show_on']['key'] ) ) {
-			$this->_meta_box['show_on'][ $this->_meta_box['show_on']['key'] ] = $this->_meta_box['show_on']['value'];
-			unset( $this->_meta_box['show_on']['key'] );
-			unset( $this->_meta_box['show_on']['value'] );
+		if (isset($this->_meta_box['show_on']['key'])) {
+			$this->_meta_box['show_on'][$this->_meta_box['show_on']['key']] = $this->_meta_box['show_on']['value'];
+			unset($this->_meta_box['show_on']['key']);
+			unset($this->_meta_box['show_on']['value']);
 		}
 
-		foreach ( (array) $this->_meta_box['pages'] as $page ) {
-			if ( $this->is_metabox_displayed() ) {
-				add_meta_box( $this->_meta_box['id'], $this->_meta_box['title'], array(&$this, 'show'), $page, $this->_meta_box['context'], $this->_meta_box['priority'] ) ;
+		foreach ((array) $this->_meta_box['pages'] as $page) {
+			if ($this->is_metabox_displayed()) {
+				add_meta_box($this->_meta_box['id'], $this->_meta_box['title'], array(&$this, 'show'), $page, $this->_meta_box['context'], $this->_meta_box['priority']);
 			}
 		}
 
@@ -130,107 +130,107 @@ 
 	 */
 	function is_metabox_displayed() {
 		$display = true;
-		$display = $this->add_for_id( $display );
-		$display = $this->hide_for_id( $display );
-		$display = $this->add_for_page_template( $display );
-		$display = $this->hide_for_page_template( $display );
+		$display = $this->add_for_id($display);
+		$display = $this->hide_for_id($display);
+		$display = $this->add_for_page_template($display);
+		$display = $this->hide_for_page_template($display);
 		return $display;
 	}
 
 	// Add CMB for ID
-	function add_for_id( $display ) {
+	function add_for_id($display) {
 
-		if ( ! isset( $this->_meta_box['show_on']['id'] ) ) {
+		if ( ! isset($this->_meta_box['show_on']['id'])) {
 			return $display;
 		}
 
 		// Don't show CMB if we can't identify ID of a post
 		$post_id = $this->get_post_id();
 
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return false;
 		}
 
 		// If value isn't an array, turn it into one
-		$this->_meta_box['show_on']['id'] = ! is_array( $this->_meta_box['show_on']['id'] ) ? array( $this->_meta_box['show_on']['id'] ) : $this->_meta_box['show_on']['id'];
+		$this->_meta_box['show_on']['id'] = ! is_array($this->_meta_box['show_on']['id']) ? array($this->_meta_box['show_on']['id']) : $this->_meta_box['show_on']['id'];
 
-		return in_array( $post_id, $this->_meta_box['show_on']['id'] );
+		return in_array($post_id, $this->_meta_box['show_on']['id']);
 
 	}
 
 	// Hide CMB for ID
-	function hide_for_id( $display ) {
+	function hide_for_id($display) {
 
-		if ( ! isset( $this->_meta_box['hide_on']['id'] ) ) {
+		if ( ! isset($this->_meta_box['hide_on']['id'])) {
 			return $display;
 		}
 
 		// Return if we can't identify ID of a post
 		$post_id = $this->get_post_id();
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return $display;
 		}
 
 		// If value isn't an array, turn it into one
-		$this->_meta_box['hide_on']['id'] = ! is_array( $this->_meta_box['hide_on']['id'] ) ? array( $this->_meta_box['hide_on']['id'] ) : $this->_meta_box['hide_on']['id'];
+		$this->_meta_box['hide_on']['id'] = ! is_array($this->_meta_box['hide_on']['id']) ? array($this->_meta_box['hide_on']['id']) : $this->_meta_box['hide_on']['id'];
 
-		return ! in_array( $post_id, $this->_meta_box['hide_on']['id'] );
+		return ! in_array($post_id, $this->_meta_box['hide_on']['id']);
 
 	}
 
 	// Add CMB for Page Template
-	function add_for_page_template( $display ) {
+	function add_for_page_template($display) {
 
-		if ( ! isset( $this->_meta_box['show_on']['page-template'] ) ) {
+		if ( ! isset($this->_meta_box['show_on']['page-template'])) {
 			return $display;
 		}
 
 		// Return false if we can't identify ID of a post
 		$post_id = $this->get_post_id();
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return false;
 		}
 
 		// Get current template
-		$current_template = get_post_meta( $post_id, '_wp_page_template', true );
+		$current_template = get_post_meta($post_id, '_wp_page_template', true);
 
 		// If value isn't an array, turn it into one
-		$this->_meta_box['show_on']['page-template'] = ! is_array( $this->_meta_box['show_on']['page-template'] ) ? array( $this->_meta_box['show_on']['page-template'] ) : $this->_meta_box['show_on']['page-template'];
+		$this->_meta_box['show_on']['page-template'] = ! is_array($this->_meta_box['show_on']['page-template']) ? array($this->_meta_box['show_on']['page-template']) : $this->_meta_box['show_on']['page-template'];
 
-		return in_array( $current_template, $this->_meta_box['show_on']['page-template'] );
+		return in_array($current_template, $this->_meta_box['show_on']['page-template']);
 
 	}
 
 	// Hide CMB for Page Template
-	function hide_for_page_template( $display ) {
+	function hide_for_page_template($display) {
 
-		if ( ! isset( $this->_meta_box['hide_on']['page-template'] ) ) {
+		if ( ! isset($this->_meta_box['hide_on']['page-template'])) {
 			return $display;
 		}
 
 		// Return $display if we can't identify ID of a post and hence its current template
 		$post_id = $this->get_post_id();
 
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return $display;
 		}
 
 		// Get current template
-		$current_template = get_post_meta( $post_id, '_wp_page_template', true );
+		$current_template = get_post_meta($post_id, '_wp_page_template', true);
 
 		// If value isn't an array, turn it into one
-		$this->_meta_box['hide_on']['page-template'] = ! is_array( $this->_meta_box['hide_on']['page-template'] ) ? array( $this->_meta_box['hide_on']['page-template'] ) : $this->_meta_box['hide_on']['page-template'];
+		$this->_meta_box['hide_on']['page-template'] = ! is_array($this->_meta_box['hide_on']['page-template']) ? array($this->_meta_box['hide_on']['page-template']) : $this->_meta_box['hide_on']['page-template'];
 
-		return ! in_array( $current_template, $this->_meta_box['hide_on']['page-template'] );
+		return ! in_array($current_template, $this->_meta_box['hide_on']['page-template']);
 
 	}
 
 	// display fields
 	function show() { ?>
 
-		<input type="hidden" name="wp_meta_box_nonce" value="<?php esc_attr_e( wp_create_nonce( basename(__FILE__) ) ); ?>" />
+		<input type="hidden" name="wp_meta_box_nonce" value="<?php esc_attr_e(wp_create_nonce(basename(__FILE__))); ?>" />
 
-		<?php self::layout_fields( $this->fields );
+		<?php self::layout_fields($this->fields);
 
 	}
 
@@ -241,15 +241,15 @@ 
 	 *
 	 * @param  CMB_Field[]  $fields
 	 */
-	static function layout_fields( array $fields ) { ?>
+	static function layout_fields(array $fields) { ?>
 
 		<div class="cmb_metabox">
 
 			<?php $current_colspan = 0;
 
-			foreach ( $fields as $field ) :
+			foreach ($fields as $field) :
 
-				if ( $current_colspan == 0 ) : ?>
+				if ($current_colspan == 0) : ?>
 
 					<div class="cmb-row">
 
@@ -257,36 +257,36 @@ 
 
 				$current_colspan += $field->args['cols'];
 
-				$classes = array( 'field', get_class($field) );
+				$classes = array('field', get_class($field));
 
-				if ( ! empty( $field->args['repeatable'] ) )
+				if ( ! empty($field->args['repeatable']))
 					$classes[] = 'repeatable';
 
-				if ( ! empty( $field->args['sortable'] ) )
+				if ( ! empty($field->args['sortable']))
 					$classes[] = 'cmb-sortable';
 
 				$attrs = array(
-					sprintf( 'id="%s"', sanitize_html_class( $field->id ) ),
-					sprintf( 'class="%s"', esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) )
+					sprintf('id="%s"', sanitize_html_class($field->id)),
+					sprintf('class="%s"', esc_attr(implode(' ', array_map('sanitize_html_class', $classes))))
 				);
 
 				// Field Repeatable Max.
-				if ( isset( $field->args['repeatable_max']  ) )
-					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
+				if (isset($field->args['repeatable_max']))
+					$attrs[] = sprintf('data-rep-max="%s"', intval($field->args['repeatable_max']));
 
 				?>
 
-				<div class="cmb-cell-<?php echo intval( $field->args['cols'] ); ?>">
+				<div class="cmb-cell-<?php echo intval($field->args['cols']); ?>">
 
-						<div <?php echo implode( ' ', $attrs ); ?>>
+						<div <?php echo implode(' ', $attrs); ?>>
 							<?php $field->display(); ?>
 						</div>
 
-						<input type="hidden" name="_cmb_present_<?php esc_attr_e( $field->id ); ?>" value="1" />
+						<input type="hidden" name="_cmb_present_<?php esc_attr_e($field->id); ?>" value="1" />
 
 				</div>
 
-				<?php if ( $current_colspan == 12 || $field === end( $fields ) ) :
+				<?php if ($current_colspan == 12 || $field === end($fields)) :
 
 					$current_colspan = 0; ?>
 
@@ -300,15 +300,15 @@ 
 
 	<?php }
 
-	function strip_repeatable( $values ) {
+	function strip_repeatable($values) {
 
-		foreach ( $values as $key => $value ) {
+		foreach ($values as $key => $value) {
 
-			if ( false !== strpos( $key, 'cmb-group-x' ) || false !==  strpos( $key, 'cmb-field-x' ) )
-				unset( $values[$key] );
+			if (false !== strpos($key, 'cmb-group-x') || false !== strpos($key, 'cmb-field-x'))
+				unset($values[$key]);
 
-			elseif ( is_array( $value ) )
-				$values[$key] = $this->strip_repeatable( $value );
+			elseif (is_array($value))
+				$values[$key] = $this->strip_repeatable($value);
 
 		}
 
@@ -316,60 +316,60 @@ 
 	}
 
 	// Save data from metabox
-	function save( $post_id = 0 ) {
+	function save($post_id = 0) {
 
 		// Verify nonce
-		if ( ! isset( $_POST['wp_meta_box_nonce'] ) || ! wp_verify_nonce( $_POST['wp_meta_box_nonce'], basename( __FILE__ ) ) )
+		if ( ! isset($_POST['wp_meta_box_nonce']) || ! wp_verify_nonce($_POST['wp_meta_box_nonce'], basename(__FILE__)))
 			return $post_id;
 
-		foreach ( $this->_meta_box['fields'] as $field ) {
+		foreach ($this->_meta_box['fields'] as $field) {
 
 			// Verify this meta box was shown on the page
-			if ( ! isset( $_POST['_cmb_present_' . $field['id'] ] ) )
+			if ( ! isset($_POST['_cmb_present_' . $field['id']]))
 				continue;
 
-			if ( isset( $_POST[ $field['id'] ] ) )
-				$value = (array) $_POST[ $field['id'] ];
+			if (isset($_POST[$field['id']]))
+				$value = (array) $_POST[$field['id']];
 			else
 				$value = array();
 
-			$value = $this->strip_repeatable( $value );
+			$value = $this->strip_repeatable($value);
 
-			if ( ! $class = _cmb_field_class_for_type( $field['type'] ) ) {
-				do_action( 'cmb_save_' . $field['type'], $field, $value );
+			if ( ! $class = _cmb_field_class_for_type($field['type'])) {
+				do_action('cmb_save_' . $field['type'], $field, $value);
 			}
 
-			$field_obj = new $class( $field['id'], $field['name'], $value, $field );
-			if ( 'post_select' === $field['type'] || 'group' === $field['type'] ) {
+			$field_obj = new $class($field['id'], $field['name'], $value, $field);
+			if ('post_select' === $field['type'] || 'group' === $field['type']) {
 				do_action('cmb_save_custom', $post_id, $field, $value);
 			}
-			$field_obj->save( $post_id, $value );
+			$field_obj->save($post_id, $value);
 
 		}
 
 		// If we are not on a post, need to refresh the field objects to reflect new values, as we do not get a redirect
-		if ( ! $post_id ) {
+		if ( ! $post_id) {
 			$this->fields = array();
 			$this->init_fields();
 		}
 	}
 
 	// Save the on save_post hook
-	function save_for_post( $post_id ) {
+	function save_for_post($post_id) {
 
 		// check autosave
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 			return $post_id;
 
-		$this->save( $post_id );
+		$this->save($post_id);
 
 	}
 
 	function get_post_id() {
 
-		$post_id = isset( $_GET['post'] ) ? $_GET['post'] : null;
+		$post_id = isset($_GET['post']) ? $_GET['post'] : null;
 
-		if ( ! $post_id && isset( $_POST['post_id'] ) ) {
+		if ( ! $post_id && isset($_POST['post_id'])) {
 			$post_id = $_POST['post_id'];
 		}
 

Braces +52 added lines, -41 removed lines

@@ -12,8 +12,9 @@ 
 
 		$this->_meta_box = $meta_box;
 
-		if ( empty( $this->_meta_box['id'] ) )
-			$this->_meta_box['id'] = sanitize_title( $this->_meta_box['title'] );
+		if ( empty( $this->_meta_box['id'] ) ) {
+					$this->_meta_box['id'] = sanitize_title( $this->_meta_box['title'] );
+		}
 
 		add_action( 'add_meta_boxes', array( &$this, 'init_fields_for_post' ) );
 		add_action( 'cmb_init_fields', array( &$this, 'init_fields' ) );
@@ -59,17 +60,17 @@ 
 		global $post, $temp_ID;
 
 		// Get the current ID
-		if( isset( $_GET['post'] ) )
-			$post_id = $_GET['post'];
-
-		elseif( isset( $_POST['post_ID'] ) )
-			$post_id = $_POST['post_ID'];
-
-		elseif ( ! empty( $post->ID ) )
-			$post_id = $post->ID;
+		if( isset( $_GET['post'] ) ) {
+					$post_id = $_GET['post'];
+		} elseif( isset( $_POST['post_ID'] ) ) {
+					$post_id = $_POST['post_ID'];
+		} elseif ( ! empty( $post->ID ) ) {
+					$post_id = $post->ID;
+		}
 
-		if ( is_page() || ! isset( $post_id ) )
-			return false;
+		if ( is_page() || ! isset( $post_id ) ) {
+					return false;
+		}
 
 		$this->init_fields( (int) $post_id );
 
@@ -85,8 +86,9 @@ 
 			)
 		) );
 
-		foreach ( $this->fields as $field )
-			$field->enqueue_scripts();
+		foreach ( $this->fields as $field ) {
+					$field->enqueue_scripts();
+		}
 
 	}
 
@@ -94,13 +96,15 @@ 
 
 		$suffix = CMB_DEV ? '' : '.min';
 
-		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) )
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css" );
-		else
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css' );
+		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) {
+					wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css" );
+		} else {
+					wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css' );
+		}
 
-		foreach ( $this->fields as $field )
-			$field->enqueue_styles();
+		foreach ( $this->fields as $field ) {
+					$field->enqueue_styles();
+		}
 
 	}
 
@@ -259,11 +263,13 @@ 
 
 				$classes = array( 'field', get_class($field) );
 
-				if ( ! empty( $field->args['repeatable'] ) )
-					$classes[] = 'repeatable';
+				if ( ! empty( $field->args['repeatable'] ) ) {
+									$classes[] = 'repeatable';
+				}
 
-				if ( ! empty( $field->args['sortable'] ) )
-					$classes[] = 'cmb-sortable';
+				if ( ! empty( $field->args['sortable'] ) ) {
+									$classes[] = 'cmb-sortable';
+				}
 
 				$attrs = array(
 					sprintf( 'id="%s"', sanitize_html_class( $field->id ) ),
@@ -271,8 +277,9 @@ 
 				);
 
 				// Field Repeatable Max.
-				if ( isset( $field->args['repeatable_max']  ) )
-					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
+				if ( isset( $field->args['repeatable_max']  ) ) {
+									$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
+				}
 
 				?>
 
@@ -304,11 +311,11 @@ 
 
 		foreach ( $values as $key => $value ) {
 
-			if ( false !== strpos( $key, 'cmb-group-x' ) || false !==  strpos( $key, 'cmb-field-x' ) )
-				unset( $values[$key] );
-
-			elseif ( is_array( $value ) )
-				$values[$key] = $this->strip_repeatable( $value );
+			if ( false !== strpos( $key, 'cmb-group-x' ) || false !==  strpos( $key, 'cmb-field-x' ) ) {
+							unset( $values[$key] );
+			} elseif ( is_array( $value ) ) {
+							$values[$key] = $this->strip_repeatable( $value );
+			}
 
 		}
 
@@ -319,19 +326,22 @@ 
 	function save( $post_id = 0 ) {
 
 		// Verify nonce
-		if ( ! isset( $_POST['wp_meta_box_nonce'] ) || ! wp_verify_nonce( $_POST['wp_meta_box_nonce'], basename( __FILE__ ) ) )
-			return $post_id;
+		if ( ! isset( $_POST['wp_meta_box_nonce'] ) || ! wp_verify_nonce( $_POST['wp_meta_box_nonce'], basename( __FILE__ ) ) ) {
+					return $post_id;
+		}
 
 		foreach ( $this->_meta_box['fields'] as $field ) {
 
 			// Verify this meta box was shown on the page
-			if ( ! isset( $_POST['_cmb_present_' . $field['id'] ] ) )
-				continue;
+			if ( ! isset( $_POST['_cmb_present_' . $field['id'] ] ) ) {
+							continue;
+			}
 
-			if ( isset( $_POST[ $field['id'] ] ) )
-				$value = (array) $_POST[ $field['id'] ];
-			else
-				$value = array();
+			if ( isset( $_POST[ $field['id'] ] ) ) {
+							$value = (array) $_POST[ $field['id'] ];
+			} else {
+							$value = array();
+			}
 
 			$value = $this->strip_repeatable( $value );
 
@@ -358,8 +368,9 @@ 
 	function save_for_post( $post_id ) {
 
 		// check autosave
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-			return $post_id;
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+					return $post_id;
+		}
 
 		$this->save( $post_id );
 

vendor/Custom-Meta-Boxes/fields-anywhere.php

Spacing +20 added lines, -20 removed lines

@@ -11,9 +11,9 @@ 
  * 
  * @return null
  */
-function cmb_draw_meta_boxes( $pages, $context = 'normal', $object = null ) {
+function cmb_draw_meta_boxes($pages, $context = 'normal', $object = null) {
 
-	cmb_do_meta_boxes( $pages, $context, $object );
+	cmb_do_meta_boxes($pages, $context, $object);
 
 	wp_enqueue_script('post');
 
@@ -29,54 +29,54 @@ 
  * @param mixed $object gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
-function cmb_do_meta_boxes( $screen, $context, $object ) {
+function cmb_do_meta_boxes($screen, $context, $object) {
 
 	global $wp_meta_boxes;
 
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
 
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 
 	$i = 0;
 
 	do {
 		// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
 
-		if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) )
-			foreach ( $sorted as $box_context => $ids )
-				foreach ( explode(',', $ids ) as $id )
-					if ( $id && 'dashboard_browser_nag' !== $id )
-						add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+		if ( ! $already_sorted && $sorted = get_user_option("meta-box-order_$page"))
+			foreach ($sorted as $box_context => $ids)
+				foreach (explode(',', $ids) as $id)
+					if ($id && 'dashboard_browser_nag' !== $id)
+						add_meta_box($id, null, null, $screen, $box_context, 'sorted');
 
 		$already_sorted = true;
 
-		if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) )
+		if ( ! isset($wp_meta_boxes) || ! isset($wp_meta_boxes[$page]) || ! isset($wp_meta_boxes[$page][$context]))
 			break;
 
-		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
+		foreach (array('high', 'sorted', 'core', 'default', 'low') as $priority) {
 
-			if ( isset( $wp_meta_boxes[$page][$context][$priority] ) ) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
 
-				foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
+				foreach ((array) $wp_meta_boxes[$page][$context][$priority] as $box) {
 
-					if ( false == $box || ! $box['title'] )
+					if (false == $box || ! $box['title'])
 						continue;
 
 					$i++;
 
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : ''; ?>
 
-					<div id="<?php esc_attr_e( $box['id'] ); ?>" class="<?php esc_attr_e( postbox_classes( $box['id'], $page ) . $hidden_class ); ?>">
+					<div id="<?php esc_attr_e($box['id']); ?>" class="<?php esc_attr_e(postbox_classes($box['id'], $page) . $hidden_class); ?>">
 
-						<?php call_user_func( $box['callback'], $object, $box ); ?>
+						<?php call_user_func($box['callback'], $object, $box); ?>
 
 					</div>
 
@@ -85,7 +85,7 @@ 
 			}
 
 		}
-	} while( 0 );
+	} while (0);
 
 	return $i;
 

Braces +14 added lines, -11 removed lines

@@ -35,11 +35,11 @@ 
 
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -50,16 +50,18 @@ 
 	do {
 		// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
 
-		if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) )
-			foreach ( $sorted as $box_context => $ids )
+		if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
+					foreach ( $sorted as $box_context => $ids )
 				foreach ( explode(',', $ids ) as $id )
 					if ( $id && 'dashboard_browser_nag' !== $id )
 						add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+		}
 
 		$already_sorted = true;
 
-		if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) )
-			break;
+		if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) ) {
+					break;
+		}
 
 		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
 
@@ -67,8 +69,9 @@ 
 
 				foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
 
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 
 					$i++;
 

vendor/uix/uix.php

Spacing +199 added lines, -199 removed lines

@@ -73,23 +73,23 @@ 
 	 * @since  1.0.0
 	 * @access private
 	 */
-	private function __construct( $slug ) {
+	private function __construct($slug) {
 
 
 		// set slug
 		$this->plugin_slug = $slug;
 
 		// add admin page
-		add_action( 'admin_menu', array( $this, 'add_settings_pages' ), 25 );
+		add_action('admin_menu', array($this, 'add_settings_pages'), 25);
 
 		// add metaboxes
-		add_action( 'add_meta_boxes', array( $this, 'add_metaboxes'), 25 );
+		add_action('add_meta_boxes', array($this, 'add_metaboxes'), 25);
 
 		// save config
-		add_action( 'wp_ajax_' . $this->plugin_slug . '_save_config', array( $this, 'save_config') );
+		add_action('wp_ajax_' . $this->plugin_slug . '_save_config', array($this, 'save_config'));
 
 		// save metabox
-		add_action( 'save_post', array( $this, 'save_meta' ), 10, 2 );
+		add_action('save_post', array($this, 'save_meta'), 10, 2);
 
 	}
 
@@ -100,27 +100,27 @@ 
 	 *
 	 * @uses "add_meta_boxes" hook
 	 */
-	public function add_metaboxes(){
+	public function add_metaboxes() {
 
 		$screen = get_current_screen();
 
-		if( !is_object( $screen ) || $screen->base != 'post' ){
+		if ( ! is_object($screen) || $screen->base != 'post') {
 			return;
 		}
 		// post type metaboxes
 		$configs = array();
 
-		foreach( (array) $this->metaboxes as $metabox_slug => $metabox ){
+		foreach ((array) $this->metaboxes as $metabox_slug => $metabox) {
 
 			// only process this post type
-			if( empty($metabox['post_type']) || !in_array( $screen->post_type, (array) $metabox['post_type'] ) || empty( $metabox[ 'name' ] )  ){
+			if (empty($metabox['post_type']) || ! in_array($screen->post_type, (array) $metabox['post_type']) || empty($metabox['name'])) {
 				continue;
 			}
 
 			add_meta_box(
 				$metabox_slug,
 				$metabox['name'],
-				array( $this, 'render_metabox' ),
+				array($this, 'render_metabox'),
 				$screen->post_type,
 				$metabox['context'],
 				$metabox['priority'],
@@ -128,50 +128,50 @@ 
 			);
 
 			// do scripts
-			$uix = $this->get_metabox( $metabox_slug );
-			if( false !== $uix ){
-				$configs[ $metabox_slug ] = $uix;
+			$uix = $this->get_metabox($metabox_slug);
+			if (false !== $uix) {
+				$configs[$metabox_slug] = $uix;
 			}
 
 		}
 		// scripts
-		if( !empty( $configs ) ){
-			$this->enqueue_metabox_stylescripts( $configs, $screen->post_type );
+		if ( ! empty($configs)) {
+			$this->enqueue_metabox_stylescripts($configs, $screen->post_type);
 		}
 
 	}
 
 
-	public function render_metabox( $post, $metabox ){
+	public function render_metabox($post, $metabox) {
 
 		$uix = $metabox['args'];
 
-		if( !empty( $uix['base_color'] ) ){
+		if ( ! empty($uix['base_color'])) {
 		?><style type="text/css">.uix-modal-title > h3,.wrap a.page-title-action:hover{background: <?php echo $uix['base_color']; ?>;}</style>
 		<?php
 		}
 		?>
-		<input id="uix_<?php echo esc_attr( $metabox['id'] ); ?>" name="uix[<?php echo esc_attr( $metabox['id'] ); ?>]" value="" type="hidden">
-		<div class="uix-tab-canvas" data-app="<?php echo esc_attr( $metabox['id'] ); ?>"></div>
-		<script type="text/html" data-template="<?php echo esc_attr( $metabox['id'] ); ?>">
+		<input id="uix_<?php echo esc_attr($metabox['id']); ?>" name="uix[<?php echo esc_attr($metabox['id']); ?>]" value="" type="hidden">
+		<div class="uix-tab-canvas" data-app="<?php echo esc_attr($metabox['id']); ?>"></div>
+		<script type="text/html" data-template="<?php echo esc_attr($metabox['id']); ?>">
 			<?php
-				if( !empty( $uix['template'] ) && file_exists( $uix['template'] ) ){
+				if ( ! empty($uix['template']) && file_exists($uix['template'])) {
 					include $uix['template'];
-				}else{
-					echo esc_html__( 'Template not found: ', $this->plugin_slug ) . $uix['template'];
+				} else {
+					echo esc_html__('Template not found: ', $this->plugin_slug) . $uix['template'];
 				}
 			?>
 		</script>
-		<?php if( !empty( $uix['partials'] ) ){
-			foreach( $uix['partials'] as $partial_id => $partial ){
+		<?php if ( ! empty($uix['partials'])) {
+			foreach ($uix['partials'] as $partial_id => $partial) {
 				?>
-				<script type="text/html" id="__partial_<?php echo esc_attr( $partial_id ); ?>" data-handlebars-partial="<?php echo esc_attr( $partial_id ); ?>">
+				<script type="text/html" id="__partial_<?php echo esc_attr($partial_id); ?>" data-handlebars-partial="<?php echo esc_attr($partial_id); ?>">
 					<?php
 						// include this tabs template
-						if( !empty( $partial ) && file_exists( $partial ) ){
+						if ( ! empty($partial) && file_exists($partial)) {
 							include $partial;
-						}else{
-							echo esc_html__( 'Partial Template not found: ', $this->plugin_slug ) . $partial_id;
+						} else {
+							echo esc_html__('Partial Template not found: ', $this->plugin_slug) . $partial_id;
 						}
 					?>
 				</script>
@@ -180,16 +180,16 @@ 
 		}
 
 
-		if( !empty( $uix['modals'] ) ){
-			foreach( $uix['modals'] as $modal_id => $modal ){
+		if ( ! empty($uix['modals'])) {
+			foreach ($uix['modals'] as $modal_id => $modal) {
 				?>
-				<script type="text/html" id="__modal_<?php echo esc_attr( $modal_id ); ?>" data-handlebars-partial="<?php echo esc_attr( $modal_id ); ?>">
+				<script type="text/html" id="__modal_<?php echo esc_attr($modal_id); ?>" data-handlebars-partial="<?php echo esc_attr($modal_id); ?>">
 					<?php
 						// include this tabs template
-						if( !empty( $modal ) && file_exists( $modal ) ){
+						if ( ! empty($modal) && file_exists($modal)) {
 							include $modal;
-						}else{
-							echo esc_html__( 'Modal Template not found: ', $this->plugin_slug ) . $modal_id;
+						} else {
+							echo esc_html__('Modal Template not found: ', $this->plugin_slug) . $modal_id;
 						}
 					?>
 				</script>
@@ -223,7 +223,7 @@ 
 				Remove
 			</button>
 		</script>
-		<?php if( !empty( $uix['chromeless'] ) ){ ?>
+		<?php if ( ! empty($uix['chromeless'])) { ?>
 		<script type="text/javascript">
 			jQuery('#<?php echo $metabox['id']; ?>').addClass('uix-metabox');
 		</script>
@@ -247,11 +247,11 @@ 
 	 *
 	 * @return    object|\uix\uix    A single instance of this class.
 	 */
-	public static function get_instance( $slug ) {
+	public static function get_instance($slug) {
 
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
-			self::$instance = new self( $slug );
+		if (null == self::$instance) {
+			self::$instance = new self($slug);
 		}
 
 		return self::$instance;
@@ -264,33 +264,33 @@ 
 	 * @since 1.0.0
 	 * @return    string/array    the requested setting
 	 */
-	public static function get_setting( $path, $manual = false ) {
+	public static function get_setting($path, $manual = false) {
 
-		$path      = explode( '.', $path );
+		$path      = explode('.', $path);
 		$temp      = null;
-		$page_slug = array_shift( $path );
+		$page_slug = array_shift($path);
 
-		if ( null == self::$instance || true === $manual ) {
-			if ( false === $manual ) {
-				trigger_error( 'Cannot request a value without a UIX instance. Set second argument to TRUE for manual lookup.' );
+		if (null == self::$instance || true === $manual) {
+			if (false === $manual) {
+				trigger_error('Cannot request a value without a UIX instance. Set second argument to TRUE for manual lookup.');
 
 				return;
 			}
 			// attempt a manual lookup - requires the full option name
 			$option_tag = $page_slug;
 		} else {
-			if ( ! empty( self::$instance->pages[ $page_slug ]['option_name'] ) ) {
-				$option_tag = self::$instance->pages[ $page_slug ]['option_name'];
+			if ( ! empty(self::$instance->pages[$page_slug]['option_name'])) {
+				$option_tag = self::$instance->pages[$page_slug]['option_name'];
 			} else {
 				$option_tag = '_' . self::$instance->plugin_slug . '_' . $page_slug;
 			}
 		}
-		$temp = get_option( $option_tag );
-		foreach ( $path as $index => $value ) {
-			if ( ! isset( $temp[ $value ] ) ) {
+		$temp = get_option($option_tag);
+		foreach ($path as $index => $value) {
+			if ( ! isset($temp[$value])) {
 				return null;
 			}
-			$temp = $temp[ $value ];
+			$temp = $temp[$value];
 		}
 
 		return $temp;
@@ -302,7 +302,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function register_pages( $pages ) {
+	public function register_pages($pages) {
 
 		/**
 		 * Filter settings pages to be created
@@ -310,7 +310,7 @@ 
 		 * @param array $pages Page structures to be created
 		 */
 
-		$this->pages = apply_filters( $this->plugin_slug . '_set_admin_pages', $pages );
+		$this->pages = apply_filters($this->plugin_slug . '_set_admin_pages', $pages);
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function register_metaboxes( $metaboxes ) {
+	public function register_metaboxes($metaboxes) {
 		// register pages
 		$this->metaboxes = $metaboxes;
 	}
@@ -334,13 +334,13 @@ 
 
 		$page = $this->get_page();
 
-		if ( ! empty( $page['help'] ) ) {
+		if ( ! empty($page['help'])) {
 
 			$screen = get_current_screen();
 
-			foreach ( (array) $page['help'] as $help_slug => $help ) {
+			foreach ((array) $page['help'] as $help_slug => $help) {
 
-				if ( is_file( $help['content'] ) && file_exists( $help['content'] ) ) {
+				if (is_file($help['content']) && file_exists($help['content'])) {
 					ob_start();
 					include $help['content'];
 					$content = ob_get_clean();
@@ -348,16 +348,16 @@ 
 					$content = $help['content'];
 				}
 
-				$screen->add_help_tab( array(
+				$screen->add_help_tab(array(
 					'id'      => $help_slug,
 					'title'   => $help['title'],
 					'content' => $content,
-				) );
+				));
 			}
 
 			// Help sidebars are optional
-			if ( ! empty( $page['help_sidebar'] ) ) {
-				$screen->set_help_sidebar( $page['help_sidebar'] );
+			if ( ! empty($page['help_sidebar'])) {
+				$screen->set_help_sidebar($page['help_sidebar']);
 			}
 		}
 
@@ -370,24 +370,24 @@ 
 	 *
 	 * @since 0.0.1
 	 */
-	public function save_meta( $post_id ){
+	public function save_meta($post_id) {
 
-		if( !empty( $_POST['uix'] ) ){
+		if ( ! empty($_POST['uix'])) {
 
-			foreach( ( array) $_POST['uix'] as $slug => $data ){
-				if( empty( $this->metaboxes[ $slug ] ) ){
+			foreach ((array) $_POST['uix'] as $slug => $data) {
+				if (empty($this->metaboxes[$slug])) {
 					continue;
 				}
 
-				$uix = $this->metaboxes[ $slug ];
-				$config = json_decode( stripslashes_deep( $data ), true );
+				$uix = $this->metaboxes[$slug];
+				$config = json_decode(stripslashes_deep($data), true);
 
-				if( empty( $uix['meta_name'] ) ){
-					$uix['meta_name'] = '_' . $this->plugin_slug . '_' . sanitize_text_field( $slug );
+				if (empty($uix['meta_name'])) {
+					$uix['meta_name'] = '_' . $this->plugin_slug . '_' . sanitize_text_field($slug);
 				}
 				// get config object
 
-				$config_object = update_post_meta( $post_id, $uix['meta_name'], $config );
+				$config_object = update_post_meta($post_id, $uix['meta_name'], $config);
 
 			}
 
@@ -405,17 +405,17 @@ 
 	 */
 	public function save_config() {
 
-		if ( ! empty( $_POST['config'] ) ) {
+		if ( ! empty($_POST['config'])) {
 
-			$config = json_decode( stripslashes_deep( $_POST['config'] ), true );
+			$config = json_decode(stripslashes_deep($_POST['config']), true);
 
-			if ( wp_verify_nonce( $_POST['uix_setup'], $this->plugin_slug ) ) {
+			if (wp_verify_nonce($_POST['uix_setup'], $this->plugin_slug)) {
 
-				$page_slug = sanitize_text_field( $_POST['page_slug'] );
+				$page_slug = sanitize_text_field($_POST['page_slug']);
 
-				if ( ! empty( $this->pages[ $page_slug ] ) ) {
+				if ( ! empty($this->pages[$page_slug])) {
 					$params = null;
-					if ( ! empty( $_POST['params'] ) ) {
+					if ( ! empty($_POST['params'])) {
 						$params = $_POST['params'];
 					}
 					/**
@@ -424,7 +424,7 @@ 
 					 * @param array $page_config the page config array
 					 * @param array $params      any defined save_params.
 					 */
-					$page = apply_filters( $this->plugin_slug . '_get_page_save', $this->pages[ $page_slug ], $params );
+					$page = apply_filters($this->plugin_slug . '_get_page_save', $this->pages[$page_slug], $params);
 
 					/**
 					 * Filter config object
@@ -432,37 +432,37 @@ 
 					 * @param array $config the config array to save
 					 * @param array $page   the page config to be saved for
 					 */
-					$config = apply_filters( $this->plugin_slug . '_pre_save_config', $config, $page );
+					$config = apply_filters($this->plugin_slug . '_pre_save_config', $config, $page);
 
 
-					$success = __( 'Settings saved.', $this->plugin_slug );
-					if ( ! empty( $page['saved_message'] ) ) {
+					$success = __('Settings saved.', $this->plugin_slug);
+					if ( ! empty($page['saved_message'])) {
 						$success = $page['saved_message'];
 					}
 					$option_tag = '_' . $this->plugin_slug . '_' . $page_slug;
-					if ( ! empty( $page['option_name'] ) ) {
+					if ( ! empty($page['option_name'])) {
 						$option_tag = $page['option_name'];
 					}
 					// push backup if not autosave
-					if ( empty( $_POST['autosave'] ) ) {
-						$previous = get_option( $option_tag );
-						if ( ! empty( $previous ) ) {
-							update_option( $option_tag . '-' . current_time( 'timestamp' ), $previous );
+					if (empty($_POST['autosave'])) {
+						$previous = get_option($option_tag);
+						if ( ! empty($previous)) {
+							update_option($option_tag . '-' . current_time('timestamp'), $previous);
 						}
 					}
 					// save object
-					update_option( $option_tag, $config );
-					wp_send_json_success( $success );
+					update_option($option_tag, $config);
+					wp_send_json_success($success);
 				}
 
 			} else {
-				wp_send_json_error( esc_html__( 'Could not verify nonce', $this->plugin_slug ) );
+				wp_send_json_error(esc_html__('Could not verify nonce', $this->plugin_slug));
 			}
 
 		}
 
 		// nope
-		wp_send_json_error( esc_html__( 'Could not save, sorry.', $this->plugin_slug ) );
+		wp_send_json_error(esc_html__('Could not save, sorry.', $this->plugin_slug));
 	}
 
 
@@ -476,7 +476,7 @@ 
 	public function enqueue_admin_stylescripts() {
 
 		$uix = $this->get_page();
-		if ( false === $uix ) {
+		if (false === $uix) {
 			return;
 		}
 
@@ -484,39 +484,39 @@ 
 
 		// allow for minimized scripts
 		$prefix  = '.min';
-		$uix_url = plugin_dir_url( __FILE__ );
-		if ( defined( 'DEBUG_SCRIPTS' ) ) {
+		$uix_url = plugin_dir_url(__FILE__);
+		if (defined('DEBUG_SCRIPTS')) {
 			//$prefix = null;
 		}
 		// base styles
-		wp_enqueue_style( $this->plugin_slug . '-base-icons', $uix_url . 'assets/css/icons' . $prefix . '.css' );
-		wp_enqueue_style( $this->plugin_slug . '-base-styles', $uix_url . 'assets/css/admin' . $prefix . '.css' );
+		wp_enqueue_style($this->plugin_slug . '-base-icons', $uix_url . 'assets/css/icons' . $prefix . '.css');
+		wp_enqueue_style($this->plugin_slug . '-base-styles', $uix_url . 'assets/css/admin' . $prefix . '.css');
 		// enqueue scripts
-		wp_enqueue_script( 'handlebars', $uix_url . 'assets/js/handlebars.min-latest.js', array(), null, true );
+		wp_enqueue_script('handlebars', $uix_url . 'assets/js/handlebars.min-latest.js', array(), null, true);
 		// if has modals
-		if ( ! empty( $uix['modals'] ) ) {
-			wp_enqueue_script( $this->plugin_slug . '-core-modals', $uix_url . 'assets/js/uix-modals' . $prefix . '.js', array(
+		if ( ! empty($uix['modals'])) {
+			wp_enqueue_script($this->plugin_slug . '-core-modals', $uix_url . 'assets/js/uix-modals' . $prefix . '.js', array(
 				'jquery',
 				'handlebars',
-			), null, true );
+			), null, true);
 		}
-		wp_enqueue_script( $this->plugin_slug . '-helpers', $uix_url . 'assets/js/uix-helpers' . $prefix . '.js', array( 'handlebars' ), null, true );
-		wp_enqueue_script( $this->plugin_slug . '-core-admin', $uix_url . 'assets/js/uix-core' . $prefix . '.js', array(
+		wp_enqueue_script($this->plugin_slug . '-helpers', $uix_url . 'assets/js/uix-helpers' . $prefix . '.js', array('handlebars'), null, true);
+		wp_enqueue_script($this->plugin_slug . '-core-admin', $uix_url . 'assets/js/uix-core' . $prefix . '.js', array(
 			'jquery',
 			'handlebars',
-		), null, true );
+		), null, true);
 
 		// enqueue admin runtime styles
-		$this->enqueue_set( $uix, $this->plugin_slug . '-' . $uix['page_slug'] );
+		$this->enqueue_set($uix, $this->plugin_slug . '-' . $uix['page_slug']);
 
 		// enqueue tab specific runtime styles
-		if ( ! empty( $uix['tabs'] ) ) {
-			foreach ( $uix['tabs'] as $tab_slug => $tab ) {
+		if ( ! empty($uix['tabs'])) {
+			foreach ($uix['tabs'] as $tab_slug => $tab) {
 				//$this->enqueue_set( $tab, $this->plugin_slug . '-' . $uix['page_slug'] . '-' . $tab_slug );
 			}
 		}
 
-		wp_localize_script( $this->plugin_slug . '-core-admin', 'uix', $uix );
+		wp_localize_script($this->plugin_slug . '-core-admin', 'uix', $uix);
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 *
 	 * @return    null
 	 */
-	public function enqueue_metabox_stylescripts( $metaboxes, $post_type ) {
+	public function enqueue_metabox_stylescripts($metaboxes, $post_type) {
 
 
 		$uix = array(
@@ -538,35 +538,35 @@ 
 
 		// allow for minimized scripts
 		$prefix = '.min';
-		$uix_url = plugin_dir_url( __FILE__ );
-		if( defined( 'DEBUG_SCRIPTS' ) ){
+		$uix_url = plugin_dir_url(__FILE__);
+		if (defined('DEBUG_SCRIPTS')) {
 			$prefix = null;
 		}
 		// base styles
-		wp_enqueue_style( $this->plugin_slug . '-base-icons', $uix_url . 'assets/css/icons' . $prefix . '.css' );
-		wp_enqueue_style( $this->plugin_slug . '-base-styles', $uix_url . 'assets/css/metabox' . $prefix . '.css' );
+		wp_enqueue_style($this->plugin_slug . '-base-icons', $uix_url . 'assets/css/icons' . $prefix . '.css');
+		wp_enqueue_style($this->plugin_slug . '-base-styles', $uix_url . 'assets/css/metabox' . $prefix . '.css');
 		// enqueue scripts
-		wp_enqueue_script( 'handlebars', $uix_url . 'assets/js/handlebars.min-latest.js', array(), null, true );
+		wp_enqueue_script('handlebars', $uix_url . 'assets/js/handlebars.min-latest.js', array(), null, true);
 		// if has modals
 
-		wp_enqueue_script( $this->plugin_slug . '-helpers', $uix_url . 'assets/js/uix-helpers' . $prefix . '.js', array( 'handlebars' ), null, true );
-		wp_enqueue_script( $this->plugin_slug . '-core-admin', $uix_url . 'assets/js/uix-core' . $prefix . '.js', array( 'jquery', 'handlebars' ), null, true );
+		wp_enqueue_script($this->plugin_slug . '-helpers', $uix_url . 'assets/js/uix-helpers' . $prefix . '.js', array('handlebars'), null, true);
+		wp_enqueue_script($this->plugin_slug . '-core-admin', $uix_url . 'assets/js/uix-core' . $prefix . '.js', array('jquery', 'handlebars'), null, true);
 
-		foreach( $metaboxes as $slug=>$metabox ){
-			if( !empty( $metabox['modals'] ) ){
+		foreach ($metaboxes as $slug=>$metabox) {
+			if ( ! empty($metabox['modals'])) {
 				$uix['modals'] = true;
 			}
-			$uix['config'][ $slug ] = $metabox['config'];
+			$uix['config'][$slug] = $metabox['config'];
 			// enqueue admin runtime styles
-			$this->enqueue_set( $metabox, $this->plugin_slug . '-' . $slug );
+			$this->enqueue_set($metabox, $this->plugin_slug . '-' . $slug);
 
 		}
-		if( !empty( $uix['modals'] ) ){
-			wp_enqueue_script( $this->plugin_slug . '-core-modals', $uix_url . 'assets/js/uix-modals' . $prefix . '.js', array( 'jquery', 'handlebars' ), null, true );
+		if ( ! empty($uix['modals'])) {
+			wp_enqueue_script($this->plugin_slug . '-core-modals', $uix_url . 'assets/js/uix-modals' . $prefix . '.js', array('jquery', 'handlebars'), null, true);
 		}
 
 
-		wp_localize_script( $this->plugin_slug . '-core-admin', 'uix', $uix );
+		wp_localize_script($this->plugin_slug . '-core-admin', 'uix', $uix);
 	}
 
 
@@ -576,7 +576,7 @@ 
 	 * @since 0.0.1
 	 *
 	 */
-	private function enqueue_set( $set, $prefix ) {
+	private function enqueue_set($set, $prefix) {
 		// go over the set to see if it has styles or scripts
 
 		// setup default args for array type includes
@@ -589,31 +589,31 @@ 
 		);
 
 		// enqueue set specific runtime styles
-		if ( ! empty( $set['styles'] ) ) {
-			foreach ( $set['styles'] as $style_key => $style ) {
-				if ( is_int( $style_key ) ) {
-					wp_enqueue_style( $style );
+		if ( ! empty($set['styles'])) {
+			foreach ($set['styles'] as $style_key => $style) {
+				if (is_int($style_key)) {
+					wp_enqueue_style($style);
 				} else {
-					if ( is_array( $style ) ) {
-						$args = array_merge( $arguments_array, $style );
-						wp_enqueue_style( $prefix . '-' . $script_key, $args['src'], $args['deps'], $args['ver'], $args['in_footer'] );
+					if (is_array($style)) {
+						$args = array_merge($arguments_array, $style);
+						wp_enqueue_style($prefix . '-' . $script_key, $args['src'], $args['deps'], $args['ver'], $args['in_footer']);
 					} else {
-						wp_enqueue_style( $prefix . '-' . $style_key, $style );
+						wp_enqueue_style($prefix . '-' . $style_key, $style);
 					}
 				}
 			}
 		}
 		// enqueue set specific runtime scripts
-		if ( ! empty( $set['scripts'] ) ) {
-			foreach ( $set['scripts'] as $script_key => $script ) {
-				if ( is_int( $script_key ) ) {
-					wp_enqueue_script( $script );
+		if ( ! empty($set['scripts'])) {
+			foreach ($set['scripts'] as $script_key => $script) {
+				if (is_int($script_key)) {
+					wp_enqueue_script($script);
 				} else {
-					if ( is_array( $script ) ) {
-						$args = array_merge( $arguments_array, $script );
-						wp_enqueue_script( $prefix . '-' . $script_key, $args['src'], $args['deps'], $args['ver'], $args['in_footer'] );
+					if (is_array($script)) {
+						$args = array_merge($arguments_array, $script);
+						wp_enqueue_script($prefix . '-' . $script_key, $args['src'], $args['deps'], $args['ver'], $args['in_footer']);
 					} else {
-						wp_enqueue_script( $prefix . '-' . $script_key, $script );
+						wp_enqueue_script($prefix . '-' . $script_key, $script);
 					}
 				}
 			}
@@ -632,13 +632,13 @@ 
 		// check that the scrren object is valid to be safe.
 		$screen = get_current_screen();
 
-		if ( empty( $screen ) || ! is_object( $screen ) ) {
+		if (empty($screen) || ! is_object($screen)) {
 			return false;
 		}
 
 		// get the page slug from base ID
-		$page_slug = array_search( $screen->base, $this->plugin_screen_hook_suffix );
-		if ( empty( $page_slug ) || empty( $this->pages[ $page_slug ] ) ) {
+		$page_slug = array_search($screen->base, $this->plugin_screen_hook_suffix);
+		if (empty($page_slug) || empty($this->pages[$page_slug])) {
 			return false; // in case its not found or the array item is no longer valid, just leave.
 		}
 		/**
@@ -646,13 +646,13 @@ 
 		 *
 		 * @param array $page The page object array.
 		 */
-		$uix = apply_filters( $this->plugin_slug . '_get_page', $this->pages[ $page_slug ] );
+		$uix = apply_filters($this->plugin_slug . '_get_page', $this->pages[$page_slug]);
 
-		if ( empty( $uix['option_name'] ) ) {
-			$uix['option_name'] = '_' . $this->plugin_slug . '_' . sanitize_text_field( $page_slug );
+		if (empty($uix['option_name'])) {
+			$uix['option_name'] = '_' . $this->plugin_slug . '_' . sanitize_text_field($page_slug);
 		}
 		// get config object
-		$config_object = get_option( $uix['option_name'], array() );
+		$config_object = get_option($uix['option_name'], array());
 
 		$uix['page_slug'] = $page_slug;
 		/**
@@ -661,7 +661,7 @@ 
 		 * @param array $config_object The object as retrieved from DB
 		 * @param array $page_slug     The page slug this object belongs to.
 		 */
-		$uix['config'] = apply_filters( $this->plugin_slug . '_get_config', $config_object, $uix );
+		$uix['config'] = apply_filters($this->plugin_slug . '_get_config', $config_object, $uix);
 
 
 		return $uix;
@@ -674,18 +674,18 @@ 
 	 *
 	 * @return array $metabox array structure of current uix metabox
 	 */
-	private function get_metabox( $slug ){
+	private function get_metabox($slug) {
 		global $post;
 
 		// check that the scrren object is valid to be safe.
 		$screen = get_current_screen();
 
-		if( empty( $screen ) || !is_object( $screen ) || empty( $screen->post_type ) ){
+		if (empty($screen) || ! is_object($screen) || empty($screen->post_type)) {
 			return false;
 		}
 
 		// get the page slug from base ID
-		if( empty( $this->metaboxes[ $slug ] ) ){
+		if (empty($this->metaboxes[$slug])) {
 			return false; // in case its not found or the array item is no longer valid, just leave.
 		}
 		/**
@@ -693,14 +693,14 @@ 
 		 *
 		 * @param array $page The page object array.
 		 */
-		$uix = apply_filters( $this->plugin_slug . '_get_metabox', $this->metaboxes[ $slug ] );
+		$uix = apply_filters($this->plugin_slug . '_get_metabox', $this->metaboxes[$slug]);
 
-		if( empty( $uix['meta_name'] ) ){
-			$uix['meta_name'] = '_' . $this->plugin_slug . '_' . sanitize_text_field( $slug );
+		if (empty($uix['meta_name'])) {
+			$uix['meta_name'] = '_' . $this->plugin_slug . '_' . sanitize_text_field($slug);
 		}
 		// get config object
 
-		$config_object = get_post_meta( $post->ID, $uix['meta_name'], true );
+		$config_object = get_post_meta($post->ID, $uix['meta_name'], true);
 
 		$uix['slug'] = $slug;
 		/**
@@ -709,7 +709,7 @@ 
 		 * @param array $config_object The object as retrieved from DB
 		 * @param array $slug The page slug this object belongs to.
 		 */
-		$uix['config'] = apply_filters( $this->plugin_slug . '_get_meta_config', $config_object, $uix );
+		$uix['config'] = apply_filters($this->plugin_slug . '_get_meta_config', $config_object, $uix);
 
 		return $uix;
 
@@ -723,9 +723,9 @@ 
 	 */
 	public function add_settings_pages() {
 
-		foreach ( (array) $this->pages as $page_slug => $page ) {
+		foreach ((array) $this->pages as $page_slug => $page) {
 
-			if ( empty( $page['page_title'] ) || empty( $page['menu_title'] ) ) {
+			if (empty($page['page_title']) || empty($page['menu_title'])) {
 				continue;
 			}
 
@@ -734,39 +734,39 @@ 
 				'icon'       => null,
 				'position'   => null,
 			);
-			$args = array_merge( $args, $page );
+			$args = array_merge($args, $page);
 
-			if ( ! empty( $page['parent'] ) ) {
+			if ( ! empty($page['parent'])) {
 
-				$this->plugin_screen_hook_suffix[ $page_slug ] = add_submenu_page(
+				$this->plugin_screen_hook_suffix[$page_slug] = add_submenu_page(
 					$args['parent'],
 					$args['page_title'],
 					$args['menu_title'],
 					$args['capability'],
 					$this->plugin_slug . '-' . $page_slug,
-					array( $this, 'create_admin_page' )
+					array($this, 'create_admin_page')
 				);
 
 			} else {
 
-				$this->plugin_screen_hook_suffix[ $page_slug ] = add_menu_page(
+				$this->plugin_screen_hook_suffix[$page_slug] = add_menu_page(
 					$args['page_title'],
 					$args['menu_title'],
 					$args['capability'],
 					$this->plugin_slug . '-' . $page_slug,
-					array( $this, 'create_admin_page' ),
+					array($this, 'create_admin_page'),
 					$args['icon'],
 					$args['position']
 				);
 			}
-			add_action( 'admin_print_styles-' . $this->plugin_screen_hook_suffix[ $page_slug ], array(
+			add_action('admin_print_styles-' . $this->plugin_screen_hook_suffix[$page_slug], array(
 				$this,
 				'enqueue_admin_stylescripts',
-			) );
-			add_action( 'load-' . $this->plugin_screen_hook_suffix[ $page_slug ], array(
+			));
+			add_action('load-' . $this->plugin_screen_hook_suffix[$page_slug], array(
 				$this,
 				'add_help',
-			) );
+			));
 		}
 	}
 
@@ -778,70 +778,70 @@ 
 	public function create_admin_page() {
 
 		$uix           = $this->get_page();
-		$template_path = plugin_dir_path( dirname( __FILE__ ) );
+		$template_path = plugin_dir_path(dirname(__FILE__));
 		?>
         <div class="wrap">
 
-            <h1><?php esc_html_e( $uix['page_title'], $this->plugin_slug ); ?>
-				<?php if ( ! empty( $uix['version'] ) ) { ?>
-                    <small><?php esc_html_e( $uix['version'], $this->plugin_slug ); ?></small><?php } ?>
+            <h1><?php esc_html_e($uix['page_title'], $this->plugin_slug); ?>
+				<?php if ( ! empty($uix['version'])) { ?>
+                    <small><?php esc_html_e($uix['version'], $this->plugin_slug); ?></small><?php } ?>
             </h1>
-			<?php if ( ! empty( $uix['tabs'] ) ) { ?>
+			<?php if ( ! empty($uix['tabs'])) { ?>
                 <div class="wp-filter hide-if-no-js">
                     <ul class="filter-links">
-						<?php foreach ( (array) $uix['tabs'] as $tab_slug => $tab ) {
+						<?php foreach ((array) $uix['tabs'] as $tab_slug => $tab) {
 							$display = "";
-							if ( isset( $tab['disabled'] ) && true === $tab['disabled'] ) {
+							if (isset($tab['disabled']) && true === $tab['disabled']) {
 								$display = 'style="display:none;"';
 							}
 							?>
                             <li><a <?php echo $display; ?>
-                                        data-tab="<?php echo esc_attr( $tab_slug ); ?>"
-                                        href="#<?php echo esc_attr( $tab_slug ) ?>"><?php echo esc_html( $tab['menu_title'] ); ?></a>
+                                        data-tab="<?php echo esc_attr($tab_slug); ?>"
+                                        href="#<?php echo esc_attr($tab_slug) ?>"><?php echo esc_html($tab['menu_title']); ?></a>
                             </li>
 						<?php } ?>
                     </ul>
                 </div>
 			<?php } ?>
-			<?php wp_nonce_field( $this->plugin_slug, 'uix_setup' ); ?>
+			<?php wp_nonce_field($this->plugin_slug, 'uix_setup'); ?>
 			<?php
-			if ( ! empty( $uix['tabs'] ) ) {
+			if ( ! empty($uix['tabs'])) {
 				$this->current_tab = false;
-				foreach ( (array) $uix['tabs'] as $tab_slug => $tab ) {
+				foreach ((array) $uix['tabs'] as $tab_slug => $tab) {
 					$this->current_tab = $tab_slug; ?>
                     <div class="uix-tab-canvas"
-                         data-app="<?php echo esc_attr( $tab_slug ); ?>"></div>
+                         data-app="<?php echo esc_attr($tab_slug); ?>"></div>
                     <script type="text/html"
-                            data-template="<?php echo esc_attr( $tab_slug ); ?>">
+                            data-template="<?php echo esc_attr($tab_slug); ?>">
 						<?php
-						if ( ! empty( $tab['page_title'] ) ) {
+						if ( ! empty($tab['page_title'])) {
 							echo '<h2>' . $tab['page_title'];
 						}
-						if ( ! empty( $tab['page_description'] ) ) { ?>
+						if ( ! empty($tab['page_description'])) { ?>
                             <small><?php echo $tab['page_description']; ?></small> <?php }
-						if ( ! empty( $tab['page_title'] ) ) {
+						if ( ! empty($tab['page_title'])) {
 							echo '</h2>';
 						}
 						// include this tabs template
-						if ( ! empty( $tab['template'] ) && file_exists( $tab['template'] ) ) {
+						if ( ! empty($tab['template']) && file_exists($tab['template'])) {
 							include $tab['template'];
 						} else {
-							echo esc_html__( 'Template not found: ', $this->plugin_slug ) . $tab['page_title'];
+							echo esc_html__('Template not found: ', $this->plugin_slug) . $tab['page_title'];
 						}
 						?>
                     </script>
-				<?php if ( ! empty( $tab['partials'] ) ){
-				foreach ( $tab['partials'] as $partial_id => $partial ){
+				<?php if ( ! empty($tab['partials'])) {
+				foreach ($tab['partials'] as $partial_id => $partial) {
 				?>
                     <script type="text/html"
-                            id="__partial_<?php echo esc_attr( $partial_id ); ?>"
-                            data-handlebars-partial="<?php echo esc_attr( $partial_id ); ?>">
+                            id="__partial_<?php echo esc_attr($partial_id); ?>"
+                            data-handlebars-partial="<?php echo esc_attr($partial_id); ?>">
 						<?php
 						// include this tabs template
-						if ( ! empty( $partial ) && file_exists( $template_path . $partial ) ) {
+						if ( ! empty($partial) && file_exists($template_path . $partial)) {
 							include $template_path . $partial;
 						} else {
-							echo esc_html__( 'Partial Template not found: ', $this->plugin_slug ) . $partial_id;
+							echo esc_html__('Partial Template not found: ', $this->plugin_slug) . $partial_id;
 						}
 						?>
                     </script>
@@ -851,22 +851,22 @@ 
 				}
 				$this->current_tab = false;
 			} else {
-				if ( ! empty( $uix['template'] ) && file_exists( $uix['template'] ) ) {
+				if ( ! empty($uix['template']) && file_exists($uix['template'])) {
 					include $uix['template'];
 				}
 			}
-			if ( ! empty( $uix['modals'] ) ) {
-				foreach ( $uix['modals'] as $modal_id => $modal ) {
+			if ( ! empty($uix['modals'])) {
+				foreach ($uix['modals'] as $modal_id => $modal) {
 					?>
                     <script type="text/html"
-                            id="__modal_<?php echo esc_attr( $modal_id ); ?>"
-                            data-handlebars-partial="<?php echo esc_attr( $modal_id ); ?>">
+                            id="__modal_<?php echo esc_attr($modal_id); ?>"
+                            data-handlebars-partial="<?php echo esc_attr($modal_id); ?>">
 						<?php
 						// include this tabs template
-						if ( ! empty( $modal ) && file_exists( $template_path . $modal ) ) {
+						if ( ! empty($modal) && file_exists($template_path . $modal)) {
 							include $template_path . $modal;
 						} else {
-							echo esc_html__( 'Modal Template not found: ', $this->plugin_slug ) . $modal_id;
+							echo esc_html__('Modal Template not found: ', $this->plugin_slug) . $modal_id;
 						}
 						?>
                     </script>
@@ -875,9 +875,9 @@ 
 			}
 			?>
             <hr>
-			<?php if ( ! empty( $uix['save_button'] ) ) { ?>
+			<?php if ( ! empty($uix['save_button'])) { ?>
                 <p class="uix-footer-bar"><button type="button" class="button button-primary" data-save-object="true">
-					<?php esc_html_e( $uix['save_button'], $this->plugin_slug ); ?>
+					<?php esc_html_e($uix['save_button'], $this->plugin_slug); ?>
                 </button>
                 <span class="spinner uix-save-spinner"></span>
                 <span class="save-confirm" style="display: none;"><span class="dashicons dashicons-yes"></span></span>

Braces +3 added lines, -3 removed lines

@@ -157,7 +157,7 @@ 
 			<?php
 				if( !empty( $uix['template'] ) && file_exists( $uix['template'] ) ){
 					include $uix['template'];
-				}else{
+				} else{
 					echo esc_html__( 'Template not found: ', $this->plugin_slug ) . $uix['template'];
 				}
 			?>
@@ -170,7 +170,7 @@ 
 						// include this tabs template
 						if( !empty( $partial ) && file_exists( $partial ) ){
 							include $partial;
-						}else{
+						} else{
 							echo esc_html__( 'Partial Template not found: ', $this->plugin_slug ) . $partial_id;
 						}
 					?>
@@ -188,7 +188,7 @@ 
 						// include this tabs template
 						if( !empty( $modal ) && file_exists( $modal ) ){
 							include $modal;
-						}else{
+						} else{
 							echo esc_html__( 'Modal Template not found: ', $this->plugin_slug ) . $modal_id;
 						}
 					?>