gravityview / GravityView

includes/class-admin-label.php

Spacing +36 added lines, -36 removed lines

@@ -11,29 +11,29 @@ 
 		$field_info_items = array();
 
 		// Fields with IDs, not like Source URL or Entry ID
-		if( is_numeric( $this->id ) ) {
+		if (is_numeric($this->id)) {
 
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
+			$field_type_title = GFCommon::get_field_type_title($this->item['input_type']);
 
 			$field_info_items[] = array(
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title )
+				'value' => sprintf(__('Type: %s', 'gravityview'), $field_type_title)
 			);
 
 			$field_info_items[] = array(
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
+				'value' => sprintf(__('Field ID: %s', 'gravityview'), $this->id),
 			);
 
 		}
 
-		if( !empty( $this->item['desc'] ) ) {
+		if (!empty($this->item['desc'])) {
 			$field_info_items[] = array(
 				'value' => $this->item['desc']
 			);
 		}
 
-		if( !empty( $this->item['adminLabel'] ) ) {
+		if (!empty($this->item['adminLabel'])) {
 			$field_info_items[] = array(
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
+				'value' => sprintf(__('Admin Label: %s', 'gravityview'), $this->item['adminLabel']),
 				'class'	=> 'gv-sublabel'
 			);
 		}
@@ -52,7 +52,7 @@ 
 		$field_info = '';
 		$field_info_items = array();
 
-		if( !empty( $this->item['description'] ) ) {
+		if (!empty($this->item['description'])) {
 
 			$field_info_items[] = array(
 				'value' => $this->item['description']
@@ -77,16 +77,16 @@ 
 	private   $label_type;
 	protected $item;
 
-	function __construct( $title = '', $field_id, $item = array(), $settings = array() ) {
+	function __construct($title = '', $field_id, $item = array(), $settings = array()) {
 
 		// Backward compat
-		if( !empty( $item['type'] ) ) {
+		if (!empty($item['type'])) {
 			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+			unset($item['type']);
 		}
 
 		// Prevent items from not having index set
-		$item = wp_parse_args( $item, array(
+		$item = wp_parse_args($item, array(
 			'label_text' => $title,
 			'field_id' => NULL,
 			'parent_label' => NULL,
@@ -129,7 +129,7 @@ 
 	 * @param  boolean $html Display HTML output? If yes, output is wrapped in spans. If no, plaintext.
 	 * @return string|null        If empty, return null. Otherwise, return output HTML/text.
 	 */
-	protected function get_item_info( $html = true ) {
+	protected function get_item_info($html = true) {
 
 		$output = NULL;
 		$field_info_items = $this->additional_info();
@@ -139,27 +139,27 @@ 
 		 * @param array $field_info_items Additional information to display in a field
 		 * @param GravityView_Admin_View_Field $this Field shown in the admin
 		 */
-		$field_info_items = apply_filters( 'gravityview_admin_label_item_info', $field_info_items, $this );
+		$field_info_items = apply_filters('gravityview_admin_label_item_info', $field_info_items, $this);
 
-		if( $html ) {
+		if ($html) {
 
-			foreach ( $field_info_items as $item ) {
-				$class = isset($item['class']) ? sanitize_html_class( $item['class'] ).' description' : 'description';
+			foreach ($field_info_items as $item) {
+				$class = isset($item['class']) ? sanitize_html_class($item['class']).' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="'.$class.'">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html($item['value']);
 				$output .= '</span>';
 			}
 
 		} else {
 
-			$values = wp_list_pluck( $field_info_items, 'value' );
+			$values = wp_list_pluck($field_info_items, 'value');
 
-			$output = esc_html( implode(', ', $values) );
+			$output = esc_html(implode(', ', $values));
 
 		}
 
-		return empty( $output ) ? NULL : $output;
+		return empty($output) ? NULL : $output;
 
 	}
 
@@ -176,47 +176,47 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->') > 0 ) ? 'hide-if-js' : '';
-		$settings_link = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
+		$hide_settings_link = (empty($this->item['settings_html']) || strpos($this->item['settings_html'], '<!-- No Options -->') > 0) ? 'hide-if-js' : '';
+		$settings_link = sprintf('<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr($settings_title));
 
 		// Should we show the icon that the field is being used as a link to single entry?
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
-		$show_as_link = '<span class="dashicons dashicons-admin-links '.$hide_show_as_link_class.'" title="'.esc_attr( $single_link_title ).'"></span>';
+		$hide_show_as_link_class = empty($this->settings['show_as_link']) ? 'hide-if-js' : '';
+		$show_as_link = '<span class="dashicons dashicons-admin-links '.$hide_show_as_link_class.'" title="'.esc_attr($single_link_title).'"></span>';
 
 		// When a field label is empty, use the Field ID
-		$label = empty( $this->title ) ? sprintf( _x('Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview'), $this->id ) : $this->title;
+		$label = empty($this->title) ? sprintf(_x('Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview'), $this->id) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if( !empty( $this->settings['custom_label'] ) && !empty( $this->settings['show_label'] ) ) {
+		if (!empty($this->settings['custom_label']) && !empty($this->settings['show_label'])) {
 			$label = $this->settings['custom_label'];
-		} else if( !empty( $this->item['customLabel'] ) ) {
+		} else if (!empty($this->item['customLabel'])) {
 			$label = $this->item['customLabel'];
 		}
 
 		$output = '<h5 class="selectable gfield field-id-'.esc_attr($this->id).'">';
 
-		$label = esc_attr( $label );
+		$label = esc_attr($label);
 
-		if( !empty( $this->item['parent'] ) ) {
-			$label .= ' <small>('.esc_attr( $this->item['parent']['label'] ) .')</small>';
+		if (!empty($this->item['parent'])) {
+			$label .= ' <small>('.esc_attr($this->item['parent']['label']).')</small>';
 		}
 
 		// Name of field / widget
-		$output .= '<span class="gv-field-label" data-original-title="'.esc_attr( $label ).'" title="'. $this->get_item_info( false ) .'">'. $label . '</span>';
+		$output .= '<span class="gv-field-label" data-original-title="'.esc_attr($label).'" title="'.$this->get_item_info(false).'">'.$label.'</span>';
 
 
-		$output .= '<span class="gv-field-controls">'.$settings_link.$show_as_link.'<a href="#remove" class="dashicons-dismiss dashicons" title="'.esc_attr( $delete_title ) .'"></a></span>';
+		$output .= '<span class="gv-field-controls">'.$settings_link.$show_as_link.'<a href="#remove" class="dashicons-dismiss dashicons" title="'.esc_attr($delete_title).'"></a></span>';
 
 		// Displays only in the field/widget picker.
-		if( $field_info = $this->get_item_info() ) {
+		if ($field_info = $this->get_item_info()) {
 			$output .= '<span class="gv-field-info">'.$field_info.'</span>';
 		}
 
 		$output .= '</h5>';
 
-		$container_class = !empty( $this->item['parent'] ) ? ' gv-child-field' : '';
+		$container_class = !empty($this->item['parent']) ? ' gv-child-field' : '';
 
-		$output = '<div data-fieldid="'.esc_attr($this->id).'" data-inputtype="'.esc_attr( $this->item['input_type'] ).'" class="gv-fields'.$container_class.'">'.$output.$this->item['settings_html'].'</div>';
+		$output = '<div data-fieldid="'.esc_attr($this->id).'" data-inputtype="'.esc_attr($this->item['input_type']).'" class="gv-fields'.$container_class.'">'.$output.$this->item['settings_html'].'</div>';
 
 		return $output;
 	}

includes/class-admin-views.php

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 = '', $context = 'single' ) {
+	function render_available_fields($form = '', $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,22 +585,22 @@ 
 		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);
 	}
 
-	function render_additional_fields( $form, $context ) {
+	function render_additional_fields($form, $context) {
 
 		/**
 		 * @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',
@@ -610,11 +610,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,
@@ -624,13 +624,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);
 
 			}
 		}
@@ -647,7 +647,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(
@@ -696,7 +696,7 @@ 
 	        );
 
 
-			if( 'single' !== $zone) {
+			if ('single' !== $zone) {
 
 	        	$entry_default_fields['entry_link'] = array(
 	        		'label' => __('Link to Entry', 'gravityview'),
@@ -714,7 +714,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);
 	}
 
 	/**
@@ -723,25 +723,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;
@@ -758,11 +758,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);
 
 			}
 		}
@@ -779,7 +779,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;
 	}
@@ -792,67 +792,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,
@@ -861,16 +861,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);
 										}
 
 
@@ -880,11 +880,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>
 
@@ -901,13 +901,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);
 
 		}
 
@@ -915,7 +915,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
@@ -935,36 +935,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;
 		}
 
@@ -978,46 +978,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();
 
@@ -1035,25 +1035,25 @@ 
 		    '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;

includes/class-admin-welcome.php

Spacing +50 added lines, -50 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * GravityView_Welcome Class
@@ -34,10 +34,10 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
-		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
+		add_action('admin_menu', array($this, 'admin_menus'), 200);
+		add_action('admin_head', array($this, 'admin_head'));
+		add_action('admin_init', array($this, 'welcome'));
+		add_filter('gravityview_is_admin_page', array($this, 'is_dashboard_page'), 10, 2);
 	}
 
 	/**
@@ -57,27 +57,27 @@ 
 			__('Getting Started', 'gravityview'),
 			$this->minimum_capability,
 			'gv-getting-started',
-			array( $this, 'getting_started_screen' )
+			array($this, 'getting_started_screen')
 		);
 
 		// Changelog Page
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__( 'Changelog', 'gravityview' ),
-			__( 'Changelog', 'gravityview' ),
+			__('Changelog', 'gravityview'),
+			__('Changelog', 'gravityview'),
 			$this->minimum_capability,
 			'gv-changelog',
-			array( $this, 'changelog_screen' )
+			array($this, 'changelog_screen')
 		);
 
 		// Credits Page
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__( 'Credits', 'gravityview' ),
-			__( 'Credits', 'gravityview' ),
+			__('Credits', 'gravityview'),
+			__('Credits', 'gravityview'),
 			$this->minimum_capability,
 			'gv-credits',
-			array( $this, 'credits_screen' )
+			array($this, 'credits_screen')
 		);
 
 	}
@@ -90,9 +90,9 @@ 
 	public function is_dashboard_page($is_page = false, $hook = NULL) {
 		global $plugin_page;
 
-		if($is_page) { return $is_page; }
+		if ($is_page) { return $is_page; }
 
-		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
+		return in_array($plugin_page, array('gv-about', 'gv-credits', 'gv-getting-started'));
 	}
 
 	/**
@@ -105,10 +105,10 @@ 
 	public function admin_head() {
 		global $plugin_page;
 
-		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
-		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
+		remove_submenu_page('edit.php?post_type=gravityview', 'gv-credits');
+		remove_submenu_page('edit.php?post_type=gravityview', 'gv-changelog');
 
-		if( !$this->is_dashboard_page() ) { return; }
+		if (!$this->is_dashboard_page()) { return; }
 
 		?>
 		<style type="text/css" media="screen">
@@ -139,23 +139,23 @@ 
 		global $plugin_page;
 
 		// Don't fetch -beta, etc.
-		list( $display_version ) = explode( '-', GravityView_Plugin::version );
+		list($display_version) = explode('-', GravityView_Plugin::version);
 
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
+		$selected = !empty($plugin_page) ? $plugin_page : 'gv-getting-started';
 		?>
 
-		<h1><img class="alignleft" src="<?php echo plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ); ?>" width="100" height="132" /><?php printf( esc_html__( 'Welcome to GravityView %s', 'gravityview' ), $display_version ); ?></h1>
-		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
+		<h1><img class="alignleft" src="<?php echo plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE); ?>" width="100" height="132" /><?php printf(esc_html__('Welcome to GravityView %s', 'gravityview'), $display_version); ?></h1>
+		<div class="about-text"><?php esc_html_e('Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview'); ?></div>
 
 		<h2 class="nav-tab-wrapper clear">
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
-				<?php _e( "Getting Started", 'gravityview' ); ?>
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php'))); ?>">
+				<?php _e("Getting Started", 'gravityview'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
-				<?php _e( "List of Changes", 'gravityview' ); ?>
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php'))); ?>">
+				<?php _e("List of Changes", 'gravityview'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
-				<?php _e( 'Credits', 'gravityview' ); ?>
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php'))); ?>">
+				<?php _e('Credits', 'gravityview'); ?>
 			</a>
 		</h2>
 		<?php
@@ -205,14 +205,14 @@ 
 
 				<div class="last-feature">
 				<h2>Embed Views in Posts &amp; Pages</h2>
-					<p><img src="<?php echo plugins_url( 'assets/images/screenshots/add-view-button.png', GRAVITYVIEW_FILE ); ?>" class="gv-welcome-screenshots" height="35" width="97" />Views don&rsquo;t need to be embedded in a post or page, but you can if you want. Embed Views using the "Add View" button above your content editor.</p>
+					<p><img src="<?php echo plugins_url('assets/images/screenshots/add-view-button.png', GRAVITYVIEW_FILE); ?>" class="gv-welcome-screenshots" height="35" width="97" />Views don&rsquo;t need to be embedded in a post or page, but you can if you want. Embed Views using the "Add View" button above your content editor.</p>
 				</div>
 
 			</div>
 
 			<div class="feature-section clear">
 				<h2>Configure Multiple Entry, Single Entry, and Edit Entry Layouts</h2>
-				<p><img src="<?php echo plugins_url( 'assets/images/screenshots/add-field.png', GRAVITYVIEW_FILE ); ?>" alt="Add a field dialog box" class="gv-welcome-screenshots" />You can configure what fields are displayed in <strong>Multiple Entry</strong>, <strong>Single Entry</strong>, and <strong>Edit Entry</strong> modes. These can be configured by clicking on the tabs in "View Configuration."</p>
+				<p><img src="<?php echo plugins_url('assets/images/screenshots/add-field.png', GRAVITYVIEW_FILE); ?>" alt="Add a field dialog box" class="gv-welcome-screenshots" />You can configure what fields are displayed in <strong>Multiple Entry</strong>, <strong>Single Entry</strong>, and <strong>Edit Entry</strong> modes. These can be configured by clicking on the tabs in "View Configuration."</p>
 
 				<ul class="ul-disc">
 					<li>Click "+ Add Field" to add a field to a zone</li>
@@ -254,23 +254,23 @@ 
 
 			<div class="changelog point-releases">
 
-				<h2 class="subtitle" style="text-align: center;"><?php esc_html_e('What&rsquo;s New', 'gravityview' ); ?></h2>
+				<h2 class="subtitle" style="text-align: center;"><?php esc_html_e('What&rsquo;s New', 'gravityview'); ?></h2>
 
 				<div class="feature-section col two-col" style="margin-top:0">
 					<div class="col col-1">
-						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url( 'assets/images/screenshots/caps.png', GRAVITYVIEW_FILE ); ?>" alt="Icons representing capabilities"></div>
+						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url('assets/images/screenshots/caps.png', GRAVITYVIEW_FILE); ?>" alt="Icons representing capabilities"></div>
 						<h4 class="higher">Capability Management</h4>
 						<p>Manage what users and roles have access to GravityView functionality. <a href="http://docs.gravityview.co/article/311-gravityview-capabilities">See what capabilities are available</a>.</p>
 
-						<div class="media-container" style="margin-top: 2em; min-height:80px;"><img src="<?php echo plugins_url( 'assets/images/screenshots/get.png', GRAVITYVIEW_FILE ); ?>" alt=""></div>
+						<div class="media-container" style="margin-top: 2em; min-height:80px;"><img src="<?php echo plugins_url('assets/images/screenshots/get.png', GRAVITYVIEW_FILE); ?>" alt=""></div>
 						<h4 class="higher">The <code>{get}</code> Merge Tag</h4>
 						<p>Pass data using URLs and create even more powerful integrations with GravityView. <a href="http://docs.gravityview.co/article/314-the-get-merge-tag">Learn how to use <code>{get}</code></a>.</p>
 					</div>
 
 					<div class="col col-2 last-feature">
-						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url( 'assets/images/screenshots/support-port.png', GRAVITYVIEW_FILE ); ?>" alt="The Support Port"></div>
+						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url('assets/images/screenshots/support-port.png', GRAVITYVIEW_FILE); ?>" alt="The Support Port"></div>
 						<h4 class="higher">Support Port</h4>
-						<p>Users can easily search GravityView help docs. Administrators can use it to contact support. Just click the <img src="<?php echo plugins_url( 'assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE ); ?>" width="16" alt="The Support Port icon looks like a question mark"> icon on GravityView screens to activate.</p>
+						<p>Users can easily search GravityView help docs. Administrators can use it to contact support. Just click the <img src="<?php echo plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE); ?>" width="16" alt="The Support Port icon looks like a question mark"> icon on GravityView screens to activate.</p>
 					</div>
 				</div>
 
@@ -619,7 +619,7 @@ 
 
 			<?php $this->tabs(); ?>
 
-			<p class="about-description"><?php _e( 'GravityView is brought to you by:', 'gravityview' ); ?></p>
+			<p class="about-description"><?php _e('GravityView is brought to you by:', 'gravityview'); ?></p>
 
 			<div class="feature-section col two-col">
 
@@ -627,14 +627,14 @@ 
 					<h2>Zack Katz</h2>
 					<h4 style="font-weight:0; margin-top:0">Project Lead &amp; Developer</h4>
 					<p></p>
-					<p><img style="float:left; margin: 0 15px 10px 0;" src="<?php echo plugins_url( 'assets/images/zack.jpg', GRAVITYVIEW_FILE ); ?>" width="94" height="94" />Zack has been developing integrations with Gravity Forms since 2009. He is the President of Katz Web Services and lives with his wife (and cat) in Denver, Colorado.</p>
+					<p><img style="float:left; margin: 0 15px 10px 0;" src="<?php echo plugins_url('assets/images/zack.jpg', GRAVITYVIEW_FILE); ?>" width="94" height="94" />Zack has been developing integrations with Gravity Forms since 2009. He is the President of Katz Web Services and lives with his wife (and cat) in Denver, Colorado.</p>
 					<p><a href="https://katz.co">View Zack&rsquo;s website</a></p>
 				</div>
 
 				<div class="col last-feature">
 					<h2>Luis Godinho</h2>
 					<h4 style="font-weight:0; margin-top:0">Developer &amp; Support</h4>
-					<p><img style="margin: 0 15px 10px 0;"  class="alignleft avatar" src="<?php echo plugins_url( 'assets/images/luis.jpg', GRAVITYVIEW_FILE ); ?>" width="94" height="94" />Luis is a WordPress developer passionate about WordPress. He is a co-founder and partner of GOMO, a digital agency located in Lisbon, Portugal.</p>
+					<p><img style="margin: 0 15px 10px 0;"  class="alignleft avatar" src="<?php echo plugins_url('assets/images/luis.jpg', GRAVITYVIEW_FILE); ?>" width="94" height="94" />Luis is a WordPress developer passionate about WordPress. He is a co-founder and partner of GOMO, a digital agency located in Lisbon, Portugal.</p>
 					<p><a href="http://tinygod.pt">View Luis&rsquo;s website</a></p>
 				</div>
 
@@ -644,7 +644,7 @@ 
 
 			<div class="feature-section">
 				<div>
-					<h2><?php esc_attr_e( 'Contributors', 'gravityview' ); ?></h2>
+					<h2><?php esc_attr_e('Contributors', 'gravityview'); ?></h2>
 
 					<ul class="wp-people-group">
 						<li class="wp-person">Bengali translation by <a href="https://www.transifex.com/accounts/profile/tareqhi/">@tareqhi</a></li>
@@ -665,8 +665,8 @@ 
 						<li class="wp-person">Code contributions by <a href="https://github.com/ryanduff">@ryanduff</a> and <a href="https://github.com/dmlinn">@dmlinn</a></li>
 					</ul>
 
-					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
+					<h4><?php esc_attr_e('Want to contribute?', 'gravityview'); ?></h4>
+					<p><?php echo sprintf(esc_attr__('If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>'); ?></p>
 				</div>
 			</div>
 
@@ -705,34 +705,34 @@ 
 		global $plugin_page;
 
 		// Bail if we're just editing the plugin
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
+		if ($plugin_page === 'plugin-editor.php') { return; }
 
 		// Bail if no activation redirect
-		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
+		if (!get_transient('_gv_activation_redirect')) { return; }
 
 		// Delete the redirect transient
-		delete_transient( '_gv_activation_redirect' );
+		delete_transient('_gv_activation_redirect');
 
-		$upgrade = get_option( 'gv_version_upgraded_from' );
+		$upgrade = get_option('gv_version_upgraded_from');
 
 		// Don't do anything if they've already seen the new version info
-		if( $upgrade === GravityView_Plugin::version ) {
+		if ($upgrade === GravityView_Plugin::version) {
 			return;
 		}
 
 		// Add "Upgraded From" Option
-		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
+		update_option('gv_version_upgraded_from', GravityView_Plugin::version);
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
+		if (is_network_admin() || isset($_GET['activate-multi'])) { return; }
 
 		// First time install
-		if( ! $upgrade ) {
-			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
+		if (!$upgrade) {
+			wp_safe_redirect(admin_url('edit.php?post_type=gravityview&page=gv-getting-started')); exit;
 		}
 		// Update
 		else {
-			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-changelog' ) ); exit;
+			wp_safe_redirect(admin_url('edit.php?post_type=gravityview&page=gv-changelog')); exit;
 		}
 	}
 }

includes/class-admin.php

Spacing +102 added lines, -102 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if (!is_admin()) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if (false === GravityView_Compatibility::is_valid()) {
 			return;
 		}
 
@@ -22,22 +22,22 @@ 
 	private function include_required_files() {
 
 		// Migrate Class
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-migrate.php');
 
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
-			require_once( GFCommon::get_base_path() . '/tooltips.php' );
+		if (class_exists('GFCommon') && class_exists('GFForms') && !GFForms::is_gravity_page()) {
+			require_once(GFCommon::get_base_path().'/tooltips.php');
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/metaboxes/class-gravityview-admin-metaboxes.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/entry-list.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/admin/metaboxes/class-gravityview-admin-metaboxes.php');
+		require_once(GRAVITYVIEW_DIR.'includes/admin/entry-list.php');
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-change-entry-creator.php');
 
 		/** @since 1.15 **/
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-support-port.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/admin/class-gravityview-support-port.php');
 
 		/** @since 1.6 */
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-duplicate-view.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-duplicate-view.php');
 	}
 
 	/**
@@ -47,21 +47,21 @@ 
 	private function add_hooks() {
 
 		// Filter Admin messages
-		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
-		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
+		add_filter('post_updated_messages', array($this, 'post_updated_messages'));
+		add_filter('bulk_post_updated_messages', array($this, 'post_updated_messages'));
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter('plugin_action_links_'.plugin_basename(GRAVITYVIEW_FILE), array($this, 'plugin_action_links'));
 
-		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
+		add_action('plugins_loaded', array($this, 'backend_actions'), 100);
 
 		//Hooks for no-conflict functionality
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
+		add_action('wp_print_scripts', array($this, 'no_conflict_scripts'), 1000);
+		add_action('admin_print_footer_scripts', array($this, 'no_conflict_scripts'), 9);
 
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
+		add_action('wp_print_styles', array($this, 'no_conflict_styles'), 1000);
+		add_action('admin_print_styles', array($this, 'no_conflict_styles'), 11);
+		add_action('admin_print_footer_scripts', array($this, 'no_conflict_styles'), 1);
+		add_action('admin_footer', array($this, 'no_conflict_styles'), 1);
 
 	}
 
@@ -74,13 +74,13 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-label.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/admin/class.field.type.php');
+		include_once(GRAVITYVIEW_DIR.'includes/admin/class.render.settings.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-label.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-welcome.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-add-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-approve-entries.php');
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
@@ -99,19 +99,19 @@ 
 	 * @param array $links Array of action links under GravityView on the plugin page
 	 * @return array Action links with Settings and Support included, if the user has the appropriate caps
 	 */
-	public static function plugin_action_links( $links ) {
+	public static function plugin_action_links($links) {
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if (GVCommon::has_cap('gravityview_view_settings')) {
+			$actions[] = sprintf('<a href="%s">%s</a>', admin_url('edit.php?post_type=gravityview&page=gravityview_settings'), esc_html__('Settings', 'gravityview'));
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if (GVCommon::has_cap('gravityview_support_port')) {
+			$actions[] = '<a href="http://docs.gravityview.co">'.esc_html__('Support', 'gravityview').'</a>';
 		}
 
-		return array_merge( $actions, $links );
+		return array_merge($actions, $links);
 	}
 
 	/**
@@ -128,70 +128,70 @@ 
 	 * @param  array      $messages Existing messages
 	 * @return array                Messages with GravityView views!
 	 */
-	function post_updated_messages( $messages, $bulk_counts = NULL ) {
+	function post_updated_messages($messages, $bulk_counts = NULL) {
 		global $post;
 
-		$post_id = isset($_GET['post']) ? intval($_GET['post']) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
+		$post_id = isset($_GET['post']) ? intval($_GET['post']) : (is_object($post) && isset($post->ID) ? $post->ID : NULL);
 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null($bulk_counts) ? array('updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1) : $bulk_counts;
 
 
 		// If we're starting fresh, a new form was created.
 		// We should let the user know this is the case.
-		$start_fresh = get_post_meta( $post_id, '_gravityview_start_fresh', true );
+		$start_fresh = get_post_meta($post_id, '_gravityview_start_fresh', true);
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if (!empty($start_fresh)) {
 
 			// Get the form that was created
-			$connected_form = gravityview_get_form_id( $post_id );
+			$connected_form = gravityview_get_form_id($post_id);
 
-			if( !empty( $connected_form ) ) {
-				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+			if (!empty($connected_form)) {
+				$form = gravityview_get_form($connected_form);
+				$form_name = esc_attr($form['title']);
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>'.$image.sprintf(__('A new form was created for this View: "%s"', 'gravityview'), $form_name).'</h3>';
+				$new_form_text .= sprintf(__('%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
-				$new_form_text = wpautop( $new_form_text );
+					', 'gravityview'), '<strong>', '</strong>', '<a href="'.site_url('?gf_page=preview&amp;id='.$connected_form).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url('admin.php?page=gf_edit_forms&amp;id='.$connected_form).'">', '</a>', '<a href="'.admin_url('admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form).'">', '</a>');
+				$new_form_text = wpautop($new_form_text);
 
-				delete_post_meta( $post_id, '_gravityview_start_fresh' );
+				delete_post_meta($post_id, '_gravityview_start_fresh');
 			}
 		}
 
 		$messages['gravityview'] = array(
 			0  => '', // Unused. Messages start at index 1.
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			3  => __( 'View deleted.', 'gravityview' ),
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
+			2  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
+			3  => __('View deleted.', 'gravityview'),
+			4  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			8  => __( 'View submitted.', 'gravityview' ),
+			5  => isset($_GET['revision']) ? sprintf(__('View restored to revision from %s', 'gravityview'), wp_post_revision_title((int)$_GET['revision'], false)) : false,
+			6  => sprintf(__('View published. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>').$new_form_text,
+			7  => sprintf(__('View saved. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>').$new_form_text,
+			8  => __('View submitted.', 'gravityview'),
 			9  => sprintf(
-				__( 'View scheduled for: %1$s.', 'gravityview' ),
+				__('View scheduled for: %1$s.', 'gravityview'),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
-			) . $new_form_text,
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+				date_i18n(__('M j, Y @ G:i', 'gravityview'), strtotime((isset($post->post_date) ? $post->post_date : NULL)))
+			).$new_form_text,
+			10  => sprintf(__('View draft updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n('%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview'),
+			'locked'    => _n('%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview'),
+			'deleted'   => _n('%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview'),
+			'trashed'   => _n('%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview'),
+			'untrashed' => _n('%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview'),
 		);
 
 		return $messages;
@@ -204,13 +204,13 @@ 
 	function no_conflict_scripts() {
 		global $wp_scripts;
 
-		if( ! gravityview_is_admin_page() ) {
+		if (!gravityview_is_admin_page()) {
 			return;
 		}
 
 		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
 
-		if( empty( $no_conflict_mode ) ) {
+		if (empty($no_conflict_mode)) {
 			return;
 		}
 
@@ -250,7 +250,7 @@ 
             'jquery-ui-accordion',
 		);
 
-		$this->remove_conflicts( $wp_scripts, $wp_allowed_scripts, 'scripts' );
+		$this->remove_conflicts($wp_scripts, $wp_allowed_scripts, 'scripts');
 	}
 
 	/**
@@ -260,16 +260,16 @@ 
 	function no_conflict_styles() {
 		global $wp_styles;
 
-		if( ! gravityview_is_admin_page() ) {
+		if (!gravityview_is_admin_page()) {
 			return;
 		}
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
+		if (!empty($wp_styles->registered)) {
 			foreach ($wp_styles->registered as $key => $style) {
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
-					wp_dequeue_style( $key );
+				if (preg_match('/^(?:wp\-)?jquery/ism', $key)) {
+					wp_dequeue_style($key);
 				}
 			}
 		}
@@ -277,7 +277,7 @@ 
 		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
 
 		// If no conflict is off, jQuery will suffice.
-		if( empty( $no_conflict_mode ) ) {
+		if (empty($no_conflict_mode)) {
 			return;
 		}
 
@@ -299,7 +299,7 @@ 
 	        'jquery-qtip.js',
 	    );
 
-		$this->remove_conflicts( $wp_styles, $wp_allowed_styles, 'styles' );
+		$this->remove_conflicts($wp_styles, $wp_allowed_styles, 'styles');
 
 		/**
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
@@ -315,31 +315,31 @@ 
 	 * @param  string $type              Either 'styles' or 'scripts'
 	 * @return void
 	 */
-	private function remove_conflicts( &$wp_objects, $required_objects, $type = 'scripts' ) {
+	private function remove_conflicts(&$wp_objects, $required_objects, $type = 'scripts') {
 
         /**
          * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
          * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
          * @param array $required_objects
          */
-        $required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
+        $required_objects = apply_filters("gravityview_noconflict_{$type}", $required_objects);
 
         //reset queue
         $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
+        foreach ($wp_objects->queue as $object) {
+	        if (in_array($object, $required_objects) || preg_match('/gravityview|gf_|gravityforms/ism', $object)) {
                 $queue[] = $object;
             }
         }
         $wp_objects->queue = $queue;
 
-        $required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
+        $required_objects = $this->add_script_dependencies($wp_objects->registered, $required_objects);
 
         //unregistering scripts
         $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
-                $registered[ $handle ] = $script_registration;
+        foreach ($wp_objects->registered as $handle => $script_registration) {
+            if (in_array($handle, $required_objects)) {
+                $registered[$handle] = $script_registration;
             }
         }
         $wp_objects->registered = $registered;
@@ -356,16 +356,16 @@ 
 		//gets all dependent scripts linked to the $scripts array passed
 		do {
 			$dependents = array();
-			foreach ( $scripts as $script ) {
-				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
-				foreach ( $deps as $dep ) {
-					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
+			foreach ($scripts as $script) {
+				$deps = isset($registered[$script]) && is_array($registered[$script]->deps) ? $registered[$script]->deps : array();
+				foreach ($deps as $dep) {
+					if (!in_array($dep, $scripts) && !in_array($dep, $dependents)) {
 						$dependents[] = $dep;
 					}
 				}
 			}
-			$scripts = array_merge( $scripts, $dependents );
-		} while ( ! empty( $dependents ) );
+			$scripts = array_merge($scripts, $dependents);
+		} while (!empty($dependents));
 
 		return $scripts;
 	}
@@ -385,8 +385,8 @@ 
 	 * @deprecated since 1.12
 	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
 	 */
-	public static function add_notice( $notice = array() ) {
-		GravityView_Admin_Notices::add_notice( $notice );
+	public static function add_notice($notice = array()) {
+		GravityView_Admin_Notices::add_notice($notice);
 	}
 
 	/**
@@ -408,8 +408,8 @@ 
 
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
-	static function get_plugin_status( $location = '' ) {
-		return GravityView_Compatibility::get_plugin_status( $location );
+	static function get_plugin_status($location = '') {
+		return GravityView_Compatibility::get_plugin_status($location);
 	}
 
 	/**
@@ -421,10 +421,10 @@ 
 	 *
 	 * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
 	 */
-	static function is_admin_page( $hook = '', $page = NULL ) {
+	static function is_admin_page($hook = '', $page = NULL) {
 		global $current_screen, $plugin_page, $pagenow, $post;
 
-		if( ! is_admin() ) { return false; }
+		if (!is_admin()) { return false; }
 
 		$is_page = false;
 
@@ -432,21 +432,21 @@ 
 
 		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
 
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
+		$is_gv_settings_get = isset($_GET['page']) && $_GET['page'] === 'gravityview_settings';
 
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
-			$gv_post = get_post( intval( $_GET['post'] ) );
+		if (empty($post) && $pagenow === 'post.php' && !empty($_GET['post'])) {
+			$gv_post = get_post(intval($_GET['post']));
 			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
 		} else {
 			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
 		}
 
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
+		if ($is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get) {
 
 			// $_GET `post_type` variable
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
+			if (in_array($pagenow, array('post.php', 'post-new.php'))) {
 				$is_page = 'single';
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
+			} else if (in_array($plugin_page, array('gravityview_settings', 'gravityview_page_gravityview_settings')) || (!empty($_GET['page']) && $_GET['page'] === 'gravityview_settings')) {
 				$is_page = 'settings';
 			} else {
 				$is_page = 'views';
@@ -458,10 +458,10 @@ 
 		 * @param[in,out] string|bool $is_page If false, no. If string, the name of the page (`single`, `settings`, or `views`)
 		 * @param[in] string $hook The name of the page to check against. Is passed to the method.
 		 */
-		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
+		$is_page = apply_filters('gravityview_is_admin_page', $is_page, $hook);
 
 		// If the current page is the same as the compared page
-		if( !empty( $page ) ) {
+		if (!empty($page)) {
 			return $is_page === $page;
 		}
 
@@ -473,5 +473,5 @@ 
 new GravityView_Admin;
 
 function gravityview_is_admin_page($hook = '', $page = NULL) {
-	return GravityView_Admin::is_admin_page( $hook, $page );
+	return GravityView_Admin::is_admin_page($hook, $page);
 }

includes/class-ajax.php

Spacing +110 added lines, -110 removed lines

@@ -5,21 +5,21 @@ 
 	function __construct() {
 
 		//get field options
-		add_action( 'wp_ajax_gv_field_options', array( $this, 'get_field_options' ) );
+		add_action('wp_ajax_gv_field_options', array($this, 'get_field_options'));
 
 		// get available fields
-		add_action( 'wp_ajax_gv_available_fields', array( $this, 'get_available_fields_html' ) );
+		add_action('wp_ajax_gv_available_fields', array($this, 'get_available_fields_html'));
 
 		// get active areas
-		add_action( 'wp_ajax_gv_get_active_areas', array( $this, 'get_active_areas' ) );
+		add_action('wp_ajax_gv_get_active_areas', array($this, 'get_active_areas'));
 
 		// get preset fields
-		add_action( 'wp_ajax_gv_get_preset_fields', array( $this, 'get_preset_fields_config' ) );
+		add_action('wp_ajax_gv_get_preset_fields', array($this, 'get_preset_fields_config'));
 
 		// get preset fields
-		add_action( 'wp_ajax_gv_set_preset_form', array( $this, 'create_preset_form' ) );
+		add_action('wp_ajax_gv_set_preset_form', array($this, 'create_preset_form'));
 
-		add_action( 'wp_ajax_gv_sortable_fields_form', array( $this, 'get_sortable_fields' ) );
+		add_action('wp_ajax_gv_sortable_fields_form', array($this, 'get_sortable_fields'));
 	}
 
 	/**
@@ -30,17 +30,17 @@ 
 	 *
 	 * @return bool
 	 */
-	private function _exit( $mixed = NULL ) {
+	private function _exit($mixed = NULL) {
 
 		/**
 		 * Don't exit if we're running test suite.
 		 * @since 1.15
 		 */
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
+		if (defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS) {
 			return $mixed;
 		}
 
-		exit( $mixed );
+		exit($mixed);
 	}
 
 	/** -------- AJAX ---------- */
@@ -50,8 +50,8 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
-			$this->_exit( false );
+		if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxviews')) {
+			$this->_exit(false);
 		}
 	}
 
@@ -67,20 +67,20 @@ 
 		//check nonce
 		$this->check_ajax_nonce();
 
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
+		$context = isset($_POST['context']) ? esc_attr($_POST['context']) : 'directory';
 
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
-		if( !empty( $_POST['form_id'] ) ) {
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
+		if (!empty($_POST['form_id'])) {
+			do_action('gravityview_render_available_fields', (int)$_POST['form_id'], $context);
 			$this->_exit();
-		} elseif( !empty( $_POST['template_id'] ) ) {
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
-			do_action( 'gravityview_render_available_fields', $form, $context );
+		} elseif (!empty($_POST['template_id'])) {
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
+			do_action('gravityview_render_available_fields', $form, $context);
 			$this->_exit();
 		}
 
 		//if everything fails..
-		$this->_exit( false );
+		$this->_exit(false);
 	}
 
 
@@ -94,21 +94,21 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			$this->_exit(false);
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
+		do_action('gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true);
 		$response['directory'] = ob_get_clean();
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
+		do_action('gravityview_render_directory_active_areas', $_POST['template_id'], 'single', '', true);
 		$response['single'] = ob_get_clean();
 
-		$response = array_map( 'gravityview_strip_whitespace', $response );
+		$response = array_map('gravityview_strip_whitespace', $response);
 
-		$this->_exit( json_encode( $response ) );
+		$this->_exit(json_encode($response));
 	}
 
 	/**
@@ -119,49 +119,49 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			$this->_exit(false);
 		}
 
 		// get the fields xml config file for this specific preset
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
+		$preset_fields_path = apply_filters('gravityview_template_fieldsxml', array(), $_POST['template_id']);
 		// import fields
-		if( !empty( $preset_fields_path ) ) {
-			$presets = $this->import_fields( $preset_fields_path );
+		if (!empty($preset_fields_path)) {
+			$presets = $this->import_fields($preset_fields_path);
 		} else {
-			$presets = array( 'widgets' => array(), 'fields' => array() );
+			$presets = array('widgets' => array(), 'fields' => array());
 		}
 
-		$template_id = esc_attr( $_POST['template_id'] );
+		$template_id = esc_attr($_POST['template_id']);
 
 		// template areas
-		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
+		$template_areas_directory = apply_filters('gravityview_template_active_areas', array(), $template_id, 'directory');
+        $template_areas_single = apply_filters('gravityview_template_active_areas', array(), $template_id, 'single');
 
 		// widget areas
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
+		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets']);
 		$response['header'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
+		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets']);
 		$response['footer'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
+		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields']);
 		$response['directory'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
+		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields']);
 		$response['single'] = ob_get_clean();
 
-		$response = array_map( 'gravityview_strip_whitespace', $response );
+		$response = array_map('gravityview_strip_whitespace', $response);
 
-		do_action( 'gravityview_log_debug', '[get_preset_fields_config] AJAX Response', $response );
+		do_action('gravityview_log_debug', '[get_preset_fields_config] AJAX Response', $response);
 
-		$this->_exit( json_encode( $response ) );
+		$this->_exit(json_encode($response));
 	}
 
 	/**
@@ -173,26 +173,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			do_action( 'gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.' );
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			do_action('gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.');
+			$this->_exit(false);
 		}
 
 		// get the xml for this specific template_id
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
+		$preset_form_xml_path = apply_filters('gravityview_template_formxml', '', $_POST['template_id']);
 
 		// import form
-		$form = $this->import_form( $preset_form_xml_path );
+		$form = $this->import_form($preset_form_xml_path);
 
 		// get the form ID
-		if( false === $form ) {
+		if (false === $form) {
 			// send error to user
-			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int) $_POST['template_id'] );
+			do_action('gravityview_log_error', '[create_preset_form] Error importing form for template id: '.(int)$_POST['template_id']);
 
-			$this->_exit( false );
+			$this->_exit(false);
 		}
 
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
+		$this->_exit('<option value="'.esc_attr($form['id']).'" selected="selected">'.esc_html($form['title']).'</option>');
 
 	}
 
@@ -202,24 +202,24 @@ 
 	 * @param  string $xml_or_json_path Path to form XML or JSON file
 	 * @return int|bool       Imported form ID or false
 	 */
-	function import_form( $xml_or_json_path = '' ) {
+	function import_form($xml_or_json_path = '') {
 
-		do_action( 'gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path );
+		do_action('gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path);
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
-			do_action( 'gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path );
+		if (empty($xml_or_json_path) || !class_exists('GFExport') || !file_exists($xml_or_json_path)) {
+			do_action('gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path);
 			return false;
 		}
 
 		// import form
 		$forms = '';
-		$count = GFExport::import_file( $xml_or_json_path, $forms );
+		$count = GFExport::import_file($xml_or_json_path, $forms);
 
-		do_action( 'gravityview_log_debug', '[import_form] Importing form (Result)', $count );
-		do_action( 'gravityview_log_debug', '[import_form] Importing form (Form) ', $forms );
+		do_action('gravityview_log_debug', '[import_form] Importing form (Result)', $count);
+		do_action('gravityview_log_debug', '[import_form] Importing form (Form) ', $forms);
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
-			do_action( 'gravityview_log_error', '[import_form] Form Import Failed!' );
+		if ($count != 1 || empty($forms[0]['id'])) {
+			do_action('gravityview_log_error', '[import_form] Form Import Failed!');
 			return false;
 		}
 
@@ -238,26 +238,26 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
-			do_action( 'gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ' );
-			$this->_exit( false );
+		if (empty($_POST['template']) || empty($_POST['area']) || empty($_POST['field_id']) || empty($_POST['field_type'])) {
+			do_action('gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ');
+			$this->_exit(false);
 		}
 
 		// Fix apostrophes added by JSON response
-		$_post = array_map( 'stripslashes_deep', $_POST );
+		$_post = array_map('stripslashes_deep', $_POST);
 
 		// Sanitize
-		$_post = array_map( 'esc_attr', $_post );
+		$_post = array_map('esc_attr', $_post);
 
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
+		$input_type = isset($_post['input_type']) ? esc_attr($_post['input_type']) : NULL;
+		$context = isset($_post['context']) ? esc_attr($_post['context']) : NULL;
 
-		$response = GravityView_Render_Settings::render_field_options( $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$response = GravityView_Render_Settings::render_field_options($_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context);
 
-		$response = gravityview_strip_whitespace( $response );
+		$response = gravityview_strip_whitespace($response);
 
-		$this->_exit( $response );
+		$this->_exit($response);
 	}
 
 	/**
@@ -274,23 +274,23 @@ 
 		$form = '';
 
 		// if form id is set, use it, else, get form from preset
-		if( !empty( $_POST['form_id'] ) ) {
+		if (!empty($_POST['form_id'])) {
 
-			$form = (int) $_POST['form_id'];
+			$form = (int)$_POST['form_id'];
 
 		}
 		// get form from preset
-		elseif( !empty( $_POST['template_id'] ) ) {
+		elseif (!empty($_POST['template_id'])) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
 
 		}
 
-		$response = gravityview_get_sortable_fields( $form );
+		$response = gravityview_get_sortable_fields($form);
 
-		$response = gravityview_strip_whitespace( $response );
+		$response = gravityview_strip_whitespace($response);
 
-		$this->_exit( $response );
+		$this->_exit($response);
 	}
 
 	/**
@@ -298,35 +298,35 @@ 
 	 * @param  string $template_id Preset template
 	 *
 	 */
-	static function pre_get_form_fields( $template_id = '') {
+	static function pre_get_form_fields($template_id = '') {
 
-		if( empty( $template_id ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Template ID not set.' );
+		if (empty($template_id)) {
+			do_action('gravityview_log_error', __METHOD__.' - Template ID not set.');
 			return false;
 		} else {
-			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset ['. $template_id .']. File not found. file: ' . $form_file );
+			$form_file = apply_filters('gravityview_template_formxml', '', $template_id);
+			if (!file_exists($form_file)) {
+				do_action('gravityview_log_error', __METHOD__.' - Importing Form Fields for preset ['.$template_id.']. File not found. file: '.$form_file);
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
-			$xml_parser = GFCommon::get_base_path() . '/xml.php';
+		if (class_exists('GFCommon')) {
+			$xml_parser = GFCommon::get_base_path().'/xml.php';
 		} else {
-			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
+			$xml_parser = trailingslashit(WP_PLUGIN_DIR).'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
-			require_once( $xml_parser );
+		if (file_exists($xml_parser)) {
+			require_once($xml_parser);
 		} else {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Gravity Forms XML Parser not found.', $xml_parser );
+			do_action('gravityview_log_debug', __METHOD__.' - Gravity Forms XML Parser not found.', $xml_parser);
 			return false;
 		}
 
 		// load file
-		$xmlstr = file_get_contents( $form_file );
+		$xmlstr = file_get_contents($form_file);
 
         $options = array(
             "page" => array("unserialize_as_array" => true),
@@ -345,21 +345,21 @@ 
 		$xml = new RGXML($options);
         $forms = $xml->unserialize($xmlstr);
 
-        if( !$forms ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
+        if (!$forms) {
+        	do_action('gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['.$template_id.']. Error importing file. (File)', $form_file);
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
+        if (!empty($forms[0]) && is_array($forms[0])) {
         	$form = $forms[0];
         }
 
-        if( empty( $form ) ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
+        if (empty($form)) {
+        	do_action('gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms);
         	return false;
         }
 
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
+        do_action('gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['.$template_id.']. (Form)', $form);
 
         return $form;
 
@@ -371,46 +371,46 @@ 
 	 * @param  string $file path to file
 	 * @return array       Fields config array (unserialized)
 	 */
-	function import_fields( $file ) {
+	function import_fields($file) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file );
+		if (empty($file) || !file_exists($file)) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file);
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
-			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
+		if (!class_exists('WXR_Parser')) {
+			include_once GRAVITYVIEW_DIR.'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
-		$presets = $parser->parse( $file );
+		$presets = $parser->parse($file);
 
-		if(is_wp_error( $presets )) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets );
+		if (is_wp_error($presets)) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets);
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file );
+		if (empty($presets['posts'][0]['postmeta']) && !is_array($presets['posts'][0]['postmeta'])) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file);
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta'] );
+		do_action('gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta']);
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
+		foreach ($presets['posts'][0]['postmeta'] as $meta) {
 			switch ($meta['key']) {
 				case '_gravityview_directory_fields':
-					$fields = maybe_unserialize( $meta['value'] );
+					$fields = maybe_unserialize($meta['value']);
 					break;
 				case '_gravityview_directory_widgets':
-					$widgets = maybe_unserialize( $meta['value'] );
+					$widgets = maybe_unserialize($meta['value']);
 					break;
 			}
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] Imported Preset (Fields)', $fields );
-		do_action( 'gravityview_log_debug', '[import_fields] Imported Preset (Widgets)', $widgets );
+		do_action('gravityview_log_debug', '[import_fields] Imported Preset (Fields)', $fields);
+		do_action('gravityview_log_debug', '[import_fields] Imported Preset (Widgets)', $widgets);
 
 		return array(
 			'fields' => $fields,

includes/class-cache.php

Spacing +101 added lines, -101 removed lines

@@ -32,18 +32,18 @@ 
 	 * @since 1.13.1
 	 * @var array Columns in the database for leads
 	 */
-	private $lead_db_columns = array( 'id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status' );
+	private $lead_db_columns = array('id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status');
 
 	/**
 	 *
 	 * @param array|int $form_ids Form ID or array of form IDs used in a request
 	 * @param array $args Extra request parameters used to generate the query. This is used to generate the unique transient key.
 	 */
-	function __construct( $form_ids = NULL, $args = array() ) {
+	function __construct($form_ids = NULL, $args = array()) {
 
 		$this->add_hooks();
 
-		if ( ! is_null( $form_ids ) ) {
+		if (!is_null($form_ids)) {
 
 			$this->form_ids = $form_ids;
 
@@ -59,31 +59,31 @@ 
 	function add_hooks() {
 
 		// Schedule cleanup of expired transients
-		add_action( 'wp', array( $this, 'schedule_transient_cleanup' ) );
+		add_action('wp', array($this, 'schedule_transient_cleanup'));
 
 		// Hook in to the scheduled cleanup, if scheduled
-		add_action( 'gravityview-expired-transients', array( $this, 'delete_expired_transients' ) );
+		add_action('gravityview-expired-transients', array($this, 'delete_expired_transients'));
 
 		// Trigger this when you need to prevent any results from being cached with forms that have been modified
-		add_action( 'gravityview_clear_form_cache', array( $this, 'blacklist_add' ) );
+		add_action('gravityview_clear_form_cache', array($this, 'blacklist_add'));
 
 		/**
 		 * @since 1.14
 		 */
-		add_action( 'gravityview_clear_entry_cache', array( $this, 'entry_status_changed' ) );
+		add_action('gravityview_clear_entry_cache', array($this, 'entry_status_changed'));
 
-		add_action( 'gform_after_update_entry', array( $this, 'entry_updated' ), 10, 2 );
+		add_action('gform_after_update_entry', array($this, 'entry_updated'), 10, 2);
 
-		add_action( 'gform_entry_created', array( $this, 'entry_created' ), 10, 2 );
+		add_action('gform_entry_created', array($this, 'entry_created'), 10, 2);
 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
-			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
+		foreach ($this->lead_db_columns as $column) {
+			add_action('gform_update_'.$column, array($this, 'entry_status_changed'), 10, 3);
 		}
 
-		add_action( 'gform_delete_lead', array( $this, 'entry_status_changed' ), 10 );
+		add_action('gform_delete_lead', array($this, 'entry_status_changed'), 10);
 	}
 
 	/**
@@ -99,22 +99,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_status_changed( $lead_id, $property_value = '', $previous_value = '' ) {
+	public function entry_status_changed($lead_id, $property_value = '', $previous_value = '') {
 
 		/** @var array $entry */
-		$entry = GFAPI::get_entry( $lead_id );
+		$entry = GFAPI::get_entry($lead_id);
 
-		if ( is_wp_error( $entry ) ) {
+		if (is_wp_error($entry)) {
 
 			/** @var WP_Error $entry */
-			do_action( 'gravityview_log_error', __METHOD__ . ' Could not retrieve entry ' . $lead_id . ' to delete it: ' . $entry->get_error_message() );
+			do_action('gravityview_log_error', __METHOD__.' Could not retrieve entry '.$lead_id.' to delete it: '.$entry->get_error_message());
 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action('gravityview_log_debug', __METHOD__.' adding form '.$entry['form_id'].' to blacklist because entry #'.$lead_id.' was deleted', array('value' => $property_value, 'previous' => $previous_value));
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add($entry['form_id']);
 	}
 
 	/**
@@ -125,11 +125,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_updated( $form, $lead_id ) {
+	public function entry_updated($form, $lead_id) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form '.$form['id'].' to blacklist because entry #'.$lead_id.' was updated');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -142,11 +142,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_created( $entry, $form ) {
+	public function entry_created($entry, $form) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_created] adding form '.$form['id'].' to blacklist because entry #'.$entry['id'].' was created');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -156,20 +156,20 @@ 
 	 *
 	 * @return string           Prefix for the cache string used in set_key()
 	 */
-	protected function get_cache_key_prefix( $form_ids = NULL ) {
+	protected function get_cache_key_prefix($form_ids = NULL) {
 
-		if ( is_null( $form_ids ) ) {
+		if (is_null($form_ids)) {
 			$form_ids = $this->form_ids;
 		}
 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:'.implode('&f:', (array)$form_ids);
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
-		return 'gv-cache-' . $forms . '-';
+		return 'gv-cache-'.$forms.'-';
 
 	}
 
@@ -179,17 +179,17 @@ 
 	protected function set_key() {
 
 		// Don't set key if no forms have been set.
-		if ( empty( $this->form_ids ) ) {
+		if (empty($this->form_ids)) {
 			return;
 		}
 
-		$key = $this->get_cache_key_prefix() . sha1( serialize( $this->args ) );
+		$key = $this->get_cache_key_prefix().sha1(serialize($this->args));
 
 		// The transient name column can handle up to 64 characters.
 		// The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
 		// 64 - 19 = 45
 		// We make sure the key isn't too long or else WP doesn't store data.
-		$this->key = substr( $key, 0, 45 );
+		$this->key = substr($key, 0, 45);
 	}
 
 	/**
@@ -210,24 +210,24 @@ 
 	 *
 	 * @return boolean           False if value was not updated and true if value was updated.
 	 */
-	public function blacklist_add( $form_ids ) {
+	public function blacklist_add($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$form_ids = is_array( $form_ids ) ? $form_ids : array( $form_ids );
+		$form_ids = is_array($form_ids) ? $form_ids : array($form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
 			'$form_ids'  => $form_ids,
 			'$blacklist' => $blacklist
-		) );
+		));
 
 		// Add the passed form IDs
-		$blacklist = array_merge( $blacklist, $form_ids );
+		$blacklist = array_merge($blacklist, $form_ids);
 
 		// Don't duplicate
-		$blacklist = array_unique( $blacklist );
+		$blacklist = array_unique($blacklist);
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $blacklist );
+		return update_option(self::BLACKLIST_OPTION_NAME, $blacklist);
 
 	}
 
@@ -238,19 +238,19 @@ 
 	 *
 	 * @return boolean           Whether the removal was successful
 	 */
-	public function blacklist_remove( $form_ids ) {
+	public function blacklist_remove($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff($blacklist, (array)$form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
 			'$blacklist'    => $blacklist,
 			'$updated_list' => $updated_list
-		) );
+		));
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $updated_list );
+		return update_option(self::BLACKLIST_OPTION_NAME, $updated_list);
 	}
 
 
@@ -261,25 +261,25 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	function in_blacklist( $form_ids = NULL ) {
+	function in_blacklist($form_ids = NULL) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
+		if (empty($form_ids)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids );
+			do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids);
 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			if ( in_array( $form_id, $blacklist ) ) {
+			if (in_array($form_id, $blacklist)) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #' . esc_attr( $form_id ) . ' is in the cache blacklist' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #'.esc_attr($form_id).' is in the cache blacklist');
 
 				return true;
 			}
@@ -296,35 +296,35 @@ 
 	 *
 	 * @return mixed      False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
 	 */
-	public function get( $key = NULL ) {
+	public function get($key = NULL) {
 
-		$key = is_null( $key ) ? $this->key : $key;
+		$key = is_null($key) ? $this->key : $key;
 
-		if ( ! $this->use_cache() ) {
+		if (!$this->use_cache()) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results');
 
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key '.$key);
 
-		$result = get_transient( $key );
+		$result = get_transient($key);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result);
 
 			return false;
 
-		} elseif ( $result ) {
+		} elseif ($result) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key ' . $key );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key '.$key);
 
 			return $result;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key '.$key);
 
 		return NULL;
 
@@ -338,24 +338,24 @@ 
 	 * @param [type] $content     [description]
 	 * @param [type] $filter_name Name used to modify the cache time. Will be set to `gravityview_cache_time_{$filter_name}`.
 	 */
-	public function set( $content, $filter_name = '' ) {
+	public function set($content, $filter_name = '') {
 
 		// Don't cache empty results
-		if ( ! empty( $content ) ) {
+		if (!empty($content)) {
 
 			/**
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key '.$this->key.' for '.$cache_time.' seconds');
 
-			return set_transient( $this->key, $content, $cache_time );
+			return set_transient($this->key, $content, $cache_time);
 
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty');
 
 		return false;
 
@@ -371,39 +371,39 @@ 
 	 *
 	 * @return [type]           [description]
 	 */
-	public function delete( $form_ids = NULL ) {
+	public function delete($form_ids = NULL) {
 		global $wpdb;
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs' );
+		if (empty($form_ids)) {
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs');
 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			$key = $this->get_cache_key_prefix( $form_id );
+			$key = $this->get_cache_key_prefix($form_id);
 
 			// WordPress 4.0+
-			if ( is_callable( array( $wpdb, 'esc_like' ) ) ) {
-				$key = $wpdb->esc_like( $key );
+			if (is_callable(array($wpdb, 'esc_like'))) {
+				$key = $wpdb->esc_like($key);
 			} else {
-				$key = like_escape( $key );
+				$key = like_escape($key);
 			}
 
-			$key = "%" . $key . "%";
+			$key = "%".$key."%";
 
-			$sql = $wpdb->prepare( "DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
+			$sql = $wpdb->prepare("DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
 
-			$result = $wpdb->query( $sql );
+			$result = $wpdb->query($sql);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #' . $form_id, array(
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #'.$form_id, array(
 				$sql,
-				sprintf( 'Deleted results: %d', $result )
-			) );
+				sprintf('Deleted results: %d', $result)
+			));
 		}
 
 	}
@@ -421,14 +421,14 @@ 
 		 * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
 		 * @param boolean $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
 		 */
-		$cleanup = apply_filters( 'gravityview_cleanup_transients', true );
+		$cleanup = apply_filters('gravityview_cleanup_transients', true);
 
-		if ( ! $cleanup ) {
+		if (!$cleanup) {
 			return;
 		}
 
-		if ( ! wp_next_scheduled( 'gravityview-expired-transients' ) ) {
-			wp_schedule_event( time(), 'daily', 'gravityview-expired-transients' );
+		if (!wp_next_scheduled('gravityview-expired-transients')) {
+			wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
 		}
 	}
 
@@ -453,7 +453,7 @@ 
 		$threshold = time() - 60;
 
 		// get table name for options on specified blog
-		$table = $wpdb->get_blog_prefix( $blog_id ) . 'options';
+		$table = $wpdb->get_blog_prefix($blog_id).'options';
 
 		// delete expired transients, using the paired timeout record to find them
 		$sql = "
@@ -464,7 +464,7 @@ 
 			and t1.option_value < '$threshold'
 		";
 
-		$num_results = $wpdb->query( $sql );
+		$num_results = $wpdb->query($sql);
 
 		// delete orphaned transient expirations
 		// also delete NextGEN Gallery 2.x display cache timeout aliases
@@ -479,9 +479,9 @@ 
 			and option_value < '$threshold'
 		";
 
-		$num_results += $wpdb->query( $sql );
+		$num_results += $wpdb->query($sql);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted ' . $num_results . ' expired transient records from the database' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted '.$num_results.' expired transient records from the database');
 	}
 
 	/**
@@ -495,11 +495,11 @@ 
 
 		$use_cache = true;
 
-		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if (isset($_GET['cache']) || isset($_GET['nocache'])) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL');
 
 				$use_cache = false;
 			}
@@ -507,13 +507,13 @@ 
 		}
 
 		// Has the form been flagged as having changed items in it?
-		if ( $this->in_blacklist() ) {
+		if ($this->in_blacklist()) {
 
 			// Delete caches for all items with form IDs XYZ
-			$this->delete( $this->form_ids );
+			$this->delete($this->form_ids);
 
 			// Remove the form from
-			$this->blacklist_remove( $this->form_ids );
+			$this->blacklist_remove($this->form_ids);
 
 		}
 
@@ -524,9 +524,9 @@ 
 		 * @param[out,in]  boolean $use_cache Previous setting
 		 * @param[out] GravityView_Cache $this The GravityView_Cache object
 		 */
-		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
+		$use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }

includes/class-data.php

Spacing +164 added lines, -164 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -15,14 +15,14 @@ 
 	 *
 	 * @param null $passed_post
 	 */
-	private function __construct( $passed_post = NULL ) {
+	private function __construct($passed_post = NULL) {
 
-		if( !empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
+			$id_or_id_array = $this->maybe_get_view_id($passed_post);
 
-			if( !empty( $id_or_id_array ) ) {
-				$this->add_view( $id_or_id_array );
+			if (!empty($id_or_id_array)) {
+				$this->add_view($id_or_id_array);
 			}
 		}
 
@@ -34,7 +34,7 @@ 
 	public function has_multiple_views() {
 
 		//multiple views
-		return count( $this->get_views() ) > 1 ? true : false;
+		return count($this->get_views()) > 1 ? true : false;
 	}
 
 
@@ -52,37 +52,37 @@ 
 	 *
 	 * @return int|null|array ID of the View. If there are multiple views in the content, array of IDs parsed.
 	 */
-	public function maybe_get_view_id( $passed_post ) {
+	public function maybe_get_view_id($passed_post) {
 
 		$ids = array();
 
-		if( ! empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			if( is_numeric( $passed_post ) ) {
-				$passed_post = get_post( $passed_post );
+			if (is_numeric($passed_post)) {
+				$passed_post = get_post($passed_post);
 			}
 
 			// Convert WP_Posts into WP_Posts[] array
-			if( $passed_post instanceof WP_Post ) {
-				$passed_post = array( $passed_post );
+			if ($passed_post instanceof WP_Post) {
+				$passed_post = array($passed_post);
 			}
 
-			if( is_array( $passed_post ) ) {
+			if (is_array($passed_post)) {
 
-				foreach ( $passed_post as &$post) {
-					if( ( get_post_type( $post ) === 'gravityview' ) ) {
+				foreach ($passed_post as &$post) {
+					if ((get_post_type($post) === 'gravityview')) {
 						$ids[] = $post->ID;
-					} else{
+					} else {
 						// Parse the Post Content
-						$id = $this->parse_post_content( $post->post_content );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_content($post->post_content);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 
 						// Parse the Post Meta
-						$id = $this->parse_post_meta( $post->ID );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_meta($post->ID);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 					}
 
@@ -90,33 +90,33 @@ 
 
 			} else {
 
-				if ( is_string( $passed_post ) ) {
+				if (is_string($passed_post)) {
 
-					$id = $this->parse_post_content( $passed_post );
-					if( $id ) {
-						$ids = array_merge( $ids, (array) $id );
+					$id = $this->parse_post_content($passed_post);
+					if ($id) {
+						$ids = array_merge($ids, (array)$id);
 					}
 
 				} else {
-					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$id = $this->get_id_from_atts($passed_post);
+					$ids[] = intval($id);
 				}
 			}
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 	}
 
-	public static function getInstance( $passed_post = NULL ) {
+	public static function getInstance($passed_post = NULL) {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new GravityView_View_Data( $passed_post );
+		if (empty(self::$instance)) {
+			self::$instance = new GravityView_View_Data($passed_post);
 		}
 
 		return self::$instance;
@@ -126,25 +126,25 @@ 
 		return $this->views;
 	}
 
-	function get_view( $view_id, $atts = NULL ) {
+	function get_view($view_id, $atts = NULL) {
 
-		if( ! is_numeric( $view_id) ) {
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
+		if (!is_numeric($view_id)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id));
 			return false;
 		}
 
 		// Backup: the view hasn't been fetched yet. Doing it now.
-		if ( ! isset( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
-			return $this->add_view( $view_id, $atts );
+		if (!isset($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id));
+			return $this->add_view($view_id, $atts);
 		}
 
-		if ( empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
+		if (empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id));
 			return false;
 		}
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 	 * @return   bool          True if the post exists; otherwise, false.
 	 * @since    1.0.0
 	 */
-	function view_exists( $view_id ) {
-		return is_string( get_post_status( $view_id ) );
+	function view_exists($view_id) {
+		return is_string(get_post_status($view_id));
 	}
 
 	/**
@@ -168,56 +168,56 @@ 
 	 * @param array|string $atts Combine other attributes (eg. from shortcode) with the view settings (optional)
 	 * @return type
 	 */
-	function add_view( $view_id, $atts = NULL ) {
+	function add_view($view_id, $atts = NULL) {
 
 		// Handle array of IDs
-		if( is_array( $view_id ) ) {
-			foreach( $view_id as $id ) {
+		if (is_array($view_id)) {
+			foreach ($view_id as $id) {
 
-				$this->add_view( $id, $atts );
+				$this->add_view($id, $atts);
 			}
 
 			return $this->views;
 		}
 
 		// The view has been set already; returning stored view.
-		if ( !empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
-			return $this->views[ $view_id ];
+		if (!empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id));
+			return $this->views[$view_id];
 		}
 
-		if( ! $this->view_exists( $view_id ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
+		if (!$this->view_exists($view_id)) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id));
 			return false;
 		}
 
-		$form_id = gravityview_get_form_id( $view_id );
+		$form_id = gravityview_get_form_id($view_id);
 
-		if( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id));
 
 			return false;
 		}
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $view_id );
+		$view_settings = gravityview_get_template_settings($view_id);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings);
 
 		// Merge the view settings with the defaults
-		$view_defaults = wp_parse_args( $view_settings, self::get_default_args() );
+		$view_defaults = wp_parse_args($view_settings, self::get_default_args());
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults);
 
-		if( ! empty( $atts ) && is_array( $atts ) ) {
+		if (!empty($atts) && is_array($atts)) {
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts);
 
 			// Get the settings from the shortcode and merge them with defaults.
-			$atts = shortcode_atts( $view_defaults, $atts );
+			$atts = shortcode_atts($view_defaults, $atts);
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts);
 
 		} else {
 
@@ -226,24 +226,24 @@ 
 
 		}
 
-		unset( $atts['id'], $view_defaults, $view_settings );
+		unset($atts['id'], $view_defaults, $view_settings);
 
 		$data = array(
 			'id' => $view_id,
 			'view_id' => $view_id,
 			'form_id' => $form_id,
-			'template_id' => gravityview_get_template_id( $view_id ),
+			'template_id' => gravityview_get_template_id($view_id),
 			'atts' => $atts,
-			'fields' => $this->get_fields( $view_id ),
-			'widgets' => get_post_meta( $view_id, '_gravityview_directory_widgets', true ),
-			'form' => gravityview_get_form( $form_id ),
+			'fields' => $this->get_fields($view_id),
+			'widgets' => get_post_meta($view_id, '_gravityview_directory_widgets', true),
+			'form' => gravityview_get_form($form_id),
 		);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data);
 
-		$this->views[ $view_id ] = $data;
+		$this->views[$view_id] = $data;
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -253,14 +253,14 @@ 
 	 * @param  int $view_id View ID
 	 * @return array          Array of fields as passed by `gravityview_get_directory_fields()`
 	 */
-	function get_fields( $view_id ) {
+	function get_fields($view_id) {
 
-		$dir_fields = gravityview_get_directory_fields( $view_id );
-		do_action( 'gravityview_log_debug', '[render_view] Fields: ', $dir_fields );
+		$dir_fields = gravityview_get_directory_fields($view_id);
+		do_action('gravityview_log_debug', '[render_view] Fields: ', $dir_fields);
 
 		// remove fields according to visitor visibility permissions (if logged-in)
-		$dir_fields = $this->filter_fields( $dir_fields );
-		do_action( 'gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields );
+		$dir_fields = $this->filter_fields($dir_fields);
+		do_action('gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields);
 
 		return $dir_fields;
 	}
@@ -272,18 +272,18 @@ 
 	 * @param array $dir_fields
 	 * @return array
 	 */
-	private function filter_fields( $dir_fields ) {
+	private function filter_fields($dir_fields) {
 
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
+		if (empty($dir_fields) || !is_array($dir_fields)) {
 			return $dir_fields;
 		}
 
-		foreach( $dir_fields as $area => $fields ) {
+		foreach ($dir_fields as $area => $fields) {
 
-			foreach( (array)$fields as $uniqid => $properties ) {
+			foreach ((array)$fields as $uniqid => $properties) {
 
-				if( $this->hide_field_check_conditions( $properties ) ) {
-					unset( $dir_fields[ $area ][ $uniqid ] );
+				if ($this->hide_field_check_conditions($properties)) {
+					unset($dir_fields[$area][$uniqid]);
 				}
 
 			}
@@ -301,31 +301,31 @@ 
 	 * @param array $properties
 	 * @return void|boolean (field should be hidden) or false (field should be presented)
 	 */
-	private function hide_field_check_conditions( $properties ) {
+	private function hide_field_check_conditions($properties) {
 
 		// logged-in visibility
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
+		if (!empty($properties['only_loggedin']) && !GVCommon::has_cap($properties['only_loggedin_cap'])) {
 			return true;
 		}
 
 		return false;
 	}
 
-	function get_id_from_atts( $atts ) {
+	function get_id_from_atts($atts) {
 
-		$atts = is_array( $atts ) ? $atts : shortcode_parse_atts( $atts );
+		$atts = is_array($atts) ? $atts : shortcode_parse_atts($atts);
 
 		// Get the settings from the shortcode and merge them with defaults.
-		$atts = wp_parse_args( $atts, self::get_default_args() );
+		$atts = wp_parse_args($atts, self::get_default_args());
 
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
+		$view_id = !empty($atts['view_id']) ? (int)$atts['view_id'] : NULL;
 
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
+		if (empty($view_id) && !empty($atts['id'])) {
 			$view_id = (int)$atts['id'];
 		}
 
-		if( empty( $view_id ) ) {
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
+		if (empty($view_id)) {
+			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts);
 			return;
 		}
 
@@ -341,50 +341,50 @@ 
 	 * @param  string $content $post->post_content content
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, NULL
 	 */
-	function parse_post_content( $content ) {
+	function parse_post_content($content) {
 
 		/**
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
 		 * @since 1.6
 		 */
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
+		if (!shortcode_exists('gravityview') && class_exists('GravityView_Shortcode')) {
 			new GravityView_Shortcode;
 		}
 
-		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
+		$shortcodes = gravityview_has_shortcode_r($content, 'gravityview');
 
-		if( empty( $shortcodes ) ) {
+		if (empty($shortcodes)) {
 			return NULL;
 		}
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes);
 
 		$ids = array();
 
 		foreach ($shortcodes as $key => $shortcode) {
 
-			$args = shortcode_parse_atts( $shortcode[3] );
+			$args = shortcode_parse_atts($shortcode[3]);
 
-			if( empty( $args['id'] ) ) {
-				do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
+			if (empty($args['id'])) {
+				do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID), $shortcode);
 				continue;
 			}
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args);
 
 			// Store the View to the object for later fetching.
-			$this->add_view( $args['id'], $args );
+			$this->add_view($args['id'], $args);
 
 			$ids[] = $args['id'];
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 
 	}
 
@@ -395,7 +395,7 @@ 
 	 * @param int $post_id WP_Post ID
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, or meta not parsed, NULL
 	 */
-	private function parse_post_meta( $post_id ) {
+	private function parse_post_meta($post_id) {
 
 		/**
 		 * @filter `gravityview/data/parse/meta_keys` Define meta keys to parse to check for GravityView shortcode content
@@ -403,32 +403,32 @@ 
 		 * @param[in,out] array $meta_keys Array of key values to check. If empty, do not check. Default: empty array
 		 * @param[in] int $post_id ID of the post being checked
 		 */
-		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
+		$meta_keys = (array)apply_filters('gravityview/data/parse/meta_keys', array(), $post_id);
 
-		if( empty( $meta_keys ) ) {
+		if (empty($meta_keys)) {
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys);
 
 		$meta_content = '';
 
-		foreach( $meta_keys as $key ) {
-			$meta = get_post_meta( $post_id, $key , true );
-			if( ! is_string( $meta ) ) {
+		foreach ($meta_keys as $key) {
+			$meta = get_post_meta($post_id, $key, true);
+			if (!is_string($meta)) {
 				continue;
 			}
-			$meta_content .= $meta . ' ';
+			$meta_content .= $meta.' ';
 		}
 
-		if( empty( $meta_content ) ) {
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
+		if (empty($meta_content)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id), $meta_keys);
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content);
 
-		return $this->parse_post_content( $meta_content );
+		return $this->parse_post_content($meta_content);
 
 	}
 
@@ -444,61 +444,61 @@ 
 	 *
 	 * @return bool|WP_Error If valid, returns true. If invalid, returns WP_Error containing error message.
 	 */
-	public static function is_valid_embed_id( $post_id = '', $view_id = '', $empty_is_valid = true ) {
+	public static function is_valid_embed_id($post_id = '', $view_id = '', $empty_is_valid = true) {
 
 		$message = NULL;
 
 		// Not invalid if not set!
-		if( empty( $post_id ) || empty( $view_id ) ) {
+		if (empty($post_id) || empty($view_id)) {
 
-			if( $empty_is_valid ) {
+			if ($empty_is_valid) {
 				return true;
 			}
 
-			$message = esc_html__( 'The ID is required.', 'gravityview' );
+			$message = esc_html__('The ID is required.', 'gravityview');
 		}
 
-		if( ! $message ) {
-			$status = get_post_status( $post_id );
+		if (!$message) {
+			$status = get_post_status($post_id);
 
 			// Nothing exists with that post ID.
-			if ( ! is_numeric( $post_id ) ) {
-				$message = esc_html__( 'You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview' );
+			if (!is_numeric($post_id)) {
+				$message = esc_html__('You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview');
 
 				// @todo Convert to generic article about Embed IDs
-				$message .= ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				$message .= ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview'), 'target=_blank');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// Nothing exists with that post ID.
-			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
-				$message = esc_html__( 'There is no post or page with that ID.', 'gravityview' );
+			if (empty($status) || in_array($status, array('revision', 'attachment'))) {
+				$message = esc_html__('There is no post or page with that ID.', 'gravityview');
 			}
 
 		}
 
-		if( ! $message ) {
-			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
+		if (!$message) {
+			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id($post_id);
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
-				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
+			if (false === in_array($view_id, (array)$view_ids_in_post)) {
+				$message = sprintf(esc_html__('The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview'), '<br /><code>[gravityview id="'.intval($view_id).'"]</code>');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// It's a View
-			if( 'gravityview' === get_post_type( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+			if ('gravityview' === get_post_type($post_id)) {
+				$message = esc_html__('The ID is already a View.', 'gravityview'); ;
 			}
 
 		}
 
-		if( $message ) {
-			return new WP_Error( 'invalid_embed_id', $message );
+		if ($message) {
+			return new WP_Error('invalid_embed_id', $message);
 		}
 
 		return true;
@@ -510,13 +510,13 @@ 
 	 * @param  boolean $with_details Include details
 	 * @return mixed|array                If using $with_details, return array. Otherwise, mixed.
 	 */
-	public static function get_default_arg( $key, $with_details = false ) {
+	public static function get_default_arg($key, $with_details = false) {
 
-		$args = self::get_default_args( $with_details );
+		$args = self::get_default_args($with_details);
 
-		if( !isset( $args[ $key ] ) ) { return NULL; }
+		if (!isset($args[$key])) { return NULL; }
 
-		return $args[ $key ];
+		return $args[$key];
 	}
 
 	/**
@@ -535,13 +535,13 @@ 
 	 *      @param[out] array  $options Array of values to use when generating select, multiselect, radio, or checkboxes fields
 	 *      @param[out] boolean $full_width True: Display the input and label together when rendering. False: Display label and input in separate columns when rendering.
 	 */
-	public static function get_default_args( $with_details = false, $group = NULL ) {
+	public static function get_default_args($with_details = false, $group = NULL) {
 
 		/**
 		 * @filter `gravityview_default_args` Modify the default settings for new Views
 		 * @param[in,out] array $default_args Array of default args.
 		 */
-		$default_settings = apply_filters( 'gravityview_default_args', array(
+		$default_settings = apply_filters('gravityview_default_args', array(
 			'id' => array(
 				'label' => __('View ID', 'gravityview'),
 				'type' => 'number',
@@ -559,7 +559,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'lightbox' => array(
-				'label' => __( 'Enable lightbox for images', 'gravityview' ),
+				'label' => __('Enable lightbox for images', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 1,
@@ -567,29 +567,29 @@ 
 				'show_in_shortcode' => true,
 			),
 			'show_only_approved' => array(
-				'label' => __( 'Show only approved entries', 'gravityview' ),
+				'label' => __('Show only approved entries', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_until_searched' => array(
-				'label' => __( 'Hide View data until search is performed', 'gravityview' ),
+				'label' => __('Hide View data until search is performed', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
-				'tooltip' => __( 'When enabled it will only show any View entries after a search is performed.', 'gravityview' ),
+				'tooltip' => __('When enabled it will only show any View entries after a search is performed.', 'gravityview'),
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_empty' => array(
-				'label' 	=> __( 'Hide empty fields', 'gravityview' ),
+				'label' 	=> __('Hide empty fields', 'gravityview'),
 				'group'	=> 'default',
 				'type'	=> 'checkbox',
 				'value' => 1,
 				'show_in_shortcode' => false,
 			),
 			'user_edit' => array(
-				'label'	=> __( 'Allow User Edit', 'gravityview' ),
+				'label'	=> __('Allow User Edit', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -598,7 +598,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
-				'label'	=> __( 'Allow User Delete', 'gravityview' ),
+				'label'	=> __('Allow User Delete', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -612,8 +612,8 @@ 
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __('Default', 'gravityview'),
+					'date_created' => __('Date Created', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -630,19 +630,19 @@ 
 				'show_in_shortcode' => true,
 			),
 			'sort_columns' => array(
-				'label' 	=> __( 'Enable sorting by column', 'gravityview' ),
-				'left_label' => __( 'Column Sorting', 'gravityview' ),
+				'label' 	=> __('Enable sorting by column', 'gravityview'),
+				'left_label' => __('Column Sorting', 'gravityview'),
 				'type' => 'checkbox',
 				'value' => false,
 				'group'	=> 'sort',
 				'tooltip' => NULL,
 				'show_in_shortcode' => true,
-				'show_in_template' => array( 'default_table' ),
+				'show_in_template' => array('default_table'),
 			),
 			'start_date' => array(
 				'label' 	=> __('Filter by Start Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -651,7 +651,7 @@ 
 			'end_date' => array(
 				'label' 	=> __('Filter by End Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -711,12 +711,12 @@ 
 		));
 
 		// By default, we only want the key => value pairing, not the whole array.
-		if( empty( $with_details ) ) {
+		if (empty($with_details)) {
 
 			$defaults = array();
 
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ($default_settings as $key => $value) {
+				$defaults[$key] = $value['value'];
 			}
 
 			return $defaults;
@@ -729,9 +729,9 @@ 
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
-				if( !empty( $group ) && is_string( $group ) ) {
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
-						unset( $default_settings[ $key ] );
+				if (!empty($group) && is_string($group)) {
+					if (empty($value['group']) || $value['group'] !== $group) {
+						unset($default_settings[$key]);
 					}
 				}
 

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();
 		}
 
@@ -50,8 +50,8 @@ 
 	 * Should the panel be shown? If there are notices or warnings, yes.
 	 * @return boolean true: show panel; false: hide panel
 	 */
-	function set_visible( $visible = '' ) {
-		$this->_visible = ( count( $this->get_notices() ) || count( $this->get_warnings() ) );
+	function set_visible($visible = '') {
+		$this->_visible = (count($this->get_notices()) || count($this->get_warnings()));
 	}
 
 	/**
@@ -83,42 +83,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>';
 		}
 
@@ -133,12 +133,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 {
@@ -154,31 +154,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-gravityview-admin-bar.php

Spacing +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 	 * @since 1.13
 	 */
 	private function add_hooks() {
-		add_action( 'add_admin_bar_menus', array( $this, 'remove_links' ), 80 );
-		add_action( 'admin_bar_menu', array( $this, 'add_links' ), 85 );
+		add_action('add_admin_bar_menus', array($this, 'remove_links'), 80);
+		add_action('admin_bar_menu', array($this, 'add_links'), 85);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 
 		$entry_id = $this->gravityview_view->getSingleEntry();
 
-		if ( $entry_id && GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ), $entry_id ) ) {
+		if ($entry_id && GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_entries'), $entry_id)) {
 
 			$entry = $this->gravityview_view->getEntry();
 
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit-entry',
-				'title' => __( 'Edit Entry', 'gravityview' ),
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
-			) );
+				'title' => __('Edit Entry', 'gravityview'),
+				'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id']))),
+			));
 
 		}
 	}
@@ -78,7 +78,7 @@ 
 		/** @var WP_Admin_Bar $wp_admin_bar */
 		global $wp_admin_bar;
 
-		if( GVCommon::has_cap('edit_gravityviews') ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
 			$view_data = GravityView_View_Data::getInstance();
 
@@ -86,15 +86,15 @@ 
 
 			// If there is a View embed, shor Edit View link.
 			// todo: Support multiple View embeds with a drop-down menu
-			if ( ! $this->gravityview_view->isGravityviewPostType() && ! empty( $views ) && ! $view_data->has_multiple_views() ) {
-				$view = reset( $views );
+			if (!$this->gravityview_view->isGravityviewPostType() && !empty($views) && !$view_data->has_multiple_views()) {
+				$view = reset($views);
 
-				if( GVCommon::has_cap( 'edit_gravityview', $view['id'] ) ) {
-					$wp_admin_bar->add_menu( array(
+				if (GVCommon::has_cap('edit_gravityview', $view['id'])) {
+					$wp_admin_bar->add_menu(array(
 						'id'    => 'edit-view',
-						'title' => __( 'Edit View', 'gravityview' ),
-						'href'  => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view['id'] ) ) ),
-					) );
+						'title' => __('Edit View', 'gravityview'),
+						'href'  => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view['id']))),
+					));
 				}
 			}
 		}
@@ -108,8 +108,8 @@ 
 	function remove_links() {
 
 		// If we're on the single entry page, we don't want to cause confusion.
-		if ( is_admin() || ( $this->gravityview_view->getSingleEntry() && ! $this->gravityview_view->isGravityviewPostType() ) ) {
-			remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		if (is_admin() || ($this->gravityview_view->getSingleEntry() && !$this->gravityview_view->isGravityviewPostType())) {
+			remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 		}
 	}
 }