Completed
Push — develop ( 7e41dd...83f716 )
by Zack
17:52
created
includes/fields/class-gravityview-field-payment-status.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	 */
24 24
 	public function __construct() {
25 25
 		$this->label = esc_html__( 'Payment Status', 'gravityview' );
26
-		$this->description = esc_html__('The current payment status of the entry (ie "Processing", "Failed", "Cancelled", "Approved").', 'gravityview' );
26
+		$this->description = esc_html__( 'The current payment status of the entry (ie "Processing", "Failed", "Cancelled", "Approved").', 'gravityview' );
27 27
 		parent::__construct();
28 28
 	}
29 29
 }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-calculation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@
 block discarded – undo
37 37
 	public function blacklist_field_types( $field_types = array(), $context = '' ) {
38 38
 
39 39
 		// Allow Calculation field in Edit Entry
40
-		if( 'edit' !== $context ) {
41
-			$field_types[] = $this->name;
40
+		if ( 'edit' !== $context ) {
41
+			$field_types[ ] = $this->name;
42 42
 		}
43 43
 
44 44
 		return $field_types;
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/gravityview-navigation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
15 15
 	<?php
16 16
 
17
-	foreach( $metaboxes as $metabox ) {
18
-		$class = !isset( $class ) ? 'nav-tab-active' : '';
17
+	foreach ( $metaboxes as $metabox ) {
18
+		$class = ! isset( $class ) ? 'nav-tab-active' : '';
19 19
 	?>
20 20
 	<li class="ui-state-default">
21 21
 		<a class="nav-tab ui-tabs-anchor <?php echo $class; ?>" href="#<?php echo esc_attr( $metabox->id ); ?>">
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/gravityview-content.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@
 block discarded – undo
19 19
 	 * Loop through the array of registered metaboxes
20 20
 	 * @var GravityView_Metabox_Tab $metabox
21 21
 	 */
22
-	foreach( $metaboxes as $metabox ) {
22
+	foreach ( $metaboxes as $metabox ) {
23 23
 
24
-		echo '<div id="'.esc_attr( $metabox->id ).'">';
24
+		echo '<div id="' . esc_attr( $metabox->id ) . '">';
25 25
 
26 26
 		$metabox->render( $post );
27 27
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_checkbox.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 	function render_setting( $override_input = NULL ) {
17 17
 
18
-		if( $this->get_field_left_label() ) { ?>
18
+		if ( $this->get_field_left_label() ) { ?>
19 19
 
20 20
 			<td scope="row">
21 21
 				<label for="<?php echo $this->get_field_id(); ?>">
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	}
43 43
 
44 44
 	function render_input( $override_input = NULL ) {
45
-		if( isset( $override_input ) ) {
45
+		if ( isset( $override_input ) ) {
46 46
 			echo $override_input;
47 47
 			return;
48 48
 		}
Please login to merge, or discard this patch.
includes/admin/field-types/type_select.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 
@@ -20,13 +20,13 @@  discard block
 block discarded – undo
20 20
 	}
21 21
 
22 22
 	function render_input( $override_input = null ) {
23
-		if( isset( $override_input ) ) {
23
+		if ( isset( $override_input ) ) {
24 24
 			echo $override_input;
25 25
 			return;
26 26
 		}
27 27
 		?>
28 28
 		<select name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>">
29
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
29
+			<?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
30 30
 				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $this->value, true ); ?>><?php echo esc_html( $label ); ?></option>
31 31
 			<?php endforeach; ?>
32 32
 		</select>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/inline-javascript.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
9
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
9
+		if(confirm('<?php echo esc_js( __( "Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview' ) ); ?>')){
10 10
 			var fileIndex = jQuery(deleteButton).parent().index();
11
-			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
11
+			var mysack = new sack("<?php echo admin_url( "admin-ajax.php" )?>");
12 12
 			mysack.execute = 1;
13 13
 			mysack.method = 'POST';
14 14
 			mysack.setVar( "action", "rg_delete_file" );
15
-			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce("rg_delete_file") ?>" );
15
+			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce( "rg_delete_file" ) ?>" );
16 16
 			mysack.setVar( "lead_id", leadId );
17 17
 			mysack.setVar( "field_id", fieldId );
18 18
 			mysack.setVar( "file_index", fileIndex );
19
-			mysack.onError = function() { alert('<?php echo esc_js(__('Ajax error while deleting field.', 'gravityview')) ?>' )};
19
+			mysack.onError = function() { alert('<?php echo esc_js( __( 'Ajax error while deleting field.', 'gravityview' ) ) ?>' )};
20 20
 			mysack.runAJAX();
21 21
 
22 22
 			return true;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/fields/edit_link.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@
 block discarded – undo
7 7
 extract( $gravityview_view->getCurrentField() );
8 8
 
9 9
 // Only show the link to logged-in users.
10
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
10
+if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
14
+$link_text = empty( $field_settings[ 'edit_link' ] ) ? __( 'Edit Entry', 'gravityview' ) : $field_settings[ 'edit_link' ];
15 15
 
16
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
16
+$link_atts = empty( $field_settings[ 'new_window' ] ) ? '' : 'target="_blank"';
17 17
 
18 18
 $output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
19 19
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 3 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * @return void
272 272
 	 */
273
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
273
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
274 274
 
275 275
 		$output = '';
276 276
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	function save_postdata( $post_id ) {
431 431
 
432
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
432
+		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
433 433
 			return;
434 434
 		}
435 435
 
Please login to merge, or discard this patch.
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -62,28 +62,28 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	/**
65
-     * When on the Add/Edit View screen, suggest most popular articles related to that
66
-     *
65
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
66
+	 *
67 67
 	 * @param array $localization_data Data to be passed to the Support Port JS
68 68
 	 *
69 69
 	 * @return array
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
74
-	        return $localization_data;
75
-        }
73
+		if( ! gravityview()->request->is_view() ) {
74
+			return $localization_data;
75
+		}
76 76
 
77 77
 		$localization_data['suggest'] = array(
78
-            '57ef23539033602e61d4a560',
79
-            '54c67bb9e4b0512429885513',
80
-            '54c67bb9e4b0512429885512',
81
-            '54c67bbbe4b07997ea3f3f6b',
82
-            '54d1a33ae4b086c0c0964ce9',
83
-            '57ef253c9033602e61d4a563',
84
-            '552355bfe4b0221aadf2572b',
85
-            '54c67bcde4b051242988553e',
86
-        );
78
+			'57ef23539033602e61d4a560',
79
+			'54c67bb9e4b0512429885513',
80
+			'54c67bb9e4b0512429885512',
81
+			'54c67bbbe4b07997ea3f3f6b',
82
+			'54d1a33ae4b086c0c0964ce9',
83
+			'57ef253c9033602e61d4a563',
84
+			'552355bfe4b0221aadf2572b',
85
+			'54c67bcde4b051242988553e',
86
+		);
87 87
 
88 88
 		return $localization_data;
89 89
 	}
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
 
230 230
 		if( 'form_list' === GFForms::get_page() ) {
231 231
 			$priority = 790;
232
-        }
232
+		}
233 233
 
234 234
 		if( empty( $connected_views ) ) {
235 235
 
236
-		    $menu_items['gravityview'] = array(
236
+			$menu_items['gravityview'] = array(
237 237
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
238 238
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
239 239
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
 		// If there were no items added, then let's create the parent menu
266 266
 		if( $sub_menu_items ) {
267 267
 
268
-		    $sub_menu_items[] = array(
269
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
270
-			    'icon' => '<span class="dashicons dashicons-plus"></span>',
271
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273
-			    'capabilities'   => array( 'edit_gravityviews' ),
274
-            );
268
+			$sub_menu_items[] = array(
269
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
270
+				'icon' => '<span class="dashicons dashicons-plus"></span>',
271
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273
+				'capabilities'   => array( 'edit_gravityviews' ),
274
+			);
275 275
 
276 276
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
277 277
 			$sub_menu_items[] = array(
@@ -653,16 +653,16 @@  discard block
 block discarded – undo
653 653
 	/**
654 654
 	 * Render html for displaying available fields based on a Form ID
655 655
 	 *
656
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
656
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
657 657
 	 *
658 658
 	 * @param int $form Gravity Forms Form ID (default: '')
659 659
 	 * @param string $context (default: 'single')
660
-     *
660
+	 *
661 661
 	 * @return void
662 662
 	 */
663 663
 	function render_available_fields( $form = 0, $context = 'single' ) {
664 664
 
665
-	    // Determine if form is a preset and convert it to an array with fields
665
+		// Determine if form is a preset and convert it to an array with fields
666 666
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
667 667
 
668 668
 		/**
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 
675 675
 		if ( ! is_array( $blacklist_field_types ) ) {
676 676
 
677
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
677
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
678 678
 
679 679
 			$blacklist_field_types = array();
680 680
 		}
@@ -932,9 +932,9 @@  discard block
 block discarded – undo
932 932
 
933 933
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
934 934
 
935
-                foreach ( $joined_forms as $form ) {
936
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
937
-                }
935
+				foreach ( $joined_forms as $form ) {
936
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
937
+				}
938 938
 			} else {
939 939
 				$available_items[ $form ] = \GV\Widget::registered();
940 940
 			}
@@ -973,9 +973,9 @@  discard block
 block discarded – undo
973 973
 
974 974
 										if ( $form_id ) {
975 975
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
976
-                                        } else {
976
+										} else {
977 977
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
978
-                                        }
978
+										}
979 979
 
980 980
 										if ( !$original_item ) {
981 981
 											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 ) ) );
@@ -1225,7 +1225,7 @@  discard block
 block discarded – undo
1225 1225
 		}
1226 1226
 
1227 1227
 		// Add the GV font (with the Astronaut)
1228
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1228
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1229 1229
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1230 1230
 
1231 1231
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1233,46 +1233,46 @@  discard block
 block discarded – undo
1233 1233
 		if( GFForms::get_page() === 'form_list' ) {
1234 1234
 			wp_enqueue_style( 'gravityview_views_styles' );
1235 1235
 			return;
1236
-        }
1236
+		}
1237 1237
 
1238 1238
 		// Don't process any scripts below here if it's not a GravityView page.
1239 1239
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1240
-		    return;
1240
+			return;
1241 1241
 		}
1242 1242
 
1243 1243
 		wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
1244 1244
 
1245
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1246
-
1247
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1248
-
1249
-        // Enqueue scripts
1250
-        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 );
1251
-
1252
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1253
-            'cookiepath' => COOKIEPATH,
1254
-            'admin_cookiepath' => ADMIN_COOKIE_PATH,
1255
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1256
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1257
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1258
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1259
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1260
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1261
-            'label_close' => __( 'Close', 'gravityview' ),
1262
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1263
-            'label_continue' => __( 'Continue', 'gravityview' ),
1264
-            'label_ok' => __( 'Ok', 'gravityview' ),
1265
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1266
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1267
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1268
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1269
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1270
-        ));
1245
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1246
+
1247
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1248
+
1249
+		// Enqueue scripts
1250
+		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 );
1251
+
1252
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1253
+			'cookiepath' => COOKIEPATH,
1254
+			'admin_cookiepath' => ADMIN_COOKIE_PATH,
1255
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1256
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1257
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1258
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1259
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1260
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1261
+			'label_close' => __( 'Close', 'gravityview' ),
1262
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1263
+			'label_continue' => __( 'Continue', 'gravityview' ),
1264
+			'label_ok' => __( 'Ok', 'gravityview' ),
1265
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1266
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1267
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1268
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1269
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1270
+		));
1271 1271
 
1272 1272
 		wp_enqueue_style( 'gravityview_views_styles' );
1273 1273
 
1274
-        // Enqueue scripts needed for merge tags
1275
-        self::enqueue_gravity_forms_scripts();
1274
+		// Enqueue scripts needed for merge tags
1275
+		self::enqueue_gravity_forms_scripts();
1276 1276
 
1277 1277
 		// 2.5 changed how Merge Tags are enqueued
1278 1278
 		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
@@ -1282,24 +1282,24 @@  discard block
 block discarded – undo
1282 1282
 
1283 1283
 	/**
1284 1284
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1285
-     *
1286
-     * @since 1.0.5-beta
1287
-     *
1288
-     * @return void
1285
+	 *
1286
+	 * @since 1.0.5-beta
1287
+	 *
1288
+	 * @return void
1289 1289
 	 */
1290 1290
 	static function enqueue_gravity_forms_scripts() {
1291 1291
 		GFForms::register_scripts();
1292 1292
 
1293 1293
 		$scripts = array(
1294
-		    'sack',
1295
-		    'gform_gravityforms',
1296
-		    'gform_forms',
1297
-		    'gform_form_admin',
1298
-		    'jquery-ui-autocomplete'
1294
+			'sack',
1295
+			'gform_gravityforms',
1296
+			'gform_forms',
1297
+			'gform_form_admin',
1298
+			'jquery-ui-autocomplete'
1299 1299
 		);
1300 1300
 
1301 1301
 		if ( wp_is_mobile() ) {
1302
-		    $scripts[] = 'jquery-touch-punch';
1302
+			$scripts[] = 'jquery-touch-punch';
1303 1303
 		}
1304 1304
 
1305 1305
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
Spacing   +171 added lines, -171 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
73
+	    if ( ! gravityview()->request->is_view() ) {
74 74
 	        return $localization_data;
75 75
         }
76 76
 
77
-		$localization_data['suggest'] = array(
77
+		$localization_data[ 'suggest' ] = array(
78 78
             '57ef23539033602e61d4a560',
79 79
             '54c67bb9e4b0512429885513',
80 80
             '54c67bb9e4b0512429885512',
@@ -103,20 +103,20 @@  discard block
 block discarded – undo
103 103
 			return;
104 104
 		}
105 105
 
106
-		if ( ! isset( $query->query_vars['post_type'] ) ) {
106
+		if ( ! isset( $query->query_vars[ 'post_type' ] ) ) {
107 107
 			return;
108 108
 		}
109 109
 
110
-		if ( 'gravityview' !== $query->query_vars['post_type'] ) {
110
+		if ( 'gravityview' !== $query->query_vars[ 'post_type' ] ) {
111 111
 			return;
112 112
 		}
113 113
 
114
-		$form_id = (int) \GV\Utils::_GET( 'gravityview_form_id' );
114
+		$form_id = (int)\GV\Utils::_GET( 'gravityview_form_id' );
115 115
 
116 116
 		$meta_query = array();
117 117
 
118 118
 		if ( $form_id ) {
119
-			$meta_query[] = array(
119
+			$meta_query[ ] = array(
120 120
 					'key'   => '_gravityview_form_id',
121 121
 					'value' => $form_id,
122 122
 			);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$layout_id = \GV\Utils::_GET( 'gravityview_layout' );
126 126
 
127 127
 		if ( $layout_id ) {
128
-			$meta_query[] = array(
128
+			$meta_query[ ] = array(
129 129
 					'key'   => '_gravityview_directory_template',
130 130
 					'value' => esc_attr( $layout_id ),
131 131
 			);
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	public function add_view_dropdown() {
143 143
 		$current_screen = get_current_screen();
144 144
 
145
-		if( 'gravityview' !== $current_screen->post_type ) {
145
+		if ( 'gravityview' !== $current_screen->post_type ) {
146 146
 			return;
147 147
 		}
148 148
 
@@ -150,12 +150,12 @@  discard block
 block discarded – undo
150 150
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
151 151
 
152 152
 		// If there are no forms to select, show no forms.
153
-		if( ! empty( $forms ) ) { ?>
153
+		if ( ! empty( $forms ) ) { ?>
154 154
 			<label for="gravityview_form_id" class="screen-reader-text"><?php esc_html_e( 'Filter Views by form', 'gravityview' ); ?></label>
155 155
 			<select name="gravityview_form_id" id="gravityview_form_id">
156 156
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
157
-				<?php foreach( $forms as $form ) { ?>
158
-					<option value="<?php echo esc_attr( $form['id'] ); ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
157
+				<?php foreach ( $forms as $form ) { ?>
158
+					<option value="<?php echo esc_attr( $form[ 'id' ] ); ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
159 159
 				<?php } ?>
160 160
 			</select>
161 161
 		<?php }
@@ -164,26 +164,26 @@  discard block
 block discarded – undo
164 164
 		$current_layout = \GV\Utils::_GET( 'gravityview_layout' );
165 165
 
166 166
 		// If there are no forms to select, show no forms.
167
-		if( ! empty( $layouts ) ) { ?>
167
+		if ( ! empty( $layouts ) ) { ?>
168 168
 			<label for="gravityview_layout_name" class="screen-reader-text"><?php esc_html_e( 'Filter Views by layout', 'gravityview' ); ?></label>
169 169
 			<select name="gravityview_layout" id="gravityview_layout_name">
170 170
 				<option value="" <?php selected( '', $current_layout, true ); ?>><?php esc_html_e( 'All layouts', 'gravityview' ); ?></option>
171 171
 				<optgroup label="<?php esc_html_e( 'Layouts', 'gravityview' ); ?>">
172
-				<?php foreach( $layouts as $layout_id => $layout ) {
173
-					if ( in_array( $layout['type'], array( 'preset', 'internal' ), true ) ) {
172
+				<?php foreach ( $layouts as $layout_id => $layout ) {
173
+					if ( in_array( $layout[ 'type' ], array( 'preset', 'internal' ), true ) ) {
174 174
 						continue;
175 175
 					}
176 176
 					?>
177
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
177
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
178 178
 				<?php } ?>
179 179
 				</optgroup>
180 180
 				<optgroup label="<?php esc_html_e( 'Form Presets', 'gravityview' ); ?>">
181
-				<?php foreach( $layouts as $layout_id => $layout ) {
182
-					if ( ! in_array( $layout['type'], array( 'preset' ), true ) ) {
181
+				<?php foreach ( $layouts as $layout_id => $layout ) {
182
+					if ( ! in_array( $layout[ 'type' ], array( 'preset' ), true ) ) {
183 183
 						continue;
184 184
 					}
185 185
 					?>
186
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
186
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
187 187
 				<?php } ?>
188 188
 				</optgroup>
189 189
 			</select>
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 	 */
198 198
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
199 199
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
200
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
200
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
201 201
 	}
202 202
 
203 203
 	/**
@@ -227,13 +227,13 @@  discard block
 block discarded – undo
227 227
 
228 228
 		$priority = 0;
229 229
 
230
-		if( 'form_list' === GFForms::get_page() ) {
230
+		if ( 'form_list' === GFForms::get_page() ) {
231 231
 			$priority = 790;
232 232
         }
233 233
 
234
-		if( empty( $connected_views ) ) {
234
+		if ( empty( $connected_views ) ) {
235 235
 
236
-		    $menu_items['gravityview'] = array(
236
+		    $menu_items[ 'gravityview' ] = array(
237 237
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
238 238
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
239 239
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -249,23 +249,23 @@  discard block
 block discarded – undo
249 249
 		$sub_menu_items = array();
250 250
 		foreach ( (array)$connected_views as $view ) {
251 251
 
252
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
252
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
253 253
 				continue;
254 254
 			}
255 255
 
256
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
256
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
257 257
 
258
-			$sub_menu_items[] = array(
258
+			$sub_menu_items[ ] = array(
259 259
 				'label' => esc_attr( $label ),
260
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
260
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
261 261
 				'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
262 262
 			);
263 263
 		}
264 264
 
265 265
 		// If there were no items added, then let's create the parent menu
266
-		if( $sub_menu_items ) {
266
+		if ( $sub_menu_items ) {
267 267
 
268
-		    $sub_menu_items[] = array(
268
+		    $sub_menu_items[ ] = array(
269 269
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
270 270
 			    'icon' => '<span class="dashicons dashicons-plus"></span>',
271 271
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -274,14 +274,14 @@  discard block
 block discarded – undo
274 274
             );
275 275
 
276 276
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
277
-			$sub_menu_items[] = array(
277
+			$sub_menu_items[ ] = array(
278 278
 				'url' => '#',
279 279
 				'label' => '',
280 280
 				'menu_class' => 'hidden',
281 281
 				'capabilities' => '',
282 282
 			);
283 283
 
284
-			$menu_items['gravityview'] = array(
284
+			$menu_items[ 'gravityview' ] = array(
285 285
 				'label'          => __( 'Connected Views', 'gravityview' ),
286 286
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
287 287
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -309,8 +309,8 @@  discard block
 block discarded – undo
309 309
 		$add = array( 'captcha', 'page' );
310 310
 
311 311
 		// Don't allowing editing the following values:
312
-		if( $context === 'edit' ) {
313
-			$add[] = 'post_id';
312
+		if ( $context === 'edit' ) {
313
+			$add[ ] = 'post_id';
314 314
 		}
315 315
 
316 316
 		$return = array_merge( $array, $add );
@@ -333,27 +333,27 @@  discard block
 block discarded – undo
333 333
 		foreach ( $default_args as $key => $arg ) {
334 334
 
335 335
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
336
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
336
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
337 337
 
338 338
 			// By default, use `tooltip` if defined.
339
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
339
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
340 340
 
341 341
 			// If there's no tooltip set, continue
342
-			if( empty( $tooltip ) ) {
342
+			if ( empty( $tooltip ) ) {
343 343
 				continue;
344 344
 			}
345 345
 
346 346
 			// Add the tooltip
347
-			$gv_tooltips[ 'gv_'.$key ] = array(
348
-				'title'	=> $arg['label'],
347
+			$gv_tooltips[ 'gv_' . $key ] = array(
348
+				'title'	=> $arg[ 'label' ],
349 349
 				'value'	=> $tooltip,
350 350
 			);
351 351
 
352 352
 		}
353 353
 
354
-		$gv_tooltips['gv_css_merge_tags'] = array(
355
-			'title' => __('CSS Merge Tags', 'gravityview'),
356
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
354
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
355
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
356
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
357 357
 		);
358 358
 
359 359
 		/**
@@ -371,9 +371,9 @@  discard block
 block discarded – undo
371 371
 
372 372
 		foreach ( $gv_tooltips as $key => $tooltip ) {
373 373
 
374
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
374
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
375 375
 
376
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
376
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
377 377
 		}
378 378
 
379 379
 		return $tooltips;
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 	 *
388 388
 	 * @return void
389 389
 	 */
390
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
390
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
391 391
 
392 392
 		$output = '';
393 393
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
410 410
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
411 411
 
412
-				$output = $template ? $template['label'] : $template_id_pretty;
412
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
413 413
 
414 414
 				break;
415 415
 
@@ -450,12 +450,12 @@  discard block
 block discarded – undo
450 450
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
451 451
 
452 452
 		// Either the form is empty or the form ID is 0, not yet set.
453
-		if( empty( $form ) ) {
453
+		if ( empty( $form ) ) {
454 454
 			return '';
455 455
 		}
456 456
 
457 457
 		// The $form is passed as the form ID
458
-		if( !is_array( $form ) ) {
458
+		if ( ! is_array( $form ) ) {
459 459
 			$form = gravityview_get_form( $form );
460 460
 		}
461 461
 
@@ -463,35 +463,35 @@  discard block
 block discarded – undo
463 463
 			return '';
464 464
 		}
465 465
 
466
-		$form_id = $form['id'];
466
+		$form_id = $form[ 'id' ];
467 467
 		$links = array();
468 468
 
469
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
469
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
470 470
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
471
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
472
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
471
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
472
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
473 473
 		} else {
474
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
474
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
475 475
 		}
476 476
 
477
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
477
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
478 478
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
479
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
479
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
480 480
 		}
481 481
 
482
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
482
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
483 483
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
484
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
484
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
485 485
 		}
486 486
 
487
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
487
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
488 488
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
489
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
489
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
490 490
 		}
491 491
 
492 492
 		$output = '';
493 493
 
494
-		if( !empty( $include_form_link ) ) {
494
+		if ( ! empty( $include_form_link ) ) {
495 495
 			$output .= $form_link;
496 496
 		}
497 497
 
@@ -506,11 +506,11 @@  discard block
 block discarded – undo
506 506
 		$css_class = 'row-actions';
507 507
 
508 508
 		// Is Screen Options > View mode set to "Extended view"? If so, keep actions visible.
509
-		if( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
509
+		if ( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
510 510
 			$css_class = 'row-actions visible';
511 511
 		}
512 512
 
513
-		$output .= '<div class="' . $css_class . '">'. implode( ' | ', $links ) .'</div>';
513
+		$output .= '<div class="' . $css_class . '">' . implode( ' | ', $links ) . '</div>';
514 514
 
515 515
 		return $output;
516 516
 	}
@@ -524,8 +524,8 @@  discard block
 block discarded – undo
524 524
 		// Get the date column and save it for later to add back in.
525 525
 		// This adds it after the Data Source column.
526 526
 		// This way, we don't need to do array_slice, array_merge, etc.
527
-		$date = $columns['date'];
528
-		unset( $columns['date'] );
527
+		$date = $columns[ 'date' ];
528
+		unset( $columns[ 'date' ] );
529 529
 
530 530
 		$data_source_required_caps = array(
531 531
 			'gravityforms_edit_forms',
@@ -536,14 +536,14 @@  discard block
 block discarded – undo
536 536
 			'gravityforms_preview_forms',
537 537
 		);
538 538
 
539
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
540
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
539
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
540
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
541 541
 		}
542 542
 
543
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
543
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
544 544
 
545 545
 		// Add the date back in.
546
-		$columns['date'] = $date;
546
+		$columns[ 'date' ] = $date;
547 547
 
548 548
 		return $columns;
549 549
 	}
@@ -556,12 +556,12 @@  discard block
 block discarded – undo
556 556
 	 */
557 557
 	function save_postdata( $post_id ) {
558 558
 
559
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
559
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
560 560
 			return;
561 561
 		}
562 562
 
563 563
 		// validate post_type
564
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
564
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
565 565
 			return;
566 566
 		}
567 567
 
@@ -576,63 +576,63 @@  discard block
 block discarded – undo
576 576
 		$statii = array();
577 577
 
578 578
 		// check if this is a start fresh View
579
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
579
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
580 580
 
581
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
581
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
582 582
 			// save form id
583
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
583
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
584 584
 
585 585
 		}
586 586
 
587
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
587
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
588 588
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
589 589
 			return;
590 590
 		}
591 591
 
592 592
 		// Was this a start fresh?
593
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
594
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
593
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
594
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
595 595
 		} else {
596
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
596
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
597 597
 		}
598 598
 
599 599
 		// Check if we have a template id
600
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
600
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
601 601
 
602
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
602
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
603 603
 
604 604
 			// now save template id
605
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
605
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
606 606
 		}
607 607
 
608 608
 
609 609
 		// save View Configuration metabox
610
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
610
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
611 611
 
612 612
 			// template settings
613
-			if( empty( $_POST['template_settings'] ) ) {
614
-				$_POST['template_settings'] = array();
613
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
614
+				$_POST[ 'template_settings' ] = array();
615 615
 			}
616
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
616
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
617 617
 
618 618
 			// guard against unloaded View configuration page
619
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
619
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
620 620
 				$fields = array();
621 621
 
622
-				if ( ! empty( $_POST['gv_fields'] ) ) {
622
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
623 623
 					$fields = _gravityview_process_posted_fields();
624 624
 				}
625 625
 
626 626
 				$fields = wp_slash( $fields );
627 627
 
628
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
628
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
629 629
 			}
630 630
 
631 631
 			// Directory Visible Widgets
632
-			if( empty( $_POST['widgets'] ) ) {
633
-				$_POST['widgets'] = array();
632
+			if ( empty( $_POST[ 'widgets' ] ) ) {
633
+				$_POST[ 'widgets' ] = array();
634 634
 			}
635
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
635
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
636 636
 
637 637
 		} // end save view configuration
638 638
 
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
 		 * @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.
643 643
 		 * @since 1.17.2
644 644
 		 */
645
-		do_action('gravityview_view_saved', $post_id, $statii );
645
+		do_action( 'gravityview_view_saved', $post_id, $statii );
646 646
 
647 647
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
648 648
 	}
@@ -687,20 +687,20 @@  discard block
 block discarded – undo
687 687
 
688 688
 		$output = '';
689 689
 
690
-		if( !empty( $fields ) ) {
690
+		if ( ! empty( $fields ) ) {
691 691
 
692
-			foreach( $fields as $id => $details ) {
692
+			foreach ( $fields as $id => $details ) {
693 693
 
694
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
694
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
695 695
 					continue;
696 696
 				}
697 697
 
698 698
 				// Edit mode only allows editing the parent fields, not single inputs.
699
-				if( $context === 'edit' && ! empty( $details['parent'] ) ) {
699
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
700 700
 					continue;
701 701
 				}
702 702
 
703
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form );
703
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
704 704
 
705 705
 			} // End foreach
706 706
 		}
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 		echo $output;
709 709
 
710 710
 		// For the EDIT view we only want to allow the form fields.
711
-		if( $context === 'edit' ) {
711
+		if ( $context === 'edit' ) {
712 712
 			return;
713 713
 		}
714 714
 
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
 		$additional_fields = array(
728 728
 			array(
729 729
 				'label_text' => __( 'Add All Form Fields', 'gravityview' ),
730
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
730
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
731 731
 				'field_id' => 'all-fields',
732 732
 				'label_type' => 'field',
733 733
 				'input_type' => null,
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 		 */
744 744
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
745 745
 
746
-		foreach ( (array) $additional_fields as $item ) {
746
+		foreach ( (array)$additional_fields as $item ) {
747 747
 
748 748
 			// Prevent items from not having index set
749 749
 			$item = wp_parse_args( $item, array(
@@ -754,16 +754,16 @@  discard block
 block discarded – undo
754 754
 				'field_options' => null,
755 755
 				'settings_html'	=> null,
756 756
 				'icon' => null,
757
-			));
757
+			) );
758 758
 
759 759
 			// Backward compat.
760
-			if( !empty( $item['field_options'] ) ) {
760
+			if ( ! empty( $item[ 'field_options' ] ) ) {
761 761
 				// Use settings_html from now on.
762
-				$item['settings_html'] = $item['field_options'];
762
+				$item[ 'settings_html' ] = $item[ 'field_options' ];
763 763
 			}
764 764
 
765 765
 			// Render a label for each of them
766
-			echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
766
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
767 767
 
768 768
 		}
769 769
 
@@ -775,12 +775,12 @@  discard block
 block discarded – undo
775 775
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
776 776
 	 * @return array
777 777
 	 */
778
-	function get_entry_default_fields($form, $zone) {
778
+	function get_entry_default_fields( $form, $zone ) {
779 779
 
780 780
 		$entry_default_fields = array();
781 781
 
782 782
 		// if in zone directory or single
783
-		if( in_array( $zone, array( 'directory', 'single' ), true ) ) {
783
+		if ( in_array( $zone, array( 'directory', 'single' ), true ) ) {
784 784
 
785 785
 			$meta_fields = GravityView_Fields::get_all( array( 'meta', 'gravityview', 'add-ons' ) );
786 786
 
@@ -797,7 +797,7 @@  discard block
 block discarded – undo
797 797
 		 * @param  string|array $form form_ID or form object
798 798
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
799 799
 		 */
800
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
800
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
801 801
 	}
802 802
 
803 803
 	/**
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
 	 */
809 809
 	function get_available_fields( $form = '', $zone = NULL ) {
810 810
 
811
-		if( empty( $form ) ) {
811
+		if ( empty( $form ) ) {
812 812
 			gravityview()->log->error( '$form is empty' );
813 813
 			return array();
814 814
 		}
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 		$fields = gravityview_get_form_fields( $form, true );
818 818
 
819 819
 		// get meta fields ( only if form was already created )
820
-		if( !is_array( $form ) ) {
820
+		if ( ! is_array( $form ) ) {
821 821
 			$meta_fields = gravityview_get_entry_meta( $form );
822 822
 		} else {
823 823
 			$meta_fields = array();
@@ -830,8 +830,8 @@  discard block
 block discarded – undo
830 830
 		$fields = $fields + $meta_fields + $default_fields;
831 831
 
832 832
 		// Move Custom Content to top
833
-		if ( isset( $fields['custom'] ) ) {
834
-			$fields = array( 'custom' => $fields['custom'] ) + $fields;
833
+		if ( isset( $fields[ 'custom' ] ) ) {
834
+			$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
835 835
 		}
836 836
 
837 837
 		$gv_fields = GravityView_Fields::get_all();
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 		foreach ( $fields as &$field ) {
840 840
 			foreach ( $gv_fields as $gv_field ) {
841 841
 				if ( \GV\Utils::get( $field, 'type' ) === $gv_field->name ) {
842
-					$field['icon'] = \GV\Utils::get( $gv_field, 'icon' );
842
+					$field[ 'icon' ] = \GV\Utils::get( $gv_field, 'icon' );
843 843
 				}
844 844
 			}
845 845
 		}
@@ -867,7 +867,7 @@  discard block
 block discarded – undo
867 867
 		}
868 868
 
869 869
 		foreach ( $widgets as $id => $details ) {
870
-			echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
870
+			echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
871 871
 		}
872 872
 
873 873
 	}
@@ -897,7 +897,7 @@  discard block
 block discarded – undo
897 897
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
898 898
 		global $post;
899 899
 
900
-		if( $type === 'widget' ) {
900
+		if ( $type === 'widget' ) {
901 901
 			$button_label = __( 'Add Widget', 'gravityview' );
902 902
 		} else {
903 903
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -923,10 +923,10 @@  discard block
 block discarded – undo
923 923
 		$form_id = null;
924 924
 
925 925
 		// if saved values, get available fields to label everyone
926
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
926
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
927 927
 
928
-			if( !empty( $_POST['template_id'] ) ) {
929
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
928
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
929
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
930 930
 			} else {
931 931
 				$form_id = $form = gravityview_get_form_id( $post->ID );
932 932
 			}
@@ -944,53 +944,53 @@  discard block
 block discarded – undo
944 944
 			}
945 945
 		}
946 946
 
947
-		foreach( $rows as $row ) :
948
-			foreach( $row as $col => $areas ) :
949
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
947
+		foreach ( $rows as $row ) :
948
+			foreach ( $row as $col => $areas ) :
949
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
950 950
 
951 951
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
952 952
 
953
-					<?php foreach( $areas as $area ) : 	?>
953
+					<?php foreach ( $areas as $area ) : 	?>
954 954
 
955
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
956
-                            <p class="gv-droppable-area-title" <?php if ( 'widget' === $type && empty( $area['subtitle'] ) ) { echo ' style="margin: 0; padding: 0;"'; } ?>>
957
-								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area['title'] ); ?></strong>
955
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
956
+                            <p class="gv-droppable-area-title" <?php if ( 'widget' === $type && empty( $area[ 'subtitle' ] ) ) { echo ' style="margin: 0; padding: 0;"'; } ?>>
957
+								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area[ 'title' ] ); ?></strong>
958 958
 
959 959
 								<?php if ( 'widget' !== $type ) { ?>
960
-									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
960
+									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
961 961
 								<?php } ?>
962 962
 
963
-                                <?php if ( ! empty( $area['subtitle'] ) ) { ?>
964
-									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area['subtitle'] ); ?>"></span></span>
963
+                                <?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?>
964
+									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area[ 'subtitle' ] ); ?>"></span></span>
965 965
 								<?php } ?>
966 966
 							</p>
967 967
 							<div class="active-drop-container active-drop-container-<?php echo esc_attr( $type ); ?>">
968
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php // render saved fields
969
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
968
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php // render saved fields
969
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
970 970
 
971
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
971
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
972 972
 
973 973
 										// Maybe has a form ID
974
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
974
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
975 975
 
976 976
 										$input_type = NULL;
977 977
 
978 978
 										if ( $form_id ) {
979
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
979
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
980 980
                                         } else {
981
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
981
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
982 982
                                         }
983 983
 
984
-										if ( !$original_item ) {
985
-											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 ) ) );
984
+										if ( ! $original_item ) {
985
+											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 ) ) );
986 986
 
987 987
 											$original_item = $field;
988 988
 										} else {
989
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
989
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
990 990
 										}
991 991
 
992 992
 										// Field options dialog box
993
-										$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 );
993
+										$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 );
994 994
 
995 995
 										$item = array(
996 996
 											'input_type' => $input_type,
@@ -1003,12 +1003,12 @@  discard block
 block discarded – undo
1003 1003
 											$item = wp_parse_args( $item, $original_item );
1004 1004
 										}
1005 1005
 
1006
-										switch( $type ) {
1006
+										switch ( $type ) {
1007 1007
 											case 'widget':
1008
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
1008
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
1009 1009
 												break;
1010 1010
 											default:
1011
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
1011
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
1012 1012
 										}
1013 1013
 									}
1014 1014
 
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
 								<div class="gv-droppable-area-action">
1017 1017
 									<a href="#" class="gv-add-field button button-link button-hero" title=""
1018 1018
 									   data-objecttype="<?php echo esc_attr( $type ); ?>"
1019
-									   data-areaid="<?php echo esc_attr( $zone . '_' . $area['areaid'] ); ?>"
1019
+									   data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"
1020 1020
 									   data-context="<?php echo esc_attr( $zone ); ?>"
1021 1021
 									   data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '<span class="dashicons dashicons-plus-alt"></span>' . esc_html( $button_label ); ?></a>
1022 1022
 								</div>
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
 				// This is a new View, prefill the widgets
1050 1050
 				$widgets = array(
1051 1051
 					'header_top' => array(
1052
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1052
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1053 1053
 							'id' => 'search_bar',
1054 1054
 							'label' => __( 'Search Bar', 'gravityview' ),
1055 1055
 							'search_layout' => 'horizontal',
@@ -1124,12 +1124,12 @@  discard block
 block discarded – undo
1124 1124
 		if ( $post ) {
1125 1125
 			$source_form_id = gravityview_get_form_id( $post->ID );
1126 1126
 			if ( $source_form_id ) {
1127
-				$form_ids[] = $source_form_id;
1127
+				$form_ids[ ] = $source_form_id;
1128 1128
 			}
1129 1129
 
1130 1130
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
1131 1131
 			foreach ( $joined_forms as $joined_form ) {
1132
-				$form_ids[] = $joined_form->ID;
1132
+				$form_ids[ ] = $joined_form->ID;
1133 1133
 			}
1134 1134
 		}
1135 1135
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1167,7 +1167,7 @@  discard block
 block discarded – undo
1167 1167
 	 * @return string HTML of the active areas
1168 1168
 	 */
1169 1169
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1170
-		if( empty( $template_id ) ) {
1170
+		if ( empty( $template_id ) ) {
1171 1171
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1172 1172
 			return '';
1173 1173
 		}
@@ -1181,12 +1181,12 @@  discard block
 block discarded – undo
1181 1181
 		 */
1182 1182
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1183 1183
 
1184
-		if( empty( $template_areas ) ) {
1184
+		if ( empty( $template_areas ) ) {
1185 1185
 
1186 1186
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1187 1187
 			$output = '<div>';
1188
-			$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>';
1189
-			$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>';
1188
+			$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>';
1189
+			$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>';
1190 1190
 			$output .= '</div>';
1191 1191
 		} else {
1192 1192
 
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
 
1202 1202
 		}
1203 1203
 
1204
-		if( $echo ) {
1204
+		if ( $echo ) {
1205 1205
 			echo $output;
1206 1206
 		}
1207 1207
 
@@ -1229,18 +1229,18 @@  discard block
 block discarded – undo
1229 1229
 		}
1230 1230
 
1231 1231
 		// Add the GV font (with the Astronaut)
1232
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1232
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1233 1233
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1234 1234
 
1235
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1235
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1236 1236
 
1237
-		if( GFForms::get_page() === 'form_list' ) {
1237
+		if ( GFForms::get_page() === 'form_list' ) {
1238 1238
 			wp_enqueue_style( 'gravityview_views_styles' );
1239 1239
 			return;
1240 1240
         }
1241 1241
 
1242 1242
 		// Don't process any scripts below here if it's not a GravityView page.
1243
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1243
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1244 1244
 		    return;
1245 1245
 		}
1246 1246
 
@@ -1248,15 +1248,15 @@  discard block
 block discarded – undo
1248 1248
 
1249 1249
         wp_enqueue_script( 'jquery-ui-datepicker' );
1250 1250
 
1251
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1251
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1252 1252
 
1253 1253
         // Enqueue scripts
1254 1254
         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 );
1255 1255
 
1256
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1256
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1257 1257
             'cookiepath' => COOKIEPATH,
1258 1258
             'admin_cookiepath' => ADMIN_COOKIE_PATH,
1259
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1259
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1260 1260
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1261 1261
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1262 1262
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1271,7 +1271,7 @@  discard block
 block discarded – undo
1271 1271
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1272 1272
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1273 1273
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1274
-        ));
1274
+        ) );
1275 1275
 
1276 1276
 		wp_enqueue_style( 'gravityview_views_styles' );
1277 1277
 
@@ -1279,7 +1279,7 @@  discard block
 block discarded – undo
1279 1279
         self::enqueue_gravity_forms_scripts();
1280 1280
 
1281 1281
 		// 2.5 changed how Merge Tags are enqueued
1282
-		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
1282
+		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript' ) ) ) {
1283 1283
 			GFCommon::output_hooks_javascript();
1284 1284
 		}
1285 1285
 	}
@@ -1303,7 +1303,7 @@  discard block
 block discarded – undo
1303 1303
 		);
1304 1304
 
1305 1305
 		if ( wp_is_mobile() ) {
1306
-		    $scripts[] = 'jquery-touch-punch';
1306
+		    $scripts[ ] = 'jquery-touch-punch';
1307 1307
 		}
1308 1308
 
1309 1309
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.