gravityview / GravityView

includes/admin/class.render.settings.php

Spacing +72 added lines, -72 removed lines

@@ -27,7 +27,7 @@ 
 
 		$field_options = array();
 
-		if( 'field' === $field_type ) {
+		if ( 'field' === $field_type ) {
 
 			// Default options - fields
 			$field_options = array(
@@ -45,7 +45,7 @@ 
 				'custom_class' => array(
 					'type' => 'text',
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
 					'value' => '',
 					'merge_tags' => true,
 					'tooltip' => 'gv_css_merge_tags',
@@ -65,11 +65,11 @@ 
 			);
 
 			// Match Table as well as DataTables
-			if( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
-				$field_options['width'] = array(
+			if ( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
+				$field_options[ 'width' ] = array(
 					'type' => 'number',
-					'label' => __('Percent Width', 'gravityview'),
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
+					'label' => __( 'Percent Width', 'gravityview' ),
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
 					'class' => 'code widefat',
 					'value' => '',
 				);
@@ -122,8 +122,8 @@ 
 			'manage_options' => __( 'Administrator', 'gravityview' ),
 		);
 
-		if( is_multisite() ) {
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
+		if ( is_multisite() ) {
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
 		}
 
 		/**
@@ -136,7 +136,7 @@ 
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
 		 */
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
 
 		return $select_cap_choices;
 	}
@@ -164,27 +164,27 @@ 
 	 */
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
 
-		if( empty( $uniqid ) ) {
+		if ( empty( $uniqid ) ) {
 			//generate a unique field id
-			$uniqid = uniqid('', false);
+			$uniqid = uniqid( '', false );
 		}
 
 		// get field/widget options
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type );
 
 		// two different post arrays, depending of the field type
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
 
 		// build output
 		$output = '';
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
 		if ( $form_id ) {
-			$output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
+			$output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
 		}
 
 		// If there are no options, return what we got.
-		if(empty($options)) {
+		if ( empty( $options ) ) {
 
 			// This is here for checking if the output is empty in render_label()
 			$output .= '<!-- No Options -->';
@@ -192,33 +192,33 @@ 
 			return $output;
 		}
 
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
 
 		/**
 		 * @since 1.8
 		 */
-		if( !empty( $item['subtitle'] ) ) {
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
 		}
 
-		foreach( $options as $key => $option ) {
+		foreach ( $options as $key => $option ) {
 
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
 
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
 
 			// The setting is empty
-			if( empty( $field_output ) ) {
+			if ( empty( $field_output ) ) {
 				continue;
 			}
 
-			switch( $option['type'] ) {
+			switch ( $option[ 'type' ] ) {
 				// Hide hidden fields
 				case 'hidden':
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
 					break;
 				default:
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
 			}
 		}
 
@@ -247,17 +247,17 @@ 
 		 * @deprecated setting index 'default' was replaced by 'value'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
-			$option['value'] = $option['default'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
+			$option[ 'value' ] = $option[ 'default' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
 		}
 
 		// prepare to render option field type
-		if( isset( $option['type'] ) ) {
+		if ( isset( $option[ 'type' ] ) ) {
 
 			$type_class = self::load_type_class( $option );
 
-			if( class_exists( $type_class ) ) {
+			if ( class_exists( $type_class ) ) {
 
 				/** @var GravityView_FieldType $render_type */
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -274,7 +274,7 @@ 
 				 * @param[in,out] string $output field class name
 				 * @param[in] array $option  option field data
 				 */
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
 			}
 
 		} // isset option[type]
@@ -309,27 +309,27 @@ 
 		 * @deprecated setting index 'name' was replaced by 'label'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
-			$setting['label'] = $setting['name'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
+			$setting[ 'label' ] = $setting[ 'name' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
 		}
 
 		$name = esc_attr( sprintf( $name, $key ) );
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
-		$setting['tooltip'] = 'gv_' . $key;
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
+		$setting[ 'tooltip' ] = 'gv_' . $key;
 
 		// Use default if current setting isn't set.
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
 
 		// default setting type = text
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
 
 		// merge tags
-		if( !isset( $setting['merge_tags'] ) ) {
-			if( $setting['type'] === 'text' ) {
-				$setting['merge_tags'] = true;
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
+			if ( $setting[ 'type' ] === 'text' ) {
+				$setting[ 'merge_tags' ] = true;
 			} else {
-				$setting['merge_tags'] = false;
+				$setting[ 'merge_tags' ] = false;
 			}
 		}
 
@@ -337,7 +337,7 @@ 
 
 		// render the setting
 		$type_class = self::load_type_class( $setting );
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			/** @var GravityView_FieldType $render_type */
 			$render_type = new $type_class( $name, $setting, $curr_value );
 			ob_start();
@@ -346,21 +346,21 @@ 
 		}
 
 		// Check if setting is specific for a template
-		if( !empty( $setting['show_in_template'] ) ) {
-			if( !is_array( $setting['show_in_template'] ) ) {
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
 			}
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
 		} else {
 			$show_if = '';
 		}
 
-		if( ! empty( $setting['requires'] ) ) {
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
+		if ( ! empty( $setting[ 'requires' ] ) ) {
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
 		}
 
 		// output
-		echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>';
+		echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>';
 
 	}
 
@@ -372,7 +372,7 @@ 
 	 */
 	public static function load_type_class( $field = NULL ) {
 
-		if( empty( $field['type'] ) ) {
+		if ( empty( $field[ 'type' ] ) ) {
 			return NULL;
 		}
 
@@ -381,19 +381,19 @@ 
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
 		 * @param array $field   field data
 		 */
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
 
-		if( !class_exists( $type_class ) ) {
+		if ( ! class_exists( $type_class ) ) {
 
 			/**
 			 * @filter `gravityview/setting/class_file/{field_type}`
 			 * @param string  $field_type_include_path field class file path
 			 * @param array $field  field data
 			 */
-			$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
+			$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
 
-			if( $class_file ) {
-				if( file_exists( $class_file ) ) {
+			if ( $class_file ) {
+				if ( file_exists( $class_file ) ) {
 					require_once( $class_file );
 				}
 			}
@@ -418,8 +418,8 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
 
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
 
 		return $output;
 	}
@@ -439,22 +439,22 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
 
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
 	}
 
 	/**
@@ -471,21 +471,21 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
 
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
 	}
 
 	/**
@@ -501,9 +501,9 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
 
-		$output = '<select name="'. $name .'" id="'. $id .'">';
-		foreach( $choices as $value => $label ) {
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
+		$output = '<select name="' . $name . '" id="' . $id . '">';
+		foreach ( $choices as $value => $label ) {
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
 		}
 		$output .= '</select>';
 

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/delete-entry/class-delete-entry.php

Spacing +74 added lines, -74 removed lines

@@ -42,12 +42,12 @@ 
 
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
 
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
 
 		// For the Delete Entry Link, you don't want visible to all users.
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
 		// Modify the field options based on the name of the field type
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@ 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 );
 
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -105,20 +105,20 @@ 
 	function delete_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' ] );
 
 		// Delete 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['delete_link'] = array(
+		$add_option[ 'delete_link' ] = array(
 			'type' => 'text',
 			'label' => __( 'Delete Link Text', 'gravityview' ),
 			'desc' => NULL,
-			'value' => __('Delete Entry', 'gravityview'),
+			'value' => __( 'Delete Entry', 'gravityview' ),
 			'merge_tags' => true,
 		);
 
-		$field_options['allow_edit_cap'] = array(
+		$field_options[ 'allow_edit_cap' ] = array(
 			'type' => 'select',
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -142,8 +142,8 @@ 
 	 */
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-		if( 'edit' !== $zone ) {
-			$entry_default_fields['delete_link'] = array(
+		if ( 'edit' !== $zone ) {
+			$entry_default_fields[ 'delete_link' ] = array(
 				'label' => __( 'Delete Entry', 'gravityview' ),
 				'type'  => 'delete_link',
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -160,7 +160,7 @@ 
 	 */
 	function add_available_field( $available_fields = array() ) {
 
-		$available_fields['delete_link'] = array(
+		$available_fields[ 'delete_link' ] = array(
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
 			'field_id' => 'delete_link',
 			'label_type' => 'field',
@@ -188,12 +188,12 @@ 
 		$caps = $visibility_caps;
 
 		// If we're configuring fields in the edit context, we want a limited selection
-		if( $field_id === 'delete_link' ) {
+		if ( $field_id === 'delete_link' ) {
 
 			// 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;
@@ -206,7 +206,7 @@ 
 	 * @param [type] $entry [description]
 	 */
 	function set_entry( $entry = null ) {
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 
 		self::getInstance()->set_entry( $entry );
 
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
 
 		if ( empty( $base ) ) {
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -247,7 +247,7 @@ 
 		}
 
 		// Use the slug instead of the ID for consistent security
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
 		$actionurl = add_query_arg( array(
 			'action'	=> 'delete',
@@ -256,7 +256,7 @@ 
             'view_id' => $view_id,
 		), $base );
 
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
 
 		return $url;
 	}
@@ -273,7 +273,7 @@ 
 	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
 
 		// Only show the link to those who are allowed to see it.
-		if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
 			return;
 		}
 
@@ -284,13 +284,13 @@ 
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
 
 		// If the button is hidden by the filter, don't show.
-		if( !$show_delete_button ) {
+		if ( ! $show_delete_button ) {
 			return;
 		}
 
 		$attributes = array(
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
-			'tabindex' => ( GFCommon::$tab_index ++ ),
+			'tabindex' => ( GFCommon::$tab_index++ ),
 			'onclick' => self::get_confirm_dialog(),
 		);
 
@@ -314,27 +314,27 @@ 
 	function process_delete() {
 
 		// If the form is submitted
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
 
 			// Make sure it's a GravityView request
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
 
-			if( ! $valid_nonce_key ) {
+			if ( ! $valid_nonce_key ) {
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
 				return;
 			}
 
 			// Get the entry slug
-			$entry_slug = esc_attr( $_GET['entry_id'] );
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
 
 			// See if there's an entry there
 			$entry = gravityview_get_entry( $entry_slug, true, false );
 
-			if( $entry ) {
+			if ( $entry ) {
 
 				$has_permission = $this->user_can_delete_entry( $entry );
 
-				if( is_wp_error( $has_permission ) ) {
+				if ( is_wp_error( $has_permission ) ) {
 
 					$messages = array(
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -346,7 +346,7 @@ 
 					// Delete the entry
 					$delete_response = $this->delete_or_trash_entry( $entry );
 
-					if( is_wp_error( $delete_response ) ) {
+					if ( is_wp_error( $delete_response ) ) {
 
 						$messages = array(
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -368,7 +368,7 @@ 
 				gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) );
 
 				$messages = array(
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
 					'status' => 'error',
 				);
 			}
@@ -408,18 +408,18 @@ 
 	 */
 	private function delete_or_trash_entry( $entry ) {
 
-		$entry_id = $entry['id'];
+		$entry_id = $entry[ 'id' ];
 		
 		$mode = $this->get_delete_mode();
 
-		if( 'delete' === $mode ) {
+		if ( 'delete' === $mode ) {
 
 			gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) );
 
 			// Delete the entry
 			$delete_response = GFAPI::delete_entry( $entry_id );
 
-			if( ! is_wp_error( $delete_response ) ) {
+			if ( ! is_wp_error( $delete_response ) ) {
 				$delete_response = 'deleted';
 
 				/**
@@ -440,8 +440,8 @@ 
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
 			new GravityView_Cache;
 
-			if( ! $trashed ) {
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
+			if ( ! $trashed ) {
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
 			} else {
 
 				/**
@@ -472,7 +472,7 @@ 
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
 
 		// The entry had no connected post
-		if( empty( $entry['post_id'] ) ) {
+		if ( empty( $entry[ 'post_id' ] ) ) {
 			return;
 		}
 
@@ -483,19 +483,19 @@ 
 		 */
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
 		
-		if( false === $delete_post ) {
+		if ( false === $delete_post ) {
 			return;
 		}
 
 		$action = current_action();
 
-		if( 'gravityview/delete-entry/deleted' === $action ) {
-			$result = wp_delete_post( $entry['post_id'], true );
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
 		} else {
-			$result = wp_trash_post( $entry['post_id'] );
+			$result = wp_trash_post( $entry[ 'post_id' ] );
 		}
 
-		if( false === $result ) {
+		if ( false === $result ) {
 			gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
 		} else {
 			gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
@@ -511,13 +511,13 @@ 
 	public function verify_nonce() {
 
 		// No delete entry request was made
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
 
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
 
 		/**
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -539,7 +539,7 @@ 
 	 */
 	public static function get_confirm_dialog() {
 
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
 
 		/**
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -547,7 +547,7 @@ 
 		 */
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
 	}
 
 	/**
@@ -565,16 +565,16 @@ 
 
 		$error = NULL;
 
-		if( ! $this->verify_nonce() ) {
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
+		if ( ! $this->verify_nonce() ) {
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
 		}
 
-		if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
 		}
 
-		if( $entry['status'] === 'trash' ) {
-			if( 'trash' === $this->get_delete_mode() ) {
+		if ( $entry[ 'status' ] === 'trash' ) {
+			if ( 'trash' === $this->get_delete_mode() ) {
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
 			} else {
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -582,7 +582,7 @@ 
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
@@ -611,10 +611,10 @@ 
 
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
 
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
 
 			gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
 
@@ -623,20 +623,20 @@ 
 
 
 		// If field options are passed, check if current user can view the link
-		if( !empty( $field ) ) {
+		if ( ! empty( $field ) ) {
 
 			// If capability is not defined, something is not right!
-			if( empty( $field['allow_edit_cap'] ) ) {
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
 
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
 
 				return false;
 			}
 
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if( $field['allow_edit_cap'] !== 'read' ) {
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
 					return true;
 				}
 
@@ -649,21 +649,21 @@ 
 
 		}
 
-		if( !isset( $entry['created_by'] ) ) {
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
 
 			return false;
 		}
 
 		// Only checks user_delete view option if view is already set
-		if( $view_id ) {
+		if ( $view_id ) {
 
 			$current_view = gravityview_get_current_view_data( $view_id );
 
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
+			$user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false;
 
-			if( empty( $user_delete ) ) {
+			if ( empty( $user_delete ) ) {
 
 				gravityview()->log->debug( 'User Delete is disabled. Returning false.' );
 
@@ -672,7 +672,7 @@ 
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
 
@@ -697,16 +697,16 @@ 
 	 */
 	public function display_message( $current_view_id = 0 ) {
 
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
 			return;
 		}
 
 		// Entry wasn't deleted from current View
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
+		$status = esc_attr( $_GET[ 'status' ] );
 		$message_from_url = \GV\Utils::_GET( 'message' );
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
 		$class = '';
@@ -714,14 +714,14 @@ 
 		switch ( $status ) {
 			case 'error':
 				$class = ' gv-error error';
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
 				$message = sprintf( $error_message, $message_from_url );
 				break;
 			case 'trashed':
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
 				break;
 			default:
-				$message = __('The entry was successfully deleted.', 'gravityview');
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
 				break;
 		}
 
@@ -735,7 +735,7 @@ 
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
 	}
 
 

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 );
 
 		?>