Completed
Pull Request — master (#1399)
by Gennady
08:24 queued 05:57
created
includes/extensions/edit-entry/class-edit-entry-locking.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 			return;
57 57
 		}
58 58
 
59
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET['gform_debug'] ) ? '' : '.min';
59
+		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET[ 'gform_debug' ] ) ? '' : '.min';
60 60
 		$locking_path = GFCommon::get_base_url() . '/includes/locking/';
61 61
 
62 62
 		wp_enqueue_script( 'gforms_locking', $locking_path . "js/locking{$min}.js", array( 'jquery', 'heartbeat' ), GFCommon::$version );
@@ -65,20 +65,20 @@  discard block
 block discarded – undo
65 65
 		$translations = array_map( 'wp_strip_all_tags', $this->get_strings() );
66 66
 
67 67
 		$strings = array(
68
-			'noResponse'    => $translations['no_response'],
69
-			'requestAgain'  => $translations['request_again'],
70
-			'requestError'  => $translations['request_error'],
71
-			'gainedControl' => $translations['gained_control'],
72
-			'rejected'      => $translations['request_rejected'],
73
-			'pending'       => $translations['request_pending'],
68
+			'noResponse'    => $translations[ 'no_response' ],
69
+			'requestAgain'  => $translations[ 'request_again' ],
70
+			'requestError'  => $translations[ 'request_error' ],
71
+			'gainedControl' => $translations[ 'gained_control' ],
72
+			'rejected'      => $translations[ 'request_rejected' ],
73
+			'pending'       => $translations[ 'request_pending' ],
74 74
 		);
75 75
 
76
-		$lock_user_id = $this->check_lock( $entry['id'] );
76
+		$lock_user_id = $this->check_lock( $entry[ 'id' ] );
77 77
 
78 78
 		$vars = array(
79 79
 			'hasLock'    => ! $lock_user_id ? 1 : 0,
80 80
 			'lockUI'     => $this->get_lock_ui( $lock_user_id ),
81
-			'objectID'   => $entry['id'],
81
+			'objectID'   => $entry[ 'id' ],
82 82
 			'objectType' => 'entry',
83 83
 			'strings'    => $strings,
84 84
 		);
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
 
207 207
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
208 208
 
209
-		if ( isset( $_GET['get-edit-lock'] ) ) {
209
+		if ( isset( $_GET[ 'get-edit-lock' ] ) ) {
210 210
 			$this->set_lock( $entry_id );
211 211
 			echo '<script>window.location = ' . json_encode( remove_query_arg( 'get-edit-lock', $current_url ) ) . ';</script>';
212 212
 			exit();
213
-		} else if ( isset( $_GET['release-edit-lock'] ) ) {
213
+		} else if ( isset( $_GET[ 'release-edit-lock' ] ) ) {
214 214
 			$this->delete_lock_meta( $entry_id );
215 215
 			$current_url = remove_query_arg( 'edit', $current_url );
216 216
 			echo '<script>window.location = ' . json_encode( remove_query_arg( 'release-edit-lock', $current_url ) ) . ';</script>';
Please login to merge, or discard this patch.
includes/class-gravityview-logging.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
 	function __construct() {
9 9
 
10
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
10
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
11 11
 
12
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
12
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
13 13
 
14 14
 		// Enable debug with Gravity Forms Logging Add-on
15 15
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
35 35
 		}
36 36
 
37
-		$panels[] = new GravityView_Debug_Bar;
37
+		$panels[ ] = new GravityView_Debug_Bar;
38 38
 
39 39
 		return $panels;
40 40
 	}
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param array $supported_plugins List of plugins
45 45
 	 */
46 46
 	public function enable_gform_logging( $supported_plugins ) {
47
-	    $supported_plugins['gravityview'] = 'GravityView';
47
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
48 48
 	    return $supported_plugins;
49 49
 	}
50 50
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @return string "print_r" or "var_export"
73 73
 	 */
74 74
 	static function get_print_function() {
75
-		if( ob_get_level() > 0 ) {
75
+		if ( ob_get_level() > 0 ) {
76 76
 			$function = 'var_export';
77 77
 		} else {
78 78
 			$function = 'print_r';
@@ -90,17 +90,17 @@  discard block
 block discarded – undo
90 90
 			'data' => $data,
91 91
 		);
92 92
 
93
-		if( !in_array( $notice, self::$notices ) ) {
94
-			self::$notices[] = $notice;
93
+		if ( ! in_array( $notice, self::$notices ) ) {
94
+			self::$notices[ ] = $notice;
95 95
 		}
96 96
 
97
-		if ( class_exists("GFLogging") ) {
97
+		if ( class_exists( "GFLogging" ) ) {
98 98
 			GFLogging::include_logger();
99
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
99
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
100 100
 	    }
101 101
 	}
102 102
 
103
-	static function log_error( $message = '', $data = null  ) {
103
+	static function log_error( $message = '', $data = null ) {
104 104
 
105 105
 		$function = self::get_print_function();
106 106
 
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
111 111
 		);
112 112
 
113
-		if( !in_array( $error, self::$errors ) ) {
114
-			self::$errors[] = $error;
113
+		if ( ! in_array( $error, self::$errors ) ) {
114
+			self::$errors[ ] = $error;
115 115
 		}
116 116
 
117
-		if ( class_exists("GFLogging") ) {
117
+		if ( class_exists( "GFLogging" ) ) {
118 118
 		    GFLogging::include_logger();
119
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ( $error, true), KLogger::ERROR );
119
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $error, true ), KLogger::ERROR );
120 120
 		}
121 121
 	}
122 122
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	static function is_logging_active( $plugin = 'gravityview' ) {
135 135
 
136
-		if( ! class_exists( 'GFLogging') ) {
136
+		if ( ! class_exists( 'GFLogging' ) ) {
137 137
 			return false;
138 138
 		}
139 139
 
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 */
247 247
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
248 248
 
249
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
249
+		$base = GravityView_API::directory_link( $post_id ? : $view_id, true );
250 250
 
251 251
 		if ( empty( $base ) ) {
252 252
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			'action'	=> 'duplicate',
258 258
 			'entry_id'	=> $entry['id'],
259 259
 			'gvid' => $view_id,
260
-            'view_id' => $view_id,
260
+			'view_id' => $view_id,
261 261
 		), $base );
262 262
 
263 263
 		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 		 * @since 2.5
461 461
 		 * @param  array $duplicated_entry The duplicated entry
462 462
 		 * @param  array $entry The original entry
463
-		*/
463
+		 */
464 464
 		do_action( 'gravityview/duplicate-entry/duplicated', $duplicated_entry, $entry );
465 465
 
466 466
 		gravityview()->log->debug( 'Duplicate response: {duplicate_response}', array( 'duplicate_response' => $duplicate_response ) );
Please login to merge, or discard this patch.
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -115,12 +115,12 @@  discard block
 block discarded – undo
115 115
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
116 116
 
117 117
 		// Always a link, never a filter, always same window
118
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
118
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
119 119
 
120 120
 		// Duplicate Entry link should only appear to visitors capable of editing entries
121
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
121
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
122 122
 
123
-		$add_option['duplicate_link'] = array(
123
+		$add_option[ 'duplicate_link' ] = array(
124 124
 			'type' => 'text',
125 125
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
126 126
 			'desc' => NULL,
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			'merge_tags' => true,
129 129
 		);
130 130
 
131
-		$field_options['allow_duplicate_cap'] = array(
131
+		$field_options[ 'allow_duplicate_cap' ] = array(
132 132
 			'type' => 'select',
133 133
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
134 134
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
156 156
 
157 157
 		if ( 'edit' !== $zone ) {
158
-			$entry_default_fields['duplicate_link'] = array(
158
+			$entry_default_fields[ 'duplicate_link' ] = array(
159 159
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
160 160
 				'type'  => 'duplicate_link',
161 161
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 */
177 177
 	public function add_available_field( $available_fields = array() ) {
178 178
 
179
-		$available_fields['duplicate_link'] = array(
179
+		$available_fields[ 'duplicate_link' ] = array(
180 180
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
181 181
 			'field_id' => 'duplicate_link',
182 182
 			'label_type' => 'field',
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
 		if ( 'duplicate_link' === $field_id ) {
210 210
 
211 211
 			// Remove other built-in caps.
212
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
212
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
213 213
 
214
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
214
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
215 215
 		}
216 216
 
217 217
 		return $caps;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 */
247 247
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
248 248
 
249
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
249
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
250 250
 
251 251
 		if ( empty( $base ) ) {
252 252
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -255,12 +255,12 @@  discard block
 block discarded – undo
255 255
 
256 256
 		$actionurl = add_query_arg( array(
257 257
 			'action'	=> 'duplicate',
258
-			'entry_id'	=> $entry['id'],
258
+			'entry_id'	=> $entry[ 'id' ],
259 259
 			'gvid' => $view_id,
260 260
             'view_id' => $view_id,
261 261
 		), $base );
262 262
 
263
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
263
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
264 264
 	}
265 265
 
266 266
 	/**
@@ -281,12 +281,12 @@  discard block
 block discarded – undo
281 281
 	public function process_duplicate() {
282 282
 
283 283
 		// If the form is submitted
284
-		if ( ( ! isset( $_GET['action'] ) ) || 'duplicate' !== $_GET['action'] || ( ! isset( $_GET['entry_id'] ) ) ) {
284
+		if ( ( ! isset( $_GET[ 'action' ] ) ) || 'duplicate' !== $_GET[ 'action' ] || ( ! isset( $_GET[ 'entry_id' ] ) ) ) {
285 285
 			return;
286 286
 		}
287 287
 
288 288
 		// Make sure it's a GravityView request
289
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
289
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
290 290
 
291 291
 		if ( ! $valid_nonce_key ) {
292 292
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 		}
295 295
 
296 296
 		// Get the entry slug
297
-		$entry_slug = esc_attr( $_GET['entry_id'] );
297
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
298 298
 
299 299
 		// See if there's an entry there
300 300
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -388,15 +388,15 @@  discard block
 block discarded – undo
388 388
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
389 389
 		}
390 390
 
391
-		$row['id'] = null;
392
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
393
-		$row['date_updated'] = $row['date_created'];
394
-		$row['is_starred'] = false;
395
-		$row['is_read'] = false;
396
-		$row['ip'] = GFFormsModel::get_ip();
397
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
398
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
399
-		$row['created_by'] = wp_get_current_user()->ID;
391
+		$row[ 'id' ] = null;
392
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
393
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
394
+		$row[ 'is_starred' ] = false;
395
+		$row[ 'is_read' ] = false;
396
+		$row[ 'ip' ] = GFFormsModel::get_ip();
397
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
398
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
399
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
400 400
 
401 401
 		/**
402 402
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -424,15 +424,15 @@  discard block
 block discarded – undo
424 424
 
425 425
 		$save_this_meta = array();
426 426
 		foreach ( $duplicate_meta->get_output() as $m ) {
427
-			$save_this_meta[] = array(
428
-				'meta_key' => $m['meta_key'],
429
-				'meta_value' => $m['meta_value'],
430
-				'item_index' => $m['item_index'],
427
+			$save_this_meta[ ] = array(
428
+				'meta_key' => $m[ 'meta_key' ],
429
+				'meta_value' => $m[ 'meta_value' ],
430
+				'item_index' => $m[ 'item_index' ],
431 431
 			);
432 432
 		}
433 433
 
434 434
 		// Update the row ID for later usage
435
-		$row['id'] = $duplicated_id;
435
+		$row[ 'id' ] = $duplicated_id;
436 436
 
437 437
 		/**
438 438
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
443 443
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
444 444
 
445 445
 		foreach ( $save_this_meta as $data ) {
446
-			$data['form_id'] = $entry['form_id'];
447
-			$data['entry_id'] = $duplicated_id;
446
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
447
+			$data[ 'entry_id' ] = $duplicated_id;
448 448
 
449 449
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
450 450
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -478,13 +478,13 @@  discard block
 block discarded – undo
478 478
 	public function verify_nonce() {
479 479
 
480 480
 		// No duplicate entry request was made
481
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
481
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
482 482
 			return false;
483 483
 		}
484 484
 
485
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
485
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
486 486
 
487
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
487
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
488 488
 
489 489
 		/**
490 490
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 			return '';
521 521
 		}
522 522
 
523
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
523
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
524 524
 	}
525 525
 
526 526
 	/**
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
575 575
 		$current_user = wp_get_current_user();
576 576
 
577
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
577
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
578 578
 
579 579
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
580 580
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -589,17 +589,17 @@  discard block
 block discarded – undo
589 589
 		if ( ! empty( $field ) ) {
590 590
 
591 591
 			// If capability is not defined, something is not right!
592
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
592
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
593 593
 
594 594
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
595 595
 
596 596
 				return false;
597 597
 			}
598 598
 
599
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
599
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
600 600
 
601 601
 				// Do not return true if cap is read, as we need to check if the current user created the entry
602
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
602
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
603 603
 					return true;
604 604
 				}
605 605
 
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 
613 613
 		}
614 614
 
615
-		if ( ! isset( $entry['created_by'] ) ) {
615
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
616 616
 
617 617
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
618 618
 
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 		}
638 638
 
639 639
 		// If the logged-in user is the same as the user who created the entry, we're good.
640
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
640
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
641 641
 
642 642
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
643 643
 
@@ -661,12 +661,12 @@  discard block
 block discarded – undo
661 661
 	 * @return void
662 662
 	 */
663 663
 	public function maybe_display_message( $current_view_id = 0 ) {
664
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
664
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
665 665
 			return;
666 666
 		}
667 667
 
668 668
 		// Entry wasn't duplicated from current View
669
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
669
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
670 670
 			return;
671 671
 		}
672 672
 
@@ -674,11 +674,11 @@  discard block
 block discarded – undo
674 674
 	}
675 675
 
676 676
 	public function display_message() {
677
-		if ( empty( $_GET['status'] ) || empty( $_GET['duplicate'] ) ) {
677
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
678 678
 			return;
679 679
 		}
680 680
 
681
-		$status = esc_attr( $_GET['status'] );
681
+		$status = esc_attr( $_GET[ 'status' ] );
682 682
 		$message_from_url = \GV\Utils::_GET( 'message' );
683 683
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
684 684
 		$class = '';
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
705 705
 
706 706
 		// DISPLAY ERROR/SUCCESS MESSAGE
707
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
707
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
708 708
 	}
709 709
 
710 710
 	/**
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
 		?>
736 736
 		<span class="gv-duplicate">
737 737
 			|
738
-			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry['id'] ), self::get_nonce_key( $entry['id'] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
738
+			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry[ 'id' ] ), self::get_nonce_key( $entry[ 'id' ] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
739 739
 		</span>
740 740
 		<?php
741 741
 	}
@@ -757,9 +757,9 @@  discard block
 block discarded – undo
757 757
 
758 758
 		if ( 'success' === \GV\Utils::_GET( 'result' ) ) {
759 759
 			add_filter( 'gform_admin_messages', function( $messages ) {
760
-				$messages = (array) $messages;
760
+				$messages = (array)$messages;
761 761
 
762
-				$messages[] = esc_html__( 'Entry duplicated.', 'gravityview' );
762
+				$messages[ ] = esc_html__( 'Entry duplicated.', 'gravityview' );
763 763
 				return $messages;
764 764
 			} );
765 765
 		}
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
 
771 771
 			$check_logs_message = '';
772 772
 
773
-			if( $is_logging_active ) {
773
+			if ( $is_logging_active ) {
774 774
 				$check_logs_message = sprintf( ' <a href="%s">%s</a>',
775 775
 					esc_url( admin_url( 'admin.php?page=gf_settings&subview=gravityformslogging' ) ),
776 776
 					esc_html_x( 'Check the GravityView logs for more information.', 'Error message links to logging page', 'gravityview' )
@@ -778,9 +778,9 @@  discard block
 block discarded – undo
778 778
 			}
779 779
 
780 780
 			add_filter( 'gform_admin_error_messages', function( $messages ) use ( $check_logs_message ) {
781
-				$messages = (array) $messages;
781
+				$messages = (array)$messages;
782 782
 
783
-				$messages[] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
783
+				$messages[ ] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
784 784
 
785 785
 				return $messages;
786 786
 			} );
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +73 added lines, -73 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, 'maybe_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, 4 );
58
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 4 );
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
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
64 64
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	static function getInstance() {
73 73
 
74
-		if( empty( self::$instance ) ) {
74
+		if ( empty( self::$instance ) ) {
75 75
 			self::$instance = new self;
76 76
 		}
77 77
 
@@ -151,20 +151,20 @@  discard block
 block discarded – undo
151 151
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
152 152
 
153 153
 		// Always a link, never a filter
154
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
154
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
155 155
 
156 156
 		// Delete Entry link should only appear to visitors capable of editing entries
157
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
157
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
158 158
 
159
-		$add_option['delete_link'] = array(
159
+		$add_option[ 'delete_link' ] = array(
160 160
 			'type' => 'text',
161 161
 			'label' => __( 'Delete Link Text', 'gravityview' ),
162 162
 			'desc' => NULL,
163
-			'value' => __('Delete Entry', 'gravityview'),
163
+			'value' => __( 'Delete Entry', 'gravityview' ),
164 164
 			'merge_tags' => true,
165 165
 		);
166 166
 
167
-		$field_options['allow_edit_cap'] = array(
167
+		$field_options[ 'allow_edit_cap' ] = array(
168 168
 			'type' => 'select',
169 169
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
170 170
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
190 190
 
191
-		if( 'edit' !== $zone ) {
192
-			$entry_default_fields['delete_link'] = array(
191
+		if ( 'edit' !== $zone ) {
192
+			$entry_default_fields[ 'delete_link' ] = array(
193 193
 				'label' => __( 'Delete Entry', 'gravityview' ),
194 194
 				'type'  => 'delete_link',
195 195
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	function add_available_field( $available_fields = array() ) {
208 208
 
209
-		$available_fields['delete_link'] = array(
209
+		$available_fields[ 'delete_link' ] = array(
210 210
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
211 211
 			'field_id' => 'delete_link',
212 212
 			'label_type' => 'field',
@@ -234,12 +234,12 @@  discard block
 block discarded – undo
234 234
 		$caps = $visibility_caps;
235 235
 
236 236
 		// If we're configuring fields in the edit context, we want a limited selection
237
-		if( $field_id === 'delete_link' ) {
237
+		if ( $field_id === 'delete_link' ) {
238 238
 
239 239
 			// Remove other built-in caps.
240
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
240
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
241 241
 
242
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
242
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
243 243
 		}
244 244
 
245 245
 		return $caps;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @param [type] $entry [description]
253 253
 	 */
254 254
 	function set_entry( $entry = null ) {
255
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
255
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
256 256
 	}
257 257
 
258 258
 	/**
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 
286 286
 		self::getInstance()->set_entry( $entry );
287 287
 
288
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
288
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
289 289
 
290 290
 		if ( empty( $base ) ) {
291 291
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		}
294 294
 
295 295
 		// Use the slug instead of the ID for consistent security
296
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
296
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
297 297
 
298 298
 		$actionurl = add_query_arg( array(
299 299
 			'action'	=> 'delete',
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
             'view_id' => $view_id,
303 303
 		), $base );
304 304
 
305
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
305
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
306 306
 
307 307
 		return $url;
308 308
 	}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) {
325 325
 
326 326
 		// Only show the link to those who are allowed to see it.
327
-		if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
327
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
328 328
 			return;
329 329
 		}
330 330
 
@@ -335,13 +335,13 @@  discard block
 block discarded – undo
335 335
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
336 336
 
337 337
 		// If the button is hidden by the filter, don't show.
338
-		if( !$show_delete_button ) {
338
+		if ( ! $show_delete_button ) {
339 339
 			return;
340 340
 		}
341 341
 
342 342
 		$attributes = array(
343 343
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
344
-			'tabindex' => ( GFCommon::$tab_index ++ ),
344
+			'tabindex' => ( GFCommon::$tab_index++ ),
345 345
 			'onclick' => self::get_confirm_dialog(),
346 346
 		);
347 347
 
@@ -365,27 +365,27 @@  discard block
 block discarded – undo
365 365
 	function process_delete() {
366 366
 
367 367
 		// If the form is submitted
368
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
368
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
369 369
 
370 370
 			// Make sure it's a GravityView request
371
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
371
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
372 372
 
373
-			if( ! $valid_nonce_key ) {
373
+			if ( ! $valid_nonce_key ) {
374 374
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
375 375
 				return;
376 376
 			}
377 377
 
378 378
 			// Get the entry slug
379
-			$entry_slug = esc_attr( $_GET['entry_id'] );
379
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
380 380
 
381 381
 			// See if there's an entry there
382 382
 			$entry = gravityview_get_entry( $entry_slug, true, false );
383 383
 
384
-			if( $entry ) {
384
+			if ( $entry ) {
385 385
 
386 386
 				$has_permission = $this->user_can_delete_entry( $entry, \GV\Utils::_GET( 'gvid', \GV\Utils::_GET( 'view_id' ) ) );
387 387
 
388
-				if( is_wp_error( $has_permission ) ) {
388
+				if ( is_wp_error( $has_permission ) ) {
389 389
 
390 390
 					$messages = array(
391 391
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 					// Delete the entry
398 398
 					$delete_response = $this->delete_or_trash_entry( $entry );
399 399
 
400
-					if( is_wp_error( $delete_response ) ) {
400
+					if ( is_wp_error( $delete_response ) ) {
401 401
 
402 402
 						$messages = array(
403 403
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 				gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) );
420 420
 
421 421
 				$messages = array(
422
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
422
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
423 423
 					'status' => 'error',
424 424
 				);
425 425
 			}
@@ -459,18 +459,18 @@  discard block
 block discarded – undo
459 459
 	 */
460 460
 	private function delete_or_trash_entry( $entry ) {
461 461
 
462
-		$entry_id = $entry['id'];
462
+		$entry_id = $entry[ 'id' ];
463 463
 		
464 464
 		$mode = $this->get_delete_mode();
465 465
 
466
-		if( 'delete' === $mode ) {
466
+		if ( 'delete' === $mode ) {
467 467
 
468 468
 			gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) );
469 469
 
470 470
 			// Delete the entry
471 471
 			$delete_response = GFAPI::delete_entry( $entry_id );
472 472
 
473
-			if( ! is_wp_error( $delete_response ) ) {
473
+			if ( ! is_wp_error( $delete_response ) ) {
474 474
 				$delete_response = 'deleted';
475 475
 
476 476
 				/**
@@ -491,8 +491,8 @@  discard block
 block discarded – undo
491 491
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
492 492
 			new GravityView_Cache;
493 493
 
494
-			if( ! $trashed ) {
495
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
494
+			if ( ! $trashed ) {
495
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
496 496
 			} else {
497 497
 
498 498
 				/**
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
524 524
 
525 525
 		// The entry had no connected post
526
-		if( empty( $entry['post_id'] ) ) {
526
+		if ( empty( $entry[ 'post_id' ] ) ) {
527 527
 			return;
528 528
 		}
529 529
 
@@ -534,19 +534,19 @@  discard block
 block discarded – undo
534 534
 		 */
535 535
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
536 536
 		
537
-		if( false === $delete_post ) {
537
+		if ( false === $delete_post ) {
538 538
 			return;
539 539
 		}
540 540
 
541 541
 		$action = current_action();
542 542
 
543
-		if( 'gravityview/delete-entry/deleted' === $action ) {
544
-			$result = wp_delete_post( $entry['post_id'], true );
543
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
544
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
545 545
 		} else {
546
-			$result = wp_trash_post( $entry['post_id'] );
546
+			$result = wp_trash_post( $entry[ 'post_id' ] );
547 547
 		}
548 548
 
549
-		if( false === $result ) {
549
+		if ( false === $result ) {
550 550
 			gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
551 551
 		} else {
552 552
 			gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
@@ -562,13 +562,13 @@  discard block
 block discarded – undo
562 562
 	public function verify_nonce() {
563 563
 
564 564
 		// No delete entry request was made
565
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
565
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
566 566
 			return false;
567 567
 		}
568 568
 
569
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
569
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
570 570
 
571
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
571
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
572 572
 
573 573
 		/**
574 574
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 	 */
591 591
 	public static function get_confirm_dialog() {
592 592
 
593
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
593
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
594 594
 
595 595
 		/**
596 596
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 		 */
599 599
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
600 600
 
601
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
601
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
602 602
 	}
603 603
 
604 604
 	/**
@@ -616,16 +616,16 @@  discard block
 block discarded – undo
616 616
 
617 617
 		$error = NULL;
618 618
 
619
-		if( ! $this->verify_nonce() ) {
620
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
619
+		if ( ! $this->verify_nonce() ) {
620
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
621 621
 		}
622 622
 
623
-		if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
624
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
623
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
624
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
625 625
 		}
626 626
 
627
-		if( $entry['status'] === 'trash' ) {
628
-			if( 'trash' === $this->get_delete_mode() ) {
627
+		if ( $entry[ 'status' ] === 'trash' ) {
628
+			if ( 'trash' === $this->get_delete_mode() ) {
629 629
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
630 630
 			} else {
631 631
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 		}
634 634
 
635 635
 		// No errors; everything's fine here!
636
-		if( empty( $error ) ) {
636
+		if ( empty( $error ) ) {
637 637
 			return true;
638 638
 		}
639 639
 
@@ -661,17 +661,17 @@  discard block
 block discarded – undo
661 661
 			$view = \GV\View::by_id( $view_id );
662 662
 		} else {
663 663
 			if ( ! $view instanceof \GV\View ) {
664
-				$view = \GV\View::by_id ( $view );
664
+				$view = \GV\View::by_id( $view );
665 665
 			}
666 666
 			$view_id = $view->ID;
667 667
 		}
668 668
 
669 669
 		$current_user = wp_get_current_user();
670 670
 
671
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
671
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
672 672
 
673 673
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
674
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
674
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
675 675
 
676 676
 			gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
677 677
 
@@ -680,20 +680,20 @@  discard block
 block discarded – undo
680 680
 
681 681
 
682 682
 		// If field options are passed, check if current user can view the link
683
-		if( !empty( $field ) ) {
683
+		if ( ! empty( $field ) ) {
684 684
 
685 685
 			// If capability is not defined, something is not right!
686
-			if( empty( $field['allow_edit_cap'] ) ) {
686
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
687 687
 
688 688
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
689 689
 
690 690
 				return false;
691 691
 			}
692 692
 
693
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
693
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
694 694
 
695 695
 				// Do not return true if cap is read, as we need to check if the current user created the entry
696
-				if( $field['allow_edit_cap'] !== 'read' ) {
696
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
697 697
 					return true;
698 698
 				}
699 699
 
@@ -706,9 +706,9 @@  discard block
 block discarded – undo
706 706
 
707 707
 		}
708 708
 
709
-		if( !isset( $entry['created_by'] ) ) {
709
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
710 710
 
711
-			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
711
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
712 712
 
713 713
 			return false;
714 714
 		}
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
 		}
723 723
 
724 724
 		// If the logged-in user is the same as the user who created the entry, we're good.
725
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
725
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
726 726
 
727 727
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
728 728
 
@@ -746,12 +746,12 @@  discard block
 block discarded – undo
746 746
 	 * @return void
747 747
 	 */
748 748
 	public function maybe_display_message( $current_view_id = 0 ) {
749
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
749
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
750 750
 			return;
751 751
 		}
752 752
 
753 753
 		// Entry wasn't deleted from current View
754
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
754
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
755 755
 			return;
756 756
 		}
757 757
 
@@ -760,11 +760,11 @@  discard block
 block discarded – undo
760 760
 
761 761
 	public function display_message() {
762 762
 
763
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
763
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
764 764
 			return;
765 765
 		}
766 766
 
767
-		$status = esc_attr( $_GET['status'] );
767
+		$status = esc_attr( $_GET[ 'status' ] );
768 768
 		$message_from_url = \GV\Utils::_GET( 'message' );
769 769
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
770 770
 		$class = '';
@@ -772,14 +772,14 @@  discard block
 block discarded – undo
772 772
 		switch ( $status ) {
773 773
 			case 'error':
774 774
 				$class = ' gv-error error';
775
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
775
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
776 776
 				$message = sprintf( $error_message, $message_from_url );
777 777
 				break;
778 778
 			case 'trashed':
779
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
779
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
780 780
 				break;
781 781
 			default:
782
-				$message = __('The entry was successfully deleted.', 'gravityview');
782
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
783 783
 				break;
784 784
 		}
785 785
 
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
794 794
 
795 795
 		// DISPLAY ERROR/SUCCESS MESSAGE
796
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
796
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
797 797
 	}
798 798
 
799 799
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 2 patches
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
58
+        if ( empty( self::$instance ) ) {
59 59
             self::$instance = new GravityView_Edit_Entry;
60 60
         }
61 61
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     private function add_hooks() {
82 82
 
83 83
         // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
85 85
 
86 86
         // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
88 88
 
89 89
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	private function addon_specific_hooks() {
103 103
 
104
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
104
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
106 106
 		}
107 107
 
108 108
 	}
@@ -192,15 +192,15 @@  discard block
 block discarded – undo
192 192
      */
193 193
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
194 194
 
195
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
195
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
196 196
 
197
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
197
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
198 198
 
199 199
         $url = add_query_arg( array(
200 200
             'edit' => wp_create_nonce( $nonce_key )
201 201
         ), $base );
202 202
 
203
-        if( $post_id ) {
203
+        if ( $post_id ) {
204 204
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
205 205
         }
206 206
 
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 	     * Allow passing params to dynamically populate entry with values
209 209
 	     * @since 1.9.2
210 210
 	     */
211
-	    if( !empty( $field_values ) ) {
211
+	    if ( ! empty( $field_values ) ) {
212 212
 
213
-		    if( is_array( $field_values ) ) {
213
+		    if ( is_array( $field_values ) ) {
214 214
 			    // If already an array, no parse_str() needed
215 215
 			    $params = $field_values;
216 216
 		    } else {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		 * @param array $entry The entry.
227 227
 		 * @param \GV\View $view The View.
228 228
 		 */
229
-		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
229
+		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id ) );
230 230
     }
231 231
 
232 232
 	/**
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 */
238 238
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
239 239
 
240
-		if( empty( $context ) || $context !== 'edit' ) {
240
+		if ( empty( $context ) || $context !== 'edit' ) {
241 241
 			return $fields;
242 242
 		}
243 243
 
@@ -315,15 +315,15 @@  discard block
 block discarded – undo
315 315
         // If they can edit any entries (as defined in Gravity Forms)
316 316
         // Or if they can edit other people's entries
317 317
         // Then we're good.
318
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
318
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
319 319
 
320 320
             gravityview()->log->debug( 'User has ability to edit all entries.' );
321 321
 
322 322
             $user_can_edit = true;
323 323
 
324
-        } else if( !isset( $entry['created_by'] ) ) {
324
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
325 325
 
326
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
326
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
327 327
 
328 328
             $user_can_edit = false;
329 329
 
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
             $current_user = wp_get_current_user();
334 334
 
335 335
             // User edit is disabled
336
-            if( empty( $user_edit ) ) {
336
+            if ( empty( $user_edit ) ) {
337 337
 
338 338
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
339 339
 
@@ -341,13 +341,13 @@  discard block
 block discarded – undo
341 341
             }
342 342
 
343 343
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
344
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
344
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
345 345
 
346 346
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
347 347
 
348 348
                 $user_can_edit = true;
349 349
 
350
-            } else if( ! is_user_logged_in() ) {
350
+            } else if ( ! is_user_logged_in() ) {
351 351
 
352 352
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
353 353
             }
Please login to merge, or discard this patch.
Indentation   +156 added lines, -156 removed lines patch added patch discarded remove patch
@@ -18,83 +18,83 @@  discard block
 block discarded – undo
18 18
 
19 19
 class GravityView_Edit_Entry {
20 20
 
21
-    /**
22
-     * @var string
23
-     */
21
+	/**
22
+	 * @var string
23
+	 */
24 24
 	static $file;
25 25
 
26 26
 	static $instance;
27 27
 
28
-    /**
29
-     * Component instances.
30
-     * @var array
31
-     */
32
-    public $instances = array();
28
+	/**
29
+	 * Component instances.
30
+	 * @var array
31
+	 */
32
+	public $instances = array();
33 33
 
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+		self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
41
-        }
39
+		if( is_admin() ) {
40
+			$this->load_components( 'admin' );
41
+		}
42 42
 
43 43
 		$this->load_components( 'locking' );
44 44
 
45
-        $this->load_components( 'render' );
45
+		$this->load_components( 'render' );
46 46
 
47
-        // If GF User Registration Add-on exists
48
-        $this->load_components( 'user-registration' );
47
+		// If GF User Registration Add-on exists
48
+		$this->load_components( 'user-registration' );
49 49
 
50
-        $this->add_hooks();
50
+		$this->add_hooks();
51 51
 
52 52
 		// Process hooks for addons that may or may not be present
53 53
 		$this->addon_specific_hooks();
54 54
 	}
55 55
 
56 56
 
57
-    static function getInstance() {
57
+	static function getInstance() {
58 58
 
59
-        if( empty( self::$instance ) ) {
60
-            self::$instance = new GravityView_Edit_Entry;
61
-        }
59
+		if( empty( self::$instance ) ) {
60
+			self::$instance = new GravityView_Edit_Entry;
61
+		}
62 62
 
63
-        return self::$instance;
64
-    }
63
+		return self::$instance;
64
+	}
65 65
 
66 66
 
67
-    private function load_components( $component ) {
67
+	private function load_components( $component ) {
68 68
 
69
-        $dir = trailingslashit( self::$file );
69
+		$dir = trailingslashit( self::$file );
70 70
 
71
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
72
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
71
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
72
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
73 73
 
74
-        // Loads component and pass extension's instance so that component can
75
-        // talk each other.
76
-        require_once $filename;
77
-        $this->instances[ $component ] = new $classname( $this );
78
-        $this->instances[ $component ]->load();
74
+		// Loads component and pass extension's instance so that component can
75
+		// talk each other.
76
+		require_once $filename;
77
+		$this->instances[ $component ] = new $classname( $this );
78
+		$this->instances[ $component ]->load();
79 79
 
80
-    }
80
+	}
81 81
 
82
-    private function add_hooks() {
82
+	private function add_hooks() {
83 83
 
84
-        // Add front-end access to Gravity Forms delete file action
85
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+		// Add front-end access to Gravity Forms delete file action
85
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
86 86
 
87
-        // Make sure this hook is run for non-admins
88
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+		// Make sure this hook is run for non-admins
88
+		add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
89 89
 
90
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90
+		add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
91 91
 
92
-        // add template path to check for field
93
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
92
+		// add template path to check for field
93
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
94 94
 
95 95
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
96 96
 
97
-    }
97
+	}
98 98
 
99 99
 	/**
100 100
 	 * Trigger hooks that are normally run in the admin for Addons, but need to be triggered manually because we're not in the admin
@@ -152,74 +152,74 @@  discard block
 block discarded – undo
152 152
 		return false;
153 153
 	}
154 154
 
155
-    /**
156
-     * Include this extension templates path
157
-     * @param array $file_paths List of template paths ordered
158
-     */
159
-    public function add_template_path( $file_paths ) {
160
-
161
-        // Index 100 is the default GravityView template path.
162
-        $file_paths[ 110 ] = self::$file;
163
-
164
-        return $file_paths;
165
-    }
166
-
167
-    /**
168
-     *
169
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
170
-     *
171
-     * @param $view_id int GravityView view id
172
-     * @param $form_id int Gravity Forms form id
173
-     * @param $entry_id int Gravity Forms entry id
174
-     * @return string
175
-     */
176
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
177
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
178
-    }
179
-
180
-
181
-    /**
182
-     * The edit entry link creates a secure link with a nonce
183
-     *
184
-     * It also mimics the URL structure Gravity Forms expects to have so that
185
-     * it formats the display of the edit form like it does in the backend, like
186
-     * "You can edit this post from the post page" fields, for example.
187
-     *
188
-     * @param $entry array Gravity Forms entry object
189
-     * @param $view_id int GravityView view id
190
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
191
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
192
-     * @return string
193
-     */
194
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
195
-
196
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
197
-
198
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
199
-
200
-        $url = add_query_arg( array(
201
-            'edit' => wp_create_nonce( $nonce_key )
202
-        ), $base );
203
-
204
-        if( $post_id ) {
205
-	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
206
-        }
207
-
208
-	    /**
209
-	     * Allow passing params to dynamically populate entry with values
210
-	     * @since 1.9.2
211
-	     */
212
-	    if( !empty( $field_values ) ) {
213
-
214
-		    if( is_array( $field_values ) ) {
215
-			    // If already an array, no parse_str() needed
216
-			    $params = $field_values;
217
-		    } else {
218
-			    parse_str( $field_values, $params );
219
-		    }
220
-
221
-		    $url = add_query_arg( $params, $url );
222
-	    }
155
+	/**
156
+	 * Include this extension templates path
157
+	 * @param array $file_paths List of template paths ordered
158
+	 */
159
+	public function add_template_path( $file_paths ) {
160
+
161
+		// Index 100 is the default GravityView template path.
162
+		$file_paths[ 110 ] = self::$file;
163
+
164
+		return $file_paths;
165
+	}
166
+
167
+	/**
168
+	 *
169
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
170
+	 *
171
+	 * @param $view_id int GravityView view id
172
+	 * @param $form_id int Gravity Forms form id
173
+	 * @param $entry_id int Gravity Forms entry id
174
+	 * @return string
175
+	 */
176
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
177
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
178
+	}
179
+
180
+
181
+	/**
182
+	 * The edit entry link creates a secure link with a nonce
183
+	 *
184
+	 * It also mimics the URL structure Gravity Forms expects to have so that
185
+	 * it formats the display of the edit form like it does in the backend, like
186
+	 * "You can edit this post from the post page" fields, for example.
187
+	 *
188
+	 * @param $entry array Gravity Forms entry object
189
+	 * @param $view_id int GravityView view id
190
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
191
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
192
+	 * @return string
193
+	 */
194
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
195
+
196
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
197
+
198
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
199
+
200
+		$url = add_query_arg( array(
201
+			'edit' => wp_create_nonce( $nonce_key )
202
+		), $base );
203
+
204
+		if( $post_id ) {
205
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
206
+		}
207
+
208
+		/**
209
+		 * Allow passing params to dynamically populate entry with values
210
+		 * @since 1.9.2
211
+		 */
212
+		if( !empty( $field_values ) ) {
213
+
214
+			if( is_array( $field_values ) ) {
215
+				// If already an array, no parse_str() needed
216
+				$params = $field_values;
217
+			} else {
218
+				parse_str( $field_values, $params );
219
+			}
220
+
221
+			$url = add_query_arg( $params, $url );
222
+		}
223 223
 
224 224
 		/**
225 225
 		 * @filter `gravityview/edit/link` Filter the edit URL link.
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 		 * @param \GV\View $view The View.
229 229
 		 */
230 230
 		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
231
-    }
231
+	}
232 232
 
233 233
 	/**
234 234
 	 * Edit mode doesn't allow certain field types.
@@ -283,19 +283,19 @@  discard block
 block discarded – undo
283 283
 	}
284 284
 
285 285
 
286
-    /**
287
-     * checks if user has permissions to edit a specific entry
288
-     *
289
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
290
-     *
291
-     * @param  array $entry Gravity Forms entry array
292
-     * @param \GV\View int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
293
-     * @return bool
294
-     */
295
-    public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
286
+	/**
287
+	 * checks if user has permissions to edit a specific entry
288
+	 *
289
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
290
+	 *
291
+	 * @param  array $entry Gravity Forms entry array
292
+	 * @param \GV\View int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
293
+	 * @return bool
294
+	 */
295
+	public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
296 296
 
297
-        // No permission by default
298
-        $user_can_edit = false;
297
+		// No permission by default
298
+		$user_can_edit = false;
299 299
 
300 300
 		// get user_edit setting
301 301
 		if ( empty( $view ) ) {
@@ -313,59 +313,59 @@  discard block
 block discarded – undo
313 313
 			$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
314 314
 		}
315 315
 
316
-        // If they can edit any entries (as defined in Gravity Forms)
317
-        // Or if they can edit other people's entries
318
-        // Then we're good.
319
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
316
+		// If they can edit any entries (as defined in Gravity Forms)
317
+		// Or if they can edit other people's entries
318
+		// Then we're good.
319
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
320 320
 
321
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
321
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
322 322
 
323
-            $user_can_edit = true;
323
+			$user_can_edit = true;
324 324
 
325
-        } else if( !isset( $entry['created_by'] ) ) {
325
+		} else if( !isset( $entry['created_by'] ) ) {
326 326
 
327
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
327
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
328 328
 
329
-            $user_can_edit = false;
329
+			$user_can_edit = false;
330 330
 
331
-        } else {
331
+		} else {
332 332
 
333 333
 
334
-            $current_user = wp_get_current_user();
334
+			$current_user = wp_get_current_user();
335 335
 
336
-            // User edit is disabled
337
-            if( empty( $user_edit ) ) {
336
+			// User edit is disabled
337
+			if( empty( $user_edit ) ) {
338 338
 
339
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
339
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
340 340
 
341
-                $user_can_edit = false;
342
-            }
341
+				$user_can_edit = false;
342
+			}
343 343
 
344
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
345
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
344
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
345
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
346 346
 
347
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
347
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
348 348
 
349
-                $user_can_edit = true;
349
+				$user_can_edit = true;
350 350
 
351
-            } else if( ! is_user_logged_in() ) {
351
+			} else if( ! is_user_logged_in() ) {
352 352
 
353
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
354
-            }
353
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
354
+			}
355 355
 
356
-        }
356
+		}
357 357
 
358
-        /**
359
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
360
-         * @since 1.15 Added `$entry` and `$view_id` parameters
361
-         * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
362
-         * @param[in] array $entry Gravity Forms entry array {@since 1.15}
363
-         * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
364
-         */
365
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
358
+		/**
359
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
360
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
361
+		 * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
362
+		 * @param[in] array $entry Gravity Forms entry array {@since 1.15}
363
+		 * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
364
+		 */
365
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
366 366
 
367
-        return (bool)$user_can_edit;
368
-    }
367
+		return (bool)$user_can_edit;
368
+	}
369 369
 
370 370
 
371 371
 
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		$this->id         = $item_id;
76 76
 		$this->form_id    = $form_id;
77 77
 		$this->settings   = $settings;
78
-		$this->label_type = $item['label_type'];
78
+		$this->label_type = $item[ 'label_type' ];
79 79
 	}
80 80
 
81 81
 	/**
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 
120 120
 			foreach ( $field_info_items as $item ) {
121 121
 
122
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
122
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123 123
 					continue;
124 124
 				}
125 125
 
126
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
126
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
127 127
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
128 128
 				$output .= '<span class="' . $class . '">';
129
-				$output .= esc_html( $item['value'] );
129
+				$output .= esc_html( $item[ 'value' ] );
130 130
 				$output .= '</span>';
131 131
 			}
132 132
 
@@ -154,21 +154,21 @@  discard block
 block discarded – undo
154 154
 
155 155
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
156 156
 		// TODO: Un-hack this
157
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158
-		$settings_link      = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
157
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158
+		$settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
159 159
 
160 160
 		// Should we show the icon that the field is being used as a link to single entry?
161
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
161
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
162 162
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
163 163
 
164 164
 		// When a field label is empty, use the Field ID
165 165
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
166 166
 
167 167
 		// If there's a custom label, and show label is checked, use that as the field heading
168
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
169
-			$label = $this->settings['custom_label'];
170
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
171
-			$label = $this->item['customLabel'];
168
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
169
+			$label = $this->settings[ 'custom_label' ];
170
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
171
+			$label = $this->item[ 'customLabel' ];
172 172
 		}
173 173
 		$label = esc_attr( $label );
174 174
 
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
 
177 177
 		$output .= '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
178 178
 
179
-		if ( ! empty( $this->item['parent'] ) ) {
180
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
179
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
180
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
181 181
 		}
182 182
 
183 183
 		// Name of field / widget
@@ -193,10 +193,10 @@  discard block
 block discarded – undo
193 193
 
194 194
 		$output .= '</h5>';
195 195
 
196
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
197
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
196
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
197
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
198 198
 
199
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
199
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
200 200
 
201 201
 		return $output;
202 202
 	}
Please login to merge, or discard this patch.
includes/connector-functions.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
  *
58 58
  * @see GVCommon::get_form_fields()
59 59
  * @access public
60
- * @param string|array $form_id (default: '') or $form object
60
+ * @param string|array $form (default: '') or $form object
61 61
  * @return array
62 62
  */
63 63
 function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
@@ -219,7 +219,6 @@  discard block
 block discarded – undo
219 219
  *
220 220
  * @see GravityView_Template::template_id
221 221
  *
222
- * @param int $view_id The ID of the View to get the layout of
223 222
  *
224 223
  * @return string GravityView_Template::template_id value. Empty string if not.
225 224
  */
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Spacing   +111 added lines, -111 removed lines patch added patch discarded remove patch
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 
126 126
 		$form = false;
127 127
 
128
-		if( $entry ) {
129
-			$form = GFAPI::get_form( $entry['form_id'] );
128
+		if ( $entry ) {
129
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
130 130
 		}
131 131
 
132 132
 		return $form;
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 			}
203 203
 		}
204 204
 
205
-		return (bool) $has_transaction_data;
205
+		return (bool)$has_transaction_data;
206 206
 	}
207 207
 
208 208
 	/**
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
242 242
 
243
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
243
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
244 244
 
245 245
 		return $result;
246 246
 	}
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
257 257
 	 *
258 258
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
259 259
 	 */
260
-	public static function get_forms(  $active = true, $trash = false ) {
260
+	public static function get_forms( $active = true, $trash = false ) {
261 261
 		$forms = array();
262 262
 		if ( class_exists( 'GFAPI' ) ) {
263
-			if( 'any' === $active ) {
263
+			if ( 'any' === $active ) {
264 264
 				$active_forms = GFAPI::get_forms( true, $trash );
265 265
 				$inactive_forms = GFAPI::get_forms( false, $trash );
266 266
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -291,9 +291,9 @@  discard block
 block discarded – undo
291 291
 		$has_post_fields = false;
292 292
 
293 293
 		if ( $form ) {
294
-			foreach ( $form['fields'] as $field ) {
295
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
296
-					$fields["{$field['id']}"] = array(
294
+			foreach ( $form[ 'fields' ] as $field ) {
295
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
296
+					$fields[ "{$field[ 'id' ]}" ] = array(
297 297
 						'label' => \GV\Utils::get( $field, 'label' ),
298 298
 						'parent' => null,
299 299
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -302,10 +302,10 @@  discard block
 block discarded – undo
302 302
 					);
303 303
 				}
304 304
 
305
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
306
-					foreach ( $field['inputs'] as $input ) {
305
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
306
+					foreach ( $field[ 'inputs' ] as $input ) {
307 307
 
308
-						if( ! empty( $input['isHidden'] ) ) {
308
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
309 309
 							continue;
310 310
 						}
311 311
 
@@ -313,10 +313,10 @@  discard block
 block discarded – undo
313 313
                          * @hack
314 314
                          * In case of email/email confirmation, the input for email has the same id as the parent field
315 315
                          */
316
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
316
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
317 317
                             continue;
318 318
                         }
319
-						$fields["{$input['id']}"] = array(
319
+						$fields[ "{$input[ 'id' ]}" ] = array(
320 320
 							'label' => \GV\Utils::get( $input, 'label' ),
321 321
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
322 322
 							'parent' => $field,
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 				}
329 329
 
330 330
 
331
-				if( GFCommon::is_product_field( $field['type'] ) ){
331
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
332 332
 					$has_product_fields = true;
333 333
 				}
334 334
 
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 		 * @since 1.7
343 343
 		 */
344 344
 		if ( $has_post_fields ) {
345
-			$fields['post_id'] = array(
345
+			$fields[ 'post_id' ] = array(
346 346
 				'label' => __( 'Post ID', 'gravityview' ),
347 347
 				'type' => 'post_id',
348 348
 			);
@@ -355,11 +355,11 @@  discard block
 block discarded – undo
355 355
 			foreach ( $payment_fields as $payment_field ) {
356 356
 
357 357
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
358
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
358
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
359 359
 					continue;
360 360
 				}
361 361
 
362
-				$fields["{$payment_field->name}"] = array(
362
+				$fields[ "{$payment_field->name}" ] = array(
363 363
 					'label' => $payment_field->label,
364 364
 					'desc' => $payment_field->description,
365 365
 					'type' => $payment_field->name,
@@ -391,9 +391,9 @@  discard block
 block discarded – undo
391 391
 
392 392
 		$fields = array();
393 393
 
394
-		foreach ( $extra_fields as $key => $field ){
395
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
396
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
394
+		foreach ( $extra_fields as $key => $field ) {
395
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
396
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
397 397
 			}
398 398
 		}
399 399
 
@@ -433,33 +433,33 @@  discard block
 block discarded – undo
433 433
 			'search_criteria' => null,
434 434
 			'sorting' => null,
435 435
 			'paging' => null,
436
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
436
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
437 437
 			'context_view_id' => null,
438 438
 		);
439 439
 
440 440
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
441 441
 
442
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) {
443
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
442
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
443
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
444 444
 
445 445
 				if ( ! is_array( $filter ) ) {
446 446
 					continue;
447 447
 				}
448 448
 
449 449
 				// By default, we want searches to be wildcard for each field.
450
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
450
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
451 451
 
452 452
 				/**
453 453
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
454 454
 				 * @param string $operator Existing search operator
455 455
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
456 456
 				 */
457
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
457
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
458 458
 			}
459 459
 
460 460
 			// don't send just the [mode] without any field filter.
461
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
462
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
461
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
462
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
463 463
 			}
464 464
 
465 465
 		}
@@ -470,33 +470,33 @@  discard block
 block discarded – undo
470 470
 		 * Prepare date formats to be in Gravity Forms DB format;
471 471
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
472 472
 		 */
473
-		foreach ( array('start_date', 'end_date' ) as $key ) {
473
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
474 474
 
475
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
475
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
476 476
 
477 477
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
478
-				$date = date_create( $criteria['search_criteria'][ $key ] );
478
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
479 479
 
480 480
 				if ( $date ) {
481 481
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
482
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
482
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
483 483
 				} else {
484
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
484
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
485 485
 
486 486
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
487
-					unset( $criteria['search_criteria'][ $key ] );
487
+					unset( $criteria[ 'search_criteria' ][ $key ] );
488 488
 				}
489 489
 			}
490 490
 		}
491 491
 
492
-		if ( empty( $criteria['context_view_id'] ) ) {
492
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
493 493
 			// Calculate the context view id and send it to the advanced filter
494 494
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
495
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
495
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
496 496
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
497
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
497
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
498 498
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
499
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
499
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
500 500
 			}
501 501
 		}
502 502
 
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 		 * @param array $form_ids Forms to search
507 507
 		 * @param int $view_id ID of the view being used to search
508 508
 		 */
509
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
509
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
510 510
 
511 511
 		return (array)$criteria;
512 512
 	}
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 		/** Reduce # of database calls */
542 542
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
543 543
 
544
-		if ( ! empty( $criteria['cache'] ) ) {
544
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
545 545
 
546 546
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
547 547
 
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 
550 550
 				// Still update the total count when using cached results
551 551
 				if ( ! is_null( $total ) ) {
552
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
552
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
553 553
 				}
554 554
 
555 555
 				$return = $entries;
@@ -571,9 +571,9 @@  discard block
 block discarded – undo
571 571
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
572 572
 
573 573
 			// No entries returned from gravityview_before_get_entries
574
-			if( is_null( $entries ) ) {
574
+			if ( is_null( $entries ) ) {
575 575
 
576
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
576
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
577 577
 
578 578
 				if ( is_wp_error( $entries ) ) {
579 579
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 				}
585 585
 			}
586 586
 
587
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
587
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
588 588
 
589 589
 				// Cache results
590 590
 				$Cache->set( $entries, 'entries' );
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 		 */
697 697
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view );
698 698
 
699
-		if( $check_entry_display ) {
699
+		if ( $check_entry_display ) {
700 700
 			if ( ! $view ) {
701 701
 				$view = \GV\View::by_id( \GravityView_View::getInstance()->getViewId() ); // @todo Bad legacy context, provide $view parameter!
702 702
 				gravityview()->log->warning( '$view parameter not provided! Context assumed from legacy context mocks. This is unreliable!' );
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 			$entry = self::check_entry_display( $entry, $view );
707 707
 		}
708 708
 
709
-		if( is_wp_error( $entry ) ) {
709
+		if ( is_wp_error( $entry ) ) {
710 710
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
711 711
 			return false;
712 712
 		}
@@ -740,12 +740,12 @@  discard block
 block discarded – undo
740 740
 
741 741
 		$value = false;
742 742
 
743
-		if( 'context' === $val1 ) {
743
+		if ( 'context' === $val1 ) {
744 744
 
745 745
 			$matching_contexts = array( $val2 );
746 746
 
747 747
 			// We allow for non-standard contexts.
748
-			switch( $val2 ) {
748
+			switch ( $val2 ) {
749 749
 				// Check for either single or edit
750 750
 				case 'singular':
751 751
 					$matching_contexts = array( 'single', 'edit' );
@@ -788,18 +788,18 @@  discard block
 block discarded – undo
788 788
 				$json_val_1 = json_decode( $val1, true );
789 789
 				$json_val_2 = json_decode( $val2, true );
790 790
 
791
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
791
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
792 792
 
793 793
 					$json_in = false;
794
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
795
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
794
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
795
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
796 796
 
797 797
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
798 798
 					foreach ( $json_val_1 as $item_1 ) {
799 799
 						foreach ( $json_val_2 as $item_2 ) {
800 800
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
801 801
 
802
-							if( $json_in ) {
802
+							if ( $json_in ) {
803 803
 								break 2;
804 804
 							}
805 805
 						}
@@ -850,10 +850,10 @@  discard block
 block discarded – undo
850 850
 	public static function check_entry_display( $entry, $view = null ) {
851 851
 
852 852
 		if ( ! $entry || is_wp_error( $entry ) ) {
853
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
853
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
854 854
 		}
855 855
 
856
-		if ( empty( $entry['form_id'] ) ) {
856
+		if ( empty( $entry[ 'form_id' ] ) ) {
857 857
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
858 858
 		}
859 859
 
@@ -869,12 +869,12 @@  discard block
 block discarded – undo
869 869
 		$view_form_id = $view->form->ID;
870 870
 
871 871
 		if ( $view->joins ) {
872
-			if ( in_array( (int)$entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
873
-				$view_form_id = $entry['form_id'];
872
+			if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
873
+				$view_form_id = $entry[ 'form_id' ];
874 874
 			}
875 875
 		}
876 876
 
877
-		if ( $view_form_id != $entry['form_id'] ) {
877
+		if ( $view_form_id != $entry[ 'form_id' ] ) {
878 878
 			return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry );
879 879
 		}
880 880
 
@@ -882,13 +882,13 @@  discard block
 block discarded – undo
882 882
 		 * Check whether the entry is in the entries subset by running a modified query.
883 883
 		 */
884 884
 		add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
885
-			$_tmp_query       = new \GF_Query( $view_form_id, array(
885
+			$_tmp_query = new \GF_Query( $view_form_id, array(
886 886
 				'field_filters' => array(
887 887
 					'mode' => 'all',
888 888
 					array(
889 889
 						'key' => 'id',
890 890
 						'operation' => 'is',
891
-						'value' => $entry['id']
891
+						'value' => $entry[ 'id' ]
892 892
 					)
893 893
 				)
894 894
 			) );
@@ -898,14 +898,14 @@  discard block
 block discarded – undo
898 898
 			/** @var \GF_Query $query */
899 899
 			$query_parts      = $query->_introspect();
900 900
 
901
-			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
901
+			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
902 902
 
903 903
 		}, 10, 3 );
904 904
 
905 905
 		// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
906 906
 		add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
907 907
 
908
-			$criteria['paging'] = array(
908
+			$criteria[ 'paging' ] = array(
909 909
 				'offset' => 0,
910 910
 				'page_size' => 25
911 911
 			);
@@ -924,20 +924,20 @@  discard block
 block discarded – undo
924 924
 		}
925 925
 
926 926
 		// This entry is on a View with joins
927
-		if ( $entries[0]->is_multi() ) {
927
+		if ( $entries[ 0 ]->is_multi() ) {
928 928
 
929 929
 			$multi_entry_ids = array();
930 930
 
931
-			foreach ( $entries[0]->entries as $multi_entry ) {
932
-				$multi_entry_ids[] = (int) $multi_entry->ID;
931
+			foreach ( $entries[ 0 ]->entries as $multi_entry ) {
932
+				$multi_entry_ids[ ] = (int)$multi_entry->ID;
933 933
 			}
934 934
 
935
-			if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
935
+			if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
936 936
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
937 937
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
938 938
 			}
939 939
 
940
-		} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
940
+		} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
941 941
 			remove_action( 'gravityview/view/query', $entry_subset_callback );
942 942
 			return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
943 943
 		}
@@ -982,18 +982,18 @@  discard block
 block discarded – undo
982 982
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
983 983
 		 * @see GFCommon::format_date() for original code
984 984
 		 */
985
-		$date_gmt_time   = mysql2date( 'G', $date_string );
985
+		$date_gmt_time = mysql2date( 'G', $date_string );
986 986
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
987 987
 
988
-		$format  = \GV\Utils::get( $atts, 'format' );
989
-		$is_human  = ! empty( $atts['human'] );
990
-		$is_diff  = ! empty( $atts['diff'] );
991
-		$is_raw = ! empty( $atts['raw'] );
992
-		$is_timestamp = ! empty( $atts['timestamp'] );
993
-		$include_time = ! empty( $atts['time'] );
988
+		$format = \GV\Utils::get( $atts, 'format' );
989
+		$is_human = ! empty( $atts[ 'human' ] );
990
+		$is_diff = ! empty( $atts[ 'diff' ] );
991
+		$is_raw = ! empty( $atts[ 'raw' ] );
992
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
993
+		$include_time = ! empty( $atts[ 'time' ] );
994 994
 
995 995
 		// If we're using time diff, we want to have a different default format
996
-		if( empty( $format ) ) {
996
+		if ( empty( $format ) ) {
997 997
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
998 998
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
999 999
 		}
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
 		// If raw was specified, don't modify the stored value
1002 1002
 		if ( $is_raw ) {
1003 1003
 			$formatted_date = $date_string;
1004
-		} elseif( $is_timestamp ) {
1004
+		} elseif ( $is_timestamp ) {
1005 1005
 			$formatted_date = $date_local_timestamp;
1006 1006
 		} elseif ( $is_diff ) {
1007 1007
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1035,7 +1035,7 @@  discard block
 block discarded – undo
1035 1035
 
1036 1036
 		$label = \GV\Utils::get( $field, 'label' );
1037 1037
 
1038
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1038
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1039 1039
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1040 1040
 		}
1041 1041
 
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
 			$form = GFAPI::get_form( $form );
1064 1064
 		}
1065 1065
 
1066
-		if ( class_exists( 'GFFormsModel' ) ){
1066
+		if ( class_exists( 'GFFormsModel' ) ) {
1067 1067
 			return GFFormsModel::get_field( $form, $field_id );
1068 1068
 		} else {
1069 1069
 			return null;
@@ -1110,19 +1110,19 @@  discard block
 block discarded – undo
1110 1110
 			$shortcodes = array();
1111 1111
 
1112 1112
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1113
-			if ( empty( $matches ) ){
1113
+			if ( empty( $matches ) ) {
1114 1114
 				return false;
1115 1115
 			}
1116 1116
 
1117 1117
 			foreach ( $matches as $shortcode ) {
1118
-				if ( $tag === $shortcode[2] ) {
1118
+				if ( $tag === $shortcode[ 2 ] ) {
1119 1119
 
1120 1120
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1121
-					$shortcodes[] = $shortcode;
1121
+					$shortcodes[ ] = $shortcode;
1122 1122
 
1123
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1124
-					foreach( $results as $result ) {
1125
-						$shortcodes[] = $result;
1123
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1124
+					foreach ( $results as $result ) {
1125
+						$shortcodes[ ] = $result;
1126 1126
 					}
1127 1127
 				}
1128 1128
 			}
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 			'post_type'      => 'gravityview',
1155 1155
 			'posts_per_page' => 100,
1156 1156
 			'meta_key'       => '_gravityview_form_id',
1157
-			'meta_value'     => (int) $form_id,
1157
+			'meta_value'     => (int)$form_id,
1158 1158
 		);
1159 1159
 		$args     = wp_parse_args( $args, $defaults );
1160 1160
 		$views    = get_posts( $args );
@@ -1166,21 +1166,21 @@  discard block
 block discarded – undo
1166 1166
 
1167 1167
 			$data = unserialize( $view->meta_value );
1168 1168
 
1169
-			if( ! $data || ! is_array( $data ) ) {
1169
+			if ( ! $data || ! is_array( $data ) ) {
1170 1170
 				continue;
1171 1171
 			}
1172 1172
 
1173 1173
 			foreach ( $data as $datum ) {
1174
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
1175
-					$joined_forms[] = $view->post_id;
1174
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
1175
+					$joined_forms[ ] = $view->post_id;
1176 1176
 				}
1177 1177
 			}
1178 1178
 		}
1179 1179
 
1180 1180
 		if ( $joined_forms ) {
1181
-			$joined_args  = array(
1181
+			$joined_args = array(
1182 1182
 				'post_type'      => 'gravityview',
1183
-				'posts_per_page' => $args['posts_per_page'],
1183
+				'posts_per_page' => $args[ 'posts_per_page' ],
1184 1184
 				'post__in'       => $joined_forms,
1185 1185
 			);
1186 1186
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1336,7 +1336,7 @@  discard block
 block discarded – undo
1336 1336
 
1337 1337
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
1338 1338
 
1339
-		if( $json_decode ) {
1339
+		if ( $json_decode ) {
1340 1340
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
1341 1341
 		}
1342 1342
 
@@ -1352,7 +1352,7 @@  discard block
 block discarded – undo
1352 1352
 	 * @return string         html
1353 1353
 	 */
1354 1354
 	public static function get_sortable_fields( $formid, $current = '' ) {
1355
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
1355
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
1356 1356
 
1357 1357
 		if ( empty( $formid ) ) {
1358 1358
 			return $output;
@@ -1365,11 +1365,11 @@  discard block
 block discarded – undo
1365 1365
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1366 1366
 
1367 1367
 			foreach ( $fields as $id => $field ) {
1368
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1368
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1369 1369
 					continue;
1370 1370
 				}
1371 1371
 
1372
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1372
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1373 1373
 			}
1374 1374
 		}
1375 1375
 
@@ -1404,16 +1404,16 @@  discard block
 block discarded – undo
1404 1404
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1405 1405
 
1406 1406
 		// TODO: Convert to using array_filter
1407
-		foreach( $fields as $id => $field ) {
1407
+		foreach ( $fields as $id => $field ) {
1408 1408
 
1409
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1409
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1410 1410
 				unset( $fields[ $id ] );
1411 1411
 			}
1412 1412
 
1413 1413
 			/**
1414 1414
 			 * Merge date and time subfields.
1415 1415
 			 */
1416
-			if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) {
1416
+			if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) {
1417 1417
 				$fields[ intval( $id ) ] = array(
1418 1418
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
1419 1419
 					'parent' => null,
@@ -1463,14 +1463,14 @@  discard block
 block discarded – undo
1463 1463
 	 * @param  int|array  $field field key or field array
1464 1464
 	 * @return boolean
1465 1465
 	 */
1466
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1466
+	public static function is_field_numeric( $form = null, $field = '' ) {
1467 1467
 
1468 1468
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1469 1469
 			$form = self::get_form( $form );
1470 1470
 		}
1471 1471
 
1472 1472
 		// If entry meta, it's a string. Otherwise, numeric
1473
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1473
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1474 1474
 			$type = $field;
1475 1475
 		} else {
1476 1476
 			$type = self::get_field_type( $form, $field );
@@ -1484,9 +1484,9 @@  discard block
 block discarded – undo
1484 1484
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1485 1485
 
1486 1486
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1487
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1488
-			if( true === $gv_field->is_numeric ) {
1489
-				$numeric_types[] = $gv_field->is_numeric;
1487
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1488
+			if ( true === $gv_field->is_numeric ) {
1489
+				$numeric_types[ ] = $gv_field->is_numeric;
1490 1490
 			}
1491 1491
 		}
1492 1492
 
@@ -1636,18 +1636,18 @@  discard block
 block discarded – undo
1636 1636
 		$final_atts = array_filter( $final_atts );
1637 1637
 
1638 1638
 		// If the href wasn't passed as an attribute, use the value passed to the function
1639
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1640
-			$final_atts['href'] = $href;
1639
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1640
+			$final_atts[ 'href' ] = $href;
1641 1641
 		}
1642 1642
 
1643
-		$final_atts['href'] = esc_url_raw( $href );
1643
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1644 1644
 
1645 1645
 		/**
1646 1646
 		 * Fix potential security issue with target=_blank
1647 1647
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1648 1648
 		 */
1649
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1650
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1649
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1650
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1651 1651
 		}
1652 1652
 
1653 1653
 		// Sort the attributes alphabetically, to help testing
@@ -1659,7 +1659,7 @@  discard block
 block discarded – undo
1659 1659
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1660 1660
 		}
1661 1661
 
1662
-		if( '' !== $output ) {
1662
+		if ( '' !== $output ) {
1663 1663
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1664 1664
 		}
1665 1665
 
@@ -1686,7 +1686,7 @@  discard block
 block discarded – undo
1686 1686
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1687 1687
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1688 1688
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1689
-				$merged[] = $value;
1689
+				$merged[ ] = $value;
1690 1690
 			} else {
1691 1691
 				$merged[ $key ] = $value;
1692 1692
 			}
@@ -1719,7 +1719,7 @@  discard block
 block discarded – undo
1719 1719
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1720 1720
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1721 1721
 		 */
1722
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1722
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1723 1723
 
1724 1724
 		return get_users( $get_users_settings );
1725 1725
 	}
@@ -1739,11 +1739,11 @@  discard block
 block discarded – undo
1739 1739
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1740 1740
 
1741 1741
     	// If $cap is defined, only show notice if user has capability
1742
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1742
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1743 1743
     		return '';
1744 1744
 	    }
1745 1745
 
1746
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1746
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1747 1747
     }
1748 1748
 
1749 1749
 	/**
Please login to merge, or discard this patch.
includes/class-admin-views.php 2 patches
Indentation   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -63,28 +63,28 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	/**
66
-     * When on the Add/Edit View screen, suggest most popular articles related to that
67
-     *
66
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
67
+	 *
68 68
 	 * @param array $localization_data Data to be passed to the Support Port JS
69 69
 	 *
70 70
 	 * @return array
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
75
-	        return $localization_data;
76
-        }
74
+		if( ! gravityview()->request->is_view() ) {
75
+			return $localization_data;
76
+		}
77 77
 
78 78
 		$localization_data['suggest'] = array(
79
-            '57ef23539033602e61d4a560',
80
-            '54c67bb9e4b0512429885513',
81
-            '54c67bb9e4b0512429885512',
82
-            '54c67bbbe4b07997ea3f3f6b',
83
-            '54d1a33ae4b086c0c0964ce9',
84
-            '57ef253c9033602e61d4a563',
85
-            '552355bfe4b0221aadf2572b',
86
-            '54c67bcde4b051242988553e',
87
-        );
79
+			'57ef23539033602e61d4a560',
80
+			'54c67bb9e4b0512429885513',
81
+			'54c67bb9e4b0512429885512',
82
+			'54c67bbbe4b07997ea3f3f6b',
83
+			'54d1a33ae4b086c0c0964ce9',
84
+			'57ef253c9033602e61d4a563',
85
+			'552355bfe4b0221aadf2572b',
86
+			'54c67bcde4b051242988553e',
87
+		);
88 88
 
89 89
 		return $localization_data;
90 90
 	}
@@ -175,11 +175,11 @@  discard block
 block discarded – undo
175 175
 
176 176
 		if( 'form_list' === GFForms::get_page() ) {
177 177
 			$priority = 790;
178
-        }
178
+		}
179 179
 
180 180
 		if( empty( $connected_views ) ) {
181 181
 
182
-		    $menu_items['gravityview'] = array(
182
+			$menu_items['gravityview'] = array(
183 183
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
184 184
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
185 185
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -210,13 +210,13 @@  discard block
 block discarded – undo
210 210
 		// If there were no items added, then let's create the parent menu
211 211
 		if( $sub_menu_items ) {
212 212
 
213
-		    $sub_menu_items[] = array(
214
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
215
-                'link_class' => 'gv-create-view',
216
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
217
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
218
-			    'capabilities'   => array( 'edit_gravityviews' ),
219
-            );
213
+			$sub_menu_items[] = array(
214
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
215
+				'link_class' => 'gv-create-view',
216
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
217
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
218
+				'capabilities'   => array( 'edit_gravityviews' ),
219
+			);
220 220
 
221 221
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
222 222
 			$sub_menu_items[] = array(
@@ -599,17 +599,17 @@  discard block
 block discarded – undo
599 599
 	 * Render html for displaying available fields based on a Form ID
600 600
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
601 601
 	 *
602
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
602
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
603 603
 	 * @access public
604
-     *
604
+	 *
605 605
 	 * @param int $form Gravity Forms Form ID (default: '')
606 606
 	 * @param string $context (default: 'single')
607
-     *
607
+	 *
608 608
 	 * @return void
609 609
 	 */
610 610
 	function render_available_fields( $form = 0, $context = 'single' ) {
611 611
 
612
-	    // Determine if form is a preset and convert it to an array with fields
612
+		// Determine if form is a preset and convert it to an array with fields
613 613
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
614 614
 
615 615
 		/**
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 
622 622
 		if ( ! is_array( $blacklist_field_types ) ) {
623 623
 
624
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
624
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
625 625
 
626 626
 			$blacklist_field_types = array();
627 627
 		}
@@ -753,12 +753,12 @@  discard block
 block discarded – undo
753 753
 				/**
754 754
 				 * @since 1.7.2
755 755
 				 */
756
-			    'other_entries' => array(
757
-				    'label'	=> __('Other Entries', 'gravityview'),
758
-				    'type'	=> 'other_entries',
759
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
760
-			    ),
761
-	        );
756
+				'other_entries' => array(
757
+					'label'	=> __('Other Entries', 'gravityview'),
758
+					'type'	=> 'other_entries',
759
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
760
+				),
761
+			);
762 762
 
763 763
 			if( 'single' !== $zone) {
764 764
 
@@ -906,9 +906,9 @@  discard block
 block discarded – undo
906 906
 
907 907
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
908 908
 
909
-                foreach ( $joined_forms as $form ) {
910
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
911
-                }
909
+				foreach ( $joined_forms as $form ) {
910
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
911
+				}
912 912
 			} else {
913 913
 				$available_items[ $form ] = \GV\Widget::registered();
914 914
 			}
@@ -936,9 +936,9 @@  discard block
 block discarded – undo
936 936
 
937 937
 										if ( $form_id ) {
938 938
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
939
-                                        } else {
939
+										} else {
940 940
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
941
-                                        }
941
+										}
942 942
 
943 943
 										if ( !$original_item ) {
944 944
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -990,7 +990,7 @@  discard block
 block discarded – undo
990 990
 
991 991
 	/**
992 992
 	 * Render the widget active areas
993
-     * @param  string $template_id The current slug of the selected View template
993
+	 * @param  string $template_id The current slug of the selected View template
994 994
 	 * @param  string $zone    Either 'header' or 'footer'
995 995
 	 * @param  string $post_id Current Post ID (view)
996 996
 	 * @return string          html
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1175 1175
 
1176 1176
 		// Add the GV font (with the Astronaut)
1177
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1177
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1178 1178
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1179 1179
 
1180 1180
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1182,66 +1182,66 @@  discard block
 block discarded – undo
1182 1182
 		if( GFForms::get_page() === 'form_list' ) {
1183 1183
 			wp_enqueue_style( 'gravityview_views_styles' );
1184 1184
 			return;
1185
-        }
1185
+		}
1186 1186
 
1187 1187
 		// Don't process any scripts below here if it's not a GravityView page.
1188 1188
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1189
-		    return;
1189
+			return;
1190 1190
 		}
1191 1191
 
1192
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1193
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1194
-
1195
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1196
-
1197
-        //enqueue scripts
1198
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1199
-
1200
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1201
-            'cookiepath' => COOKIEPATH,
1202
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1203
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1204
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1205
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1206
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1207
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1208
-            'label_close' => __( 'Close', 'gravityview' ),
1209
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1210
-            'label_continue' => __( 'Continue', 'gravityview' ),
1211
-            'label_ok' => __( 'Ok', 'gravityview' ),
1212
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1213
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1214
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1215
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1216
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1217
-        ));
1192
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1193
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1194
+
1195
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1196
+
1197
+		//enqueue scripts
1198
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1199
+
1200
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1201
+			'cookiepath' => COOKIEPATH,
1202
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1203
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1204
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1205
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1206
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1207
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1208
+			'label_close' => __( 'Close', 'gravityview' ),
1209
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1210
+			'label_continue' => __( 'Continue', 'gravityview' ),
1211
+			'label_ok' => __( 'Ok', 'gravityview' ),
1212
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1213
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1214
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1215
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1216
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1217
+		));
1218 1218
 
1219 1219
 		wp_enqueue_style( 'gravityview_views_styles' );
1220 1220
 
1221
-        // Enqueue scripts needed for merge tags
1222
-        self::enqueue_gravity_forms_scripts();
1221
+		// Enqueue scripts needed for merge tags
1222
+		self::enqueue_gravity_forms_scripts();
1223 1223
 	}
1224 1224
 
1225 1225
 	/**
1226 1226
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1227
-     *
1228
-     * @since 1.0.5-beta
1229
-     *
1230
-     * @return void
1227
+	 *
1228
+	 * @since 1.0.5-beta
1229
+	 *
1230
+	 * @return void
1231 1231
 	 */
1232 1232
 	static function enqueue_gravity_forms_scripts() {
1233 1233
 		GFForms::register_scripts();
1234 1234
 
1235 1235
 		$scripts = array(
1236
-		    'sack',
1237
-		    'gform_gravityforms',
1238
-		    'gform_forms',
1239
-		    'gform_form_admin',
1240
-		    'jquery-ui-autocomplete'
1236
+			'sack',
1237
+			'gform_gravityforms',
1238
+			'gform_forms',
1239
+			'gform_form_admin',
1240
+			'jquery-ui-autocomplete'
1241 1241
 		);
1242 1242
 
1243 1243
 		if ( wp_is_mobile() ) {
1244
-		    $scripts[] = 'jquery-touch-punch';
1244
+			$scripts[] = 'jquery-touch-punch';
1245 1245
 		}
1246 1246
 
1247 1247
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
Spacing   +184 added lines, -184 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
74
+	    if ( ! gravityview()->request->is_view() ) {
75 75
 	        return $localization_data;
76 76
         }
77 77
 
78
-		$localization_data['suggest'] = array(
78
+		$localization_data[ 'suggest' ] = array(
79 79
             '57ef23539033602e61d4a560',
80 80
             '54c67bb9e4b0512429885513',
81 81
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( !is_admin() ) {
99
+		if ( ! is_admin() ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
103
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
104 104
 
105
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
106 106
 			return;
107 107
 		}
108 108
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	function add_view_dropdown() {
120 120
 		$current_screen = get_current_screen();
121 121
 
122
-		if( 'gravityview' !== $current_screen->post_type ) {
122
+		if ( 'gravityview' !== $current_screen->post_type ) {
123 123
 			return;
124 124
 		}
125 125
 
126 126
 		$forms = gravityview_get_forms();
127 127
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
128 128
 		// If there are no forms to select, show no forms.
129
-		if( !empty( $forms ) ) { ?>
129
+		if ( ! empty( $forms ) ) { ?>
130 130
 			<select name="gravityview_form_id" id="gravityview_form_id">
131 131
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
132
-				<?php foreach( $forms as $form ) { ?>
133
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
132
+				<?php foreach ( $forms as $form ) { ?>
133
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
134 134
 				<?php } ?>
135 135
 			</select>
136 136
 		<?php }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
145 145
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
146
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
146
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
147 147
 	}
148 148
 
149 149
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
166 166
 
167 167
 		// Don't show on Trashed forms
168
-		if( 'trash' === rgget( 'filter') ) {
168
+		if ( 'trash' === rgget( 'filter' ) ) {
169 169
 			return $menu_items;
170 170
 		}
171 171
 
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$priority = 0;
175 175
 
176
-		if( 'form_list' === GFForms::get_page() ) {
176
+		if ( 'form_list' === GFForms::get_page() ) {
177 177
 			$priority = 790;
178 178
         }
179 179
 
180
-		if( empty( $connected_views ) ) {
180
+		if ( empty( $connected_views ) ) {
181 181
 
182
-		    $menu_items['gravityview'] = array(
182
+		    $menu_items[ 'gravityview' ] = array(
183 183
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
184 184
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
185 185
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -195,22 +195,22 @@  discard block
 block discarded – undo
195 195
 		$sub_menu_items = array();
196 196
 		foreach ( (array)$connected_views as $view ) {
197 197
 
198
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
198
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
199 199
 				continue;
200 200
 			}
201 201
 
202
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
202
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
203 203
 
204
-			$sub_menu_items[] = array(
204
+			$sub_menu_items[ ] = array(
205 205
 				'label' => esc_attr( $label ),
206
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
206
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
207 207
 			);
208 208
 		}
209 209
 
210 210
 		// If there were no items added, then let's create the parent menu
211
-		if( $sub_menu_items ) {
211
+		if ( $sub_menu_items ) {
212 212
 
213
-		    $sub_menu_items[] = array(
213
+		    $sub_menu_items[ ] = array(
214 214
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
215 215
                 'link_class' => 'gv-create-view',
216 216
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -219,14 +219,14 @@  discard block
 block discarded – undo
219 219
             );
220 220
 
221 221
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
222
-			$sub_menu_items[] = array(
222
+			$sub_menu_items[ ] = array(
223 223
 				'url' => '#',
224 224
 				'label' => '',
225 225
 				'menu_class' => 'hidden',
226 226
 				'capabilities' => '',
227 227
 			);
228 228
 
229
-			$menu_items['gravityview'] = array(
229
+			$menu_items[ 'gravityview' ] = array(
230 230
 				'label'          => __( 'Connected Views', 'gravityview' ),
231 231
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
232 232
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -255,8 +255,8 @@  discard block
 block discarded – undo
255 255
 		$add = array( 'captcha', 'page' );
256 256
 
257 257
 		// Don't allowing editing the following values:
258
-		if( $context === 'edit' ) {
259
-			$add[] = 'post_id';
258
+		if ( $context === 'edit' ) {
259
+			$add[ ] = 'post_id';
260 260
 		}
261 261
 
262 262
 		$return = array_merge( $array, $add );
@@ -279,32 +279,32 @@  discard block
 block discarded – undo
279 279
 		foreach ( $default_args as $key => $arg ) {
280 280
 
281 281
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
282
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
282
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
283 283
 
284 284
 			// By default, use `tooltip` if defined.
285
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
285
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
286 286
 
287 287
 			// Otherwise, use the description as a tooltip.
288
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
289
-				$tooltip = $arg['desc'];
288
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
289
+				$tooltip = $arg[ 'desc' ];
290 290
 			}
291 291
 
292 292
 			// If there's no tooltip set, continue
293
-			if( empty( $tooltip ) ) {
293
+			if ( empty( $tooltip ) ) {
294 294
 				continue;
295 295
 			}
296 296
 
297 297
 			// Add the tooltip
298
-			$gv_tooltips[ 'gv_'.$key ] = array(
299
-				'title'	=> $arg['label'],
298
+			$gv_tooltips[ 'gv_' . $key ] = array(
299
+				'title'	=> $arg[ 'label' ],
300 300
 				'value'	=> $tooltip,
301 301
 			);
302 302
 
303 303
 		}
304 304
 
305
-		$gv_tooltips['gv_css_merge_tags'] = array(
306
-			'title' => __('CSS Merge Tags', 'gravityview'),
307
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
305
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
306
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
307
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
308 308
 		);
309 309
 
310 310
 		/**
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
322 322
 
323 323
 		foreach ( $gv_tooltips as $key => $tooltip ) {
324 324
 
325
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
325
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
326 326
 
327
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
327
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
328 328
 		}
329 329
 
330 330
 		return $tooltips;
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 	 *
339 339
 	 * @return void
340 340
 	 */
341
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
341
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
342 342
 
343 343
 		$output = '';
344 344
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
361 361
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
362 362
 
363
-				$output = $template ? $template['label'] : $template_id_pretty;
363
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
364 364
 
365 365
 				break;
366 366
 
@@ -401,44 +401,44 @@  discard block
 block discarded – undo
401 401
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
402 402
 
403 403
 		// Either the form is empty or the form ID is 0, not yet set.
404
-		if( empty( $form ) ) {
404
+		if ( empty( $form ) ) {
405 405
 			return '';
406 406
 		}
407 407
 
408 408
 		// The $form is passed as the form ID
409
-		if( !is_array( $form ) ) {
409
+		if ( ! is_array( $form ) ) {
410 410
 			$form = gravityview_get_form( $form );
411 411
 		}
412 412
 
413
-		$form_id = $form['id'];
413
+		$form_id = $form[ 'id' ];
414 414
 		$links = array();
415 415
 
416
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
416
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
417 417
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
418
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
419
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
418
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
419
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
420 420
 		} else {
421
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
421
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
422 422
 		}
423 423
 
424
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
424
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
425 425
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
426
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
426
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
427 427
 		}
428 428
 
429
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
429
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
430 430
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
431
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
431
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
432 432
 		}
433 433
 
434
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
434
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
435 435
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
436
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
436
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
437 437
 		}
438 438
 
439 439
 		$output = '';
440 440
 
441
-		if( !empty( $include_form_link ) ) {
441
+		if ( ! empty( $include_form_link ) ) {
442 442
 			$output .= $form_link;
443 443
 		}
444 444
 
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 		 */
451 451
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
452 452
 
453
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
453
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
454 454
 
455 455
 		return $output;
456 456
 	}
@@ -464,8 +464,8 @@  discard block
 block discarded – undo
464 464
 		// Get the date column and save it for later to add back in.
465 465
 		// This adds it after the Data Source column.
466 466
 		// This way, we don't need to do array_slice, array_merge, etc.
467
-		$date = $columns['date'];
468
-		unset( $columns['date'] );
467
+		$date = $columns[ 'date' ];
468
+		unset( $columns[ 'date' ] );
469 469
 
470 470
 		$data_source_required_caps = array(
471 471
 			'gravityforms_edit_forms',
@@ -476,14 +476,14 @@  discard block
 block discarded – undo
476 476
 			'gravityforms_preview_forms',
477 477
 		);
478 478
 
479
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
480
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
479
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
480
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
481 481
 		}
482 482
 
483
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
483
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
484 484
 
485 485
 		// Add the date back in.
486
-		$columns['date'] = $date;
486
+		$columns[ 'date' ] = $date;
487 487
 
488 488
 		return $columns;
489 489
 	}
@@ -497,12 +497,12 @@  discard block
 block discarded – undo
497 497
 	 */
498 498
 	function save_postdata( $post_id ) {
499 499
 
500
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
500
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
501 501
 			return;
502 502
 		}
503 503
 
504 504
 		// validate post_type
505
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
505
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
506 506
 			return;
507 507
 		}
508 508
 
@@ -517,63 +517,63 @@  discard block
 block discarded – undo
517 517
 		$statii = array();
518 518
 
519 519
 		// check if this is a start fresh View
520
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
520
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
521 521
 
522
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
522
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
523 523
 			// save form id
524
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
524
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
525 525
 
526 526
 		}
527 527
 
528
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
528
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
529 529
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
530 530
 			return;
531 531
 		}
532 532
 
533 533
 		// Was this a start fresh?
534
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
535
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
534
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
535
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
536 536
 		} else {
537
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
537
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
538 538
 		}
539 539
 
540 540
 		// Check if we have a template id
541
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
541
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
542 542
 
543
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
543
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
544 544
 
545 545
 			// now save template id
546
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
546
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
547 547
 		}
548 548
 
549 549
 
550 550
 		// save View Configuration metabox
551
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
551
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
552 552
 
553 553
 			// template settings
554
-			if( empty( $_POST['template_settings'] ) ) {
555
-				$_POST['template_settings'] = array();
554
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
555
+				$_POST[ 'template_settings' ] = array();
556 556
 			}
557
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
557
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
558 558
 
559 559
 			// guard against unloaded View configuration page
560
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
560
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
561 561
 				$fields = array();
562 562
 
563
-				if ( ! empty( $_POST['gv_fields'] ) ) {
563
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
564 564
 					$fields = _gravityview_process_posted_fields();
565 565
 				}
566 566
 
567 567
 				$fields = wp_slash( $fields );
568 568
 
569
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
569
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
570 570
 			}
571 571
 
572 572
 			// Directory Visible Widgets
573
-			if( empty( $_POST['widgets'] ) ) {
574
-				$_POST['widgets'] = array();
573
+			if ( empty( $_POST[ 'widgets' ] ) ) {
574
+				$_POST[ 'widgets' ] = array();
575 575
 			}
576
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
576
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
577 577
 
578 578
 		} // end save view configuration
579 579
 
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
584 584
 		 * @since 1.17.2
585 585
 		 */
586
-		do_action('gravityview_view_saved', $post_id, $statii );
586
+		do_action( 'gravityview_view_saved', $post_id, $statii );
587 587
 
588 588
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
589 589
 	}
@@ -630,20 +630,20 @@  discard block
 block discarded – undo
630 630
 
631 631
 		$output = '';
632 632
 
633
-		if( !empty( $fields ) ) {
633
+		if ( ! empty( $fields ) ) {
634 634
 
635
-			foreach( $fields as $id => $details ) {
635
+			foreach ( $fields as $id => $details ) {
636 636
 
637
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
637
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
638 638
 					continue;
639 639
 				}
640 640
 
641 641
 				// Edit mode only allows editing the parent fields, not single inputs.
642
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
642
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
643 643
 					continue;
644 644
 				}
645 645
 
646
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
646
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
647 647
 
648 648
 			} // End foreach
649 649
 		}
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 		echo $output;
652 652
 
653 653
 		// For the EDIT view we only want to allow the form fields.
654
-		if( $context === 'edit' ) {
654
+		if ( $context === 'edit' ) {
655 655
 			return;
656 656
 		}
657 657
 
@@ -675,16 +675,16 @@  discard block
 block discarded – undo
675 675
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
676 676
 			array(
677 677
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
678
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
678
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
679 679
 				'field_id' => 'all-fields',
680 680
 				'label_type' => 'field',
681 681
 				'input_type' => NULL,
682 682
 				'field_options' => NULL,
683 683
 				'settings_html'	=> NULL,
684 684
 			)
685
-		));
685
+		) );
686 686
 
687
-		if( !empty( $additional_fields )) {
687
+		if ( ! empty( $additional_fields ) ) {
688 688
 			foreach ( (array)$additional_fields as $item ) {
689 689
 
690 690
 				// Prevent items from not having index set
@@ -695,16 +695,16 @@  discard block
 block discarded – undo
695 695
 					'input_type' => NULL,
696 696
 					'field_options' => NULL,
697 697
 					'settings_html'	=> NULL,
698
-				));
698
+				) );
699 699
 
700 700
 				// Backward compat.
701
-				if( !empty( $item['field_options'] ) ) {
701
+				if ( ! empty( $item[ 'field_options' ] ) ) {
702 702
 					// Use settings_html from now on.
703
-					$item['settings_html'] = $item['field_options'];
703
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
704 704
 				}
705 705
 
706 706
 				// Render a label for each of them
707
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
707
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
708 708
 
709 709
 			}
710 710
 		}
@@ -717,54 +717,54 @@  discard block
 block discarded – undo
717 717
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
718 718
 	 * @return array
719 719
 	 */
720
-	function get_entry_default_fields($form, $zone) {
720
+	function get_entry_default_fields( $form, $zone ) {
721 721
 
722 722
 		$entry_default_fields = array();
723 723
 
724
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
724
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
725 725
 
726 726
 			$entry_default_fields = array(
727 727
 				'id' => array(
728
-					'label' => __('Entry ID', 'gravityview'),
728
+					'label' => __( 'Entry ID', 'gravityview' ),
729 729
 					'type' => 'id',
730
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
730
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
731 731
 				),
732 732
 				'date_created' => array(
733
-					'label' => __('Entry Date', 'gravityview'),
734
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
733
+					'label' => __( 'Entry Date', 'gravityview' ),
734
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
735 735
 					'type' => 'date_created',
736 736
 				),
737 737
 				'source_url' => array(
738
-					'label' => __('Source URL', 'gravityview'),
738
+					'label' => __( 'Source URL', 'gravityview' ),
739 739
 					'type' => 'source_url',
740
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
740
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
741 741
 				),
742 742
 				'ip' => array(
743
-					'label' => __('User IP', 'gravityview'),
743
+					'label' => __( 'User IP', 'gravityview' ),
744 744
 					'type' => 'ip',
745
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
745
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
746 746
 				),
747 747
 				'created_by' => array(
748
-					'label' => __('User', 'gravityview'),
748
+					'label' => __( 'User', 'gravityview' ),
749 749
 					'type' => 'created_by',
750
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
750
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
751 751
 				),
752 752
 
753 753
 				/**
754 754
 				 * @since 1.7.2
755 755
 				 */
756 756
 			    'other_entries' => array(
757
-				    'label'	=> __('Other Entries', 'gravityview'),
757
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
758 758
 				    'type'	=> 'other_entries',
759
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
759
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
760 760
 			    ),
761 761
 	        );
762 762
 
763
-			if( 'single' !== $zone) {
763
+			if ( 'single' !== $zone ) {
764 764
 
765
-				$entry_default_fields['entry_link'] = array(
766
-					'label' => __('Link to Entry', 'gravityview'),
767
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
765
+				$entry_default_fields[ 'entry_link' ] = array(
766
+					'label' => __( 'Link to Entry', 'gravityview' ),
767
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
768 768
 					'type' => 'entry_link',
769 769
 				);
770 770
 			}
@@ -774,19 +774,19 @@  discard block
 block discarded – undo
774 774
 		/**
775 775
 		 * @since  1.2
776 776
 		 */
777
-		$entry_default_fields['custom']	= array(
778
-			'label'	=> __('Custom Content', 'gravityview'),
777
+		$entry_default_fields[ 'custom' ] = array(
778
+			'label'	=> __( 'Custom Content', 'gravityview' ),
779 779
 			'type'	=> 'custom',
780
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
780
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
781 781
 		);
782 782
 
783 783
 		/**
784 784
 		 * @since develop
785 785
 		 */
786
-		$entry_default_fields['sequence'] = array(
787
-			'label'	=> __('Result Number', 'gravityview'),
786
+		$entry_default_fields[ 'sequence' ] = array(
787
+			'label'	=> __( 'Result Number', 'gravityview' ),
788 788
 			'type'	=> 'sequence',
789
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
789
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
790 790
 		);
791 791
 
792 792
 		/**
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 		 * @param  string|array $form form_ID or form object
796 796
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
797 797
 		 */
798
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
798
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
799 799
 	}
800 800
 
801 801
 	/**
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 	 */
807 807
 	function get_available_fields( $form = '', $zone = NULL ) {
808 808
 
809
-		if( empty( $form ) ) {
809
+		if ( empty( $form ) ) {
810 810
 			gravityview()->log->error( '$form is empty' );
811 811
 			return array();
812 812
 		}
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
 		$fields = gravityview_get_form_fields( $form, true );
816 816
 
817 817
 		// get meta fields ( only if form was already created )
818
-		if( !is_array( $form ) ) {
818
+		if ( ! is_array( $form ) ) {
819 819
 			$meta_fields = gravityview_get_entry_meta( $form );
820 820
 		} else {
821 821
 			$meta_fields = array();
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 		$fields = $fields + $meta_fields + $default_fields;
829 829
 
830 830
 		// Move Custom Content to top
831
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
831
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
832 832
 
833 833
 		/**
834 834
 		 * @filter `gravityview/admin/available_fields` Modify the available fields that can be used in a View.
@@ -848,11 +848,11 @@  discard block
 block discarded – undo
848 848
 
849 849
 		$widgets = $this->get_registered_widgets();
850 850
 
851
-		if( !empty( $widgets ) ) {
851
+		if ( ! empty( $widgets ) ) {
852 852
 
853
-			foreach( $widgets as $id => $details ) {
853
+			foreach ( $widgets as $id => $details ) {
854 854
 
855
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
855
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
856 856
 
857 857
 			}
858 858
 		}
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
882 882
 		global $post;
883 883
 
884
-		if( $type === 'widget' ) {
884
+		if ( $type === 'widget' ) {
885 885
 			$button_label = __( 'Add Widget', 'gravityview' );
886 886
 		} else {
887 887
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -893,10 +893,10 @@  discard block
 block discarded – undo
893 893
 		$form_id = null;
894 894
 
895 895
 		// if saved values, get available fields to label everyone
896
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
896
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
897 897
 
898
-			if( !empty( $_POST['template_id'] ) ) {
899
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
898
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
899
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
900 900
 			} else {
901 901
 				$form_id = $form = gravityview_get_form_id( $post->ID );
902 902
 			}
@@ -914,42 +914,42 @@  discard block
 block discarded – undo
914 914
 			}
915 915
 		}
916 916
 
917
-		foreach( $rows as $row ) :
918
-			foreach( $row as $col => $areas ) :
919
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
917
+		foreach ( $rows as $row ) :
918
+			foreach ( $row as $col => $areas ) :
919
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
920 920
 
921 921
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
922 922
 
923
-					<?php foreach( $areas as $area ) : 	?>
923
+					<?php foreach ( $areas as $area ) : 	?>
924 924
 
925
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
926
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
925
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
926
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
927 927
 								<?php // render saved fields
928
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
928
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
929 929
 
930
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
930
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
931 931
 
932 932
 										// Maybe has a form ID
933
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
933
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
934 934
 
935 935
 										$input_type = NULL;
936 936
 
937 937
 										if ( $form_id ) {
938
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
938
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
939 939
                                         } else {
940
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
940
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
941 941
                                         }
942 942
 
943
-										if ( !$original_item ) {
944
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
943
+										if ( ! $original_item ) {
944
+											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) );
945 945
 
946 946
 											$original_item = $field;
947 947
 										} else {
948
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
948
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
949 949
 										}
950 950
 
951 951
 										// Field options dialog box
952
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
952
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
953 953
 
954 954
 										$item = array(
955 955
 											'input_type' => $input_type,
@@ -962,22 +962,22 @@  discard block
 block discarded – undo
962 962
 											$item = wp_parse_args( $item, $original_item );
963 963
 										}
964 964
 
965
-										switch( $type ) {
965
+										switch ( $type ) {
966 966
 											case 'widget':
967
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
967
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
968 968
 												break;
969 969
 											default:
970
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
970
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
971 971
 										}
972 972
 									}
973 973
 
974 974
 								} // End if zone is not empty ?>
975 975
 
976
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
976
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
977 977
 							</div>
978 978
 							<div class="gv-droppable-area-action">
979
-								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></button>
980
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
979
+								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></button>
980
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
981 981
 							</div>
982 982
 						</div>
983 983
 
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
 				// This is a new View, prefill the widgets
1006 1006
 				$widgets = array(
1007 1007
 					'header_top' => array(
1008
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1008
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1009 1009
 							'id' => 'search_bar',
1010 1010
 							'label' => __( 'Search Bar', 'gravityview' ),
1011 1011
 							'search_layout' => 'horizontal',
@@ -1080,12 +1080,12 @@  discard block
 block discarded – undo
1080 1080
 		if ( $post ) {
1081 1081
 			$source_form_id = gravityview_get_form_id( $post->ID );
1082 1082
 			if ( $source_form_id ) {
1083
-				$form_ids[] = $source_form_id;
1083
+				$form_ids[ ] = $source_form_id;
1084 1084
 			}
1085 1085
 
1086 1086
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
1087 1087
 			foreach ( $joined_forms as $joined_form ) {
1088
-				$form_ids[] = $joined_form->ID;
1088
+				$form_ids[ ] = $joined_form->ID;
1089 1089
 			}
1090 1090
 		}
1091 1091
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1120,7 +1120,7 @@  discard block
 block discarded – undo
1120 1120
 	 * @return string HTML of the active areas
1121 1121
 	 */
1122 1122
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1123
-		if( empty( $template_id ) ) {
1123
+		if ( empty( $template_id ) ) {
1124 1124
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1125 1125
 			return '';
1126 1126
 		}
@@ -1134,12 +1134,12 @@  discard block
 block discarded – undo
1134 1134
 		 */
1135 1135
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1136 1136
 
1137
-		if( empty( $template_areas ) ) {
1137
+		if ( empty( $template_areas ) ) {
1138 1138
 
1139 1139
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1140 1140
 			$output = '<div>';
1141
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
1142
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
1141
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
1142
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
1143 1143
 			$output .= '</div>';
1144 1144
 		} else {
1145 1145
 
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 
1155 1155
 		}
1156 1156
 
1157
-		if( $echo ) {
1157
+		if ( $echo ) {
1158 1158
 			echo $output;
1159 1159
 		}
1160 1160
 
@@ -1174,32 +1174,32 @@  discard block
 block discarded – undo
1174 1174
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1175 1175
 
1176 1176
 		// Add the GV font (with the Astronaut)
1177
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1177
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1178 1178
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1179 1179
 
1180
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1180
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1181 1181
 
1182
-		if( GFForms::get_page() === 'form_list' ) {
1182
+		if ( GFForms::get_page() === 'form_list' ) {
1183 1183
 			wp_enqueue_style( 'gravityview_views_styles' );
1184 1184
 			return;
1185 1185
         }
1186 1186
 
1187 1187
 		// Don't process any scripts below here if it's not a GravityView page.
1188
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1188
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1189 1189
 		    return;
1190 1190
 		}
1191 1191
 
1192 1192
         wp_enqueue_script( 'jquery-ui-datepicker' );
1193
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1193
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1194 1194
 
1195
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1195
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1196 1196
 
1197 1197
         //enqueue scripts
1198 1198
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1199 1199
 
1200
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1200
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1201 1201
             'cookiepath' => COOKIEPATH,
1202
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1202
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1203 1203
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1204 1204
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1205 1205
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1214,7 +1214,7 @@  discard block
 block discarded – undo
1214 1214
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1215 1215
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1216 1216
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1217
-        ));
1217
+        ) );
1218 1218
 
1219 1219
 		wp_enqueue_style( 'gravityview_views_styles' );
1220 1220
 
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
1241 1241
 		);
1242 1242
 
1243 1243
 		if ( wp_is_mobile() ) {
1244
-		    $scripts[] = 'jquery-touch-punch';
1244
+		    $scripts[ ] = 'jquery-touch-punch';
1245 1245
 		}
1246 1246
 
1247 1247
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.