gravityview / GravityView

includes/widgets/search-widget/templates/search-field-link.php

Indentation +12 added lines, -12 removed lines

@@ -41,22 +41,22 @@
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+		$search_value = \GV\Utils::_GET( $search_field['name'] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+		foreach ( $search_field['choices'] as $k => $choice ) {
 
-            if ( 0 != $k ) {
-                echo esc_html( $links_sep );
-            }
+			if ( 0 != $k ) {
+				echo esc_html( $links_sep );
+			}
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
 
-            if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
-            } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
-            }
-            ?>
+			if ( $active ) {
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+			} else {
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+			}
+			?>
 
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
 

Spacing +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@ 
 $base_url = GravityView_Widget_Search::get_search_form_action();
 
 // Make sure that there are choices to display
-if ( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
 	return;
 }
 
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
 
 /**
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@ 
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
 
             if ( 0 != $k ) {
                 echo esc_html( $links_sep );
             }
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
 
             if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
             } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
             }
             ?>
 
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
 
 		<?php } ?>
 	</p>

includes/widgets/search-widget/templates/search-field-checkbox.php

Spacing +7 added lines, -7 removed lines

@@ -10,22 +10,22 @@
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-checkbox">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
 
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
-			<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
-			<?php echo esc_html( $choice['text'] ); ?>
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
+			<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
 		</label>
 
 	<?php } ?>

includes/widgets/search-widget/templates/widget-search.php

Indentation +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 		/**
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
 		 * @param GravityView_Widget_Search $this GravityView Widget instance
-         * @param array $search_field
+		 * @param array $search_field
 		 */
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
 
@@ -46,7 +46,7 @@ 
 		/**
 		 * @action `gravityview_search_widget_field_after` After each search input is rendered (other than the submit button)
 		 * @param GravityView_Widget_Search $this GravityView Widget instance
-         * @param array $search_field
+		 * @param array $search_field
 		 */
 		do_action( 'gravityview_search_widget_field_after', $this, $search_field );
 	}
@@ -58,7 +58,7 @@ 
 	do_action( 'gravityview_search_widget_fields_after', $this );
 
 	if( $has_inputs ) {
-	    $this->render( 'search-field', 'submit', false );
-    }
+		$this->render( 'search-field', 'submit', false );
+	}
 ?>
 </form>

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	do_action( 'gravityview_search_widget_fields_before', $this );
 
-	foreach( array_merge( $this->search_fields, $this->permalink_fields ) as $search_field ) {
+	foreach ( array_merge( $this->search_fields, $this->permalink_fields ) as $search_field ) {
 
 		/**
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
@@ -36,10 +36,10 @@ 
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
 
 		$gravityview_view->search_field = $search_field;
-		$this->render( 'search-field', $search_field['input'], false );
+		$this->render( 'search-field', $search_field[ 'input' ], false );
 
 		// show/hide the search button if there are input type fields
-		if( !$has_inputs &&  $search_field['input'] != 'link' ) {
+		if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) {
 			$has_inputs = true;
 		}
 
@@ -57,7 +57,7 @@ 
 	 */
 	do_action( 'gravityview_search_widget_fields_after', $this );
 
-	if( $has_inputs ) {
+	if ( $has_inputs ) {
 	    $this->render( 'search-field', 'submit', false );
     }
 ?>

includes/widgets/search-widget/templates/search-field-radio.php

Spacing +7 added lines, -7 removed lines

@@ -10,22 +10,22 @@
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-radio.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-radio">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
 
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
-			<input type="radio" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php checked( $choice['value'], $search_field['value'], true ); ?>>
-			<?php echo esc_html( $choice['text'] ); ?>
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
+			<input type="radio" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php checked( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>>
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
 		</label>
 
 	<?php } ?>

includes/admin/field-types/type_text.php

Indentation +5 added lines, -5 removed lines

@@ -28,11 +28,11 @@
 
 		$show_mt = $this->show_merge_tags();
 
-        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' );
-        $placeholder = \GV\Utils::get( $this->field, 'placeholder' );
+		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' );
+		$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
 		<?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/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 ) );

Indentation +262 added lines, -262 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 /**
@@ -22,109 +22,109 @@ 
 	/**
 	 * @var GravityView_Edit_Entry $loader
 	 */
-    protected $loader;
+	protected $loader;
 
-    /**
-     * @var WP_User|null Temporary storage used by restore_user_details()
-     */
-    private $_user_before_update = null;
+	/**
+	 * @var WP_User|null Temporary storage used by restore_user_details()
+	 */
+	private $_user_before_update = null;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
 	/**
 	 * @since 1.11
 	 */
 	public function load() {
 		add_action( 'wp', array( $this, 'add_hooks' ), 10 );
-    }
+	}
 
 	/**
 	 * Add hooks to trigger updating the user
 	 *
 	 * @since 1.18
 	 */
-    public function add_hooks() {
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/trigger_update` Choose whether to update user information via User Registration add-on when an entry is updated?
-	     * @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 ) ) {
-
-	    	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 );
-	    }
-    }
-
-    /**
-     * Update the WordPress user profile based on the GF User Registration create feed
-     *
-     * @since 1.11
-     *
-     * @param array $form Gravity Forms form array
-     * @param string $entry_id Gravity Forms entry ID
-     * @return void
-     */
-    public function update_user( $form = array(), $entry_id = 0 ) {
-
-        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 ) ) {
-        	gravityview()->log->error( 'Entry ID is empty [{entry_id}]; not updating the user', array( 'entry_id' => $entry_id ) );
-	        return;
-        }
-
-        $gf_user_registration = GF_User_Registration::get_instance();
-
-        $entry = GFAPI::get_entry( $entry_id );
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
-	     * @since 1.11
-	     * @param array $entry Gravity Forms entry
-	     * @param array $form Gravity Forms form
-	     */
-        $entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
-
-	    $config = $this->get_feed_configuration( $entry, $form );
-
-        // Make sure the feed is active
-	    if ( ! \GV\Utils::get( $config, 'is_active', false ) ) {
+	public function add_hooks() {
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/trigger_update` Choose whether to update user information via User Registration add-on when an entry is updated?
+		 * @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 ) ) {
+
+			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 );
+		}
+	}
+
+	/**
+	 * Update the WordPress user profile based on the GF User Registration create feed
+	 *
+	 * @since 1.11
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param string $entry_id Gravity Forms entry ID
+	 * @return void
+	 */
+	public function update_user( $form = array(), $entry_id = 0 ) {
+
+		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 ) ) {
+			gravityview()->log->error( 'Entry ID is empty [{entry_id}]; not updating the user', array( 'entry_id' => $entry_id ) );
+			return;
+		}
+
+		$gf_user_registration = GF_User_Registration::get_instance();
+
+		$entry = GFAPI::get_entry( $entry_id );
 
-	    // 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 ) ) {
-			    return;
-		    }
-	    }
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
+		 * @since 1.11
+		 * @param array $entry Gravity Forms entry
+		 * @param array $form Gravity Forms form
+		 */
+		$entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
 
-	    // Do not update user if the user hasn't been registered (happens when manual activation is enabled in User Registration feed)
-	    $username = \GV\Utils::get( $config, 'meta/username', null );
-	    if ( ! isset( $entry[ $username ] ) || ! get_user_by( 'login', $entry[ $username ] ) ) {
-		    return;
-	    }
+		$config = $this->get_feed_configuration( $entry, $form );
+
+		// Make sure the feed is active
+		if ( ! \GV\Utils::get( $config, 'is_active', false ) ) {
+			return;
+		}
+
+		// 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 ) ) {
+				return;
+			}
+		}
+
+		// Do not update user if the user hasn't been registered (happens when manual activation is enabled in User Registration feed)
+		$username = \GV\Utils::get( $config, 'meta/username', null );
+		if ( ! isset( $entry[ $username ] ) || ! get_user_by( 'login', $entry[ $username ] ) ) {
+			return;
+		}
 
-        // The priority is set to 3 so that default priority (10) will still override it
-        add_filter( 'send_password_change_email', '__return_false', 3 );
-        add_filter( 'send_email_change_email', '__return_false', 3 );
+		// The priority is set to 3 so that default priority (10) will still override it
+		add_filter( 'send_password_change_email', '__return_false', 3 );
+		add_filter( 'send_email_change_email', '__return_false', 3 );
 
-        // Trigger the User Registration update user method
-        $gf_user_registration->update_user( $entry, $form, $config );
+		// Trigger the User Registration update user method
+		$gf_user_registration->update_user( $entry, $form, $config );
 
-        remove_filter( 'send_password_change_email', '__return_false', 3 );
-        remove_filter( 'send_email_change_email', '__return_false', 3 );
+		remove_filter( 'send_password_change_email', '__return_false', 3 );
+		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 );
-    }
+		// Prevent double-triggering by removing the hook
+		remove_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10 );
+	}
 
 	/**
 	 * Get the User Registration feed configuration for the entry & form
@@ -139,184 +139,184 @@ 
 	 *
 	 * @return array
 	 */
-    public function get_feed_configuration( $entry, $form ) {
-
-	    $gf_user_registration = GF_User_Registration::get_instance();
-
-	    $config = $gf_user_registration->get_single_submission_feed( $entry, $form );
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
-	     * @since 1.15
-	     * @param[in,out] boolean $preserve_role Preserve current user role Default: true
-	     * @param[in] array $config Gravity Forms User Registration feed configuration for the form
-	     * @param[in] array $form Gravity Forms form array
-	     * @param[in] array $entry Gravity Forms entry being edited
-	     */
-	    $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
-
-	    if( $preserve_role ) {
-		    $config['meta']['role'] = 'gfur_preserve_role';
-	    }
-
-	    $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'];
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
-	     * @since 1.14
-	     * @param[in,out] array $config Gravity Forms User Registration feed configuration for the form
-	     * @param[in] array $form Gravity Forms form array
-	     * @param[in] array $entry Gravity Forms entry being edited
-	     */
-	    $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
-
-	    return $config;
-    }
-
-    /**
-     * Calculate the user display name format
-     *
-     * @since 1.15
-     * @since 1.20 Returns false if user not found at $user_id
-     *
-     * @param int $user_id WP User ID
-     * @return false|string Display name format as used inside Gravity Forms User Registration. Returns false if user not found.
-     */
-    public function match_current_display_name( $user_id ) {
-
-        $user = get_userdata( $user_id );
-
-        if( ! $user ) {
-        	return false;
-        }
-
-        $names = $this->generate_display_names( $user );
-
-        $format = array_search( $user->display_name, $names, true );
-
-        /**
-         * 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 ) {
-            $this->_user_before_update = $user;
-        }
-
-        return $format;
-    }
-
-    /**
-     * Generate an array of all the user display names possibilities
-     *
-     * @since 1.15
-     *
-     * @param object $profileuser WP_User object
-     * @return array List all the possible display names for a certain User object
-     */
-    public function generate_display_names( $profileuser ) {
-
-        $public_display = array();
-        $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->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;
-        }
-
-        $public_display = array_map( 'trim', $public_display );
-        $public_display = array_unique( $public_display );
-
-        return $public_display;
-    }
-
-
-    /**
-     * Restore the Display Name and roles of a user after being updated by Gravity Forms User Registration Addon
-     *
-     * @see GFUser::update_user()
-     * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon
-     * @param array $config Gravity Forms User Registration Addon form feed configuration
-     * @param array $entry The Gravity Forms entry that was just updated
-     * @param string $password User password
-     * @return int|false|WP_Error|null True: User updated; False: $user_id not a valid User ID; WP_Error: User update error; Null: Method didn't process
-     */
-    public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
-
-        /**
-         * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
-         * Otherwise, display names will be reset to the format specified in Gravity Forms User Registration "Update" feed
-         * @since 1.14.4
-         * @param boolean $restore_display_name Restore Display Name? Default: true
-         */
-        $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
-
-        $is_update_feed = ( $config && \GV\Utils::get( $config, 'meta/feed_type' ) === 'update' );
-
-        /**
-         * Don't restore display name:
-         *   - either disabled,
-         *   - or it is an Update feed (we only care about Create feed)
-         *   - 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 ) ) {
-            return null;
-        }
-
-        $user_after_update = get_userdata( $user_id );
-
-        // User not found
-	    if ( ! $user_after_update ) {
-	    	gravityview()->log->error( 'User not found at $user_id #{user_id}', array( 'user_id' => $user_id ) );
-		    return false;
-	    }
-
-        $restored_user = $user_after_update;
-
-	    // Restore previous display_name
-        $restored_user->display_name = $this->_user_before_update->display_name;
-
-	    // Don't have WP update the password.
-	    unset( $restored_user->data->user_pass, $restored_user->user_pass );
-
-        /**
-         * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
-         * @since 1.14
-         * @param WP_User $restored_user The user with restored details about to be updated by wp_update_user()
-         * @param WP_User $user_before_update The user before being updated by Gravity Forms User Registration
-         * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
-         * @param array   $entry The Gravity Forms entry that was just updated
-         */
-        $restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
-
-        $updated = wp_update_user( $restored_user );
-
-        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 ) );
-        }
-
-        $this->_user_before_update = null;
-
-        unset( $restored_user, $user_after_update );
-
-        return $updated;
-    }
+	public function get_feed_configuration( $entry, $form ) {
+
+		$gf_user_registration = GF_User_Registration::get_instance();
+
+		$config = $gf_user_registration->get_single_submission_feed( $entry, $form );
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
+		 * @since 1.15
+		 * @param[in,out] boolean $preserve_role Preserve current user role Default: true
+		 * @param[in] array $config Gravity Forms User Registration feed configuration for the form
+		 * @param[in] array $form Gravity Forms form array
+		 * @param[in] array $entry Gravity Forms entry being edited
+		 */
+		$preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
+
+		if( $preserve_role ) {
+			$config['meta']['role'] = 'gfur_preserve_role';
+		}
+
+		$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'];
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
+		 * @since 1.14
+		 * @param[in,out] array $config Gravity Forms User Registration feed configuration for the form
+		 * @param[in] array $form Gravity Forms form array
+		 * @param[in] array $entry Gravity Forms entry being edited
+		 */
+		$config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
+
+		return $config;
+	}
+
+	/**
+	 * Calculate the user display name format
+	 *
+	 * @since 1.15
+	 * @since 1.20 Returns false if user not found at $user_id
+	 *
+	 * @param int $user_id WP User ID
+	 * @return false|string Display name format as used inside Gravity Forms User Registration. Returns false if user not found.
+	 */
+	public function match_current_display_name( $user_id ) {
+
+		$user = get_userdata( $user_id );
+
+		if( ! $user ) {
+			return false;
+		}
+
+		$names = $this->generate_display_names( $user );
+
+		$format = array_search( $user->display_name, $names, true );
+
+		/**
+		 * 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 ) {
+			$this->_user_before_update = $user;
+		}
+
+		return $format;
+	}
+
+	/**
+	 * Generate an array of all the user display names possibilities
+	 *
+	 * @since 1.15
+	 *
+	 * @param object $profileuser WP_User object
+	 * @return array List all the possible display names for a certain User object
+	 */
+	public function generate_display_names( $profileuser ) {
+
+		$public_display = array();
+		$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->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;
+		}
+
+		$public_display = array_map( 'trim', $public_display );
+		$public_display = array_unique( $public_display );
+
+		return $public_display;
+	}
+
+
+	/**
+	 * Restore the Display Name and roles of a user after being updated by Gravity Forms User Registration Addon
+	 *
+	 * @see GFUser::update_user()
+	 * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon
+	 * @param array $config Gravity Forms User Registration Addon form feed configuration
+	 * @param array $entry The Gravity Forms entry that was just updated
+	 * @param string $password User password
+	 * @return int|false|WP_Error|null True: User updated; False: $user_id not a valid User ID; WP_Error: User update error; Null: Method didn't process
+	 */
+	public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
+		 * Otherwise, display names will be reset to the format specified in Gravity Forms User Registration "Update" feed
+		 * @since 1.14.4
+		 * @param boolean $restore_display_name Restore Display Name? Default: true
+		 */
+		$restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
+
+		$is_update_feed = ( $config && \GV\Utils::get( $config, 'meta/feed_type' ) === 'update' );
+
+		/**
+		 * Don't restore display name:
+		 *   - either disabled,
+		 *   - or it is an Update feed (we only care about Create feed)
+		 *   - 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 ) ) {
+			return null;
+		}
+
+		$user_after_update = get_userdata( $user_id );
+
+		// User not found
+		if ( ! $user_after_update ) {
+			gravityview()->log->error( 'User not found at $user_id #{user_id}', array( 'user_id' => $user_id ) );
+			return false;
+		}
+
+		$restored_user = $user_after_update;
+
+		// Restore previous display_name
+		$restored_user->display_name = $this->_user_before_update->display_name;
+
+		// Don't have WP update the password.
+		unset( $restored_user->data->user_pass, $restored_user->user_pass );
+
+		/**
+		 * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
+		 * @since 1.14
+		 * @param WP_User $restored_user The user with restored details about to be updated by wp_update_user()
+		 * @param WP_User $user_before_update The user before being updated by Gravity Forms User Registration
+		 * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
+		 * @param array   $entry The Gravity Forms entry that was just updated
+		 */
+		$restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
+
+		$updated = wp_update_user( $restored_user );
+
+		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 ) );
+		}
+
+		$this->_user_before_update = null;
+
+		unset( $restored_user, $user_after_update );
+
+		return $updated;
+	}
 
 } //end class

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/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>