Completed
Push — develop ( c1e96d...73f739 )
by Gennady
23:17 queued 11:06
created
includes/class-admin-approve-entries.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -109,27 +109,27 @@  discard block
 block discarded – undo
109 109
 		$approved_count = $disapproved_count = $unapproved_count = 0;
110 110
 
111 111
 		// Only count if necessary
112
-		if( $include_counts ) {
113
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
114
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
115
-			$unapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
112
+		if ( $include_counts ) {
113
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
114
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
115
+			$unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
116 116
 		}
117 117
 
118
-		$filter_links[] = array(
118
+		$filter_links[ ] = array(
119 119
 			'id'            => 'gv_approved',
120 120
 			'field_filters' => $field_filters_approved,
121 121
 			'count'         => $approved_count,
122 122
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
123 123
 		);
124 124
 
125
-		$filter_links[] = array(
125
+		$filter_links[ ] = array(
126 126
 			'id'            => 'gv_disapproved',
127 127
 			'field_filters' => $field_filters_disapproved,
128 128
 			'count'         => $disapproved_count,
129 129
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),
130 130
 		);
131 131
 
132
-		$filter_links[] = array(
132
+		$filter_links[ ] = array(
133 133
 			'id'            => 'gv_unapproved',
134 134
 			'field_filters' => $field_filters_unapproved,
135 135
 			'count'         => $unapproved_count,
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 	 */
149 149
 	function tooltips( $tooltips ) {
150 150
 
151
-		$tooltips['form_gravityview_fields'] = array(
152
-			'title' => __('GravityView Fields', 'gravityview'),
153
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
151
+		$tooltips[ 'form_gravityview_fields' ] = array(
152
+			'title' => __( 'GravityView Fields', 'gravityview' ),
153
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
154 154
 		);
155 155
 
156 156
 		return $tooltips;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$gv_bulk_action = false;
263 263
 
264
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
264
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
265 265
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
266 266
 		} else {
267 267
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 		}
270 270
 
271 271
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
272
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
272
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
273 273
 			$gv_bulk_action = $bulk_action;
274 274
 		}
275 275
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 
295 295
 		// gforms_entry_list is the nonce that confirms we're on the right page
296 296
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
297
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
297
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
298 298
 
299 299
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
300 300
 
@@ -312,13 +312,13 @@  discard block
 block discarded – undo
312 312
 			}
313 313
 
314 314
 			// All entries are set to be updated, not just the visible ones
315
-			if ( ! empty( $_POST['all_entries'] ) ) {
315
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
316 316
 
317 317
 				// Convert the current entry search into GF-formatted search criteria
318 318
 				$search = array(
319
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
320
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
321
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
319
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
320
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
321
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
322 322
 				);
323 323
 
324 324
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 			} else {
330 330
 
331 331
 				// Changed from 'lead' to 'entry' in 2.0
332
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
332
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
333 333
 
334 334
 			}
335 335
 
@@ -341,15 +341,15 @@  discard block
 block discarded – undo
341 341
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
342 342
 
343 343
 			switch ( $approved_status ) {
344
-				case $this->bulk_action_prefixes['approve']:
344
+				case $this->bulk_action_prefixes[ 'approve' ]:
345 345
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
346 346
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
347 347
 					break;
348
-				case $this->bulk_action_prefixes['unapprove']:
348
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
349 349
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
350 350
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
351 351
 					break;
352
-				case $this->bulk_action_prefixes['disapprove']:
352
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
353 353
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
354 354
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
355 355
 					break;
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
      *
372 372
 	 * @return boolean True: It worked; False: it failed
373 373
 	 */
374
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
374
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
375 375
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
376 376
 	}
377 377
 
@@ -401,20 +401,20 @@  discard block
 block discarded – undo
401 401
 	 *
402 402
 	 * @return void
403 403
 	 */
404
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
404
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
405 405
 
406
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
406
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
407 407
 			return;
408 408
 		}
409 409
 
410
-		if( empty( $entry['id'] ) ) {
410
+		if ( empty( $entry[ 'id' ] ) ) {
411 411
 			return;
412 412
 		}
413 413
 
414 414
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
415 415
 
416
-		if( $status_value ) {
417
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
416
+		if ( $status_value ) {
417
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
418 418
 		}
419 419
 	}
420 420
 
@@ -427,10 +427,10 @@  discard block
 block discarded – undo
427 427
 	 */
428 428
 	private function get_form_id() {
429 429
 
430
-		$form_id = GFForms::get('id');
430
+		$form_id = GFForms::get( 'id' );
431 431
 
432 432
 		// If there are no forms identified, use the first form. That's how GF does it.
433
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
433
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
434 434
 			$form_id = $this->get_first_form_id();
435 435
 		}
436 436
 
@@ -450,14 +450,14 @@  discard block
 block discarded – undo
450 450
 
451 451
 		$forms = RGFormsModel::get_forms( null, 'title' );
452 452
 
453
-		if( ! isset( $forms[0] ) ) {
453
+		if ( ! isset( $forms[ 0 ] ) ) {
454 454
 			gravityview()->log->error( 'No forms were found' );
455 455
 			return 0;
456 456
 		}
457 457
 
458
-		$first_form = $forms[0];
458
+		$first_form = $forms[ 0 ];
459 459
 
460
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
460
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
461 461
 
462 462
 		return intval( $form_id );
463 463
 	}
@@ -465,37 +465,37 @@  discard block
 block discarded – undo
465 465
 
466 466
 	function add_scripts_and_styles( $hook ) {
467 467
 
468
-		if( ! class_exists( 'GFForms' ) ) {
468
+		if ( ! class_exists( 'GFForms' ) ) {
469 469
 			gravityview()->log->error( 'GFForms does not exist.' );
470 470
 			return;
471 471
 		}
472 472
 
473 473
 		// enqueue styles & scripts gf_entries
474 474
 		// But only if we're on the main Entries page, not on reports pages
475
-		if( GFForms::get_page() !== 'entry_list' ) {
475
+		if ( GFForms::get_page() !== 'entry_list' ) {
476 476
 			return;
477 477
 		}
478 478
 
479 479
 		$form_id = $this->get_form_id();
480 480
 
481 481
 		// Things are broken; no forms were found
482
-		if( empty( $form_id ) ) {
482
+		if ( empty( $form_id ) ) {
483 483
 			return;
484 484
 		}
485 485
 
486
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
486
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
487 487
 
488
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
488
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
489 489
 
490
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
490
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
491 491
 
492 492
 		wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
493 493
 		wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
494 494
 		wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
495 495
 
496 496
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
497
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
498
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
497
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
498
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
499 499
 			'form_id' => $form_id,
500 500
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
501 501
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -504,10 +504,10 @@  discard block
 block discarded – undo
504 504
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
505 505
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
506 506
 			'bulk_message' => $this->bulk_update_message,
507
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
508
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
509
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
510
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
507
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
508
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
509
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
510
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
511 511
 			'column_link' => esc_url( $this->get_sort_link() ),
512 512
             'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
513 513
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
@@ -551,16 +551,16 @@  discard block
 block discarded – undo
551 551
 		$bulk_actions = array(
552 552
 			'GravityView' => array(
553 553
 				array(
554
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
555
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
554
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
555
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
556 556
 				),
557 557
 				array(
558
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
559
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
558
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
559
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
560 560
 				),
561 561
 				array(
562
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
563
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
562
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
563
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
564 564
 				),
565 565
 			),
566 566
 		);
@@ -577,13 +577,13 @@  discard block
 block discarded – undo
577 577
 		// Sanitize the values, just to be sure.
578 578
 		foreach ( $bulk_actions as $key => $group ) {
579 579
 
580
-		    if( empty( $group ) ) {
580
+		    if ( empty( $group ) ) {
581 581
 		        continue;
582 582
 		    }
583 583
 
584 584
 			foreach ( $group as $i => $action ) {
585
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
586
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
585
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
586
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
587 587
 			}
588 588
 		}
589 589
 
@@ -608,13 +608,13 @@  discard block
 block discarded – undo
608 608
 		 * @since 1.7.2
609 609
 		 * @param boolean $hide_if_no_connections
610 610
 		 */
611
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
611
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
612 612
 
613
-		if( $hide_if_no_connections ) {
613
+		if ( $hide_if_no_connections ) {
614 614
 
615 615
 			$connected_views = gravityview_get_connected_views( $form_id );
616 616
 
617
-			if( empty( $connected_views ) ) {
617
+			if ( empty( $connected_views ) ) {
618 618
 				$show_approve_column = false;
619 619
 			}
620 620
 		}
@@ -624,21 +624,21 @@  discard block
 block discarded – undo
624 624
 		 * @param boolean $show_approve_column Whether the column will be shown
625 625
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
626 626
 		 */
627
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
627
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
628 628
 
629 629
 		return $show_approve_column;
630 630
 	}
631 631
 
632 632
 	function register_gform_noconflict_script( $scripts ) {
633
-		$scripts[] = 'gravityview_gf_entries_scripts';
634
-		$scripts[] = 'gravityview_entries_list-popper';
635
-		$scripts[] = 'gravityview_entries_list-tippy';
633
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
634
+		$scripts[ ] = 'gravityview_entries_list-popper';
635
+		$scripts[ ] = 'gravityview_entries_list-tippy';
636 636
 		return $scripts;
637 637
 	}
638 638
 
639 639
 	function register_gform_noconflict_style( $styles ) {
640
-		$styles[] = 'gravityview_entries_list';
641
-		$styles[] = 'gravityview_entries_list-tippy';
640
+		$styles[ ] = 'gravityview_entries_list';
641
+		$styles[ ] = 'gravityview_entries_list-tippy';
642 642
 		return $styles;
643 643
 	}
644 644
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-approval.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 		$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
26 26
 
27
-		$this->description =  esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
27
+		$this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
28 28
 
29 29
 		$this->add_hooks();
30 30
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
48 48
 
49
-		unset( $field_options['only_loggedin'] );
49
+		unset( $field_options[ 'only_loggedin' ] );
50 50
 
51
-		unset( $field_options['new_window'] );
51
+		unset( $field_options[ 'new_window' ] );
52 52
 
53
-		unset( $field_options['show_as_link'] );
53
+		unset( $field_options[ 'show_as_link' ] );
54 54
 
55 55
 		return $field_options;
56 56
 	}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 		add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
72 72
 
73
-		add_action( 'gravityview_datatables_scripts_styles',  array( $this, 'enqueue_and_localize_script' ) );
73
+		add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
74 74
 
75 75
 		add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
76 76
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	public function maybe_prevent_field_render( $html, $args ) {
93 93
 
94 94
 		// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
95
-		if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
95
+		if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
96 96
 			return '';
97 97
 		}
98 98
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	public function modify_search_parameters( $parameters ) {
123 123
 
124 124
 		if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) {
125
-			$parameters['sorting']['key'] = 'is_approved';
125
+			$parameters[ 'sorting' ][ 'key' ] = 'is_approved';
126 126
 		}
127 127
 
128 128
 		return $parameters;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	function register_scripts_and_styles() {
139 139
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
140 140
 
141
-		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
141
+		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
142 142
 
143 143
 		wp_register_script( 'gravityview-field-approval-popper', GRAVITYVIEW_URL . 'assets/lib/tippy/popper.min.js', array(), GravityView_Plugin::version, true );
144 144
 		wp_register_script( 'gravityview-field-approval-tippy', GRAVITYVIEW_URL . 'assets/lib/tippy/tippy.min.js', array(), GravityView_Plugin::version, true );
@@ -146,14 +146,14 @@  discard block
 block discarded – undo
146 146
 
147 147
 		$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
148 148
 
149
-		if( class_exists( 'GravityView_View' ) ) {
149
+		if ( class_exists( 'GravityView_View' ) ) {
150 150
 			/**
151 151
 			 * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
152 152
 			 */
153 153
 			$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
154 154
 		}
155 155
 
156
-		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) )  );
156
+		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
157 157
 
158 158
 		/**
159 159
 		 * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 		 */
163 163
 		$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
164 164
 
165
-		if( ! empty( $style_url ) ) {
165
+		if ( ! empty( $style_url ) ) {
166 166
 			wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
167 167
 		}
168 168
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 	public function enqueue_and_localize_script() {
178 178
 
179 179
 		// The script is already registered and enqueued
180
-		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
180
+		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
181 181
 			return;
182 182
 		}
183 183
 
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
190 190
 
191 191
 		wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
192 192
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
193
-			'nonce' => wp_create_nonce('gravityview_entry_approval'),
193
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
194 194
 			'status' => GravityView_Entry_Approval_Status::get_all(),
195 195
 			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
196 196
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
197
-		));
197
+		) );
198 198
 
199 199
 	}
200 200
 
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
 	 */
212 212
 	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
213 213
 
214
-		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
215
-			$entry_default_fields["{$this->name}"] = array(
214
+		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
215
+			$entry_default_fields[ "{$this->name}" ] = array(
216 216
 				'label' => $this->label,
217 217
 				'desc'  => $this->description,
218 218
 				'type'  => $this->name,
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +47 added lines, -47 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
 		// autounapprove
51 51
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		$form = GFAPI::get_form( $entry['form_id'] );
97
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
98 98
 
99 99
 		if ( ! $form ) {
100
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
100
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
101 101
 			return;
102 102
 		}
103 103
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
116 116
 
117
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
117
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
121 121
 
122 122
 		return $notification_events;
123 123
 	}
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
137 137
 
138
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
138
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
139 139
 
140 140
 		$status = gform_get_meta( $entry_id, self::meta_key );
141 141
 
142 142
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
143 143
 
144
-		if( 'value' === $value_or_label ) {
144
+		if ( 'value' === $value_or_label ) {
145 145
 			return $status;
146 146
 		}
147 147
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$nonce = \GV\Utils::_POST( 'nonce' );
180 180
 
181 181
 		// Valid status
182
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
182
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
183 183
 
184 184
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
185 185
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
212 212
 
213
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
213
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
214 214
 
215 215
 		}
216 216
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 		}
273 273
 
274 274
 		// Set default
275
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
275
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
276 276
 
277 277
 		// Then check for if there is an approval column, and use that value instead
278
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
278
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
279 279
 	}
280 280
 
281 281
 	/**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
291 291
 
292
-		$approved_column = self::get_approved_column( $form['id'] );
292
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
293 293
 
294 294
 		/**
295 295
 		 * If the form doesn't contain the approve field, don't assume anything.
296 296
 		 */
297
-		if( empty( $approved_column ) ) {
297
+		if ( empty( $approved_column ) ) {
298 298
 			return;
299 299
 		}
300 300
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 			$value = GravityView_Entry_Approval_Status::APPROVED;
309 309
 		}
310 310
 
311
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
311
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
312 312
 	}
313 313
 
314 314
 	/**
@@ -326,12 +326,12 @@  discard block
 block discarded – undo
326 326
 	 */
327 327
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
328 328
 
329
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
329
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
330 330
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
331 331
 			return NULL;
332 332
 		}
333 333
 
334
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
334
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
335 335
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
336 336
 			return NULL;
337 337
 		}
@@ -346,10 +346,10 @@  discard block
 block discarded – undo
346 346
 		$approved_column_id = self::get_approved_column( $form_id );
347 347
 
348 348
 		$success = true;
349
-		foreach( $entries as $entry_id ) {
349
+		foreach ( $entries as $entry_id ) {
350 350
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
351 351
 
352
-			if( ! $update_success ) {
352
+			if ( ! $update_success ) {
353 353
 				$success = false;
354 354
 			}
355 355
 		}
@@ -373,12 +373,12 @@  discard block
 block discarded – undo
373 373
 	 */
374 374
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
375 375
 
376
-		if( !class_exists( 'GFAPI' ) ) {
376
+		if ( ! class_exists( 'GFAPI' ) ) {
377 377
 			gravityview()->log->error( 'GFAPI does not exist' );
378 378
 			return false;
379 379
 		}
380 380
 
381
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
381
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
382 382
 			gravityview()->log->error( 'Not a valid approval value.' );
383 383
 			return false;
384 384
 		}
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 		// If the form has an Approve/Reject field, update that value
396 396
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
397 397
 
398
-		if( is_wp_error( $result ) ) {
398
+		if ( is_wp_error( $result ) ) {
399 399
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
400 400
 			return false;
401 401
 		}
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 
408 408
 		// add note to entry if approval field updating worked or there was no approved field
409 409
 		// There's no validation for the meta
410
-		if( true === $result ) {
410
+		if ( true === $result ) {
411 411
 
412 412
 			// Add an entry note
413 413
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 
461 461
 		$note_id = false;
462 462
 
463
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
463
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
464 464
 
465 465
 			$current_user = wp_get_current_user();
466 466
 
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 	 */
483 483
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
484 484
 
485
-		if( empty( $approvedcolumn ) ) {
485
+		if ( empty( $approvedcolumn ) ) {
486 486
 			$approvedcolumn = self::get_approved_column( $form_id );
487 487
 		}
488 488
 
@@ -505,12 +505,12 @@  discard block
 block discarded – undo
505 505
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
506 506
 
507 507
 		$new_value = '';
508
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
508
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
509 509
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
510 510
 		}
511 511
 
512 512
 		//update entry
513
-		$entry["{$approvedcolumn}"] = $new_value;
513
+		$entry[ "{$approvedcolumn}" ] = $new_value;
514 514
 
515 515
 		/**
516 516
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -541,12 +541,12 @@  discard block
 block discarded – undo
541 541
 		// If the user has enabled a different value than the label (for some reason), use it.
542 542
 		// This is highly unlikely
543 543
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
544
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
544
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
545 545
 		}
546 546
 
547 547
 		// Otherwise, fall back on the inputs array
548 548
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
549
-			return $field->inputs[0]['label'];
549
+			return $field->inputs[ 0 ][ 'label' ];
550 550
 		}
551 551
 
552 552
 		return null;
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 		 * @since 1.18 Added "unapproved"
599 599
 		 * @param  int $entry_id ID of the Gravity Forms entry
600 600
 		 */
601
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
601
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
602 602
 	}
603 603
 
604 604
 	/**
@@ -611,11 +611,11 @@  discard block
 block discarded – undo
611 611
 	 */
612 612
 	static public function get_approved_column( $form ) {
613 613
 
614
-		if( empty( $form ) ) {
614
+		if ( empty( $form ) ) {
615 615
 			return null;
616 616
 		}
617 617
 
618
-		if( !is_array( $form ) ) {
618
+		if ( ! is_array( $form ) ) {
619 619
 			$form = GVCommon::get_form( $form );
620 620
 		}
621 621
 
@@ -625,22 +625,22 @@  discard block
 block discarded – undo
625 625
 		 * @var string $key
626 626
 		 * @var GF_Field $field
627 627
 		 */
628
-		foreach( $form['fields'] as $key => $field ) {
628
+		foreach ( $form[ 'fields' ] as $key => $field ) {
629 629
 
630 630
 			$inputs = $field->get_entry_inputs();
631 631
 
632
-			if( !empty( $field->gravityview_approved ) ) {
633
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
634
-					$approved_column_id = $inputs[0]['id'];
632
+			if ( ! empty( $field->gravityview_approved ) ) {
633
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
634
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
635 635
 					break;
636 636
 				}
637 637
 			}
638 638
 
639 639
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
640
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
640
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
641 641
 				foreach ( $inputs as $input ) {
642
-					if ( 'approved' === strtolower( $input['label'] ) ) {
643
-						$approved_column_id = $input['id'];
642
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
643
+						$approved_column_id = $input[ 'id' ];
644 644
 						break;
645 645
 					}
646 646
 				}
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 
667 667
 		$view_keys = array_keys( $gv_data->get_views() );
668 668
 
669
-		$view = \GV\View::by_id( $view_keys[0] );
669
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
670 670
 
671 671
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
672 672
 			return;
@@ -691,11 +691,11 @@  discard block
 block discarded – undo
691 691
 			return;
692 692
 		}
693 693
 
694
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
694
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
695 695
 			$approval_status = GravityView_Entry_Approval_Status::UNAPPROVED;
696 696
 		}
697 697
 
698
-		self::update_approved_meta( $entry_id, $approval_status, $form['id'] );
698
+		self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] );
699 699
 	}
700 700
 
701 701
 	/**
@@ -733,9 +733,9 @@  discard block
 block discarded – undo
733 733
 		$choices = GravityView_Entry_Approval_Status::get_all();
734 734
 
735 735
 		return <<<TEMPLATE
736
-<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a>
737
-<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a>
738
-<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a>
736
+<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a>
737
+<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a>
738
+<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a>
739 739
 TEMPLATE;
740 740
 	}
741 741
 }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -24,16 +24,16 @@  discard block
 block discarded – undo
24 24
 
25 25
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 			$base_id = null;
120 120
 
121 121
 			$is_single = gravityview_get_context() === 'single';
122
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
122
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
123 123
 			$field_compat = $gravityview_view->getCurrentField();
124 124
 		}
125 125
 
126 126
 		$output_arr = array();
127 127
 
128 128
 		// Get an array of file paths for the field.
129
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
129
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
130 130
 
131 131
 		// The $value JSON was probably truncated; let's check lead_detail_long.
132 132
 		if ( ! is_array( $file_paths ) ) {
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			$rendered = null;
146 146
 
147 147
 			// If the site is HTTPS, use HTTPS
148
-			if ( function_exists('set_url_scheme') ) {
148
+			if ( function_exists( 'set_url_scheme' ) ) {
149 149
 				$file_path = set_url_scheme( $file_path );
150 150
 			}
151 151
 
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
 			$file_path_info = pathinfo( $file_path );
157 157
 
158 158
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
159
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
160
-			$basename = $file_path_info['basename'];
159
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
160
+			$basename = $file_path_info[ 'basename' ];
161 161
 
162 162
 			// Get the secure download URL
163 163
 			$is_secure = false;
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 					 */
195 195
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
196 196
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
197
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
197
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
198 198
 					), $context );
199 199
 
200 200
 					/**
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 					 */
231 231
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
232 232
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
233
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
233
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
234 234
 					), $context );
235 235
 
236 236
 					/**
@@ -262,13 +262,13 @@  discard block
 block discarded – undo
262 262
 			} else if ( in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ) ) {
263 263
 				$image_atts = array(
264 264
 					'src'   => $file_path,
265
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
266
-					'alt'   => $field_settings['label'],
265
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
266
+					'alt'   => $field_settings[ 'label' ],
267 267
 					'width' => ( $is_single ? null : 250 )
268 268
 				);
269 269
 
270 270
 				if ( $is_secure ) {
271
-					$image_atts['validate_src'] = false;
271
+					$image_atts[ 'validate_src' ] = false;
272 272
 				}
273 273
 
274 274
 				/**
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 				$image = new GravityView_Image( $image_atts );
285 285
 
286
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
286
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
287 287
 
288 288
 				/**
289 289
 				 * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox.
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 				 */
295 295
 				$override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context );
296 296
 
297
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) {
297
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) {
298 298
 					$lightbox_link_atts = array(
299 299
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
300 300
 						'class' => 'thickbox',
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 					$lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context );
304 304
 
305 305
 					if ( $override_security ) {
306
-						$image_atts['src'] = $insecure_file_path;
306
+						$image_atts[ 'src' ] = $insecure_file_path;
307 307
 						$image = new GravityView_Image( $image_atts );
308 308
 						$file_path = $insecure_file_path;
309 309
 						// :( a kitten died somewhere
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 				}
316 316
 
317 317
 				// Show as link should render the image regardless.
318
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
318
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
319 319
 					$text = $rendered;
320 320
 				}
321 321
 			}
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
333 333
 
334 334
 			// Output textualized content where 
335
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
335
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
336 336
 				/**
337 337
 				 * Modify the link text (defaults to the file name)
338 338
 				 *
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 				 */
346 346
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
347 347
 
348
-				if ( empty( $field_settings['show_as_link'] ) ) {
348
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
349 349
 					/**
350 350
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
351 351
 					 * @param array|string $link_atts Array or attributes string
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 				$content = empty( $rendered ) ? $text : $rendered;
362 362
 			}
363 363
 
364
-			$output_arr[] = array(
364
+			$output_arr[ ] = array(
365 365
 				'file_path' => $file_path,
366 366
 				'content' => $content
367 367
 			);
Please login to merge, or discard this patch.
includes/class-ajax.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		 * Don't exit if we're running test suite.
37 37
 		 * @since 1.15
38 38
 		 */
39
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
39
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
40 40
 			return $mixed;
41 41
 		}
42 42
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @return void
51 51
 	 */
52 52
 	function check_ajax_nonce() {
53
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
53
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
54 54
 			$this->_exit( false );
55 55
 		}
56 56
 	}
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
 		//check nonce
68 68
 		$this->check_ajax_nonce();
69 69
 
70
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
70
+		$context = isset( $_POST[ 'context' ] ) ? esc_attr( $_POST[ 'context' ] ) : 'directory';
71 71
 
72 72
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
73
-		if( !empty( $_POST['form_id'] ) ) {
74
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
73
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
74
+			do_action( 'gravityview_render_available_fields', (int)$_POST[ 'form_id' ], $context );
75 75
 			$this->_exit();
76
-		} elseif( !empty( $_POST['template_id'] ) ) {
77
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
76
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
77
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
78 78
 
79 79
 			/** @see GravityView_Admin_Views::render_available_fields */
80 80
 			do_action( 'gravityview_render_available_fields', $form, $context );
@@ -96,17 +96,17 @@  discard block
 block discarded – undo
96 96
 	function get_active_areas() {
97 97
 		$this->check_ajax_nonce();
98 98
 
99
-		if( empty( $_POST['template_id'] ) ) {
99
+		if ( empty( $_POST[ 'template_id' ] ) ) {
100 100
 			$this->_exit( false );
101 101
 		}
102 102
 
103 103
 		ob_start();
104
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
105
-		$response['directory'] = ob_get_clean();
104
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
105
+		$response[ 'directory' ] = ob_get_clean();
106 106
 
107 107
 		ob_start();
108
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
109
-		$response['single'] = ob_get_clean();
108
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
109
+		$response[ 'single' ] = ob_get_clean();
110 110
 
111 111
 		$response = array_map( 'gravityview_strip_whitespace', $response );
112 112
 
@@ -121,20 +121,20 @@  discard block
 block discarded – undo
121 121
 
122 122
 		$this->check_ajax_nonce();
123 123
 
124
-		if( empty( $_POST['template_id'] ) ) {
124
+		if ( empty( $_POST[ 'template_id' ] ) ) {
125 125
 			$this->_exit( false );
126 126
 		}
127 127
 
128 128
 		// get the fields xml config file for this specific preset
129
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
129
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
130 130
 		// import fields
131
-		if( !empty( $preset_fields_path ) ) {
131
+		if ( ! empty( $preset_fields_path ) ) {
132 132
 			$presets = $this->import_fields( $preset_fields_path );
133 133
 		} else {
134 134
 			$presets = array( 'widgets' => array(), 'fields' => array() );
135 135
 		}
136 136
 
137
-		$template_id = esc_attr( $_POST['template_id'] );
137
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
138 138
 
139 139
 		// template areas
140 140
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -144,20 +144,20 @@  discard block
 block discarded – undo
144 144
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
145 145
 
146 146
 		ob_start();
147
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
148
-		$response['header'] = ob_get_clean();
147
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
148
+		$response[ 'header' ] = ob_get_clean();
149 149
 
150 150
 		ob_start();
151
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
152
-		$response['footer'] = ob_get_clean();
151
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
152
+		$response[ 'footer' ] = ob_get_clean();
153 153
 
154 154
 		ob_start();
155
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
156
-		$response['directory'] = ob_get_clean();
155
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
156
+		$response[ 'directory' ] = ob_get_clean();
157 157
 
158 158
 		ob_start();
159
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
160
-		$response['single'] = ob_get_clean();
159
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
160
+		$response[ 'single' ] = ob_get_clean();
161 161
 
162 162
 		$response = array_map( 'gravityview_strip_whitespace', $response );
163 163
 
@@ -175,26 +175,26 @@  discard block
 block discarded – undo
175 175
 
176 176
 		$this->check_ajax_nonce();
177 177
 
178
-		if( empty( $_POST['template_id'] ) ) {
178
+		if ( empty( $_POST[ 'template_id' ] ) ) {
179 179
 			gravityview()->log->error( 'Cannot create preset form; the template_id is empty.' );
180 180
 			$this->_exit( false );
181 181
 		}
182 182
 
183 183
 		// get the xml for this specific template_id
184
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
184
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
185 185
 
186 186
 		// import form
187 187
 		$form = $this->import_form( $preset_form_xml_path );
188 188
 
189 189
 		// get the form ID
190
-		if( false === $form ) {
190
+		if ( false === $form ) {
191 191
 			// send error to user
192
-			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int) $_POST['template_id'] ) );
192
+			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int)$_POST[ 'template_id' ] ) );
193 193
 
194 194
 			$this->_exit( false );
195 195
 		}
196 196
 
197
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
197
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
198 198
 
199 199
 	}
200 200
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
 		gravityview()->log->debug( '[import_form] Import Preset Form. (File) {path}', array( 'path' => $xml_or_json_path ) );
210 210
 
211
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
211
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
212 212
 			gravityview()->log->error( 'Class GFExport or file not found. file: {path}', array( 'path' => $xml_or_json_path ) );
213 213
 			return false;
214 214
 		}
@@ -220,13 +220,13 @@  discard block
 block discarded – undo
220 220
 		gravityview()->log->debug( '[import_form] Importing form (Result) {count}', array( 'count' => $count ) );
221 221
 		gravityview()->log->debug( '[import_form] Importing form (Form) ', array( 'data' => $forms ) );
222 222
 
223
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
223
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
224 224
 			gravityview()->log->error( 'Form Import Failed!' );
225 225
 			return false;
226 226
 		}
227 227
 
228 228
 		// import success - return form id
229
-		return $forms[0];
229
+		return $forms[ 0 ];
230 230
 	}
231 231
 
232 232
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	function get_field_options() {
241 241
 		$this->check_ajax_nonce();
242 242
 		
243
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
243
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
244 244
 			gravityview()->log->error( 'Required fields were not set in the $_POST request. ' );
245 245
 			$this->_exit( false );
246 246
 		}
@@ -252,11 +252,11 @@  discard block
 block discarded – undo
252 252
 		$_post = array_map( 'esc_attr', $_post );
253 253
 
254 254
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
255
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
256
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
255
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
256
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
257 257
 
258
-		$form_id = empty( $_post['form_id'] ) ? null : $_post['form_id'];
259
-		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
258
+		$form_id = empty( $_post[ 'form_id' ] ) ? null : $_post[ 'form_id' ];
259
+		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
260 260
 
261 261
 		$response = gravityview_strip_whitespace( $response );
262 262
 
@@ -277,15 +277,15 @@  discard block
 block discarded – undo
277 277
 		$form = '';
278 278
 
279 279
 		// if form id is set, use it, else, get form from preset
280
-		if( !empty( $_POST['form_id'] ) ) {
280
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
281 281
 
282
-			$form = (int) $_POST['form_id'];
282
+			$form = (int)$_POST[ 'form_id' ];
283 283
 
284 284
 		}
285 285
 		// get form from preset
286
-		elseif( !empty( $_POST['template_id'] ) ) {
286
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
287 287
 
288
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
288
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
289 289
 
290 290
 		}
291 291
 
@@ -301,27 +301,27 @@  discard block
 block discarded – undo
301 301
 	 * @param  string $template_id Preset template
302 302
 	 *
303 303
 	 */
304
-	static function pre_get_form_fields( $template_id = '') {
304
+	static function pre_get_form_fields( $template_id = '' ) {
305 305
 
306
-		if( empty( $template_id ) ) {
306
+		if ( empty( $template_id ) ) {
307 307
 			gravityview()->log->error( 'Template ID not set.' );
308 308
 			return false;
309 309
 		} else {
310 310
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
311
-			if( !file_exists( $form_file )  ) {
311
+			if ( ! file_exists( $form_file ) ) {
312 312
 				gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. File not found. file: {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
313 313
 				return false;
314 314
 			}
315 315
 		}
316 316
 
317 317
 		// Load xml parser (from GravityForms)
318
-		if( class_exists( 'GFCommon' ) ) {
318
+		if ( class_exists( 'GFCommon' ) ) {
319 319
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
320 320
 		} else {
321 321
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
322 322
 		}
323 323
 
324
-		if( file_exists( $xml_parser ) ) {
324
+		if ( file_exists( $xml_parser ) ) {
325 325
 			require_once( $xml_parser );
326 326
 		} else {
327 327
 			gravityview()->log->debug( ' - Gravity Forms XML Parser not found {path}.', array( 'path' => $xml_parser ) );
@@ -332,32 +332,32 @@  discard block
 block discarded – undo
332 332
 		$xmlstr = file_get_contents( $form_file );
333 333
 
334 334
         $options = array(
335
-            "page" => array("unserialize_as_array" => true),
336
-            "form"=> array("unserialize_as_array" => true),
337
-            "field"=> array("unserialize_as_array" => true),
338
-            "rule"=> array("unserialize_as_array" => true),
339
-            "choice"=> array("unserialize_as_array" => true),
340
-            "input"=> array("unserialize_as_array" => true),
341
-            "routing_item"=> array("unserialize_as_array" => true),
342
-            "creditCard"=> array("unserialize_as_array" => true),
343
-            "routin"=> array("unserialize_as_array" => true),
344
-            "confirmation" => array("unserialize_as_array" => true),
345
-            "notification" => array("unserialize_as_array" => true)
335
+            "page" => array( "unserialize_as_array" => true ),
336
+            "form"=> array( "unserialize_as_array" => true ),
337
+            "field"=> array( "unserialize_as_array" => true ),
338
+            "rule"=> array( "unserialize_as_array" => true ),
339
+            "choice"=> array( "unserialize_as_array" => true ),
340
+            "input"=> array( "unserialize_as_array" => true ),
341
+            "routing_item"=> array( "unserialize_as_array" => true ),
342
+            "creditCard"=> array( "unserialize_as_array" => true ),
343
+            "routin"=> array( "unserialize_as_array" => true ),
344
+            "confirmation" => array( "unserialize_as_array" => true ),
345
+            "notification" => array( "unserialize_as_array" => true )
346 346
         );
347 347
 
348
-		$xml = new RGXML($options);
349
-        $forms = $xml->unserialize($xmlstr);
348
+		$xml = new RGXML( $options );
349
+        $forms = $xml->unserialize( $xmlstr );
350 350
 
351
-        if( !$forms ) {
351
+        if ( ! $forms ) {
352 352
         	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353 353
         	return false;
354 354
         }
355 355
 
356
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
-        	$form = $forms[0];
356
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
357
+        	$form = $forms[ 0 ];
358 358
         }
359 359
 
360
-        if( empty( $form ) ) {
360
+        if ( empty( $form ) ) {
361 361
         	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362 362
         	return false;
363 363
         }
@@ -376,38 +376,38 @@  discard block
 block discarded – undo
376 376
 	 */
377 377
 	function import_fields( $file ) {
378 378
 
379
-		if( empty( $file ) || !file_exists(  $file ) ) {
379
+		if ( empty( $file ) || ! file_exists( $file ) ) {
380 380
 			gravityview()->log->error( 'Importing Preset Fields. File not found. (File) {path}', array( 'path' => $file ) );
381 381
 			return false;
382 382
 		}
383 383
 
384
-		if( !class_exists('WXR_Parser') ) {
384
+		if ( ! class_exists( 'WXR_Parser' ) ) {
385 385
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
386 386
 		}
387 387
 
388 388
 		$parser = new WXR_Parser();
389 389
 		$presets = $parser->parse( $file );
390 390
 
391
-		if(is_wp_error( $presets )) {
391
+		if ( is_wp_error( $presets ) ) {
392 392
 			gravityview()->log->error( 'Importing Preset Fields failed. Threw WP_Error.', array( 'data' => $presets ) );
393 393
 			return false;
394 394
 		}
395 395
 
396
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
396
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
397 397
 			gravityview()->log->error( 'Importing Preset Fields failed. Meta not found in file. {path}', array( 'path' => $file ) );
398 398
 			return false;
399 399
 		}
400 400
 
401
-		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets['posts'][0]['postmeta'] ) );
401
+		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) );
402 402
 
403 403
 		$fields = $widgets = array();
404
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
405
-			switch ($meta['key']) {
404
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
405
+			switch ( $meta[ 'key' ] ) {
406 406
 				case '_gravityview_directory_fields':
407
-					$fields = maybe_unserialize( $meta['value'] );
407
+					$fields = maybe_unserialize( $meta[ 'value' ] );
408 408
 					break;
409 409
 				case '_gravityview_directory_widgets':
410
-					$widgets = maybe_unserialize( $meta['value'] );
410
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
411 411
 					break;
412 412
 			}
413 413
 		}
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 		$this->api_data    = $_api_data;
41 41
 		$this->name        = plugin_basename( $_plugin_file );
42 42
 		$this->slug        = basename( $_plugin_file, '.php' );
43
-		$this->version     = $_api_data['version'];
44
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
45
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
46
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
43
+		$this->version     = $_api_data[ 'version' ];
44
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
45
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
46
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
47 47
 
48 48
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
49 49
 
@@ -147,11 +147,11 @@  discard block
 block discarded – undo
147 147
 			return;
148 148
 		}
149 149
 
150
-		if( ! current_user_can( 'update_plugins' ) ) {
150
+		if ( ! current_user_can( 'update_plugins' ) ) {
151 151
 			return;
152 152
 		}
153 153
 
154
-		if( ! is_multisite() ) {
154
+		if ( ! is_multisite() ) {
155 155
 			return;
156 156
 		}
157 157
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
248 248
 					esc_html( $version_info->new_version ),
249 249
 					'</a>',
250
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
250
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
251 251
 					'</a>'
252 252
 				);
253 253
 			}
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 			)
293 293
 		);
294 294
 
295
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
295
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
296 296
 
297 297
 		// Get the transient where we store the api request for this plugin for 24 hours
298 298
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
334 334
 		}
335 335
 
336
-		if( ! isset( $_data->plugin ) ) {
336
+		if ( ! isset( $_data->plugin ) ) {
337 337
 			$_data->plugin = $this->name;
338 338
 		}
339 339
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 
373 373
 		$verify_ssl = $this->verify_ssl();
374 374
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
375
-			$args['sslverify'] = $verify_ssl;
375
+			$args[ 'sslverify' ] = $verify_ssl;
376 376
 		}
377 377
 		return $args;
378 378
 
@@ -400,9 +400,9 @@  discard block
 block discarded – undo
400 400
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
401 401
 			$test_url_parts = parse_url( $this->api_url );
402 402
 
403
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
404
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
405
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
403
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
404
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
405
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
406 406
 
407 407
 			if ( empty( $host ) ) {
408 408
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -419,27 +419,27 @@  discard block
 block discarded – undo
419 419
 
420 420
 		$data = array_merge( $this->api_data, $_data );
421 421
 
422
-		if ( $data['slug'] != $this->slug ) {
422
+		if ( $data[ 'slug' ] != $this->slug ) {
423 423
 			return;
424 424
 		}
425 425
 
426
-		if( $this->api_url == trailingslashit ( home_url() ) ) {
426
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
427 427
 			return false; // Don't allow a plugin to ping itself
428 428
 		}
429 429
 
430 430
 		$api_params = array(
431 431
 			'edd_action' => 'get_version',
432
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
433
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
434
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
435
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
436
-			'slug'       => $data['slug'],
437
-			'author'     => $data['author'],
432
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
433
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
434
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
435
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
436
+			'slug'       => $data[ 'slug' ],
437
+			'author'     => $data[ 'author' ],
438 438
 			'url'        => home_url(),
439
-			'beta'       => ! empty( $data['beta'] ),
439
+			'beta'       => ! empty( $data[ 'beta' ] ),
440 440
 		);
441 441
 
442
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
442
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
443 443
 
444 444
 		if ( ! is_wp_error( $request ) ) {
445 445
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -459,9 +459,9 @@  discard block
 block discarded – undo
459 459
 			$request->icons = maybe_unserialize( $request->icons );
460 460
 		}
461 461
 
462
-		if( ! empty( $request->sections ) ) {
463
-			foreach( $request->sections as $key => $section ) {
464
-				$request->$key = (array) $section;
462
+		if ( ! empty( $request->sections ) ) {
463
+			foreach ( $request->sections as $key => $section ) {
464
+				$request->$key = (array)$section;
465 465
 			}
466 466
 		}
467 467
 
@@ -472,37 +472,37 @@  discard block
 block discarded – undo
472 472
 
473 473
 		global $edd_plugin_data;
474 474
 
475
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
475
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
476 476
 			return;
477 477
 		}
478 478
 
479
-		if( empty( $_REQUEST['plugin'] ) ) {
479
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
480 480
 			return;
481 481
 		}
482 482
 
483
-		if( empty( $_REQUEST['slug'] ) ) {
483
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
484 484
 			return;
485 485
 		}
486 486
 
487
-		if( ! current_user_can( 'update_plugins' ) ) {
487
+		if ( ! current_user_can( 'update_plugins' ) ) {
488 488
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
489 489
 		}
490 490
 
491
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
492
-		$beta         = ! empty( $data['beta'] ) ? true : false;
493
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
491
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
492
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
493
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
494 494
 		$version_info = $this->get_cached_version_info( $cache_key );
495 495
 
496
-		if( false === $version_info ) {
496
+		if ( false === $version_info ) {
497 497
 
498 498
 			$api_params = array(
499 499
 				'edd_action' => 'get_version',
500
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
501
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
502
-				'slug'       => $_REQUEST['slug'],
503
-				'author'     => $data['author'],
500
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
501
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
502
+				'slug'       => $_REQUEST[ 'slug' ],
503
+				'author'     => $data[ 'author' ],
504 504
 				'url'        => home_url(),
505
-				'beta'       => ! empty( $data['beta'] )
505
+				'beta'       => ! empty( $data[ 'beta' ] )
506 506
 			);
507 507
 
508 508
 			$verify_ssl = $this->verify_ssl();
@@ -519,9 +519,9 @@  discard block
 block discarded – undo
519 519
 				$version_info = false;
520 520
 			}
521 521
 
522
-			if( ! empty( $version_info ) ) {
523
-				foreach( $version_info->sections as $key => $section ) {
524
-					$version_info->$key = (array) $section;
522
+			if ( ! empty( $version_info ) ) {
523
+				foreach ( $version_info->sections as $key => $section ) {
524
+					$version_info->$key = (array)$section;
525 525
 				}
526 526
 			}
527 527
 
@@ -529,8 +529,8 @@  discard block
 block discarded – undo
529 529
 
530 530
 		}
531 531
 
532
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
533
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
532
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
533
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
534 534
 		}
535 535
 
536 536
 		exit;
@@ -538,29 +538,29 @@  discard block
 block discarded – undo
538 538
 
539 539
 	public function get_cached_version_info( $cache_key = '' ) {
540 540
 
541
-		if( empty( $cache_key ) ) {
541
+		if ( empty( $cache_key ) ) {
542 542
 			$cache_key = $this->cache_key;
543 543
 		}
544 544
 
545 545
 		$cache = get_option( $cache_key );
546 546
 
547
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
547
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
548 548
 			return false; // Cache is expired
549 549
 		}
550 550
 
551 551
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
552
-		$cache['value'] = json_decode( $cache['value'] );
553
-		if ( ! empty( $cache['value']->icons ) ) {
554
-			$cache['value']->icons = (array) $cache['value']->icons;
552
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
553
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
554
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
555 555
 		}
556 556
 
557
-		return $cache['value'];
557
+		return $cache[ 'value' ];
558 558
 
559 559
 	}
560 560
 
561 561
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
562 562
 
563
-		if( empty( $cache_key ) ) {
563
+		if ( empty( $cache_key ) ) {
564 564
 			$cache_key = $this->cache_key;
565 565
 		}
566 566
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 	 * @return bool
581 581
 	 */
582 582
 	private function verify_ssl() {
583
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
583
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
584 584
 	}
585 585
 
586 586
 }
Please login to merge, or discard this patch.
future/includes/class-gv-extension.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -180,13 +180,13 @@  discard block
 block discarded – undo
180 180
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
181 181
 
182 182
 		// Force the screen to be GravityView
183
-		$tab['screen'] = 'gravityview';
183
+		$tab[ 'screen' ] = 'gravityview';
184 184
 
185 185
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
186
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
186
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
187 187
 			\GravityView_Metabox_Tabs::add( $metabox );
188 188
 		} else {
189
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
189
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
190 190
 		}
191 191
 	}
192 192
 
@@ -211,14 +211,14 @@  discard block
 block discarded – undo
211 211
 	 */
212 212
 	protected function is_extension_supported() {
213 213
 
214
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
214
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
215 215
 
216 216
 		if ( ! function_exists( 'gravityview' ) ) {
217 217
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
218
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
219
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
220
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
221
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
218
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
219
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
220
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
221
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
222 222
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
223 223
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
224 224
 		} else {
@@ -258,12 +258,12 @@  discard block
 block discarded – undo
258 258
 
259 259
 		$locale = get_locale();
260 260
 
261
-		if ( function_exists('get_user_locale') && is_admin() ) {
261
+		if ( function_exists( 'get_user_locale' ) && is_admin() ) {
262 262
 			$locale = get_user_locale();
263 263
 		}
264 264
 
265 265
 		// Traditional WordPress plugin locale filter
266
-		$locale = apply_filters( 'plugin_locale',  $locale, $this->_text_domain );
266
+		$locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
267 267
 
268 268
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
269 269
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 	public function settings() {
292 292
 
293 293
 		// If doing ajax, get outta here
294
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
294
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
295 295
 			return;
296 296
 		}
297 297
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
             	'version'	=> $this->_version, // current version number
309 309
             	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
310 310
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
311
-            	'item_name' => $this->_title,  // name of this plugin
311
+            	'item_name' => $this->_title, // name of this plugin
312 312
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
313 313
           	)
314 314
         );
@@ -337,16 +337,16 @@  discard block
 block discarded – undo
337 337
 	 */
338 338
 	public static function add_notice( $notice = array() ) {
339 339
 
340
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
340
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
341 341
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
342 342
 			return;
343 343
 		} else if ( is_string( $notice ) ) {
344 344
 			$notice = array( 'message' => $notice );
345 345
 		}
346 346
 
347
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
347
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
348 348
 
349
-		self::$admin_notices []= $notice;
349
+		self::$admin_notices [ ] = $notice;
350 350
 	}
351 351
 
352 352
 	/**
@@ -360,8 +360,8 @@  discard block
 block discarded – undo
360 360
 		}
361 361
 
362 362
 		foreach ( self::$admin_notices as $key => $notice ) {
363
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
364
-			echo wpautop( $notice['message'] );
363
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
364
+			echo wpautop( $notice[ 'message' ] );
365 365
 			echo '<div class="clear"></div>';
366 366
 			echo '</div>';
367 367
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-sequence.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
39 39
 
40
-		unset ( $field_options['search_filter'] );
40
+		unset ( $field_options[ 'search_filter' ] );
41 41
 
42 42
 		$new_fields = array(
43 43
 			'start' => array(
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 			$total = $context->view->get_entries()->total();
85 85
 			remove_filter( 'gform_gf_query_sql', $callback );
86 86
 
87
-			unset( $sql_query['paginate'] );
87
+			unset( $sql_query[ 'paginate' ] );
88 88
 
89 89
 			global $wpdb;
90 90
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +183 added lines, -183 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') );
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' ) );
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
 	/**
@@ -168,13 +168,13 @@  discard block
 block discarded – undo
168 168
 
169 169
 		$priority = 0;
170 170
 
171
-		if( 'form_list' === GFForms::get_page() ) {
171
+		if ( 'form_list' === GFForms::get_page() ) {
172 172
 			$priority = 790;
173 173
         }
174 174
 
175
-		if( empty( $connected_views ) ) {
175
+		if ( empty( $connected_views ) ) {
176 176
 
177
-		    $menu_items['gravityview'] = array(
177
+		    $menu_items[ 'gravityview' ] = array(
178 178
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
179 179
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
180 180
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -190,22 +190,22 @@  discard block
 block discarded – undo
190 190
 		$sub_menu_items = array();
191 191
 		foreach ( (array)$connected_views as $view ) {
192 192
 
193
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
193
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
194 194
 				continue;
195 195
 			}
196 196
 
197
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
197
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
198 198
 
199
-			$sub_menu_items[] = array(
199
+			$sub_menu_items[ ] = array(
200 200
 				'label' => esc_attr( $label ),
201
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
201
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
202 202
 			);
203 203
 		}
204 204
 
205 205
 		// If there were no items added, then let's create the parent menu
206
-		if( $sub_menu_items ) {
206
+		if ( $sub_menu_items ) {
207 207
 
208
-		    $sub_menu_items[] = array(
208
+		    $sub_menu_items[ ] = array(
209 209
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
210 210
                 'link_class' => 'gv-create-view',
211 211
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -214,14 +214,14 @@  discard block
 block discarded – undo
214 214
             );
215 215
 
216 216
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
217
-			$sub_menu_items[] = array(
217
+			$sub_menu_items[ ] = array(
218 218
 				'url' => '#',
219 219
 				'label' => '',
220 220
 				'menu_class' => 'hidden',
221 221
 				'capabilities' => '',
222 222
 			);
223 223
 
224
-			$menu_items['gravityview'] = array(
224
+			$menu_items[ 'gravityview' ] = array(
225 225
 				'label'          => __( 'Connected Views', 'gravityview' ),
226 226
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
227 227
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -250,8 +250,8 @@  discard block
 block discarded – undo
250 250
 		$add = array( 'captcha', 'page' );
251 251
 
252 252
 		// Don't allowing editing the following values:
253
-		if( $context === 'edit' ) {
254
-			$add[] = 'post_id';
253
+		if ( $context === 'edit' ) {
254
+			$add[ ] = 'post_id';
255 255
 		}
256 256
 
257 257
 		$return = array_merge( $array, $add );
@@ -274,32 +274,32 @@  discard block
 block discarded – undo
274 274
 		foreach ( $default_args as $key => $arg ) {
275 275
 
276 276
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
277
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
277
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
278 278
 
279 279
 			// By default, use `tooltip` if defined.
280
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
280
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
281 281
 
282 282
 			// Otherwise, use the description as a tooltip.
283
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
284
-				$tooltip = $arg['desc'];
283
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
284
+				$tooltip = $arg[ 'desc' ];
285 285
 			}
286 286
 
287 287
 			// If there's no tooltip set, continue
288
-			if( empty( $tooltip ) ) {
288
+			if ( empty( $tooltip ) ) {
289 289
 				continue;
290 290
 			}
291 291
 
292 292
 			// Add the tooltip
293
-			$gv_tooltips[ 'gv_'.$key ] = array(
294
-				'title'	=> $arg['label'],
293
+			$gv_tooltips[ 'gv_' . $key ] = array(
294
+				'title'	=> $arg[ 'label' ],
295 295
 				'value'	=> $tooltip,
296 296
 			);
297 297
 
298 298
 		}
299 299
 
300
-		$gv_tooltips['gv_css_merge_tags'] = array(
301
-			'title' => __('CSS Merge Tags', 'gravityview'),
302
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
300
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
301
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
302
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
303 303
 		);
304 304
 
305 305
 		/**
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
 
318 318
 		foreach ( $gv_tooltips as $key => $tooltip ) {
319 319
 
320
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
320
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
321 321
 
322
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
322
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
323 323
 		}
324 324
 
325 325
 		return $tooltips;
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 *
334 334
 	 * @return void
335 335
 	 */
336
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
336
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
337 337
 
338 338
 		$output = '';
339 339
 
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
356 356
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
357 357
 
358
-				$output = $template ? $template['label'] : $template_id_pretty;
358
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
359 359
 
360 360
 				break;
361 361
 
@@ -396,44 +396,44 @@  discard block
 block discarded – undo
396 396
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
397 397
 
398 398
 		// Either the form is empty or the form ID is 0, not yet set.
399
-		if( empty( $form ) ) {
399
+		if ( empty( $form ) ) {
400 400
 			return '';
401 401
 		}
402 402
 
403 403
 		// The $form is passed as the form ID
404
-		if( !is_array( $form ) ) {
404
+		if ( ! is_array( $form ) ) {
405 405
 			$form = gravityview_get_form( $form );
406 406
 		}
407 407
 
408
-		$form_id = $form['id'];
408
+		$form_id = $form[ 'id' ];
409 409
 		$links = array();
410 410
 
411
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
411
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
412 412
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
413
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
414
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
413
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
414
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
415 415
 		} else {
416
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
416
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
417 417
 		}
418 418
 
419
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
419
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
420 420
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
421
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
421
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
422 422
 		}
423 423
 
424
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
424
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
425 425
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
426
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
426
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
427 427
 		}
428 428
 
429
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
429
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
430 430
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
431
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
431
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
432 432
 		}
433 433
 
434 434
 		$output = '';
435 435
 
436
-		if( !empty( $include_form_link ) ) {
436
+		if ( ! empty( $include_form_link ) ) {
437 437
 			$output .= $form_link;
438 438
 		}
439 439
 
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 		 */
446 446
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
447 447
 
448
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
448
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
449 449
 
450 450
 		return $output;
451 451
 	}
@@ -459,8 +459,8 @@  discard block
 block discarded – undo
459 459
 		// Get the date column and save it for later to add back in.
460 460
 		// This adds it after the Data Source column.
461 461
 		// This way, we don't need to do array_slice, array_merge, etc.
462
-		$date = $columns['date'];
463
-		unset( $columns['date'] );
462
+		$date = $columns[ 'date' ];
463
+		unset( $columns[ 'date' ] );
464 464
 
465 465
 		$data_source_required_caps = array(
466 466
 			'gravityforms_edit_forms',
@@ -471,14 +471,14 @@  discard block
 block discarded – undo
471 471
 			'gravityforms_preview_forms',
472 472
 		);
473 473
 
474
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
475
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
474
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
475
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
476 476
 		}
477 477
 
478
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
478
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
479 479
 
480 480
 		// Add the date back in.
481
-		$columns['date'] = $date;
481
+		$columns[ 'date' ] = $date;
482 482
 
483 483
 		return $columns;
484 484
 	}
@@ -492,12 +492,12 @@  discard block
 block discarded – undo
492 492
 	 */
493 493
 	function save_postdata( $post_id ) {
494 494
 
495
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
495
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
496 496
 			return;
497 497
 		}
498 498
 
499 499
 		// validate post_type
500
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
500
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
501 501
 			return;
502 502
 		}
503 503
 
@@ -512,65 +512,65 @@  discard block
 block discarded – undo
512 512
 		$statii = array();
513 513
 
514 514
 		// check if this is a start fresh View
515
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
515
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
516 516
 
517
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
517
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
518 518
 			// save form id
519
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
519
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
520 520
 
521 521
 		}
522 522
 
523
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
523
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
524 524
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
525 525
 			return;
526 526
 		}
527 527
 
528 528
 		// Was this a start fresh?
529
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
530
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
529
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
530
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
531 531
 		} else {
532
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
532
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
533 533
 		}
534 534
 
535 535
 		// Check if we have a template id
536
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
536
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
537 537
 
538
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
538
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
539 539
 
540 540
 			// now save template id
541
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
541
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
542 542
 		}
543 543
 
544 544
 
545 545
 		// save View Configuration metabox
546
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
546
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
547 547
 
548 548
 			// template settings
549
-			if( empty( $_POST['template_settings'] ) ) {
550
-				$_POST['template_settings'] = array();
549
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
550
+				$_POST[ 'template_settings' ] = array();
551 551
 			}
552
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
552
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
553 553
 
554 554
 			$fields = array();
555 555
 
556 556
 			// Directory&single Visible Fields
557
-			if( !empty( $preset_fields ) ) {
557
+			if ( ! empty( $preset_fields ) ) {
558 558
 
559 559
 				$fields = $preset_fields;
560 560
 
561
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
561
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
562 562
 				$fields = _gravityview_process_posted_fields();
563 563
 			}
564 564
 
565 565
 			$fields = wp_slash( $fields );
566 566
 
567
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
567
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
568 568
 
569 569
 			// Directory Visible Widgets
570
-			if( empty( $_POST['widgets'] ) ) {
571
-				$_POST['widgets'] = array();
570
+			if ( empty( $_POST[ 'widgets' ] ) ) {
571
+				$_POST[ 'widgets' ] = array();
572 572
 			}
573
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
573
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
574 574
 
575 575
 		} // end save view configuration
576 576
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 		 * @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.
581 581
 		 * @since 1.17.2
582 582
 		 */
583
-		do_action('gravityview_view_saved', $post_id, $statii );
583
+		do_action( 'gravityview_view_saved', $post_id, $statii );
584 584
 
585 585
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
586 586
 	}
@@ -624,20 +624,20 @@  discard block
 block discarded – undo
624 624
 
625 625
 		$output = '';
626 626
 
627
-		if( !empty( $fields ) ) {
627
+		if ( ! empty( $fields ) ) {
628 628
 
629
-			foreach( $fields as $id => $details ) {
629
+			foreach ( $fields as $id => $details ) {
630 630
 
631
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
631
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
632 632
 					continue;
633 633
 				}
634 634
 
635 635
 				// Edit mode only allows editing the parent fields, not single inputs.
636
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
636
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
637 637
 					continue;
638 638
 				}
639 639
 
640
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
640
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
641 641
 
642 642
 			} // End foreach
643 643
 		}
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
 		echo $output;
646 646
 
647 647
 		// For the EDIT view we only want to allow the form fields.
648
-		if( $context === 'edit' ) {
648
+		if ( $context === 'edit' ) {
649 649
 			return;
650 650
 		}
651 651
 
@@ -669,16 +669,16 @@  discard block
 block discarded – undo
669 669
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
670 670
 			array(
671 671
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
672
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
672
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
673 673
 				'field_id' => 'all-fields',
674 674
 				'label_type' => 'field',
675 675
 				'input_type' => NULL,
676 676
 				'field_options' => NULL,
677 677
 				'settings_html'	=> NULL,
678 678
 			)
679
-		));
679
+		) );
680 680
 
681
-		if( !empty( $additional_fields )) {
681
+		if ( ! empty( $additional_fields ) ) {
682 682
 			foreach ( (array)$additional_fields as $item ) {
683 683
 
684 684
 				// Prevent items from not having index set
@@ -689,16 +689,16 @@  discard block
 block discarded – undo
689 689
 					'input_type' => NULL,
690 690
 					'field_options' => NULL,
691 691
 					'settings_html'	=> NULL,
692
-				));
692
+				) );
693 693
 
694 694
 				// Backward compat.
695
-				if( !empty( $item['field_options'] ) ) {
695
+				if ( ! empty( $item[ 'field_options' ] ) ) {
696 696
 					// Use settings_html from now on.
697
-					$item['settings_html'] = $item['field_options'];
697
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
698 698
 				}
699 699
 
700 700
 				// Render a label for each of them
701
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
701
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
702 702
 
703 703
 			}
704 704
 		}
@@ -711,54 +711,54 @@  discard block
 block discarded – undo
711 711
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
712 712
 	 * @return array
713 713
 	 */
714
-	function get_entry_default_fields($form, $zone) {
714
+	function get_entry_default_fields( $form, $zone ) {
715 715
 
716 716
 		$entry_default_fields = array();
717 717
 
718
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
718
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
719 719
 
720 720
 			$entry_default_fields = array(
721 721
 				'id' => array(
722
-					'label' => __('Entry ID', 'gravityview'),
722
+					'label' => __( 'Entry ID', 'gravityview' ),
723 723
 					'type' => 'id',
724
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
724
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
725 725
 				),
726 726
 				'date_created' => array(
727
-					'label' => __('Entry Date', 'gravityview'),
728
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
727
+					'label' => __( 'Entry Date', 'gravityview' ),
728
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
729 729
 					'type' => 'date_created',
730 730
 				),
731 731
 				'source_url' => array(
732
-					'label' => __('Source URL', 'gravityview'),
732
+					'label' => __( 'Source URL', 'gravityview' ),
733 733
 					'type' => 'source_url',
734
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
734
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
735 735
 				),
736 736
 				'ip' => array(
737
-					'label' => __('User IP', 'gravityview'),
737
+					'label' => __( 'User IP', 'gravityview' ),
738 738
 					'type' => 'ip',
739
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
739
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
740 740
 				),
741 741
 				'created_by' => array(
742
-					'label' => __('User', 'gravityview'),
742
+					'label' => __( 'User', 'gravityview' ),
743 743
 					'type' => 'created_by',
744
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
744
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
745 745
 				),
746 746
 
747 747
 				/**
748 748
 				 * @since 1.7.2
749 749
 				 */
750 750
 			    'other_entries' => array(
751
-				    'label'	=> __('Other Entries', 'gravityview'),
751
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
752 752
 				    'type'	=> 'other_entries',
753
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
753
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
754 754
 			    ),
755 755
 	        );
756 756
 
757
-			if( 'single' !== $zone) {
757
+			if ( 'single' !== $zone ) {
758 758
 
759
-				$entry_default_fields['entry_link'] = array(
760
-					'label' => __('Link to Entry', 'gravityview'),
761
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
759
+				$entry_default_fields[ 'entry_link' ] = array(
760
+					'label' => __( 'Link to Entry', 'gravityview' ),
761
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
762 762
 					'type' => 'entry_link',
763 763
 				);
764 764
 			}
@@ -768,19 +768,19 @@  discard block
 block discarded – undo
768 768
 		/**
769 769
 		 * @since  1.2
770 770
 		 */
771
-		$entry_default_fields['custom']	= array(
772
-			'label'	=> __('Custom Content', 'gravityview'),
771
+		$entry_default_fields[ 'custom' ] = array(
772
+			'label'	=> __( 'Custom Content', 'gravityview' ),
773 773
 			'type'	=> 'custom',
774
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
774
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
775 775
 		);
776 776
 
777 777
 		/**
778 778
 		 * @since develop
779 779
 		 */
780
-		$entry_default_fields['sequence'] = array(
781
-			'label'	=> __('Result Number', 'gravityview'),
780
+		$entry_default_fields[ 'sequence' ] = array(
781
+			'label'	=> __( 'Result Number', 'gravityview' ),
782 782
 			'type'	=> 'sequence',
783
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
783
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
784 784
 		);
785 785
 
786 786
 		/**
@@ -789,7 +789,7 @@  discard block
 block discarded – undo
789 789
 		 * @param  string|array $form form_ID or form object
790 790
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
791 791
 		 */
792
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
792
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
793 793
 	}
794 794
 
795 795
 	/**
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 	 */
801 801
 	function get_available_fields( $form = '', $zone = NULL ) {
802 802
 
803
-		if( empty( $form ) ) {
803
+		if ( empty( $form ) ) {
804 804
 			gravityview()->log->error( '$form is empty' );
805 805
 			return array();
806 806
 		}
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
 		$fields = gravityview_get_form_fields( $form, true );
810 810
 
811 811
 		// get meta fields ( only if form was already created )
812
-		if( !is_array( $form ) ) {
812
+		if ( ! is_array( $form ) ) {
813 813
 			$meta_fields = gravityview_get_entry_meta( $form );
814 814
 		} else {
815 815
 			$meta_fields = array();
@@ -822,7 +822,7 @@  discard block
 block discarded – undo
822 822
 		$fields = $fields + $meta_fields + $default_fields;
823 823
 
824 824
 		// Move Custom Content to top
825
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
825
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
826 826
 
827 827
 		return $fields;
828 828
 	}
@@ -836,11 +836,11 @@  discard block
 block discarded – undo
836 836
 
837 837
 		$widgets = $this->get_registered_widgets();
838 838
 
839
-		if( !empty( $widgets ) ) {
839
+		if ( ! empty( $widgets ) ) {
840 840
 
841
-			foreach( $widgets as $id => $details ) {
841
+			foreach ( $widgets as $id => $details ) {
842 842
 
843
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
843
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
844 844
 
845 845
 			}
846 846
 		}
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
870 870
 		global $post;
871 871
 
872
-		if( $type === 'widget' ) {
872
+		if ( $type === 'widget' ) {
873 873
 			$button_label = __( 'Add Widget', 'gravityview' );
874 874
 		} else {
875 875
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -881,10 +881,10 @@  discard block
 block discarded – undo
881 881
 		$form_id = null;
882 882
 
883 883
 		// if saved values, get available fields to label everyone
884
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
884
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
885 885
 
886
-			if( !empty( $_POST['template_id'] ) ) {
887
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
886
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
887
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
888 888
 			} else {
889 889
 				$form_id = $form = gravityview_get_form_id( $post->ID );
890 890
 			}
@@ -902,44 +902,44 @@  discard block
 block discarded – undo
902 902
 			}
903 903
 		}
904 904
 
905
-		foreach( $rows as $row ) :
906
-			foreach( $row as $col => $areas ) :
907
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
905
+		foreach ( $rows as $row ) :
906
+			foreach ( $row as $col => $areas ) :
907
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
908 908
 
909 909
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
910 910
 
911
-					<?php foreach( $areas as $area ) : 	?>
911
+					<?php foreach ( $areas as $area ) : 	?>
912 912
 
913
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
914
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
913
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
914
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
915 915
 
916 916
 								<?php // render saved fields
917 917
 
918
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
918
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
919 919
 
920
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
920
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
921 921
 
922 922
 										// Maybe has a form ID
923
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
923
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
924 924
 
925 925
 										$input_type = NULL;
926 926
 
927 927
 										if ( $form_id ) {
928
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
928
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
929 929
                                         } else {
930
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
930
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
931 931
                                         }
932 932
 
933
-										if ( !$original_item ) {
934
-											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 ) ) );
933
+										if ( ! $original_item ) {
934
+											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 ) ) );
935 935
 
936 936
 											$original_item = $field;
937 937
 										} else {
938
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
938
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
939 939
 										}
940 940
 
941 941
 										// Field options dialog box
942
-										$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 );
942
+										$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 );
943 943
 
944 944
 										$item = array(
945 945
 											'input_type' => $input_type,
@@ -952,23 +952,23 @@  discard block
 block discarded – undo
952 952
 											$item = wp_parse_args( $item, $original_item );
953 953
 										}
954 954
 
955
-										switch( $type ) {
955
+										switch ( $type ) {
956 956
 											case 'widget':
957
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
957
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
958 958
 												break;
959 959
 											default:
960
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
960
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
961 961
 										}
962 962
 									}
963 963
 
964 964
 								} // End if zone is not empty ?>
965 965
 
966
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
966
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
967 967
 							</div>
968 968
 							<div class="gv-droppable-area-action">
969
-								<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>
969
+								<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>
970 970
 
971
-								<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>
971
+								<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>
972 972
 							</div>
973 973
 						</div>
974 974
 
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
992 992
 
993 993
 		$widgets = array();
994
-		if( !empty( $post_id ) ) {
994
+		if ( ! empty( $post_id ) ) {
995 995
 			$widgets = gravityview_get_directory_widgets( $post_id );
996 996
 		}
997 997
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
 		// list of available fields to be shown in the popup
1025 1025
 		$forms = gravityview_get_forms( 'any' );
1026 1026
 
1027
-		$form_ids = array_map( function ($form) { return $form['id']; }, $forms);
1027
+		$form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms );
1028 1028
 
1029 1029
 		foreach ( $form_ids as $form_id ) {
1030 1030
 			$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id );
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
                 </div>
1038 1038
 
1039 1039
                 <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox">
1040
-                <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?>
1040
+                <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?>
1041 1041
                 </div>
1042 1042
 
1043 1043
                 <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div>
@@ -1056,7 +1056,7 @@  discard block
 block discarded – undo
1056 1056
 	 * @return string HTML of the active areas
1057 1057
 	 */
1058 1058
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1059
-		if( empty( $template_id ) ) {
1059
+		if ( empty( $template_id ) ) {
1060 1060
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1061 1061
 			return '';
1062 1062
 		}
@@ -1070,12 +1070,12 @@  discard block
 block discarded – undo
1070 1070
 		 */
1071 1071
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1072 1072
 
1073
-		if( empty( $template_areas ) ) {
1073
+		if ( empty( $template_areas ) ) {
1074 1074
 
1075 1075
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1076 1076
 			$output = '<div>';
1077
-			$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>';
1078
-			$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>';
1077
+			$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>';
1078
+			$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>';
1079 1079
 			$output .= '</div>';
1080 1080
 		} else {
1081 1081
 
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
1090 1090
 
1091 1091
 		}
1092 1092
 
1093
-		if( $echo ) {
1093
+		if ( $echo ) {
1094 1094
 			echo $output;
1095 1095
 		}
1096 1096
 
@@ -1110,32 +1110,32 @@  discard block
 block discarded – undo
1110 1110
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1111 1111
 
1112 1112
 		// Add the GV font (with the Astronaut)
1113
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1113
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1114 1114
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1115 1115
 
1116
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1116
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1117 1117
 
1118
-		if( GFForms::get_page() === 'form_list' ) {
1118
+		if ( GFForms::get_page() === 'form_list' ) {
1119 1119
 			wp_enqueue_style( 'gravityview_views_styles' );
1120 1120
 			return;
1121 1121
         }
1122 1122
 
1123 1123
 		// Don't process any scripts below here if it's not a GravityView page.
1124
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1124
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1125 1125
 		    return;
1126 1126
 		}
1127 1127
 
1128 1128
         wp_enqueue_script( 'jquery-ui-datepicker' );
1129
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1129
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1130 1130
 
1131
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1131
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1132 1132
 
1133 1133
         //enqueue scripts
1134 1134
         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 );
1135 1135
 
1136
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1136
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1137 1137
             'cookiepath' => COOKIEPATH,
1138
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1138
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1139 1139
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1140 1140
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1141 1141
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
1147 1147
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1148 1148
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1149 1149
             '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' ),
1150
-        ));
1150
+        ) );
1151 1151
 
1152 1152
 		wp_enqueue_style( 'gravityview_views_styles' );
1153 1153
 
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 		);
1175 1175
 
1176 1176
 		if ( wp_is_mobile() ) {
1177
-		    $scripts[] = 'jquery-touch-punch';
1177
+		    $scripts[ ] = 'jquery-touch-punch';
1178 1178
 		}
1179 1179
 
1180 1180
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.