gravityview / GravityView

future/includes/class-gv-entry-gravityforms.php

Spacing +4 added lines, -4 removed lines

@@ -106,14 +106,14 @@ 
 	 * @return \GV\GF_Entry|null An instance of this entry or null if not found.
 	 */
 	public static function from_entry( $entry ) {
-		if ( empty( $entry['id'] ) ) {
+		if ( empty( $entry[ 'id' ] ) ) {
 			return null;
 		}
 
 		$self = new self();
 		$self->entry = $entry;
 
-		$self->ID = $self->entry['id'];
+		$self->ID = $self->entry[ 'id' ];
 		$self->slug = $self->get_slug();
 
 		return $self;
@@ -128,7 +128,7 @@ 
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->entry[$offset] );
+		return isset( $this->entry[ $offset ] );
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 * @return mixed The value of the requested entry data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->entry[$offset];
+		return $this->entry[ $offset ];
 	}
 
 	/**

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', false, 'title' );
+$forms = gravityview_get_forms( 'any', false, 'title' );
 
 /**
  * @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;<button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
+	&nbsp;<button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
 </p>
 
 <?php // confirm dialog box ?>

includes/class-frontend-views.php

Braces +3 added lines, -3 removed lines

@@ -451,7 +451,7 @@ 
 		}
 
 		// WooCommerce doesn't $post_id
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $passed_title;
 		}
 
@@ -1206,7 +1206,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1296,7 +1296,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;

Spacing +96 added lines, -96 removed lines

@@ -85,10 +85,10 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
 		add_filter( 'render_block', array( $this, 'detect_views_in_block_content' ) );
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -235,18 +235,18 @@ 
 
 		if ( ! empty( $view_id ) ) {
 
-			$this->context_view_id = (int) $view_id;
+			$this->context_view_id = (int)$view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 */
-			$this->context_view_id = (int) $_GET['gvid'];
+			$this->context_view_id = (int)$_GET[ 'gvid' ];
 
 		} elseif ( ! $multiple_views ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
-			$this->context_view_id = (int) array_pop( $array_keys );
+			$this->context_view_id = (int)array_pop( $array_keys );
 			unset( $array_keys );
 		}
 
@@ -279,25 +279,25 @@ 
 		global $wp_rewrite;
 
 		$is_front_page = ( $query->is_home || $query->is_page );
-		$show_on_front = ( 'page' === get_option('show_on_front') );
-		$front_page_id = get_option('page_on_front');
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
+		$front_page_id = get_option( 'page_on_front' );
 
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
 
 			// Force to be an array, potentially a query string ( entry=16 )
 			$_query = wp_parse_args( $query->query );
 
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
-				unset( $_query['pagename'] );
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
+				unset( $_query[ 'pagename' ] );
 			}
 
 			// this is where will break from core wordpress
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
 			$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' );
-			foreach ( (array) $endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+			foreach ( (array)$endpoints as $endpoint ) {
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 			unset( $endpoints );
 
@@ -307,21 +307,21 @@ 
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
 
-				$qv =& $query->query_vars;
+				$qv = & $query->query_vars;
 
 				// Prevent redirect when on the single entry endpoint
-				if( self::is_single_entry() ) {
+				if ( self::is_single_entry() ) {
 					add_filter( 'redirect_canonical', '__return_false' );
 				}
 
 				$query->is_page = true;
 				$query->is_home = false;
-				$qv['page_id']  = $front_page_id;
+				$qv[ 'page_id' ]  = $front_page_id;
 
 				// Correct <!--nextpage--> for page_on_front
-				if ( ! empty( $qv['paged'] ) ) {
-					$qv['page'] = $qv['paged'];
-					unset( $qv['paged'] );
+				if ( ! empty( $qv[ 'paged' ] ) ) {
+					$qv[ 'page' ] = $qv[ 'paged' ];
+					unset( $qv[ 'paged' ] );
 				}
 			}
 
@@ -383,11 +383,11 @@ 
 			$blocks = parse_blocks( $post_content );
 
 			foreach ( $blocks as $block ) {
-				if ( empty( $block['attrs']['ref'] ) ) {
+				if ( empty( $block[ 'attrs' ][ 'ref' ] ) ) {
 					continue;
 				}
 
-				$block_post = get_post( $block['attrs']['ref'] );
+				$block_post = get_post( $block[ 'attrs' ][ 'ref' ] );
 
 				if ( $block_post ) {
 					$post_content .= $block_post->post_content;
@@ -440,7 +440,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -492,7 +492,7 @@ 
 		$gventry = gravityview()->request->is_entry();
 
 		// If this is the directory view, return.
-		if( ! $gventry ) {
+		if ( ! $gventry ) {
 			return $passed_title;
 		}
 
@@ -510,19 +510,19 @@ 
 		}
 
 		// WooCommerce doesn't $post_id
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $passed_title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $passed_title;
 		}
 
 		$view = gravityview()->request->is_view();
 
-		if( $view ) {
+		if ( $view ) {
 			return $this->_get_single_entry_title( $view, $entry, $passed_title );
 		}
 
@@ -545,7 +545,7 @@ 
 		$view_collection = \GV\View_Collection::from_post( $post );
 
 		// We have multiple Views, but no gvid...this isn't valid security
-		if( 1 < $view_collection->count() ) {
+		if ( 1 < $view_collection->count() ) {
 			return $passed_title;
 		}
 
@@ -579,18 +579,18 @@ 
 		 */
 		$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view );
 
-		if( $check_entry_display ) {
+		if ( $check_entry_display ) {
 
 			$check_display = GVCommon::check_entry_display( $entry, $view );
 
-			if( is_wp_error( $check_display ) ) {
+			if ( is_wp_error( $check_display ) ) {
 				return $passed_title;
 			}
 		}
 
 		$title = $view->settings->get( 'single_title', $passed_title );
 
-		$form = GVCommon::get_form( $entry['form_id'] );
+		$form = GVCommon::get_form( $entry[ 'form_id' ] );
 
 		// We are allowing HTML in the fields, so no escaping the output
 		$title = GravityView_API::replace_variables( $title, $form, $entry );
@@ -661,7 +661,7 @@ 
 
 		$context = GravityView_View::getInstance()->getContext();
 
-		switch( $context ) {
+		switch ( $context ) {
 			case 'directory':
 				$tab = __( 'Multiple Entries', 'gravityview' );
 				break;
@@ -675,12 +675,12 @@ 
 		}
 
 
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -727,7 +727,7 @@ 
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
 		$embed_only = $view->settings->get( 'embed_only' );
 
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -774,7 +774,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ], GFCommon::get_local_timestamp() );
 
@@ -802,14 +802,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
 			}
 		}
@@ -828,19 +828,19 @@ 
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
 			return $search_criteria;
 		}
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => GravityView_Entry_Approval::meta_key,
 				'value' => GravityView_Entry_Approval_Status::APPROVED
 			);
 
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
 		}
@@ -867,18 +867,18 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
 
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
 	}
@@ -902,7 +902,7 @@ 
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
 		 */
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
 
 		/**
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -922,29 +922,29 @@ 
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 
 			// Lock search mode to "all" with implicit presearch filter.
-			$search_criteria['field_filters']['mode'] = 'all';
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
 		}
 
@@ -955,7 +955,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -1067,7 +1067,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => self::updateViewSorting( $args, $form_id ),
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1092,7 +1092,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
 
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
 
@@ -1117,17 +1117,17 @@ 
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 		$offset = ( $curr_page - 1 ) * $page_size;
 
-		if ( ! empty( $args['offset'] ) ) {
-			$offset += intval( $args['offset'] );
+		if ( ! empty( $args[ 'offset' ] ) ) {
+			$offset += intval( $args[ 'offset' ] );
 		}
 
 		$paging = array(
@@ -1152,11 +1152,11 @@ 
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
 
-		$has_values = isset( $_GET['sort'] );
+		$has_values = isset( $_GET[ 'sort' ] );
 
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
-			$sorts = array_keys( $_GET['sort'] );
-			$dirs  = array_values( $_GET['sort'] );
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
+			$sorts = array_keys( $_GET[ 'sort' ] );
+			$dirs  = array_values( $_GET[ 'sort' ] );
 
 			if ( $has_values = array_filter( $dirs ) ) {
 				$sort_field_id = end( $sorts );
@@ -1165,11 +1165,11 @@ 
 		}
 
 		if ( ! isset( $sort_field_id ) ) {
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
 		}
 
 		if ( ! isset( $sort_direction ) ) {
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
 		}
 
 		if ( is_array( $sort_field_id ) ) {
@@ -1201,10 +1201,10 @@ 
 				$form = GFAPI::get_form( $form_id );
 
 				// Get the first GF_Field field ID, set as the key for entry randomization
-				if ( ! empty( $form['fields'] ) ) {
+				if ( ! empty( $form[ 'fields' ] ) ) {
 
 					/** @var GF_Field $field */
-					foreach ( $form['fields'] as $field ) {
+					foreach ( $form[ 'fields' ] as $field ) {
 						if ( ! is_a( $field, 'GF_Field' ) ) {
 							continue;
 						}
@@ -1249,7 +1249,7 @@ 
 		if ( is_array( $sort_field_id ) ) {
 			$modified_ids = array();
 			foreach ( $sort_field_id as $_sort_field_id ) {
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
 			}
 			return $modified_ids;
 		}
@@ -1258,11 +1258,11 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		if( ! $sort_field ) {
+		if ( ! $sort_field ) {
 			return $sort_field_id;
 		}
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1279,7 +1279,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1352,7 +1352,7 @@ 
 		if ( ! class_exists( '\GV\Entry' ) ) {
 
 			// Not using gravityview()->log->error(), since that may not exist yet either!
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
 
 			return null;
 		}
@@ -1369,7 +1369,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1390,7 +1390,7 @@ 
 			$views = $this->getGvOutputData()->get_views();
 
 			foreach ( $views as $view_id => $data ) {
-				$view = \GV\View::by_id( $data['id'] );
+				$view = \GV\View::by_id( $data[ 'id' ] );
 				$view_id = $view->ID;
 				$template_id = gravityview_get_template_id( $view->ID );
 				$data = $view->as_data();
@@ -1399,7 +1399,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1428,7 +1428,7 @@ 
 					 * @param \GV\View The View.
 					 */
 					$js_dependency = apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
-					$js_dependencies[] = $js_dependency;
+					$js_dependencies[ ] = $js_dependency;
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
@@ -1444,7 +1444,7 @@ 
 					 * @param \GV\View The View.
 					 */
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
-					$css_dependencies[] = $css_dependency;
+					$css_dependencies[ ] = $css_dependency;
 				}
 
 				/**
@@ -1452,19 +1452,19 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
@@ -1527,7 +1527,7 @@ 
 	public static function add_style( $template_id ) {
 
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
 		} elseif ( empty( $template_id ) ) {
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1558,11 +1558,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1570,29 +1570,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1610,7 +1610,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field ? $field->type : $field_id;
 		}
@@ -1633,7 +1633,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/class-gravityview-entry-list.php

Spacing +12 added lines, -12 removed lines

@@ -190,8 +190,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 = '';
@@ -202,22 +202,22 @@ 
 			$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 ( $entry instanceof \GV\Entry ) {
 				$entry = $entry->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
@@ -240,15 +240,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;
 		}
 
@@ -283,7 +283,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
@@ -292,14 +292,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

future/includes/rest/class-gv-rest-route.php

Spacing +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 
 		$format = '(?:\.(?P<format>html|json))?';
 
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
 			array(
 				'methods'         => \WP_REST_Server::READABLE,
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -382,7 +382,7 @@ 
 	 * @return \WP_REST_Response
 	 */
 	protected function not_implemented() {
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
 		return new \WP_REST_Response( $error, 501 );
 	}
 

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

Indentation +7 added lines, -7 removed lines

@@ -39,13 +39,13 @@
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
-            'type' => 'checkbox',
-            'merge_tags' => false,
-            'value' => 0,
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
-        );
+		$field_options['make_clickable'] = array(
+			'type' => 'checkbox',
+			'merge_tags' => false,
+			'value' => 0,
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
+		);
 
 		$field_options['allow_html'] = array(
 			'type' => 'checkbox',

Spacing +5 added lines, -5 removed lines

@@ -29,13 +29,13 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		$field_options['trim_words'] = array(
+		$field_options[ 'trim_words' ] = array(
 			'type' => 'number',
 			'merge_tags' => false,
 			'value' => null,
@@ -43,7 +43,7 @@ 
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
+        $field_options[ 'make_clickable' ] = array(
             'type' => 'checkbox',
             'merge_tags' => false,
             'value' => 0,
@@ -51,7 +51,7 @@ 
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
         );
 
-		$field_options['allow_html'] = array(
+		$field_options[ 'allow_html' ] = array(
 			'type' => 'checkbox',
 			'merge_tags' => false,
 			'value' => 1,

includes/admin/field-types/type_number.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
  * number input type
  */
 
-if( !class_exists('GravityView_FieldType_text') ) {
+if ( ! class_exists( 'GravityView_FieldType_text' ) ) {
 	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
 }
 
@@ -20,7 +20,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 ';
 		}
 
@@ -31,9 +31,9 @@ 
 		$step = \GV\Utils::get( $this->field, 'step', null );
 
 		$atts = '';
-		$atts .= $max ? ' max="' . (int) $max . '"' : '';
-		$atts .= $min ? ' min="' . (int) $min . '"' : '';
-		$atts .= $step ? ' step="' . (int) $step . '"' : '';
+		$atts .= $max ? ' max="' . (int)$max . '"' : '';
+		$atts .= $min ? ' min="' . (int)$min . '"' : '';
+		$atts .= $step ? ' step="' . (int)$step . '"' : '';
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number"
 		       value="<?php echo esc_attr( $this->value ); ?>"

includes/presets/default-table/class-gravityview-default-template-table.php

Spacing +3 added lines, -3 removed lines

@@ -88,15 +88,15 @@
 	 */
 	public function maybe_modify_button_label( $label = '', $atts = array() ) {
 
-		if( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
+		if ( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
 			return $label;
 		}
 
-		if( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
+		if ( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
 			return $label;
 		}
 
-		if( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
+		if ( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
 			return $label;
 		}
 

includes/admin/class.field.type.php

Spacing +15 added lines, -15 removed lines

@@ -33,14 +33,14 @@ 
         $defaults = self::get_field_defaults();
 
         // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
+        if ( ! empty( $field[ 'choices' ] ) ) {
+        	$field[ 'options' ] = $field[ 'choices' ];
+        	unset( $field[ 'choices' ] );
         }
 
-        $this->field =  wp_parse_args( $field, $defaults );
+        $this->field = wp_parse_args( $field, $defaults );
 
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
 
     }
 
@@ -79,7 +79,7 @@ 
 
 
     function get_tooltip() {
-        if( ! function_exists('gform_tooltip') ) {
+        if ( ! function_exists( 'gform_tooltip' ) ) {
             return null;
         }
 
@@ -89,7 +89,7 @@ 
 	    	'url' => '#',
 	    ) );
 
-        return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null;
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . $this->tooltip( $this->field[ 'tooltip' ], false, true, $article ) : null;
     }
 
     /**
@@ -132,7 +132,7 @@ 
 	     * Below this line has been modified by GravityView.
 	     */
 
-		if ( empty( $tooltip_text ) && empty( $article['id'] ) ) {
+		if ( empty( $tooltip_text ) && empty( $article[ 'id' ] ) ) {
 			return '';
 		}
 
@@ -168,8 +168,8 @@ 
      * @return string
      */
     function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
+        if ( isset( $this->field[ 'id' ] ) ) {
+            return esc_attr( $this->field[ 'id' ] );
         }
         return esc_attr( sanitize_html_class( $this->name ) );
     }
@@ -179,7 +179,7 @@ 
      * @return string
      */
     function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
+        return esc_html( trim( $this->field[ 'label' ] ) );
     }
 
 	/**
@@ -190,7 +190,7 @@ 
 	 * @return string
 	 */
 	function get_field_left_label() {
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
 	}
 
     /**
@@ -198,7 +198,7 @@ 
      * @return string
      */
     function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
     }
 
 
@@ -207,7 +207,7 @@ 
      * @return string
      */
     function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
     }
 
 
@@ -240,7 +240,7 @@ 
      */
     function render_setting( $override_input = NULL ) {
 
-        if( !empty( $this->field['full_width'] ) ) { ?>
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">

Indentation +176 added lines, -176 removed lines

@@ -10,107 +10,107 @@ 
 	 *
 	 * @var string
 	 */
-    protected $name;
+	protected $name;
 
 	/**
 	 * Field settings
 	 *
 	 * @var array
 	 */
-    protected $field;
+	protected $field;
 
 	/**
 	 * Field current value
 	 *
 	 * @var mixed
 	 */
-    protected $value;
-
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
-
-        $this->name = $name;
-
-        $defaults = self::get_field_defaults();
-
-        // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
-        }
-
-        $this->field =  wp_parse_args( $field, $defaults );
-
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
-
-    }
-
-    /**
-     * Returns the default details for a field option
-     *
-     * - default    // default option value, in case nothing is defined (@deprecated)
-     * - desc       // option description
-     * - value      // the option default value
-     * - label      // the option label
-     * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
-     * - id         // the field id
-     * - type       // the option type ( text, checkbox, select, ... )
-     * - options    // when type is select, define the select options ('choices' is @deprecated)
-     * - merge_tags // if the option supports merge tags feature
-     * - class      // (new) define extra classes for the field
-     * - tooltip    //
-     *
-     * @return array
-     */
-    public static function get_field_defaults() {
-        return array(
-            'desc' => '',
-            'value' => null,
-            'label' => '',
-            'left_label' => null,
-            'id' => null,
-            'type'  => 'text',
-            'options' => null,
-            'merge_tags' => true,
-            'class' => '',
-            'tooltip' => null,
-            'requires' => null
-        );
-    }
-
-
-    function get_tooltip() {
-        if( ! function_exists('gform_tooltip') ) {
-            return null;
-        }
-
-	    $article = wp_parse_args( \GV\Utils::get( $this->field, 'article', array() ), array(
-	    	'id' => '',
-	    	'type' => 'modal',
-	    	'url' => '#',
-	    ) );
-
-        return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null;
-    }
-
-    /**
-     * Displays the tooltip
-     *
-     * @since 2.8.1
-     *
-     * @global $__gf_tooltips
-     *
-     * @param string $name      The name of the tooltip to be displayed
-     * @param string $css_class Optional. The CSS class to apply toi the element. Defaults to empty string.
-     * @param bool   $return    Optional. If the tooltip should be returned instead of output. Defaults to false (output)
-     * @param array  $article   Optional. Details about support doc article connected to the tooltip. {
-     *   @type string $id   Unique ID of article for Beacon API
-     *   @type string $url  URL of support doc article
-     *   @type string $type Type of Beacon element to open. {@see https://developer.helpscout.com/beacon-2/web/javascript-api/#beaconarticle}
-     * }
-     *
-     * @return string
-     */
-    function tooltip( $name, $css_class = '', $return = false, $article = array() ) {
+	protected $value;
+
+	function __construct( $name = '', $field = array(), $curr_value = NULL ) {
+
+		$this->name = $name;
+
+		$defaults = self::get_field_defaults();
+
+		// Backward compatibility
+		if( !empty( $field['choices'] ) ) {
+			$field['options'] = $field['choices'];
+			unset( $field['choices'] );
+		}
+
+		$this->field =  wp_parse_args( $field, $defaults );
+
+		$this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+
+	}
+
+	/**
+	 * Returns the default details for a field option
+	 *
+	 * - default    // default option value, in case nothing is defined (@deprecated)
+	 * - desc       // option description
+	 * - value      // the option default value
+	 * - label      // the option label
+	 * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
+	 * - id         // the field id
+	 * - type       // the option type ( text, checkbox, select, ... )
+	 * - options    // when type is select, define the select options ('choices' is @deprecated)
+	 * - merge_tags // if the option supports merge tags feature
+	 * - class      // (new) define extra classes for the field
+	 * - tooltip    //
+	 *
+	 * @return array
+	 */
+	public static function get_field_defaults() {
+		return array(
+			'desc' => '',
+			'value' => null,
+			'label' => '',
+			'left_label' => null,
+			'id' => null,
+			'type'  => 'text',
+			'options' => null,
+			'merge_tags' => true,
+			'class' => '',
+			'tooltip' => null,
+			'requires' => null
+		);
+	}
+
+
+	function get_tooltip() {
+		if( ! function_exists('gform_tooltip') ) {
+			return null;
+		}
+
+		$article = wp_parse_args( \GV\Utils::get( $this->field, 'article', array() ), array(
+			'id' => '',
+			'type' => 'modal',
+			'url' => '#',
+		) );
+
+		return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null;
+	}
+
+	/**
+	 * Displays the tooltip
+	 *
+	 * @since 2.8.1
+	 *
+	 * @global $__gf_tooltips
+	 *
+	 * @param string $name      The name of the tooltip to be displayed
+	 * @param string $css_class Optional. The CSS class to apply toi the element. Defaults to empty string.
+	 * @param bool   $return    Optional. If the tooltip should be returned instead of output. Defaults to false (output)
+	 * @param array  $article   Optional. Details about support doc article connected to the tooltip. {
+	 *   @type string $id   Unique ID of article for Beacon API
+	 *   @type string $url  URL of support doc article
+	 *   @type string $type Type of Beacon element to open. {@see https://developer.helpscout.com/beacon-2/web/javascript-api/#beaconarticle}
+	 * }
+	 *
+	 * @return string
+	 */
+	function tooltip( $name, $css_class = '', $return = false, $article = array() ) {
 		global $__gf_tooltips; //declared as global to improve WPML performance
 
 		$css_class = empty( $css_class ) ? 'tooltip' : $css_class;
@@ -128,17 +128,17 @@ 
 		$tooltip_class = isset( $__gf_tooltips[ $name ] ) ? "tooltip_{$name}" : '';
 		$tooltip_class = esc_attr( $tooltip_class );
 
-	    /**
-	     * Below this line has been modified by GravityView.
-	     */
+		/**
+		 * Below this line has been modified by GravityView.
+		 */
 
 		if ( empty( $tooltip_text ) && empty( $article['id'] ) ) {
 			return '';
 		}
 
 		$url = '#';
-	    $atts = 'onclick="return false;" onkeypress="return false;"';
-	    $anchor_text = '<i class=\'fa fa-question-circle\'></i>';
+		$atts = 'onclick="return false;" onkeypress="return false;"';
+		$anchor_text = '<i class=\'fa fa-question-circle\'></i>';
 		$css_class = gravityview_sanitize_html_class( 'gf_tooltip ' . $css_class . ' ' . $tooltip_class );
 
 		$tooltip = sprintf( '<a href="%s" %s class="%s" title="%s" role="button">%s</a>',
@@ -149,11 +149,11 @@ 
 			$anchor_text
 		);
 
-	    /**
-	     * Modify the tooltip HTML before outputting
-	     * @internal
-	     * @see GravityView_Support_Port::maybe_add_article_to_tooltip()
-	     */
+		/**
+		 * Modify the tooltip HTML before outputting
+		 * @internal
+		 * @see GravityView_Support_Port::maybe_add_article_to_tooltip()
+		 */
 		$tooltip = apply_filters( 'gravityview/tooltips/tooltip', $tooltip, $article, $url, $atts, $css_class, $tooltip_text, $anchor_text );
 
 		if ( ! $return ) {
@@ -163,84 +163,84 @@ 
 		return $tooltip;
 	}
 
-    /**
-     * Build input id based on the name
-     * @return string
-     */
-    function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
-        }
-        return esc_attr( sanitize_html_class( $this->name ) );
-    }
-
-    /**
-     * Retrieve field label
-     * @return string
-     */
-    function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
-    }
+	/**
+	 * Build input id based on the name
+	 * @return string
+	 */
+	function get_field_id() {
+		if( isset( $this->field['id'] ) ) {
+			return esc_attr( $this->field['id'] );
+		}
+		return esc_attr( sanitize_html_class( $this->name ) );
+	}
+
+	/**
+	 * Retrieve field label
+	 * @return string
+	 */
+	function get_field_label() {
+		return esc_html( trim( $this->field['label'] ) );
+	}
 
 	/**
 	 * Retrieve field left label
-     *
-     * @since 1.7
-     *
+	 *
+	 * @since 1.7
+	 *
 	 * @return string
 	 */
 	function get_field_left_label() {
 		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
 	}
 
-    /**
-     * Retrieve field label class
-     * @return string
-     */
-    function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
-    }
-
-
-    /**
-     * Retrieve field description
-     * @return string
-     */
-    function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
-    }
-
-
-    /**
-     * Verify if field should have merge tags
-     * @return boolean
-     */
-    function show_merge_tags() {
-        // Show the merge tags if the field is a list view
-        $is_list = preg_match( '/_list-/ism', $this->name );
-        // Or is a single entry view
-        $is_single = preg_match( '/single_/ism', $this->name );
-
-        return ( $is_single || $is_list );
-    }
-
-
-
-    /**
-     * important! Override this class
-     * outputs the field option html
-     */
-    function render_option() {
-        // to replace on each field
-    }
-
-    /**
-     * important! Override this class if needed
-     * outputs the field setting html
-     */
-    function render_setting( $override_input = NULL ) {
-
-        if( !empty( $this->field['full_width'] ) ) { ?>
+	/**
+	 * Retrieve field label class
+	 * @return string
+	 */
+	function get_label_class() {
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+	}
+
+
+	/**
+	 * Retrieve field description
+	 * @return string
+	 */
+	function get_field_desc() {
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+	}
+
+
+	/**
+	 * Verify if field should have merge tags
+	 * @return boolean
+	 */
+	function show_merge_tags() {
+		// Show the merge tags if the field is a list view
+		$is_list = preg_match( '/_list-/ism', $this->name );
+		// Or is a single entry view
+		$is_single = preg_match( '/single_/ism', $this->name );
+
+		return ( $is_single || $is_list );
+	}
+
+
+
+	/**
+	 * important! Override this class
+	 * outputs the field option html
+	 */
+	function render_option() {
+		// to replace on each field
+	}
+
+	/**
+	 * important! Override this class if needed
+	 * outputs the field setting html
+	 */
+	function render_setting( $override_input = NULL ) {
+
+		if( !empty( $this->field['full_width'] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -260,14 +260,14 @@ 
             </td>
         <?php }
 
-    }
+	}
 
-    /**
-     * important! Override this class
-     * outputs the input html part
-     */
-    function render_input( $override_input ) {
-        echo '';
-    }
+	/**
+	 * important! Override this class
+	 * outputs the input html part
+	 */
+	function render_input( $override_input ) {
+		echo '';
+	}
 
 }