Completed
Pull Request — master (#1064)
by Zack
24:19 queued 19:34
created
future/includes/class-gv-form-gravityforms.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 		$self = new self();
56 56
 		$self->form = $form;
57 57
 
58
-		$self->ID = $self->form['id'];
58
+		$self->ID = $self->form[ 'id' ];
59 59
 
60 60
 		return $self;
61 61
 	}
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	 * @return \GV\GF_Form|null An instance of this form or null if not found.
71 71
 	 */
72 72
 	public static function from_form( $form ) {
73
-		if ( empty( $form['id'] ) ) {
73
+		if ( empty( $form[ 'id' ] ) ) {
74 74
 			return null;
75 75
 		}
76 76
 
77 77
 		$self = new self();
78 78
 		$self->form = $form;
79
-		$self->ID = $self->form['id'];
79
+		$self->ID = $self->form[ 'id' ];
80 80
 
81 81
 		return $self;
82 82
 	}
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
 
120 120
 			/** The offset and limit */
121 121
 			if ( ! empty( $offset->limit ) ) {
122
-				$paging['page_size'] = $offset->limit;
122
+				$paging[ 'page_size' ] = $offset->limit;
123 123
 			}
124 124
 
125 125
 			if ( ! empty( $offset->offset ) ) {
126
-				$paging['offset'] = $offset->offset;
126
+				$paging[ 'offset' ] = $offset->offset;
127 127
 			}
128 128
 
129 129
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
 	 */
181 181
 	public function get_fields() {
182 182
 		$fields = array();
183
-		foreach ( $this['fields'] as $field ) {
184
-			foreach ( empty( $field['inputs'] ) ? array( $field['id'] ) : wp_list_pluck( $field['inputs'], 'id' ) as $id ) {
183
+		foreach ( $this[ 'fields' ] as $field ) {
184
+			foreach ( empty( $field[ 'inputs' ] ) ? array( $field[ 'id' ] ) : wp_list_pluck( $field[ 'inputs' ], 'id' ) as $id ) {
185 185
 				if ( is_numeric( $id ) ) {
186 186
 					$fields[ $id ] = self::get_field( $this, $id );
187 187
 				} else {
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @return bool Whether the offset exists or not.
219 219
 	 */
220 220
 	public function offsetExists( $offset ) {
221
-		return isset( $this->form[$offset] );
221
+		return isset( $this->form[ $offset ] );
222 222
 	}
223 223
 
224 224
 	/**
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	 * @return mixed The value of the requested form data.
234 234
 	 */
235 235
 	public function offsetGet( $offset ) {
236
-		return $this->form[$offset];
236
+		return $this->form[ $offset ];
237 237
 	}
238 238
 
239 239
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-field-internal.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@
 block discarded – undo
29 29
 	 */
30 30
 	public static function from_configuration( $configuration ) {
31 31
 
32
-		if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) {
32
+		if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
33 33
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
34 34
 			return null;
35 35
 		}
36 36
 
37
-		$field = self::by_id( $configuration['id'] );
37
+		$field = self::by_id( $configuration[ 'id' ] );
38 38
 
39 39
 		$field->update_configuration( $configuration );
40 40
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 	}
51 51
 
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
64 64
 
65
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
65
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
66 66
 
67 67
 		$status = gform_get_meta( $entry_id, self::meta_key );
68 68
 
69 69
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
70 70
 
71
-		if( 'value' === $value_or_label ) {
71
+		if ( 'value' === $value_or_label ) {
72 72
 			return $status;
73 73
 		}
74 74
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 		$nonce = \GV\Utils::_POST( 'nonce' );
107 107
 
108 108
 		// Valid status
109
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
109
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
110 110
 
111 111
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
112 112
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 
138 138
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
139 139
 
140
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
140
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
141 141
 
142 142
 		}
143 143
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	 * @param $form array Gravity Forms form object
171 171
 	 */
172 172
 	public function after_submission( $entry, $form ) {
173
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
173
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
174 174
 	}
175 175
 
176 176
 	/**
@@ -184,12 +184,12 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
186 186
 
187
-		$approved_column = self::get_approved_column( $form['id'] );
187
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
188 188
 
189 189
 		/**
190 190
 		 * If the form doesn't contain the approve field, don't assume anything.
191 191
 		 */
192
-		if( empty( $approved_column ) ) {
192
+		if ( empty( $approved_column ) ) {
193 193
 			return;
194 194
 		}
195 195
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 			$value = GravityView_Entry_Approval_Status::APPROVED;
204 204
 		}
205 205
 
206
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
206
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
207 207
 	}
208 208
 
209 209
 	/**
@@ -221,12 +221,12 @@  discard block
 block discarded – undo
221 221
 	 */
222 222
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
223 223
 
224
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
224
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
225 225
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
226 226
 			return NULL;
227 227
 		}
228 228
 
229
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
229
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
230 230
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
231 231
 			return NULL;
232 232
 		}
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
 		$approved_column_id = self::get_approved_column( $form_id );
242 242
 
243 243
 		$success = true;
244
-		foreach( $entries as $entry_id ) {
244
+		foreach ( $entries as $entry_id ) {
245 245
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
246 246
 
247
-			if( ! $update_success ) {
247
+			if ( ! $update_success ) {
248 248
 				$success = false;
249 249
 			}
250 250
 		}
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
270 270
 
271
-		if( !class_exists( 'GFAPI' ) ) {
271
+		if ( ! class_exists( 'GFAPI' ) ) {
272 272
 			gravityview()->log->error( 'GFAPI does not exist' );
273 273
 			return false;
274 274
 		}
275 275
 
276
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
276
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
277 277
 			gravityview()->log->error( 'Not a valid approval value.' );
278 278
 			return false;
279 279
 		}
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		// If the form has an Approve/Reject field, update that value
291 291
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
292 292
 
293
-		if( is_wp_error( $result ) ) {
293
+		if ( is_wp_error( $result ) ) {
294 294
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
295 295
 			return false;
296 296
 		}
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 		// add note to entry if approval field updating worked or there was no approved field
304 304
 		// There's no validation for the meta
305
-		if( true === $result ) {
305
+		if ( true === $result ) {
306 306
 
307 307
 			// Add an entry note
308 308
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 
356 356
 		$note_id = false;
357 357
 
358
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
358
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
359 359
 
360 360
 			$current_user = wp_get_current_user();
361 361
 
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
379 379
 
380
-		if( empty( $approvedcolumn ) ) {
380
+		if ( empty( $approvedcolumn ) ) {
381 381
 			$approvedcolumn = self::get_approved_column( $form_id );
382 382
 		}
383 383
 
@@ -400,12 +400,12 @@  discard block
 block discarded – undo
400 400
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
401 401
 
402 402
 		$new_value = '';
403
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
403
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
404 404
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
405 405
 		}
406 406
 
407 407
 		//update entry
408
-		$entry["{$approvedcolumn}"] = $new_value;
408
+		$entry[ "{$approvedcolumn}" ] = $new_value;
409 409
 
410 410
 		/**
411 411
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -436,12 +436,12 @@  discard block
 block discarded – undo
436 436
 		// If the user has enabled a different value than the label (for some reason), use it.
437 437
 		// This is highly unlikely
438 438
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
439
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
439
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
440 440
 		}
441 441
 
442 442
 		// Otherwise, fall back on the inputs array
443 443
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
444
-			return $field->inputs[0]['label'];
444
+			return $field->inputs[ 0 ][ 'label' ];
445 445
 		}
446 446
 
447 447
 		return null;
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 
476 476
 		// update entry meta
477 477
 
478
-		if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
478
+		if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
479 479
 			gform_delete_meta( $entry_id, self::meta_key );
480 480
 		} else {
481 481
 			gform_update_meta( $entry_id, self::meta_key, $status, $form_id );
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 		 * @since 1.18 Added "unapproved"
499 499
 		 * @param  int $entry_id ID of the Gravity Forms entry
500 500
 		 */
501
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
501
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
502 502
 	}
503 503
 
504 504
 	/**
@@ -511,11 +511,11 @@  discard block
 block discarded – undo
511 511
 	 */
512 512
 	static public function get_approved_column( $form ) {
513 513
 
514
-		if( empty( $form ) ) {
514
+		if ( empty( $form ) ) {
515 515
 			return null;
516 516
 		}
517 517
 
518
-		if( !is_array( $form ) ) {
518
+		if ( ! is_array( $form ) ) {
519 519
 			$form = GVCommon::get_form( $form );
520 520
 		}
521 521
 
@@ -525,22 +525,22 @@  discard block
 block discarded – undo
525 525
 		 * @var string $key
526 526
 		 * @var GF_Field $field
527 527
 		 */
528
-		foreach( $form['fields'] as $key => $field ) {
528
+		foreach ( $form[ 'fields' ] as $key => $field ) {
529 529
 
530 530
 			$inputs = $field->get_entry_inputs();
531 531
 
532
-			if( !empty( $field->gravityview_approved ) ) {
533
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
534
-					$approved_column_id = $inputs[0]['id'];
532
+			if ( ! empty( $field->gravityview_approved ) ) {
533
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
534
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
535 535
 					break;
536 536
 				}
537 537
 			}
538 538
 
539 539
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
540
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
540
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
541 541
 				foreach ( $inputs as $input ) {
542
-					if ( 'approved' === strtolower( $input['label'] ) ) {
543
-						$approved_column_id = $input['id'];
542
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
543
+						$approved_column_id = $input[ 'id' ];
544 544
 						break;
545 545
 					}
546 546
 				}
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +176 added lines, -176 removed lines patch added patch discarded remove patch
@@ -28,30 +28,30 @@  discard block
 block discarded – undo
28 28
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
29 29
 
30 30
 		// Tooltips
31
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
31
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
32 32
 
33 33
 		// adding styles and scripts
34
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
35
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
38
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
39
-
40
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
41
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
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 );
34
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
35
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
38
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
39
+
40
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
41
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
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
 
54
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
54
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
55 55
 
56 56
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
57 57
 
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
73
+	    if ( ! gravityview()->request->is_view() ) {
74 74
 	        return $localization_data;
75 75
         }
76 76
 
77
-		$localization_data['suggest'] = array(
77
+		$localization_data[ 'suggest' ] = array(
78 78
             '57ef23539033602e61d4a560',
79 79
             '54c67bb9e4b0512429885513',
80 80
             '54c67bb9e4b0512429885512',
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
96 96
 		global $pagenow;
97 97
 
98
-		if ( !is_admin() ) {
98
+		if ( ! is_admin() ) {
99 99
 			return;
100 100
 		}
101 101
 
102
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
102
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
103 103
 
104
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
104
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -118,18 +118,18 @@  discard block
 block discarded – undo
118 118
 	function add_view_dropdown() {
119 119
 		$current_screen = get_current_screen();
120 120
 
121
-		if( 'gravityview' !== $current_screen->post_type ) {
121
+		if ( 'gravityview' !== $current_screen->post_type ) {
122 122
 			return;
123 123
 		}
124 124
 
125 125
 		$forms = gravityview_get_forms();
126 126
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
127 127
 		// If there are no forms to select, show no forms.
128
-		if( !empty( $forms ) ) { ?>
128
+		if ( ! empty( $forms ) ) { ?>
129 129
 			<select name="gravityview_form_id" id="gravityview_form_id">
130 130
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
131
-				<?php foreach( $forms as $form ) { ?>
132
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
131
+				<?php foreach ( $forms as $form ) { ?>
132
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
133 133
 				<?php } ?>
134 134
 			</select>
135 135
 		<?php }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
144 144
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
145
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
145
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
146 146
 	}
147 147
 
148 148
 	/**
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 
166 166
 		$connected_views = gravityview_get_connected_views( $id, array( 'post_status' => 'any' ) );
167 167
 
168
-		if( empty( $connected_views ) ) {
168
+		if ( empty( $connected_views ) ) {
169 169
 
170
-		    $menu_items['gravityview'] = array(
170
+		    $menu_items[ 'gravityview' ] = array(
171 171
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
172 172
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
173 173
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -183,22 +183,22 @@  discard block
 block discarded – undo
183 183
 		$sub_menu_items = array();
184 184
 		foreach ( (array)$connected_views as $view ) {
185 185
 
186
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
186
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
187 187
 				continue;
188 188
 			}
189 189
 
190
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
190
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
191 191
 
192
-			$sub_menu_items[] = array(
192
+			$sub_menu_items[ ] = array(
193 193
 				'label' => esc_attr( $label ),
194
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
194
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
195 195
 			);
196 196
 		}
197 197
 
198 198
 		// If there were no items added, then let's create the parent menu
199
-		if( $sub_menu_items ) {
199
+		if ( $sub_menu_items ) {
200 200
 
201
-		    $sub_menu_items[] = array(
201
+		    $sub_menu_items[ ] = array(
202 202
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
203 203
                 'link_class' => 'gv-create-view',
204 204
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -207,14 +207,14 @@  discard block
 block discarded – undo
207 207
             );
208 208
 
209 209
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
210
-			$sub_menu_items[] = array(
210
+			$sub_menu_items[ ] = array(
211 211
 				'url' => '#',
212 212
 				'label' => '',
213 213
 				'menu_class' => 'hidden',
214 214
 				'capabilities' => '',
215 215
 			);
216 216
 
217
-			$menu_items['gravityview'] = array(
217
+			$menu_items[ 'gravityview' ] = array(
218 218
 				'label'          => __( 'Connected Views', 'gravityview' ),
219 219
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
220 220
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -243,8 +243,8 @@  discard block
 block discarded – undo
243 243
 		$add = array( 'captcha', 'page' );
244 244
 
245 245
 		// Don't allowing editing the following values:
246
-		if( $context === 'edit' ) {
247
-			$add[] = 'post_id';
246
+		if ( $context === 'edit' ) {
247
+			$add[ ] = 'post_id';
248 248
 		}
249 249
 
250 250
 		$return = array_merge( $array, $add );
@@ -267,32 +267,32 @@  discard block
 block discarded – undo
267 267
 		foreach ( $default_args as $key => $arg ) {
268 268
 
269 269
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
270
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
270
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
271 271
 
272 272
 			// By default, use `tooltip` if defined.
273
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
273
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
274 274
 
275 275
 			// Otherwise, use the description as a tooltip.
276
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
277
-				$tooltip = $arg['desc'];
276
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
277
+				$tooltip = $arg[ 'desc' ];
278 278
 			}
279 279
 
280 280
 			// If there's no tooltip set, continue
281
-			if( empty( $tooltip ) ) {
281
+			if ( empty( $tooltip ) ) {
282 282
 				continue;
283 283
 			}
284 284
 
285 285
 			// Add the tooltip
286
-			$gv_tooltips[ 'gv_'.$key ] = array(
287
-				'title'	=> $arg['label'],
286
+			$gv_tooltips[ 'gv_' . $key ] = array(
287
+				'title'	=> $arg[ 'label' ],
288 288
 				'value'	=> $tooltip,
289 289
 			);
290 290
 
291 291
 		}
292 292
 
293
-		$gv_tooltips['gv_css_merge_tags'] = array(
294
-			'title' => __('CSS Merge Tags', 'gravityview'),
295
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
293
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
294
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
295
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
296 296
 		);
297 297
 
298 298
 		/**
@@ -310,9 +310,9 @@  discard block
 block discarded – undo
310 310
 
311 311
 		foreach ( $gv_tooltips as $key => $tooltip ) {
312 312
 
313
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
313
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
314 314
 
315
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
315
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
316 316
 		}
317 317
 
318 318
 		return $tooltips;
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 	 *
327 327
 	 * @return void
328 328
 	 */
329
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
329
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
330 330
 
331 331
 		$output = '';
332 332
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
349 349
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
350 350
 
351
-				$output = $template ? $template['label'] : $template_id_pretty;
351
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
352 352
 
353 353
 				break;
354 354
 
@@ -389,44 +389,44 @@  discard block
 block discarded – undo
389 389
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
390 390
 
391 391
 		// Either the form is empty or the form ID is 0, not yet set.
392
-		if( empty( $form ) ) {
392
+		if ( empty( $form ) ) {
393 393
 			return '';
394 394
 		}
395 395
 
396 396
 		// The $form is passed as the form ID
397
-		if( !is_array( $form ) ) {
397
+		if ( ! is_array( $form ) ) {
398 398
 			$form = gravityview_get_form( $form );
399 399
 		}
400 400
 
401
-		$form_id = $form['id'];
401
+		$form_id = $form[ 'id' ];
402 402
 		$links = array();
403 403
 
404
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
404
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
405 405
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
406
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
407
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
406
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
407
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
408 408
 		} else {
409
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
409
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
410 410
 		}
411 411
 
412
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
412
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
413 413
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
414
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
414
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
415 415
 		}
416 416
 
417
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
417
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
418 418
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
419
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
419
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
420 420
 		}
421 421
 
422
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
422
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
423 423
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
424
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
424
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
425 425
 		}
426 426
 
427 427
 		$output = '';
428 428
 
429
-		if( !empty( $include_form_link ) ) {
429
+		if ( ! empty( $include_form_link ) ) {
430 430
 			$output .= $form_link;
431 431
 		}
432 432
 
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 		 */
439 439
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
440 440
 
441
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
441
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
442 442
 
443 443
 		return $output;
444 444
 	}
@@ -452,8 +452,8 @@  discard block
 block discarded – undo
452 452
 		// Get the date column and save it for later to add back in.
453 453
 		// This adds it after the Data Source column.
454 454
 		// This way, we don't need to do array_slice, array_merge, etc.
455
-		$date = $columns['date'];
456
-		unset( $columns['date'] );
455
+		$date = $columns[ 'date' ];
456
+		unset( $columns[ 'date' ] );
457 457
 
458 458
 		$data_source_required_caps = array(
459 459
 			'gravityforms_edit_forms',
@@ -464,14 +464,14 @@  discard block
 block discarded – undo
464 464
 			'gravityforms_preview_forms',
465 465
 		);
466 466
 
467
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
468
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
467
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
468
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
469 469
 		}
470 470
 
471
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
471
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
472 472
 
473 473
 		// Add the date back in.
474
-		$columns['date'] = $date;
474
+		$columns[ 'date' ] = $date;
475 475
 
476 476
 		return $columns;
477 477
 	}
@@ -485,12 +485,12 @@  discard block
 block discarded – undo
485 485
 	 */
486 486
 	function save_postdata( $post_id ) {
487 487
 
488
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
488
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
489 489
 			return;
490 490
 		}
491 491
 
492 492
 		// validate post_type
493
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
493
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
494 494
 			return;
495 495
 		}
496 496
 
@@ -505,63 +505,63 @@  discard block
 block discarded – undo
505 505
 		$statii = array();
506 506
 
507 507
 		// check if this is a start fresh View
508
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
508
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
509 509
 
510
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
510
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
511 511
 			// save form id
512
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
512
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
513 513
 
514 514
 		}
515 515
 
516
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
516
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
517 517
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
518 518
 			return;
519 519
 		}
520 520
 
521 521
 		// Was this a start fresh?
522
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
523
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
522
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
523
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
524 524
 		} else {
525
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
525
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
526 526
 		}
527 527
 
528 528
 		// Check if we have a template id
529
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
529
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
530 530
 
531
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
531
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
532 532
 
533 533
 			// now save template id
534
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
534
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
535 535
 		}
536 536
 
537 537
 
538 538
 		// save View Configuration metabox
539
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
539
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
540 540
 
541 541
 			// template settings
542
-			if( empty( $_POST['template_settings'] ) ) {
543
-				$_POST['template_settings'] = array();
542
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
543
+				$_POST[ 'template_settings' ] = array();
544 544
 			}
545
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
545
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
546 546
 
547 547
 			$fields = array();
548 548
 
549 549
 			// Directory&single Visible Fields
550
-			if( !empty( $preset_fields ) ) {
550
+			if ( ! empty( $preset_fields ) ) {
551 551
 
552 552
 				$fields = $preset_fields;
553 553
 
554
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
554
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
555 555
 				$fields = _gravityview_process_posted_fields();
556 556
 			}
557 557
 
558
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
558
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
559 559
 
560 560
 			// Directory Visible Widgets
561
-			if( empty( $_POST['widgets'] ) ) {
562
-				$_POST['widgets'] = array();
561
+			if ( empty( $_POST[ 'widgets' ] ) ) {
562
+				$_POST[ 'widgets' ] = array();
563 563
 			}
564
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
564
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
565 565
 
566 566
 		} // end save view configuration
567 567
 
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 		 * @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.
572 572
 		 * @since 1.17.2
573 573
 		 */
574
-		do_action('gravityview_view_saved', $post_id, $statii );
574
+		do_action( 'gravityview_view_saved', $post_id, $statii );
575 575
 
576 576
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
577 577
 	}
@@ -615,20 +615,20 @@  discard block
 block discarded – undo
615 615
 
616 616
 		$output = '';
617 617
 
618
-		if( !empty( $fields ) ) {
618
+		if ( ! empty( $fields ) ) {
619 619
 
620
-			foreach( $fields as $id => $details ) {
620
+			foreach ( $fields as $id => $details ) {
621 621
 
622
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
622
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
623 623
 					continue;
624 624
 				}
625 625
 
626 626
 				// Edit mode only allows editing the parent fields, not single inputs.
627
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
627
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
628 628
 					continue;
629 629
 				}
630 630
 
631
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
631
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
632 632
 
633 633
 			} // End foreach
634 634
 		}
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 		echo $output;
637 637
 
638 638
 		// For the EDIT view we only want to allow the form fields.
639
-		if( $context === 'edit' ) {
639
+		if ( $context === 'edit' ) {
640 640
 			return;
641 641
 		}
642 642
 
@@ -660,16 +660,16 @@  discard block
 block discarded – undo
660 660
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
661 661
 			array(
662 662
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
663
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
663
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
664 664
 				'field_id' => 'all-fields',
665 665
 				'label_type' => 'field',
666 666
 				'input_type' => NULL,
667 667
 				'field_options' => NULL,
668 668
 				'settings_html'	=> NULL,
669 669
 			)
670
-		));
670
+		) );
671 671
 
672
-		if( !empty( $additional_fields )) {
672
+		if ( ! empty( $additional_fields ) ) {
673 673
 			foreach ( (array)$additional_fields as $item ) {
674 674
 
675 675
 				// Prevent items from not having index set
@@ -680,16 +680,16 @@  discard block
 block discarded – undo
680 680
 					'input_type' => NULL,
681 681
 					'field_options' => NULL,
682 682
 					'settings_html'	=> NULL,
683
-				));
683
+				) );
684 684
 
685 685
 				// Backward compat.
686
-				if( !empty( $item['field_options'] ) ) {
686
+				if ( ! empty( $item[ 'field_options' ] ) ) {
687 687
 					// Use settings_html from now on.
688
-					$item['settings_html'] = $item['field_options'];
688
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
689 689
 				}
690 690
 
691 691
 				// Render a label for each of them
692
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
692
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
693 693
 
694 694
 			}
695 695
 		}
@@ -702,54 +702,54 @@  discard block
 block discarded – undo
702 702
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
703 703
 	 * @return array
704 704
 	 */
705
-	function get_entry_default_fields($form, $zone) {
705
+	function get_entry_default_fields( $form, $zone ) {
706 706
 
707 707
 		$entry_default_fields = array();
708 708
 
709
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
709
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
710 710
 
711 711
 			$entry_default_fields = array(
712 712
 				'id' => array(
713
-					'label' => __('Entry ID', 'gravityview'),
713
+					'label' => __( 'Entry ID', 'gravityview' ),
714 714
 					'type' => 'id',
715
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
715
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
716 716
 				),
717 717
 				'date_created' => array(
718
-					'label' => __('Entry Date', 'gravityview'),
719
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
718
+					'label' => __( 'Entry Date', 'gravityview' ),
719
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
720 720
 					'type' => 'date_created',
721 721
 				),
722 722
 				'source_url' => array(
723
-					'label' => __('Source URL', 'gravityview'),
723
+					'label' => __( 'Source URL', 'gravityview' ),
724 724
 					'type' => 'source_url',
725
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
725
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
726 726
 				),
727 727
 				'ip' => array(
728
-					'label' => __('User IP', 'gravityview'),
728
+					'label' => __( 'User IP', 'gravityview' ),
729 729
 					'type' => 'ip',
730
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
730
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
731 731
 				),
732 732
 				'created_by' => array(
733
-					'label' => __('User', 'gravityview'),
733
+					'label' => __( 'User', 'gravityview' ),
734 734
 					'type' => 'created_by',
735
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
735
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
736 736
 				),
737 737
 
738 738
 				/**
739 739
 				 * @since 1.7.2
740 740
 				 */
741 741
 			    'other_entries' => array(
742
-				    'label'	=> __('Other Entries', 'gravityview'),
742
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
743 743
 				    'type'	=> 'other_entries',
744
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
744
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
745 745
 			    ),
746 746
 	        );
747 747
 
748
-			if( 'single' !== $zone) {
748
+			if ( 'single' !== $zone ) {
749 749
 
750
-				$entry_default_fields['entry_link'] = array(
751
-					'label' => __('Link to Entry', 'gravityview'),
752
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
750
+				$entry_default_fields[ 'entry_link' ] = array(
751
+					'label' => __( 'Link to Entry', 'gravityview' ),
752
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
753 753
 					'type' => 'entry_link',
754 754
 				);
755 755
 			}
@@ -759,10 +759,10 @@  discard block
 block discarded – undo
759 759
 		/**
760 760
 		 * @since  1.2
761 761
 		 */
762
-		$entry_default_fields['custom']	= array(
763
-			'label'	=> __('Custom Content', 'gravityview'),
762
+		$entry_default_fields[ 'custom' ] = array(
763
+			'label'	=> __( 'Custom Content', 'gravityview' ),
764 764
 			'type'	=> 'custom',
765
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
765
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
766 766
 		);
767 767
 
768 768
 		/**
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
 		 * @param  string|array $form form_ID or form object
772 772
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
773 773
 		 */
774
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
774
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
775 775
 	}
776 776
 
777 777
 	/**
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
 	 */
783 783
 	function get_available_fields( $form = '', $zone = NULL ) {
784 784
 
785
-		if( empty( $form ) ) {
785
+		if ( empty( $form ) ) {
786 786
 			gravityview()->log->error( '$form is empty' );
787 787
 			return array();
788 788
 		}
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 		$fields = gravityview_get_form_fields( $form, true );
792 792
 
793 793
 		// get meta fields ( only if form was already created )
794
-		if( !is_array( $form ) ) {
794
+		if ( ! is_array( $form ) ) {
795 795
 			$meta_fields = gravityview_get_entry_meta( $form );
796 796
 		} else {
797 797
 			$meta_fields = array();
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
 		$fields = $fields + $meta_fields + $default_fields;
805 805
 
806 806
 		// Move Custom Content to top
807
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
807
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
808 808
 
809 809
 		return $fields;
810 810
 	}
@@ -818,11 +818,11 @@  discard block
 block discarded – undo
818 818
 
819 819
 		$widgets = $this->get_registered_widgets();
820 820
 
821
-		if( !empty( $widgets ) ) {
821
+		if ( ! empty( $widgets ) ) {
822 822
 
823
-			foreach( $widgets as $id => $details ) {
823
+			foreach ( $widgets as $id => $details ) {
824 824
 
825
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
825
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
826 826
 
827 827
 			}
828 828
 		}
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
852 852
 		global $post;
853 853
 
854
-		if( $type === 'widget' ) {
854
+		if ( $type === 'widget' ) {
855 855
 			$button_label = __( 'Add Widget', 'gravityview' );
856 856
 		} else {
857 857
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -862,15 +862,15 @@  discard block
 block discarded – undo
862 862
 		$view = \GV\View::from_post( $post );
863 863
 
864 864
 		// if saved values, get available fields to label everyone
865
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
865
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
866 866
 
867
-			if( !empty( $_POST['template_id'] ) ) {
868
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
867
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
868
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
869 869
 			} else {
870 870
 				$form = gravityview_get_form_id( $post->ID );
871 871
 			}
872 872
 
873
-			if( 'field' === $type ) {
873
+			if ( 'field' === $type ) {
874 874
 				$available_items = $this->get_available_fields( $form, $zone );
875 875
 			} else {
876 876
 				$available_items = $this->get_registered_widgets();
@@ -878,42 +878,42 @@  discard block
 block discarded – undo
878 878
 
879 879
 		}
880 880
 
881
-		foreach( $rows as $row ) :
882
-			foreach( $row as $col => $areas ) :
883
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
881
+		foreach ( $rows as $row ) :
882
+			foreach ( $row as $col => $areas ) :
883
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
884 884
 
885 885
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
886 886
 
887
-					<?php foreach( $areas as $area ) : 	?>
887
+					<?php foreach ( $areas as $area ) : 	?>
888 888
 
889 889
 						<div class="gv-droppable-area">
890
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
890
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
891 891
 
892 892
 								<?php // render saved fields
893 893
 
894
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
894
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
895 895
 
896
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
896
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
897 897
 
898 898
 										$input_type = NULL;
899
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
899
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
900 900
 
901
-										if( !$original_item ) {
901
+										if ( ! $original_item ) {
902 902
 
903
-											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 ) ) );
903
+											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 ) ) );
904 904
 
905 905
 											$original_item = $field;
906 906
 										} else {
907 907
 
908
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
908
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
909 909
 
910 910
 										}
911 911
 
912 912
 										// Maybe has a form ID
913
-										$form_id = empty( $field['form_id'] ) ? null : $field['form_id'];
913
+										$form_id = empty( $field[ 'form_id' ] ) ? null : $field[ 'form_id' ];
914 914
 
915 915
 										// Field options dialog box
916
-										$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 );
916
+										$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 );
917 917
 
918 918
 										$item = array(
919 919
 											'input_type' => $input_type,
@@ -922,16 +922,16 @@  discard block
 block discarded – undo
922 922
 										);
923 923
 
924 924
 										// Merge the values with the current item to pass things like widget descriptions and original field names
925
-										if( $original_item ) {
925
+										if ( $original_item ) {
926 926
 											$item = wp_parse_args( $item, $original_item );
927 927
 										}
928 928
 
929
-										switch( $type ) {
929
+										switch ( $type ) {
930 930
 											case 'widget':
931
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
931
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
932 932
 												break;
933 933
 											default:
934
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
934
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
935 935
 										}
936 936
 
937 937
 
@@ -941,12 +941,12 @@  discard block
 block discarded – undo
941 941
 
942 942
 								} // End if zone is not empty ?>
943 943
 
944
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
944
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
945 945
 							</div>
946 946
 							<div class="gv-droppable-area-action">
947
-								<a href="#" 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 ); ?></a>
947
+								<a href="#" 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 ); ?></a>
948 948
 
949
-								<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>
949
+								<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>
950 950
 							</div>
951 951
 						</div>
952 952
 
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
968 968
 		$default_widget_areas = GravityView_Widget::get_default_widget_areas();
969 969
 
970 970
 		$widgets = array();
971
-		if( !empty( $post_id ) ) {
971
+		if ( ! empty( $post_id ) ) {
972 972
 			$widgets = gravityview_get_directory_widgets( $post_id );
973 973
 		}
974 974
 
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
997 997
 	 * @return string HTML of the active areas
998 998
 	 */
999 999
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1000
-		if( empty( $template_id ) ) {
1000
+		if ( empty( $template_id ) ) {
1001 1001
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1002 1002
 			return '';
1003 1003
 		}
@@ -1011,12 +1011,12 @@  discard block
 block discarded – undo
1011 1011
 		 */
1012 1012
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1013 1013
 
1014
-		if( empty( $template_areas ) ) {
1014
+		if ( empty( $template_areas ) ) {
1015 1015
 
1016 1016
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1017 1017
 			$output = '<div>';
1018
-			$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>';
1019
-			$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>';
1018
+			$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>';
1019
+			$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>';
1020 1020
 			$output .= '</div>';
1021 1021
 		} else {
1022 1022
 
@@ -1031,7 +1031,7 @@  discard block
 block discarded – undo
1031 1031
 
1032 1032
 		}
1033 1033
 
1034
-		if( $echo ) {
1034
+		if ( $echo ) {
1035 1035
 			echo $output;
1036 1036
 		}
1037 1037
 
@@ -1051,26 +1051,26 @@  discard block
 block discarded – undo
1051 1051
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1052 1052
 
1053 1053
 		// Add the GV font (with the Astronaut)
1054
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
1054
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
1055 1055
 
1056
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
1056
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1057 1057
 
1058 1058
 		// Don't process any scripts below here if it's not a GravityView page.
1059
-		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1059
+		if ( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1060 1060
 		    return;
1061 1061
 		}
1062 1062
 
1063 1063
         wp_enqueue_script( 'jquery-ui-datepicker' );
1064
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1064
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
1065 1065
 
1066
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1066
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1067 1067
 
1068 1068
         //enqueue scripts
1069 1069
         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' ), GravityView_Plugin::version );
1070 1070
 
1071
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1071
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1072 1072
             'cookiepath' => COOKIEPATH,
1073
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1073
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1074 1074
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1075 1075
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1076 1076
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1082,9 +1082,9 @@  discard block
 block discarded – undo
1082 1082
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1083 1083
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1084 1084
             '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' ),
1085
-        ));
1085
+        ) );
1086 1086
 
1087
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1087
+        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1088 1088
 
1089 1089
         // Enqueue scripts needed for merge tags
1090 1090
         self::enqueue_gravity_forms_scripts();
@@ -1109,7 +1109,7 @@  discard block
 block discarded – undo
1109 1109
 		);
1110 1110
 
1111 1111
 		if ( wp_is_mobile() ) {
1112
-		    $scripts[] = 'jquery-touch-punch';
1112
+		    $scripts[ ] = 'jquery-touch-punch';
1113 1113
 		}
1114 1114
 
1115 1115
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
future/includes/class-gv-request.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 */
46 46
 	public static function is_add_oembed_preview() {
47 47
 		/** The preview request is a parse-embed AJAX call without a type set. */
48
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
48
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
49 49
 	}
50 50
 
51 51
 	/**
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 * @return boolean
64 64
 	 */
65 65
 	public static function is_rest() {
66
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
66
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
67 67
 	}
68 68
 
69 69
 	/**
@@ -141,15 +141,15 @@  discard block
 block discarded – undo
141 141
 			$get = $_GET;
142 142
 		}
143 143
 
144
-		unset( $get['mode'] );
144
+		unset( $get[ 'mode' ] );
145 145
 
146
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
146
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
147 147
 			return true;
148 148
 		}
149 149
 
150 150
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
151 151
 
152
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
152
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
153 153
 	}
154 154
 
155 155
 	/**
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
172 172
 
173 173
 		$meta = array();
174 174
 		foreach ( $fields as $field ) {
175
-			if( empty( $field->_gf_field_class_name ) ) {
176
-				$meta[] = preg_quote( $field->name );
175
+			if ( empty( $field->_gf_field_class_name ) ) {
176
+				$meta[ ] = preg_quote( $field->name );
177 177
 			}
178 178
 		}
179 179
 
180 180
 		foreach ( $get as $key => $value ) {
181
-			if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
181
+			if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
182 182
 				$has_field_key = true;
183 183
 				break;
184 184
 			}
Please login to merge, or discard this patch.