Completed
Push — develop ( cb5b74...de6e74 )
by Zack
11:01
created
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   +113 added lines, -113 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
@@ -1570,7 +1570,7 @@  discard block
 block discarded – undo
1570 1570
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1571 1571
 		}
1572 1572
 
1573
-		if( '' !== $output ) {
1573
+		if ( '' !== $output ) {
1574 1574
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1575 1575
 		}
1576 1576
 
@@ -1597,7 +1597,7 @@  discard block
 block discarded – undo
1597 1597
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1598 1598
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1599 1599
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1600
-				$merged[] = $value;
1600
+				$merged[ ] = $value;
1601 1601
 			} else {
1602 1602
 				$merged[ $key ] = $value;
1603 1603
 			}
@@ -1630,7 +1630,7 @@  discard block
 block discarded – undo
1630 1630
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1631 1631
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1632 1632
 		 */
1633
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1633
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1634 1634
 
1635 1635
 		return get_users( $get_users_settings );
1636 1636
 	}
@@ -1650,11 +1650,11 @@  discard block
 block discarded – undo
1650 1650
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1651 1651
 
1652 1652
     	// If $cap is defined, only show notice if user has capability
1653
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1653
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1654 1654
     		return '';
1655 1655
 	    }
1656 1656
 
1657
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1657
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1658 1658
     }
1659 1659
 
1660 1660
 	/**
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.
class-gravityview-plugin-hooks-gravity-forms-dropbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	 */
46 46
 	function filter_file_path( $file_path = '', $file_path_info = array(), $field_settings = array() ) {
47 47
 
48
-		$file_path = str_replace('www.dropbox.com', 'dl.dropboxusercontent.com', $file_path );
48
+		$file_path = str_replace( 'www.dropbox.com', 'dl.dropboxusercontent.com', $file_path );
49 49
 		$file_path = str_replace( '?dl=0', '', $file_path );
50 50
 
51 51
 		return $file_path;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -24,16 +24,16 @@  discard block
 block discarded – undo
24 24
 
25 25
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 		$output_arr = array();
89 89
 
90 90
 		// Get an array of file paths for the field.
91
-		$file_paths = rgar( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
91
+		$file_paths = rgar( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
92 92
 
93 93
 		// The $value JSON was probably truncated; let's check lead_detail_long.
94 94
 		if ( ! is_array( $file_paths ) ) {
@@ -102,10 +102,10 @@  discard block
 block discarded – undo
102 102
 		}
103 103
 
104 104
 		// Process each file path
105
-		foreach( $file_paths as $file_path ) {
105
+		foreach ( $file_paths as $file_path ) {
106 106
 
107 107
 			// If the site is HTTPS, use HTTPS
108
-			if(function_exists('set_url_scheme')) { $file_path = set_url_scheme( $file_path ); }
108
+			if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); }
109 109
 
110 110
 			// This is from Gravity Forms's code
111 111
 			$file_path = esc_attr( str_replace( " ", "%20", $file_path ) );
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			$file_path_info = pathinfo( $file_path );
124 124
 
125 125
 			// If the field is set to link to the single entry, link to it.
126
-			$link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
126
+			$link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
127 127
 
128 128
 			$html_format = NULL;
129 129
 
@@ -132,30 +132,30 @@  discard block
 block discarded – undo
132 132
 			$disable_wrapped_link = false;
133 133
 
134 134
 			// Is this an image?
135
-			$image = new GravityView_Image(array(
135
+			$image = new GravityView_Image( array(
136 136
 				'src' => $file_path,
137
-				'class' => 'gv-image gv-field-id-'.$field_settings['id'],
138
-				'alt' => $field_settings['label'],
137
+				'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
138
+				'alt' => $field_settings[ 'label' ],
139 139
 				'width' => ( gravityview_get_context() === 'single' ? NULL : 250 )
140
-			));
140
+			) );
141 141
 
142 142
 			$content = $image->html();
143 143
 
144 144
 			// The new default content is the image, if it exists. If not, use the file name as the content.
145
-			$content = !empty( $content ) ? $content : $file_path_info['basename'];
145
+			$content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ];
146 146
 
147 147
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
148
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
148
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
149 149
 
150 150
 
151
-			switch( true ) {
151
+			switch ( true ) {
152 152
 
153 153
 				// Audio file
154 154
 				case in_array( $extension, wp_get_audio_extensions() ):
155 155
 
156 156
 					$disable_lightbox = true;
157 157
 
158
-					if( shortcode_exists( 'audio' ) ) {
158
+					if ( shortcode_exists( 'audio' ) ) {
159 159
 
160 160
 						$disable_wrapped_link = true;
161 161
 
@@ -166,8 +166,8 @@  discard block
 block discarded – undo
166 166
 						 */
167 167
 						$audio_settings = apply_filters( 'gravityview_audio_settings', array(
168 168
 							'src' => $file_path,
169
-							'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
170
-						));
169
+							'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
170
+						) );
171 171
 
172 172
 						/**
173 173
 						 * Generate the audio shortcode
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
 					$disable_lightbox = true;
187 187
 
188
-					if( shortcode_exists( 'video' ) ) {
188
+					if ( shortcode_exists( 'video' ) ) {
189 189
 
190 190
 						$disable_wrapped_link = true;
191 191
 
@@ -196,8 +196,8 @@  discard block
 block discarded – undo
196 196
 						 */
197 197
 						$video_settings = apply_filters( 'gravityview_video_settings', array(
198 198
 							'src' => $file_path,
199
-							'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
200
-						));
199
+							'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
200
+						) );
201 201
 
202 202
 						/**
203 203
 						 * Generate the video shortcode
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 					break;
220 220
 
221 221
 				// if not image, do not set the lightbox (@since 1.5.3)
222
-				case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
222
+				case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
223 223
 
224 224
 					$disable_lightbox = true;
225 225
 
@@ -229,10 +229,10 @@  discard block
 block discarded – undo
229 229
 
230 230
 			// If using Link to File, override the content.
231 231
 			// (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.)
232
-			if( !empty( $field_settings['link_to_file'] ) ) {
232
+			if ( ! empty( $field_settings[ 'link_to_file' ] ) ) {
233 233
 
234 234
 				// Force the content to be the file name
235
-				$content =  $file_path_info["basename"];
235
+				$content = $file_path_info[ "basename" ];
236 236
 
237 237
 				// Restore the wrapped link
238 238
 				$disable_wrapped_link = false;
@@ -240,13 +240,13 @@  discard block
 block discarded – undo
240 240
 			}
241 241
 
242 242
 			// Whether to use lightbox or not
243
-			if( $disable_lightbox || empty( $gravityview_view->atts['lightbox'] ) || !empty( $field_settings['show_as_link'] ) ) {
243
+			if ( $disable_lightbox || empty( $gravityview_view->atts[ 'lightbox' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) {
244 244
 
245
-				$link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array();
245
+				$link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array();
246 246
 
247 247
 			} else {
248 248
 
249
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
249
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
250 250
 
251 251
 				$link_atts = array(
252 252
 					'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ),
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $gravityview_view->getCurrentField() );
273 273
 
274 274
 			// If the HTML output hasn't been overridden by the switch statement above, use the default format
275
-			if( !empty( $content ) && empty( $disable_wrapped_link ) ) {
275
+			if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) {
276 276
 
277 277
 				/**
278 278
 				 * Modify the link text (defaults to the file name)
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
                 $content = gravityview_get_link( $link, $content, $link_atts );
288 288
 			}
289 289
 
290
-			$output_arr[] = array(
290
+			$output_arr[ ] = array(
291 291
 				'file_path' => $file_path,
292 292
 				'content' => $content
293 293
 			);
Please login to merge, or discard this patch.
includes/class-gravityview-roles-capabilities.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	public static function get_instance() {
35 35
 
36
-		if( ! self::$instance ) {
36
+		if ( ! self::$instance ) {
37 37
 			self::$instance = new self;
38 38
 		}
39 39
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
57 57
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
58 58
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
59
-        add_action( 'admin_init', array( $this, 'add_caps') );
59
+        add_action( 'admin_init', array( $this, 'add_caps' ) );
60 60
 	}
61 61
 
62 62
 
@@ -77,18 +77,18 @@  discard block
 block discarded – undo
77 77
 	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
78 78
 
79 79
 		// Empty caps_to_check array
80
-		if( ! $usercaps || ! $caps ) {
80
+		if ( ! $usercaps || ! $caps ) {
81 81
 			return $usercaps;
82 82
 		}
83 83
 
84 84
 		/**
85 85
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
86 86
 		 */
87
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
87
+		if ( ! empty( $usercaps[ 'gravityview_full_access' ] ) ) {
88 88
 
89 89
 			$all_gravityview_caps = self::all_caps();
90 90
 
91
-			foreach( $all_gravityview_caps as $gv_cap ) {
91
+			foreach ( $all_gravityview_caps as $gv_cap ) {
92 92
 				$usercaps[ $gv_cap ] = true;
93 93
 			}
94 94
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		$all = $administrator;
307 307
 
308 308
 		// If role is set, return caps_to_check for just that role.
309
-		if( $single_role ) {
309
+		if ( $single_role ) {
310 310
 			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
311 311
 			return $flat_array ? $caps : array( $single_role => $caps );
312 312
 		}
@@ -355,9 +355,9 @@  discard block
 block discarded – undo
355 355
 
356 356
 		if ( true === $allow_logged_out ) {
357 357
 
358
-			$all_caps = self::all_caps('editor');
358
+			$all_caps = self::all_caps( 'editor' );
359 359
 
360
-			if( array_intersect( $all_caps, (array) $caps_to_check ) ) {
360
+			if ( array_intersect( $all_caps, (array)$caps_to_check ) ) {
361 361
 				return true;
362 362
 			}
363 363
 		}
@@ -378,13 +378,13 @@  discard block
 block discarded – undo
378 378
 		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
379 379
 
380 380
 		foreach ( $caps_to_check as $cap ) {
381
-			if( ! is_null( $object_id ) ) {
381
+			if ( ! is_null( $object_id ) ) {
382 382
 				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
383 383
 			} else {
384 384
 				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
385 385
 			}
386 386
 			// At the first successful response, stop checking
387
-			if( $has_cap ) {
387
+			if ( $has_cap ) {
388 388
 				break;
389 389
 			}
390 390
 		}
@@ -408,15 +408,15 @@  discard block
 block discarded – undo
408 408
 		$all_gravityview_caps = self::all_caps();
409 409
 
410 410
 		// Are there any $caps_to_check that are from GravityView?
411
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
412
-			$caps_to_check[] = 'gravityview_full_access';
411
+		if ( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
412
+			$caps_to_check[ ] = 'gravityview_full_access';
413 413
 		}
414 414
 
415 415
 		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
416 416
 
417 417
 		// Are there any $caps_to_check that are from Gravity Forms?
418
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
419
-			$caps_to_check[] = 'gform_full_access';
418
+		if ( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
419
+			$caps_to_check[ ] = 'gform_full_access';
420 420
 		}
421 421
 
422 422
 		return array_unique( $caps_to_check );
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 			$capabilities = self::all_caps();
439 439
 
440 440
 			// Loop through each role and remove GV caps_to_check
441
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
441
+			foreach ( $wp_roles->get_names() as $role_slug => $role_name ) {
442 442
 				foreach ( $capabilities as $cap ) {
443 443
 					$wp_roles->remove_cap( $role_slug, $cap );
444 444
 				}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
 
43 43
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
44 44
 
45
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
45
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
46 46
 
47 47
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
48 48
 
49 49
 		// For the Delete Entry Link, you don't want visible to all users.
50
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
50
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
51 51
 
52 52
 		// Modify the field options based on the name of the field type
53 53
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 		// add template path to check for field
56 56
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
57 57
 
58
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
58
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 );
59 59
 
60
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
60
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
62 62
 	}
63 63
 
64 64
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	static function getInstance() {
71 71
 
72
-		if( empty( self::$instance ) ) {
72
+		if ( empty( self::$instance ) ) {
73 73
 			self::$instance = new self;
74 74
 		}
75 75
 
@@ -105,20 +105,20 @@  discard block
 block discarded – undo
105 105
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
106 106
 
107 107
 		// Always a link, never a filter
108
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
108
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
109 109
 
110 110
 		// Delete Entry link should only appear to visitors capable of editing entries
111
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
111
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
112 112
 
113
-		$add_option['delete_link'] = array(
113
+		$add_option[ 'delete_link' ] = array(
114 114
 			'type' => 'text',
115 115
 			'label' => __( 'Delete Link Text', 'gravityview' ),
116 116
 			'desc' => NULL,
117
-			'value' => __('Delete Entry', 'gravityview'),
117
+			'value' => __( 'Delete Entry', 'gravityview' ),
118 118
 			'merge_tags' => true,
119 119
 		);
120 120
 
121
-		$field_options['allow_edit_cap'] = array(
121
+		$field_options[ 'allow_edit_cap' ] = array(
122 122
 			'type' => 'select',
123 123
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
124 124
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
144 144
 
145
-		if( 'edit' !== $zone ) {
146
-			$entry_default_fields['delete_link'] = array(
145
+		if ( 'edit' !== $zone ) {
146
+			$entry_default_fields[ 'delete_link' ] = array(
147 147
 				'label' => __( 'Delete Entry', 'gravityview' ),
148 148
 				'type'  => 'delete_link',
149 149
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	 */
161 161
 	function add_available_field( $available_fields = array() ) {
162 162
 
163
-		$available_fields['delete_link'] = array(
163
+		$available_fields[ 'delete_link' ] = array(
164 164
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
165 165
 			'field_id' => 'delete_link',
166 166
 			'label_type' => 'field',
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
188 188
 		$caps = $visibility_caps;
189 189
 
190 190
 		// If we're configuring fields in the edit context, we want a limited selection
191
-		if( $field_id === 'delete_link' ) {
191
+		if ( $field_id === 'delete_link' ) {
192 192
 
193 193
 			// Remove other built-in caps.
194
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
194
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
195 195
 
196
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
196
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
197 197
 		}
198 198
 
199 199
 		return $caps;
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 * @param [type] $entry [description]
207 207
 	 */
208 208
 	function set_entry( $entry = null ) {
209
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
209
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
210 210
 	}
211 211
 
212 212
 	/**
@@ -236,13 +236,13 @@  discard block
 block discarded – undo
236 236
 
237 237
         $base = GravityView_API::directory_link( $post_id, true );
238 238
 
239
-		if( empty( $base ) ) {
240
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
239
+		if ( empty( $base ) ) {
240
+			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: ' . $post_id );
241 241
 			return NULL;
242 242
 		}
243 243
 
244 244
 		// Use the slug instead of the ID for consistent security
245
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
245
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
246 246
 
247 247
         $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
248 248
 
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
             'view_id' => $view_id,
254 254
 		), $base );
255 255
 
256
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
256
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
257 257
 
258 258
 		return $url;
259 259
 	}
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
271 271
 
272 272
 		// Only show the link to those who are allowed to see it.
273
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
273
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
274 274
 			return;
275 275
 		}
276 276
 
@@ -281,13 +281,13 @@  discard block
 block discarded – undo
281 281
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
282 282
 
283 283
 		// If the button is hidden by the filter, don't show.
284
-		if( !$show_delete_button ) {
284
+		if ( ! $show_delete_button ) {
285 285
 			return;
286 286
 		}
287 287
 
288 288
 		$attributes = array(
289 289
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
290
-			'tabindex' => ( GFCommon::$tab_index ++ ),
290
+			'tabindex' => ( GFCommon::$tab_index++ ),
291 291
 			'onclick' => self::get_confirm_dialog(),
292 292
 		);
293 293
 
@@ -311,27 +311,27 @@  discard block
 block discarded – undo
311 311
 	function process_delete() {
312 312
 
313 313
 		// If the form is submitted
314
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
314
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
315 315
 
316 316
 			// Make sure it's a GravityView request
317
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
317
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
318 318
 
319
-			if( ! $valid_nonce_key ) {
320
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
319
+			if ( ! $valid_nonce_key ) {
320
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
321 321
 				return;
322 322
 			}
323 323
 
324 324
 			// Get the entry slug
325
-			$entry_slug = esc_attr( $_GET['entry_id'] );
325
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
326 326
 
327 327
 			// See if there's an entry there
328 328
 			$entry = gravityview_get_entry( $entry_slug, true, false );
329 329
 
330
-			if( $entry ) {
330
+			if ( $entry ) {
331 331
 
332 332
 				$has_permission = $this->user_can_delete_entry( $entry );
333 333
 
334
-				if( is_wp_error( $has_permission ) ) {
334
+				if ( is_wp_error( $has_permission ) ) {
335 335
 
336 336
 					$messages = array(
337 337
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 					// Delete the entry
344 344
 					$delete_response = $this->delete_or_trash_entry( $entry );
345 345
 
346
-					if( is_wp_error( $delete_response ) ) {
346
+					if ( is_wp_error( $delete_response ) ) {
347 347
 
348 348
 						$messages = array(
349 349
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -362,10 +362,10 @@  discard block
 block discarded – undo
362 362
 
363 363
 			} else {
364 364
 
365
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
365
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug ' . $entry_slug );
366 366
 
367 367
 				$messages = array(
368
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
368
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
369 369
 					'status' => 'error',
370 370
 				);
371 371
 			}
@@ -405,18 +405,18 @@  discard block
 block discarded – undo
405 405
 	 */
406 406
 	private function delete_or_trash_entry( $entry ) {
407 407
 
408
-		$entry_id = $entry['id'];
408
+		$entry_id = $entry[ 'id' ];
409 409
 		
410 410
 		$mode = $this->get_delete_mode();
411 411
 
412
-		if( 'delete' === $mode ) {
412
+		if ( 'delete' === $mode ) {
413 413
 
414 414
 			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
415 415
 
416 416
 			// Delete the entry
417 417
 			$delete_response = GFAPI::delete_entry( $entry_id );
418 418
 
419
-			if( ! is_wp_error( $delete_response ) ) {
419
+			if ( ! is_wp_error( $delete_response ) ) {
420 420
 				$delete_response = 'deleted';
421 421
 
422 422
 				/**
@@ -437,8 +437,8 @@  discard block
 block discarded – undo
437 437
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
438 438
 			new GravityView_Cache;
439 439
 
440
-			if( ! $trashed ) {
441
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
440
+			if ( ! $trashed ) {
441
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
442 442
 			} else {
443 443
 
444 444
 				/**
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
470 470
 
471 471
 		// The entry had no connected post
472
-		if( empty( $entry['post_id'] ) ) {
472
+		if ( empty( $entry[ 'post_id' ] ) ) {
473 473
 			return;
474 474
 		}
475 475
 
@@ -480,22 +480,22 @@  discard block
 block discarded – undo
480 480
 		 */
481 481
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
482 482
 		
483
-		if( false === $delete_post ) {
483
+		if ( false === $delete_post ) {
484 484
 			return;
485 485
 		}
486 486
 
487 487
 		$action = current_action();
488 488
 
489
-		if( 'gravityview/delete-entry/deleted' === $action ) {
490
-			$result = wp_delete_post( $entry['post_id'], true );
489
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
490
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
491 491
 		} else {
492
-			$result = wp_trash_post( $entry['post_id'] );
492
+			$result = wp_trash_post( $entry[ 'post_id' ] );
493 493
 		}
494 494
 
495
-		if( false === $result ) {
496
-			do_action( 'gravityview_log_error', __METHOD__ . ' (called by '.$action.'): Error processing the Post connected to the entry.', $entry );
495
+		if ( false === $result ) {
496
+			do_action( 'gravityview_log_error', __METHOD__ . ' (called by ' . $action . '): Error processing the Post connected to the entry.', $entry );
497 497
 		} else {
498
-			do_action( 'gravityview_log_debug', __METHOD__ . ' (called by '.$action.'): Successfully processed Post connected to the entry.', $entry );
498
+			do_action( 'gravityview_log_debug', __METHOD__ . ' (called by ' . $action . '): Successfully processed Post connected to the entry.', $entry );
499 499
 		}
500 500
 	}
501 501
 
@@ -508,13 +508,13 @@  discard block
 block discarded – undo
508 508
 	public function verify_nonce() {
509 509
 
510 510
 		// No delete entry request was made
511
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
511
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
512 512
 			return false;
513 513
 		}
514 514
 
515
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
515
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
516 516
 
517
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
517
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
518 518
 
519 519
 		/**
520 520
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
 	 */
537 537
 	public static function get_confirm_dialog() {
538 538
 
539
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
539
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
540 540
 
541 541
 		/**
542 542
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 		 */
545 545
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
546 546
 
547
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
547
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
548 548
 	}
549 549
 
550 550
 	/**
@@ -562,16 +562,16 @@  discard block
 block discarded – undo
562 562
 
563 563
 		$error = NULL;
564 564
 
565
-		if( ! $this->verify_nonce() ) {
566
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
565
+		if ( ! $this->verify_nonce() ) {
566
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
567 567
 		}
568 568
 
569
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
570
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
569
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
570
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
571 571
 		}
572 572
 
573
-		if( $entry['status'] === 'trash' ) {
574
-			if( 'trash' === $this->get_delete_mode() ) {
573
+		if ( $entry[ 'status' ] === 'trash' ) {
574
+			if ( 'trash' === $this->get_delete_mode() ) {
575 575
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
576 576
 			} else {
577 577
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -579,11 +579,11 @@  discard block
 block discarded – undo
579 579
 		}
580 580
 
581 581
 		// No errors; everything's fine here!
582
-		if( empty( $error ) ) {
582
+		if ( empty( $error ) ) {
583 583
 			return true;
584 584
 		}
585 585
 
586
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
586
+		do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
587 587
 
588 588
 		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
589 589
 	}
@@ -605,32 +605,32 @@  discard block
 block discarded – undo
605 605
 
606 606
 		$current_user = wp_get_current_user();
607 607
 
608
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
608
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
609 609
 
610 610
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
611
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
611
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
612 612
 
613
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
613
+			do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
614 614
 
615 615
 			return true;
616 616
 		}
617 617
 
618 618
 
619 619
 		// If field options are passed, check if current user can view the link
620
-		if( !empty( $field ) ) {
620
+		if ( ! empty( $field ) ) {
621 621
 
622 622
 			// If capability is not defined, something is not right!
623
-			if( empty( $field['allow_edit_cap'] ) ) {
623
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
624 624
 
625 625
 				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
626 626
 
627 627
 				return false;
628 628
 			}
629 629
 
630
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
630
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
631 631
 
632 632
 				// Do not return true if cap is read, as we need to check if the current user created the entry
633
-				if( $field['allow_edit_cap'] !== 'read' ) {
633
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
634 634
 					return true;
635 635
 				}
636 636
 
@@ -643,9 +643,9 @@  discard block
 block discarded – undo
643 643
 
644 644
 		}
645 645
 
646
-		if( !isset( $entry['created_by'] ) ) {
646
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
647 647
 
648
-			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
648
+			do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.' );
649 649
 
650 650
 			return false;
651 651
 		}
@@ -653,24 +653,24 @@  discard block
 block discarded – undo
653 653
 		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
654 654
 
655 655
 		// Only checks user_delete view option if view is already set
656
-		if( $view_id ) {
656
+		if ( $view_id ) {
657 657
 
658 658
 			$current_view = gravityview_get_current_view_data( $view_id );
659 659
 
660
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
660
+			$user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false;
661 661
 
662
-			if( empty( $user_delete ) ) {
662
+			if ( empty( $user_delete ) ) {
663 663
 
664
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
664
+				do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
665 665
 
666 666
 				return false;
667 667
 			}
668 668
 		}
669 669
 
670 670
 		// If the logged-in user is the same as the user who created the entry, we're good.
671
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
671
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
672 672
 
673
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
673
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
674 674
 
675 675
 			return true;
676 676
 		}
@@ -693,31 +693,31 @@  discard block
 block discarded – undo
693 693
 	 */
694 694
 	public function display_message( $current_view_id = 0 ) {
695 695
 
696
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
696
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
697 697
 			return;
698 698
 		}
699 699
 
700 700
 		// Entry wasn't deleted from current View
701
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
701
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
702 702
 			return;
703 703
 		}
704 704
 
705
-		$status = esc_attr( $_GET['status'] );
706
-		$message_from_url = rgget('message');
705
+		$status = esc_attr( $_GET[ 'status' ] );
706
+		$message_from_url = rgget( 'message' );
707 707
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
708 708
 		$class = '';
709 709
 
710 710
 		switch ( $status ) {
711 711
 			case 'error':
712 712
 				$class = ' gv-error error';
713
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
713
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
714 714
 				$message = sprintf( $error_message, $message_from_url );
715 715
 				break;
716 716
 			case 'trashed':
717
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
717
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
718 718
 				break;
719 719
 			default:
720
-				$message = __('The entry was successfully deleted.', 'gravityview');
720
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
721 721
 				break;
722 722
 		}
723 723
 
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
732 732
 
733 733
 		// DISPLAY ERROR/SUCCESS MESSAGE
734
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
734
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
735 735
 	}
736 736
 
737 737
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 	$labels = array(
31 31
 		'cancel' => __( 'Cancel', 'gravityview' ),
32
-		'submit' => __( 'Update', 'gravityview')
32
+		'submit' => __( 'Update', 'gravityview' )
33 33
 	);
34 34
 
35 35
 	/**
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 	$update_tabindex  = GFCommon::get_tabindex();
46 46
 	$cancel_tabindex  = GFCommon::get_tabindex();
47 47
 	?>
48
-	<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels['submit'] ); ?>" name="save" />
48
+	<input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels[ 'submit' ] ); ?>" name="save" />
49 49
 
50
-	<a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels['cancel'] ); ?></a>
50
+	<a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels[ 'cancel' ] ); ?></a>
51 51
 	<?php
52 52
 
53 53
 	/**
@@ -61,5 +61,5 @@  discard block
 block discarded – undo
61 61
 
62 62
 	?>
63 63
 	<input type="hidden" name="action" value="update" />
64
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
64
+	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" />
65 65
 </div>
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	 */
18 18
 	function __construct() {
19 19
 
20
-		if( !GravityView_Compatibility::is_valid() ) { return; }
20
+		if ( ! GravityView_Compatibility::is_valid() ) { return; }
21 21
 
22 22
         self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
23 23
 
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	function initialize() {
37 37
 
38
-		add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ));
38
+		add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ) );
39 39
 
40
-		add_action( 'add_meta_boxes_gravityview' , array( $this, 'update_priority' ) );
40
+		add_action( 'add_meta_boxes_gravityview', array( $this, 'update_priority' ) );
41 41
 
42 42
 		// information box
43 43
 		add_action( 'post_submitbox_misc_actions', array( $this, 'render_shortcode_hint' ) );
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 	function update_priority() {
52 52
 		global $wp_meta_boxes;
53 53
 
54
-		if( ! empty( $wp_meta_boxes['gravityview'] ) ) {
55
-			foreach( array( 'high', 'core', 'low' ) as $position ) {
56
-				if( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
57
-					foreach( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
58
-						if( ! preg_match( '/^gravityview_/ism', $key ) ) {
59
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
60
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
54
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
55
+			foreach ( array( 'high', 'core', 'low' ) as $position ) {
56
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
57
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
58
+						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
59
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
60
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
61 61
 						}
62 62
 					}
63 63
 				}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		global $post;
70 70
 
71 71
 		// On Comment Edit, for example, $post isn't set.
72
-		if( empty( $post ) || !is_object( $post ) || !isset( $post->ID ) ) {
72
+		if ( empty( $post ) || ! is_object( $post ) || ! isset( $post->ID ) ) {
73 73
 			return;
74 74
 		}
75 75
 
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 		 */
153 153
 		$metaboxes = apply_filters( 'gravityview/metaboxes/default', $metaboxes );
154 154
 
155
-		foreach( $metaboxes as $m ) {
155
+		foreach ( $metaboxes as $m ) {
156 156
 
157
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
157
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
158 158
 
159 159
 			GravityView_Metabox_Tabs::add( $tab );
160 160
 
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
 
181 181
 		$links = GravityView_Admin_Views::get_connected_form_links( $current_form, false );
182 182
 
183
-		if( !empty( $links ) ) {
184
-			$links = '<span class="alignright gv-form-links">'. $links .'</span>';
183
+		if ( ! empty( $links ) ) {
184
+			$links = '<span class="alignright gv-form-links">' . $links . '</span>';
185 185
 		}
186 186
 
187 187
 		return __( 'Data Source', 'gravityview' ) . $links;
@@ -220,28 +220,28 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	public static function render_merge_tags_scripts( $curr_form ) {
222 222
 
223
-		if( empty( $curr_form )) {
223
+		if ( empty( $curr_form ) ) {
224 224
 			return NULL;
225 225
 		}
226 226
 
227 227
 		$form = gravityview_get_form( $curr_form );
228 228
 
229
-		$get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL;
229
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : NULL;
230 230
 
231
-		if( isset( $form['id'] ) ) {
232
-		    $form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
231
+		if ( isset( $form[ 'id' ] ) ) {
232
+		    $form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
233 233
 
234 234
 		    // The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
235
-		    $_GET['id'] = $form['id'];
235
+		    $_GET[ 'id' ] = $form[ 'id' ];
236 236
 
237 237
 		} else {
238 238
 		    $form_script = 'var form = new Form();';
239 239
 		}
240 240
 
241
-		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>';
241
+		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
242 242
 
243 243
 		// Restore previous $_GET setting
244
-		$_GET['id'] = $get_id_backup;
244
+		$_GET[ 'id' ] = $get_id_backup;
245 245
 
246 246
 		return $output;
247 247
 	}
@@ -297,12 +297,12 @@  discard block
 block discarded – undo
297 297
 		global $post;
298 298
 
299 299
 		// Only show this on GravityView post types.
300
-		if( false === gravityview_is_admin_page() ) {
300
+		if ( false === gravityview_is_admin_page() ) {
301 301
 			return;
302 302
 		}
303 303
 
304 304
 		// If the View hasn't been configured yet, don't show embed shortcode
305
-		if( ! gravityview_get_directory_fields( $post->ID ) && ! gravityview_get_directory_widgets( $post->ID ) ) {
305
+		if ( ! gravityview_get_directory_fields( $post->ID ) && ! gravityview_get_directory_widgets( $post->ID ) ) {
306 306
 			return;
307 307
 		}
308 308
 
Please login to merge, or discard this patch.