gravityview / GravityView

includes/admin/field-types/type_text.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 		?>
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
 
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
 			echo $this->get_tooltip() . $this->get_field_desc();
 		?><div>
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@ 
 
 	function render_input( $override_input = null ) {
 
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -28,7 +28,7 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
         }
         $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );

includes/admin/metaboxes/class-gravityview-metabox-tab.php

Spacing +10 added lines, -10 removed lines

@@ -97,9 +97,9 @@ 
 	 * @param array $callback_args Arguments passed to the callback
 	 * @return void
 	 */
-	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array()  ) {
+	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array() ) {
 
-		$this->id = $this->prefix.$id;
+		$this->id = $this->prefix . $id;
 		$this->title = $title;
 		$this->render_template_file = $file;
 		$this->callback = $callback;
@@ -118,7 +118,7 @@ 
 	 */
 	function parse_icon_class_name( $icon_class_name = '' ) {
 
-		if( preg_match( '/dashicon/i', $icon_class_name ) ) {
+		if ( preg_match( '/dashicon/i', $icon_class_name ) ) {
 			$icon_class_name = 'dashicons ' . $icon_class_name;
 		}
 
@@ -142,29 +142,29 @@ 
 	 */
 	function render( $post ) {
 
-		if( !empty( $this->render_template_file ) ) {
+		if ( ! empty( $this->render_template_file ) ) {
 
 			$file = $this->render_template_file;
 
 			// If the full path exists, use it
-			if( file_exists( $file ) ) {
+			if ( file_exists( $file ) ) {
 				$path = $file;
 			} else {
-				$path = GRAVITYVIEW_DIR .'includes/admin/metaboxes/views/'.$file;
+				$path = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/views/' . $file;
 			}
 
-			if( file_exists( $path ) ) {
+			if ( file_exists( $path ) ) {
 				include $path;
 			} else {
 				gravityview()->log->error( 'Metabox template file not found', array( 'data' => $this ) );
 			}
 
-		} else if( !empty( $this->callback ) ) {
+		} else if ( ! empty( $this->callback ) ) {
 
-			if( is_callable( $this->callback ) ) {
+			if ( is_callable( $this->callback ) ) {
 
 				/** @see do_accordion_sections() */
-				call_user_func( $this->callback, $post, (array) $this );
+				call_user_func( $this->callback, $post, (array)$this );
 
 			} else {
 				gravityview()->log->error( 'Metabox callback was not callable', array( 'data' => $this ) );

includes/admin/metaboxes/views/data-source.php

Spacing +7 added lines, -7 removed lines

@@ -10,13 +10,13 @@ 
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
 
 //current value
-$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
+$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
 
 // If form is in trash or not existing, show error
 GravityView_Admin::connected_form_warning( $current_form );
 
 // check for available gravity forms
-$forms = gravityview_get_forms('any');
+$forms = gravityview_get_forms( 'any' );
 
 /**
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -35,24 +35,24 @@ 
 		?>
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
 
-		<?php if( !empty( $forms ) ) { ?>
+		<?php if ( ! empty( $forms ) ) { ?>
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
 		<?php }
 	}
 
 	// 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 ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</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 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 } else { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
 	<?php } ?>
 
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
 </p>
 
 <?php // confirm dialog box ?>

includes/extensions/edit-entry/class-edit-entry-user-registration.php

Spacing +23 added lines, -23 removed lines

@@ -52,9 +52,9 @@ 
 	     * @since 1.11
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
 	     */
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
+	    if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
 
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
+	    	add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
 
 		    // last resort in case the current user display name don't match any of the defaults
 		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -72,10 +72,10 @@ 
      */
     public function update_user( $form = array(), $entry_id = 0 ) {
 
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
 	        gravityview()->log->error( 'GFAPI or User Registration class not found; not updating the user' );
 	        return;
-        } elseif( empty( $entry_id ) ) {
+        } elseif ( empty( $entry_id ) ) {
         	gravityview()->log->error( 'Entry ID is empty [{entry_id}]; not updating the user', array( 'entry_id' => $entry_id ) );
 	        return;
         }
@@ -102,7 +102,7 @@ 
 
 	    // If an Update feed, make sure the conditions are met.
 	    if ( \GV\Utils::get( $config, 'meta/feedType' ) === 'update' ) {
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
+	    	if ( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
 			    return;
 		    }
 	    }
@@ -118,7 +118,7 @@ 
         remove_filter( 'send_email_change_email', '__return_false', 3 );
 
         // Prevent double-triggering by removing the hook
-	    remove_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10 );
+	    remove_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10 );
     }
 
 	/**
@@ -151,17 +151,17 @@ 
 	     */
 	    $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
 
-	    if( $preserve_role ) {
-		    $config['meta']['role'] = 'gfur_preserve_role';
+	    if ( $preserve_role ) {
+		    $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
 	    }
 
-	    $displayname = $this->match_current_display_name( $entry['created_by'] );
+	    $displayname = $this->match_current_display_name( $entry[ 'created_by' ] );
 
 	    /**
 	     * Make sure the current display name is not changed with the update user method.
 	     * @since 1.15
 	     */
-	    $config['meta']['displayname'] = $displayname ? $displayname : $config['meta']['displayname'];
+	    $config[ 'meta' ][ 'displayname' ] = $displayname ? $displayname : $config[ 'meta' ][ 'displayname' ];
 
 	    /**
 	     * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
@@ -188,7 +188,7 @@ 
 
         $user = get_userdata( $user_id );
 
-        if( ! $user ) {
+        if ( ! $user ) {
         	return false;
         }
 
@@ -200,7 +200,7 @@ 
          * In case we can't find the current display name format, trigger last resort method at the 'gform_user_updated' hook
          * @see restore_display_name
          */
-        if( false === $format ) {
+        if ( false === $format ) {
             $this->_user_before_update = $user;
         }
 
@@ -218,20 +218,20 @@ 
     public function generate_display_names( $profileuser ) {
 
         $public_display = array();
-        $public_display['nickname']  = $profileuser->nickname;
-        $public_display['username']  = $profileuser->user_login;
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
+        $public_display[ 'username' ]  = $profileuser->user_login;
 
-        if ( !empty($profileuser->first_name) ) {
-	        $public_display['firstname'] = $profileuser->first_name;
+        if ( ! empty( $profileuser->first_name ) ) {
+	        $public_display[ 'firstname' ] = $profileuser->first_name;
         }
 
-        if ( !empty($profileuser->last_name) ) {
-	        $public_display['lastname'] = $profileuser->last_name;
+        if ( ! empty( $profileuser->last_name ) ) {
+	        $public_display[ 'lastname' ] = $profileuser->last_name;
         }
 
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
         }
 
         $public_display = array_map( 'trim', $public_display );
@@ -270,7 +270,7 @@ 
          *   - or we don't need as we found the correct format before updating user.
          * @since 1.14.4
          */
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
             return null;
         }
 
@@ -302,7 +302,7 @@ 
 
         $updated = wp_update_user( $restored_user );
 
-        if( is_wp_error( $updated ) ) {
+        if ( is_wp_error( $updated ) ) {
             gravityview()->log->error( 'There was an error updating user #{user_id} details', array( 'user_id' => $user_id, 'data' => $updated ) );
         } else {
             gravityview()->log->debug( 'User #{user_id} details restored', array( 'user_id' => $user_id ) );

includes/extensions/edit-entry/class-edit-entry-admin.php

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
 
     function load() {
 
-        if( !is_admin() ) {
+        if ( ! is_admin() ) {
             return;
         }
 
@@ -38,7 +38,7 @@ 
         add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
 
         // add tooltips
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
+        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
 
         // custom fields' options for zone EDIT
         add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 5 );
@@ -52,12 +52,12 @@ 
      */
     function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-        if( $zone !== 'edit' ) {
+        if ( $zone !== 'edit' ) {
 
-            $entry_default_fields['edit_link'] = array(
-                'label' => __('Edit Entry', 'gravityview'),
+            $entry_default_fields[ 'edit_link' ] = array(
+                'label' => __( 'Edit Entry', 'gravityview' ),
                 'type' => 'edit_link',
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
+                'desc'	=> __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ),
             );
 
         }
@@ -81,12 +81,12 @@ 
         $caps = $visibility_caps;
 
         // If we're configuring fields in the edit context, we want a limited selection
-        if( $context === 'edit' ) {
+        if ( $context === 'edit' ) {
 
             // Remove other built-in caps.
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+            unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
 
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
+            $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
         }
 
         return $caps;
@@ -104,16 +104,16 @@ 
     function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
         // Always a link, never a filter
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
 
         // Edit Entry link should only appear to visitors capable of editing entries
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
-        $add_option['edit_link'] = array(
+        $add_option[ 'edit_link' ] = array(
             'type' => 'text',
             'label' => __( 'Edit Link Text', 'gravityview' ),
             'desc' => NULL,
-            'value' => __('Edit Entry', 'gravityview'),
+            'value' => __( 'Edit Entry', 'gravityview' ),
             'merge_tags' => true,
         );
 
@@ -129,9 +129,9 @@ 
 
         $return = $tooltips;
 
-        $return['allow_edit_cap'] = array(
-            'title' => __('Limiting Edit Access', 'gravityview'),
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
+        $return[ 'allow_edit_cap' ] = array(
+            'title' => __( 'Limiting Edit Access', 'gravityview' ),
+            'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ),
         );
 
         return $return;
@@ -149,12 +149,12 @@ 
     function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
         // We only want to modify the settings for the edit context
-        if( 'edit' !== $context ) {
+        if ( 'edit' !== $context ) {
 
             /**
              * @since 1.8.4
              */
-            $field_options['new_window'] = array(
+            $field_options[ 'new_window' ] = array(
                 'type' => 'checkbox',
                 'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
                 'value' => false,
@@ -164,7 +164,7 @@ 
         }
 
         //  Entry field is only for logged in users
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
         $add_options = array(
             'allow_edit_cap' => array(

includes/class-oembed.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	static function getInstance() {
 		gravityview()->log->notice( '\GravityView_oEmbed is deprecated. Use \GV\oEmbed instead.' );
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 			self::$instance->initialize();
 		}

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>