Completed
Pull Request — master (#1461)
by Zack
17:37 queued 14:56
created
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/admin/entry-list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 );
12 12
 
13 13
 		// Add script to enable edit link
14
-		add_action( 'admin_head-forms_page_gf_entries', array( $this, 'add_edit_script') );
14
+		add_action( 'admin_head-forms_page_gf_entries', array( $this, 'add_edit_script' ) );
15 15
 
16 16
 	}
17 17
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	public function add_edit_script() {
27 27
 
28 28
 		// We're on a single entry page, or at least not the Entries page.
29
-		if( !empty( $_GET['view'] ) && $_GET['view'] !== 'entries' ) { return; }
29
+		if ( ! empty( $_GET[ 'view' ] ) && $_GET[ 'view' ] !== 'entries' ) { return; }
30 30
 	?>
31 31
 		<script>
32 32
 		jQuery( document ).ready( function( $ ) {
@@ -56,14 +56,14 @@  discard block
 block discarded – undo
56 56
 			'page' => 'gf_entries',
57 57
 			'view' => 'entry',
58 58
 			'id'	=> (int)$form_id,
59
-			'lid'	=>	(int)$lead["id"],
59
+			'lid'	=>	(int)$lead[ "id" ],
60 60
 			'screen_mode'	=> 'edit',
61 61
 		);
62 62
 		?>
63 63
 
64 64
 		<span class="edit edit_entry">
65 65
 			|
66
-		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
66
+		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview' ); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page=' . $query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
67 67
 		</span>
68 68
 		<?php
69 69
 	}
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/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,11 +7,11 @@
 block discarded – undo
7 7
 extract( $gravityview_view->getCurrentField() );
8 8
 
9 9
 // Only show the link to logged-in users with the rigth caps.
10
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
10
+if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
14
+$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ];
15 15
 
16 16
 $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
17 17
 
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   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -63,28 +63,28 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	/**
66
-     * When on the Add/Edit View screen, suggest most popular articles related to that
67
-     *
66
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
67
+	 *
68 68
 	 * @param array $localization_data Data to be passed to the Support Port JS
69 69
 	 *
70 70
 	 * @return array
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
75
-	        return $localization_data;
76
-        }
74
+		if( ! gravityview()->request->is_view() ) {
75
+			return $localization_data;
76
+		}
77 77
 
78 78
 		$localization_data['suggest'] = array(
79
-            '57ef23539033602e61d4a560',
80
-            '54c67bb9e4b0512429885513',
81
-            '54c67bb9e4b0512429885512',
82
-            '54c67bbbe4b07997ea3f3f6b',
83
-            '54d1a33ae4b086c0c0964ce9',
84
-            '57ef253c9033602e61d4a563',
85
-            '552355bfe4b0221aadf2572b',
86
-            '54c67bcde4b051242988553e',
87
-        );
79
+			'57ef23539033602e61d4a560',
80
+			'54c67bb9e4b0512429885513',
81
+			'54c67bb9e4b0512429885512',
82
+			'54c67bbbe4b07997ea3f3f6b',
83
+			'54d1a33ae4b086c0c0964ce9',
84
+			'57ef253c9033602e61d4a563',
85
+			'552355bfe4b0221aadf2572b',
86
+			'54c67bcde4b051242988553e',
87
+		);
88 88
 
89 89
 		return $localization_data;
90 90
 	}
@@ -175,11 +175,11 @@  discard block
 block discarded – undo
175 175
 
176 176
 		if( 'form_list' === GFForms::get_page() ) {
177 177
 			$priority = 790;
178
-        }
178
+		}
179 179
 
180 180
 		if( empty( $connected_views ) ) {
181 181
 
182
-		    $menu_items['gravityview'] = array(
182
+			$menu_items['gravityview'] = array(
183 183
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
184 184
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
185 185
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -210,13 +210,13 @@  discard block
 block discarded – undo
210 210
 		// If there were no items added, then let's create the parent menu
211 211
 		if( $sub_menu_items ) {
212 212
 
213
-		    $sub_menu_items[] = array(
214
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
215
-                'link_class' => 'gv-create-view',
216
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
217
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
218
-			    'capabilities'   => array( 'edit_gravityviews' ),
219
-            );
213
+			$sub_menu_items[] = array(
214
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
215
+				'link_class' => 'gv-create-view',
216
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
217
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
218
+				'capabilities'   => array( 'edit_gravityviews' ),
219
+			);
220 220
 
221 221
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
222 222
 			$sub_menu_items[] = array(
@@ -599,17 +599,17 @@  discard block
 block discarded – undo
599 599
 	 * Render html for displaying available fields based on a Form ID
600 600
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
601 601
 	 *
602
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
602
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
603 603
 	 * @access public
604
-     *
604
+	 *
605 605
 	 * @param int $form Gravity Forms Form ID (default: '')
606 606
 	 * @param string $context (default: 'single')
607
-     *
607
+	 *
608 608
 	 * @return void
609 609
 	 */
610 610
 	function render_available_fields( $form = 0, $context = 'single' ) {
611 611
 
612
-	    // Determine if form is a preset and convert it to an array with fields
612
+		// Determine if form is a preset and convert it to an array with fields
613 613
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
614 614
 
615 615
 		/**
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 
622 622
 		if ( ! is_array( $blacklist_field_types ) ) {
623 623
 
624
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
624
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
625 625
 
626 626
 			$blacklist_field_types = array();
627 627
 		}
@@ -753,12 +753,12 @@  discard block
 block discarded – undo
753 753
 				/**
754 754
 				 * @since 1.7.2
755 755
 				 */
756
-			    'other_entries' => array(
757
-				    'label'	=> __('Other Entries', 'gravityview'),
758
-				    'type'	=> 'other_entries',
759
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
760
-			    ),
761
-	        );
756
+				'other_entries' => array(
757
+					'label'	=> __('Other Entries', 'gravityview'),
758
+					'type'	=> 'other_entries',
759
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
760
+				),
761
+			);
762 762
 
763 763
 			if( 'single' !== $zone) {
764 764
 
@@ -906,9 +906,9 @@  discard block
 block discarded – undo
906 906
 
907 907
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
908 908
 
909
-                foreach ( $joined_forms as $form ) {
910
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
911
-                }
909
+				foreach ( $joined_forms as $form ) {
910
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
911
+				}
912 912
 			} else {
913 913
 				$available_items[ $form ] = \GV\Widget::registered();
914 914
 			}
@@ -936,9 +936,9 @@  discard block
 block discarded – undo
936 936
 
937 937
 										if ( $form_id ) {
938 938
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
939
-                                        } else {
939
+										} else {
940 940
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
941
-                                        }
941
+										}
942 942
 
943 943
 										if ( !$original_item ) {
944 944
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -990,7 +990,7 @@  discard block
 block discarded – undo
990 990
 
991 991
 	/**
992 992
 	 * Render the widget active areas
993
-     * @param  string $template_id The current slug of the selected View template
993
+	 * @param  string $template_id The current slug of the selected View template
994 994
 	 * @param  string $zone    Either 'header' or 'footer'
995 995
 	 * @param  string $post_id Current Post ID (view)
996 996
 	 * @return string          html
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1175 1175
 
1176 1176
 		// Add the GV font (with the Astronaut)
1177
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1177
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1178 1178
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1179 1179
 
1180 1180
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1182,66 +1182,66 @@  discard block
 block discarded – undo
1182 1182
 		if( GFForms::get_page() === 'form_list' ) {
1183 1183
 			wp_enqueue_style( 'gravityview_views_styles' );
1184 1184
 			return;
1185
-        }
1185
+		}
1186 1186
 
1187 1187
 		// Don't process any scripts below here if it's not a GravityView page.
1188 1188
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1189
-		    return;
1189
+			return;
1190 1190
 		}
1191 1191
 
1192
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1193
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1194
-
1195
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1196
-
1197
-        //enqueue scripts
1198
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1199
-
1200
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1201
-            'cookiepath' => COOKIEPATH,
1202
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1203
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1204
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1205
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1206
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1207
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1208
-            'label_close' => __( 'Close', 'gravityview' ),
1209
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1210
-            'label_continue' => __( 'Continue', 'gravityview' ),
1211
-            'label_ok' => __( 'Ok', 'gravityview' ),
1212
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1213
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1214
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1215
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1216
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1217
-        ));
1192
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1193
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1194
+
1195
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1196
+
1197
+		//enqueue scripts
1198
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1199
+
1200
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1201
+			'cookiepath' => COOKIEPATH,
1202
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1203
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1204
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1205
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1206
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1207
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1208
+			'label_close' => __( 'Close', 'gravityview' ),
1209
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1210
+			'label_continue' => __( 'Continue', 'gravityview' ),
1211
+			'label_ok' => __( 'Ok', 'gravityview' ),
1212
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1213
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1214
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1215
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1216
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1217
+		));
1218 1218
 
1219 1219
 		wp_enqueue_style( 'gravityview_views_styles' );
1220 1220
 
1221
-        // Enqueue scripts needed for merge tags
1222
-        self::enqueue_gravity_forms_scripts();
1221
+		// Enqueue scripts needed for merge tags
1222
+		self::enqueue_gravity_forms_scripts();
1223 1223
 	}
1224 1224
 
1225 1225
 	/**
1226 1226
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1227
-     *
1228
-     * @since 1.0.5-beta
1229
-     *
1230
-     * @return void
1227
+	 *
1228
+	 * @since 1.0.5-beta
1229
+	 *
1230
+	 * @return void
1231 1231
 	 */
1232 1232
 	static function enqueue_gravity_forms_scripts() {
1233 1233
 		GFForms::register_scripts();
1234 1234
 
1235 1235
 		$scripts = array(
1236
-		    'sack',
1237
-		    'gform_gravityforms',
1238
-		    'gform_forms',
1239
-		    'gform_form_admin',
1240
-		    'jquery-ui-autocomplete'
1236
+			'sack',
1237
+			'gform_gravityforms',
1238
+			'gform_forms',
1239
+			'gform_form_admin',
1240
+			'jquery-ui-autocomplete'
1241 1241
 		);
1242 1242
 
1243 1243
 		if ( wp_is_mobile() ) {
1244
-		    $scripts[] = 'jquery-touch-punch';
1244
+			$scripts[] = 'jquery-touch-punch';
1245 1245
 		}
1246 1246
 
1247 1247
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
Spacing   +185 added lines, -185 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
74
+	    if ( ! gravityview()->request->is_view() ) {
75 75
 	        return $localization_data;
76 76
         }
77 77
 
78
-		$localization_data['suggest'] = array(
78
+		$localization_data[ 'suggest' ] = array(
79 79
             '57ef23539033602e61d4a560',
80 80
             '54c67bb9e4b0512429885513',
81 81
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( !is_admin() ) {
99
+		if ( ! is_admin() ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
103
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
104 104
 
105
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
106 106
 			return;
107 107
 		}
108 108
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	function add_view_dropdown() {
120 120
 		$current_screen = get_current_screen();
121 121
 
122
-		if( 'gravityview' !== $current_screen->post_type ) {
122
+		if ( 'gravityview' !== $current_screen->post_type ) {
123 123
 			return;
124 124
 		}
125 125
 
126 126
 		$forms = gravityview_get_forms();
127 127
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
128 128
 		// If there are no forms to select, show no forms.
129
-		if( !empty( $forms ) ) { ?>
129
+		if ( ! empty( $forms ) ) { ?>
130 130
 			<select name="gravityview_form_id" id="gravityview_form_id">
131 131
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
132
-				<?php foreach( $forms as $form ) { ?>
133
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
132
+				<?php foreach ( $forms as $form ) { ?>
133
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
134 134
 				<?php } ?>
135 135
 			</select>
136 136
 		<?php }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
145 145
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
146
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
146
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
147 147
 	}
148 148
 
149 149
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
166 166
 
167 167
 		// Don't show on Trashed forms
168
-		if( 'trash' === rgget( 'filter') ) {
168
+		if ( 'trash' === rgget( 'filter' ) ) {
169 169
 			return $menu_items;
170 170
 		}
171 171
 
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$priority = 0;
175 175
 
176
-		if( 'form_list' === GFForms::get_page() ) {
176
+		if ( 'form_list' === GFForms::get_page() ) {
177 177
 			$priority = 790;
178 178
         }
179 179
 
180
-		if( empty( $connected_views ) ) {
180
+		if ( empty( $connected_views ) ) {
181 181
 
182
-		    $menu_items['gravityview'] = array(
182
+		    $menu_items[ 'gravityview' ] = array(
183 183
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
184 184
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
185 185
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -195,22 +195,22 @@  discard block
 block discarded – undo
195 195
 		$sub_menu_items = array();
196 196
 		foreach ( (array)$connected_views as $view ) {
197 197
 
198
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
198
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
199 199
 				continue;
200 200
 			}
201 201
 
202
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
202
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
203 203
 
204
-			$sub_menu_items[] = array(
204
+			$sub_menu_items[ ] = array(
205 205
 				'label' => esc_attr( $label ),
206
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
206
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
207 207
 			);
208 208
 		}
209 209
 
210 210
 		// If there were no items added, then let's create the parent menu
211
-		if( $sub_menu_items ) {
211
+		if ( $sub_menu_items ) {
212 212
 
213
-		    $sub_menu_items[] = array(
213
+		    $sub_menu_items[ ] = array(
214 214
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
215 215
                 'link_class' => 'gv-create-view',
216 216
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -219,14 +219,14 @@  discard block
 block discarded – undo
219 219
             );
220 220
 
221 221
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
222
-			$sub_menu_items[] = array(
222
+			$sub_menu_items[ ] = array(
223 223
 				'url' => '#',
224 224
 				'label' => '',
225 225
 				'menu_class' => 'hidden',
226 226
 				'capabilities' => '',
227 227
 			);
228 228
 
229
-			$menu_items['gravityview'] = array(
229
+			$menu_items[ 'gravityview' ] = array(
230 230
 				'label'          => __( 'Connected Views', 'gravityview' ),
231 231
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
232 232
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -255,8 +255,8 @@  discard block
 block discarded – undo
255 255
 		$add = array( 'captcha', 'page' );
256 256
 
257 257
 		// Don't allowing editing the following values:
258
-		if( $context === 'edit' ) {
259
-			$add[] = 'post_id';
258
+		if ( $context === 'edit' ) {
259
+			$add[ ] = 'post_id';
260 260
 		}
261 261
 
262 262
 		$return = array_merge( $array, $add );
@@ -279,32 +279,32 @@  discard block
 block discarded – undo
279 279
 		foreach ( $default_args as $key => $arg ) {
280 280
 
281 281
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
282
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
282
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
283 283
 
284 284
 			// By default, use `tooltip` if defined.
285
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
285
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
286 286
 
287 287
 			// Otherwise, use the description as a tooltip.
288
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
289
-				$tooltip = $arg['desc'];
288
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
289
+				$tooltip = $arg[ 'desc' ];
290 290
 			}
291 291
 
292 292
 			// If there's no tooltip set, continue
293
-			if( empty( $tooltip ) ) {
293
+			if ( empty( $tooltip ) ) {
294 294
 				continue;
295 295
 			}
296 296
 
297 297
 			// Add the tooltip
298
-			$gv_tooltips[ 'gv_'.$key ] = array(
299
-				'title'	=> $arg['label'],
298
+			$gv_tooltips[ 'gv_' . $key ] = array(
299
+				'title'	=> $arg[ 'label' ],
300 300
 				'value'	=> $tooltip,
301 301
 			);
302 302
 
303 303
 		}
304 304
 
305
-		$gv_tooltips['gv_css_merge_tags'] = array(
306
-			'title' => __('CSS Merge Tags', 'gravityview'),
307
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
305
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
306
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
307
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
308 308
 		);
309 309
 
310 310
 		/**
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
322 322
 
323 323
 		foreach ( $gv_tooltips as $key => $tooltip ) {
324 324
 
325
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
325
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
326 326
 
327
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
327
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
328 328
 		}
329 329
 
330 330
 		return $tooltips;
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 	 *
339 339
 	 * @return void
340 340
 	 */
341
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
341
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
342 342
 
343 343
 		$output = '';
344 344
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
361 361
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
362 362
 
363
-				$output = $template ? $template['label'] : $template_id_pretty;
363
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
364 364
 
365 365
 				break;
366 366
 
@@ -401,44 +401,44 @@  discard block
 block discarded – undo
401 401
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
402 402
 
403 403
 		// Either the form is empty or the form ID is 0, not yet set.
404
-		if( empty( $form ) ) {
404
+		if ( empty( $form ) ) {
405 405
 			return '';
406 406
 		}
407 407
 
408 408
 		// The $form is passed as the form ID
409
-		if( !is_array( $form ) ) {
409
+		if ( ! is_array( $form ) ) {
410 410
 			$form = gravityview_get_form( $form );
411 411
 		}
412 412
 
413
-		$form_id = $form['id'];
413
+		$form_id = $form[ 'id' ];
414 414
 		$links = array();
415 415
 
416
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
416
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
417 417
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
418
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
419
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
418
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
419
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
420 420
 		} else {
421
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
421
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
422 422
 		}
423 423
 
424
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
424
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
425 425
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
426
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
426
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
427 427
 		}
428 428
 
429
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
429
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
430 430
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
431
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
431
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
432 432
 		}
433 433
 
434
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
434
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
435 435
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
436
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
436
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
437 437
 		}
438 438
 
439 439
 		$output = '';
440 440
 
441
-		if( !empty( $include_form_link ) ) {
441
+		if ( ! empty( $include_form_link ) ) {
442 442
 			$output .= $form_link;
443 443
 		}
444 444
 
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 		 */
451 451
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
452 452
 
453
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
453
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
454 454
 
455 455
 		return $output;
456 456
 	}
@@ -464,8 +464,8 @@  discard block
 block discarded – undo
464 464
 		// Get the date column and save it for later to add back in.
465 465
 		// This adds it after the Data Source column.
466 466
 		// This way, we don't need to do array_slice, array_merge, etc.
467
-		$date = $columns['date'];
468
-		unset( $columns['date'] );
467
+		$date = $columns[ 'date' ];
468
+		unset( $columns[ 'date' ] );
469 469
 
470 470
 		$data_source_required_caps = array(
471 471
 			'gravityforms_edit_forms',
@@ -476,14 +476,14 @@  discard block
 block discarded – undo
476 476
 			'gravityforms_preview_forms',
477 477
 		);
478 478
 
479
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
480
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
479
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
480
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
481 481
 		}
482 482
 
483
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
483
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
484 484
 
485 485
 		// Add the date back in.
486
-		$columns['date'] = $date;
486
+		$columns[ 'date' ] = $date;
487 487
 
488 488
 		return $columns;
489 489
 	}
@@ -497,12 +497,12 @@  discard block
 block discarded – undo
497 497
 	 */
498 498
 	function save_postdata( $post_id ) {
499 499
 
500
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
500
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
501 501
 			return;
502 502
 		}
503 503
 
504 504
 		// validate post_type
505
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
505
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
506 506
 			return;
507 507
 		}
508 508
 
@@ -517,63 +517,63 @@  discard block
 block discarded – undo
517 517
 		$statii = array();
518 518
 
519 519
 		// check if this is a start fresh View
520
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
520
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
521 521
 
522
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
522
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
523 523
 			// save form id
524
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
524
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
525 525
 
526 526
 		}
527 527
 
528
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
528
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
529 529
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
530 530
 			return;
531 531
 		}
532 532
 
533 533
 		// Was this a start fresh?
534
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
535
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
534
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
535
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
536 536
 		} else {
537
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
537
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
538 538
 		}
539 539
 
540 540
 		// Check if we have a template id
541
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
541
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
542 542
 
543
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
543
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
544 544
 
545 545
 			// now save template id
546
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
546
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
547 547
 		}
548 548
 
549 549
 
550 550
 		// save View Configuration metabox
551
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
551
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
552 552
 
553 553
 			// template settings
554
-			if( empty( $_POST['template_settings'] ) ) {
555
-				$_POST['template_settings'] = array();
554
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
555
+				$_POST[ 'template_settings' ] = array();
556 556
 			}
557
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
557
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
558 558
 
559 559
 			// guard against unloaded View configuration page
560
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
560
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
561 561
 				$fields = array();
562 562
 
563
-				if ( ! empty( $_POST['gv_fields'] ) ) {
563
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
564 564
 					$fields = _gravityview_process_posted_fields();
565 565
 				}
566 566
 
567 567
 				$fields = wp_slash( $fields );
568 568
 
569
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
569
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
570 570
 			}
571 571
 
572 572
 			// Directory Visible Widgets
573
-			if( empty( $_POST['widgets'] ) ) {
574
-				$_POST['widgets'] = array();
573
+			if ( empty( $_POST[ 'widgets' ] ) ) {
574
+				$_POST[ 'widgets' ] = array();
575 575
 			}
576
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
576
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
577 577
 
578 578
 		} // end save view configuration
579 579
 
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
584 584
 		 * @since 1.17.2
585 585
 		 */
586
-		do_action('gravityview_view_saved', $post_id, $statii );
586
+		do_action( 'gravityview_view_saved', $post_id, $statii );
587 587
 
588 588
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
589 589
 	}
@@ -630,20 +630,20 @@  discard block
 block discarded – undo
630 630
 
631 631
 		$output = '';
632 632
 
633
-		if( !empty( $fields ) ) {
633
+		if ( ! empty( $fields ) ) {
634 634
 
635
-			foreach( $fields as $id => $details ) {
635
+			foreach ( $fields as $id => $details ) {
636 636
 
637
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
637
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
638 638
 					continue;
639 639
 				}
640 640
 
641 641
 				// Edit mode only allows editing the parent fields, not single inputs.
642
-				if( $context === 'edit' && ! empty( $details['parent'] ) ) {
642
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
643 643
 					continue;
644 644
 				}
645 645
 
646
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form );
646
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
647 647
 
648 648
 			} // End foreach
649 649
 		}
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 		echo $output;
652 652
 
653 653
 		// For the EDIT view we only want to allow the form fields.
654
-		if( $context === 'edit' ) {
654
+		if ( $context === 'edit' ) {
655 655
 			return;
656 656
 		}
657 657
 
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
 		$additional_fields = array(
672 672
 			array(
673 673
 				'label_text' => '+ ' . __( 'Add All Form Fields', 'gravityview' ),
674
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
674
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
675 675
 				'field_id' => 'all-fields',
676 676
 				'label_type' => 'field',
677 677
 				'input_type' => null,
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
 		 */
687 687
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
688 688
 
689
-		foreach ( (array) $additional_fields as $item ) {
689
+		foreach ( (array)$additional_fields as $item ) {
690 690
 
691 691
 			// Prevent items from not having index set
692 692
 			$item = wp_parse_args( $item, array(
@@ -696,16 +696,16 @@  discard block
 block discarded – undo
696 696
 				'input_type' => null,
697 697
 				'field_options' => null,
698 698
 				'settings_html'	=> null,
699
-			));
699
+			) );
700 700
 
701 701
 			// Backward compat.
702
-			if( !empty( $item['field_options'] ) ) {
702
+			if ( ! empty( $item[ 'field_options' ] ) ) {
703 703
 				// Use settings_html from now on.
704
-				$item['settings_html'] = $item['field_options'];
704
+				$item[ 'settings_html' ] = $item[ 'field_options' ];
705 705
 			}
706 706
 
707 707
 			// Render a label for each of them
708
-			echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
708
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
709 709
 
710 710
 		}
711 711
 
@@ -717,59 +717,59 @@  discard block
 block discarded – undo
717 717
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
718 718
 	 * @return array
719 719
 	 */
720
-	function get_entry_default_fields($form, $zone) {
720
+	function get_entry_default_fields( $form, $zone ) {
721 721
 
722 722
 		$entry_default_fields = array();
723 723
 
724
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
724
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
725 725
 
726 726
 			$entry_default_fields = array(
727 727
 				'id' => array(
728
-					'label' => __('Entry ID', 'gravityview'),
728
+					'label' => __( 'Entry ID', 'gravityview' ),
729 729
 					'type' => 'id',
730
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
730
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
731 731
 				),
732 732
 				'date_created' => array(
733
-					'label' => __('Entry Date', 'gravityview'),
734
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
733
+					'label' => __( 'Entry Date', 'gravityview' ),
734
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
735 735
 					'type' => 'date_created',
736 736
 				),
737 737
 				'date_updated' => array(
738
-						'label' => __( 'Date Updated', 'gravityview'),
739
-						'desc'	=> __('The date the entry was last updated.', 'gravityview'),
738
+						'label' => __( 'Date Updated', 'gravityview' ),
739
+						'desc'	=> __( 'The date the entry was last updated.', 'gravityview' ),
740 740
 						'type' => 'date_updated',
741 741
 				),
742 742
 				'source_url' => array(
743
-					'label' => __('Source URL', 'gravityview'),
743
+					'label' => __( 'Source URL', 'gravityview' ),
744 744
 					'type' => 'source_url',
745
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
745
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
746 746
 				),
747 747
 				'ip' => array(
748
-					'label' => __('User IP', 'gravityview'),
748
+					'label' => __( 'User IP', 'gravityview' ),
749 749
 					'type' => 'ip',
750
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
750
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
751 751
 				),
752 752
 				'created_by' => array(
753
-					'label' => __('User', 'gravityview'),
753
+					'label' => __( 'User', 'gravityview' ),
754 754
 					'type' => 'created_by',
755
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
755
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
756 756
 				),
757 757
 
758 758
 				/**
759 759
 				 * @since 1.7.2
760 760
 				 */
761 761
 			    'other_entries' => array(
762
-				    'label'	=> __('Other Entries', 'gravityview'),
762
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
763 763
 				    'type'	=> 'other_entries',
764
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
764
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
765 765
 			    ),
766 766
 	        );
767 767
 
768
-			if( 'single' !== $zone) {
768
+			if ( 'single' !== $zone ) {
769 769
 
770
-				$entry_default_fields['entry_link'] = array(
771
-					'label' => __('Link to Entry', 'gravityview'),
772
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
770
+				$entry_default_fields[ 'entry_link' ] = array(
771
+					'label' => __( 'Link to Entry', 'gravityview' ),
772
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
773 773
 					'type' => 'entry_link',
774 774
 				);
775 775
 			}
@@ -779,19 +779,19 @@  discard block
 block discarded – undo
779 779
 		/**
780 780
 		 * @since  1.2
781 781
 		 */
782
-		$entry_default_fields['custom']	= array(
783
-			'label'	=> __('Custom Content', 'gravityview'),
782
+		$entry_default_fields[ 'custom' ] = array(
783
+			'label'	=> __( 'Custom Content', 'gravityview' ),
784 784
 			'type'	=> 'custom',
785
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
785
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
786 786
 		);
787 787
 
788 788
 		/**
789 789
 		 * @since develop
790 790
 		 */
791
-		$entry_default_fields['sequence'] = array(
792
-			'label'	=> __('Result Number', 'gravityview'),
791
+		$entry_default_fields[ 'sequence' ] = array(
792
+			'label'	=> __( 'Result Number', 'gravityview' ),
793 793
 			'type'	=> 'sequence',
794
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
794
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
795 795
 		);
796 796
 
797 797
 		/**
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 		 * @param  string|array $form form_ID or form object
801 801
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
802 802
 		 */
803
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
803
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
804 804
 	}
805 805
 
806 806
 	/**
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
811 811
 	 */
812 812
 	function get_available_fields( $form = '', $zone = NULL ) {
813 813
 
814
-		if( empty( $form ) ) {
814
+		if ( empty( $form ) ) {
815 815
 			gravityview()->log->error( '$form is empty' );
816 816
 			return array();
817 817
 		}
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 		$fields = gravityview_get_form_fields( $form, true );
821 821
 
822 822
 		// get meta fields ( only if form was already created )
823
-		if( !is_array( $form ) ) {
823
+		if ( ! is_array( $form ) ) {
824 824
 			$meta_fields = gravityview_get_entry_meta( $form );
825 825
 		} else {
826 826
 			$meta_fields = array();
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
833 833
 		$fields = $fields + $meta_fields + $default_fields;
834 834
 
835 835
 		// Move Custom Content to top
836
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
836
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
837 837
 
838 838
 		/**
839 839
 		 * @filter `gravityview/admin/available_fields` Modify the available fields that can be used in a View.
@@ -853,11 +853,11 @@  discard block
 block discarded – undo
853 853
 
854 854
 		$widgets = $this->get_registered_widgets();
855 855
 
856
-		if( !empty( $widgets ) ) {
856
+		if ( ! empty( $widgets ) ) {
857 857
 
858
-			foreach( $widgets as $id => $details ) {
858
+			foreach ( $widgets as $id => $details ) {
859 859
 
860
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
860
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
861 861
 
862 862
 			}
863 863
 		}
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
886 886
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
887 887
 		global $post;
888 888
 
889
-		if( $type === 'widget' ) {
889
+		if ( $type === 'widget' ) {
890 890
 			$button_label = __( 'Add Widget', 'gravityview' );
891 891
 		} else {
892 892
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -912,10 +912,10 @@  discard block
 block discarded – undo
912 912
 		$form_id = null;
913 913
 
914 914
 		// if saved values, get available fields to label everyone
915
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
915
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
916 916
 
917
-			if( !empty( $_POST['template_id'] ) ) {
918
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
917
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
918
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
919 919
 			} else {
920 920
 				$form_id = $form = gravityview_get_form_id( $post->ID );
921 921
 			}
@@ -933,42 +933,42 @@  discard block
 block discarded – undo
933 933
 			}
934 934
 		}
935 935
 
936
-		foreach( $rows as $row ) :
937
-			foreach( $row as $col => $areas ) :
938
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
936
+		foreach ( $rows as $row ) :
937
+			foreach ( $row as $col => $areas ) :
938
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
939 939
 
940 940
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
941 941
 
942
-					<?php foreach( $areas as $area ) : 	?>
942
+					<?php foreach ( $areas as $area ) : 	?>
943 943
 
944
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
945
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
944
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
945
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
946 946
 								<?php // render saved fields
947
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
947
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
948 948
 
949
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
949
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
950 950
 
951 951
 										// Maybe has a form ID
952
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
952
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
953 953
 
954 954
 										$input_type = NULL;
955 955
 
956 956
 										if ( $form_id ) {
957
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
957
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
958 958
                                         } else {
959
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
959
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
960 960
                                         }
961 961
 
962
-										if ( !$original_item ) {
963
-											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 ) ) );
962
+										if ( ! $original_item ) {
963
+											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 ) ) );
964 964
 
965 965
 											$original_item = $field;
966 966
 										} else {
967
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
967
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
968 968
 										}
969 969
 
970 970
 										// Field options dialog box
971
-										$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 );
971
+										$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 );
972 972
 
973 973
 										$item = array(
974 974
 											'input_type' => $input_type,
@@ -981,22 +981,22 @@  discard block
 block discarded – undo
981 981
 											$item = wp_parse_args( $item, $original_item );
982 982
 										}
983 983
 
984
-										switch( $type ) {
984
+										switch ( $type ) {
985 985
 											case 'widget':
986
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
986
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
987 987
 												break;
988 988
 											default:
989
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
989
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
990 990
 										}
991 991
 									}
992 992
 
993 993
 								} // End if zone is not empty ?>
994 994
 
995
-								<span class="drop-message"><?php echo sprintf( esc_html__('"+ %s" or drag existing %ss here.', 'gravityview'), esc_html( $button_label ), esc_html( $type ) ); ?></span>
995
+								<span class="drop-message"><?php echo sprintf( esc_html__( '"+ %s" or drag existing %ss here.', 'gravityview' ), esc_html( $button_label ), esc_html( $type ) ); ?></span>
996 996
 							</div>
997 997
 							<div class="gv-droppable-area-action">
998
-								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></button>
999
-								<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>
998
+								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></button>
999
+								<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>
1000 1000
 							</div>
1001 1001
 						</div>
1002 1002
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
 				// This is a new View, prefill the widgets
1025 1025
 				$widgets = array(
1026 1026
 					'header_top' => array(
1027
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1027
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1028 1028
 							'id' => 'search_bar',
1029 1029
 							'label' => __( 'Search Bar', 'gravityview' ),
1030 1030
 							'search_layout' => 'horizontal',
@@ -1099,12 +1099,12 @@  discard block
 block discarded – undo
1099 1099
 		if ( $post ) {
1100 1100
 			$source_form_id = gravityview_get_form_id( $post->ID );
1101 1101
 			if ( $source_form_id ) {
1102
-				$form_ids[] = $source_form_id;
1102
+				$form_ids[ ] = $source_form_id;
1103 1103
 			}
1104 1104
 
1105 1105
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
1106 1106
 			foreach ( $joined_forms as $joined_form ) {
1107
-				$form_ids[] = $joined_form->ID;
1107
+				$form_ids[ ] = $joined_form->ID;
1108 1108
 			}
1109 1109
 		}
1110 1110
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1139,7 +1139,7 @@  discard block
 block discarded – undo
1139 1139
 	 * @return string HTML of the active areas
1140 1140
 	 */
1141 1141
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1142
-		if( empty( $template_id ) ) {
1142
+		if ( empty( $template_id ) ) {
1143 1143
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1144 1144
 			return '';
1145 1145
 		}
@@ -1153,12 +1153,12 @@  discard block
 block discarded – undo
1153 1153
 		 */
1154 1154
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1155 1155
 
1156
-		if( empty( $template_areas ) ) {
1156
+		if ( empty( $template_areas ) ) {
1157 1157
 
1158 1158
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1159 1159
 			$output = '<div>';
1160
-			$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>';
1161
-			$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>';
1160
+			$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>';
1161
+			$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>';
1162 1162
 			$output .= '</div>';
1163 1163
 		} else {
1164 1164
 
@@ -1173,7 +1173,7 @@  discard block
 block discarded – undo
1173 1173
 
1174 1174
 		}
1175 1175
 
1176
-		if( $echo ) {
1176
+		if ( $echo ) {
1177 1177
 			echo $output;
1178 1178
 		}
1179 1179
 
@@ -1193,32 +1193,32 @@  discard block
 block discarded – undo
1193 1193
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1194 1194
 
1195 1195
 		// Add the GV font (with the Astronaut)
1196
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1196
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1197 1197
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1198 1198
 
1199
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1199
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1200 1200
 
1201
-		if( GFForms::get_page() === 'form_list' ) {
1201
+		if ( GFForms::get_page() === 'form_list' ) {
1202 1202
 			wp_enqueue_style( 'gravityview_views_styles' );
1203 1203
 			return;
1204 1204
         }
1205 1205
 
1206 1206
 		// Don't process any scripts below here if it's not a GravityView page.
1207
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1207
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1208 1208
 		    return;
1209 1209
 		}
1210 1210
 
1211 1211
         wp_enqueue_script( 'jquery-ui-datepicker' );
1212
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1212
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1213 1213
 
1214
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1214
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1215 1215
 
1216 1216
         //enqueue scripts
1217 1217
         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 );
1218 1218
 
1219
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1219
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1220 1220
             'cookiepath' => COOKIEPATH,
1221
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1221
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1222 1222
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1223 1223
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1224 1224
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1233,7 +1233,7 @@  discard block
 block discarded – undo
1233 1233
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1234 1234
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1235 1235
             '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' ),
1236
-        ));
1236
+        ) );
1237 1237
 
1238 1238
 		wp_enqueue_style( 'gravityview_views_styles' );
1239 1239
 
@@ -1260,7 +1260,7 @@  discard block
 block discarded – undo
1260 1260
 		);
1261 1261
 
1262 1262
 		if ( wp_is_mobile() ) {
1263
-		    $scripts[] = 'jquery-touch-punch';
1263
+		    $scripts[ ] = 'jquery-touch-punch';
1264 1264
 		}
1265 1265
 
1266 1266
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.