Completed
Push — develop ( 4e47eb...d09b3b )
by Zack
14:47
created
includes/class-gravityview-merge-tags.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
80 80
 
81
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
81
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
82 82
 		}
83 83
 
84 84
 		foreach ( $modifiers as $passed_modifier ) {
85 85
 
86
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
86
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
87 87
 
88 88
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
89 89
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	private static function modifier_timestamp( $raw_value, $matches ) {
134 134
 
135
-		if( empty( $matches[0] ) ) {
135
+		if ( empty( $matches[ 0 ] ) ) {
136 136
 			return $raw_value;
137 137
 		}
138 138
 
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
163 163
 
164
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
164
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
165 165
 			return $raw_value;
166 166
 		}
167 167
 
168
-		$max = intval( $matches[1] );
168
+		$max = intval( $matches[ 1 ] );
169 169
 
170 170
 		$more_placeholder = '[GVMORE]';
171 171
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
235 235
 
236 236
 		// For JSON-encoded arrays
237
-		if( $json_array = json_decode( $raw_value, true ) ) {
237
+		if ( $json_array = json_decode( $raw_value, true ) ) {
238 238
 			return implode( ' ', $json_array );
239 239
 		}
240 240
 
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
257 257
 
258
-		if( empty( $matches[0] ) ) {
258
+		if ( empty( $matches[ 0 ] ) ) {
259 259
 			return $raw_value;
260 260
 		}
261 261
 
262 262
 		$return = $raw_value;
263 263
 
264
-		switch( $matches[0] ) {
264
+		switch ( $matches[ 0 ] ) {
265 265
 			case 'urlencode':
266 266
 				$return = urlencode( $raw_value );
267 267
 				break;
@@ -343,9 +343,9 @@  discard block
 block discarded – undo
343 343
 		 * @internal Fixed $form['title'] in Gravity Forms
344 344
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
345 345
 		 */
346
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
347
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
348
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
346
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
347
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
348
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
349 349
 
350 350
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
351 351
 	}
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
407 407
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
408 408
 
409
-		if( empty( $matches ) ) {
409
+		if ( empty( $matches ) ) {
410 410
 			return $original_text;
411 411
 		}
412 412
 
@@ -427,18 +427,18 @@  discard block
 block discarded – undo
427 427
 		 * }
428 428
 		 */
429 429
 		foreach ( $matches as $match ) {
430
-			$full_tag = $match[0];
430
+			$full_tag = $match[ 0 ];
431 431
 
432 432
 			$link_args = array(
433 433
 				'return' => 'url',
434
-				'entry_id' => $entry['id'],
434
+				'entry_id' => $entry[ 'id' ],
435 435
 				'post_id' => \GV\Utils::get( $match, 1, null ),
436 436
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
437 437
 			);
438 438
 
439 439
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
440 440
 
441
-			if( $url_encode ) {
441
+			if ( $url_encode ) {
442 442
 				$entry_link = urlencode( $entry_link );
443 443
 			}
444 444
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
476 476
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
477 477
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
478
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
478
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
479 479
 		);
480 480
 
481 481
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -552,8 +552,8 @@  discard block
 block discarded – undo
552 552
 			return $original_text;
553 553
 		}
554 554
 
555
-		foreach ( (array) $matches as $match ) {
556
-			$full_tag = $match[0];
555
+		foreach ( (array)$matches as $match ) {
556
+			$full_tag = $match[ 0 ];
557 557
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
558 558
 
559 559
 			$replacement = false;
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 					$replacement = esc_html( $replacement );
572 572
 				}
573 573
 
574
-				if( $url_encode ) {
574
+				if ( $url_encode ) {
575 575
 					$replacement = urlencode( $replacement );
576 576
 				}
577 577
 
@@ -611,14 +611,14 @@  discard block
 block discarded – undo
611 611
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
612 612
 
613 613
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
614
-		if( empty( $matches ) ) {
614
+		if ( empty( $matches ) ) {
615 615
 			return $text;
616 616
 		}
617 617
 
618 618
 		foreach ( $matches as $match ) {
619 619
 
620
-			$full_tag = $match[0];
621
-			$property = $match[1];
620
+			$full_tag = $match[ 0 ];
621
+			$property = $match[ 1 ];
622 622
 
623 623
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
624 624
 
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
 			 * @since 1.15
643 643
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
644 644
 			 */
645
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
645
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
646 646
 
647 647
 			$value = $esc_html ? esc_html( $value ) : $value;
648 648
 
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 			 * @param[in] array $form Gravity Forms form array
654 654
 			 * @param[in] array $entry Entry array
655 655
 			 */
656
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
656
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
657 657
 
658 658
 			$text = str_replace( $full_tag, $value, $text );
659 659
 		}
Please login to merge, or discard this patch.
includes/class-cache.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		/**
82 82
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
83 83
 		 */
84
-		foreach( $this->lead_db_columns as $column ) {
84
+		foreach ( $this->lead_db_columns as $column ) {
85 85
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
86 86
 		}
87 87
 
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 			return;
115 115
 		}
116 116
 
117
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
117
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
118 118
 
119
-		$this->blacklist_add( $entry['form_id'] );
119
+		$this->blacklist_add( $entry[ 'form_id' ] );
120 120
 	}
121 121
 
122 122
 	/**
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 	 */
130 130
 	public function entry_updated( $form, $lead_id ) {
131 131
 
132
-		gravityview()->log->debug(' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form['id'], 'entry_id' => $lead_id ) );
132
+		gravityview()->log->debug( ' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ) );
133 133
 
134
-		$this->blacklist_add( $form['id'] );
134
+		$this->blacklist_add( $form[ 'id' ] );
135 135
 	}
136 136
 
137 137
 	/**
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function entry_created( $entry, $form ) {
148 148
 
149
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
149
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
150 150
 
151
-		$this->blacklist_add( $form['id'] );
151
+		$this->blacklist_add( $form[ 'id' ] );
152 152
 	}
153 153
 
154 154
 	/**
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 			return;
165 165
 		}
166 166
 
167
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
167
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
168 168
 
169
-		$this->blacklist_add( $form['id'] );
169
+		$this->blacklist_add( $form[ 'id' ] );
170 170
 	}
171 171
 
172 172
 	/**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 		// Normally just one form, but supports multiple forms
186 186
 		//
187 187
 		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
188
-		$forms = 'f:' . implode( '-f:', (array) $form_ids );
188
+		$forms = 'f:' . implode( '-f:', (array)$form_ids );
189 189
 
190 190
 		// Prefix for transient keys
191 191
 		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		) ) );
243 243
 
244 244
 		// Add the passed form IDs
245
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
245
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
246 246
 
247 247
 		// Don't duplicate
248 248
 		$blacklist = array_unique( $blacklist );
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 
266 266
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
267 267
 
268
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
268
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
269 269
 
270 270
 		gravityview()->log->debug( 'Removing form IDs from cache blacklist', array( 'data' => array(
271 271
 			'$form_ids'     => $form_ids,
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			return false;
299 299
 		}
300 300
 
301
-		foreach ( (array) $form_ids as $form_id ) {
301
+		foreach ( (array)$form_ids as $form_id ) {
302 302
 
303 303
 			if ( in_array( $form_id, $blacklist ) ) {
304 304
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
371 371
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
372 372
 			 */
373
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
373
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
374 374
 
375 375
 			gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', array( 'key' => $this->key, 'cache_time' => $cache_time ) );
376 376
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 			return;
407 407
 		}
408 408
 
409
-		foreach ( (array) $form_ids as $form_id ) {
409
+		foreach ( (array)$form_ids as $form_id ) {
410 410
 
411 411
 			$key = '_transient_gv-cache-';
412 412
 
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
 	public function use_cache() {
523 523
 
524 524
 		// Exit early if debugging (unless running PHPUnit)
525
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined('DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
525
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
526 526
 			return apply_filters( 'gravityview_use_cache', false, $this );
527 527
 		}
528 528
 
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
 
531 531
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
532 532
 
533
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
533
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
534 534
 
535 535
 				gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' );
536 536
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 		 */
558 558
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
559 559
 
560
-		return (boolean) $use_cache;
560
+		return (boolean)$use_cache;
561 561
 	}
562 562
 
563 563
 }
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
 		$approved_count = $disapproved_count = 0;
103 103
 
104 104
 		// Only count if necessary
105
-		if( $include_counts ) {
106
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
105
+		if ( $include_counts ) {
106
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
108 108
 		}
109 109
 
110
-		$filter_links[] = array(
110
+		$filter_links[ ] = array(
111 111
 			'id'            => 'gv_approved',
112 112
 			'field_filters' => $field_filters_approved,
113 113
 			'count'         => $approved_count,
114 114
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
115 115
 		);
116 116
 
117
-		$filter_links[] = array(
117
+		$filter_links[ ] = array(
118 118
 			'id'            => 'gv_disapproved',
119 119
 			'field_filters' => $field_filters_disapproved,
120 120
 			'count'         => $disapproved_count,
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	function tooltips( $tooltips ) {
135 135
 
136
-		$tooltips['form_gravityview_fields'] = array(
137
-			'title' => __('GravityView Fields', 'gravityview'),
138
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
136
+		$tooltips[ 'form_gravityview_fields' ] = array(
137
+			'title' => __( 'GravityView Fields', 'gravityview' ),
138
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
139 139
 		);
140 140
 
141 141
 		return $tooltips;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 
247 247
 		$gv_bulk_action = false;
248 248
 
249
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
249
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
250 250
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
251 251
 		} else {
252 252
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 		}
255 255
 
256 256
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
257
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
257
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
258 258
 			$gv_bulk_action = $bulk_action;
259 259
 		}
260 260
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 		
280 280
 		// gforms_entry_list is the nonce that confirms we're on the right page
281 281
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
282
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
282
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
283 283
 
284 284
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
285 285
 
@@ -297,13 +297,13 @@  discard block
 block discarded – undo
297 297
 			}
298 298
 
299 299
 			// All entries are set to be updated, not just the visible ones
300
-			if ( ! empty( $_POST['all_entries'] ) ) {
300
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
301 301
 
302 302
 				// Convert the current entry search into GF-formatted search criteria
303 303
 				$search = array(
304
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
305
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
306
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
304
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
305
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
306
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
307 307
 				);
308 308
 
309 309
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			} else {
315 315
 
316 316
 				// Changed from 'lead' to 'entry' in 2.0
317
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
317
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
318 318
 
319 319
 			}
320 320
 
@@ -326,15 +326,15 @@  discard block
 block discarded – undo
326 326
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
327 327
 
328 328
 			switch ( $approved_status ) {
329
-				case $this->bulk_action_prefixes['approve']:
329
+				case $this->bulk_action_prefixes[ 'approve' ]:
330 330
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
331 331
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
332 332
 					break;
333
-				case $this->bulk_action_prefixes['unapprove']:
333
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
334 334
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
335 335
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
336 336
 					break;
337
-				case $this->bulk_action_prefixes['disapprove']:
337
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
338 338
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
339 339
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
340 340
 					break;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
      *
357 357
 	 * @return boolean True: It worked; False: it failed
358 358
 	 */
359
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
359
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
360 360
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
361 361
 	}
362 362
 
@@ -386,20 +386,20 @@  discard block
 block discarded – undo
386 386
 	 *
387 387
 	 * @return void
388 388
 	 */
389
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
389
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
390 390
 
391
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
391
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
392 392
 			return;
393 393
 		}
394 394
 
395
-		if( empty( $entry['id'] ) ) {
395
+		if ( empty( $entry[ 'id' ] ) ) {
396 396
 			return;
397 397
 		}
398 398
 
399 399
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
400 400
 
401
-		if( $status_value ) {
402
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
401
+		if ( $status_value ) {
402
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
403 403
 		}
404 404
 	}
405 405
 
@@ -412,10 +412,10 @@  discard block
 block discarded – undo
412 412
 	 */
413 413
 	private function get_form_id() {
414 414
 
415
-		$form_id = GFForms::get('id');
415
+		$form_id = GFForms::get( 'id' );
416 416
 
417 417
 		// If there are no forms identified, use the first form. That's how GF does it.
418
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
418
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
419 419
 			$form_id = $this->get_first_form_id();
420 420
 		}
421 421
 
@@ -435,14 +435,14 @@  discard block
 block discarded – undo
435 435
 
436 436
 		$forms = RGFormsModel::get_forms( null, 'title' );
437 437
 
438
-		if( ! isset( $forms[0] ) ) {
438
+		if ( ! isset( $forms[ 0 ] ) ) {
439 439
 			gravityview()->log->error( 'No forms were found' );
440 440
 			return 0;
441 441
 		}
442 442
 
443
-		$first_form = $forms[0];
443
+		$first_form = $forms[ 0 ];
444 444
 
445
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
445
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
446 446
 
447 447
 		return intval( $form_id );
448 448
 	}
@@ -450,33 +450,33 @@  discard block
 block discarded – undo
450 450
 
451 451
 	function add_scripts_and_styles( $hook ) {
452 452
 
453
-		if( ! class_exists( 'GFForms' ) ) {
453
+		if ( ! class_exists( 'GFForms' ) ) {
454 454
 			gravityview()->log->error( 'GFForms does not exist.' );
455 455
 			return;
456 456
 		}
457 457
 
458 458
 		// enqueue styles & scripts gf_entries
459 459
 		// But only if we're on the main Entries page, not on reports pages
460
-		if( GFForms::get_page() !== 'entry_list' ) {
460
+		if ( GFForms::get_page() !== 'entry_list' ) {
461 461
 			return;
462 462
 		}
463 463
 
464 464
 		$form_id = $this->get_form_id();
465 465
 
466 466
 		// Things are broken; no forms were found
467
-		if( empty( $form_id ) ) {
467
+		if ( empty( $form_id ) ) {
468 468
 			return;
469 469
 		}
470 470
 
471
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
471
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
472 472
 
473
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
473
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
474 474
 
475
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
475
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
476 476
 
477 477
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
478
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
479
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
478
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
479
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
480 480
 			'form_id' => $form_id,
481 481
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
482 482
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
485 485
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
486 486
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
487 487
 			'bulk_message' => $this->bulk_update_message,
488
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
489
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
490
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
491
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
488
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
489
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
490
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
491
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
492 492
 			'column_link' => esc_url( $this->get_sort_link( $form_id ) ),
493 493
 		) );
494 494
 
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 
509 509
 		$approved_column_id = self::get_approved_column( $form_id );
510 510
 
511
-		if( ! $approved_column_id ) {
511
+		if ( ! $approved_column_id ) {
512 512
 		    return '';
513 513
         }
514 514
 
@@ -538,16 +538,16 @@  discard block
 block discarded – undo
538 538
 		$bulk_actions = array(
539 539
 			'GravityView' => array(
540 540
 				array(
541
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
542
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
541
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
542
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
543 543
 				),
544 544
 				array(
545
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
546
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
545
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
546
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
547 547
 				),
548 548
 				array(
549
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
550
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
549
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
550
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
551 551
 				),
552 552
 			),
553 553
 		);
@@ -564,13 +564,13 @@  discard block
 block discarded – undo
564 564
 		// Sanitize the values, just to be sure.
565 565
 		foreach ( $bulk_actions as $key => $group ) {
566 566
 
567
-		    if( empty( $group ) ) {
567
+		    if ( empty( $group ) ) {
568 568
 		        continue;
569 569
 		    }
570 570
 
571 571
 			foreach ( $group as $i => $action ) {
572
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
573
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
572
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
573
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
574 574
 			}
575 575
 		}
576 576
 
@@ -595,13 +595,13 @@  discard block
 block discarded – undo
595 595
 		 * @since 1.7.2
596 596
 		 * @param boolean $hide_if_no_connections
597 597
 		 */
598
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
598
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
599 599
 
600
-		if( $hide_if_no_connections ) {
600
+		if ( $hide_if_no_connections ) {
601 601
 
602 602
 			$connected_views = gravityview_get_connected_views( $form_id );
603 603
 
604
-			if( empty( $connected_views ) ) {
604
+			if ( empty( $connected_views ) ) {
605 605
 				$show_approve_column = false;
606 606
 			}
607 607
 		}
@@ -611,18 +611,18 @@  discard block
 block discarded – undo
611 611
 		 * @param boolean $show_approve_column Whether the column will be shown
612 612
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
613 613
 		 */
614
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
614
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
615 615
 
616 616
 		return $show_approve_column;
617 617
 	}
618 618
 
619 619
 	function register_gform_noconflict_script( $scripts ) {
620
-		$scripts[] = 'gravityview_gf_entries_scripts';
620
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
621 621
 		return $scripts;
622 622
 	}
623 623
 
624 624
 	function register_gform_noconflict_style( $styles ) {
625
-		$styles[] = 'gravityview_entries_list';
625
+		$styles[ ] = 'gravityview_entries_list';
626 626
 		return $styles;
627 627
 	}
628 628
 
Please login to merge, or discard this patch.
future/includes/class-gv-collection-view.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 			$meta_keys = apply_filters_ref_array( 'gravityview/view_collection/from_post/meta_keys', array( array(), $post, &$views ) );
100 100
 
101 101
 			if ( function_exists( 'apply_filters_deprecated' ) ) {
102
-				$meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
102
+				$meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
103 103
 			} else {
104 104
 				/**
105 105
 				 * @filter `gravityview/data/parse/meta_keys`
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 				 * @todo Require WP 4.6.0 so that `apply_filters_deprecated` is always available
108 108
 				 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
109 109
 				 */
110
-				$meta_keys = (array) apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID );
110
+				$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID );
111 111
 			}
112 112
 
113 113
 			/** What about inside post meta values? */
@@ -137,12 +137,12 @@  discard block
 block discarded – undo
137 137
 
138 138
 		/** Let's find us some [gravityview] shortcodes perhaps. */
139 139
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
140
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
140
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
141 141
 				continue;
142 142
 			}
143 143
 
144
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
145
-				$view = View::by_id( $shortcode->atts['id'] );
144
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
145
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
146 146
 				if ( ! $view ) {
147 147
 					continue;
148 148
 				}
Please login to merge, or discard this patch.
plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 	private function maybe_add_hooks() {
111 111
 		$class_exists = $this->class_name && class_exists( $this->class_name );
112 112
 		$function_exists = $this->function_name && function_exists( $this->function_name );
113
-		$constant_defined = $this->constant_name && defined("{$this->constant_name}");
113
+		$constant_defined = $this->constant_name && defined( "{$this->constant_name}" );
114 114
 
115
-		if( $class_exists || $function_exists || $constant_defined ) {
115
+		if ( $class_exists || $function_exists || $constant_defined ) {
116 116
 			$this->add_hooks();
117 117
 		}
118 118
 	}
@@ -124,23 +124,23 @@  discard block
 block discarded – undo
124 124
 	 */
125 125
 	protected function add_hooks() {
126 126
 
127
-		if( $this->meta_keys ) {
127
+		if ( $this->meta_keys ) {
128 128
 			add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_meta_keys' ), 10, 2 );
129 129
 		}
130 130
 
131
-		if( $this->content_meta_keys ) {
131
+		if ( $this->content_meta_keys ) {
132 132
 			add_filter( 'gravityview/view_collection/from_post/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 3 );
133 133
 		}
134 134
 
135
-		if( $this->script_handles ) {
135
+		if ( $this->script_handles ) {
136 136
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) );
137 137
 		}
138 138
 
139
-		if( $this->style_handles ) {
139
+		if ( $this->style_handles ) {
140 140
 			add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) );
141 141
 		}
142 142
 
143
-		if( $this->post_type_support ) {
143
+		if ( $this->post_type_support ) {
144 144
 			add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 );
145 145
 		}
146 146
 	}
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-theme-hooks-siteorigin.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,19 +39,19 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	function merge_content_meta_keys( $meta_keys = array(), $post = null, & $views = null ) {
41 41
 
42
-		if( empty( $post->panels_data ) || empty( $post->panels_data['widgets'] ) ) {
42
+		if ( empty( $post->panels_data ) || empty( $post->panels_data[ 'widgets' ] ) ) {
43 43
 			return $meta_keys;
44 44
 		}
45 45
 
46
-		foreach ( (array) $post->panels_data['widgets'] as $widget ) {
46
+		foreach ( (array)$post->panels_data[ 'widgets' ] as $widget ) {
47 47
 
48 48
 			$views->merge( \GV\View_Collection::from_content( \GV\Utils::get( $widget, 'text' ) ) );
49 49
 
50
-			if ( empty( $widget['tabs'] ) || ! is_array( $widget['tabs'] ) ) {
50
+			if ( empty( $widget[ 'tabs' ] ) || ! is_array( $widget[ 'tabs' ] ) ) {
51 51
 				continue;
52 52
 			}
53 53
 
54
-			foreach ( $widget['tabs'] as $tab ) {
54
+			foreach ( $widget[ 'tabs' ] as $tab ) {
55 55
 
56 56
 				// Livemesh Tabs
57 57
 				$backup = \GV\Utils::get( $tab, 'tab_content' );
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 				// SiteOrigin Tabs
60 60
 				$content = \GV\Utils::get( $tab, 'content_text', $backup );
61 61
 
62
-				if( $content ) {
62
+				if ( $content ) {
63 63
 					$views->merge( \GV\View_Collection::from_content( $content ) );
64 64
 				}
65 65
 			}
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			/** Must be an embed of some sort. */
124 124
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
125 125
 				$permalink = get_permalink( $post->ID );
126
-				$args['gvid'] = $view_id;
126
+				$args[ 'gvid' ] = $view_id;
127 127
 			}
128 128
 		}
129 129
 		
@@ -151,21 +151,21 @@  discard block
 block discarded – undo
151 151
 			 */
152 152
 			$link_parts = explode( '?', $permalink );
153 153
 
154
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
154
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
155 155
 
156
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
156
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
157 157
 		} else {
158 158
 			$args[ $entry_endpoint_name ] = $entry_slug;
159 159
 		}
160 160
 
161 161
 		if ( $track_directory ) {
162
-			if ( ! empty( $_GET['pagenum'] ) ) {
163
-				$args['pagenum'] = intval( $_GET['pagenum'] );
162
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
163
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
164 164
 			}
165 165
 
166 166
 			if ( $sort = Utils::_GET( 'sort' ) ) {
167
-				$args['sort'] = $sort;
168
-				$args['dir'] = Utils::_GET( 'dir' );
167
+				$args[ 'sort' ] = $sort;
168
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
169 169
 			}
170 170
 		}
171 171
 
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
57 57
 
58
-		if( $acf_keys ) {
58
+		if ( $acf_keys ) {
59 59
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
60 60
 		}
61 61
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 	 * @return void
71 71
 	 */
72 72
 	private function fix_posted_fields() {
73
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
74
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
75
-				$_POST['fields'] = _gravityview_process_posted_fields();
73
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
74
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
75
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
76 76
 			}
77 77
 		}
78 78
 	}
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Spacing   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
 
403 403
 		// If we've saved the permalink in memory, use it
404 404
 		// @since 1.3
405
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
405
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
406 406
 
407
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
407
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
408 408
 			$link = home_url();
409 409
 		}
410 410
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 			// If not yet saved, cache the permalink.
415 415
 			// @since 1.3
416
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
416
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
417 417
 		}
418 418
 
419 419
 		// Deal with returning to proper pagination for embedded views
@@ -421,13 +421,13 @@  discard block
 block discarded – undo
421 421
 
422 422
 			$args = array();
423 423
 
424
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
-				$args['pagenum'] = intval( $pagenum );
424
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
+				$args[ 'pagenum' ] = intval( $pagenum );
426 426
 			}
427 427
 
428
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
-				$args['sort'] = $sort;
430
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
428
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
+				$args[ 'sort' ] = $sort;
430
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
431 431
 			}
432 432
 
433 433
 			$link = add_query_arg( $args, $link );
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
465 465
 
466 466
 		// Generate an unique hash to use as the default value
467
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
467
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
468 468
 
469 469
 		/**
470 470
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
476 476
 
477 477
 		// Make sure we have something - use the original ID as backup.
478
-		if( empty( $slug ) ) {
478
+		if ( empty( $slug ) ) {
479 479
 			$slug = $id;
480 480
 		}
481 481
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
505 505
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
506 506
 		 */
507
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
507
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
508 508
 
509 509
 		// If we're using custom slug...
510 510
 		if ( $custom ) {
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 			// If it does have a hash set, and the hash is expected, use it.
519 519
 			// This check allows users to change the hash structure using the
520 520
 			// gravityview_entry_hash filter and have the old hashes expire.
521
-			if( empty( $value ) || $value !== $hash ) {
521
+			if ( empty( $value ) || $value !== $hash ) {
522 522
 				gravityview()->log->debug( 'Setting hash for entry {entry}: {hash}', array( 'entry' => $id_or_string, 'hash' => $hash ) );
523 523
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
524 524
 			}
@@ -545,15 +545,15 @@  discard block
 block discarded – undo
545 545
          * @param boolean $custom Should we process the custom entry slug?
546 546
          */
547 547
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
-        if( $custom ) {
548
+        if ( $custom ) {
549 549
             // create the gravityview_unique_id and save it
550 550
 
551 551
             // Get the entry hash
552
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
552
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
553 553
 
554
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
554
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
555 555
 
556
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
556
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
557 557
 
558 558
         }
559 559
     }
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 
573 573
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
574 574
 			$entry = GVCommon::get_entry( $entry );
575
-		} else if( empty( $entry ) ) {
575
+		} else if ( empty( $entry ) ) {
576 576
 			// @deprecated path
577 577
 			$entry = GravityView_frontend::getInstance()->getEntry();
578 578
 		}
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
 
593 593
 		$query_arg_name = \GV\Entry::get_endpoint_name();
594 594
 
595
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
595
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
596 596
 
597
-		if ( get_option('permalink_structure') && !is_preview() ) {
597
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
598 598
 
599 599
 			$args = array();
600 600
 
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 			 */
605 605
 			$link_parts = explode( '?', $directory_link );
606 606
 
607
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
607
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
608 608
 
609
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
609
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
610 610
 
611 611
 		} else {
612 612
 
@@ -618,22 +618,22 @@  discard block
 block discarded – undo
618 618
 		 */
619 619
 		if ( $add_directory_args ) {
620 620
 
621
-			if ( ! empty( $_GET['pagenum'] ) ) {
622
-				$args['pagenum'] = intval( $_GET['pagenum'] );
621
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
622
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
623 623
 			}
624 624
 
625 625
 			/**
626 626
 			 * @since 1.7
627 627
 			 */
628 628
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
629
-				$args['sort'] = $sort;
630
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
629
+				$args[ 'sort' ] = $sort;
630
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
631 631
 			}
632 632
 
633 633
 		}
634 634
 
635 635
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
636
-			$args['gvid'] = gravityview_get_view_id();
636
+			$args[ 'gvid' ] = gravityview_get_view_id();
637 637
 		}
638 638
 
639 639
 		return add_query_arg( $args, $directory_link );
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
 }
655 655
 
656 656
 function gv_class( $field, $form = NULL, $entry = array() ) {
657
-	return GravityView_API::field_class( $field, $form, $entry  );
657
+	return GravityView_API::field_class( $field, $form, $entry );
658 658
 }
659 659
 
660 660
 /**
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 		$view_id = 0;
678 678
 		if ( $context->view ) {
679 679
 			$view_id = $context->view->ID;
680
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
680
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
681 681
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
682 682
 			}
683 683
 		}
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		$default_css_class .= ' gv-container-no-results';
706 706
 	}
707 707
 
708
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
708
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
709 709
 
710 710
 	/**
711 711
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
732 732
 
733 733
 	$value = GravityView_API::field_value( $entry, $field );
734 734
 
735
-	if( $value === '' ) {
735
+	if ( $value === '' ) {
736 736
 		/**
737 737
 		 * @filter `gravityview_empty_value` What to display when a field is empty
738 738
 		 * @param string $value (empty string)
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
  */
840 840
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
841 841
 
842
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
842
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
843 843
 
844 844
 		// For the complete field value as generated by Gravity Forms
845 845
 		return $display_value;
@@ -873,16 +873,16 @@  discard block
 block discarded – undo
873 873
 		$terms = explode( ', ', $value );
874 874
 	}
875 875
 
876
-	foreach ($terms as $term_name ) {
876
+	foreach ( $terms as $term_name ) {
877 877
 
878 878
 		// If we're processing a category,
879
-		if( $taxonomy === 'category' ) {
879
+		if ( $taxonomy === 'category' ) {
880 880
 
881 881
 			// Use rgexplode to prevent errors if : doesn't exist
882 882
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
883 883
 
884 884
 			// The explode was succesful; we have the category ID
885
-			if( !empty( $term_id )) {
885
+			if ( ! empty( $term_id ) ) {
886 886
 				$term = get_term_by( 'id', $term_id, $taxonomy );
887 887
 			} else {
888 888
 			// We have to fall back to the name
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 		}
896 896
 
897 897
 		// There's still a tag/category here.
898
-		if( $term ) {
898
+		if ( $term ) {
899 899
 
900 900
 			$term_link = get_term_link( $term, $taxonomy );
901 901
 
@@ -904,11 +904,11 @@  discard block
 block discarded – undo
904 904
 			    continue;
905 905
 			}
906 906
 
907
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
907
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
908 908
 		}
909 909
 	}
910 910
 
911
-	return implode(', ', $output );
911
+	return implode( ', ', $output );
912 912
 }
913 913
 
914 914
 /**
@@ -922,8 +922,8 @@  discard block
 block discarded – undo
922 922
 
923 923
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
924 924
 
925
-	if( empty( $link ) ) {
926
-		return strip_tags( $output);
925
+	if ( empty( $link ) ) {
926
+		return strip_tags( $output );
927 927
 	}
928 928
 
929 929
 	return $output;
@@ -942,7 +942,7 @@  discard block
 block discarded – undo
942 942
 	$fe = GravityView_frontend::getInstance();
943 943
 
944 944
 	// Solve problem when loading content via admin-ajax.php
945
-	if( ! $fe->getGvOutputData() ) {
945
+	if ( ! $fe->getGvOutputData() ) {
946 946
 
947 947
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
948 948
 
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 	}
951 951
 
952 952
 	// Make 100% sure that we're dealing with a properly called situation
953
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
953
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
954 954
 
955 955
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
956 956
 
@@ -1155,12 +1155,12 @@  discard block
 block discarded – undo
1155 1155
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1156 1156
 	/** @define "GRAVITYVIEW_DIR" "../" */
1157 1157
 
1158
-	if( !class_exists( 'GravityView_Field' ) ) {
1159
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1158
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1159
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1160 1160
 	}
1161 1161
 
1162
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1163
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1162
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1163
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1164 1164
 	}
1165 1165
 
1166 1166
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class, $context );
@@ -1259,21 +1259,21 @@  discard block
 block discarded – undo
1259 1259
 	} else {
1260 1260
 		// @deprecated path
1261 1261
 		// Required fields.
1262
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1262
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1263 1263
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1264 1264
 			return '';
1265 1265
 		}
1266 1266
 	}
1267 1267
 
1268 1268
 	if ( $context instanceof \GV\Template_Context ) {
1269
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1270
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1271
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1269
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1270
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1271
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1272 1272
 	} else {
1273 1273
 		// @deprecated path
1274
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1275
-		$field = $args['field'];
1276
-		$form = $args['form'];
1274
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1275
+		$field = $args[ 'field' ];
1276
+		$form = $args[ 'form' ];
1277 1277
 	}
1278 1278
 
1279 1279
 	/**
@@ -1291,46 +1291,46 @@  discard block
 block discarded – undo
1291 1291
 	);
1292 1292
 
1293 1293
 	if ( $context instanceof \GV\Template_Context ) {
1294
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1294
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1295 1295
 	} else {
1296 1296
 		// @deprecated path
1297
-		$placeholders['value'] = gv_value( $entry, $field );
1297
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1298 1298
 	}
1299 1299
 
1300 1300
 	// If the value is empty and we're hiding empty, return empty.
1301
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1301
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1302 1302
 		return '';
1303 1303
 	}
1304 1304
 
1305
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1306
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1305
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1306
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1307 1307
 	}
1308 1308
 
1309 1309
 	// Get width setting, if exists
1310
-	$placeholders['width'] = GravityView_API::field_width( $field );
1310
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1311 1311
 
1312 1312
 	// If replacing with CSS inline formatting, let's do it.
1313
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1313
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1314 1314
 
1315 1315
 	// Grab the Class using `gv_class`
1316
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1317
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1316
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1317
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1318 1318
 
1319 1319
 
1320 1320
 	// Get field label if needed
1321
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
1322
-		$placeholders['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
1321
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
1322
+		$placeholders[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
1323 1323
 	}
1324 1324
 
1325 1325
 	if ( $context instanceof \GV\Template_Context ) {
1326
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1326
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1327 1327
 	} else {
1328 1328
 		// Default Label value
1329
-		$placeholders['label_value'] = gv_label( $field, $entry );
1329
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1330 1330
 	}
1331 1331
 
1332
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1333
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1332
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1333
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1334 1334
 	}
1335 1335
 
1336 1336
 	/**
@@ -1341,7 +1341,7 @@  discard block
 block discarded – undo
1341 1341
 	 * @since 2.0
1342 1342
 	 * @param \GV\Template_Context $context The context.
1343 1343
 	 */
1344
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1344
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1345 1345
 
1346 1346
 	/**
1347 1347
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1368,7 +1368,7 @@  discard block
 block discarded – undo
1368 1368
 	foreach ( $placeholders as $tag => $value ) {
1369 1369
 
1370 1370
 		// If the tag doesn't exist just skip it
1371
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1371
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1372 1372
 			continue;
1373 1373
 		}
1374 1374
 
Please login to merge, or discard this patch.