gravityview / GravityView

includes/class-admin-approve-entries.php

Doc Comments +3 added lines, -3 removed lines

@@ -170,7 +170,7 @@ 
 	 *
 	 * @uses  GravityView_frontend::get_search_criteria() Convert the $_POST search request into a properly formatted request.
 	 * @access public
-	 * @return void|boolean
+	 * @return null|false
 	 */
 	public function process_bulk_action() {
 		if ( ! class_exists( 'RGForms' ) ) {
@@ -252,7 +252,7 @@ 
 	 * @param array|boolean $entries If array, array of entry IDs that are to be updated. If true: update all entries.
 	 * @param int $approved Approved status. If `0`: unapproved, if not empty, `Approved`
 	 * @param int $form_id The Gravity Forms Form ID
-	 * @return boolean|void
+	 * @return false|null
 	 */
 	private static function update_bulk( $entries, $approved, $form_id ) {
 
@@ -470,7 +470,7 @@ 
 	 * @access public
 	 * @static
 	 * @param mixed $form GF Form or Form ID
-	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
+	 * @return integer Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
 	 */
 	static public function get_approved_column( $form ) {
 

includes/class-debug-bar.php

Spacing +31 added lines, -31 removed lines

@@ -21,12 +21,12 @@ 
 	function init() {
 
 		$icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i>&nbsp;' : NULL;
-		$this->title( $icon . __('GravityView', 'gravityview') );
+		$this->title($icon.__('GravityView', 'gravityview'));
 	}
 
 	function get_warnings() {
 
-		if( is_null( $this->warnings ) ) {
+		if (is_null($this->warnings)) {
 			$this->warnings = GravityView_Logging::get_errors();
 		}
 
@@ -35,7 +35,7 @@ 
 
 	function get_notices() {
 
-		if( is_null( $this->notices ) ) {
+		if (is_null($this->notices)) {
 			$this->notices = GravityView_Logging::get_notices();
 		}
 
@@ -51,8 +51,8 @@ 
 	 * @param boolean $visible {@internal Leave here for compatibility with the Debug_Bar_Panel parent class}
 	 * @return void
 	 */
-	function set_visible( $visible = false ) {
-		$this->_visible = ( count( $this->get_notices() ) || count( $this->get_warnings() ) );
+	function set_visible($visible = false) {
+		$this->_visible = (count($this->get_notices()) || count($this->get_warnings()));
 	}
 
 	/**
@@ -84,42 +84,42 @@ 
 		</style>
 		<div id='debug-bar-gravityview'>";
 
-		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />';
+		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE).'" class="alignright" alt="" width="100" height="132" />';
 
 
 		$warnings = $this->get_warnings();
 		$notices = $this->get_notices();
 
-		if(count($warnings)) {
+		if (count($warnings)) {
 			$output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>';
 			$output .= '<ol>';
-			foreach ( $warnings as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ($warnings as $key => $notice) {
+				if (empty($notice['message'])) { continue; }
+				$output .= '<li><a href="#'.sanitize_html_class('gv-warning-'.$key).'">'.strip_tags($notice['message']).'</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
-		if(count($notices)) {
+		if (count($notices)) {
 			$output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>';
 			$output .= '<ol>';
-			foreach ( $notices as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ($notices as $key => $notice) {
+				if (empty($notice['message'])) { continue; }
+				$output .= '<li><a href="#'.sanitize_html_class('gv-notice-'.$key).'">'.strip_tags($notice['message']).'</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
 
-		if ( count( $warnings ) ) {
+		if (count($warnings)) {
 			$output .= '<h3>Warnings</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-'  . $key ); }
+			foreach ($warnings as $key => $notice) { $output .= $this->render_item($notice, 'gv-warning-'.$key); }
 			$output .= '</ol>';
 		}
 
-		if ( count( $notices ) ) {
+		if (count($notices)) {
 			$output .= '<h3>Notices</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
+			foreach ($notices as $key => $notice) { $output .= $this->render_item($notice, 'gv-notice-'.$key); }
 			$output .= '</ol>';
 		}
 
@@ -134,12 +134,12 @@ 
 	 * @return string       Escaped HTML
 	 */
 	function esc_html_recursive($item) {
-		if(is_object($item)) {
-			foreach($item as $key => $value) {
+		if (is_object($item)) {
+			foreach ($item as $key => $value) {
 				$item->{$key} = $this->esc_html_recursive($value);
 			}
-		} else if(is_array($item)) {
-			foreach($item as $key => $value) {
+		} else if (is_array($item)) {
+			foreach ($item as $key => $value) {
 				$item[$key] = $this->esc_html_recursive($value);
 			}
 		} else {
@@ -155,31 +155,31 @@ 
 	 * @param  string $anchor The anchor ID for the item
 	 * @return string         HTML output
 	 */
-	function render_item( $notice, $anchor = '' ) {
+	function render_item($notice, $anchor = '') {
 
 		$output = '';
 
-		if(!empty($notice['message'])) {
-			$output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>';
+		if (!empty($notice['message'])) {
+			$output .= '<a id="'.sanitize_html_class($anchor).'"></a>';
 			$output .= "<li class='debug-bar-php-notice'>";
 		}
 
 		$output .= '<div class="clear"></div>';
 
 		// Title
-		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>';
+		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr($notice['message']).'</div>';
 
 		// Debugging Output
-		if( empty( $notice['data'] ) ) {
-			if( !is_null( $notice['data'] ) ) {
-				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>';
+		if (empty($notice['data'])) {
+			if (!is_null($notice['data'])) {
+				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview').'</em>';
 			}
 		}
 		else {
-			$output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) );
+			$output .= sprintf('<pre>%s</pre>', print_r($this->esc_html_recursive($notice['data']), true));
 		}
 
-		if(!empty($notice['message'])) {
+		if (!empty($notice['message'])) {
 			$output .= '</li>';
 		}
 

includes/class-admin-views.php

Indentation +16 added lines, -16 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * Renders all the metaboxes on Add New / Edit View post type.
- *
- * @package   GravityView
- * @license   GPL2+
- * @author    Katz Web Services, Inc.
- * @link      http://gravityview.co
- * @copyright Copyright 2014, Katz Web Services, Inc.
- *
- * @since 1.0.0
- */
+	 * Renders all the metaboxes on Add New / Edit View post type.
+	 *
+	 * @package   GravityView
+	 * @license   GPL2+
+	 * @author    Katz Web Services, Inc.
+	 * @link      http://gravityview.co
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
+	 *
+	 * @since 1.0.0
+	 */
 
 /** If this file is called directly, abort. */
 if ( ! defined( 'ABSPATH' ) ) {
@@ -1037,15 +1037,15 @@ 
 		GFForms::register_scripts();
 
 		$scripts = array(
-		    'sack',
-		    'gform_gravityforms',
-		    'gform_forms',
-		    'gform_form_admin',
-		    'jquery-ui-autocomplete'
+			'sack',
+			'gform_gravityforms',
+			'gform_forms',
+			'gform_form_admin',
+			'jquery-ui-autocomplete'
 		);
 
 		if ( wp_is_mobile() ) {
-				    $scripts[] = 'jquery-touch-punch';
+					$scripts[] = 'jquery-touch-punch';
 		}
 
 		foreach ($scripts as $script) {

Spacing +250 added lines, -250 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -22,40 +22,40 @@ 
 
 	function __construct() {
 
-		add_action( 'save_post', array( $this, 'save_postdata' ) );
+		add_action('save_post', array($this, 'save_postdata'));
 
 		// set the blacklist field types across the entire plugin
-		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
+		add_filter('gravityview_blacklist_field_types', array($this, 'default_field_blacklist'), 10, 2);
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter('gform_tooltips', array($this, 'tooltips'));
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action('admin_enqueue_scripts', array('GravityView_Admin_Views', 'add_scripts_and_styles'), 999);
+		add_filter('gform_noconflict_styles', array($this, 'register_no_conflict'));
+		add_filter('gform_noconflict_scripts', array($this, 'register_no_conflict'));
+		add_filter('gravityview_noconflict_styles', array($this, 'register_no_conflict'));
+		add_filter('gravityview_noconflict_scripts', array($this, 'register_no_conflict'));
+
+		add_action('gravityview_render_directory_active_areas', array($this, 'render_directory_active_areas'), 10, 4);
+		add_action('gravityview_render_widgets_active_areas', array($this, 'render_widgets_active_areas'), 10, 3);
+		add_action('gravityview_render_available_fields', array($this, 'render_available_fields'), 10, 2);
+		add_action('gravityview_render_available_widgets', array($this, 'render_available_widgets'));
+		add_action('gravityview_render_active_areas', array($this, 'render_active_areas'), 10, 5);
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter('manage_gravityview_posts_columns', array($this, 'add_post_type_columns'));
 
-		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
+		add_filter('gform_toolbar_menu', array('GravityView_Admin_Views', 'gform_toolbar_menu'), 10, 2);
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action('manage_gravityview_posts_custom_column', array($this, 'add_custom_column_content'), 10, 2);
 
-		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
+		add_action('restrict_manage_posts', array($this, 'add_view_dropdown'));
 
-		add_action( 'pre_get_posts', array( $this, 'filter_pre_get_posts_by_gravityview_form_id' ) );
+		add_action('pre_get_posts', array($this, 'filter_pre_get_posts_by_gravityview_form_id'));
 
 	}
 
@@ -63,42 +63,42 @@ 
 	 * @since 1.15
 	 * @param WP_Query $query
 	 */
-	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
+	public function filter_pre_get_posts_by_gravityview_form_id(&$query) {
 		global $pagenow;
 
-		if ( !is_admin() ) {
+		if (!is_admin()) {
 			return;
 		}
 
-		if( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
+		if ('edit.php' !== $pagenow || !rgget('gravityview_form_id') || !isset($query->query_vars['post_type'])) {
 			return;
 		}
 
-		if ( $query->query_vars[ 'post_type' ] == 'gravityview' ) {
-			$query->set( 'meta_query', array(
+		if ($query->query_vars['post_type'] == 'gravityview') {
+			$query->set('meta_query', array(
 				array(
 					'key' => '_gravityview_form_id',
-					'value' => rgget( 'gravityview_form_id' ),
+					'value' => rgget('gravityview_form_id'),
 				)
-			) );
+			));
 		}
 	}
 
 	function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ('gravityview' !== $current_screen->post_type) {
 			return;
 		}
 
 		$forms = gravityview_get_forms();
-		$current_form = rgget( 'gravityview_form_id' );
+		$current_form = rgget('gravityview_form_id');
 		// If there are no forms to select, show no forms.
-		if( !empty( $forms ) ) { ?>
+		if (!empty($forms)) { ?>
 			<select name="gravityview_form_id" id="gravityview_form_id">
-				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
-				<?php foreach( $forms as $form ) { ?>
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+				<option value="" <?php selected('', $current_form, true); ?>><?php esc_html_e('All forms', 'gravityview'); ?></option>
+				<?php foreach ($forms as $form) { ?>
+					<option value="<?php echo $form['id']; ?>" <?php selected($form['id'], $current_form, true); ?>><?php echo esc_html($form['title']); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -109,18 +109,18 @@ 
 	 * @deprecated since 1.2
 	 * Start using GravityView_Render_Settings::render_setting_row
 	 */
-	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
-		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+	public static function render_setting_row($key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s') {
+		_deprecated_function('GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row');
+		GravityView_Render_Settings::render_setting_row($key, $current_settings, $override_input, $name, $id);
 	}
 
 	/**
 	 * @deprecated since 1.2
 	 * Start using GravityView_Render_Settings::render_field_option
 	 */
-	public static function render_field_option( $name = '', $option, $curr_value = NULL ) {
-		_deprecated_function( 'GravityView_Admin_Views::render_field_option', '1.1.7', 'GravityView_Render_Settings::render_field_option' );
-		return GravityView_Render_Settings::render_field_option( $name, $option, $curr_value );
+	public static function render_field_option($name = '', $option, $curr_value = NULL) {
+		_deprecated_function('GravityView_Admin_Views::render_field_option', '1.1.7', 'GravityView_Render_Settings::render_field_option');
+		return GravityView_Render_Settings::render_field_option($name, $option, $curr_value);
 	}
 
 
@@ -130,31 +130,31 @@ 
 	 * @param  int $id         ID of the current Gravity form
 	 * @return array            Modified array
 	 */
-	static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
+	static function gform_toolbar_menu($menu_items = array(), $id = NULL) {
 
-		$connected_views = gravityview_get_connected_views( $id );
+		$connected_views = gravityview_get_connected_views($id);
 
-		if( empty( $connected_views ) ) {
+		if (empty($connected_views)) {
 			return $menu_items;
 		}
 
 		$sub_menu_items = array();
-		foreach ( (array)$connected_views as $view ) {
+		foreach ((array)$connected_views as $view) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if (!GVCommon::has_cap('edit_gravityview', $view->ID)) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty($view->post_title) ? sprintf(__('No Title (View #%d)', 'gravityview'), $view->ID) : $view->post_title;
 
 			$sub_menu_items[] = array(
-				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'label' => esc_attr($label),
+				'url' => admin_url('post.php?action=edit&post='.$view->ID),
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ($sub_menu_items) {
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
 			$sub_menu_items[] = array(
@@ -165,16 +165,16 @@ 
 			);
 
 			$menu_items['gravityview'] = array(
-				'label'          => __( 'Connected Views', 'gravityview' ),
+				'label'          => __('Connected Views', 'gravityview'),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
-				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
+				'title'          => __('GravityView Views using this form as a data source', 'gravityview'),
 				'url'            => '#',
 				'onclick'        => 'return false;',
 				'menu_class'     => 'gv_connected_forms gf_form_toolbar_settings',
-				'link_class'     => ( 1 === 1 ? '' : 'gf_toolbar_disabled' ),
+				'link_class'     => (1 === 1 ? '' : 'gf_toolbar_disabled'),
 				'sub_menu_items' => $sub_menu_items,
 				'priority'       => 0,
-				'capabilities'   => array( 'edit_gravityviews' ),
+				'capabilities'   => array('edit_gravityviews'),
 			);
 		}
 
@@ -189,16 +189,16 @@ 
 	 * @access public
 	 * @return array Default blacklist fields merged with existing blacklist fields
 	 */
-	function default_field_blacklist( $array = array(), $context = NULL ) {
+	function default_field_blacklist($array = array(), $context = NULL) {
 
-		$add = array( 'captcha', 'page' );
+		$add = array('captcha', 'page');
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
+		if ($context === 'edit') {
 			$add[] = 'post_id';
 		}
 
-		$return = array_merge( $array, $add );
+		$return = array_merge($array, $add);
 
 		return $return;
 	}
@@ -208,33 +208,33 @@ 
 	 * @param  array       $tooltips Array of Gravity Forms tooltips
 	 * @return array                Modified tooltips array
 	 */
-	public function tooltips( $tooltips = array() ) {
+	public function tooltips($tooltips = array()) {
 
 		$gv_tooltips = array();
 
 		// Generate tooltips for View settings
-		$default_args = GravityView_View_Data::get_default_args( true );
+		$default_args = GravityView_View_Data::get_default_args(true);
 
-		foreach ( $default_args as $key => $arg ) {
+		foreach ($default_args as $key => $arg) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if (isset($arg['tooltip']) && empty($arg['tooltip'])) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty($arg['tooltip']) ? NULL : $arg['tooltip'];
 
 			// Otherwise, use the description as a tooltip.
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
+			if (empty($tooltip) && !empty($arg['desc'])) {
 				$tooltip = $arg['desc'];
 			}
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if (empty($tooltip)) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
+			$gv_tooltips['gv_'.$key] = array(
 				'title'	=> $arg['label'],
 				'value'	=> $tooltip,
 			);
@@ -243,20 +243,20 @@ 
 
 		$gv_tooltips['gv_css_merge_tags'] = array(
 			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+			'value' => sprintf(__('Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>')
 		);
 
 		/**
 		 * @filter `gravityview_tooltips` The tooltips GravityView adds to the Gravity Forms tooltip array
 		 * @param array $gv_tooltips Associative array with unique keys containing array of `title` and `value` keys, as expected by `gform_tooltips` filter
 		 */
-		$gv_tooltips = apply_filters( 'gravityview_tooltips', $gv_tooltips );
+		$gv_tooltips = apply_filters('gravityview_tooltips', $gv_tooltips);
 
-		foreach ( $gv_tooltips as $key => $tooltip ) {
+		foreach ($gv_tooltips as $key => $tooltip) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty($tooltip['title']) ? '' : '<h6>'.esc_html($tooltip['title']).'</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[$key] = $title.wpautop(esc_html($tooltip['value']));
 		}
 
 		return $tooltips;
@@ -270,27 +270,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
+	public function add_custom_column_content($column_name = NULL, $post_id) {
 
 		$output = '';
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'gv_template':
 
-				$template_id = gravityview_get_template_id( $post_id );
+				$template_id = gravityview_get_template_id($post_id);
 
 				// All Views should have a connected form. If it doesn't, that's not right.
-				if ( empty( $template_id ) ) {
-					do_action( 'gravityview_log_error', sprintf( __METHOD__ . ' View ID %s does not have a connected template.', $post_id ) );
+				if (empty($template_id)) {
+					do_action('gravityview_log_error', sprintf(__METHOD__.' View ID %s does not have a connected template.', $post_id));
 					break;
 				}
 
 				$templates = gravityview_get_registered_templates();
 
-				$template = isset( $templates[ $template_id ] ) ? $templates[ $template_id ] : false;
+				$template = isset($templates[$template_id]) ? $templates[$template_id] : false;
 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
-				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
+				$template_id_pretty = ucwords(implode(' ', explode('_', $template_id)));
 
 				$output = $template ? $template['label'] : $template_id_pretty;
 
@@ -298,24 +298,24 @@ 
 
 			case 'gv_connected_form':
 
-				$form_id = gravityview_get_form_id( $post_id );
+				$form_id = gravityview_get_form_id($post_id);
 
 				// All Views should have a connected form. If it doesn't, that's not right.
-				if ( empty( $form_id ) ) {
-					do_action( 'gravityview_log_error', sprintf( '[add_data_source_column_content] View ID %s does not have a connected GF form.', $post_id ) );
-					$output = __( 'Not connected.', 'gravityview' );
+				if (empty($form_id)) {
+					do_action('gravityview_log_error', sprintf('[add_data_source_column_content] View ID %s does not have a connected GF form.', $post_id));
+					$output = __('Not connected.', 'gravityview');
 					break;
 				}
 
-				$form = gravityview_get_form( $form_id );
+				$form = gravityview_get_form($form_id);
 
-				if ( ! $form ) {
-					do_action( 'gravityview_log_error', sprintf( '[add_data_source_column_content] Connected form not found: Form #%d', $form_id ) );
+				if (!$form) {
+					do_action('gravityview_log_error', sprintf('[add_data_source_column_content] Connected form not found: Form #%d', $form_id));
 
-					$output = __( 'The connected form can not be found; it may no longer exist.', 'gravityview' );
+					$output = __('The connected form can not be found; it may no longer exist.', 'gravityview');
 				}
 
-				$output = self::get_connected_form_links( $form );
+				$output = self::get_connected_form_links($form);
 
 				break;
 		}
@@ -330,47 +330,47 @@ 
 	 * @param  boolean $include_form_link Whether to include the bold name of the form in the output
 	 * @return string          HTML links
 	 */
-	static public function get_connected_form_links( $form, $include_form_link = true ) {
+	static public function get_connected_form_links($form, $include_form_link = true) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if (empty($form)) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
-			$form = gravityview_get_form( $form );
+		if (!is_array($form)) {
+			$form = gravityview_get_form($form);
 		}
 
 		$form_id = $form['id'];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
-			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+		if (GVCommon::has_cap('gravityforms_edit_forms')) {
+			$form_url = admin_url(sprintf('admin.php?page=gf_edit_forms&amp;id=%d', $form_id));
+			$form_link = '<strong class="gv-form-title">'.gravityview_get_link($form_url, $form['title'], 'class=row-title').'</strong>';
+			$links[] = '<span>'.gravityview_get_link($form_url, __('Edit Form', 'gravityview')).'</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">'.esc_html($form['title']).'</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
-			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+		if (GVCommon::has_cap('gravityforms_view_entries')) {
+			$entries_url = admin_url(sprintf('admin.php?page=gf_entries&amp;id=%d', $form_id));
+			$links[] = '<span>'.gravityview_get_link($entries_url, __('Entries', 'gravityview')).'</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
-			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+		if (GVCommon::has_cap(array('gravityforms_edit_settings', 'gravityview_view_settings'))) {
+			$settings_url = admin_url(sprintf('admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id));
+			$links[] = '<span>'.gravityview_get_link($settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview')).'</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
-			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+		if (GVCommon::has_cap(array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms"))) {
+			$preview_url = site_url(sprintf('?gf_page=preview&amp;id=%d', $form_id));
+			$links[] = '<span>'.gravityview_get_link($preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview')).'</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if (!empty($include_form_link)) {
 			$output .= $form_link;
 		}
 
@@ -380,9 +380,9 @@ 
 		 * @param array $links Links to show
 		 * @param array $form Gravity Forms form array
 		 */
-		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
+		$links = apply_filters('gravityview_connected_form_links', $links, $form);
 
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="row-actions">'.implode(' | ', $links).'</div>';
 
 		return $output;
 	}
@@ -391,13 +391,13 @@ 
 	 * Add the Data Source column to the Views page
 	 * @param  array      $columns Columns array
 	 */
-	public function add_post_type_columns( $columns ) {
+	public function add_post_type_columns($columns) {
 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
 		$date = $columns['date'];
-		unset( $columns['date'] );
+		unset($columns['date']);
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -408,11 +408,11 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if (GVCommon::has_cap($data_source_required_caps)) {
+			$columns['gv_connected_form'] = __('Data Source', 'gravityview');
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns['gv_template'] = _x('Template', 'Column title that shows what template is being used for Views', 'gravityview');
 
 		// Add the date back in.
 		$columns['date'] = $date;
@@ -427,91 +427,91 @@ 
 	 * @param int $post_id Currently saved Post ID
 	 * @return void
 	 */
-	function save_postdata( $post_id ) {
+	function save_postdata($post_id) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if (!isset($_POST['post_type']) || 'gravityview' != $_POST['post_type']) {
 			return;
 		}
 
 		// validate user can edit and save View
-		if ( ! GVCommon::has_cap( 'edit_gravityview', $post_id ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to edit View #' . $post_id, wp_get_current_user() );
+		if (!GVCommon::has_cap('edit_gravityview', $post_id)) {
+			do_action('gravityview_log_error', __METHOD__.' - Current user does not have the capability to edit View #'.$post_id, wp_get_current_user());
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', '[save_postdata] Saving View post type.', $_POST );
+		do_action('gravityview_log_debug', '[save_postdata] Saving View post type.', $_POST);
 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if (isset($_POST['gravityview_select_form_nonce']) && wp_verify_nonce($_POST['gravityview_select_form_nonce'], 'gravityview_select_form')) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = !empty($_POST['gravityview_form_id']) ? $_POST['gravityview_form_id'] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii['form_id'] = update_post_meta($post_id, '_gravityview_form_id', $form_id);
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
+		if (false === GVCommon::has_cap('gravityforms_create_form') && empty($statii['form_id'])) {
+			do_action('gravityview_log_error', __METHOD__.' - Current user does not have the capability to create a new Form.', wp_get_current_user());
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if (!empty($_POST['gravityview_form_id_start_fresh'])) {
+			$statii['start_fresh'] = add_post_meta($post_id, '_gravityview_start_fresh', 1);
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii['start_fresh'] = delete_post_meta($post_id, '_gravityview_start_fresh');
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if (isset($_POST['gravityview_select_template_nonce']) && wp_verify_nonce($_POST['gravityview_select_template_nonce'], 'gravityview_select_template')) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = !empty($_POST['gravityview_directory_template']) ? $_POST['gravityview_directory_template'] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii['directory_template'] = update_post_meta($post_id, '_gravityview_directory_template', $template_id);
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if (isset($_POST['gravityview_view_configuration_nonce']) && wp_verify_nonce($_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration')) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
+			if (empty($_POST['template_settings'])) {
 				$_POST['template_settings'] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii['template_settings'] = update_post_meta($post_id, '_gravityview_template_settings', $_POST['template_settings']);
 
 			$fields = array();
 
 			// Directory&single Visible Fields
-			if( !empty( $preset_fields ) ) {
+			if (!empty($preset_fields)) {
 
 				$fields = $preset_fields;
 
-			} elseif( !empty( $_POST['fields'] ) ) {
+			} elseif (!empty($_POST['fields'])) {
 
-				if( !is_array( $_POST['fields'] ) ) {
+				if (!is_array($_POST['fields'])) {
 
 					// Fields are passed as a jQuery-serialized array, created in admin-views.js in the serializeForm method
 					// Not using parse_str due to max_input_vars limitation
 					$fields_holder = array();
-					GVCommon::gv_parse_str( $_POST['fields'], $fields_holder );
+					GVCommon::gv_parse_str($_POST['fields'], $fields_holder);
 
-					if( isset( $fields_holder['fields'] ) ) {
+					if (isset($fields_holder['fields'])) {
 
 						// When parsed, there's a m
 						$fields = $fields_holder['fields'];
 
 					} else {
 
-						do_action('gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
+						do_action('gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder);
 
 					}
 
@@ -522,24 +522,24 @@ 
 				}
 			}
 
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+			$statii['directory_fields'] = update_post_meta($post_id, '_gravityview_directory_fields', $fields);
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
+			if (empty($_POST['widgets'])) {
 				$_POST['widgets'] = array();
 			}
-			$statii['directory_widgets'] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST['widgets'] );
+			$statii['directory_widgets'] = update_post_meta($post_id, '_gravityview_directory_widgets', $_POST['widgets']);
 
 		} // end save view configuration
 
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
+		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map('intval', $statii));
 	}
 
 	/**
 	 * @deprecated 1.1.6
 	 */
 	function render_label() {
-		_deprecated_function( 'GravityView_Admin_Views::render_label()', '1.1.6', 'Use the GravityView_Admin_View_Field class instead.' );
+		_deprecated_function('GravityView_Admin_Views::render_label()', '1.1.6', 'Use the GravityView_Admin_View_Field class instead.');
 	}
 
 	/**
@@ -551,33 +551,33 @@ 
 	 * @param string $context (default: 'single')
 	 * @return void
 	 */
-	function render_available_fields( $form = 0, $context = 'single' ) {
+	function render_available_fields($form = 0, $context = 'single') {
 
 		/**
 		 * @filter  `gravityview_blacklist_field_types` Modify the types of fields that shouldn't be shown in a View.
 		 * @param[in,out] array $blacklist_field_types Array of field types to block for this context.
 		 * @param[in] string $context View context ('single', 'directory', or 'edit')
 		 */
-		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array(), $context );
+		$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', array(), $context);
 
-		$fields = $this->get_available_fields( $form, $context );
+		$fields = $this->get_available_fields($form, $context);
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if (!empty($fields)) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ($fields as $id => $details) {
 
-				if( in_array( $details['type'], $blacklist_field_types ) ) {
+				if (in_array($details['type'], $blacklist_field_types)) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
+				if ($context === 'edit' && !empty($details['parent'])) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
+				$output .= new GravityView_Admin_View_Field($details['label'], $id, $details);
 
 			} // End foreach
 		}
@@ -585,11 +585,11 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ($context === 'edit') {
 			return;
 		}
 
-		$this->render_additional_fields( $form, $context );
+		$this->render_additional_fields($form, $context);
 	}
 
 	/**
@@ -600,15 +600,15 @@ 
 	 * @param string $context (default: 'single')
 	 * @return void
 	 */
-	public function render_additional_fields( $form = 0, $context = 'single' ) {
+	public function render_additional_fields($form = 0, $context = 'single') {
 
 		/**
 		 * @filter `gravityview_additional_fields` non-standard Fields to show at the bottom of the field picker
 		 * @param array $additional_fields Associative array of field arrays, with `label_text`, `desc`, `field_id`, `label_type`, `input_type`, `field_options`, and `settings_html` keys
 		 */
-		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
+		$additional_fields = apply_filters('gravityview_additional_fields', array(
 			array(
-				'label_text' => __( '+ Add All Fields', 'gravityview' ),
+				'label_text' => __('+ Add All Fields', 'gravityview'),
 				'desc' => __('Add all the available fields at once.', 'gravityview'),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
@@ -618,11 +618,11 @@ 
 			)
 		));
 
-		if( !empty( $additional_fields )) {
-			foreach ( (array)$additional_fields as $item ) {
+		if (!empty($additional_fields)) {
+			foreach ((array)$additional_fields as $item) {
 
 				// Prevent items from not having index set
-				$item = wp_parse_args( $item, array(
+				$item = wp_parse_args($item, array(
 					'label_text' => NULL,
 					'field_id' => NULL,
 					'label_type' => NULL,
@@ -632,13 +632,13 @@ 
 				));
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if (!empty($item['field_options'])) {
 					// Use settings_html from now on.
 					$item['settings_html'] = $item['field_options'];
 				}
 
 				// Render a label for each of them
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
+				echo new GravityView_Admin_View_Field($item['label_text'], $item['field_id'], $item);
 
 			}
 		}
@@ -655,7 +655,7 @@ 
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if (in_array($zone, array('directory', 'single'))) {
 
 			$entry_default_fields = array(
 				'id' => array(
@@ -704,7 +704,7 @@ 
 			);
 
 
-			if( 'single' !== $zone) {
+			if ('single' !== $zone) {
 
 				$entry_default_fields['entry_link'] = array(
 					'label' => __('Link to Entry', 'gravityview'),
@@ -722,7 +722,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters('gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
 	}
 
 	/**
@@ -731,25 +731,25 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array         fields
 	 */
-	function get_available_fields( $form = '', $zone = NULL ) {
+	function get_available_fields($form = '', $zone = NULL) {
 
-		if( empty( $form ) ) {
-			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
+		if (empty($form)) {
+			do_action('gravityview_log_error', '[get_available_fields] $form is empty');
 			return array();
 		}
 
 		// get form fields
-		$fields = gravityview_get_form_fields( $form, true );
+		$fields = gravityview_get_form_fields($form, true);
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
-			$meta_fields = gravityview_get_entry_meta( $form );
+		if (!is_array($form)) {
+			$meta_fields = gravityview_get_entry_meta($form);
 		} else {
 			$meta_fields = array();
 		}
 
 		// get default fields
-		$default_fields = $this->get_entry_default_fields( $form, $zone );
+		$default_fields = $this->get_entry_default_fields($form, $zone);
 
 		//merge without loosing the keys
 		$fields = $fields + $meta_fields + $default_fields;
@@ -766,11 +766,11 @@ 
 
 		$widgets = $this->get_registered_widgets();
 
-		if( !empty( $widgets ) ) {
+		if (!empty($widgets)) {
 
-			foreach( $widgets as $id => $details ) {
+			foreach ($widgets as $id => $details) {
 
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+				echo new GravityView_Admin_View_Widget($details['label'], $id, $details);
 
 			}
 		}
@@ -787,7 +787,7 @@ 
 		 * @filter `gravityview_register_directory_widgets` Get the list of registered widgets. Each item is used to instantiate a GravityView_Admin_View_Widget object
 		 * @param array $registered_widgets Empty array
 		 */
-		$registered_widgets = apply_filters( 'gravityview_register_directory_widgets', array() );
+		$registered_widgets = apply_filters('gravityview_register_directory_widgets', array());
 
 		return $registered_widgets;
 	}
@@ -801,67 +801,67 @@ 
 	 * @param  array $values  Saved objects
 	 * @return void
 	 */
-	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
+	function render_active_areas($template_id, $type, $zone, $rows, $values) {
 		global $post;
 
-		if( $type === 'widget' ) {
-			$button_label = __( 'Add Widget', 'gravityview' );
+		if ($type === 'widget') {
+			$button_label = __('Add Widget', 'gravityview');
 		} else {
-			$button_label = __( 'Add Field', 'gravityview' );
+			$button_label = __('Add Field', 'gravityview');
 		}
 
 		$available_items = array();
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if (!empty($values) && (!empty($post->ID) || !empty($_POST['template_id']))) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if (!empty($_POST['template_id'])) {
+				$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
 			} else {
-				$form = gravityview_get_form_id( $post->ID );
+				$form = gravityview_get_form_id($post->ID);
 			}
 
-			if( 'field' === $type ) {
-				$available_items = $this->get_available_fields( $form, $zone );
+			if ('field' === $type) {
+				$available_items = $this->get_available_fields($form, $zone);
 			} else {
 				$available_items = $this->get_registered_widgets();
 			}
 
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
+		foreach ($rows as $row) :
+			foreach ($row as $col => $areas) :
 				$column = ($col == '2-2') ? '1-2' : $col; ?>
 
-				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
+				<div class="gv-grid-col-<?php echo esc_attr($column); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ($areas as $area) : 	?>
 
 						<div class="gv-droppable-area">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
+							<div class="active-drop active-drop-<?php echo esc_attr($type); ?>" data-areaid="<?php echo esc_attr($zone.'_'.$area['areaid']); ?>">
 
 								<?php // render saved fields
 
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+								if (!empty($values[$zone.'_'.$area['areaid']])) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ($values[$zone.'_'.$area['areaid']] as $uniqid => $field) {
 
 										$input_type = NULL;
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+										$original_item = isset($available_items[$field['id']]) ? $available_items[$field['id']] : false;
 
-										if( !$original_item ) {
+										if (!$original_item) {
 
-											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field ));
+											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field));
 
 											$original_item = $field;
 										} else {
 
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset($original_item['type']) ? $original_item['type'] : NULL;
 
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options($type, $template_id, $field['id'], $original_item['label'], $zone.'_'.$area['areaid'], $input_type, $uniqid, $field, $zone, $original_item);
 
 										$item = array(
 											'input_type' => $input_type,
@@ -870,16 +870,16 @@ 
 										);
 
 										// Merge the values with the current item to pass things like widget descriptions and original field names
-										if( $original_item ) {
-											$item = wp_parse_args( $item, $original_item );
+										if ($original_item) {
+											$item = wp_parse_args($item, $original_item);
 										}
 
-										switch( $type ) {
+										switch ($type) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget($item['label'], $field['id'], $item, $field);
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Field($item['label'], $field['id'], $item, $field);
 										}
 
 
@@ -889,11 +889,11 @@ 
 
 								} // End if zone is not empty ?>
 
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
+								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type); ?></span>
 							</div>
 							<div class="gv-droppable-area-action">
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr($type); ?>" data-areaid="<?php echo esc_attr($zone.'_'.$area['areaid']); ?>" data-context="<?php echo esc_attr($zone); ?>"><?php echo '+ '.esc_html($button_label); ?></a>
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html($area['title']); ?></strong><?php if (!empty($area['subtitle'])) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html($area['subtitle']); ?></span><?php } ?></p>
 							</div>
 						</div>
 
@@ -910,13 +910,13 @@ 
 	 * @param  string $post_id Current Post ID (view)
 	 * @return string          html
 	 */
-	function render_widgets_active_areas( $template_id = '', $zone, $post_id = '' ) {
+	function render_widgets_active_areas($template_id = '', $zone, $post_id = '') {
 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		$widgets = array();
-		if( !empty( $post_id ) ) {
-			$widgets = get_post_meta( $post_id, '_gravityview_directory_widgets', true );
+		if (!empty($post_id)) {
+			$widgets = get_post_meta($post_id, '_gravityview_directory_widgets', true);
 
 		}
 
@@ -924,7 +924,7 @@ 
 		?>
 
 		<div class="gv-grid gv-grid-pad gv-grid-border" id="directory-<?php echo $zone; ?>-widgets">
-			<?php $this->render_active_areas( $template_id, 'widget', $zone, $default_widget_areas, $widgets ); ?>
+			<?php $this->render_active_areas($template_id, 'widget', $zone, $default_widget_areas, $widgets); ?>
 		</div>
 
 		<?php
@@ -944,36 +944,36 @@ 
 	 * @param string $context (default: 'single')
 	 * @return string HTML of the active areas
 	 */
-	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
+	function render_directory_active_areas($template_id = '', $context = 'single', $post_id = '', $echo = false) {
 
-		if( empty( $template_id ) ) {
-			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
+		if (empty($template_id)) {
+			do_action('gravityview_log_debug', '[render_directory_active_areas] $template_id is empty');
 			return;
 		}
 
-		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
+		$template_areas = apply_filters('gravityview_template_active_areas', array(), $template_id, $context);
 
-		if( empty( $template_areas ) ) {
+		if (empty($template_areas)) {
 
-			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
+			do_action('gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id);
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'.sprintf(esc_html__('This View is configured using the %s View type, which is disabled.', 'gravityview'), '<em>'.$template_id.'</em>').'</h2>';
 			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
 			$output .= '</div>';
 		} else {
 
 			$fields = '';
-			if ( ! empty( $post_id ) ) {
-				$fields = gravityview_get_directory_fields( $post_id );
+			if (!empty($post_id)) {
+				$fields = gravityview_get_directory_fields($post_id);
 			}
 
 			ob_start();
-			$this->render_active_areas( $template_id, 'field', $context, $template_areas, $fields );
+			$this->render_active_areas($template_id, 'field', $context, $template_areas, $fields);
 			$output = ob_get_clean();
 
 		}
 
-		if( $echo ) {
+		if ($echo) {
 			echo $output;
 		}
 
@@ -987,46 +987,46 @@ 
 	 * @param mixed $hook
 	 * @return void
 	 */
-	static function add_scripts_and_styles( $hook ) {
+	static function add_scripts_and_styles($hook) {
 		global $plugin_page, $pagenow;
 
-		$is_widgets_page = ( $pagenow === 'widgets.php' );
+		$is_widgets_page = ($pagenow === 'widgets.php');
 
 		// Add the GV font (with the Astronaut)
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style('gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version);
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script('gravityview-jquery-cookie', plugins_url('includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE), array('jquery'), GravityView_Plugin::version, true);
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( !gravityview_is_admin_page($hook) && !$is_widgets_page ) { return; }
+		if (!gravityview_is_admin_page($hook) && !$is_widgets_page) { return; }
 
 		// Only enqueue the following on single pages
-		if( gravityview_is_admin_page($hook, 'single') || $is_widgets_page ) {
+		if (gravityview_is_admin_page($hook, 'single') || $is_widgets_page) {
 
-			wp_enqueue_script( 'jquery-ui-datepicker' );
-			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
+			wp_enqueue_script('jquery-ui-datepicker');
+			wp_enqueue_style('gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version);
 
 			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 			//enqueue scripts
-			wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
+			wp_enqueue_script('gravityview_views_scripts', plugins_url('assets/js/admin-views'.$script_debug.'.js', GRAVITYVIEW_FILE), array('jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore'), GravityView_Plugin::version);
 
 			wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
 				'cookiepath' => COOKIEPATH,
-				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
-				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
-				'label_close' => __( 'Close', 'gravityview' ),
-				'label_cancel' => __( 'Cancel', 'gravityview' ),
-				'label_continue' => __( 'Continue', 'gravityview' ),
-				'label_ok' => __( 'Ok', 'gravityview' ),
-				'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
-				'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
-				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
-				'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
+				'nonce' => wp_create_nonce('gravityview_ajaxviews'),
+				'label_viewname' => __('Enter View name here', 'gravityview'),
+				'label_close' => __('Close', 'gravityview'),
+				'label_cancel' => __('Cancel', 'gravityview'),
+				'label_continue' => __('Continue', 'gravityview'),
+				'label_ok' => __('Ok', 'gravityview'),
+				'label_publisherror' => __('Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview'),
+				'loading_text' => esc_html__('Loading&hellip;', 'gravityview'),
+				'loading_error' => esc_html__('There was an error loading dynamic content.', 'gravityview'),
+				'field_loaderror' => __('Error while adding the field. Please try again or contact GravityView support.', 'gravityview'),
+				'remove_all_fields' => __('Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview'),
 			));
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
+			wp_enqueue_style('gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons', 'wp-jquery-ui-dialog'), GravityView_Plugin::version);
 
 			self::enqueue_gravity_forms_scripts();
 
@@ -1044,26 +1044,26 @@ 
 		    'jquery-ui-autocomplete'
 		);
 
-		if ( wp_is_mobile() ) {
+		if (wp_is_mobile()) {
 				    $scripts[] = 'jquery-touch-punch';
 		}
 
 		foreach ($scripts as $script) {
-			wp_enqueue_script( $script );
+			wp_enqueue_script($script);
 		}
 	}
 
-	function register_no_conflict( $registered ) {
+	function register_no_conflict($registered) {
 
 		$filter = current_filter();
 
-		if( preg_match('/script/ism', $filter ) ) {
-			$allow_scripts = array( 'jquery-ui-core', 'jquery-ui-dialog', 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'gravityview_views_scripts', 'gravityview-support', 'gravityview-jquery-cookie', 'gravityview_views_datepicker',
-			'sack', 'gform_gravityforms', 'gform_forms', 'gform_form_admin', 'jquery-ui-autocomplete' );
-			$registered = array_merge( $registered, $allow_scripts );
-		} elseif( preg_match('/style/ism', $filter ) ) {
-			$allow_styles = array( 'dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker' );
-			$registered = array_merge( $registered, $allow_styles );
+		if (preg_match('/script/ism', $filter)) {
+			$allow_scripts = array('jquery-ui-core', 'jquery-ui-dialog', 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'gravityview_views_scripts', 'gravityview-support', 'gravityview-jquery-cookie', 'gravityview_views_datepicker',
+			'sack', 'gform_gravityforms', 'gform_forms', 'gform_form_admin', 'jquery-ui-autocomplete');
+			$registered = array_merge($registered, $allow_scripts);
+		} elseif (preg_match('/style/ism', $filter)) {
+			$allow_styles = array('dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker');
+			$registered = array_merge($registered, $allow_styles);
 		}
 
 		return $registered;