gravityview / GravityView

includes/class-gravityview-entry-list.php

Spacing +12 added lines, -12 removed lines

@@ -179,8 +179,8 @@ 
 	public function get_output() {
 
 		// No Entries
-		if( empty( $this->entries ) ) {
-			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
+		if ( empty( $this->entries ) ) {
+			return '<div class="gv-no-results">' . $this->empty_message . '</div>';
 		}
 
 		$output = '';
@@ -191,18 +191,18 @@ 
 			$current_entry = GravityView_View::getInstance()->getCurrentEntry();
 		}
 
-		$output .= '<'. $this->wrapper_tag .'>';
+		$output .= '<' . $this->wrapper_tag . '>';
 
-		foreach( $this->entries as $entry ) {
+		foreach ( $this->entries as $entry ) {
 
-			if( $this->skip_entry( $entry, $current_entry ) ) {
+			if ( $this->skip_entry( $entry, $current_entry ) ) {
 				continue;
 			}
 
 			$output .= $this->get_item_output( $entry );
 		}
 
-		$output .= '</'. $this->wrapper_tag .'>';
+		$output .= '</' . $this->wrapper_tag . '>';
 
 		/**
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
@@ -225,15 +225,15 @@ 
 	private function skip_entry( $entry, $current_entry ) {
 
 		// If skip entry is off, or there's no current entry, return false
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
+		if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
 			return false;
 		}
 
 		// If in Single or Edit mode, $current_entry will be an array.
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
+		$current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry;
 
 		// If the entry ID matches the current entry, yes: skip
-		if( $entry['id'] === $current_entry_id ) {
+		if ( $entry[ 'id' ] === $current_entry_id ) {
 			return true;
 		}
 
@@ -260,7 +260,7 @@ 
 
 		$item_output = gravityview_get_link( $link, $this->link_format );
 
-		if( !empty( $this->after_link ) ) {
+		if ( ! empty( $this->after_link ) ) {
 
 			/**
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -269,14 +269,14 @@ 
 			 * @param array $entry Gravity Forms entry array
 			 * @param GravityView_Entry_List $this The current class instance
 			 */
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
+			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this );
 
 			$item_output .= $after_link;
 		}
 
 		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
 
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
+		$item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>';
 
 		/**
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list

includes/wordpress-widgets/class-gravityview-recent-entries-widget.php

Spacing +64 added lines, -64 removed lines

@@ -12,7 +12,7 @@ 
 
 	function __construct( ) {
 
-		$name = __('GravityView Recent Entries', 'gravityview');
+		$name = __( 'GravityView Recent Entries', 'gravityview' );
 
 		$widget_options = array(
 			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
@@ -25,7 +25,7 @@ 
 
 	private function initialize() {
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 
 		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
 
@@ -38,21 +38,21 @@ 
 	 */
 	function ajax_get_view_merge_tag_data() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajax_widget' ) ) {
 			exit( false );
 		}
 
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
+		$form_id = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
 		$form = RGFormsModel::get_form_meta( $form_id );
 
 		$output = array(
 			'form' => array(
-				'id' => $form['id'],
-				'title' => $form['title'],
-				'fields' => $form['fields'],
+				'id' => $form[ 'id' ],
+				'title' => $form[ 'title' ],
+				'fields' => $form[ 'fields' ],
 			),
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
+			'mergeTags' => GFCommon::get_merge_tags( $form[ 'fields' ], '', false ),
 		);
 
 		echo json_encode( $output );
@@ -68,17 +68,17 @@ 
 	function admin_enqueue_scripts() {
 		global $pagenow;
 
-		if( $pagenow === 'widgets.php' ) {
+		if ( $pagenow === 'widgets.php' ) {
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
 
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
-			));
+			) );
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
 		}
 
 	}
@@ -93,19 +93,19 @@ 
 	function widget( $args, $instance ) {
 
 		// Don't have the Customizer render too soon.
-		if( empty( $instance['view_id'] ) ) {
+		if ( empty( $instance[ 'view_id' ] ) ) {
 			return;
 		}
 
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
 
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
 
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
-		if ( !empty( $title ) ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ( ! empty( $title ) ) {
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		/**
@@ -125,7 +125,7 @@ 
 		 */
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	private function get_output( $instance ) {
 
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
 
 		$form = gravityview_get_form( $form_id );
 
@@ -149,13 +149,13 @@ 
 		 * @since 1.6.1
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
 		 */
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
 
 		/**
 		 * Generate list output
 		 * @since 1.7.2
 		 */
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget' );
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget' );
 
 		$output = $List->get_output();
 
@@ -180,30 +180,30 @@ 
 	private function get_entries( $instance, $form_id ) {
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
+		$view_settings = gravityview_get_template_settings( $instance[ 'view_id' ] );
 
         // Set the context view ID to avoid conflicts with the Advanced Filter extension.
-        $criteria['context_view_id'] = $instance['view_id'];
+        $criteria[ 'context_view_id' ] = $instance[ 'view_id' ];
 
-		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
-		$view_settings['id'] = $instance['view_id'];
-		$view_settings['page_size'] = $instance['limit'];
+		$instance[ 'limit' ] = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
+		$view_settings[ 'id' ] = $instance[ 'view_id' ];
+		$view_settings[ 'page_size' ] = $instance[ 'limit' ];
 
 		// Prepare paging criteria
-		$criteria['paging'] = array(
+		$criteria[ 'paging' ] = array(
 			'offset' => 0,
-			'page_size' => $instance['limit']
+			'page_size' => $instance[ 'limit' ]
 		);
 
 		// Prepare Search Criteria
-		$criteria['search_criteria'] = array( 'field_filters' => array() );
-		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria['search_criteria']);
-		$criteria['search_criteria']['status'] = apply_filters( 'gravityview_status', 'active', $view_settings );
+		$criteria[ 'search_criteria' ] = array( 'field_filters' => array() );
+		$criteria[ 'search_criteria' ] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria[ 'search_criteria' ] );
+		$criteria[ 'search_criteria' ][ 'status' ] = apply_filters( 'gravityview_status', 'active', $view_settings );
 
 		/**
 		 * Modify the search parameters before the entries are fetched
 		 */
-		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
+		$criteria = apply_filters( 'gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
 
 		$results = GVCommon::get_entries( $form_id, $criteria );
 
@@ -224,23 +224,23 @@ 
 		$instance = $new_instance;
 
 		// Force positive number
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
 
-		$instance['view_id'] = intval( $instance['view_id'] );
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
 
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
 
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
 
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance[ 'updated' ] = 1;
 
 		/**
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -262,22 +262,22 @@ 
 
 		// Set up some default widget settings.
 		$defaults = array(
-			'title' 			=> __('Recent Entries', 'gravityview'),
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
 			'view_id'           => NULL,
 			'post_id'           => NULL,
 			'limit'            => 10,
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
 			'after_link'        => ''
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args( (array)$instance, $defaults );
 
 		?>
 
 		<!-- Title -->
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'title' ] ); ?>" />
 		</p>
 
 		<!-- Download -->
@@ -290,7 +290,7 @@ 
 		$views = get_posts( $args );
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
+		if ( empty( $views ) ) {
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
 			return;
 		}
@@ -302,10 +302,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
 			?>
 			<div class="error inline hide-on-view-change">
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -313,14 +313,14 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
 			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
 				<?php
 
-				foreach( $views as $view ) {
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+				foreach ( $views as $view ) {
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
 				}
 
 				?>
@@ -332,10 +332,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
 			?>
 			<div class="error inline">
-				<p><?php echo $instance['error_post_id']; ?></p>
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -343,11 +343,11 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'post_id' ] ); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
+				echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
 				?></span>
 		</p>
 
@@ -355,21 +355,21 @@ 
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
 			</label>
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
+			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance[ 'limit' ] ); ?>" size="3" />
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
 			</label>
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
+			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'link_format' ] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
 			</label>
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
+			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance[ 'after_link' ] ); ?></textarea>
 		</p>
 
 		<?php
@@ -379,7 +379,7 @@ 
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
 		 * @param array $instance Current widget instance
 		 */
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
 
 		?>
 

includes/wordpress-widgets/class-gravityview-search-wp-widget.php

Spacing +56 added lines, -56 removed lines

@@ -11,7 +11,7 @@ 
 
 		$widget_ops = array(
 			'classname' => 'widget_gravityview_search',
-			'description' => __( 'A search form for a specific GravityView.', 'gravityview')
+			'description' => __( 'A search form for a specific GravityView.', 'gravityview' )
 		);
 
 		$widget_display = array(
@@ -34,7 +34,7 @@ 
 	}
 
 	private function load_required_files() {
-		if( !class_exists( 'GravityView_Widget_Search' ) ) {
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
 			gravityview_register_gravityview_widgets();
 		}
 	}
@@ -53,7 +53,7 @@ 
 	public function widget( $args, $instance ) {
 
 		// Don't show unless a View ID has been set.
-		if( empty( $instance['view_id'] ) ) {
+		if ( empty( $instance[ 'view_id' ] ) ) {
 
 			gravityview()->log->debug( 'No View ID has been defined. Not showing the widget.', array( 'data' => $instance ) );
 
@@ -61,22 +61,22 @@ 
 		}
 
 		/** This filter is documented in wp-includes/default-widgets.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base );
 
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
 		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		// @todo Add to the widget configuration form
-		$instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
+		$instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
 
-		$instance['context'] = 'wp_widget';
+		$instance[ 'context' ] = 'wp_widget';
 
 		// form
-		$instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] );
-		$instance['form'] = GVCommon::get_form( $instance['form_id'] );
+		$instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] );
+		$instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] );
 
 		// We don't want to overwrite existing context, etc.
 		$previous_view = GravityView_View::getInstance();
@@ -92,7 +92,7 @@ 
 		 */
 		new GravityView_View( $previous_view );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	/**
@@ -102,27 +102,27 @@ 
 
 		$instance = $old_instance;
 
-		if( $this->is_preview() ) {
+		if ( $this->is_preview() ) {
 			//Oh! Sorry but still not fully compatible with customizer
 			return $instance;
 		}
 
-		$new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() );
+		$new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() );
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
-		$instance['view_id'] = absint( $new_instance['view_id'] );
-		$instance['search_fields'] = $new_instance['search_fields'];
-		$instance['post_id'] = $new_instance['post_id'];
-		$instance['search_clear'] = $new_instance['search_clear'];
-		$instance['search_mode'] = $new_instance['search_mode'];
+		$instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] );
+		$instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] );
+		$instance[ 'search_fields' ] = $new_instance[ 'search_fields' ];
+		$instance[ 'post_id' ] = $new_instance[ 'post_id' ];
+		$instance[ 'search_clear' ] = $new_instance[ 'search_clear' ];
+		$instance[ 'search_mode' ] = $new_instance[ 'search_mode' ];
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'], true );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ], true );
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance[ 'updated' ] = 1;
 
 		return $instance;
 	}
@@ -133,28 +133,28 @@ 
 	public function form( $instance ) {
 
 		// @todo Make compatible with Customizer
-		if( $this->is_preview() ) {
+		if ( $this->is_preview() ) {
 
-			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' );
+			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="' . admin_url( 'widgets.php' ) . '">', '</a>' );
 
 			echo wpautop( GravityView_Admin::get_floaty() . $warning );
 
 			return;
 		}
 
-		$instance = wp_parse_args( (array) $instance, self::get_defaults() );
+		$instance = wp_parse_args( (array)$instance, self::get_defaults() );
 
-		$title    = $instance['title'];
-		$view_id  = $instance['view_id'];
-		$post_id  = $instance['post_id'];
-		$search_fields = $instance['search_fields'];
-		$search_clear = $instance['search_clear'];
-		$search_mode = $instance['search_mode'];
+		$title    = $instance[ 'title' ];
+		$view_id  = $instance[ 'view_id' ];
+		$post_id  = $instance[ 'post_id' ];
+		$search_fields = $instance[ 'search_fields' ];
+		$search_clear = $instance[ 'search_clear' ];
+		$search_mode = $instance[ 'search_mode' ];
 
 		$views = GVCommon::get_all_views();
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) { ?>
+		if ( empty( $views ) ) { ?>
 			<div id="select_gravityview_view">
 				<div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div>
 			</div>
@@ -162,17 +162,17 @@ 
 		}
 		?>
 
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'gravityview' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
 
 		<?php
 		/**
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
 			?>
 			<div class="error inline hide-on-view-change">
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -181,12 +181,12 @@ 
 
 		<p>
 			<label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label>
-			<select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat">
+			<select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat">
 				<option value=""><?php esc_html_e( '&mdash; Select a View &mdash;', 'gravityview' ); ?></option>
 				<?php
-				foreach( $views as $view_option ) {
-					$title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title;
-					echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>';
+				foreach ( $views as $view_option ) {
+					$title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title;
+					echo '<option value="' . $view_option->ID . '" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>' . esc_html( sprintf( '%s #%d', $title, $view_option->ID ) ) . '</option>';
 				}
 				?>
 			</select>
@@ -198,10 +198,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
 			?>
 			<div class="error inline">
-				<p><?php echo $instance['error_post_id']; ?></p>
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -209,40 +209,40 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
+				echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
 				?></span>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
-			<input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0">
-			<input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
+			<label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
+			<input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0">
+			<input id="<?php echo $this->get_field_id( 'search_clear' ); ?>" name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
 		</p>
 
 		<p>
 			<label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label>
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_any">
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any">
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
 				<?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?>
 			</label>
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_all">
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all">
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
 				<?php esc_html_e( 'Match All Fields', 'gravityview' ); ?>
 			</label>
-			<span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span
+			<span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span
 		</p>
 
 		<hr />
 
 		<?php // @todo: move style to CSS ?>
 		<div style="margin-bottom: 1em;">
-			<label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
-			<div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>">
-				<input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
+			<label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
+			<div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>">
+				<input id="<?php echo $this->get_field_id( 'search_fields' ); ?>" name="<?php echo $this->get_field_name( 'search_fields' ); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
 			</div>
 
 		</div>

includes/class-ajax.php

Spacing +72 added lines, -72 removed lines

@@ -36,7 +36,7 @@ 
 		 * 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;
 		}
 
@@ -50,7 +50,7 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
 			$this->_exit( false );
 		}
 	}
@@ -67,14 +67,14 @@ 
 		//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'] );
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 			/** @see GravityView_Admin_Views::render_available_fields */
 			do_action( 'gravityview_render_available_fields', $form, $context );
@@ -96,17 +96,17 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
-		$response['directory'] = ob_get_clean();
+		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 );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -121,20 +121,20 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		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 ) ) {
+		if ( ! empty( $preset_fields_path ) ) {
 			$presets = $this->import_fields( $preset_fields_path );
 		} else {
 			$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' );
@@ -144,20 +144,20 @@ 
 		$default_widget_areas = GravityView_Widget::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
-		$response['header'] = ob_get_clean();
+		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'] );
-		$response['footer'] = ob_get_clean();
+		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'] );
-		$response['directory'] = ob_get_clean();
+		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'] );
-		$response['single'] = ob_get_clean();
+		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 );
 
@@ -175,26 +175,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			gravityview()->log->error( '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 );
 
 		// get the form ID
-		if( false === $form ) {
+		if ( false === $form ) {
 			// send error to user
-			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int) $_POST['template_id'] ) );
+			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int)$_POST[ 'template_id' ] ) );
 
 			$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>' );
 
 	}
 
@@ -208,7 +208,7 @@ 
 
 		gravityview()->log->debug( '[import_form] Import Preset Form. (File) {path}', array( 'path' => $xml_or_json_path ) );
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
 			gravityview()->log->error( 'Class GFExport or file not found. file: {path}', array( 'path' => $xml_or_json_path ) );
 			return false;
 		}
@@ -220,13 +220,13 @@ 
 		gravityview()->log->debug( '[import_form] Importing form (Result) {count}', array( 'count' => $count ) );
 		gravityview()->log->debug( '[import_form] Importing form (Form) ', array( 'data' => $forms ) );
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
 			gravityview()->log->error( 'Form Import Failed!' );
 			return false;
 		}
 
 		// import success - return form id
-		return $forms[0];
+		return $forms[ 0 ];
 	}
 
 
@@ -240,7 +240,7 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 		
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
 			gravityview()->log->error( 'Required fields were not set in the $_POST request. ' );
 			$this->_exit( false );
 		}
@@ -252,11 +252,11 @@ 
 		$_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;
 
-		$form_id = empty( $_post['form_id'] ) ? null : $_post['form_id'];
-		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$form_id = empty( $_post[ 'form_id' ] ) ? null : $_post[ 'form_id' ];
+		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
 
 		$response = gravityview_strip_whitespace( $response );
 
@@ -277,15 +277,15 @@ 
 		$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' ] );
 
 		}
 
@@ -301,27 +301,27 @@ 
 	 * @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 ) ) {
+		if ( empty( $template_id ) ) {
 			gravityview()->log->error( 'Template ID not set.' );
 			return false;
 		} else {
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
+			if ( ! file_exists( $form_file ) ) {
 				gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. File not found. file: {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
 		} else {
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
+		if ( file_exists( $xml_parser ) ) {
 			require_once( $xml_parser );
 		} else {
 			gravityview()->log->debug( ' - Gravity Forms XML Parser not found {path}.', array( 'path' => $xml_parser ) );
@@ -332,32 +332,32 @@ 
 		$xmlstr = file_get_contents( $form_file );
 
         $options = array(
-            "page" => array("unserialize_as_array" => true),
-            "form"=> array("unserialize_as_array" => true),
-            "field"=> array("unserialize_as_array" => true),
-            "rule"=> array("unserialize_as_array" => true),
-            "choice"=> array("unserialize_as_array" => true),
-            "input"=> array("unserialize_as_array" => true),
-            "routing_item"=> array("unserialize_as_array" => true),
-            "creditCard"=> array("unserialize_as_array" => true),
-            "routin"=> array("unserialize_as_array" => true),
-            "confirmation" => array("unserialize_as_array" => true),
-            "notification" => array("unserialize_as_array" => true)
+            "page" => array( "unserialize_as_array" => true ),
+            "form"=> array( "unserialize_as_array" => true ),
+            "field"=> array( "unserialize_as_array" => true ),
+            "rule"=> array( "unserialize_as_array" => true ),
+            "choice"=> array( "unserialize_as_array" => true ),
+            "input"=> array( "unserialize_as_array" => true ),
+            "routing_item"=> array( "unserialize_as_array" => true ),
+            "creditCard"=> array( "unserialize_as_array" => true ),
+            "routin"=> array( "unserialize_as_array" => true ),
+            "confirmation" => array( "unserialize_as_array" => true ),
+            "notification" => array( "unserialize_as_array" => true )
         );
 
-		$xml = new RGXML($options);
-        $forms = $xml->unserialize($xmlstr);
+		$xml = new RGXML( $options );
+        $forms = $xml->unserialize( $xmlstr );
 
-        if( !$forms ) {
+        if ( ! $forms ) {
         	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
-        	$form = $forms[0];
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
+        	$form = $forms[ 0 ];
         }
 
-        if( empty( $form ) ) {
+        if ( empty( $form ) ) {
         	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
         	return false;
         }
@@ -376,38 +376,38 @@ 
 	 */
 	function import_fields( $file ) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
+		if ( empty( $file ) || ! file_exists( $file ) ) {
 			gravityview()->log->error( 'Importing Preset Fields. File not found. (File) {path}', array( 'path' => $file ) );
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
+		if ( ! class_exists( 'WXR_Parser' ) ) {
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
 		$presets = $parser->parse( $file );
 
-		if(is_wp_error( $presets )) {
+		if ( is_wp_error( $presets ) ) {
 			gravityview()->log->error( 'Importing Preset Fields failed. Threw WP_Error.', array( 'data' => $presets ) );
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
 			gravityview()->log->error( 'Importing Preset Fields failed. Meta not found in file. {path}', array( 'path' => $file ) );
 			return false;
 		}
 
-		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets['posts'][0]['postmeta'] ) );
+		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) );
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
-			switch ($meta['key']) {
+		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;
 			}
 		}

includes/connector-functions.php

Spacing +9 added lines, -9 removed lines

@@ -333,8 +333,8 @@ 
  * @param  mixed $field_id Field ID or Field array
  * @return string field type
  */
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
-	return GVCommon::get_field_type(  $form, $field_id );
+function gravityview_get_field_type( $form = null, $field_id = '' ) {
+	return GVCommon::get_field_type( $form, $field_id );
 }
 
 
@@ -347,8 +347,8 @@ 
  * @return string HTML of the output. Empty string if $view_id is empty.
  */
 function get_gravityview( $view_id = '', $atts = array() ) {
-	if( !empty( $view_id ) ) {
-		$atts['id'] = $view_id;
+	if ( ! empty( $view_id ) ) {
+		$atts[ 'id' ] = $view_id;
 		$args = wp_parse_args( $atts, \GV\View_Settings::defaults() );
 		$GravityView_frontend = GravityView_frontend::getInstance();
 		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
@@ -391,19 +391,19 @@ 
  */
 function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
 
-	if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
+	if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
 
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
-		foreach( $form_fields as $form_field ) {
+		foreach ( $form_fields as $form_field ) {
 			$field_id = $form_field->id;
-			foreach( $view_fields as $zone ) {
+			foreach ( $view_fields as $zone ) {
 
 				// ACF compatibility; ACF-added fields aren't arrays
 				if ( ! is_array( $zone ) ) { continue; }
 
-				foreach( $zone as $field ) {
+				foreach ( $zone as $field ) {
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
+					if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) {
 						return true;
 					}
 				}

includes/class-gravityview-compatibility.php

Spacing +36 added lines, -36 removed lines

@@ -76,7 +76,7 @@ 
 	 * @return GravityView_Compatibility
 	 */
 	public static function getInstance() {
-		if( self::$instance ) {
+		if ( self::$instance ) {
 			return self::$instance;
 		}
 		return new self;
@@ -138,10 +138,10 @@ 
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
 		// show the notice, but not load any post types or process shortcodes.
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
-		if( ! self::is_valid() ) {
+		if ( ! self::is_valid() ) {
 
 			// If the plugin's not loaded, might as well hide the shortcode for people.
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
 
 		}
 	}
@@ -167,15 +167,15 @@ 
 	 */
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
 
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
 			return null;
 		}
 
 		$notices = self::get_notices();
 
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
-		foreach( (array)$notices as $notice ) {
-			$message .= wpautop( $notice['message'] );
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
+		foreach ( (array)$notices as $notice ) {
+			$message .= wpautop( $notice[ 'message' ] );
 		}
 		$message .= '</div>';
 
@@ -195,9 +195,9 @@ 
 
 		if ( ! gravityview()->plugin->is_compatible_php() ) {
 
-			self::$notices['php_version'] = array(
+			self::$notices[ 'php_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => 'php_version',
 			);
@@ -208,11 +208,11 @@ 
 		if ( ! gravityview()->plugin->is_compatible_future_php() ) {
 
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
 
 			self::$notices[ $key ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => $key,
 			);
@@ -233,9 +233,9 @@ 
 
 		if ( ! gravityview()->plugin->is_compatible_wordpress() ) {
 
-			self::$notices['wp_version'] = array(
+			self::$notices[ 'wp_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ),
+				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
 			    'cap' => 'update_core',
 				'dismiss' => 'wp_version',
 			);
@@ -258,17 +258,17 @@ 
 	public static function check_gravityforms() {
 
 		// Bypass other checks: if the class exists
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 
 			// Does the version meet future requirements?
-			if( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) {
+			if ( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) {
 				return true;
 			}
 
 			// Does it meet minimum requirements?
 			$meets_minimum = gravityview()->plugin->is_compatible_gravityforms();
 
-			if( $meets_minimum ) {
+			if ( $meets_minimum ) {
 				/* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */
 				$title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' );
 				$version = GV_FUTURE_MIN_GF_VERSION;
@@ -283,14 +283,14 @@ 
 			$message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>';
 
 			/* translators: the placeholder is the current version of Gravity Forms. */
-			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>';
+			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>';
 
 			/* translators: In this context, "get" means purchase */
 			$message .= '<p><a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>';
 
 
 			// Show the notice even if the future version requirements aren't met
-			self::$notices['gf_version'] = array(
+			self::$notices[ 'gf_version' ] = array(
 				'class' => $class,
 				'message' => $message,
 				'cap' => 'update_plugins',
@@ -308,42 +308,42 @@ 
 		 * OR
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
 		 */
-		if( true === $gf_status || is_network_admin() ) {
+		if ( true === $gf_status || is_network_admin() ) {
 			return true;
 		}
 
 		// If GFCommon doesn't exist, assume GF not active
 		$return = false;
 
-		switch( $gf_status ) {
+		switch ( $gf_status ) {
 			case 'inactive':
 
 				// Required for multisite
-				if( ! function_exists('wp_create_nonce') ) {
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
 					require_once ABSPATH . WPINC . '/pluggable.php';
 				}
 
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
-				if( is_multisite() ) {
+				if ( is_multisite() ) {
 					wp_cookie_constants();
 				}
 
 				$return = false;
 
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
 
-				self::$notices['gf_inactive'] = array(
+				self::$notices[ 'gf_inactive' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
 					'cap' => 'activate_plugins',
 					'dismiss' => 'gf_inactive',
 				);
 
 				break;
 			default:
-				self::$notices['gf_installed'] = array(
+				self::$notices[ 'gf_installed' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -360,10 +360,10 @@ 
 	 */
 	private static function check_gf_directory() {
 
-		if( class_exists( 'GFDirectory' ) ) {
-			self::$notices['gf_directory'] = array(
+		if ( class_exists( 'GFDirectory' ) ) {
+			self::$notices[ 'gf_directory' ] = array(
 				'class' => 'error is-dismissible',
-				'title' => __('Potential Conflict', 'gravityview' ),
+				'title' => __( 'Potential Conflict', 'gravityview' ),
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
 				'dismiss' => 'gf_directory',
 				'cap' => 'activate_plugins',
@@ -382,21 +382,21 @@ 
 	 */
 	public static function get_plugin_status( $location = '' ) {
 
-		if( ! function_exists('is_plugin_active') ) {
+		if ( ! function_exists( 'is_plugin_active' ) ) {
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
 		}
 
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
 			return true;
 		}
 
-		if( !is_network_admin() && is_plugin_active( $location ) ) {
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
 			return true;
 		}
 
-		if(
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
+		if (
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
 		) {
 			return false;
 		}

includes/class-admin-add-shortcode.php

Spacing +30 added lines, -30 removed lines

@@ -20,12 +20,12 @@ 
 
 	function __construct() {
 
-			add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30);
+			add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 30 );
 
-			add_action( 'admin_footer',	array( $this, 'add_shortcode_popup') );
+			add_action( 'admin_footer', array( $this, 'add_shortcode_popup' ) );
 
 			// adding styles and scripts
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
 
 			// ajax - populate sort fields based on the selected view
 			add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) );
@@ -40,7 +40,7 @@ 
 	 */
 	function is_post_editor_screen() {
 		global $current_screen, $pagenow;
-		return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) );
+		return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, array( 'post.php', 'post-new.php' ) );
 	}
 
 
@@ -55,15 +55,15 @@ 
 		/**
 		 * @since 1.15.3
 		 */
-		if( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
+		if ( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
 			return;
 		}
 
-		if( !$this->is_post_editor_screen() ) {
+		if ( ! $this->is_post_editor_screen() ) {
 			return;
 		}
 		?>
-		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
+		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( "Insert View", 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
 		<?php
 
 	}
@@ -79,16 +79,16 @@ 
 	function add_shortcode_popup() {
 		global $post;
 
-		if( !$this->is_post_editor_screen() ) {
+		if ( ! $this->is_post_editor_screen() ) {
 			return;
 		}
 
-		$post_type = get_post_type_object($post->post_type);
+		$post_type = get_post_type_object( $post->post_type );
 
-		$views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) );
+		$views = get_posts( array( 'post_type' => 'gravityview', 'posts_per_page' => -1 ) );
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
+		if ( empty( $views ) ) {
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
 			return;
 		}
@@ -99,7 +99,7 @@ 
 				<div class="wrap">
 
 					<h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2>
-					<p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
+					<p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
 
 					<div>
 						<h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3>
@@ -107,9 +107,9 @@ 
 						<select name="gravityview_id" id="gravityview_id">
 							<option value=""><?php esc_html_e( '&mdash; Select a View to Insert &mdash;', 'gravityview' ); ?></option>
 							<?php
-							foreach( $views as $view ) {
-								$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-								echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+							foreach ( $views as $view ) {
+								$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
+								echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
 							}
 							?>
 						</select>
@@ -125,7 +125,7 @@ 
 
 						foreach ( $settings as $key => $setting ) {
 
-							if( empty( $setting['show_in_shortcode'] ) ) { continue; }
+							if ( empty( $setting[ 'show_in_shortcode' ] ) ) { continue; }
 
 							GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' );
 						}
@@ -134,8 +134,8 @@ 
 					</table>
 
 					<div class="submit">
-						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
-						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" />
+						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
+						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( "Cancel", 'gravityview' ); ?>" />
 					</div>
 
 				</div>
@@ -156,7 +156,7 @@ 
 	 */
 	function add_scripts_and_styles() {
 
-		if( ! $this->is_post_editor_screen() ) {
+		if ( ! $this->is_post_editor_screen() ) {
 			return;
 		}
 
@@ -167,22 +167,22 @@ 
 
 		$protocol = is_ssl() ? 'https://' : 'http://';
 
-		wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
 
 		//enqueue styles
-		wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 		wp_enqueue_style( 'gravityview_postedit_styles' );
 
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 		// custom js
-		wp_register_script( 'gravityview_postedit_scripts',  plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
+		wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
 		wp_enqueue_script( 'gravityview_postedit_scripts' );
-		wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array(
-			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'),
+		wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', array(
+			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode' ),
 			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-			'alert_1' => esc_html__( 'Please select a View', 'gravityview'),
-		));
+			'alert_1' => esc_html__( 'Please select a View', 'gravityview' ),
+		) );
 
 	}
 
@@ -198,16 +198,16 @@ 
 	function get_sortable_fields() {
 
 		// Not properly formatted request
-		if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) {
+		if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) {
 			exit( false );
 		}
 
 		// Not valid request
-		if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) {
+		if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) {
 			exit( false );
 		}
 
-		$viewid = (int)$_POST['viewid'];
+		$viewid = (int)$_POST[ 'viewid' ];
 
 		// fetch form id assigned to the view
 		$formid = gravityview_get_form_id( $viewid );

includes/fields/class-gravityview-field-is-starred.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 	private function add_hooks() {
 	    /** @see \GV\Field::get_value_filters */
 		add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 );
-		add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 );
+		add_action( 'gravityview/template/after', array( $this, 'print_script' ), 10, 1 );
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 	}
 
@@ -52,7 +52,7 @@ 
 	 */
 	function add_default_field( $entry_default_fields = array(), $form = array(), $zone = '' ) {
 
-		if( 'edit' !== $zone ) {
+		if ( 'edit' !== $zone ) {
 			$entry_default_fields[ $this->name ] = array(
 				'label' => $this->label,
 				'desc'  => $this->description,
@@ -76,7 +76,7 @@ 
 	public function get_content( $output, $template ) {
 		$entry = $template->entry;
 
-	    $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png';
+	    $star_url = GFCommon::get_base_url() . '/images/star' . intval( $entry[ 'is_starred' ] ) . '.png';
 
 		$entry_id = '';
 
@@ -85,7 +85,7 @@ 
 		}
 
 		// if( $show_as_star )
-		$output = '<img class="gv-star-image" '.$entry_id.' data-is_starred="'. intval( $entry['is_starred'] ) .'" src="'. esc_attr( $star_url ) .'" />';
+		$output = '<img class="gv-star-image" ' . $entry_id . ' data-is_starred="' . intval( $entry[ 'is_starred' ] ) . '" src="' . esc_attr( $star_url ) . '" />';
 
 		self::$has_star_field = true;
 
@@ -102,7 +102,7 @@ 
 	 */
 	public function print_script( $context ) {
 
-		if( ! self::$has_star_field ) {
+		if ( ! self::$has_star_field ) {
 			return;
 		}
 

includes/fields/class-gravityview-field-date.php

Spacing +3 added lines, -3 removed lines

@@ -31,11 +31,11 @@ 
 
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('date_display', $field_options );
+		$this->add_field_support( 'date_display', $field_options );
 
 		return $field_options;
 	}
@@ -83,7 +83,7 @@ 
 		$field_input_id = gravityview_get_input_id_from_id( $field_id );
 
 		$date_field_output = '';
-		switch( $field_input_id ) {
+		switch ( $field_input_id ) {
 			case 1:
 				$date_field_output = \GV\Utils::get( $parsed_date, 'day' );
 				break;