gravityview / GravityView

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) {
 
-		if( ! empty( $output ) ) {
+		if ( ! empty( $output ) ) {
 			$output = gravity_flow()->translate_status_label( $output );
 		}
 
@@ -78,11 +78,11 @@ 
 	function modify_entry_value_workflow_step( $output, $entry, $field_settings, $field ) {
 
 		// If not set, the entry hasn't started a workflow
-		$has_workflow_step = isset( $entry['workflow_step'] );
+		$has_workflow_step = isset( $entry[ 'workflow_step' ] );
 
-		if( $has_workflow_step ) {
+		if ( $has_workflow_step ) {
 
-			$GFlow = new Gravity_Flow_API( $entry['form_id'] );
+			$GFlow = new Gravity_Flow_API( $entry[ 'form_id' ] );
 
 			if ( $current_step = $GFlow->get_current_step( $entry ) ) {
 				$output = esc_html( $current_step->get_name() );

includes/class-common.php

Doc Comments +4 added lines, -5 removed lines

@@ -185,7 +185,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() {
@@ -206,7 +205,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 ) {
@@ -907,7 +906,7 @@ 
 	 *
 	 * @param array $form Gravity Forms form array
 	 * @param string $field_id ID of the field. If an input, full input ID (like `1.3`)
-	 * @param string|array $field_value Raw value of the field.
+	 * @param string $field_value Raw value of the field.
 	 * @return string
 	 */
 	public static function get_field_label( $form = array(), $field_id = '', $field_value = '' ) {
@@ -1551,9 +1550,9 @@ 
 	 * @param string $message            Message body (required)
 	 * @param string $from_name          Displayed name of the sender
 	 * @param string $message_format     If "html", sent text as `text/html`. Otherwise, `text/plain`. Default: "html".
-	 * @param string|array $attachments  Optional. Files to attach. {@see wp_mail()} for usage. Default: "".
+	 * @param string $attachments  Optional. Files to attach. {@see wp_mail()} for usage. Default: "".
 	 * @param array|false $entry         Gravity Forms entry array, related to the email. Default: false.
-	 * @param array|false $notification  Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false.
+	 * @param boolean $notification  Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false.
 	 */
 	public static function send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name = '', $message_format = 'html', $attachments = '', $entry = false, $notification = false ) {
 

Indentation +26 added lines, -26 removed lines

@@ -236,13 +236,13 @@ 
 
 				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
-                         */
+						/**
+						 * @hack
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
+						 */
 						if( 'email' === $field->type && false === strpos( $input['id'], '.' ) ) {
-                            continue;
-                        }
+							continue;
+						}
 						$fields["{$input['id']}"] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
@@ -419,7 +419,7 @@ 
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
 			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_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)
+			// Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
 			$criteria['context_view_id'] = null;
 		}
 
@@ -1148,7 +1148,7 @@ 
 			),
 		);
 
-        $fields = $date_created + $fields;
+		$fields = $date_created + $fields;
 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
@@ -1160,13 +1160,13 @@ 
 			}
 		}
 
-        /**
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
-         * @since 1.12
-         * @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 );
+		/**
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
+		 * @since 1.12
+		 * @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 );
 
 		return $fields;
 	}
@@ -1449,17 +1449,17 @@ 
 	}
 
 
-    /**
-     * Display updated/error notice
-     *
-     * @param string $notice text/HTML of notice
-     * @param string $class CSS class for notice (`updated` or `error`)
-     *
-     * @return string
-     */
-    public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
-    }
+	/**
+	 * Display updated/error notice
+	 *
+	 * @param string $notice text/HTML of notice
+	 * @param string $class CSS class for notice (`updated` or `error`)
+	 *
+	 * @return string
+	 */
+	public static function generate_notice( $notice, $class = '' ) {
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+	}
 
 	/**
 	 * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets

Spacing +96 added lines, -96 removed lines

@@ -124,7 +124,7 @@ 
 
 		$entry = self::get_entry( $entry_slug, true );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		return $form;
 	}
@@ -175,7 +175,7 @@ 
 
 		$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;
 	}
@@ -193,9 +193,9 @@ 
 		if ( class_exists( 'GFAPI' ) ) {
 			$gf_forms = GFAPI::get_forms();
 			foreach ( $gf_forms as $form ) {
-				$forms[] = array(
-					'id' => $form['id'],
-					'title' => $form['title'],
+				$forms[ ] = array(
+					'id' => $form[ 'id' ],
+					'title' => $form[ 'title' ],
 				);
 			}
 		}
@@ -222,10 +222,10 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
+			foreach ( $form[ 'fields' ] as $field ) {
 
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field->id}"] = array(
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field->id}" ] = array(
 						'label' => rgar( $field, 'label' ),
 						'parent' => null,
 						'type' => rgar( $field, 'type' ),
@@ -240,10 +240,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field->type && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field->type && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
 							'parent' => $field,
@@ -255,7 +255,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field->type ) ){
+				if ( GFCommon::is_product_field( $field->type ) ) {
 					$has_product_fields = true;
 				}
 
@@ -269,7 +269,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -280,10 +280,10 @@ 
 			$payment_fields = GravityView_Fields::get_all( 'pricing' );
 
 			foreach ( $payment_fields as $payment_field ) {
-				if( isset( $fields["{$payment_field->name}"] ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) ) {
 					continue;
 				}
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -315,9 +315,9 @@ 
 
 		$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' );
 			}
 		}
 
@@ -357,32 +357,32 @@ 
 			'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 );
 
-		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 ) ) {
 					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 );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -393,21 +393,21 @@ 
 		 * 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 ) {
 					// 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 ] );
 				}
 			}
 		}
@@ -415,12 +415,12 @@ 
 
 		// 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() ) {
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_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;
+			$criteria[ 'context_view_id' ] = null;
 		}
 
 		/**
@@ -429,7 +429,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;
 
@@ -460,7 +460,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -468,7 +468,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -488,9 +488,9 @@ 
 			$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 );
@@ -499,7 +499,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -586,7 +586,7 @@ 
 			 */
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-			if( $check_entry_display ) {
+			if ( $check_entry_display ) {
 				// Is the entry allowed
 				$entry = self::check_entry_display( $entry );
 			}
@@ -619,12 +619,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$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' );
@@ -684,7 +684,7 @@ 
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
 			return false;
 		}
@@ -692,26 +692,26 @@ 
 		$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'] );
+		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 ( 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'] ) ) {
+		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'];
+		$search_criteria = $criteria[ 'search_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;
 		}
 
@@ -719,37 +719,37 @@ 
 		// @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'] ) ) {
+		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'];
+		$filters = $search_criteria[ 'field_filters' ];
 		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 ) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			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_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 ) {
@@ -807,18 +807,18 @@ 
 		 * 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_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 ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -826,7 +826,7 @@ 
 		// If raw was specified, don't modify the stored value
 		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 ) );
@@ -860,7 +860,7 @@ 
 
 		$label = rgar( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -881,7 +881,7 @@ 
 	 * @return GF_Field|null Gravity Forms field object, or NULL: Gravity Forms GFFormsModel does not exist or field at $field_id doesn't exist.
 	 */
 	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -928,19 +928,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1101,7 +1101,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1114,11 +1114,11 @@ 
 			$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 ) ) {
+				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>';
 			}
 		}
 
@@ -1153,9 +1153,9 @@ 
 		$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 ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1196,14 +1196,14 @@ 
 	 * @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 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 );
@@ -1217,9 +1217,9 @@ 
 		$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 ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1369,11 +1369,11 @@ 
 		$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 ) ) {
-			$final_atts['href'] = $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 );
 
 		// Sort the attributes alphabetically, to help testing
 		ksort( $final_atts );
@@ -1384,7 +1384,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1408,7 +1408,7 @@ 
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
 		$merged = $array1;
 
-		foreach ( $array2 as $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 {
@@ -1443,7 +1443,7 @@ 
 		 * `$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 );
 	}
@@ -1458,7 +1458,7 @@ 
      * @return string
      */
     public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

Braces +5 added lines, -5 removed lines

@@ -255,7 +255,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field->type ) ){
+				if( GFCommon::is_product_field( $field->type ) ) {
 					$has_product_fields = true;
 				}
 
@@ -315,7 +315,7 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
+		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' );
 			}
@@ -881,7 +881,7 @@ 
 	 * @return GF_Field|null Gravity Forms field object, or NULL: Gravity Forms GFFormsModel does not exist or field at $field_id doesn't exist.
 	 */
 	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -928,7 +928,7 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
@@ -1408,7 +1408,7 @@ 
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
 		$merged = $array1;
 
-		foreach ( $array2 as $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 {

includes/class-admin.php

Indentation +1 added lines, -2 removed lines

@@ -175,7 +175,7 @@ 
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
-		        /* translators: Date and time the View is scheduled to be published */
+				/* translators: Date and time the View is scheduled to be published */
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -232,7 +232,6 @@ 
 	 *
 	 * @deprecated since 1.12
 	 * @see GravityView_Compatibility::get_plugin_status()
-
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
 	static function get_plugin_status( $location = '' ) {

Spacing +50 added lines, -50 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if ( ! is_admin() ) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if ( false === GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -25,7 +25,7 @@ 
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
 
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
+		if ( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && ! GFForms::is_gravity_page() ) {
 			require_once( GFCommon::get_base_path() . '/tooltips.php' );
 		}
 
@@ -53,7 +53,7 @@ 
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
 
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
 
@@ -68,20 +68,20 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-label.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-label.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
 		 *
 		 * Nice place to insert extensions' backend stuff
 		 */
-		do_action('gravityview_include_backend_actions');
+		do_action( 'gravityview_include_backend_actions' );
 	}
 
 	/**
@@ -97,12 +97,12 @@ 
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
+			$actions[ ] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
 		}
 
 		return array_merge( $actions, $links );
@@ -130,7 +130,7 @@ 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
 
 		// If we're starting fresh, a new form was created.
 		// We should let the user know this is the case.
@@ -138,60 +138,60 @@ 
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if ( ! empty( $start_fresh ) ) {
 
 			// Get the form that was created
 			$connected_form = gravityview_get_form_id( $post_id );
 
-			if( !empty( $connected_form ) ) {
+			if ( ! empty( $connected_form ) ) {
 				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+				$form_name = esc_attr( $form[ 'title' ] );
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
 				$new_form_text = wpautop( $new_form_text );
 
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
 			}
 		}
 
-		$messages['gravityview'] = array(
+		$messages[ 'gravityview' ] = array(
 			0  => '', // Unused. Messages start at index 1.
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			3  => __( 'View deleted.', 'gravityview' ),
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
 		        /* translators: Date and time the View is scheduled to be published */
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
 			) . $new_form_text,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
 		);
 
 		return $messages;
@@ -251,29 +251,29 @@ 
 	static function is_admin_page( $hook = '', $page = NULL ) {
 		global $current_screen, $plugin_page, $pagenow, $post;
 
-		if( ! is_admin() ) { return false; }
+		if ( ! is_admin() ) { return false; }
 
 		$is_page = false;
 
-		$is_gv_screen = (!empty($current_screen) && isset($current_screen->post_type) && $current_screen->post_type === 'gravityview');
+		$is_gv_screen = ( ! empty( $current_screen ) && isset( $current_screen->post_type ) && $current_screen->post_type === 'gravityview' );
 
-		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
+		$is_gv_post_type_get = ( isset( $_GET[ 'post_type' ] ) && $_GET[ 'post_type' ] === 'gravityview' );
 
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
+		$is_gv_settings_get = isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings';
 
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
-			$gv_post = get_post( intval( $_GET['post'] ) );
-			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
+		if ( empty( $post ) && $pagenow === 'post.php' && ! empty( $_GET[ 'post' ] ) ) {
+			$gv_post = get_post( intval( $_GET[ 'post' ] ) );
+			$is_gv_post_type = ( ! empty( $gv_post ) && ! empty( $gv_post->post_type ) && $gv_post->post_type === 'gravityview' );
 		} else {
-			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
+			$is_gv_post_type = ( ! empty( $post ) && ! empty( $post->post_type ) && $post->post_type === 'gravityview' );
 		}
 
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
+		if ( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
 
 			// $_GET `post_type` variable
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
+			if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 				$is_page = 'single';
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
+			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( ! empty( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings' ) ) {
 				$is_page = 'settings';
 			} else {
 				$is_page = 'views';
@@ -288,7 +288,7 @@ 
 		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
 
 		// If the current page is the same as the compared page
-		if( !empty( $page ) ) {
+		if ( ! empty( $page ) ) {
 			return $is_page === $page;
 		}
 
@@ -309,6 +309,6 @@ 
  *
  * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
  */
-function gravityview_is_admin_page($hook = '', $page = NULL) {
+function gravityview_is_admin_page( $hook = '', $page = NULL ) {
 	return GravityView_Admin::is_admin_page( $hook, $page );
 }

includes/admin/class-gravityview-admin-no-conflict.php

Spacing +24 added lines, -24 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	public function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if ( ! is_admin() ) { return; }
 		
 		$this->add_hooks();
 	}
@@ -32,13 +32,13 @@ 
 	 */
 	private function add_hooks() {
 		//Hooks for no-conflict functionality
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
+		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9 );
 
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
+		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000 );
+		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1 );
+		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1 );
 	}
 
 	/**
@@ -51,13 +51,13 @@ 
 	function no_conflict_scripts() {
 		global $wp_scripts;
 
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
 
-		if( empty( $no_conflict_mode ) ) {
+		if ( empty( $no_conflict_mode ) ) {
 			return;
 		}
 
@@ -110,24 +110,24 @@ 
 	function no_conflict_styles() {
 		global $wp_styles;
 
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
-			foreach ($wp_styles->registered as $key => $style) {
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
+		if ( ! empty( $wp_styles->registered ) ) {
+			foreach ( $wp_styles->registered as $key => $style ) {
+				if ( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
 					wp_dequeue_style( $key );
 				}
 			}
 		}
 
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
 
 		// If no conflict is off, jQuery will suffice.
-		if( empty( $no_conflict_mode ) ) {
+		if ( empty( $no_conflict_mode ) ) {
 			return;
 		}
 
@@ -154,7 +154,7 @@ 
 		/**
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
 		 */
-		do_action('gravityview_remove_conflicts_after');
+		do_action( 'gravityview_remove_conflicts_after' );
 	}
 
 	/**
@@ -178,9 +178,9 @@ 
 
 		//reset queue
 		$queue = array();
-		foreach( $wp_objects->queue as $object ) {
-			if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
-				$queue[] = $object;
+		foreach ( $wp_objects->queue as $object ) {
+			if ( in_array( $object, $required_objects ) || preg_match( '/gravityview|gf_|gravityforms/ism', $object ) ) {
+				$queue[ ] = $object;
 			}
 		}
 		$wp_objects->queue = $queue;
@@ -189,8 +189,8 @@ 
 
 		//unregistering scripts
 		$registered = array();
-		foreach( $wp_objects->registered as $handle => $script_registration ){
-			if( in_array( $handle, $required_objects ) ){
+		foreach ( $wp_objects->registered as $handle => $script_registration ) {
+			if ( in_array( $handle, $required_objects ) ) {
 				$registered[ $handle ] = $script_registration;
 			}
 		}
@@ -205,7 +205,7 @@ 
 	 * @param array $registered [description]
 	 * @param array $scripts    [description]
 	 */
-	private function add_script_dependencies($registered, $scripts) {
+	private function add_script_dependencies( $registered, $scripts ) {
 
 		//gets all dependent scripts linked to the $scripts array passed
 		do {
@@ -214,7 +214,7 @@ 
 				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
 				foreach ( $deps as $dep ) {
 					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
-						$dependents[] = $dep;
+						$dependents[ ] = $dep;
 					}
 				}
 			}

Braces +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
+		if( !empty( $wp_styles->registered ) ) {
 			foreach ($wp_styles->registered as $key => $style) {
 				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
 					wp_dequeue_style( $key );
@@ -189,8 +189,8 @@ 
 
 		//unregistering scripts
 		$registered = array();
-		foreach( $wp_objects->registered as $handle => $script_registration ){
-			if( in_array( $handle, $required_objects ) ){
+		foreach( $wp_objects->registered as $handle => $script_registration ) {
+			if( in_array( $handle, $required_objects ) ) {
 				$registered[ $handle ] = $script_registration;
 			}
 		}

includes/admin/field-types/type_radio.php

Spacing +2 added lines, -2 removed lines

@@ -19,12 +19,12 @@
 	}
 
 	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
 
-		foreach( $this->field['options'] as $value => $label ) : ?>
+		foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
 		<label class="<?php echo $this->get_label_class(); ?>">
 			<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>-<?php echo esc_attr( $value ); ?>" type="radio" value="<?php echo esc_attr( $value ); ?>" <?php checked( $value, $this->value, true ); ?> />&nbsp;<?php echo esc_html( $label ); ?>
 		</label>

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

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 
 	var $name = 'radio';
 
-	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_Radio';
 
@@ -38,8 +38,8 @@ 
 		// Set the $_field_id var
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
 		
-		if( $this->is_choice_value_enabled() ) {
-			$field_options['choice_display'] = array(
+		if ( $this->is_choice_value_enabled() ) {
+			$field_options[ 'choice_display' ] = array(
 				'type'    => 'radio',
 				'value'   => 'value',
 				'label'   => __( 'What should be displayed:', 'gravityview' ),

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

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
 		// Set the $_field_id var
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
 
-		if( $this->is_choice_value_enabled() ) {
-			$field_options['choice_display'] = array(
+		if ( $this->is_choice_value_enabled() ) {
+			$field_options[ 'choice_display' ] = array(
 				'type'    => 'radio',
 				'value'   => 'value',
 				'label'   => __( 'What should be displayed:', 'gravityview' ),

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravityformsquiz.php

Spacing +5 added lines, -5 removed lines

@@ -48,25 +48,25 @@
 		
 		$quiz_fields = GFAPI::get_fields_by_type( $form, 'quiz' );
 		
-		if( ! empty( $quiz_fields ) ) {
+		if ( ! empty( $quiz_fields ) ) {
 			
-			$fields['gquiz_score']   = array(
+			$fields[ 'gquiz_score' ] = array(
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
 				'type'  => 'quiz_score',
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_percent'] = array(
+			$fields[ 'gquiz_percent' ] = array(
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
 				'type'  => 'quiz_percent',
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_grade']   = array(
+			$fields[ 'gquiz_grade' ] = array(
 				/* translators: This is a field type used by the Gravity Forms Quiz Addon. "A" is 100-90, "B" is 89-80, "C" is 79-70, etc.  */
 				'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' ),
 			);
-			$fields['gquiz_is_pass'] = array(
+			$fields[ 'gquiz_is_pass' ] = array(
 				'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' ),

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

Spacing +11 added lines, -11 removed lines

@@ -49,17 +49,17 @@ 
 	 *
 	 * @return string If a custom field label isn't set, return the field label for the password field
 	 */
-	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ){
+	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ) {
 
 		// If using a custom label, no need to fetch the parent label
-		if( ! is_numeric( $field['id'] ) || ! empty( $field['custom_label'] ) ) {
+		if ( ! is_numeric( $field[ 'id' ] ) || ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$field_object = GFFormsModel::get_field( $form, $field['id'] );
+		$field_object = GFFormsModel::get_field( $form, $field[ 'id' ] );
 
-		if( $field_object && 'password' === $field_object->type ) {
-			$label = $field['label'];
+		if ( $field_object && 'password' === $field_object->type ) {
+			$label = $field[ 'label' ];
 		}
 
 		return $label;
@@ -79,16 +79,16 @@ 
 	function add_form_fields( $fields = array(), $form = array(), $include_parent_field = true ) {
 
 		foreach ( $fields as $key => $field ) {
-			if( 'password' === $field['type'] ) {
+			if ( 'password' === $field[ 'type' ] ) {
 
 				// The Enter Password input
-				if( floor( $key ) === floatval( $key ) ) {
-					$field['label'] = $field['parent']->label;
-					$field['adminOnly'] = $field['parent']->adminOnly;
-					$field['adminLabel'] = $field['parent']->adminLabel;
+				if ( floor( $key ) === floatval( $key ) ) {
+					$field[ 'label' ] = $field[ 'parent' ]->label;
+					$field[ 'adminOnly' ] = $field[ 'parent' ]->adminOnly;
+					$field[ 'adminLabel' ] = $field[ 'parent' ]->adminLabel;
 
 					// Don't show as a child input
-					unset( $field['parent'] );
+					unset( $field[ 'parent' ] );
 
 					$fields[ $key ] = $field;
 				} else {

Braces +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @return string If a custom field label isn't set, return the field label for the password field
 	 */
-	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ){
+	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ) {
 
 		// If using a custom label, no need to fetch the parent label
 		if( ! is_numeric( $field['id'] ) || ! empty( $field['custom_label'] ) ) {