gravityview / GravityView

includes/fields/class-gravityview-field-post-category.php

Spacing +5 added lines, -5 removed lines

@@ -7,20 +7,20 @@
 
 	var $name = 'post_tags';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array('is', 'in', 'not in', 'isnot', 'contains');
 
 	var $_gf_field_class_name = 'GF_Field_Post_Tags';
 
 	var $group = 'post';
 
-	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
-		if( 'edit' === $context ) {
+		if ('edit' === $context) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
-		$this->add_field_support('link_to_term', $field_options );
+		$this->add_field_support('dynamic_data', $field_options);
+		$this->add_field_support('link_to_term', $field_options);
 
 		return $field_options;
 	}

includes/class-common.php

Doc Comments +1 added lines, -2 removed lines

@@ -167,7 +167,6 @@ 
 	 * Returns the list of available forms
 	 *
 	 * @access public
-	 * @param mixed $form_id
 	 * @return array Empty array if GFAPI isn't available or no forms. Otherwise, associative array with id, title keys
 	 */
 	public static function get_forms() {
@@ -188,7 +187,7 @@ 
 	 * Return array of fields' id and label, for a given Form ID
 	 *
 	 * @access public
-	 * @param string|array $form_id (default: '') or $form object
+	 * @param string|array $form (default: '') or $form object
 	 * @return array
 	 */
 	public static function get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {

Spacing +316 added lines, -316 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -25,18 +25,18 @@ 
 	 * @param mixed $form_id
 	 * @return mixed False: no form ID specified or Gravity Forms isn't active. Array: Form returned from Gravity Forms
 	 */
-	public static function get_form( $form_id ) {
-		if ( empty( $form_id ) ) {
+	public static function get_form($form_id) {
+		if (empty($form_id)) {
 			return false;
 		}
 
 		// Only get_form_meta is cached. ::facepalm::
-		if ( class_exists( 'RGFormsModel' ) ) {
-			return GFFormsModel::get_form_meta( $form_id );
+		if (class_exists('RGFormsModel')) {
+			return GFFormsModel::get_form_meta($form_id);
 		}
 
-		if ( class_exists( 'GFAPI' ) ) {
-			return GFAPI::get_form( $form_id );
+		if (class_exists('GFAPI')) {
+			return GFAPI::get_form($form_id);
 		}
 
 		return false;
@@ -55,8 +55,8 @@ 
 	 *
 	 * @return bool True: user has at least one passed capability; False: user does not have any defined capabilities
 	 */
-	public static function has_cap( $caps = '', $object_id = null, $user_id = null ) {
-		return GravityView_Roles_Capabilities::has_cap( $caps, $object_id, $user_id );
+	public static function has_cap($caps = '', $object_id = null, $user_id = null) {
+		return GravityView_Roles_Capabilities::has_cap($caps, $object_id, $user_id);
 	}
 
 	/**
@@ -67,14 +67,14 @@ 
 	 * @param array|GF_Fields $field Gravity Forms field or array
 	 * @return array Array version of $field
 	 */
-	public static function get_field_array( $field ) {
+	public static function get_field_array($field) {
 
-		if ( class_exists( 'GF_Fields' ) ) {
+		if (class_exists('GF_Fields')) {
 
-			$field_object = GF_Fields::create( $field );
+			$field_object = GF_Fields::create($field);
 
 			// Convert the field object in 1.9 to an array for backward compatibility
-			$field_array = get_object_vars( $field_object );
+			$field_array = get_object_vars($field_object);
 
 		} else {
 			$field_array = $field;
@@ -93,7 +93,7 @@ 
 	 *
 	 * @return array Array of Views as `WP_Post`. Empty array if none found.
 	 */
-	public static function get_all_views( $args = array() ) {
+	public static function get_all_views($args = array()) {
 
 		$default_params = array(
 			'post_type' => 'gravityview',
@@ -101,15 +101,15 @@ 
 			'post_status' => 'publish',
 		);
 
-		$params = wp_parse_args( $args, $default_params );
+		$params = wp_parse_args($args, $default_params);
 
 		/**
 		 * @filter `gravityview/get_all_views/params` Modify the parameters sent to get all views.
 		 * @param[in,out]  array $params Array of parameters to pass to `get_posts()`
 		 */
-		$views_params = apply_filters( 'gravityview/get_all_views/params', $params );
+		$views_params = apply_filters('gravityview/get_all_views/params', $params);
 
-		$views = get_posts( $views_params );
+		$views = get_posts($views_params);
 
 		return $views;
 	}
@@ -120,11 +120,11 @@ 
 	 * @param  int|string $entry_slug Entry slug
 	 * @return array           Gravity Forms form array
 	 */
-	public static function get_form_from_entry_id( $entry_slug ) {
+	public static function get_form_from_entry_id($entry_slug) {
 
-		$entry = self::get_entry( $entry_slug, true );
+		$entry = self::get_entry($entry_slug, true);
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form($entry['form_id']);
 
 		return $form;
 	}
@@ -138,13 +138,13 @@ 
 	 *
 	 * @return bool|GF_Field[]
 	 */
-	public static function has_product_field( $form = array() ) {
+	public static function has_product_field($form = array()) {
 
-		$product_fields = apply_filters( 'gform_product_field_types', array( 'option', 'quantity', 'product', 'total', 'shipping', 'calculation', 'price' ) );
+		$product_fields = apply_filters('gform_product_field_types', array('option', 'quantity', 'product', 'total', 'shipping', 'calculation', 'price'));
 
-		$fields = GFAPI::get_fields_by_type( $form, $product_fields );
+		$fields = GFAPI::get_fields_by_type($form, $product_fields);
 
-		return empty( $fields ) ? false : $fields;
+		return empty($fields) ? false : $fields;
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @param  string $slug The entry slug, as returned by GravityView_API::get_entry_slug()
 	 * @return int|null       The entry ID, if exists; `NULL` if not
 	 */
-	public static function get_entry_id_from_slug( $slug ) {
+	public static function get_entry_id_from_slug($slug) {
 		global $wpdb;
 
 		$search_criteria = array(
@@ -173,9 +173,9 @@ 
 			'page_size' => 1,
 		);
 
-		$results = GFAPI::get_entries( 0, $search_criteria, null, $paging );
+		$results = GFAPI::get_entries(0, $search_criteria, null, $paging);
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = (!empty($results) && !empty($results[0]['id'])) ? $results[0]['id'] : null;
 
 		return $result;
 	}
@@ -190,9 +190,9 @@ 
 	 */
 	public static function get_forms() {
 		$forms = array();
-		if ( class_exists( 'GFAPI' ) ) {
+		if (class_exists('GFAPI')) {
 			$gf_forms = GFAPI::get_forms();
-			foreach ( $gf_forms as $form ) {
+			foreach ($gf_forms as $form) {
 				$forms[] = array(
 					'id' => $form['id'],
 					'title' => $form['title'],
@@ -209,10 +209,10 @@ 
 	 * @param string|array $form_id (default: '') or $form object
 	 * @return array
 	 */
-	public static function get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
+	public static function get_form_fields($form = '', $add_default_properties = false, $include_parent_field = true) {
 
-		if ( ! is_array( $form ) ) {
-			$form = self::get_form( $form );
+		if (!is_array($form)) {
+			$form = self::get_form($form);
 		}
 
 		$fields = array();
@@ -222,56 +222,56 @@ 
 		$has_poll_fields = false;
 
 		// If GF_Field exists, we're using GF 1.9+, where add_default_properties has been deprecated.
-		if ( false === class_exists( 'GF_Field' ) && $add_default_properties ) {
-			$form = RGFormsModel::add_default_properties( $form );
+		if (false === class_exists('GF_Field') && $add_default_properties) {
+			$form = RGFormsModel::add_default_properties($form);
 		}
 
-		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields[ $field['id'] ] = array(
-						'label' => rgar( $field, 'label' ),
+		if ($form) {
+			foreach ($form['fields'] as $field) {
+				if ($include_parent_field || empty($field['inputs'])) {
+					$fields[$field['id']] = array(
+						'label' => rgar($field, 'label'),
 						'parent' => null,
-						'type' => rgar( $field, 'type' ),
-						'adminLabel' => rgar( $field, 'adminLabel' ),
-						'adminOnly' => rgar( $field, 'adminOnly' ),
+						'type' => rgar($field, 'type'),
+						'adminLabel' => rgar($field, 'adminLabel'),
+						'adminOnly' => rgar($field, 'adminOnly'),
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ($add_default_properties && !empty($field['inputs'])) {
+					foreach ($field['inputs'] as $input) {
                         /**
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+                        if ('email' == rgar($field, 'type') && false === strpos($input['id'], '.')) {
                             continue;
                         }
-						$fields[ (string)$input['id'] ] = array(
-							'label' => rgar( $input, 'label' ),
-							'customLabel' => rgar( $input, 'customLabel' ),
+						$fields[(string)$input['id']] = array(
+							'label' => rgar($input, 'label'),
+							'customLabel' => rgar($input, 'customLabel'),
 							'parent' => $field,
-							'type' => rgar( $field, 'type' ),
-							'adminLabel' => rgar( $field, 'adminLabel' ),
-							'adminOnly' => rgar( $field, 'adminOnly' ),
+							'type' => rgar($field, 'type'),
+							'adminLabel' => rgar($field, 'adminLabel'),
+							'adminOnly' => rgar($field, 'adminOnly'),
 						);
 					}
 				}
 
 				/** @since 1.14 */
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
+				if ('list' === $field['type'] && !empty($field['enableColumns'])) {
 
-					foreach ( (array)$field['choices'] as $key => $input ) {
+					foreach ((array)$field['choices'] as $key => $input) {
 
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
+						$input_id = sprintf('%d.%d', $field['id'], $key); // {field_id}.{column_key}
 
-						$fields[ $input_id ] = array(
-							'label'       => rgar( $input, 'text' ),
+						$fields[$input_id] = array(
+							'label'       => rgar($input, 'text'),
 							'customLabel' => '',
 							'parent'      => $field,
-							'type'        => rgar( $field, 'type' ),
-							'adminLabel'  => rgar( $field, 'adminLabel' ),
-							'adminOnly'   => rgar( $field, 'adminOnly' ),
+							'type'        => rgar($field, 'type'),
+							'adminLabel'  => rgar($field, 'adminLabel'),
+							'adminOnly'   => rgar($field, 'adminOnly'),
 						);
 					}
 				}
@@ -279,27 +279,27 @@ 
 				/**
 				 * @since 1.8
 				 */
-				if( 'quiz' === $field['type'] ) {
+				if ('quiz' === $field['type']) {
 					$has_quiz_fields = true;
 				}
 
 				/**
 				 * @since 1.8
 				 */
-				if( 'poll' === $field['type'] ) {
+				if ('poll' === $field['type']) {
 					$has_poll_fields = true;
 				}
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if (GFCommon::is_product_field($field['type'])) {
 					$has_product_fields = true;
 				}
 
 				/**
 				 * @hack Version 1.9
 				 */
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
+				$field_for_is_post_field = class_exists('GF_Fields') ? (object)$field : (array)$field;
 
-				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
+				if (GFCommon::is_post_field($field_for_is_post_field)) {
 					$has_post_fields = true;
 				}
 			}
@@ -308,19 +308,19 @@ 
 		/**
 		 * @since 1.7
 		 */
-		if ( $has_post_fields ) {
+		if ($has_post_fields) {
 			$fields['post_id'] = array(
-				'label' => __( 'Post ID', 'gravityview' ),
+				'label' => __('Post ID', 'gravityview'),
 				'type' => 'post_id',
 			);
 		}
 
-		if ( $has_product_fields ) {
+		if ($has_product_fields) {
 
-			$payment_fields = GravityView_Fields::get_all( 'pricing' );
+			$payment_fields = GravityView_Fields::get_all('pricing');
 
-			foreach ( $payment_fields as $payment_field ) {
-				if( isset( $fields["{$payment_field->name}"] ) ) {
+			foreach ($payment_fields as $payment_field) {
+				if (isset($fields["{$payment_field->name}"])) {
 					continue;
 				}
 				$fields["{$payment_field->name}"] = array(
@@ -334,27 +334,27 @@ 
 		/**
 		 * @since 1.8
 		 */
-		if( $has_quiz_fields ) {
+		if ($has_quiz_fields) {
 
-			$fields['gquiz_score']   = array(
-				'label' => __( 'Quiz Score Total', 'gravityview' ),
+			$fields['gquiz_score'] = array(
+				'label' => __('Quiz Score Total', 'gravityview'),
 				'type'  => 'quiz_score',
-				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
+				'desc'  => __('Displays the number of correct Quiz answers the user submitted.', 'gravityview'),
 			);
 			$fields['gquiz_percent'] = array(
-				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
+				'label' => __('Quiz Percentage Grade', 'gravityview'),
 				'type'  => 'quiz_percent',
-				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
+				'desc'  => __('Displays the percentage of correct Quiz answers the user submitted.', 'gravityview'),
 			);
-			$fields['gquiz_grade']   = array(
-				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
+			$fields['gquiz_grade'] = array(
+				'label' => __('Quiz Letter Grade', 'gravityview'),
 				'type'  => 'quiz_grade',
-				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
+				'desc'  => __('Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview'),
 			);
 			$fields['gquiz_is_pass'] = array(
-				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
+				'label' => __('Quiz Pass/Fail', 'gravityview'),
 				'type'  => 'quiz_is_pass',
-				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
+				'desc'  => __('Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview'),
 			);
 		}
 
@@ -367,15 +367,15 @@ 
 	 * @param  string $form_id (default: '')
 	 * @return array
 	 */
-	public static function get_entry_meta( $form_id, $only_default_column = true ) {
+	public static function get_entry_meta($form_id, $only_default_column = true) {
 
-		$extra_fields = GFFormsModel::get_entry_meta( $form_id );
+		$extra_fields = GFFormsModel::get_entry_meta($form_id);
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ($extra_fields as $key => $field) {
+			if (!empty($only_default_column) && !empty($field['is_default_column'])) {
+				$fields[$key] = array('label' => $field['label'], 'type' => 'entry_meta');
 			}
 		}
 
@@ -391,13 +391,13 @@ 
 	 * @since  1.1.6
 	 * @return array|void          Array of entry IDs. Void if Gravity Forms isn't active.
 	 */
-	public static function get_entry_ids( $form_id, $search_criteria = array() ) {
+	public static function get_entry_ids($form_id, $search_criteria = array()) {
 
-		if ( ! class_exists( 'GFFormsModel' ) ) {
+		if (!class_exists('GFFormsModel')) {
 			return;
 		}
 
-		return GFFormsModel::search_lead_ids( $form_id, $search_criteria );
+		return GFFormsModel::search_lead_ids($form_id, $search_criteria);
 	}
 
 	/**
@@ -409,33 +409,33 @@ 
 	 * @param array $form_ids array Gravity Forms form IDs
 	 * @return array
 	 */
-	public static function calculate_get_entries_criteria( $passed_criteria = array(), $form_ids = array() ) {
+	public static function calculate_get_entries_criteria($passed_criteria = array(), $form_ids = array()) {
 
 		$search_criteria_defaults = array(
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
+			'cache' => (isset($passed_criteria['cache']) ? $passed_criteria['cache'] : true),
 		);
 
-		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
+		$criteria = wp_parse_args($passed_criteria, $search_criteria_defaults);
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if (!empty($criteria['search_criteria']['field_filters'])) {
+			foreach ($criteria['search_criteria']['field_filters'] as &$filter) {
 
-				if ( ! is_array( $filter ) ) {
+				if (!is_array($filter)) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter['operator'] = empty($filter['operator']) ? 'contains' : $filter['operator'];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter['operator'] = apply_filters('gravityview_search_operator', $filter['operator'], $filter);
 			}
 		}
 
@@ -443,32 +443,32 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach (array('start_date', 'end_date') as $key) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if (!empty($criteria['search_criteria'][$key])) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create($criteria['search_criteria'][$key]);
 
-				if ( $date ) {
+				if ($date) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria['search_criteria'][$key] = $date->format('Y-m-d H:i:s');
 				} else {
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset($criteria['search_criteria'][$key]);
 
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action('gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][$key]);
 				}
 			}
 		}
 
 
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
-		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry() ) {
+		if (class_exists('GravityView_View_Data') && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry()) {
 			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
-		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+		} elseif ('delete' === RGForms::get('action')) {
+			$criteria['context_view_id'] = isset($_GET['view_id']) ? $_GET['view_id'] : null;
+		} elseif (!isset($criteria['context_view_id'])) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
 			$criteria['context_view_id'] = null;
 		}
@@ -479,7 +479,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters('gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id']);
 
 		return (array)$criteria;
 
@@ -497,35 +497,35 @@ 
 	 * @param mixed &$total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate the total count. (default: null)
 	 * @return mixed False: Error fetching entries. Array: Multi-dimensional array of Gravity Forms entry arrays
 	 */
-	public static function get_entries( $form_ids = null, $passed_criteria = null, &$total = null ) {
+	public static function get_entries($form_ids = null, $passed_criteria = null, &$total = null) {
 
 		// Filter the criteria before query (includes Adv Filter)
-		$criteria = self::calculate_get_entries_criteria( $passed_criteria, $form_ids );
+		$criteria = self::calculate_get_entries_criteria($passed_criteria, $form_ids);
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_entries] Final Parameters', $criteria );
+		do_action('gravityview_log_debug', '[gravityview_get_entries] Final Parameters', $criteria);
 
 		// Return value
 		$return = null;
 
 		/** Reduce # of database calls */
-		add_filter( 'gform_is_encrypted_field', '__return_false' );
+		add_filter('gform_is_encrypted_field', '__return_false');
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if (!empty($criteria['cache'])) {
 
-			$Cache = new GravityView_Cache( $form_ids, $criteria );
+			$Cache = new GravityView_Cache($form_ids, $criteria);
 
-			if ( $entries = $Cache->get() ) {
+			if ($entries = $Cache->get()) {
 
 				// Still update the total count when using cached results
-				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+				if (!is_null($total)) {
+					$total = GFAPI::count_entries($form_ids, $criteria['search_criteria']);
 				}
 
 				$return = $entries;
 			}
 		}
 
-		if ( is_null( $return ) && class_exists( 'GFAPI' ) && ( is_numeric( $form_ids ) || is_array( $form_ids ) ) ) {
+		if (is_null($return) && class_exists('GFAPI') && (is_numeric($form_ids) || is_array($form_ids))) {
 
 			/**
 			 * @filter `gravityview_pre_get_entries` Define entries to be used before GFAPI::get_entries() is called
@@ -535,24 +535,24 @@ 
 			 * @param array $passed_criteria The original search criteria passed to `GVCommon::get_entries()`
 			 * @param  int|null $total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate
 			 */
-			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
+			$entries = apply_filters('gravityview_before_get_entries', null, $criteria, $passed_criteria, $total);
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if (is_null($entries)) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries($form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total);
 
-				if ( is_wp_error( $entries ) ) {
-					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
+				if (is_wp_error($entries)) {
+					do_action('gravityview_log_error', $entries->get_error_message(), $entries);
 
 					return false;
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if (!empty($criteria['cache']) && isset($Cache)) {
 
 				// Cache results
-				$Cache->set( $entries, 'entries' );
+				$Cache->set($entries, 'entries');
 
 			}
 
@@ -560,7 +560,7 @@ 
 		}
 
 		/** Remove filter added above */
-		remove_filter( 'gform_is_encrypted_field', '__return_false' );
+		remove_filter('gform_is_encrypted_field', '__return_false');
 
 		/**
 		 * @filter `gravityview_entries` Modify the array of entries returned to GravityView after it has been fetched from the cache or from `GFAPI::get_entries()`.
@@ -569,7 +569,7 @@ 
 		 * @param array $passed_criteria The original search criteria passed to `GVCommon::get_entries()`
 		 * @param  int|null $total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate
 		 */
-		$return = apply_filters( 'gravityview_entries', $return, $criteria, $passed_criteria, $total );
+		$return = apply_filters('gravityview_entries', $return, $criteria, $passed_criteria, $total);
 
 		return $return;
 	}
@@ -586,15 +586,15 @@ 
 	 * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true. {@since 1.14}
 	 * @return array|boolean
 	 */
-	public static function get_entry( $entry_slug, $force_allow_ids = false, $check_entry_display = true ) {
+	public static function get_entry($entry_slug, $force_allow_ids = false, $check_entry_display = true) {
 
-		if ( class_exists( 'GFAPI' ) && ! empty( $entry_slug ) ) {
+		if (class_exists('GFAPI') && !empty($entry_slug)) {
 
 			/**
 			 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 			 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 			 */
-			$custom_slug = apply_filters( 'gravityview_custom_entry_slug', false );
+			$custom_slug = apply_filters('gravityview_custom_entry_slug', false);
 
 			/**
 			 * @filter `gravityview_custom_entry_slug_allow_id` When using a custom slug, allow access to the entry using the original slug (the Entry ID).
@@ -602,38 +602,38 @@ 
 			 * - If enabled, you could access using the custom slug OR the entry id (example: `/entry/custom-slug/` OR `/entry/123/`)
 			 * @param boolean $custom_slug_id_access True: allow accessing the slug by ID; False: only use the slug passed to the method.
 			 */
-			$custom_slug_id_access = $force_allow_ids || apply_filters( 'gravityview_custom_entry_slug_allow_id', false );
+			$custom_slug_id_access = $force_allow_ids || apply_filters('gravityview_custom_entry_slug_allow_id', false);
 
 			/**
 			 * If we're using custom entry slugs, we do a meta value search
 			 * instead of doing a straightup ID search.
 			 */
-			if ( $custom_slug ) {
+			if ($custom_slug) {
 
-				$entry_id = self::get_entry_id_from_slug( $entry_slug );
+				$entry_id = self::get_entry_id_from_slug($entry_slug);
 
 			}
 
 			// If custom slug is off, search using the entry ID
 			// ID allow ID access is on, also use entry ID as a backup
-			if ( empty( $custom_slug ) || ! empty( $custom_slug_id_access ) ) {
+			if (empty($custom_slug) || !empty($custom_slug_id_access)) {
 				// Search for IDs matching $entry_slug
 				$entry_id = $entry_slug;
 			}
 
-			if ( empty( $entry_id ) ) {
+			if (empty($entry_id)) {
 				return false;
 			}
 
 			// fetch the entry
-			$entry = GFAPI::get_entry( $entry_id );
+			$entry = GFAPI::get_entry($entry_id);
 
-			if( $check_entry_display ) {
+			if ($check_entry_display) {
 				// Is the entry allowed
-				$entry = self::check_entry_display( $entry );
+				$entry = self::check_entry_display($entry);
 			}
 
-			return is_wp_error( $entry ) ? false : $entry;
+			return is_wp_error($entry) ? false : $entry;
 
 		}
 
@@ -657,51 +657,51 @@ 
 	 *
 	 * @return bool True: matches, false: not matches
 	 */
-	public static function matches_operation( $val1, $val2, $operation ) {
+	public static function matches_operation($val1, $val2, $operation) {
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ('context' === $val1) {
 
-			$matching_contexts = array( $val2 );
+			$matching_contexts = array($val2);
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ($val2) {
 				// Check for either single or edit
 				case 'singular':
-					$matching_contexts = array( 'single', 'edit' );
+					$matching_contexts = array('single', 'edit');
 					break;
 				// Use multiple as alias for directory for consistency
 				case 'multiple':
-					$matching_contexts = array( 'directory' );
+					$matching_contexts = array('directory');
 					break;
 			}
 
-			$val1 = in_array( gravityview_get_context(), $matching_contexts ) ? $val2 : false;
+			$val1 = in_array(gravityview_get_context(), $matching_contexts) ? $val2 : false;
 		}
 
-		switch ( $operation ) {
+		switch ($operation) {
 			case 'equals':
-				$value = GFFormsModel::matches_operation( $val1, $val2, 'is' );
+				$value = GFFormsModel::matches_operation($val1, $val2, 'is');
 				break;
 			case 'greater_than_or_is':
 			case 'greater_than_or_equals':
-				$is    = GFFormsModel::matches_operation( $val1, $val2, 'is' );
-				$gt    = GFFormsModel::matches_operation( $val1, $val2, 'greater_than' );
-				$value = ( $is || $gt );
+				$is    = GFFormsModel::matches_operation($val1, $val2, 'is');
+				$gt    = GFFormsModel::matches_operation($val1, $val2, 'greater_than');
+				$value = ($is || $gt);
 				break;
 			case 'less_than_or_is':
 			case 'less_than_or_equals':
-				$is    = GFFormsModel::matches_operation( $val1, $val2, 'is' );
-				$gt    = GFFormsModel::matches_operation( $val1, $val2, 'less_than' );
-				$value = ( $is || $gt );
+				$is    = GFFormsModel::matches_operation($val1, $val2, 'is');
+				$gt    = GFFormsModel::matches_operation($val1, $val2, 'less_than');
+				$value = ($is || $gt);
 				break;
 			case 'not_contains':
-				$contains = GFFormsModel::matches_operation( $val1, $val2, 'contains' );
-				$value    = ! $contains;
+				$contains = GFFormsModel::matches_operation($val1, $val2, 'contains');
+				$value    = !$contains;
 				break;
 			default:
-				$value = GFFormsModel::matches_operation( $val1, $val2, $operation );
+				$value = GFFormsModel::matches_operation($val1, $val2, $operation);
 		}
 
 		return $value;
@@ -719,41 +719,41 @@ 
 	 * @param array $entry Gravity Forms Entry object
 	 * @return bool|array Returns 'false' if entry is not valid according to the view search filters (Adv Filter)
 	 */
-	public static function check_entry_display( $entry ) {
+	public static function check_entry_display($entry) {
 
-		if ( ! $entry || is_wp_error( $entry ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Entry was not found.', $entry );
+		if (!$entry || is_wp_error($entry)) {
+			do_action('gravityview_log_debug', __METHOD__.' Entry was not found.', $entry);
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
+		if (empty($entry['form_id'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry);
 			return false;
 		}
 
 		$criteria = self::calculate_get_entries_criteria();
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
-			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+		if (!empty($criteria['context_view_id'])) {
+			$context_view_id = intval($criteria['context_view_id']);
+			$context_form_id = gravityview_get_form_id($context_view_id);
+			if (intval($context_form_id) !== intval($entry['form_id'])) {
+				do_action('gravityview_log_debug', sprintf('[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id']), $criteria['context_view_id']);
 				return false;
 			}
 		}
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
+		if (empty($criteria['search_criteria']) || !is_array($criteria['search_criteria'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria);
 			return $entry;
 		}
 
 		$search_criteria = $criteria['search_criteria'];
-		unset( $criteria );
+		unset($criteria);
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if (array_key_exists('status', $search_criteria) && $search_criteria['status'] != $entry['status']) {
+			do_action('gravityview_log_debug', sprintf('[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status']), $search_criteria);
 			return false;
 		}
 
@@ -761,53 +761,53 @@ 
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
+		if (empty($search_criteria['field_filters']) || !is_array($search_criteria['field_filters'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria);
 			return $entry;
 		}
 
 		$filters = $search_criteria['field_filters'];
-		unset( $search_criteria );
+		unset($search_criteria);
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
-		unset( $filters['mode'] );
+		$mode = array_key_exists('mode', $filters) ? strtolower($filters['mode']) : 'all';
+		unset($filters['mode']);
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form($entry['form_id']);
 
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if (!isset($filter['key'])) {
 				continue;
 			}
 
 			$k = $filter['key'];
 
-			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
-				$field_value = $entry[ $k ];
+			if (in_array($k, array('created_by', 'payment_status'))) {
+				$field_value = $entry[$k];
 				$field = null;
 			} else {
-				$field = self::get_field( $form, $k );
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field = self::get_field($form, $k);
+				$field_value = GFFormsModel::get_lead_field_value($entry, $field);
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$operator = isset($filter['operator']) ? strtolower($filter['operator']) : 'is';
+			$is_value_match = GFFormsModel::is_value_match($field_value, $filter['value'], $operator, $field);
 
 			// verify if we are already free to go!
-			if ( ! $is_value_match && 'all' === $mode ) {
-				do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed one criteria for ALL mode', $filter );
+			if (!$is_value_match && 'all' === $mode) {
+				do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed one criteria for ALL mode', $filter);
 				return false;
-			} elseif ( $is_value_match && 'any' === $mode ) {
+			} elseif ($is_value_match && 'any' === $mode) {
 				return $entry;
 			}
 		}
 
 		// at this point, if in ALL mode, then entry is approved - all conditions were met.
 		// Or, for ANY mode, means none of the conditions were satisfied, so entry is not approved
-		if ( 'all' === $mode ) {
+		if ('all' === $mode) {
 			return $entry;
 		} else {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters);
 			return false;
 		}
 
@@ -832,7 +832,7 @@ 
 	 *
 	 * @return int|null|string Formatted date based on the original date
 	 */
-	public static function format_date( $date_string = '', $args = array() ) {
+	public static function format_date($date_string = '', $args = array()) {
 
 		$default_atts = array(
 			'raw' => false,
@@ -843,39 +843,39 @@ 
 			'time' => false,
 		);
 
-		$atts = wp_parse_args( $args, $default_atts );
+		$atts = wp_parse_args($args, $default_atts);
 
 		/**
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
-		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
+		$date_gmt_time = mysql2date('G', $date_string);
+		$date_local_timestamp = GFCommon::get_local_timestamp($date_gmt_time);
 
-		$format  = rgar( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = rgar($atts, 'format');
+		$is_human = !empty($atts['human']);
+		$is_diff = !empty($atts['diff']);
+		$is_raw = !empty($atts['raw']);
+		$is_timestamp = !empty($atts['timestamp']);
+		$include_time = !empty($atts['time']);
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
-			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
+		if (empty($format)) {
+			$format = $is_diff ? esc_html__('%s ago', 'gravityview') : get_option('date_format');
 		}
 
 		// If raw was specified, don't modify the stored value
-		if ( $is_raw ) {
+		if ($is_raw) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ($is_timestamp) {
 			$formatted_date = $date_local_timestamp;
-		} elseif ( $is_diff ) {
-			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
+		} elseif ($is_diff) {
+			$formatted_date = sprintf($format, human_time_diff($date_gmt_time));
 		} else {
-			$formatted_date = GFCommon::format_date( $date_string, $is_human, $format, $include_time );
+			$formatted_date = GFCommon::format_date($date_string, $is_human, $format, $include_time);
 		}
 
-		unset( $format, $is_diff, $is_human, $is_timestamp, $is_raw, $date_gmt_time, $date_local_timestamp, $default_atts );
+		unset($format, $is_diff, $is_human, $is_timestamp, $is_raw, $date_gmt_time, $date_local_timestamp, $default_atts);
 
 		return $formatted_date;
 	}
@@ -888,14 +888,14 @@ 
 	 * @param string $field_id
 	 * @return string
 	 */
-	public static function get_field_label( $form = array(), $field_id = '' ) {
+	public static function get_field_label($form = array(), $field_id = '') {
 
-		if ( empty( $form ) || empty( $field_id ) ) {
+		if (empty($form) || empty($field_id)) {
 			return '';
 		}
 
-		$field = self::get_field( $form, $field_id );
-		return isset( $field['label'] ) ?  $field['label'] : '';
+		$field = self::get_field($form, $field_id);
+		return isset($field['label']) ? $field['label'] : '';
 
 	}
 
@@ -912,9 +912,9 @@ 
 	 * @param string|int $field_id
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
 	 */
-	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
-			return GFFormsModel::get_field( $form, $field_id );
+	public static function get_field($form, $field_id) {
+		if (class_exists('GFFormsModel')) {
+			return GFFormsModel::get_field($form, $field_id);
 		} else {
 			return null;
 		}
@@ -930,16 +930,16 @@ 
 	 * @param  WP_Post      $post WordPress post object
 	 * @return boolean           True: yep, GravityView; No: not!
 	 */
-	public static function has_gravityview_shortcode( $post = null ) {
-		if ( ! is_a( $post, 'WP_Post' ) ) {
+	public static function has_gravityview_shortcode($post = null) {
+		if (!is_a($post, 'WP_Post')) {
 			return false;
 		}
 
-		if ( 'gravityview' === get_post_type( $post ) ) {
+		if ('gravityview' === get_post_type($post)) {
 			return true;
 		}
 
-		return self::has_shortcode_r( $post->post_content, 'gravityview' ) ? true : false;
+		return self::has_shortcode_r($post->post_content, 'gravityview') ? true : false;
 
 	}
 
@@ -950,27 +950,27 @@ 
 	 * @param string $content Content to check whether there's a shortcode
 	 * @param string $tag Current shortcode tag
 	 */
-	public static function has_shortcode_r( $content, $tag = 'gravityview' ) {
-		if ( false === strpos( $content, '[' ) ) {
+	public static function has_shortcode_r($content, $tag = 'gravityview') {
+		if (false === strpos($content, '[')) {
 			return false;
 		}
 
-		if ( shortcode_exists( $tag ) ) {
+		if (shortcode_exists($tag)) {
 
 			$shortcodes = array();
 
-			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			preg_match_all('/'.get_shortcode_regex().'/s', $content, $matches, PREG_SET_ORDER);
+			if (empty($matches)) {
 				return false;
 			}
 
-			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+			foreach ($matches as $shortcode) {
+				if ($tag === $shortcode[2]) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
 					$shortcodes[] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $result = self::has_shortcode_r( $shortcode[5], $tag ) ) {
+				} else if (isset($shortcode[5]) && $result = self::has_shortcode_r($shortcode[5], $tag)) {
 					$shortcodes = $result;
 				}
 			}
@@ -994,7 +994,7 @@ 
 	 *
 	 * @return array          Array with view details, as returned by get_posts()
 	 */
-	public static function get_connected_views( $form_id, $args = array() ) {
+	public static function get_connected_views($form_id, $args = array()) {
 
 		$defaults = array(
 			'post_type' => 'gravityview',
@@ -1003,9 +1003,9 @@ 
 			'meta_value' => (int)$form_id,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$views = get_posts( $args );
+		$views = get_posts($args);
 
 		return $views;
 	}
@@ -1017,8 +1017,8 @@ 
 	 *
 	 * @return string ID of the connected Form, if exists. Empty string if not.
 	 */
-	public static function get_meta_form_id( $view_id ) {
-		return get_post_meta( $view_id, '_gravityview_form_id', true );
+	public static function get_meta_form_id($view_id) {
+		return get_post_meta($view_id, '_gravityview_form_id', true);
 	}
 
 	/**
@@ -1030,8 +1030,8 @@ 
 	 *
 	 * @return string GravityView_Template::template_id value. Empty string if not.
 	 */
-	public static function get_meta_template_id( $view_id ) {
-		return get_post_meta( $view_id, '_gravityview_directory_template', true );
+	public static function get_meta_template_id($view_id) {
+		return get_post_meta($view_id, '_gravityview_directory_template', true);
 	}
 
 
@@ -1042,15 +1042,15 @@ 
 	 * @param  int $post_id View ID
 	 * @return array          Associative array of settings with plugin defaults used if not set by the View
 	 */
-	public static function get_template_settings( $post_id ) {
+	public static function get_template_settings($post_id) {
 
-		$settings = get_post_meta( $post_id, '_gravityview_template_settings', true );
+		$settings = get_post_meta($post_id, '_gravityview_template_settings', true);
 
-		if ( class_exists( 'GravityView_View_Data' ) ) {
+		if (class_exists('GravityView_View_Data')) {
 
 			$defaults = GravityView_View_Data::get_default_args();
 
-			return wp_parse_args( (array)$settings, $defaults );
+			return wp_parse_args((array)$settings, $defaults);
 
 		}
 
@@ -1067,12 +1067,12 @@ 
 	 * @param  string $key     Key for the setting
 	 * @return mixed|null          Setting value, or NULL if not set.
 	 */
-	public static function get_template_setting( $post_id, $key ) {
+	public static function get_template_setting($post_id, $key) {
 
-		$settings = self::get_template_settings( $post_id );
+		$settings = self::get_template_settings($post_id);
 
-		if ( isset( $settings[ $key ] ) ) {
-			return $settings[ $key ];
+		if (isset($settings[$key])) {
+			return $settings[$key];
 		}
 
 		return null;
@@ -1108,8 +1108,8 @@ 
 	 * @param  int $post_id View ID
 	 * @return array          Multi-array of fields with first level being the field zones. See code comment.
 	 */
-	public static function get_directory_fields( $post_id ) {
-		return get_post_meta( $post_id, '_gravityview_directory_fields', true );
+	public static function get_directory_fields($post_id) {
+		return get_post_meta($post_id, '_gravityview_directory_fields', true);
 	}
 
 
@@ -1120,25 +1120,25 @@ 
 	 * @param  int $formid Form ID
 	 * @return string         html
 	 */
-	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+	public static function get_sortable_fields($formid, $current = '') {
+		$output = '<option value="" '.selected('', $current, false).'>'.esc_html__('Default', 'gravityview').'</option>';
 
-		if ( empty( $formid ) ) {
+		if (empty($formid)) {
 			return $output;
 		}
 
-		$fields = self::get_sortable_fields_array( $formid );
+		$fields = self::get_sortable_fields_array($formid);
 
-		if ( ! empty( $fields ) ) {
+		if (!empty($fields)) {
 
-			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
+			$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', array('list', 'textarea'), null);
 
-			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+			foreach ($fields as $id => $field) {
+				if (in_array($field['type'], $blacklist_field_types)) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="'.$id.'" '.selected($id, $current, false).'>'.esc_attr($field['label']).'</option>';
 			}
 		}
 
@@ -1156,27 +1156,27 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_sortable_fields_array( $formid, $blacklist = array( 'list', 'textarea' ) ) {
+	public static function get_sortable_fields_array($formid, $blacklist = array('list', 'textarea')) {
 
 		// Get fields with sub-inputs and no parent
-		$fields = self::get_form_fields( $formid, true, false );
+		$fields = self::get_form_fields($formid, true, false);
 
 		$date_created = array(
 			'date_created' => array(
 				'type' => 'date_created',
-				'label' => __( 'Date Created', 'gravityview' ),
+				'label' => __('Date Created', 'gravityview'),
 			),
 		);
 
         $fields = $date_created + $fields;
 
-		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
+		$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', $blacklist, NULL);
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ($fields as $id => $field) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
-				unset( $fields[ $id ] );
+			if (in_array($field['type'], $blacklist_field_types)) {
+				unset($fields[$id]);
 			}
 		}
 
@@ -1186,7 +1186,7 @@ 
          * @param array $fields Sub-set of GF form fields that are sortable
          * @param int $formid The Gravity Forms form ID that the fields are from
          */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+        $fields = apply_filters('gravityview/common/sortable_fields', $fields, $formid);
 
 		return $fields;
 	}
@@ -1197,15 +1197,15 @@ 
 	 * @param  mixed $field_id Field ID or Field array
 	 * @return string field type
 	 */
-	public static function get_field_type( $form = null, $field_id = '' ) {
+	public static function get_field_type($form = null, $field_id = '') {
 
-		if ( ! empty( $field_id ) && ! is_array( $field_id ) ) {
-			$field = self::get_field( $form, $field_id );
+		if (!empty($field_id) && !is_array($field_id)) {
+			$field = self::get_field($form, $field_id);
 		} else {
 			$field = $field_id;
 		}
 
-		return class_exists( 'RGFormsModel' ) ? RGFormsModel::get_input_type( $field ) : '';
+		return class_exists('RGFormsModel') ? RGFormsModel::get_input_type($field) : '';
 
 	}
 
@@ -1216,17 +1216,17 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric($form = null, $field = '') {
 
-		if ( ! is_array( $form ) && ! is_array( $field ) ) {
-			$form = self::get_form( $form );
+		if (!is_array($form) && !is_array($field)) {
+			$form = self::get_form($form);
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if (!is_numeric($field) && is_string($field)) {
 			$type = $field;
 		} else {
-			$type = self::get_field_type( $form, $field );
+			$type = self::get_field_type($form, $field);
 		}
 
 		/**
@@ -1234,16 +1234,16 @@ 
 		 * @since 1.5.2
 		 * @param array $numeric_types Fields that are numeric. Default: `[ number, time ]`
 		 */
-		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
+		$numeric_types = apply_filters('gravityview/common/numeric_types', array('number', 'time'));
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
+		if ($gv_field = GravityView_Fields::get($type)) {
+			if (true === $gv_field->is_numeric) {
 				$numeric_types[] = $gv_field->is_numeric;
 			}
 		}
 
-		$return = in_array( $type, $numeric_types );
+		$return = in_array($type, $numeric_types);
 
 		return $return;
 	}
@@ -1262,19 +1262,19 @@ 
 	 *
 	 * @return string Content, encrypted
 	 */
-	public static function js_encrypt( $content, $message = '' ) {
+	public static function js_encrypt($content, $message = '') {
 
 		$output = $content;
 
-		if ( ! class_exists( 'StandalonePHPEnkoder' ) ) {
-			include_once( GRAVITYVIEW_DIR . 'includes/lib/standalone-phpenkoder/StandalonePHPEnkoder.php' );
+		if (!class_exists('StandalonePHPEnkoder')) {
+			include_once(GRAVITYVIEW_DIR.'includes/lib/standalone-phpenkoder/StandalonePHPEnkoder.php');
 		}
 
-		if ( class_exists( 'StandalonePHPEnkoder' ) ) {
+		if (class_exists('StandalonePHPEnkoder')) {
 
 			$enkoder = new StandalonePHPEnkoder;
 
-			$message = empty( $message ) ? __( 'Email hidden; Javascript is required.', 'gravityview' ) : $message;
+			$message = empty($message) ? __('Email hidden; Javascript is required.', 'gravityview') : $message;
 
 			/**
 			 * @filter `gravityview/phpenkoder/msg` Modify the message shown when Javascript is disabled and an encrypted email field is displayed
@@ -1282,9 +1282,9 @@ 
 			 * @param string $message Existing message
 			 * @param string $content Content to encrypt
 			 */
-			$enkoder->enkode_msg = apply_filters( 'gravityview/phpenkoder/msg', $message, $content );
+			$enkoder->enkode_msg = apply_filters('gravityview/phpenkoder/msg', $message, $content);
 
-			$output = $enkoder->enkode( $content );
+			$output = $enkoder->enkode($content);
 		}
 
 		return $output;
@@ -1301,25 +1301,25 @@ 
 	 *
 	 * @author rubo77 at https://gist.github.com/rubo77/6821632
 	 **/
-	public static function gv_parse_str( $string, &$result ) {
-		if ( empty( $string ) ) {
+	public static function gv_parse_str($string, &$result) {
+		if (empty($string)) {
 			return false;
 		}
 
 		$result = array();
 
 		// find the pairs "name=value"
-		$pairs = explode( '&', $string );
+		$pairs = explode('&', $string);
 
-		foreach ( $pairs as $pair ) {
+		foreach ($pairs as $pair) {
 			// use the original parse_str() on each element
-			parse_str( $pair, $params );
+			parse_str($pair, $params);
 
-			$k = key( $params );
-			if ( ! isset( $result[ $k ] ) ) {
+			$k = key($params);
+			if (!isset($result[$k])) {
 				$result += $params;
-			} elseif ( array_key_exists( $k, $params ) && is_array( $params[ $k ] ) ) {
-				$result[ $k ] = self::array_merge_recursive_distinct( $result[ $k ], $params[ $k ] );
+			} elseif (array_key_exists($k, $params) && is_array($params[$k])) {
+				$result[$k] = self::array_merge_recursive_distinct($result[$k], $params[$k]);
 			}
 		}
 		return true;
@@ -1341,7 +1341,7 @@ 
 	 *
 	 * @return string HTML output of anchor link. If empty $href, returns NULL
 	 */
-	public static function get_link_html( $href = '', $anchor_text = '', $atts = array() ) {
+	public static function get_link_html($href = '', $anchor_text = '', $atts = array()) {
 
 		// Supported attributes for anchor tags. HREF left out intentionally.
 		$allowed_atts = array(
@@ -1377,31 +1377,31 @@ 
 		 * @filter `gravityview/get_link/allowed_atts` Modify the attributes that are allowed to be used in generating links
 		 * @param array $allowed_atts Array of attributes allowed
 		 */
-		$allowed_atts = apply_filters( 'gravityview/get_link/allowed_atts', $allowed_atts );
+		$allowed_atts = apply_filters('gravityview/get_link/allowed_atts', $allowed_atts);
 
 		// Make sure the attributes are formatted as array
-		$passed_atts = wp_parse_args( $atts );
+		$passed_atts = wp_parse_args($atts);
 
 		// Make sure the allowed attributes are only the ones in the $allowed_atts list
-		$final_atts = shortcode_atts( $allowed_atts, $passed_atts );
+		$final_atts = shortcode_atts($allowed_atts, $passed_atts);
 
 		// Remove attributes with empty values
-		$final_atts = array_filter( $final_atts );
+		$final_atts = array_filter($final_atts);
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
+		if (empty($final_atts['href']) && !empty($href)) {
 			$final_atts['href'] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts['href'] = esc_url_raw($href);
 
 		// For each attribute, generate the code
 		$output = '';
-		foreach ( $final_atts as $attr => $value ) {
-			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
+		foreach ($final_atts as $attr => $value) {
+			$output .= sprintf(' %s="%s"', $attr, esc_attr($value));
 		}
 
-		$output = '<a'. $output .'>'. $anchor_text .'</a>';
+		$output = '<a'.$output.'>'.$anchor_text.'</a>';
 
 		return $output;
 	}
@@ -1420,14 +1420,14 @@ 
 	 * @author Daniel <daniel (at) danielsmedegaardbuus (dot) dk>
 	 * @author Gabriel Sobrinho <gabriel (dot) sobrinho (at) gmail (dot) com>
 	 */
-	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
+	public static function array_merge_recursive_distinct(array &$array1, array &$array2) {
 		$merged = $array1;
 
-		foreach ( $array2 as $key => &$value )  {
-			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
-				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
+		foreach ($array2 as $key => &$value) {
+			if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
+				$merged[$key] = self::array_merge_recursive_distinct($merged[$key], $value);
 			} else {
-				$merged[ $key ] = $value;
+				$merged[$key] = $value;
 			}
 		}
 
@@ -1441,26 +1441,26 @@ 
 	 * @param array $args Arguments to modify the user query. See get_users() {@since 1.14}
 	 * @return array Array of WP_User objects.
 	 */
-	public static function get_users( $context = 'change_entry_creator', $args = array() ) {
+	public static function get_users($context = 'change_entry_creator', $args = array()) {
 
 		$default_args = array(
 			'number' => 2000,
 			'orderby' => 'display_name',
 			'order' => 'ASC',
-			'fields' => array( 'ID', 'display_name', 'user_login', 'user_nicename' )
+			'fields' => array('ID', 'display_name', 'user_login', 'user_nicename')
 		);
 
 		// Merge in the passed arg
-		$get_users_settings = wp_parse_args( $args, $default_args );
+		$get_users_settings = wp_parse_args($args, $default_args);
 
 		/**
 		 * @filter `gravityview/get_users/{$context}` There are issues with too many users using [get_users()](http://codex.wordpress.org/Function_Reference/get_users) where it breaks the select. We try to keep it at a reasonable number. \n
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters('gravityview/get_users/'.$context, apply_filters('gravityview_change_entry_creator_user_parameters', $get_users_settings));
 
-		return get_users( $get_users_settings );
+		return get_users($get_users_settings);
 	}
 
 
@@ -1472,8 +1472,8 @@ 
      *
      * @return string
      */
-    public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+    public static function generate_notice($notice, $class = '') {
+        return '<div class="gv-notice '.gravityview_sanitize_html_class($class).'">'.$notice.'</div>';
     }
 
 
@@ -1495,6 +1495,6 @@ 
  *
  * @return string HTML output of anchor link. If empty $href, returns NULL
  */
-function gravityview_get_link( $href = '', $anchor_text = '', $atts = array() ) {
-	return GVCommon::get_link_html( $href, $anchor_text, $atts );
+function gravityview_get_link($href = '', $anchor_text = '', $atts = array()) {
+	return GVCommon::get_link_html($href, $anchor_text, $atts);
 }

includes/fields/class-gravityview-field.php

Doc Comments +6 added lines, -6 removed lines

@@ -175,7 +175,7 @@ 
 	 * @param bool $url_encode Whether to URL-encode output
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
@@ -202,7 +202,7 @@ 
 	 *
 	 * @since 1.8.4
 	 *
-	 * @param array $existing_merge_tags
+	 * @param array $custom_merge_tags
 	 * @param int $form_id GF Form ID
 	 * @param GF_Field[] $fields Array of fields in the form
 	 * @param string $element_id The ID of the input that Merge Tags are being used on
@@ -341,10 +341,10 @@ 
 	 * </pre>
 	 *
 	 * @param  [type]      $field_options [description]
-	 * @param  [type]      $template_id   [description]
-	 * @param  [type]      $field_id      [description]
-	 * @param  [type]      $context       [description]
-	 * @param  [type]      $input_type    [description]
+	 * @param  string      $template_id   [description]
+	 * @param  string      $field_id      [description]
+	 * @param  string      $context       [description]
+	 * @param  string      $input_type    [description]
 	 * @return [type]                     [description]
 	 */
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {

Spacing +45 added lines, -45 removed lines

@@ -73,7 +73,7 @@ 
 	 * @type array
 	 * @since 1.15.2
 	 */
-	var $contexts = array( 'single', 'multiple', 'edit', 'export' );
+	var $contexts = array('single', 'multiple', 'edit', 'export');
 
 	/**
 	 * @internal Not yet implemented
@@ -105,23 +105,23 @@ 
 		/**
 		 * If this is a Gravity Forms field, use their labels. Spare our translation team!
 		 */
-		if( ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
+		if (!empty($this->_gf_field_class_name) && class_exists($this->_gf_field_class_name)) {
 			/** @var GF_Field $GF_Field */
 			$GF_Field = new $this->_gf_field_class_name;
 			$this->label = $GF_Field->get_form_editor_field_title();
 		}
 
 		// Modify the field options based on the name of the field type
-		add_filter( sprintf( 'gravityview_template_%s_options', $this->name ), array( &$this, 'field_options' ), 10, 5 );
+		add_filter(sprintf('gravityview_template_%s_options', $this->name), array(&$this, 'field_options'), 10, 5);
 
-		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
+		add_filter('gravityview/sortable/field_blacklist', array($this, '_filter_sortable_fields'), 1);
 
-		if( $this->_custom_merge_tag ) {
-			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
-			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
+		if ($this->_custom_merge_tag) {
+			add_filter('gform_custom_merge_tags', array($this, '_filter_gform_custom_merge_tags'), 10, 4);
+			add_filter('gform_replace_merge_tags', array($this, '_filter_gform_replace_merge_tags'), 10, 7);
 		}
 
-		GravityView_Fields::register( $this );
+		GravityView_Fields::register($this);
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 *
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
 	 */
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function _filter_gform_replace_merge_tags($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false) {
 
 		/**
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
@@ -146,19 +146,19 @@ 
 		 * @see GFCommon::replace_variables_prepopulate()
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
 		 */
-		if( false === $form ) {
+		if (false === $form) {
 			return $text;
 		}
 
 		// Is there is field merge tag? Strip whitespace off the ned, too.
-		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
+		preg_match_all('/{'.preg_quote($this->_custom_merge_tag).':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER);
 
 		// If there are no matches, return original text
-		if ( empty( $matches ) ) {
+		if (empty($matches)) {
 			return $text;
 		}
 
-		return $this->replace_merge_tag( $matches, $text, $form, $entry, $url_encode, $esc_html );
+		return $this->replace_merge_tag($matches, $text, $form, $entry, $url_encode, $esc_html);
 	}
 
 	/**
@@ -177,29 +177,29 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
+	public function replace_merge_tag($matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false) {
 
-		foreach( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			$full_tag = $match[0];
 
 			// Strip the Merge Tags
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
+			$tag = str_replace(array('{', '}'), '', $full_tag);
 
 			// Replace the value from the entry, if exists
-			if( isset( $entry[ $tag ] ) ) {
+			if (isset($entry[$tag])) {
 
-				$value = $entry[ $tag ];
+				$value = $entry[$tag];
 
-				if( is_callable( array( $this, 'get_content') ) ) {
-					$value = $this->get_content( $value );
+				if (is_callable(array($this, 'get_content'))) {
+					$value = $this->get_content($value);
 				}
 
-				$text = str_replace( $full_tag, $value, $text );
+				$text = str_replace($full_tag, $value, $text);
 			}
 		}
 
-		unset( $value, $tag, $full_tag );
+		unset($value, $tag, $full_tag);
 
 		return $text;
 	}
@@ -218,13 +218,13 @@ 
 	 *
 	 * @return array Modified merge tags
 	 */
-	public function _filter_gform_custom_merge_tags( $custom_merge_tags = array(), $form_id, $fields = array(), $element_id = '' ) {
+	public function _filter_gform_custom_merge_tags($custom_merge_tags = array(), $form_id, $fields = array(), $element_id = '') {
 
-		$form = GVCommon::get_form( $form_id );
+		$form = GVCommon::get_form($form_id);
 
-		$field_merge_tags = $this->custom_merge_tags( $form, $fields );
+		$field_merge_tags = $this->custom_merge_tags($form, $fields);
 
-		return array_merge( $custom_merge_tags, $field_merge_tags );
+		return array_merge($custom_merge_tags, $field_merge_tags);
 	}
 
 	/**
@@ -239,13 +239,13 @@ 
 	 *
 	 * @return array Merge tag array with `label` and `tag` keys based on class `label` and `_custom_merge_tag` variables
 	 */
-	protected function custom_merge_tags( $form = array(), $fields = array() ) {
+	protected function custom_merge_tags($form = array(), $fields = array()) {
 
 		// Use variables to make it unnecessary for other fields to override
 		$merge_tags = array(
 			array(
 				'label' => $this->label,
-				'tag' => '{' . $this->_custom_merge_tag . '}',
+				'tag' => '{'.$this->_custom_merge_tag.'}',
 			),
 		);
 
@@ -262,9 +262,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function _filter_sortable_fields( $not_sortable ) {
+	public function _filter_sortable_fields($not_sortable) {
 
-		if( ! $this->is_sortable ) {
+		if (!$this->is_sortable) {
 			$not_sortable[] = $this->name;
 		}
 
@@ -275,35 +275,35 @@ 
 		$options = array(
 			'link_to_post' => array(
 				'type' => 'checkbox',
-				'label' => __( 'Link to the post', 'gravityview' ),
-				'desc' => __( 'Link to the post created by the entry.', 'gravityview' ),
+				'label' => __('Link to the post', 'gravityview'),
+				'desc' => __('Link to the post created by the entry.', 'gravityview'),
 				'value' => false,
 			),
 			'link_to_term' => array(
 				'type' => 'checkbox',
-				'label' => __( 'Link to the category or tag', 'gravityview' ),
-				'desc' => __( 'Link to the current category or tag. "Link to single entry" must be unchecked.', 'gravityview' ),
+				'label' => __('Link to the category or tag', 'gravityview'),
+				'desc' => __('Link to the current category or tag. "Link to single entry" must be unchecked.', 'gravityview'),
 				'value' => false,
 			),
 			'dynamic_data' => array(
 				'type' => 'checkbox',
-				'label' => __( 'Use the live post data', 'gravityview' ),
-				'desc' => __( 'Instead of using the entry data, instead use the current post data.', 'gravityview' ),
+				'label' => __('Use the live post data', 'gravityview'),
+				'desc' => __('Instead of using the entry data, instead use the current post data.', 'gravityview'),
 				'value' => true,
 			),
 			'date_display' => array(
 				'type' => 'text',
-				'label' => __( 'Override Date Format', 'gravityview' ),
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
+				'label' => __('Override Date Format', 'gravityview'),
+				'desc' => sprintf(__('Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>'),
 				/**
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
 				 * @param[in,out] null|string $date_format Date Format (default: null)
 				 */
-				'value' => apply_filters( 'gravityview_date_format', null )
+				'value' => apply_filters('gravityview_date_format', null)
 			),
 			'new_window' => array(
 				'type' => 'checkbox',
-				'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
+				'label' => __('Open link in a new tab or window?', 'gravityview'),
 				'value' => false,
 			),
 		);
@@ -312,15 +312,15 @@ 
 		 * @filter `gravityview_field_support_options` Modify the settings that a field supports
 		 * @param array $options Options multidimensional array with each key being the input name, with each array setting having `type`, `label`, `desc` and `value` (default values) keys
 		 */
-		return apply_filters( 'gravityview_field_support_options', $options );
+		return apply_filters('gravityview_field_support_options', $options);
 	}
 
-	function add_field_support( $key = '', &$field_options ) {
+	function add_field_support($key = '', &$field_options) {
 
 		$options = $this->field_support_options();
 
-		if( isset( $options[ $key ] ) ) {
-			$field_options[ $key ] = $options[ $key ];
+		if (isset($options[$key])) {
+			$field_options[$key] = $options[$key];
 		}
 
 		return $field_options;
@@ -356,7 +356,7 @@ 
 	 * @param  [type]      $input_type    [description]
 	 * @return [type]                     [description]
 	 */
-	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
 		$this->_field_options = $field_options;
 		$this->_field_id = $field_id;

includes/fields/class-gravityview-fields.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	/**
 	 * Alias for get_instance()
 	 *
-	 * @param $field_name
+	 * @param string $field_name
 	 *
 	 * @return GravityView_Field
 	 */

Spacing +27 added lines, -27 removed lines

@@ -23,17 +23,17 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register( $field ) {
-		if ( ! is_subclass_of( $field, 'GravityView_Field' ) ) {
-			throw new Exception( 'Must be a subclass of GravityView_Field' );
+	public static function register($field) {
+		if (!is_subclass_of($field, 'GravityView_Field')) {
+			throw new Exception('Must be a subclass of GravityView_Field');
 		}
-		if ( empty( $field->name ) ) {
-			throw new Exception( 'The name must be set' );
+		if (empty($field->name)) {
+			throw new Exception('The name must be set');
 		}
-		if ( isset( self::$_fields[ $field->name ] ) && ! defined( 'DOING_GRAVITYVIEW_TESTS' ) ) {
-			throw new Exception( 'Field type already registered: ' . $field->name );
+		if (isset(self::$_fields[$field->name]) && !defined('DOING_GRAVITYVIEW_TESTS')) {
+			throw new Exception('Field type already registered: '.$field->name);
 		}
-		self::$_fields[ $field->name ] = $field;
+		self::$_fields[$field->name] = $field;
 	}
 
 	/**
@@ -41,15 +41,15 @@ 
 	 *
 	 * @return GravityView_Field | bool
 	 */
-	public static function create( $properties ) {
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
-		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
-			return new GravityView_Field( $properties );
+	public static function create($properties) {
+		$type = isset($properties['type']) ? $properties['type'] : '';
+		$type = empty($properties['inputType']) ? $type : $properties['inputType'];
+		if (empty($type) || !isset(self::$_fields[$type])) {
+			return new GravityView_Field($properties);
 		}
-		$class      = self::$_fields[ $type ];
-		$class_name = get_class( $class );
-		$field      = new $class_name( $properties );
+		$class      = self::$_fields[$type];
+		$class_name = get_class($class);
+		$field      = new $class_name($properties);
 
 		return $field;
 	}
@@ -61,8 +61,8 @@ 
 	 *
 	 * @return bool True: yes, it exists; False: nope
 	 */
-	public static function exists( $field_name ) {
-		return isset( self::$_fields["{$field_name}"] );
+	public static function exists($field_name) {
+		return isset(self::$_fields["{$field_name}"]);
 	}
 
 	/**
@@ -70,8 +70,8 @@ 
 	 *
 	 * @return GravityView_Field
 	 */
-	public static function get_instance( $field_name ) {
-		return isset( self::$_fields[ $field_name ] ) ? self::$_fields[ $field_name ] : false;
+	public static function get_instance($field_name) {
+		return isset(self::$_fields[$field_name]) ? self::$_fields[$field_name] : false;
 	}
 
 	/**
@@ -81,8 +81,8 @@ 
 	 *
 	 * @return GravityView_Field
 	 */
-	public static function get( $field_name ) {
-		return self::get_instance( $field_name );
+	public static function get($field_name) {
+		return self::get_instance($field_name);
 	}
 
 	/**
@@ -94,13 +94,13 @@ 
 	 *
 	 * @return GravityView_Field[]
 	 */
-	public static function get_all( $group = '' ) {
+	public static function get_all($group = '') {
 
-		if( '' !== $group ) {
+		if ('' !== $group) {
 			$return_fields = self::$_fields;
-			foreach ( $return_fields as $key => $field ) {
-				if( $group !== $field->group ) {
-					unset( $return_fields[ $key ] );
+			foreach ($return_fields as $key => $field) {
+				if ($group !== $field->group) {
+					unset($return_fields[$key]);
 				}
 			}
 			return $return_fields;

gravityview.php

Spacing +80 added lines, -80 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -36,52 +36,52 @@ 
  * Full path to the GravityView file
  * @define "GRAVITYVIEW_FILE" "./gravityview.php"
  */
-define( 'GRAVITYVIEW_FILE', __FILE__ );
+define('GRAVITYVIEW_FILE', __FILE__);
 
 /**
  * The URL to this file
  */
-define( 'GRAVITYVIEW_URL', plugin_dir_url( __FILE__ ) );
+define('GRAVITYVIEW_URL', plugin_dir_url(__FILE__));
 
 
 /** @define "GRAVITYVIEW_DIR" "./" The absolute path to the plugin directory */
-define( 'GRAVITYVIEW_DIR', plugin_dir_path( __FILE__ ) );
+define('GRAVITYVIEW_DIR', plugin_dir_path(__FILE__));
 
 /**
  * GravityView requires at least this version of Gravity Forms to function properly.
  */
-define( 'GV_MIN_GF_VERSION', '1.9.9.10' );
+define('GV_MIN_GF_VERSION', '1.9.9.10');
 
 /**
  * GravityView requires at least this version of WordPress to function properly.
  * @since 1.12
  */
-define( 'GV_MIN_WP_VERSION', '3.3' );
+define('GV_MIN_WP_VERSION', '3.3');
 
 /**
  * GravityView requires at least this version of PHP to function properly.
  * @since 1.12
  */
-define( 'GV_MIN_PHP_VERSION', '5.2.4' );
+define('GV_MIN_PHP_VERSION', '5.2.4');
 
 /** Load common & connector functions */
-require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
-require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
-require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
+require_once(GRAVITYVIEW_DIR.'includes/helper-functions.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-common.php');
+require_once(GRAVITYVIEW_DIR.'includes/connector-functions.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-compatibility.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-roles-capabilities.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-notices.php');
 
 /** Register Post Types and Rewrite Rules */
-require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-post-types.php');
 
 /** Add Cache Class */
-require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-cache.php');
 
 /** Register hooks that are fired when the plugin is activated and deactivated. */
-if( is_admin() ) {
-	register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) );
-	register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) );
+if (is_admin()) {
+	register_activation_hook(__FILE__, array('GravityView_Plugin', 'activate'));
+	register_deactivation_hook(__FILE__, array('GravityView_Plugin', 'deactivate'));
 }
 
 /**
@@ -100,7 +100,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -110,7 +110,7 @@ 
 	private function __construct() {
 
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if (!GravityView_Compatibility::is_valid()) {
 			return;
 		}
 
@@ -126,10 +126,10 @@ 
 	 */
 	private function add_hooks() {
 		// Load plugin text domain
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ), 1 );
+		add_action('init', array($this, 'load_plugin_textdomain'), 1);
 
 		// Load frontend files
-		add_action( 'init', array( $this, 'frontend_actions' ), 20 );
+		add_action('init', array($this, 'frontend_actions'), 20);
 	}
 
 	/**
@@ -139,48 +139,48 @@ 
 	 */
 	public function include_files() {
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin.php');
 
 		// Load fields
-		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-fields.php');
+		include_once(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-field.php');
 
 		// Load all field files automatically
-		foreach ( glob( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field*.php' ) as $gv_field_filename ) {
-			include_once( $gv_field_filename );
+		foreach (glob(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-field*.php') as $gv_field_filename) {
+			include_once($gv_field_filename);
 		}
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-entry-notes.php');
+		include_once(GRAVITYVIEW_DIR.'includes/load-plugin-and-theme-hooks.php');
 
 		// Load Extensions
 		// @todo: Convert to a scan of the directory or a method where this all lives
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/extensions/edit-entry/class-edit-entry.php');
+		include_once(GRAVITYVIEW_DIR.'includes/extensions/delete-entry/class-delete-entry.php');
 
 		// Load WordPress Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/wordpress-widgets/register-wordpress-widgets.php');
 
 		// Load GravityView Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/widgets/register-gravityview-widgets.php');
 
 		// Add oEmbed
-		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-oembed.php');
 
 		// Add logging
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-logging.php' );
-
-		include_once( GRAVITYVIEW_DIR . 'includes/class-ajax.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-settings.php');
-		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
-		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gvlogic-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/presets/register-default-templates.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-logging.php');
+
+		include_once(GRAVITYVIEW_DIR.'includes/class-ajax.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-settings.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-frontend-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-bar.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-entry-list.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once(GRAVITYVIEW_DIR.'includes/class-data.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-entry-link-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gvlogic-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/presets/register-default-templates.php');
 
 	}
 
@@ -190,7 +190,7 @@ 
 	 * @return bool
 	 */
 	public static function is_network_activated() {
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
+		return is_multisite() && (function_exists('is_plugin_active_for_network') && is_plugin_active_for_network('gravityview/gravityview.php'));
 	}
 
 
@@ -212,13 +212,13 @@ 
 		flush_rewrite_rules();
 
 		// Update the current GV version
-		update_option( 'gv_version', self::version );
+		update_option('gv_version', self::version);
 
 		// Add the transient to redirect to configuration page
-		set_transient( '_gv_activation_redirect', true, 60 );
+		set_transient('_gv_activation_redirect', true, 60);
 
 		// Clear settings transient
-		delete_transient( 'redux_edd_license_license_valid' );
+		delete_transient('redux_edd_license_license_valid');
 
 		GravityView_Roles_Capabilities::get_instance()->add_caps();
 	}
@@ -244,8 +244,8 @@ 
 	 * @return void
 	 */
 	public static function include_extension_framework() {
-		if ( ! class_exists( 'GravityView_Extension' ) ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-extension.php' );
+		if (!class_exists('GravityView_Extension')) {
+			require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-extension.php');
 		}
 	}
 
@@ -255,7 +255,7 @@ 
 	 * @since 1.7.5.1
 	 */
 	public static function include_widget_class() {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/widgets/class-gravityview-widget.php');
 	}
 
 
@@ -267,17 +267,17 @@ 
 	 */
 	public function load_plugin_textdomain() {
 
-		$loaded = load_plugin_textdomain( 'gravityview', false, '/languages/' );
-		if ( ! $loaded ) {
-			$loaded = load_muplugin_textdomain( 'gravityview', '/languages/' );
+		$loaded = load_plugin_textdomain('gravityview', false, '/languages/');
+		if (!$loaded) {
+			$loaded = load_muplugin_textdomain('gravityview', '/languages/');
 		}
-		if ( ! $loaded ) {
-			$loaded = load_theme_textdomain( 'gravityview', '/languages/' );
+		if (!$loaded) {
+			$loaded = load_theme_textdomain('gravityview', '/languages/');
 		}
-		if ( ! $loaded ) {
-			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
-			load_textdomain( 'gravityview', $mofile );
+		if (!$loaded) {
+			$locale = apply_filters('plugin_locale', get_locale(), 'gravityview');
+			$mofile = dirname(__FILE__).'/languages/gravityview-'.$locale.'.mo';
+			load_textdomain('gravityview', $mofile);
 		}
 
 	}
@@ -289,9 +289,9 @@ 
 	 */
 	public static function is_admin() {
 
-		$doing_ajax = defined( 'DOING_AJAX' ) ? DOING_AJAX : false;
+		$doing_ajax = defined('DOING_AJAX') ? DOING_AJAX : false;
 
-		return is_admin() && ! $doing_ajax;
+		return is_admin() && !$doing_ajax;
 	}
 
 	/**
@@ -302,27 +302,27 @@ 
 	 */
 	public function frontend_actions() {
 
-		if( self::is_admin() ) { return; }
+		if (self::is_admin()) { return; }
 
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-image.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-template.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-api.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-frontend-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-change-entry-creator.php');
 
 
         /**
          * When an entry is created, check if we need to update the custom slug meta
          * todo: move this to its own class..
          */
-        add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+        add_action('gform_entry_created', array('GravityView_API', 'entry_create_custom_slug'), 10, 2);
 
 		/**
 		 * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded
 		 *
 		 * Nice place to insert extensions' frontend stuff
 		 */
-		do_action( 'gravityview_include_frontend_actions' );
+		do_action('gravityview_include_frontend_actions');
 	}
 
 	/**
@@ -332,15 +332,15 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
+			array('1-1' => array(array('areaid' => 'top', 'title' => __('Top', 'gravityview'), 'subtitle' => ''))),
+			array('1-2' => array(array('areaid' => 'left', 'title' => __('Left', 'gravityview'), 'subtitle' => '')), '2-2' => array(array('areaid' => 'right', 'title' => __('Right', 'gravityview'), 'subtitle' => ''))),
 		);
 
 		/**
 		 * @filter `gravityview_widget_active_areas` Array of zones available for widgets to be dropped into
 		 * @param array $default_areas Definition for default widget areas
 		 */
-		return apply_filters( 'gravityview_widget_active_areas', $default_areas );
+		return apply_filters('gravityview_widget_active_areas', $default_areas);
 	}
 
 	/** DEBUG */
@@ -351,13 +351,13 @@ 
      * @param mixed $data Additional data to display
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug($message, $data = null) {
 	    /**
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Message to display
 	     * @param mixed $data Supporting data to print alongside it
 	     */
-    	do_action( 'gravityview_log_debug', $message, $data );
+    	do_action('gravityview_log_debug', $message, $data);
     }
 
     /**
@@ -365,13 +365,13 @@ 
      * @param  string $message log message
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error($message, $data = null) {
 	    /**
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Error message to display
 	     * @param mixed $data Supporting data to print alongside it
 	     */
-    	do_action( 'gravityview_log_error', $message, $data );
+    	do_action('gravityview_log_error', $message, $data);
     }
 
 } // end class GravityView_Plugin

Indentation +57 added lines, -57 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 /**
- * @file gravityview.php
- *
- * The GravityView plugin
- *
- * Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.
- *
- * @package   GravityView
- * @license   GPL2+
- * @author    Katz Web Services, Inc.
- * @link      http://gravityview.co
- * @copyright Copyright 2016, Katz Web Services, Inc.
- *
- * @wordpress-plugin
- * Plugin Name:       	GravityView
- * Plugin URI:        	http://gravityview.co
- * Description:       	Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.
- * Version:          	1.16
- * Author:            	Katz Web Services, Inc.
- * Author URI:        	http://www.katzwebservices.com
- * Text Domain:       	gravityview
- * License:           	GPLv2 or later
- * License URI: 		http://www.gnu.org/licenses/gpl-2.0.html
- * Domain Path:			/languages
- */
+	 * @file gravityview.php
+	 *
+	 * The GravityView plugin
+	 *
+	 * Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.
+	 *
+	 * @package   GravityView
+	 * @license   GPL2+
+	 * @author    Katz Web Services, Inc.
+	 * @link      http://gravityview.co
+	 * @copyright Copyright 2016, Katz Web Services, Inc.
+	 *
+	 * @wordpress-plugin
+	 * Plugin Name:       	GravityView
+	 * Plugin URI:        	http://gravityview.co
+	 * Description:       	Create directories based on a Gravity Forms form, insert them using a shortcode, and modify how they output.
+	 * Version:          	1.16
+	 * Author:            	Katz Web Services, Inc.
+	 * Author URI:        	http://www.katzwebservices.com
+	 * Text Domain:       	gravityview
+	 * License:           	GPLv2 or later
+	 * License URI: 		http://www.gnu.org/licenses/gpl-2.0.html
+	 * Domain Path:			/languages
+	 */
 
 /** If this file is called directly, abort. */
 if ( ! defined( 'ABSPATH' ) ) {
@@ -311,11 +311,11 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
-        /**
-         * When an entry is created, check if we need to update the custom slug meta
-         * todo: move this to its own class..
-         */
-        add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+		/**
+		 * When an entry is created, check if we need to update the custom slug meta
+		 * todo: move this to its own class..
+		 */
+		add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
 
 		/**
 		 * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded
@@ -345,34 +345,34 @@ 
 
 	/** DEBUG */
 
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @param mixed $data Additional data to display
-     * @return void
-     */
-    public static function log_debug( $message, $data = null ){
-	    /**
-	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
-	     * @param string $message Message to display
-	     * @param mixed $data Supporting data to print alongside it
-	     */
-    	do_action( 'gravityview_log_debug', $message, $data );
-    }
-
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @return void
-     */
-    public static function log_error( $message, $data = null ){
-	    /**
-	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
-	     * @param string $message Error message to display
-	     * @param mixed $data Supporting data to print alongside it
-	     */
-    	do_action( 'gravityview_log_error', $message, $data );
-    }
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @param mixed $data Additional data to display
+	 * @return void
+	 */
+	public static function log_debug( $message, $data = null ){
+		/**
+		 * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
+		 * @param string $message Message to display
+		 * @param mixed $data Supporting data to print alongside it
+		 */
+		do_action( 'gravityview_log_debug', $message, $data );
+	}
+
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @return void
+	 */
+	public static function log_error( $message, $data = null ){
+		/**
+		 * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
+		 * @param string $message Error message to display
+		 * @param mixed $data Supporting data to print alongside it
+		 */
+		do_action( 'gravityview_log_error', $message, $data );
+	}
 
 } // end class GravityView_Plugin
 

includes/fields/class-gravityview-field-created-by.php

Spacing +18 added lines, -18 removed lines

@@ -9,14 +9,14 @@ 
 
 	var $name = 'created_by';
 
-	var $search_operators = array( 'is', 'isnot' );
+	var $search_operators = array('is', 'isnot');
 
 	var $group = 'meta';
 
 	var $_custom_merge_tag = 'created_by';
 
 	public function __construct() {
-		$this->label = esc_attr__( 'Created By', 'gravityview' );
+		$this->label = esc_attr__('Created By', 'gravityview');
 		parent::__construct();
 	}
 
@@ -30,7 +30,7 @@ 
 	 *
 	 * @return array Modified merge tags
 	 */
-	protected function custom_merge_tags( $form = array(), $fields = array() ) {
+	protected function custom_merge_tags($form = array(), $fields = array()) {
 
 		$merge_tags = array(
 			array(
@@ -75,52 +75,52 @@ 
 	 *
 	 * @return string Text, with user variables replaced, if they existed
 	 */
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
+	public function replace_merge_tag($matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false) {
 
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
-		if( empty( $entry['created_by'] ) ) {
+		if (empty($entry['created_by'])) {
 			return $text;
 		}
 
 		// Get the creator of the entry
-		$entry_creator = new WP_User( $entry['created_by'] );
+		$entry_creator = new WP_User($entry['created_by']);
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			$full_tag = $match[0];
 			$property = $match[1];
 
-			switch( $property ) {
+			switch ($property) {
 				/** @since 1.13.2 */
 				case 'roles':
-					$value = implode( ', ', $entry_creator->roles );
+					$value = implode(', ', $entry_creator->roles);
 					break;
 				default:
-					$value = $entry_creator->get( $property );
+					$value = $entry_creator->get($property);
 			}
 
-			$value = $url_encode ? urlencode( $value ) : $value;
+			$value = $url_encode ? urlencode($value) : $value;
 
-			$value = $esc_html ? esc_html( $value ) : $value;
+			$value = $esc_html ? esc_html($value) : $value;
 
-			$text = str_replace( $full_tag, $value, $text );
+			$text = str_replace($full_tag, $value, $text);
 		}
 
-		unset( $entry_creator );
+		unset($entry_creator);
 
 		return $text;
 	}
 
-	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
-		if( 'edit' === $context ) {
+		if ('edit' === $context) {
 			return $field_options;
 		}
 
 		$field_options['name_display'] = array(
 			'type' => 'select',
-			'label' => __( 'User Format', 'gravityview' ),
-			'desc' => __( 'How should the User information be displayed?', 'gravityview'),
+			'label' => __('User Format', 'gravityview'),
+			'desc' => __('How should the User information be displayed?', 'gravityview'),
 			'choices' => array(
 				'display_name' => __('Display Name (Example: "Ellen Ripley")', 'gravityview'),
 				'user_login' => __('Username (Example: "nostromo")', 'gravityview'),

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

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 	var $is_searchable = true;
 
-	var $search_operators = array( 'less_than', 'greater_than', 'is', 'isnot' );
+	var $search_operators = array('less_than', 'greater_than', 'is', 'isnot');
 
 	var $group = 'pricing';
 
@@ -22,8 +22,8 @@ 
 	 * GravityView_Field_Date_Created constructor.
 	 */
 	public function __construct() {
-		$this->label = esc_attr__( 'Payment Date', 'gravityview' );
-		$this->description = esc_attr__( 'The date the payment was received.', 'gravityview' );
+		$this->label = esc_attr__('Payment Date', 'gravityview');
+		$this->description = esc_attr__('The date the payment was received.', 'gravityview');
 		parent::__construct();
 	}
 }

includes/class-template.php

Spacing +131 added lines, -131 removed lines

@@ -12,12 +12,12 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
-	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
+if (!class_exists('Gamajo_Template_Loader')) {
+	require(GRAVITYVIEW_DIR.'includes/lib/class-gamajo-template-loader.php');
 }
 
 class GravityView_View extends Gamajo_Template_Loader {
@@ -145,9 +145,9 @@ 
 	 * Construct the view object
 	 * @param  array       $atts Associative array to set the data of
 	 */
-	function __construct( $atts = array() ) {
+	function __construct($atts = array()) {
 
-		$atts = wp_parse_args( $atts, array(
+		$atts = wp_parse_args($atts, array(
 			'form_id' => NULL,
 			'view_id' => NULL,
 			'fields'  => NULL,
@@ -155,10 +155,10 @@ 
 			'post_id' => NULL,
 			'form'    => NULL,
 			'atts'	  => NULL,
-		) );
+		));
 
 		foreach ($atts as $key => $value) {
-			if( is_null( $value ) ) {
+			if (is_null($value)) {
 				continue;
 			}
 			$this->{$key} = $value;
@@ -166,18 +166,18 @@ 
 
 
 		// Add granular overrides
-		add_filter( $this->filter_prefix . '_get_template_part', array( $this, 'add_id_specific_templates' ), 10, 3 );
+		add_filter($this->filter_prefix.'_get_template_part', array($this, 'add_id_specific_templates'), 10, 3);
 
 
 		// widget logic
-		add_action( 'gravityview_before', array( $this, 'render_widget_hooks' ) );
-		add_action( 'gravityview_after', array( $this, 'render_widget_hooks' ) );
+		add_action('gravityview_before', array($this, 'render_widget_hooks'));
+		add_action('gravityview_after', array($this, 'render_widget_hooks'));
 
 		/**
 		 * Clear the current entry after the loop is done
 		 * @since 1.7.3
 		 */
-		add_action( 'gravityview_footer', array( $this, 'clearCurrentEntry' ), 500 );
+		add_action('gravityview_footer', array($this, 'clearCurrentEntry'), 500);
 
 		self::$instance = &$this;
 	}
@@ -187,10 +187,10 @@ 
 	 *
 	 * @return GravityView_View
 	 */
-	static function getInstance( $passed_post = NULL ) {
+	static function getInstance($passed_post = NULL) {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( $passed_post );
+		if (empty(self::$instance)) {
+			self::$instance = new self($passed_post);
 		}
 
 		return self::$instance;
@@ -200,11 +200,11 @@ 
 	 * @param string|null $key The key to a specific attribute of the current field
 	 * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
 	 */
-	public function getCurrentField( $key = NULL ) {
+	public function getCurrentField($key = NULL) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->_current_field[ $key ] ) ) {
-				return $this->_current_field[ $key ];
+		if (!empty($key)) {
+			if (isset($this->_current_field[$key])) {
+				return $this->_current_field[$key];
 			}
 			return NULL;
 		}
@@ -212,19 +212,19 @@ 
 		return $this->_current_field;
 	}
 
-	public function setCurrentFieldSetting( $key, $value ) {
+	public function setCurrentFieldSetting($key, $value) {
 
-		if( !empty( $this->_current_field ) ) {
-			$this->_current_field['field_settings'][ $key ] = $value;
+		if (!empty($this->_current_field)) {
+			$this->_current_field['field_settings'][$key] = $value;
 		}
 
 	}
 
-	public function getCurrentFieldSetting( $key ) {
+	public function getCurrentFieldSetting($key) {
 		$settings = $this->getCurrentField('field_settings');
 
-		if( $settings && !empty( $settings[ $key ] ) ) {
-			return $settings[ $key ];
+		if ($settings && !empty($settings[$key])) {
+			return $settings[$key];
 		}
 
 		return NULL;
@@ -233,11 +233,11 @@ 
 	/**
 	 * @param array $passed_field
 	 */
-	public function setCurrentField( $passed_field ) {
+	public function setCurrentField($passed_field) {
 
 		$existing_field = $this->getCurrentField();
 
-		$set_field = wp_parse_args( $passed_field, $existing_field );
+		$set_field = wp_parse_args($passed_field, $existing_field);
 
 		$this->_current_field = $set_field;
 
@@ -252,11 +252,11 @@ 
 	 * @param string|null $key The key to a specific field in the fields array
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
 	 */
-	public function getAtts( $key = NULL ) {
+	public function getAtts($key = NULL) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->atts[ $key ] ) ) {
-				return $this->atts[ $key ];
+		if (!empty($key)) {
+			if (isset($this->atts[$key])) {
+				return $this->atts[$key];
 			}
 			return NULL;
 		}
@@ -267,7 +267,7 @@ 
 	/**
 	 * @param array $atts
 	 */
-	public function setAtts( $atts ) {
+	public function setAtts($atts) {
 		$this->atts = $atts;
 	}
 
@@ -281,7 +281,7 @@ 
 	/**
 	 * @param array $form
 	 */
-	public function setForm( $form ) {
+	public function setForm($form) {
 		$this->form = $form;
 	}
 
@@ -295,7 +295,7 @@ 
 	/**
 	 * @param int|null $post_id
 	 */
-	public function setPostId( $post_id ) {
+	public function setPostId($post_id) {
 		$this->post_id = $post_id;
 	}
 
@@ -309,7 +309,7 @@ 
 	/**
 	 * @param string $context
 	 */
-	public function setContext( $context ) {
+	public function setContext($context) {
 		$this->context = $context;
 	}
 
@@ -317,12 +317,12 @@ 
 	 * @param string|null $key The key to a specific field in the fields array
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
 	 */
-	public function getFields( $key = null ) {
+	public function getFields($key = null) {
 
-		$fields = empty( $this->fields ) ? NULL : $this->fields;
+		$fields = empty($this->fields) ? NULL : $this->fields;
 
-		if( $fields && !empty( $key ) ) {
-			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
+		if ($fields && !empty($key)) {
+			$fields = isset($fields[$key]) ? $fields[$key] : NULL;
 		}
 
 		return $fields;
@@ -331,7 +331,7 @@ 
 	/**
 	 * @param array $fields
 	 */
-	public function setFields( $fields ) {
+	public function setFields($fields) {
 		$this->fields = $fields;
 	}
 
@@ -339,11 +339,11 @@ 
 	 * @param string $key The key to a specific field in the fields array
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
 	 */
-	public function getField( $key ) {
+	public function getField($key) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->fields[ $key ] ) ) {
-				return $this->fields[ $key ];
+		if (!empty($key)) {
+			if (isset($this->fields[$key])) {
+				return $this->fields[$key];
 			}
 		}
 
@@ -354,22 +354,22 @@ 
 	 * @param string $key The key to a specific field in the fields array
 	 * @param mixed $value The value to set for the field
 	 */
-	public function setField( $key, $value ) {
-		$this->fields[ $key ] = $value;
+	public function setField($key, $value) {
+		$this->fields[$key] = $value;
 	}
 
 	/**
 	 * @return int
 	 */
 	public function getViewId() {
-		return absint( $this->view_id );
+		return absint($this->view_id);
 	}
 
 	/**
 	 * @param int $view_id
 	 */
-	public function setViewId( $view_id ) {
-		$this->view_id = intval( $view_id );
+	public function setViewId($view_id) {
+		$this->view_id = intval($view_id);
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	/**
 	 * @param int $form_id
 	 */
-	public function setFormId( $form_id ) {
+	public function setFormId($form_id) {
 		$this->form_id = $form_id;
 	}
 
@@ -396,7 +396,7 @@ 
 	/**
 	 * @param array $entries
 	 */
-	public function setEntries( $entries ) {
+	public function setEntries($entries) {
 		$this->entries = $entries;
 	}
 
@@ -410,8 +410,8 @@ 
 	/**
 	 * @param int $total_entries
 	 */
-	public function setTotalEntries( $total_entries ) {
-		$this->total_entries = intval( $total_entries );
+	public function setTotalEntries($total_entries) {
+		$this->total_entries = intval($total_entries);
 	}
 
 	/**
@@ -424,7 +424,7 @@ 
 	/**
 	 * @param array $paging
 	 */
-	public function setPaging( $paging ) {
+	public function setPaging($paging) {
 		$this->paging = $paging;
 	}
 
@@ -446,25 +446,25 @@ 
 		$page_size = $paging['page_size'];
 		$total = $this->getTotalEntries();
 
-		if ( empty( $total ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ': No entries. Returning empty array.' );
+		if (empty($total)) {
+			do_action('gravityview_log_debug', __METHOD__.': No entries. Returning empty array.');
 
 			return array();
 		}
 
-		$first = empty( $offset ) ? 1 : $offset + 1;
+		$first = empty($offset) ? 1 : $offset + 1;
 
 		// If the page size + starting entry is larger than total, the total is the max.
-		$last = ( $offset + $page_size > $total ) ? $total : $offset + $page_size;
+		$last = ($offset + $page_size > $total) ? $total : $offset + $page_size;
 
 		/**
 		 * @filter `gravityview_pagination_counts` Modify the displayed pagination numbers
 		 * @since 1.13
 		 * @param array $counts Array with $first, $last, $total numbers in that order
 		 */
-		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
+		list($first, $last, $total) = apply_filters('gravityview_pagination_counts', array($first, $last, $total));
 
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
+		return array('first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total);
 	}
 
 	/**
@@ -477,7 +477,7 @@ 
 	/**
 	 * @param array $sorting
 	 */
-	public function setSorting( $sorting ) {
+	public function setSorting($sorting) {
 		$this->sorting = $sorting;
 	}
 
@@ -486,9 +486,9 @@ 
 	 */
 	public function getBackLinkLabel() {
 
-		$back_link_label = GravityView_API::replace_variables( $this->back_link_label, $this->getForm(), $this->getCurrentEntry() );
+		$back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
 
-		$back_link_label = do_shortcode( $back_link_label );
+		$back_link_label = do_shortcode($back_link_label);
 
 		return $back_link_label;
 	}
@@ -496,7 +496,7 @@ 
 	/**
 	 * @param string $back_link_label
 	 */
-	public function setBackLinkLabel( $back_link_label ) {
+	public function setBackLinkLabel($back_link_label) {
 		$this->back_link_label = $back_link_label;
 	}
 
@@ -510,7 +510,7 @@ 
 	/**
 	 * @param boolean $hide_until_searched
 	 */
-	public function setHideUntilSearched( $hide_until_searched ) {
+	public function setHideUntilSearched($hide_until_searched) {
 		$this->hide_until_searched = $hide_until_searched;
 	}
 
@@ -524,7 +524,7 @@ 
 	/**
 	 * @param string $template_part_slug
 	 */
-	public function setTemplatePartSlug( $template_part_slug ) {
+	public function setTemplatePartSlug($template_part_slug) {
 		$this->template_part_slug = $template_part_slug;
 	}
 
@@ -538,7 +538,7 @@ 
 	/**
 	 * @param string $template_part_name
 	 */
-	public function setTemplatePartName( $template_part_name ) {
+	public function setTemplatePartName($template_part_name) {
 		$this->template_part_name = $template_part_name;
 	}
 
@@ -548,7 +548,7 @@ 
 	 */
 	public function getCurrentEntry() {
 
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
+		if (in_array($this->getContext(), array('edit', 'single'))) {
 			$entries = $this->getEntries();
 			$entry = $entries[0];
 		} else {
@@ -556,7 +556,7 @@ 
 		}
 
 		/** @since 1.16 Fixes DataTables empty entry issue */
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
+		if (empty($entry) && !empty($this->_current_field['entry'])) {
 			$entry = $this->_current_field['entry'];
 		}
 
@@ -567,7 +567,7 @@ 
 	 * @param array $current_entry
 	 * @return void
 	 */
-	public function setCurrentEntry( $current_entry ) {
+	public function setCurrentEntry($current_entry) {
 		$this->_current_entry = $current_entry;
 	}
 
@@ -589,9 +589,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function renderZone( $zone = '', $atts = array() ) {
+	public function renderZone($zone = '', $atts = array()) {
 
-		if( empty( $zone ) ) {
+		if (empty($zone)) {
 			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
 			return NULL;
 		}
@@ -604,32 +604,32 @@ 
 			'hide_empty' => $this->getAtts('hide_empty'),
 		);
 
-		$final_atts = wp_parse_args( $atts, $defaults );
+		$final_atts = wp_parse_args($atts, $defaults);
 
 		$output = '';
 
 		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
 
-		$fields = $this->getField( $final_atts['zone_id'] );
+		$fields = $this->getField($final_atts['zone_id']);
 
 		// Backward compatibility
-		if( 'table' === $this->getTemplatePartSlug() ) {
+		if ('table' === $this->getTemplatePartSlug()) {
 			/**
 			 * Modify the fields displayed in the table
 			 * @var array
 			 */
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
+			$fields = apply_filters("gravityview_table_cells", $fields, $this);
 		}
 
-		if( empty( $fields ) ) {
+		if (empty($fields)) {
 			return NULL;
 		}
 
 		$field_output = '';
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$final_atts['field'] = $field;
 
-			$field_output .= gravityview_field_output( $final_atts );
+			$field_output .= gravityview_field_output($final_atts);
 		}
 
 		/**
@@ -638,17 +638,17 @@ 
 		 * @since 1.7.6
 		 * @param boolean $hide_empty_zone Default: false
 		 */
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
+		if (empty($field_output) && apply_filters('gravityview/render/hide-empty-zone', false)) {
 			return NULL;
 		}
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
+		if (!empty($final_atts['wrapper_class'])) {
+			$output .= '<div class="'.gravityview_sanitize_html_class($final_atts['wrapper_class']).'">';
 		}
 
 		$output .= $field_output;
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
+		if (!empty($final_atts['wrapper_class'])) {
 			$output .= '</div>';
 		}
 
@@ -666,24 +666,24 @@ 
 	 * @see Gamajo_Template_Loader::locate_template()
 	 * @return null|string NULL: Template not found; String: path to template
 	 */
-	function locate_template( $template_names, $load = false, $require_once = true ) {
+	function locate_template($template_names, $load = false, $require_once = true) {
 
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+		if (is_string($template_names) && isset($this->located_templates[$template_names])) {
 
-			$located = $this->located_templates[ $template_names ];
+			$located = $this->located_templates[$template_names];
 
 		} else {
 
 			// Set $load to always false so we handle it here.
-			$located = parent::locate_template( $template_names, false, $require_once );
+			$located = parent::locate_template($template_names, false, $require_once);
 
-			if( is_string( $template_names ) ) {
-				$this->located_templates[ $template_names ] = $located;
+			if (is_string($template_names)) {
+				$this->located_templates[$template_names] = $located;
 			}
 		}
 
-		if ( $load && $located ) {
-			load_template( $located, $require_once );
+		if ($load && $located) {
+			load_template($located, $require_once);
 		}
 
 		return $located;
@@ -694,8 +694,8 @@ 
 	 * @param  string      $name Key for the data retrieval.
 	 * @return mixed|null    The stored data.
 	 */
-	public function __get( $name ) {
-		if( isset( $this->{$name} ) ) {
+	public function __get($name) {
+		if (isset($this->{$name} )) {
 			return $this->{$name};
 		} else {
 			return NULL;
@@ -719,47 +719,47 @@ 
 	 *
 	 * @return array $templates Modified template array, merged with existing $templates values
 	 */
-	function add_id_specific_templates( $templates, $slug, $name ) {
+	function add_id_specific_templates($templates, $slug, $name) {
 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
+		$additional[] = sprintf('form-%d-%s-%s.php', $this->getFormId(), $slug, $name);
 
 		// view-3-table-body.php
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
+		$additional[] = sprintf('view-%d-%s-%s.php', $this->getViewId(), $slug, $name);
 
-		if( $this->getPostId() ) {
+		if ($this->getPostId()) {
 
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
+			$additional[] = sprintf('page-%d-%s-%s.php', $this->getPostId(), $slug, $name);
 		}
 
 		// Combine with existing table-body.php and table.php
-		$templates = array_merge( $additional, $templates );
+		$templates = array_merge($additional, $templates);
 
-		do_action( 'gravityview_log_debug', '[add_id_specific_templates] List of Template Files', $templates );
+		do_action('gravityview_log_debug', '[add_id_specific_templates] List of Template Files', $templates);
 
 		return $templates;
 	}
 
 	// Load the template
-	public function render( $slug, $name, $require_once = true ) {
+	public function render($slug, $name, $require_once = true) {
 
-		$this->setTemplatePartSlug( $slug );
+		$this->setTemplatePartSlug($slug);
 
-		$this->setTemplatePartName( $name );
+		$this->setTemplatePartName($name);
 
-		$template_file = $this->get_template_part( $slug, $name, false );
+		$template_file = $this->get_template_part($slug, $name, false);
 
-		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
+		do_action('gravityview_log_debug', '[render] Rendering Template File', $template_file);
 
-		if( !empty( $template_file) ) {
+		if (!empty($template_file)) {
 
-			if ( $require_once ) {
-				require_once( $template_file );
+			if ($require_once) {
+				require_once($template_file);
 			} else {
-				require( $template_file );
+				require($template_file);
 			}
 
 		}
@@ -769,19 +769,19 @@ 
 	 *
 	 * @param $view_id
 	 */
-	public function render_widget_hooks( $view_id ) {
+	public function render_widget_hooks($view_id) {
 
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
+		if (empty($view_id) || 'single' == gravityview_get_context()) {
+			do_action('gravityview_log_debug', __METHOD__.' - Not rendering widgets; single entry');
 			return;
 		}
 
-		$view_data = gravityview_get_current_view_data( $view_id );
+		$view_data = gravityview_get_current_view_data($view_id);
 
 		// get View widget configuration
 		$widgets = (array)$view_data['widgets'];
 
-		switch( current_filter() ) {
+		switch (current_filter()) {
 			default:
 			case 'gravityview_before':
 				$zone = 'header';
@@ -795,10 +795,10 @@ 
 		 * Filter widgets not in the current zone
 		 * @since 1.16
 		 */
-		foreach( $widgets as $key => $widget ) {
+		foreach ($widgets as $key => $widget) {
 			// The widget isn't in the current zone
-			if( false === strpos( $key, $zone ) ) {
-				unset( $widgets[ $key ] );
+			if (false === strpos($key, $zone)) {
+				unset($widgets[$key]);
 			}
 		}
 
@@ -806,37 +806,37 @@ 
 		 * Prevent output if no widgets to show.
 		 * @since 1.16
 		 */
-		if ( empty( $widgets ) ) {
-			do_action( 'gravityview_log_debug', sprintf( 'No widgets for View #%s', $view_id ) );
+		if (empty($widgets)) {
+			do_action('gravityview_log_debug', sprintf('No widgets for View #%s', $view_id));
 			return;
 		}
 
 		// Prevent being called twice
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
+		if (did_action($zone.'_'.$view_id.'_widgets')) {
+			do_action('gravityview_log_debug', sprintf('%s - Not rendering %s; already rendered', __METHOD__, $zone.'_'.$view_id.'_widgets'));
 			return;
 		}
 
 		$rows = GravityView_Plugin::get_default_widget_areas();
 
 		// TODO: Move to sep. method, use an action instead
-		wp_enqueue_style( 'gravityview_default_style' );
+		wp_enqueue_style('gravityview_default_style');
 
 		// TODO Convert to partials
 		?>
 		<div class="gv-grid">
 			<?php
-			foreach( $rows as $row ) {
-				foreach( $row as $col => $areas ) {
+			foreach ($rows as $row) {
+				foreach ($row as $col => $areas) {
 					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
 				?>
-					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
+					<div class="gv-grid-col-<?php echo esc_attr($column); ?>">
 						<?php
-						if( !empty( $areas ) ) {
-							foreach( $areas as $area ) {
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
+						if (!empty($areas)) {
+							foreach ($areas as $area) {
+								if (!empty($widgets[$zone.'_'.$area['areaid']])) {
+									foreach ($widgets[$zone.'_'.$area['areaid']] as $widget) {
+										do_action("gravityview_render_widget_{$widget['id']}", $widget);
 									}
 								}
 							}
@@ -852,8 +852,8 @@ 
 		 * Prevent widgets from being called twice.
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
 		 */
-		if( did_action( 'loop_start' ) ) {
-			do_action( $zone.'_'.$view_id.'_widgets' );
+		if (did_action('loop_start')) {
+			do_action($zone.'_'.$view_id.'_widgets');
 		}
 	}
 

includes/fields/class-gravityview-field-transaction-id.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 	var $is_numeric = true;
 
-	var $search_operators = array( 'is', 'isnot' );
+	var $search_operators = array('is', 'isnot');
 
 	var $group = 'pricing';
 
@@ -24,7 +24,7 @@ 
 	 * GravityView_Field_Payment_Amount constructor.
 	 */
 	public function __construct() {
-		$this->label = esc_attr__( 'Transaction ID', 'gravityview' );
+		$this->label = esc_attr__('Transaction ID', 'gravityview');
 		parent::__construct();
 	}
 }