Completed
Push — develop ( 726c93...2619ab )
by Zack
18:22
created
includes/class-data.php 1 patch
Spacing   +128 added lines, -128 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 			gravityview()->request = new \GV\Dummy_Request();
22 22
 		}
23 23
 
24
-		if( !empty( $passed_post ) ) {
24
+		if ( ! empty( $passed_post ) ) {
25 25
 
26 26
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
27 27
 
28 28
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
29
-				foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
29
+				foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
30 30
 					if ( \GV\View::exists( $view_id ) && ! gravityview()->views->contains( $view_id ) ) {
31 31
 						gravityview()->views->add( \GV\View::by_id( $view_id ) );
32 32
 					}
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	public function maybe_get_view_id( $passed_post ) {
74 74
 		$ids = array();
75
-		if( ! empty( $passed_post ) ) {
75
+		if ( ! empty( $passed_post ) ) {
76 76
 
77
-			if( is_numeric( $passed_post ) ) {
77
+			if ( is_numeric( $passed_post ) ) {
78 78
 				$passed_post = get_post( $passed_post );
79 79
 			}
80 80
 
@@ -83,14 +83,14 @@  discard block
 block discarded – undo
83 83
 				$passed_post = array( $passed_post );
84 84
 			}
85 85
 
86
-			if( is_array( $passed_post ) ) {
86
+			if ( is_array( $passed_post ) ) {
87 87
 
88
-				foreach ( $passed_post as &$post) {
88
+				foreach ( $passed_post as &$post ) {
89 89
 					if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && is_object( $post ) && property_exists( $post, 'ID' ) ) {
90 90
 						$post = get_post( $post ); // Convert into real WP_Post, thanks globals
91 91
 						$views = \GV\View_Collection::from_post( $post );
92 92
 						foreach ( $views->all() as $view ) {
93
-							$ids []= $view->ID;
93
+							$ids [ ] = $view->ID;
94 94
 
95 95
 							/** And as a side-effect... add each view to the global scope. */
96 96
 							if ( ! gravityview()->views->contains( $view->ID ) ) {
@@ -99,19 +99,19 @@  discard block
 block discarded – undo
99 99
 						}
100 100
 					} else {
101 101
 						/** Deprecated, see \GV\View_Collection::from_post */
102
-						if( ( get_post_type( $post ) === 'gravityview' ) ) {
103
-							$ids[] = $post->ID;
104
-						} else{
102
+						if ( ( get_post_type( $post ) === 'gravityview' ) ) {
103
+							$ids[ ] = $post->ID;
104
+						} else {
105 105
 							// Parse the Post Content
106 106
 							$id = $this->parse_post_content( $post->post_content );
107
-							if( $id ) {
108
-								$ids = array_merge( $ids, (array) $id );
107
+							if ( $id ) {
108
+								$ids = array_merge( $ids, (array)$id );
109 109
 							}
110 110
 
111 111
 							// Parse the Post Meta
112 112
 							$id = $this->parse_post_meta( $post->ID );
113
-							if( $id ) {
114
-								$ids = array_merge( $ids, (array) $id );
113
+							if ( $id ) {
114
+								$ids = array_merge( $ids, (array)$id );
115 115
 							}
116 116
 						}
117 117
 					}
@@ -125,37 +125,37 @@  discard block
 block discarded – undo
125 125
 					if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
126 126
 						$shortcodes = \GV\Shortcode::parse( $passed_post );
127 127
 						foreach ( $shortcodes as $shortcode ) {
128
-							if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
129
-								$ids []= $shortcode->atts['id'];
128
+							if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
129
+								$ids [ ] = $shortcode->atts[ 'id' ];
130 130
 
131 131
 								/** And as a side-effect... add each view to the global scope. */
132
-								if ( ! gravityview()->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
133
-									gravityview()->views->add( $shortcode->atts['id'] );
132
+								if ( ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
133
+									gravityview()->views->add( $shortcode->atts[ 'id' ] );
134 134
 								}
135 135
 							}
136 136
 						}
137 137
 					} else {
138 138
 						/** Deprecated, use \GV\Shortcode::parse. */
139 139
 						$id = $this->parse_post_content( $passed_post );
140
-						if( $id ) {
141
-							$ids = array_merge( $ids, (array) $id );
140
+						if ( $id ) {
141
+							$ids = array_merge( $ids, (array)$id );
142 142
 						}
143 143
 					}
144 144
 
145 145
 				} else {
146 146
 					$id = $this->get_id_from_atts( $passed_post );
147
-					$ids[] = intval( $id );
147
+					$ids[ ] = intval( $id );
148 148
 				}
149 149
 			}
150 150
 		}
151 151
 
152
-		if( empty($ids) ) {
152
+		if ( empty( $ids ) ) {
153 153
 			return NULL;
154 154
 		}
155 155
 
156 156
 		// If it's just one ID, return that.
157 157
 		// Otherwise, return array of IDs
158
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
158
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
159 159
 	}
160 160
 
161 161
 	/**
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public static function getInstance( $passed_post = NULL ) {
165 165
 
166
-		if( empty( self::$instance ) ) {
166
+		if ( empty( self::$instance ) ) {
167 167
 			self::$instance = new GravityView_View_Data( $passed_post );
168 168
 		}
169 169
 
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
 				return array();
181 181
 			}
182 182
 			return array_combine(
183
-				array_map( function ( $view ) { return $view->ID; }, gravityview()->views->all() ),
184
-				array_map( function ( $view ) { return $view->as_data(); }, gravityview()->views->all() )
183
+				array_map( function( $view ) { return $view->ID; }, gravityview()->views->all() ),
184
+				array_map( function( $view ) { return $view->as_data(); }, gravityview()->views->all() )
185 185
 			);
186 186
 		}
187 187
 		return $this->views;
@@ -208,19 +208,19 @@  discard block
 block discarded – undo
208 208
 			return $view->as_data();
209 209
 		}
210 210
 
211
-		if( ! is_numeric( $view_id) ) {
212
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
211
+		if ( ! is_numeric( $view_id ) ) {
212
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id ) );
213 213
 			return false;
214 214
 		}
215 215
 
216 216
 		// Backup: the view hasn't been fetched yet. Doing it now.
217 217
 		if ( ! isset( $this->views[ $view_id ] ) ) {
218
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
218
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] View #%s not set yet.', $view_id ) );
219 219
 			return $this->add_view( $view_id, $atts );
220 220
 		}
221 221
 
222 222
 		if ( empty( $this->views[ $view_id ] ) ) {
223
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
223
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id ) );
224 224
 			return false;
225 225
 		}
226 226
 
@@ -265,8 +265,8 @@  discard block
 block discarded – undo
265 265
 		}
266 266
 
267 267
 		// Handle array of IDs
268
-		if( is_array( $view_id ) ) {
269
-			foreach( $view_id as $id ) {
268
+		if ( is_array( $view_id ) ) {
269
+			foreach ( $view_id as $id ) {
270 270
 
271 271
 				$this->add_view( $id, $atts );
272 272
 			}
@@ -275,21 +275,21 @@  discard block
 block discarded – undo
275 275
 		}
276 276
 
277 277
 		// The view has been set already; returning stored view.
278
-		if ( !empty( $this->views[ $view_id ] ) ) {
279
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
278
+		if ( ! empty( $this->views[ $view_id ] ) ) {
279
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id ) );
280 280
 			return $this->views[ $view_id ];
281 281
 		}
282 282
 
283
-		if( ! $this->view_exists( $view_id ) ) {
284
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
283
+		if ( ! $this->view_exists( $view_id ) ) {
284
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) );
285 285
 			return false;
286 286
 		}
287 287
 
288 288
 		$form_id = gravityview_get_form_id( $view_id );
289 289
 
290
-		if( empty( $form_id ) ) {
290
+		if ( empty( $form_id ) ) {
291 291
 
292
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
292
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id ) );
293 293
 
294 294
 			return false;
295 295
 		}
@@ -297,21 +297,21 @@  discard block
 block discarded – undo
297 297
 		// Get the settings for the View ID
298 298
 		$view_settings = gravityview_get_template_settings( $view_id );
299 299
 
300
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
300
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id ), $view_settings );
301 301
 
302 302
 		// Merge the view settings with the defaults
303 303
 		$view_defaults = wp_parse_args( $view_settings, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() );
304 304
 
305
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
305
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
306 306
 
307
-		if( ! empty( $atts ) && is_array( $atts ) ) {
307
+		if ( ! empty( $atts ) && is_array( $atts ) ) {
308 308
 
309
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
309
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
310 310
 
311 311
 			// Get the settings from the shortcode and merge them with defaults.
312 312
 			$atts = shortcode_atts( $view_defaults, $atts );
313 313
 
314
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
314
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
315 315
 
316 316
 		} else {
317 317
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		}
322 322
 
323
-		unset( $atts['id'], $view_defaults, $view_settings );
323
+		unset( $atts[ 'id' ], $view_defaults, $view_settings );
324 324
 
325 325
 		$data = array(
326 326
 			'id' => $view_id,
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			'form' => gravityview_get_form( $form_id ),
334 334
 		);
335 335
 
336
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
336
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] View #%s being added.', $view_id ), $data );
337 337
 
338 338
 		$this->views[ $view_id ] = $data;
339 339
 
@@ -383,15 +383,15 @@  discard block
 block discarded – undo
383 383
 			throw new Exception( __METHOD__ . ' should not be called anymore. Why was it?' );
384 384
 		}
385 385
 
386
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
386
+		if ( empty( $dir_fields ) || ! is_array( $dir_fields ) ) {
387 387
 			return $dir_fields;
388 388
 		}
389 389
 
390
-		foreach( $dir_fields as $area => $fields ) {
390
+		foreach ( $dir_fields as $area => $fields ) {
391 391
 
392
-			foreach( (array)$fields as $uniqid => $properties ) {
392
+			foreach ( (array)$fields as $uniqid => $properties ) {
393 393
 
394
-				if( $this->hide_field_check_conditions( $properties ) ) {
394
+				if ( $this->hide_field_check_conditions( $properties ) ) {
395 395
 					unset( $dir_fields[ $area ][ $uniqid ] );
396 396
 				}
397 397
 
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 		}
419 419
 
420 420
 		// logged-in visibility
421
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
421
+		if ( ! empty( $properties[ 'only_loggedin' ] ) && ! GVCommon::has_cap( $properties[ 'only_loggedin_cap' ] ) ) {
422 422
 			return true;
423 423
 		}
424 424
 
@@ -449,14 +449,14 @@  discard block
 block discarded – undo
449 449
 		// Get the settings from the shortcode and merge them with defaults.
450 450
 		$atts = wp_parse_args( $atts, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() );
451 451
 
452
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
452
+		$view_id = ! empty( $atts[ 'view_id' ] ) ? (int)$atts[ 'view_id' ] : NULL;
453 453
 
454
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
455
-			$view_id = (int)$atts['id'];
454
+		if ( empty( $view_id ) && ! empty( $atts[ 'id' ] ) ) {
455
+			$view_id = (int)$atts[ 'id' ];
456 456
 		}
457 457
 
458
-		if( empty( $view_id ) ) {
459
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
458
+		if ( empty( $view_id ) ) {
459
+			do_action( 'gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
460 460
 			return;
461 461
 		}
462 462
 
@@ -480,68 +480,68 @@  discard block
 block discarded – undo
480 480
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
481 481
 			$ids = array();
482 482
 			foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
483
-				if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
484
-					if ( \GV\View::exists( $shortcode->atts['id'] ) && ! gravityview()->views->contains( $shortcode->atts['id'] ) ) {
485
-						gravityview()->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
483
+				if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
484
+					if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) ) {
485
+						gravityview()->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
486 486
 					}
487 487
 					/**
488 488
 					 * The original function outputs the ID even though it wasn't added by ::add_view()
489 489
 					 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
490 490
 					 * until better times.
491 491
 					 */
492
-					$ids []= $shortcode->atts['id'];
492
+					$ids [ ] = $shortcode->atts[ 'id' ];
493 493
 				}
494 494
 			}
495 495
 			if ( empty ( $ids ) ) {
496 496
 				return null;
497 497
 			}
498
-			return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
498
+			return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
499 499
 		}
500 500
 
501 501
 		/**
502 502
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
503 503
 		 * @since 1.6
504 504
 		 */
505
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
505
+		if ( ! shortcode_exists( 'gravityview' ) && class_exists( 'GravityView_Shortcode' ) ) {
506 506
 			new GravityView_Shortcode;
507 507
 		}
508 508
 
509 509
 		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
510 510
 
511
-		if( empty( $shortcodes ) ) {
511
+		if ( empty( $shortcodes ) ) {
512 512
 			return NULL;
513 513
 		}
514 514
 
515
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
515
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
516 516
 
517 517
 		$ids = array();
518 518
 
519
-		foreach ($shortcodes as $key => $shortcode) {
519
+		foreach ( $shortcodes as $key => $shortcode ) {
520 520
 
521
-			$shortcode[3] = htmlspecialchars_decode( $shortcode[3], ENT_QUOTES );
521
+			$shortcode[ 3 ] = htmlspecialchars_decode( $shortcode[ 3 ], ENT_QUOTES );
522 522
 
523
-			$args = shortcode_parse_atts( $shortcode[3] );
523
+			$args = shortcode_parse_atts( $shortcode[ 3 ] );
524 524
 
525
-			if( empty( $args['id'] ) ) {
526
-				do_action('gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode );
525
+			if ( empty( $args[ 'id' ] ) ) {
526
+				do_action( 'gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode );
527 527
 				continue;
528 528
 			}
529 529
 
530
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
530
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args[ 'id' ] ), $args );
531 531
 
532 532
 			// Store the View to the object for later fetching.
533
-			$this->add_view( $args['id'], $args );
533
+			$this->add_view( $args[ 'id' ], $args );
534 534
 
535
-			$ids[] = $args['id'];
535
+			$ids[ ] = $args[ 'id' ];
536 536
 		}
537 537
 
538
-		if( empty($ids) ) {
538
+		if ( empty( $ids ) ) {
539 539
 			return NULL;
540 540
 		}
541 541
 
542 542
 		// If it's just one ID, return that.
543 543
 		// Otherwise, return array of IDs
544
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
544
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
545 545
 
546 546
 	}
547 547
 
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 		 */
571 571
 		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
572 572
 
573
-		if( empty( $meta_keys ) ) {
573
+		if ( empty( $meta_keys ) ) {
574 574
 			return NULL;
575 575
 		}
576 576
 
@@ -578,16 +578,16 @@  discard block
 block discarded – undo
578 578
 
579 579
 		$meta_content = '';
580 580
 
581
-		foreach( $meta_keys as $key ) {
582
-			$meta = get_post_meta( $post_id, $key , true );
583
-			if( ! is_string( $meta ) ) {
581
+		foreach ( $meta_keys as $key ) {
582
+			$meta = get_post_meta( $post_id, $key, true );
583
+			if ( ! is_string( $meta ) ) {
584 584
 				continue;
585 585
 			}
586 586
 			$meta_content .= $meta . ' ';
587 587
 		}
588 588
 
589
-		if( empty( $meta_content ) ) {
590
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
589
+		if ( empty( $meta_content ) ) {
590
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
591 591
 			return NULL;
592 592
 		}
593 593
 
@@ -615,16 +615,16 @@  discard block
 block discarded – undo
615 615
 		$message = NULL;
616 616
 
617 617
 		// Not invalid if not set!
618
-		if( empty( $post_id ) || empty( $view_id ) ) {
618
+		if ( empty( $post_id ) || empty( $view_id ) ) {
619 619
 
620
-			if( $empty_is_valid ) {
620
+			if ( $empty_is_valid ) {
621 621
 				return true;
622 622
 			}
623 623
 
624 624
 			$message = esc_html__( 'The ID is required.', 'gravityview' );
625 625
 		}
626 626
 
627
-		if( ! $message ) {
627
+		if ( ! $message ) {
628 628
 			$status = get_post_status( $post_id );
629 629
 
630 630
 			// Nothing exists with that post ID.
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 			}
637 637
 		}
638 638
 
639
-		if( ! $message ) {
639
+		if ( ! $message ) {
640 640
 
641 641
 			// Nothing exists with that post ID.
642 642
 			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
@@ -645,8 +645,8 @@  discard block
 block discarded – undo
645 645
 
646 646
 		}
647 647
 
648
-		if( ! $message ) {
649
-			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) )  {
648
+		if ( ! $message ) {
649
+			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) {
650 650
 				$views = GV\View_Collection::from_post( $post );
651 651
 				$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
652 652
 			} else {
@@ -655,21 +655,21 @@  discard block
 block discarded – undo
655 655
 			}
656 656
 
657 657
 			// The post or page specified does not contain the shortcode.
658
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
658
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
659 659
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
660 660
 			}
661 661
 		}
662 662
 
663
-		if( ! $message ) {
663
+		if ( ! $message ) {
664 664
 
665 665
 			// It's a View
666 666
 			if ( ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && \GV\View::exists( $post_id ) )
667 667
 				|| 'gravityview' === get_post_type( $post_id ) ) {
668
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
668
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
669 669
 			}
670 670
 		}
671 671
 
672
-		if( $message ) {
672
+		if ( $message ) {
673 673
 			return new WP_Error( 'invalid_embed_id', $message );
674 674
 		}
675 675
 
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
 
687 687
 		$args = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults( $with_details ) : self::get_default_args( $with_details );
688 688
 
689
-		if( !isset( $args[ $key ] ) ) { return NULL; }
689
+		if ( ! isset( $args[ $key ] ) ) { return NULL; }
690 690
 
691 691
 		return $args[ $key ];
692 692
 	}
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
 
718 718
 		$default_settings = array(
719 719
 			'id' => array(
720
-				'label' => __('View ID', 'gravityview'),
720
+				'label' => __( 'View ID', 'gravityview' ),
721 721
 				'type' => 'number',
722 722
 				'group'	=> 'default',
723 723
 				'value' => NULL,
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 				'show_in_shortcode' => false,
726 726
 			),
727 727
 			'page_size' => array(
728
-				'label' 	=> __('Number of entries per page', 'gravityview'),
728
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
729 729
 				'type' => 'number',
730 730
 				'class'	=> 'small-text',
731 731
 				'group'	=> 'default',
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 				'show_in_shortcode' => true,
734 734
 			),
735 735
 			'offset' => array(
736
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
736
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
737 737
 				'type' => 'number',
738 738
 				'class'	=> 'small-text',
739 739
 				'group'	=> 'default',
@@ -757,8 +757,8 @@  discard block
 block discarded – undo
757 757
 			),
758 758
 			'admin_show_all_statuses' => array(
759 759
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
760
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
761
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
760
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
761
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
762 762
 				'requires' => 'show_only_approved',
763 763
 				'type' => 'checkbox',
764 764
 				'group'	=> 'default',
@@ -783,40 +783,40 @@  discard block
 block discarded – undo
783 783
 			'user_edit' => array(
784 784
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
785 785
 				'group'	=> 'default',
786
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
786
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
787 787
 				'value'	=> 0,
788
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
788
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
789 789
 				'type'	=> 'checkbox',
790 790
 				'show_in_shortcode' => true,
791 791
 			),
792 792
 			'user_delete' => array(
793 793
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
794 794
 				'group'	=> 'default',
795
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
795
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
796 796
 				'value'	=> 0,
797
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
797
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
798 798
 				'type'	=> 'checkbox',
799 799
 				'show_in_shortcode' => true,
800 800
 			),
801 801
 			'sort_field' => array(
802
-				'label'	=> __('Sort by field', 'gravityview'),
802
+				'label'	=> __( 'Sort by field', 'gravityview' ),
803 803
 				'type' => 'select',
804 804
 				'value' => '',
805 805
 				'group'	=> 'sort',
806 806
 				'options' => array(
807
-					'' => __( 'Default', 'gravityview'),
808
-					'date_created' => __( 'Date Created', 'gravityview'),
807
+					'' => __( 'Default', 'gravityview' ),
808
+					'date_created' => __( 'Date Created', 'gravityview' ),
809 809
 				),
810 810
 				'show_in_shortcode' => true,
811 811
 			),
812 812
 			'sort_direction' => array(
813
-				'label' 	=> __('Sort direction', 'gravityview'),
813
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
814 814
 				'type' => 'select',
815 815
 				'value' => 'ASC',
816 816
 				'group'	=> 'sort',
817 817
 				'options' => array(
818
-					'ASC' => __('ASC', 'gravityview'),
819
-					'DESC' => __('DESC', 'gravityview'),
818
+					'ASC' => __( 'ASC', 'gravityview' ),
819
+					'DESC' => __( 'DESC', 'gravityview' ),
820 820
 				),
821 821
 				'show_in_shortcode' => true,
822 822
 			),
@@ -831,69 +831,69 @@  discard block
 block discarded – undo
831 831
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
832 832
 			),
833 833
 			'start_date' => array(
834
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
834
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
835 835
 				'class'	=> 'gv-datepicker',
836
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
836
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
837 837
 				'type' => 'text',
838 838
 				'value' => '',
839 839
 				'group'	=> 'filter',
840 840
 				'show_in_shortcode' => true,
841 841
 			),
842 842
 			'end_date' => array(
843
-				'label' 	=> __('Filter by End Date', 'gravityview'),
843
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
844 844
 				'class'	=> 'gv-datepicker',
845
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
845
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
846 846
 				'type' => 'text',
847 847
 				'value' => '',
848 848
 				'group'	=> 'filter',
849 849
 				'show_in_shortcode' => true,
850 850
 			),
851 851
 			'class' => array(
852
-				'label' 	=> __('CSS Class', 'gravityview'),
853
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
852
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
853
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
854 854
 				'group'	=> 'default',
855 855
 				'type' => 'text',
856 856
 				'value' => '',
857 857
 				'show_in_shortcode' => false,
858 858
 			),
859 859
 			'search_value' => array(
860
-				'label' 	=> __('Search Value', 'gravityview'),
861
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
860
+				'label' 	=> __( 'Search Value', 'gravityview' ),
861
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
862 862
 				'type' => 'text',
863 863
 				'value' => '',
864 864
 				'group'	=> 'filter',
865 865
 				'show_in_shortcode' => false,
866 866
 			),
867 867
 			'search_field' => array(
868
-				'label' 	=> __('Search Field', 'gravityview'),
869
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
868
+				'label' 	=> __( 'Search Field', 'gravityview' ),
869
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
870 870
 				'type' => 'number',
871 871
 				'value' => '',
872 872
 				'group'	=> 'filter',
873 873
 				'show_in_shortcode' => false,
874 874
 			),
875 875
 			'single_title' => array(
876
-				'label'	=> __('Single Entry Title', 'gravityview'),
876
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
877 877
 				'type'	=> 'text',
878
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
878
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
879 879
 				'group'	=> 'default',
880 880
 				'value'	=> '',
881 881
 				'show_in_shortcode' => false,
882 882
 				'full_width' => true,
883 883
 			),
884 884
 			'back_link_label' => array(
885
-				'label'	=> __('Back Link Label', 'gravityview'),
885
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
886 886
 				'group'	=> 'default',
887
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
887
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
888 888
 				'type'	=> 'text',
889 889
 				'value'	=> '',
890 890
 				'show_in_shortcode' => false,
891 891
 				'full_width' => true,
892 892
 			),
893 893
 			'embed_only' => array(
894
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
894
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
895 895
 				'group'	=> 'default',
896
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
896
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
897 897
 				'type'	=> 'checkbox',
898 898
 				'value'	=> '',
899 899
 				'tooltip' => false,
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
908 908
 		);
909 909
 
910 910
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
911
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
911
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
912 912
 		}
913 913
 
914 914
 		/**
@@ -920,12 +920,12 @@  discard block
 block discarded – undo
920 920
 		$default_settings = apply_filters( 'gravityview_default_args', $default_settings );
921 921
 
922 922
 		// By default, we only want the key => value pairing, not the whole array.
923
-		if( empty( $with_details ) ) {
923
+		if ( empty( $with_details ) ) {
924 924
 
925 925
 			$defaults = array();
926 926
 
927
-			foreach( $default_settings as $key => $value ) {
928
-				$defaults[ $key ] = $value['value'];
927
+			foreach ( $default_settings as $key => $value ) {
928
+				$defaults[ $key ] = $value[ 'value' ];
929 929
 			}
930 930
 
931 931
 			return $defaults;
@@ -934,12 +934,12 @@  discard block
 block discarded – undo
934 934
 		// But sometimes, we want all the details.
935 935
 		else {
936 936
 
937
-			foreach ($default_settings as $key => $value) {
937
+			foreach ( $default_settings as $key => $value ) {
938 938
 
939 939
 				// If the $group argument is set for the method,
940 940
 				// ignore any settings that aren't in that group.
941
-				if( !empty( $group ) && is_string( $group ) ) {
942
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
941
+				if ( ! empty( $group ) && is_string( $group ) ) {
942
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
943 943
 						unset( $default_settings[ $key ] );
944 944
 					}
945 945
 				}
Please login to merge, or discard this patch.
includes/class-gravityview-uninstall.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 		$tables = array();
43 43
 
44 44
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
45
-			$tables []= GFFormsModel::get_entry_meta_table_name();
45
+			$tables [ ] = GFFormsModel::get_entry_meta_table_name();
46 46
 		}
47
-		$tables []= GFFormsModel::get_lead_meta_table_name();
47
+		$tables [ ] = GFFormsModel::get_lead_meta_table_name();
48 48
 
49 49
 		$suppress = $wpdb->suppress_errors();
50 50
 		foreach ( $tables as $meta_table ) {
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 		$tables = array();
71 71
 
72 72
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
73
-			$tables[] = GFFormsModel::get_entry_notes_table_name();
73
+			$tables[ ] = GFFormsModel::get_entry_notes_table_name();
74 74
 		}
75 75
 
76
-		$tables[] = GFFormsModel::get_lead_notes_table_name();
76
+		$tables[ ] = GFFormsModel::get_lead_notes_table_name();
77 77
 
78
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
79
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
78
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
79
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
80 80
 
81 81
 		$suppress = $wpdb->suppress_errors();
82 82
 		foreach ( $tables as $notes_table ) {
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 		$default_settings = array(
36 36
 			'id' => array(
37
-				'label' => __('View ID', 'gravityview'),
37
+				'label' => __( 'View ID', 'gravityview' ),
38 38
 				'type' => 'number',
39 39
 				'group'	=> 'default',
40 40
 				'value' => NULL,
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 				'show_in_shortcode' => false,
43 43
 			),
44 44
 			'page_size' => array(
45
-				'label' 	=> __('Number of entries per page', 'gravityview'),
45
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
46 46
 				'type' => 'number',
47 47
 				'class'	=> 'small-text',
48 48
 				'group'	=> 'default',
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 				'show_in_shortcode' => true,
51 51
 			),
52 52
 			'offset' => array(
53
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
53
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
54 54
 				'type' => 'number',
55 55
 				'class'	=> 'small-text',
56 56
 				'group'	=> 'default',
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 			),
75 75
 			'admin_show_all_statuses' => array(
76 76
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
77
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
78
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
77
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
78
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
79 79
 				'requires' => 'show_only_approved',
80 80
 				'type' => 'checkbox',
81 81
 				'group'	=> 'default',
@@ -100,40 +100,40 @@  discard block
 block discarded – undo
100 100
 			'user_edit' => array(
101 101
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
102 102
 				'group'	=> 'default',
103
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
103
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
104 104
 				'value'	=> 0,
105
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
105
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
106 106
 				'type'	=> 'checkbox',
107 107
 				'show_in_shortcode' => true,
108 108
 			),
109 109
 			'user_delete' => array(
110 110
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
111 111
 				'group'	=> 'default',
112
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
112
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
113 113
 				'value'	=> 0,
114
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
114
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
115 115
 				'type'	=> 'checkbox',
116 116
 				'show_in_shortcode' => true,
117 117
 			),
118 118
 			'sort_field' => array(
119
-				'label'	=> __('Sort by field', 'gravityview'),
119
+				'label'	=> __( 'Sort by field', 'gravityview' ),
120 120
 				'type' => 'select',
121 121
 				'value' => '',
122 122
 				'group'	=> 'sort',
123 123
 				'options' => array(
124
-					'' => __( 'Default', 'gravityview'),
125
-					'date_created' => __( 'Date Created', 'gravityview'),
124
+					'' => __( 'Default', 'gravityview' ),
125
+					'date_created' => __( 'Date Created', 'gravityview' ),
126 126
 				),
127 127
 				'show_in_shortcode' => true,
128 128
 			),
129 129
 			'sort_direction' => array(
130
-				'label' 	=> __('Sort direction', 'gravityview'),
130
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
131 131
 				'type' => 'select',
132 132
 				'value' => 'ASC',
133 133
 				'group'	=> 'sort',
134 134
 				'options' => array(
135
-					'ASC' => __('ASC', 'gravityview'),
136
-					'DESC' => __('DESC', 'gravityview'),
135
+					'ASC' => __( 'ASC', 'gravityview' ),
136
+					'DESC' => __( 'DESC', 'gravityview' ),
137 137
 				),
138 138
 				'show_in_shortcode' => true,
139 139
 			),
@@ -148,69 +148,69 @@  discard block
 block discarded – undo
148 148
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
149 149
 			),
150 150
 			'start_date' => array(
151
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
151
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
152 152
 				'class'	=> 'gv-datepicker',
153
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
153
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
154 154
 				'type' => 'text',
155 155
 				'value' => '',
156 156
 				'group'	=> 'filter',
157 157
 				'show_in_shortcode' => true,
158 158
 			),
159 159
 			'end_date' => array(
160
-				'label' 	=> __('Filter by End Date', 'gravityview'),
160
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
161 161
 				'class'	=> 'gv-datepicker',
162
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
162
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
163 163
 				'type' => 'text',
164 164
 				'value' => '',
165 165
 				'group'	=> 'filter',
166 166
 				'show_in_shortcode' => true,
167 167
 			),
168 168
 			'class' => array(
169
-				'label' 	=> __('CSS Class', 'gravityview'),
170
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
169
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
170
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
171 171
 				'group'	=> 'default',
172 172
 				'type' => 'text',
173 173
 				'value' => '',
174 174
 				'show_in_shortcode' => false,
175 175
 			),
176 176
 			'search_value' => array(
177
-				'label' 	=> __('Search Value', 'gravityview'),
178
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
177
+				'label' 	=> __( 'Search Value', 'gravityview' ),
178
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
179 179
 				'type' => 'text',
180 180
 				'value' => '',
181 181
 				'group'	=> 'filter',
182 182
 				'show_in_shortcode' => false,
183 183
 			),
184 184
 			'search_field' => array(
185
-				'label' 	=> __('Search Field', 'gravityview'),
186
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
185
+				'label' 	=> __( 'Search Field', 'gravityview' ),
186
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
187 187
 				'type' => 'number',
188 188
 				'value' => '',
189 189
 				'group'	=> 'filter',
190 190
 				'show_in_shortcode' => false,
191 191
 			),
192 192
 			'single_title' => array(
193
-				'label'	=> __('Single Entry Title', 'gravityview'),
193
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
194 194
 				'type'	=> 'text',
195
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
195
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
196 196
 				'group'	=> 'default',
197 197
 				'value'	=> '',
198 198
 				'show_in_shortcode' => false,
199 199
 				'full_width' => true,
200 200
 			),
201 201
 			'back_link_label' => array(
202
-				'label'	=> __('Back Link Label', 'gravityview'),
202
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
203 203
 				'group'	=> 'default',
204
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
204
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
205 205
 				'type'	=> 'text',
206 206
 				'value'	=> '',
207 207
 				'show_in_shortcode' => false,
208 208
 				'full_width' => true,
209 209
 			),
210 210
 			'embed_only' => array(
211
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
211
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
212 212
 				'group'	=> 'default',
213
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
213
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
214 214
 				'type'	=> 'checkbox',
215 215
 				'value'	=> '',
216 216
 				'tooltip' => false,
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		);
226 226
 
227 227
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
228
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
228
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
229 229
 		}
230 230
 
231 231
 		/**
@@ -245,19 +245,19 @@  discard block
 block discarded – undo
245 245
 		// By default, we only want the key => value pairing, not the whole array.
246 246
 		if ( ! $detailed ) {
247 247
 			$defaults = array();
248
-			foreach( $default_settings as $key => $value ) {
249
-				$defaults[ $key ] = $value['value'];
248
+			foreach ( $default_settings as $key => $value ) {
249
+				$defaults[ $key ] = $value[ 'value' ];
250 250
 			}
251 251
 			return $defaults;
252 252
 
253 253
 		// But sometimes, we want all the details.
254 254
 		} else {
255
-			foreach ($default_settings as $key => $value) {
255
+			foreach ( $default_settings as $key => $value ) {
256 256
 
257 257
 				// If the $group argument is set for the method,
258 258
 				// ignore any settings that aren't in that group.
259 259
 				if ( ! empty( $group ) && is_string( $group ) ) {
260
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
260
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
261 261
 						unset( $default_settings[ $key ] );
262 262
 					}
263 263
 				}
Please login to merge, or discard this patch.
includes/class-gravityview-gfformsmodel.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
41 41
 
42 42
 		if ( 'date_created' === $source_field ) {
43
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
44
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
43
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
44
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
45 45
 		}
46 46
 
47 47
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form ); // TODO: Change the autogenerated stub
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
 
66 66
         $post_data = self::get_post_fields( $form, $entry );
67 67
 
68
-        $media = get_attached_media( 'image', $entry['post_id'] );
68
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
69 69
 
70 70
         $post_images = array();
71 71
 
72 72
         foreach ( $media as $media_item ) {
73
-            foreach( (array) $post_data['images'] as $post_data_item ) {
74
-                if(
73
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
74
+                if (
75 75
                     rgar( $post_data_item, 'title' ) === $media_item->post_title &&
76 76
                     rgar( $post_data_item, 'description' ) === $media_item->post_content &&
77 77
                     rgar( $post_data_item, 'caption' ) === $media_item->post_excerpt
78 78
                 ) {
79
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
79
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
80 80
                 }
81 81
             }
82 82
         }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
          * If the method changes to public, use Gravity Forms' method
105 105
          * @todo: If/when the method is public, remove the unneeded copied code.
106 106
          */
107
-        if( $reflection->isPublic() ) {
107
+        if ( $reflection->isPublic() ) {
108 108
             return parent::get_post_fields( $form, $entry );
109 109
         }
110 110
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
          * If the method changes to public, use Gravity Forms' method
132 132
          * @todo: If/when the method is public, remove the unneeded copied code.
133 133
          */
134
-        if( $reflection->isPublic() ) {
134
+        if ( $reflection->isPublic() ) {
135 135
             return parent::copy_post_image( $url, $post_id );
136 136
         }
137 137
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
          * If the method changes to public, use Gravity Forms' method
167 167
          * @todo: If/when the method is public, remove the unneeded copied code.
168 168
          */
169
-        if( $reflection->isPublic() ) {
169
+        if ( $reflection->isPublic() ) {
170 170
             return parent::media_handle_upload( $url, $post_id, $post_data );
171 171
         }
172 172
 
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Spacing   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 
127 127
 		$form = false;
128 128
 
129
-		if( $entry ) {
130
-			$form = GFAPI::get_form( $entry['form_id'] );
129
+		if ( $entry ) {
130
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
131 131
 		}
132 132
 
133 133
 		return $form;
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
193 193
 
194 194
 			$has_transaction_data = rgar( $entry, $meta, false );
195 195
 
196
-			if( ! empty( $has_transaction_data ) ) {
196
+			if ( ! empty( $has_transaction_data ) ) {
197 197
 				break;
198 198
 			}
199 199
 		}
200 200
 
201
-		return (bool) $has_transaction_data;
201
+		return (bool)$has_transaction_data;
202 202
 	}
203 203
 
204 204
 	/**
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 
237 237
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
238 238
 
239
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
239
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
240 240
 
241 241
 		return $result;
242 242
 	}
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 	 *
254 254
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
255 255
 	 */
256
-	public static function get_forms(  $active = true, $trash = false ) {
256
+	public static function get_forms( $active = true, $trash = false ) {
257 257
 		$forms = array();
258 258
 		if ( class_exists( 'GFAPI' ) ) {
259
-			if( 'any' === $active ) {
259
+			if ( 'any' === $active ) {
260 260
 				$active_forms = GFAPI::get_forms( true, $trash );
261 261
 				$inactive_forms = GFAPI::get_forms( false, $trash );
262 262
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -287,9 +287,9 @@  discard block
 block discarded – undo
287 287
 		$has_post_fields = false;
288 288
 
289 289
 		if ( $form ) {
290
-			foreach ( $form['fields'] as $field ) {
291
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
292
-					$fields["{$field['id']}"] = array(
290
+			foreach ( $form[ 'fields' ] as $field ) {
291
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
292
+					$fields[ "{$field[ 'id' ]}" ] = array(
293 293
 						'label' => rgar( $field, 'label' ),
294 294
 						'parent' => null,
295 295
 						'type' => rgar( $field, 'type' ),
@@ -298,10 +298,10 @@  discard block
 block discarded – undo
298 298
 					);
299 299
 				}
300 300
 
301
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
302
-					foreach ( $field['inputs'] as $input ) {
301
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
302
+					foreach ( $field[ 'inputs' ] as $input ) {
303 303
 
304
-						if( ! empty( $input['isHidden'] ) ) {
304
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
305 305
 							continue;
306 306
 						}
307 307
 
@@ -309,10 +309,10 @@  discard block
 block discarded – undo
309 309
                          * @hack
310 310
                          * In case of email/email confirmation, the input for email has the same id as the parent field
311 311
                          */
312
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
312
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
313 313
                             continue;
314 314
                         }
315
-						$fields["{$input['id']}"] = array(
315
+						$fields[ "{$input[ 'id' ]}" ] = array(
316 316
 							'label' => rgar( $input, 'label' ),
317 317
 							'customLabel' => rgar( $input, 'customLabel' ),
318 318
 							'parent' => $field,
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 				}
325 325
 
326 326
 
327
-				if( GFCommon::is_product_field( $field['type'] ) ){
327
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
328 328
 					$has_product_fields = true;
329 329
 				}
330 330
 
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 		 * @since 1.7
339 339
 		 */
340 340
 		if ( $has_post_fields ) {
341
-			$fields['post_id'] = array(
341
+			$fields[ 'post_id' ] = array(
342 342
 				'label' => __( 'Post ID', 'gravityview' ),
343 343
 				'type' => 'post_id',
344 344
 			);
@@ -351,11 +351,11 @@  discard block
 block discarded – undo
351 351
 			foreach ( $payment_fields as $payment_field ) {
352 352
 
353 353
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
354
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
354
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
355 355
 					continue;
356 356
 				}
357 357
 
358
-				$fields["{$payment_field->name}"] = array(
358
+				$fields[ "{$payment_field->name}" ] = array(
359 359
 					'label' => $payment_field->label,
360 360
 					'desc' => $payment_field->description,
361 361
 					'type' => $payment_field->name,
@@ -387,9 +387,9 @@  discard block
 block discarded – undo
387 387
 
388 388
 		$fields = array();
389 389
 
390
-		foreach ( $extra_fields as $key => $field ){
391
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
392
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
390
+		foreach ( $extra_fields as $key => $field ) {
391
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
392
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
393 393
 			}
394 394
 		}
395 395
 
@@ -429,32 +429,32 @@  discard block
 block discarded – undo
429 429
 			'search_criteria' => null,
430 430
 			'sorting' => null,
431 431
 			'paging' => null,
432
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
432
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
433 433
 		);
434 434
 
435 435
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
436 436
 
437
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
438
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
437
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
438
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
439 439
 
440 440
 				if ( ! is_array( $filter ) ) {
441 441
 					continue;
442 442
 				}
443 443
 
444 444
 				// By default, we want searches to be wildcard for each field.
445
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
445
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
446 446
 
447 447
 				/**
448 448
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
449 449
 				 * @param string $operator Existing search operator
450 450
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
451 451
 				 */
452
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
452
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
453 453
 			}
454 454
 
455 455
 			// don't send just the [mode] without any field filter.
456
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
457
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
456
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
457
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
458 458
 			}
459 459
 
460 460
 		}
@@ -465,21 +465,21 @@  discard block
 block discarded – undo
465 465
 		 * Prepare date formats to be in Gravity Forms DB format;
466 466
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
467 467
 		 */
468
-		foreach ( array('start_date', 'end_date' ) as $key ) {
468
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
469 469
 
470
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
470
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
471 471
 
472 472
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
473
-				$date = date_create( $criteria['search_criteria'][ $key ] );
473
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
474 474
 
475 475
 				if ( $date ) {
476 476
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
477
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
477
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
478 478
 				} else {
479
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
479
+					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] ' . $key . ' Date format not valid:', $criteria[ 'search_criteria' ][ $key ] );
480 480
 
481 481
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
482
-					unset( $criteria['search_criteria'][ $key ] );
482
+					unset( $criteria[ 'search_criteria' ][ $key ] );
483 483
 				}
484 484
 			}
485 485
 		}
@@ -498,14 +498,14 @@  discard block
 block discarded – undo
498 498
 
499 499
 		// Calculate the context view id and send it to the advanced filter
500 500
 		if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
501
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
501
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
502 502
 		} elseif ( $multiple_original ) {
503
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
503
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
504 504
 		} elseif ( 'delete' === GFForms::get( 'action' ) ) {
505
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
506
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
505
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
506
+		} elseif ( ! isset( $criteria[ 'context_view_id' ] ) ) {
507 507
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
508
-			$criteria['context_view_id'] = null;
508
+			$criteria[ 'context_view_id' ] = null;
509 509
 		}
510 510
 
511 511
 		/**
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
 		 * @param array $form_ids Forms to search
515 515
 		 * @param int $view_id ID of the view being used to search
516 516
 		 */
517
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
517
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
518 518
 
519 519
 		return (array)$criteria;
520 520
 	}
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 		/** Reduce # of database calls */
545 545
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
546 546
 
547
-		if ( ! empty( $criteria['cache'] ) ) {
547
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
548 548
 
549 549
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
550 550
 
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 
553 553
 				// Still update the total count when using cached results
554 554
 				if ( ! is_null( $total ) ) {
555
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
555
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
556 556
 				}
557 557
 
558 558
 				$return = $entries;
@@ -573,9 +573,9 @@  discard block
 block discarded – undo
573 573
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
574 574
 
575 575
 			// No entries returned from gravityview_before_get_entries
576
-			if( is_null( $entries ) ) {
576
+			if ( is_null( $entries ) ) {
577 577
 
578
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
578
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
579 579
 
580 580
 				if ( is_wp_error( $entries ) ) {
581 581
 					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 				}
587 587
 			}
588 588
 
589
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
589
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
590 590
 
591 591
 				// Cache results
592 592
 				$Cache->set( $entries, 'entries' );
@@ -691,12 +691,12 @@  discard block
 block discarded – undo
691 691
 			 */
692 692
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
693 693
 
694
-			if( $check_entry_display ) {
694
+			if ( $check_entry_display ) {
695 695
 				// Is the entry allowed
696 696
 				$entry = self::check_entry_display( $entry );
697 697
 			}
698 698
 
699
-			if( is_wp_error( $entry ) ) {
699
+			if ( is_wp_error( $entry ) ) {
700 700
 				do_action( 'gravityview_log_error', __METHOD__ . ': ' . $entry->get_error_message() );
701 701
 				return false;
702 702
 			}
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
 	 */
728 728
 	public static function matches_operation( $val1, $val2, $operation ) {
729 729
 
730
-		$json_function = function_exists('wp_json_encode') ? 'wp_json_encode' : 'json_encode';
730
+		$json_function = function_exists( 'wp_json_encode' ) ? 'wp_json_encode' : 'json_encode';
731 731
 
732 732
 		// Only process strings
733 733
 		$val1 = ! is_string( $val1 ) ? $json_function( $val1 ) : $val1;
@@ -735,12 +735,12 @@  discard block
 block discarded – undo
735 735
 
736 736
 		$value = false;
737 737
 
738
-		if( 'context' === $val1 ) {
738
+		if ( 'context' === $val1 ) {
739 739
 
740 740
 			$matching_contexts = array( $val2 );
741 741
 
742 742
 			// We allow for non-standard contexts.
743
-			switch( $val2 ) {
743
+			switch ( $val2 ) {
744 744
 				// Check for either single or edit
745 745
 				case 'singular':
746 746
 					$matching_contexts = array( 'single', 'edit' );
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
783 783
 				$json_val_1 = json_decode( $val1, true );
784 784
 				$json_val_2 = json_decode( $val2, true );
785 785
 
786
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
786
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
787 787
 
788 788
 					$json_in = false;
789 789
 					$json_val_1 = $json_val_1 ? $json_val_1 : array( $val1 );
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 						foreach ( $json_val_2 as $item_2 ) {
795 795
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
796 796
 
797
-							if( $json_in ) {
797
+							if ( $json_in ) {
798 798
 								break 2;
799 799
 							}
800 800
 						}
@@ -842,62 +842,62 @@  discard block
 block discarded – undo
842 842
 	public static function check_entry_display( $entry ) {
843 843
 
844 844
 		if ( ! $entry || is_wp_error( $entry ) ) {
845
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
845
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
846 846
 		}
847 847
 
848
-		if ( empty( $entry['form_id'] ) ) {
848
+		if ( empty( $entry[ 'form_id' ] ) ) {
849 849
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
850 850
 		}
851 851
 
852 852
 		$criteria = self::calculate_get_entries_criteria();
853 853
 
854
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
854
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
855 855
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
856 856
 			return $entry;
857 857
 		}
858 858
 
859 859
 		// Make sure the current View is connected to the same form as the Entry
860
-		if( ! empty( $criteria['context_view_id'] ) ) {
861
-			$context_view_id = intval( $criteria['context_view_id'] );
860
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
861
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
862 862
 			$context_form_id = gravityview_get_form_id( $context_view_id );
863
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
864
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
863
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
864
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
865 865
 			}
866 866
 		}
867 867
 
868
-		$search_criteria = $criteria['search_criteria'];
868
+		$search_criteria = $criteria[ 'search_criteria' ];
869 869
 
870 870
 		// check entry status
871
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
872
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
871
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
872
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
873 873
 		}
874 874
 
875 875
 		// check entry date
876 876
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
877 877
 
878 878
 		// field_filters
879
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
879
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
880 880
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
881 881
 			return $entry;
882 882
 		}
883 883
 
884
-		$filters = $search_criteria['field_filters'];
884
+		$filters = $search_criteria[ 'field_filters' ];
885 885
 
886
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
886
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
887 887
 
888 888
 		// Prevent the mode from being processed below
889
-		unset( $filters['mode'] );
889
+		unset( $filters[ 'mode' ] );
890 890
 
891
-		$form = self::get_form( $entry['form_id'] );
891
+		$form = self::get_form( $entry[ 'form_id' ] );
892 892
 
893 893
 		foreach ( $filters as $filter ) {
894 894
 
895
-			if ( ! isset( $filter['key'] ) ) {
895
+			if ( ! isset( $filter[ 'key' ] ) ) {
896 896
 				do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Filter key not set', $filter );
897 897
 				continue;
898 898
 			}
899 899
 
900
-			$k = $filter['key'];
900
+			$k = $filter[ 'key' ];
901 901
 
902 902
 			$field = self::get_field( $form, $k );
903 903
 
@@ -905,14 +905,14 @@  discard block
 block discarded – undo
905 905
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
906 906
 				$field = $k;
907 907
 			} else {
908
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
908
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
909 909
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
910 910
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? rgar( $field_value, $k ) : $field_value;
911 911
 			}
912 912
 
913
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
913
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
914 914
 
915
-			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
915
+			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
916 916
 
917 917
 			// Any match is all we need to know
918 918
 			if ( $is_value_match && 'any' === $mode ) {
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
 
922 922
 			// Any failed match is a total fail
923 923
 			if ( ! $is_value_match && 'all' === $mode ) {
924
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
924
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
925 925
 			}
926 926
 		}
927 927
 
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved: all conditions were met' );
932 932
 			return $entry;
933 933
 		} else {
934
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
934
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
935 935
 		}
936 936
 
937 937
 	}
@@ -972,18 +972,18 @@  discard block
 block discarded – undo
972 972
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
973 973
 		 * @see GFCommon::format_date() for original code
974 974
 		 */
975
-		$date_gmt_time   = mysql2date( 'G', $date_string );
975
+		$date_gmt_time = mysql2date( 'G', $date_string );
976 976
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
977 977
 
978
-		$format  = rgar( $atts, 'format' );
979
-		$is_human  = ! empty( $atts['human'] );
980
-		$is_diff  = ! empty( $atts['diff'] );
981
-		$is_raw = ! empty( $atts['raw'] );
982
-		$is_timestamp = ! empty( $atts['timestamp'] );
983
-		$include_time = ! empty( $atts['time'] );
978
+		$format = rgar( $atts, 'format' );
979
+		$is_human = ! empty( $atts[ 'human' ] );
980
+		$is_diff = ! empty( $atts[ 'diff' ] );
981
+		$is_raw = ! empty( $atts[ 'raw' ] );
982
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
983
+		$include_time = ! empty( $atts[ 'time' ] );
984 984
 
985 985
 		// If we're using time diff, we want to have a different default format
986
-		if( empty( $format ) ) {
986
+		if ( empty( $format ) ) {
987 987
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
988 988
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
989 989
 		}
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
 		// If raw was specified, don't modify the stored value
992 992
 		if ( $is_raw ) {
993 993
 			$formatted_date = $date_string;
994
-		} elseif( $is_timestamp ) {
994
+		} elseif ( $is_timestamp ) {
995 995
 			$formatted_date = $date_local_timestamp;
996 996
 		} elseif ( $is_diff ) {
997 997
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 
1026 1026
 		$label = rgar( $field, 'label' );
1027 1027
 
1028
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1028
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1029 1029
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1030 1030
 		}
1031 1031
 
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
1053 1053
 			$form = GFAPI::get_form( $form );
1054 1054
 		}
1055 1055
 
1056
-		if ( class_exists( 'GFFormsModel' ) ){
1056
+		if ( class_exists( 'GFFormsModel' ) ) {
1057 1057
 			return GFFormsModel::get_field( $form, $field_id );
1058 1058
 		} else {
1059 1059
 			return null;
@@ -1100,19 +1100,19 @@  discard block
 block discarded – undo
1100 1100
 			$shortcodes = array();
1101 1101
 
1102 1102
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1103
-			if ( empty( $matches ) ){
1103
+			if ( empty( $matches ) ) {
1104 1104
 				return false;
1105 1105
 			}
1106 1106
 
1107 1107
 			foreach ( $matches as $shortcode ) {
1108
-				if ( $tag === $shortcode[2] ) {
1108
+				if ( $tag === $shortcode[ 2 ] ) {
1109 1109
 
1110 1110
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1111
-					$shortcodes[] = $shortcode;
1111
+					$shortcodes[ ] = $shortcode;
1112 1112
 
1113
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1114
-					foreach( $results as $result ) {
1115
-						$shortcodes[] = $result;
1113
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1114
+					foreach ( $results as $result ) {
1115
+						$shortcodes[ ] = $result;
1116 1116
 					}
1117 1117
 				}
1118 1118
 			}
@@ -1256,7 +1256,7 @@  discard block
 block discarded – undo
1256 1256
 	public static function get_directory_fields( $post_id, $apply_filter = true ) {
1257 1257
 		$fields = get_post_meta( $post_id, '_gravityview_directory_fields', true );
1258 1258
 
1259
-		if( $apply_filter ) {
1259
+		if ( $apply_filter ) {
1260 1260
 			/**
1261 1261
 			 * @filter `gravityview/configuration/fields` Filter the View fields' configuration array
1262 1262
 			 * @since 1.6.5
@@ -1279,7 +1279,7 @@  discard block
 block discarded – undo
1279 1279
 	 * @return string         html
1280 1280
 	 */
1281 1281
 	public static function get_sortable_fields( $formid, $current = '' ) {
1282
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
1282
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
1283 1283
 
1284 1284
 		if ( empty( $formid ) ) {
1285 1285
 			return $output;
@@ -1292,11 +1292,11 @@  discard block
 block discarded – undo
1292 1292
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1293 1293
 
1294 1294
 			foreach ( $fields as $id => $field ) {
1295
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1295
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1296 1296
 					continue;
1297 1297
 				}
1298 1298
 
1299
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1299
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1300 1300
 			}
1301 1301
 		}
1302 1302
 
@@ -1331,9 +1331,9 @@  discard block
 block discarded – undo
1331 1331
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1332 1332
 
1333 1333
 		// TODO: Convert to using array_filter
1334
-		foreach( $fields as $id => $field ) {
1334
+		foreach ( $fields as $id => $field ) {
1335 1335
 
1336
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1336
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1337 1337
 				unset( $fields[ $id ] );
1338 1338
 			}
1339 1339
 		}
@@ -1374,14 +1374,14 @@  discard block
 block discarded – undo
1374 1374
 	 * @param  int|array  $field field key or field array
1375 1375
 	 * @return boolean
1376 1376
 	 */
1377
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1377
+	public static function is_field_numeric( $form = null, $field = '' ) {
1378 1378
 
1379 1379
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1380 1380
 			$form = self::get_form( $form );
1381 1381
 		}
1382 1382
 
1383 1383
 		// If entry meta, it's a string. Otherwise, numeric
1384
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1384
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1385 1385
 			$type = $field;
1386 1386
 		} else {
1387 1387
 			$type = self::get_field_type( $form, $field );
@@ -1395,9 +1395,9 @@  discard block
 block discarded – undo
1395 1395
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1396 1396
 
1397 1397
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1398
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1399
-			if( true === $gv_field->is_numeric ) {
1400
-				$numeric_types[] = $gv_field->is_numeric;
1398
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1399
+			if ( true === $gv_field->is_numeric ) {
1400
+				$numeric_types[ ] = $gv_field->is_numeric;
1401 1401
 			}
1402 1402
 		}
1403 1403
 
@@ -1547,18 +1547,18 @@  discard block
 block discarded – undo
1547 1547
 		$final_atts = array_filter( $final_atts );
1548 1548
 
1549 1549
 		// If the href wasn't passed as an attribute, use the value passed to the function
1550
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1551
-			$final_atts['href'] = $href;
1550
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1551
+			$final_atts[ 'href' ] = $href;
1552 1552
 		}
1553 1553
 
1554
-		$final_atts['href'] = esc_url_raw( $href );
1554
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1555 1555
 
1556 1556
 		/**
1557 1557
 		 * Fix potential security issue with target=_blank
1558 1558
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1559 1559
 		 */
1560
-		if( '_blank' === rgar( $final_atts, 'target' ) ) {
1561
-			$final_atts['rel'] = trim( rgar( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1560
+		if ( '_blank' === rgar( $final_atts, 'target' ) ) {
1561
+			$final_atts[ 'rel' ] = trim( rgar( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1562 1562
 		}
1563 1563
 
1564 1564
 		// Sort the attributes alphabetically, to help testing
@@ -1569,7 +1569,7 @@  discard block
 block discarded – undo
1569 1569
 		foreach ( $final_atts as $attr => $value ) {
1570 1570
 
1571 1571
 			// Don't use esc_attr() for JS atts because it will escape single quotes, which prevents inline JS
1572
-			if( in_array( $attr, array( 'onclick', 'onchange', 'onkeyup' ) ) ) {
1572
+			if ( in_array( $attr, array( 'onclick', 'onchange', 'onkeyup' ) ) ) {
1573 1573
 				$safe_text = wp_check_invalid_utf8( $value );
1574 1574
 				$safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
1575 1575
 			} else {
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 			$output .= sprintf( ' %s="%s"', $attr, $safe_text );
1580 1580
 		}
1581 1581
 
1582
-		if( '' !== $output ) {
1582
+		if ( '' !== $output ) {
1583 1583
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1584 1584
 		}
1585 1585
 
@@ -1606,7 +1606,7 @@  discard block
 block discarded – undo
1606 1606
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1607 1607
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1608 1608
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1609
-				$merged[] = $value;
1609
+				$merged[ ] = $value;
1610 1610
 			} else {
1611 1611
 				$merged[ $key ] = $value;
1612 1612
 			}
@@ -1639,7 +1639,7 @@  discard block
 block discarded – undo
1639 1639
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1640 1640
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1641 1641
 		 */
1642
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1642
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1643 1643
 
1644 1644
 		return get_users( $get_users_settings );
1645 1645
 	}
@@ -1659,11 +1659,11 @@  discard block
 block discarded – undo
1659 1659
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1660 1660
 
1661 1661
     	// If $cap is defined, only show notice if user has capability
1662
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1662
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1663 1663
     		return '';
1664 1664
 	    }
1665 1665
 
1666
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1666
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1667 1667
     }
1668 1668
 
1669 1669
 	/**
Please login to merge, or discard this patch.