Completed
Pull Request — develop (#1492)
by Zack
08:38
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   +79 added lines, -79 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
 	}
@@ -174,11 +174,11 @@  discard block
 block discarded – undo
174 174
 
175 175
 		if( 'form_list' === GFForms::get_page() ) {
176 176
 			$priority = 790;
177
-        }
177
+		}
178 178
 
179 179
 		if( empty( $connected_views ) ) {
180 180
 
181
-		    $menu_items['gravityview'] = array(
181
+			$menu_items['gravityview'] = array(
182 182
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
183 183
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
184 184
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -209,14 +209,14 @@  discard block
 block discarded – undo
209 209
 		// If there were no items added, then let's create the parent menu
210 210
 		if( $sub_menu_items ) {
211 211
 
212
-		    $sub_menu_items[] = array(
213
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
214
-                'link_class' => 'gv-create-view',
215
-			    'icon' => '<i>&nbsp;+&nbsp;</i>',
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
-            );
212
+			$sub_menu_items[] = array(
213
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
214
+				'link_class' => 'gv-create-view',
215
+				'icon' => '<i>&nbsp;+&nbsp;</i>',
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
 
222 222
 			/**
@@ -627,17 +627,17 @@  discard block
 block discarded – undo
627 627
 	 * Render html for displaying available fields based on a Form ID
628 628
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
629 629
 	 *
630
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
630
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
631 631
 	 * @access public
632
-     *
632
+	 *
633 633
 	 * @param int $form Gravity Forms Form ID (default: '')
634 634
 	 * @param string $context (default: 'single')
635
-     *
635
+	 *
636 636
 	 * @return void
637 637
 	 */
638 638
 	function render_available_fields( $form = 0, $context = 'single' ) {
639 639
 
640
-	    // Determine if form is a preset and convert it to an array with fields
640
+		// Determine if form is a preset and convert it to an array with fields
641 641
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
642 642
 
643 643
 		/**
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
 
650 650
 		if ( ! is_array( $blacklist_field_types ) ) {
651 651
 
652
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
652
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
653 653
 
654 654
 			$blacklist_field_types = array();
655 655
 		}
@@ -798,13 +798,13 @@  discard block
 block discarded – undo
798 798
 				/**
799 799
 				 * @since 1.7.2
800 800
 				 */
801
-			    'other_entries' => array(
802
-				    'label'	=> __('Other Entries', 'gravityview'),
803
-				    'type'	=> 'other_entries',
804
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
801
+				'other_entries' => array(
802
+					'label'	=> __('Other Entries', 'gravityview'),
803
+					'type'	=> 'other_entries',
804
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
805 805
 					'group' => 'gravityview',
806
-			    ),
807
-	        );
806
+				),
807
+			);
808 808
 
809 809
 			if( 'single' !== $zone) {
810 810
 
@@ -978,9 +978,9 @@  discard block
 block discarded – undo
978 978
 
979 979
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
980 980
 
981
-                foreach ( $joined_forms as $form ) {
982
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
983
-                }
981
+				foreach ( $joined_forms as $form ) {
982
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
983
+				}
984 984
 			} else {
985 985
 				$available_items[ $form ] = \GV\Widget::registered();
986 986
 			}
@@ -1014,9 +1014,9 @@  discard block
 block discarded – undo
1014 1014
 
1015 1015
 										if ( $form_id ) {
1016 1016
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
1017
-                                        } else {
1017
+										} else {
1018 1018
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
1019
-                                        }
1019
+										}
1020 1020
 
1021 1021
 										if ( !$original_item ) {
1022 1022
 											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 ) ) );
@@ -1270,7 +1270,7 @@  discard block
 block discarded – undo
1270 1270
 		}
1271 1271
 
1272 1272
 		// Add the GV font (with the Astronaut)
1273
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1273
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1274 1274
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1275 1275
 
1276 1276
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1278,64 +1278,64 @@  discard block
 block discarded – undo
1278 1278
 		if( GFForms::get_page() === 'form_list' ) {
1279 1279
 			wp_enqueue_style( 'gravityview_views_styles' );
1280 1280
 			return;
1281
-        }
1281
+		}
1282 1282
 
1283 1283
 		// Don't process any scripts below here if it's not a GravityView page.
1284 1284
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1285
-		    return;
1285
+			return;
1286 1286
 		}
1287 1287
 
1288
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1289
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1290
-
1291
-        // Enqueue scripts
1292
-        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 );
1293
-
1294
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1295
-            'cookiepath' => COOKIEPATH,
1296
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1297
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1298
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1299
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1300
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1301
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1302
-            'label_close' => __( 'Close', 'gravityview' ),
1303
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1304
-            'label_continue' => __( 'Continue', 'gravityview' ),
1305
-            'label_ok' => __( 'Ok', 'gravityview' ),
1306
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1307
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1308
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1309
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1310
-            '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' ),
1311
-        ));
1288
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1289
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1290
+
1291
+		// Enqueue scripts
1292
+		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 );
1293
+
1294
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1295
+			'cookiepath' => COOKIEPATH,
1296
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1297
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1298
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1299
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1300
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1301
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1302
+			'label_close' => __( 'Close', 'gravityview' ),
1303
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1304
+			'label_continue' => __( 'Continue', 'gravityview' ),
1305
+			'label_ok' => __( 'Ok', 'gravityview' ),
1306
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1307
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1308
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1309
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1310
+			'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' ),
1311
+		));
1312 1312
 
1313 1313
 		wp_enqueue_style( 'gravityview_views_styles' );
1314 1314
 
1315
-        // Enqueue scripts needed for merge tags
1316
-        self::enqueue_gravity_forms_scripts();
1315
+		// Enqueue scripts needed for merge tags
1316
+		self::enqueue_gravity_forms_scripts();
1317 1317
 	}
1318 1318
 
1319 1319
 	/**
1320 1320
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1321
-     *
1322
-     * @since 1.0.5-beta
1323
-     *
1324
-     * @return void
1321
+	 *
1322
+	 * @since 1.0.5-beta
1323
+	 *
1324
+	 * @return void
1325 1325
 	 */
1326 1326
 	static function enqueue_gravity_forms_scripts() {
1327 1327
 		GFForms::register_scripts();
1328 1328
 
1329 1329
 		$scripts = array(
1330
-		    'sack',
1331
-		    'gform_gravityforms',
1332
-		    'gform_forms',
1333
-		    'gform_form_admin',
1334
-		    'jquery-ui-autocomplete'
1330
+			'sack',
1331
+			'gform_gravityforms',
1332
+			'gform_forms',
1333
+			'gform_form_admin',
1334
+			'jquery-ui-autocomplete'
1335 1335
 		);
1336 1336
 
1337 1337
 		if ( wp_is_mobile() ) {
1338
-		    $scripts[] = 'jquery-touch-punch';
1338
+			$scripts[] = 'jquery-touch-punch';
1339 1339
 		}
1340 1340
 
1341 1341
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
Spacing   +184 added lines, -184 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
73
+	    if ( ! gravityview()->request->is_view() ) {
74 74
 	        return $localization_data;
75 75
         }
76 76
 
77
-		$localization_data['suggest'] = array(
77
+		$localization_data[ 'suggest' ] = array(
78 78
             '57ef23539033602e61d4a560',
79 79
             '54c67bb9e4b0512429885513',
80 80
             '54c67bb9e4b0512429885512',
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
96 96
 		global $pagenow;
97 97
 
98
-		if ( !is_admin() ) {
98
+		if ( ! is_admin() ) {
99 99
 			return;
100 100
 		}
101 101
 
102
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
102
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
103 103
 
104
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
104
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -118,18 +118,18 @@  discard block
 block discarded – undo
118 118
 	function add_view_dropdown() {
119 119
 		$current_screen = get_current_screen();
120 120
 
121
-		if( 'gravityview' !== $current_screen->post_type ) {
121
+		if ( 'gravityview' !== $current_screen->post_type ) {
122 122
 			return;
123 123
 		}
124 124
 
125 125
 		$forms = gravityview_get_forms();
126 126
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
127 127
 		// If there are no forms to select, show no forms.
128
-		if( !empty( $forms ) ) { ?>
128
+		if ( ! empty( $forms ) ) { ?>
129 129
 			<select name="gravityview_form_id" id="gravityview_form_id">
130 130
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
131
-				<?php foreach( $forms as $form ) { ?>
132
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
131
+				<?php foreach ( $forms as $form ) { ?>
132
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
133 133
 				<?php } ?>
134 134
 			</select>
135 135
 		<?php }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
144 144
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
145
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
145
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
146 146
 	}
147 147
 
148 148
 	/**
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
172 172
 
173 173
 		$priority = 0;
174 174
 
175
-		if( 'form_list' === GFForms::get_page() ) {
175
+		if ( 'form_list' === GFForms::get_page() ) {
176 176
 			$priority = 790;
177 177
         }
178 178
 
179
-		if( empty( $connected_views ) ) {
179
+		if ( empty( $connected_views ) ) {
180 180
 
181
-		    $menu_items['gravityview'] = array(
181
+		    $menu_items[ 'gravityview' ] = array(
182 182
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
183 183
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
184 184
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -194,22 +194,22 @@  discard block
 block discarded – undo
194 194
 		$sub_menu_items = array();
195 195
 		foreach ( (array)$connected_views as $view ) {
196 196
 
197
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
197
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
198 198
 				continue;
199 199
 			}
200 200
 
201
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
201
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
202 202
 
203
-			$sub_menu_items[] = array(
203
+			$sub_menu_items[ ] = array(
204 204
 				'label' => esc_attr( $label ),
205
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
205
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
206 206
 			);
207 207
 		}
208 208
 
209 209
 		// If there were no items added, then let's create the parent menu
210
-		if( $sub_menu_items ) {
210
+		if ( $sub_menu_items ) {
211 211
 
212
-		    $sub_menu_items[] = array(
212
+		    $sub_menu_items[ ] = array(
213 213
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
214 214
                 'link_class' => 'gv-create-view',
215 215
 			    'icon' => '<i>&nbsp;+&nbsp;</i>',
@@ -225,14 +225,14 @@  discard block
 block discarded – undo
225 225
 			if ( ! ( 'gf_edit_forms' === rgget( 'page' ) && '' === rgget( 'view' ) ) || version_compare( '2.5-beta', GFForms::$version, '>' ) ) {
226 226
 
227 227
 				// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
228
-				$sub_menu_items[] = array(
228
+				$sub_menu_items[ ] = array(
229 229
 					'url' => '#',
230 230
 					'label' => '',
231 231
 					'menu_class' => 'hidden',
232 232
 					'capabilities' => '',
233 233
 				);
234 234
 
235
-				$menu_items['gravityview'] = array(
235
+				$menu_items[ 'gravityview' ] = array(
236 236
 					'label'          => __( 'Connected Views', 'gravityview' ),
237 237
 					'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
238 238
 					'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 
247 247
 			} else {
248 248
 
249
-				$menu_items[ 'gravityview'] = array(
249
+				$menu_items[ 'gravityview' ] = array(
250 250
 					'label' => __( 'Connected Views', 'gravityview' ),
251 251
 					'url'   => '#gravityview-group-heading',
252 252
 					'icon'  => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
@@ -283,8 +283,8 @@  discard block
 block discarded – undo
283 283
 		$add = array( 'captcha', 'page' );
284 284
 
285 285
 		// Don't allowing editing the following values:
286
-		if( $context === 'edit' ) {
287
-			$add[] = 'post_id';
286
+		if ( $context === 'edit' ) {
287
+			$add[ ] = 'post_id';
288 288
 		}
289 289
 
290 290
 		$return = array_merge( $array, $add );
@@ -307,32 +307,32 @@  discard block
 block discarded – undo
307 307
 		foreach ( $default_args as $key => $arg ) {
308 308
 
309 309
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
310
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
310
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
311 311
 
312 312
 			// By default, use `tooltip` if defined.
313
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
313
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
314 314
 
315 315
 			// Otherwise, use the description as a tooltip.
316
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
317
-				$tooltip = $arg['desc'];
316
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
317
+				$tooltip = $arg[ 'desc' ];
318 318
 			}
319 319
 
320 320
 			// If there's no tooltip set, continue
321
-			if( empty( $tooltip ) ) {
321
+			if ( empty( $tooltip ) ) {
322 322
 				continue;
323 323
 			}
324 324
 
325 325
 			// Add the tooltip
326
-			$gv_tooltips[ 'gv_'.$key ] = array(
327
-				'title'	=> $arg['label'],
326
+			$gv_tooltips[ 'gv_' . $key ] = array(
327
+				'title'	=> $arg[ 'label' ],
328 328
 				'value'	=> $tooltip,
329 329
 			);
330 330
 
331 331
 		}
332 332
 
333
-		$gv_tooltips['gv_css_merge_tags'] = array(
334
-			'title' => __('CSS Merge Tags', 'gravityview'),
335
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
333
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
334
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
335
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
336 336
 		);
337 337
 
338 338
 		/**
@@ -350,9 +350,9 @@  discard block
 block discarded – undo
350 350
 
351 351
 		foreach ( $gv_tooltips as $key => $tooltip ) {
352 352
 
353
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
353
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
354 354
 
355
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
355
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
356 356
 		}
357 357
 
358 358
 		return $tooltips;
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 	 *
367 367
 	 * @return void
368 368
 	 */
369
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
369
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
370 370
 
371 371
 		$output = '';
372 372
 
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
389 389
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
390 390
 
391
-				$output = $template ? $template['label'] : $template_id_pretty;
391
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
392 392
 
393 393
 				break;
394 394
 
@@ -429,44 +429,44 @@  discard block
 block discarded – undo
429 429
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
430 430
 
431 431
 		// Either the form is empty or the form ID is 0, not yet set.
432
-		if( empty( $form ) ) {
432
+		if ( empty( $form ) ) {
433 433
 			return '';
434 434
 		}
435 435
 
436 436
 		// The $form is passed as the form ID
437
-		if( !is_array( $form ) ) {
437
+		if ( ! is_array( $form ) ) {
438 438
 			$form = gravityview_get_form( $form );
439 439
 		}
440 440
 
441
-		$form_id = $form['id'];
441
+		$form_id = $form[ 'id' ];
442 442
 		$links = array();
443 443
 
444
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
444
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
445 445
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
446
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
447
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
446
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
447
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
448 448
 		} else {
449
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
449
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
450 450
 		}
451 451
 
452
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
452
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
453 453
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
454
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
454
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
455 455
 		}
456 456
 
457
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
457
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
458 458
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
459
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
459
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
460 460
 		}
461 461
 
462
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
462
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
463 463
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
464
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
464
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
465 465
 		}
466 466
 
467 467
 		$output = '';
468 468
 
469
-		if( !empty( $include_form_link ) ) {
469
+		if ( ! empty( $include_form_link ) ) {
470 470
 			$output .= $form_link;
471 471
 		}
472 472
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		 */
479 479
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
480 480
 
481
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
481
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
482 482
 
483 483
 		return $output;
484 484
 	}
@@ -492,8 +492,8 @@  discard block
 block discarded – undo
492 492
 		// Get the date column and save it for later to add back in.
493 493
 		// This adds it after the Data Source column.
494 494
 		// This way, we don't need to do array_slice, array_merge, etc.
495
-		$date = $columns['date'];
496
-		unset( $columns['date'] );
495
+		$date = $columns[ 'date' ];
496
+		unset( $columns[ 'date' ] );
497 497
 
498 498
 		$data_source_required_caps = array(
499 499
 			'gravityforms_edit_forms',
@@ -504,14 +504,14 @@  discard block
 block discarded – undo
504 504
 			'gravityforms_preview_forms',
505 505
 		);
506 506
 
507
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
508
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
507
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
508
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
509 509
 		}
510 510
 
511
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
511
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
512 512
 
513 513
 		// Add the date back in.
514
-		$columns['date'] = $date;
514
+		$columns[ 'date' ] = $date;
515 515
 
516 516
 		return $columns;
517 517
 	}
@@ -525,12 +525,12 @@  discard block
 block discarded – undo
525 525
 	 */
526 526
 	function save_postdata( $post_id ) {
527 527
 
528
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
528
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
529 529
 			return;
530 530
 		}
531 531
 
532 532
 		// validate post_type
533
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
533
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
534 534
 			return;
535 535
 		}
536 536
 
@@ -545,63 +545,63 @@  discard block
 block discarded – undo
545 545
 		$statii = array();
546 546
 
547 547
 		// check if this is a start fresh View
548
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
548
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
549 549
 
550
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
550
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
551 551
 			// save form id
552
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
552
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
553 553
 
554 554
 		}
555 555
 
556
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
556
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
557 557
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
558 558
 			return;
559 559
 		}
560 560
 
561 561
 		// Was this a start fresh?
562
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
563
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
562
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
563
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
564 564
 		} else {
565
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
565
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
566 566
 		}
567 567
 
568 568
 		// Check if we have a template id
569
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
569
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
570 570
 
571
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
571
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
572 572
 
573 573
 			// now save template id
574
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
574
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
575 575
 		}
576 576
 
577 577
 
578 578
 		// save View Configuration metabox
579
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
579
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
580 580
 
581 581
 			// template settings
582
-			if( empty( $_POST['template_settings'] ) ) {
583
-				$_POST['template_settings'] = array();
582
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
583
+				$_POST[ 'template_settings' ] = array();
584 584
 			}
585
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
585
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
586 586
 
587 587
 			// guard against unloaded View configuration page
588
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
588
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
589 589
 				$fields = array();
590 590
 
591
-				if ( ! empty( $_POST['gv_fields'] ) ) {
591
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
592 592
 					$fields = _gravityview_process_posted_fields();
593 593
 				}
594 594
 
595 595
 				$fields = wp_slash( $fields );
596 596
 
597
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
597
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
598 598
 			}
599 599
 
600 600
 			// Directory Visible Widgets
601
-			if( empty( $_POST['widgets'] ) ) {
602
-				$_POST['widgets'] = array();
601
+			if ( empty( $_POST[ 'widgets' ] ) ) {
602
+				$_POST[ 'widgets' ] = array();
603 603
 			}
604
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
604
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
605 605
 
606 606
 		} // end save view configuration
607 607
 
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
 		 * @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.
612 612
 		 * @since 1.17.2
613 613
 		 */
614
-		do_action('gravityview_view_saved', $post_id, $statii );
614
+		do_action( 'gravityview_view_saved', $post_id, $statii );
615 615
 
616 616
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
617 617
 	}
@@ -658,20 +658,20 @@  discard block
 block discarded – undo
658 658
 
659 659
 		$output = '';
660 660
 
661
-		if( !empty( $fields ) ) {
661
+		if ( ! empty( $fields ) ) {
662 662
 
663
-			foreach( $fields as $id => $details ) {
663
+			foreach ( $fields as $id => $details ) {
664 664
 
665
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
665
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
666 666
 					continue;
667 667
 				}
668 668
 
669 669
 				// Edit mode only allows editing the parent fields, not single inputs.
670
-				if( $context === 'edit' && ! empty( $details['parent'] ) ) {
670
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
671 671
 					continue;
672 672
 				}
673 673
 
674
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form );
674
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
675 675
 
676 676
 			} // End foreach
677 677
 		}
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 		echo $output;
680 680
 
681 681
 		// For the EDIT view we only want to allow the form fields.
682
-		if( $context === 'edit' ) {
682
+		if ( $context === 'edit' ) {
683 683
 			return;
684 684
 		}
685 685
 
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 		$additional_fields = array(
700 700
 			array(
701 701
 				'label_text' => '+ ' . __( 'Add All Form Fields', 'gravityview' ),
702
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
702
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
703 703
 				'field_id' => 'all-fields',
704 704
 				'label_type' => 'field',
705 705
 				'input_type' => null,
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
 		 */
715 715
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
716 716
 
717
-		foreach ( (array) $additional_fields as $item ) {
717
+		foreach ( (array)$additional_fields as $item ) {
718 718
 
719 719
 			// Prevent items from not having index set
720 720
 			$item = wp_parse_args( $item, array(
@@ -724,16 +724,16 @@  discard block
 block discarded – undo
724 724
 				'input_type' => null,
725 725
 				'field_options' => null,
726 726
 				'settings_html'	=> null,
727
-			));
727
+			) );
728 728
 
729 729
 			// Backward compat.
730
-			if( !empty( $item['field_options'] ) ) {
730
+			if ( ! empty( $item[ 'field_options' ] ) ) {
731 731
 				// Use settings_html from now on.
732
-				$item['settings_html'] = $item['field_options'];
732
+				$item[ 'settings_html' ] = $item[ 'field_options' ];
733 733
 			}
734 734
 
735 735
 			// Render a label for each of them
736
-			echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
736
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
737 737
 
738 738
 		}
739 739
 
@@ -745,52 +745,52 @@  discard block
 block discarded – undo
745 745
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
746 746
 	 * @return array
747 747
 	 */
748
-	function get_entry_default_fields($form, $zone) {
748
+	function get_entry_default_fields( $form, $zone ) {
749 749
 
750 750
 		$entry_default_fields = array();
751 751
 
752
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
752
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
753 753
 
754 754
 			$entry_default_fields = array(
755 755
 				'id' => array(
756
-					'label' => __('Entry ID', 'gravityview'),
756
+					'label' => __( 'Entry ID', 'gravityview' ),
757 757
 					'type' => 'id',
758
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
758
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
759 759
 					'icon' => 'dashicons-code-standards',
760 760
 					'group' => 'meta',
761 761
 				),
762 762
 				'date_created' => array(
763
-					'label' => __('Entry Date', 'gravityview'),
764
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
763
+					'label' => __( 'Entry Date', 'gravityview' ),
764
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
765 765
 					'type' => 'date_created',
766 766
 					'icon' => 'dashicons-calendar-alt',
767 767
 					'group' => 'meta',
768 768
 				),
769 769
 				'date_updated' => array(
770
-					'label' => __( 'Date Updated', 'gravityview'),
771
-					'desc'	=> __('The date the entry was last updated.', 'gravityview'),
770
+					'label' => __( 'Date Updated', 'gravityview' ),
771
+					'desc'	=> __( 'The date the entry was last updated.', 'gravityview' ),
772 772
 					'type' => 'date_updated',
773 773
 					'icon' => 'dashicons-calendar-alt',
774 774
 					'group' => 'meta',
775 775
 				),
776 776
 				'source_url' => array(
777
-					'label' => __('Source URL', 'gravityview'),
777
+					'label' => __( 'Source URL', 'gravityview' ),
778 778
 					'type' => 'source_url',
779
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
779
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
780 780
 					'icon' => 'dashicons-admin-links',
781 781
 					'group' => 'meta',
782 782
 				),
783 783
 				'ip' => array(
784
-					'label' => __('User IP', 'gravityview'),
784
+					'label' => __( 'User IP', 'gravityview' ),
785 785
 					'type' => 'ip',
786
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
786
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
787 787
 					'icon' => 'dashicons-laptop',
788 788
 					'group' => 'meta',
789 789
 				),
790 790
 				'created_by' => array(
791
-					'label' => __('User', 'gravityview'),
791
+					'label' => __( 'User', 'gravityview' ),
792 792
 					'type' => 'created_by',
793
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
793
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
794 794
 					'icon' => 'dashicons-admin-users',
795 795
 					'group' => 'meta',
796 796
 				),
@@ -799,18 +799,18 @@  discard block
 block discarded – undo
799 799
 				 * @since 1.7.2
800 800
 				 */
801 801
 			    'other_entries' => array(
802
-				    'label'	=> __('Other Entries', 'gravityview'),
802
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
803 803
 				    'type'	=> 'other_entries',
804
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
804
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
805 805
 					'group' => 'gravityview',
806 806
 			    ),
807 807
 	        );
808 808
 
809
-			if( 'single' !== $zone) {
809
+			if ( 'single' !== $zone ) {
810 810
 
811
-				$entry_default_fields['entry_link'] = array(
812
-					'label' => __('Link to Entry', 'gravityview'),
813
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
811
+				$entry_default_fields[ 'entry_link' ] = array(
812
+					'label' => __( 'Link to Entry', 'gravityview' ),
813
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
814 814
 					'type' => 'entry_link',
815 815
 					'group' => 'gravityview',
816 816
 				);
@@ -821,16 +821,16 @@  discard block
 block discarded – undo
821 821
 		/**
822 822
 		 * @since  1.2
823 823
 		 */
824
-		$entry_default_fields['custom']	= array(
825
-			'label'	=> __('Custom Content', 'gravityview'),
824
+		$entry_default_fields[ 'custom' ] = array(
825
+			'label'	=> __( 'Custom Content', 'gravityview' ),
826 826
 			'type'	=> 'custom',
827
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
827
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
828 828
 		);
829 829
 
830 830
 		/**
831 831
 		 * @since develop
832 832
 		 */
833
-		$entry_default_fields['sequence'] = array(
833
+		$entry_default_fields[ 'sequence' ] = array(
834 834
 			'label' => __( 'Result Number', 'gravityview' ),
835 835
 			'type'  => 'sequence',
836 836
 			'desc'  => __( 'Display a sequential result number for each entry.', 'gravityview' ),
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
 		 * @param  string|array $form form_ID or form object
844 844
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
845 845
 		 */
846
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
846
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
847 847
 	}
848 848
 
849 849
 	/**
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 	 */
855 855
 	function get_available_fields( $form = '', $zone = NULL ) {
856 856
 
857
-		if( empty( $form ) ) {
857
+		if ( empty( $form ) ) {
858 858
 			gravityview()->log->error( '$form is empty' );
859 859
 			return array();
860 860
 		}
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
863 863
 		$fields = gravityview_get_form_fields( $form, true );
864 864
 
865 865
 		// get meta fields ( only if form was already created )
866
-		if( !is_array( $form ) ) {
866
+		if ( ! is_array( $form ) ) {
867 867
 			$meta_fields = gravityview_get_entry_meta( $form );
868 868
 		} else {
869 869
 			$meta_fields = array();
@@ -876,14 +876,14 @@  discard block
 block discarded – undo
876 876
 		$fields = $fields + $meta_fields + $default_fields;
877 877
 
878 878
 		// Move Custom Content to top
879
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
879
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
880 880
 
881 881
 		$gv_fields = GravityView_Fields::get_all();
882 882
 
883 883
 		foreach ( $fields as &$field ) {
884 884
 			foreach ( $gv_fields as $gv_field ) {
885
-				if ( $field['type'] === $gv_field->name ) {
886
-					$field['icon'] = $gv_field->icon;
885
+				if ( $field[ 'type' ] === $gv_field->name ) {
886
+					$field[ 'icon' ] = $gv_field->icon;
887 887
 				}
888 888
 			}
889 889
 		}
@@ -906,11 +906,11 @@  discard block
 block discarded – undo
906 906
 
907 907
 		$widgets = $this->get_registered_widgets();
908 908
 
909
-		if( !empty( $widgets ) ) {
909
+		if ( ! empty( $widgets ) ) {
910 910
 
911
-			foreach( $widgets as $id => $details ) {
911
+			foreach ( $widgets as $id => $details ) {
912 912
 
913
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
913
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
914 914
 
915 915
 			}
916 916
 		}
@@ -939,7 +939,7 @@  discard block
 block discarded – undo
939 939
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
940 940
 		global $post;
941 941
 
942
-		if( $type === 'widget' ) {
942
+		if ( $type === 'widget' ) {
943 943
 			$button_label = __( 'Add Widget', 'gravityview' );
944 944
 		} else {
945 945
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -965,10 +965,10 @@  discard block
 block discarded – undo
965 965
 		$form_id = null;
966 966
 
967 967
 		// if saved values, get available fields to label everyone
968
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
968
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
969 969
 
970
-			if( !empty( $_POST['template_id'] ) ) {
971
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
970
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
971
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
972 972
 			} else {
973 973
 				$form_id = $form = gravityview_get_form_id( $post->ID );
974 974
 			}
@@ -986,48 +986,48 @@  discard block
 block discarded – undo
986 986
 			}
987 987
 		}
988 988
 
989
-		foreach( $rows as $row ) :
990
-			foreach( $row as $col => $areas ) :
991
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
989
+		foreach ( $rows as $row ) :
990
+			foreach ( $row as $col => $areas ) :
991
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
992 992
 
993 993
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
994 994
 
995
-					<?php foreach( $areas as $area ) : 	?>
995
+					<?php foreach ( $areas as $area ) : 	?>
996 996
 
997
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
997
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
998 998
                             <p class="gv-droppable-area-title"><strong <?php if ( 'widget' === $type ) {
999 999
 									echo 'class="screen-reader-text"';
1000
-								} ?>><?php echo esc_html( $area['title'] ); ?></strong><?php if ( ! empty( $area['subtitle'] ) ) { ?>
1000
+								} ?>><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?>
1001 1001
                                     <span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip">
1002
-                                    &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span></span><?php } ?></p>
1002
+                                    &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span></span><?php } ?></p>
1003 1003
 							<div class="active-drop-container active-drop-container-<?php echo esc_attr( $type ); ?>">
1004
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
1004
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
1005 1005
 								<?php // render saved fields
1006
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
1006
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
1007 1007
 
1008
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
1008
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
1009 1009
 
1010 1010
 										// Maybe has a form ID
1011
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
1011
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
1012 1012
 
1013 1013
 										$input_type = NULL;
1014 1014
 
1015 1015
 										if ( $form_id ) {
1016
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
1016
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
1017 1017
                                         } else {
1018
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
1018
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
1019 1019
                                         }
1020 1020
 
1021
-										if ( !$original_item ) {
1022
-											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 ) ) );
1021
+										if ( ! $original_item ) {
1022
+											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 ) ) );
1023 1023
 
1024 1024
 											$original_item = $field;
1025 1025
 										} else {
1026
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
1026
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
1027 1027
 										}
1028 1028
 
1029 1029
 										// Field options dialog box
1030
-										$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 );
1030
+										$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 );
1031 1031
 
1032 1032
 										$item = array(
1033 1033
 											'input_type' => $input_type,
@@ -1040,12 +1040,12 @@  discard block
 block discarded – undo
1040 1040
 											$item = wp_parse_args( $item, $original_item );
1041 1041
 										}
1042 1042
 
1043
-										switch( $type ) {
1043
+										switch ( $type ) {
1044 1044
 											case 'widget':
1045
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
1045
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
1046 1046
 												break;
1047 1047
 											default:
1048
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
1048
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
1049 1049
 										}
1050 1050
 									}
1051 1051
 
@@ -1055,7 +1055,7 @@  discard block
 block discarded – undo
1055 1055
 								<div class="gv-droppable-area-action">
1056 1056
 									<a href="#" class="gv-add-field button button-link button-hero" title=""
1057 1057
 									   data-objecttype="<?php echo esc_attr( $type ); ?>"
1058
-									   data-areaid="<?php echo esc_attr( $zone . '_' . $area['areaid'] ); ?>"
1058
+									   data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"
1059 1059
 									   data-context="<?php echo esc_attr( $zone ); ?>"
1060 1060
 									   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>
1061 1061
 								</div>
@@ -1088,7 +1088,7 @@  discard block
 block discarded – undo
1088 1088
 				// This is a new View, prefill the widgets
1089 1089
 				$widgets = array(
1090 1090
 					'header_top' => array(
1091
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1091
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1092 1092
 							'id' => 'search_bar',
1093 1093
 							'label' => __( 'Search Bar', 'gravityview' ),
1094 1094
 							'search_layout' => 'horizontal',
@@ -1163,12 +1163,12 @@  discard block
 block discarded – undo
1163 1163
 		if ( $post ) {
1164 1164
 			$source_form_id = gravityview_get_form_id( $post->ID );
1165 1165
 			if ( $source_form_id ) {
1166
-				$form_ids[] = $source_form_id;
1166
+				$form_ids[ ] = $source_form_id;
1167 1167
 			}
1168 1168
 
1169 1169
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
1170 1170
 			foreach ( $joined_forms as $joined_form ) {
1171
-				$form_ids[] = $joined_form->ID;
1171
+				$form_ids[ ] = $joined_form->ID;
1172 1172
 			}
1173 1173
 		}
1174 1174
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1207,7 +1207,7 @@  discard block
 block discarded – undo
1207 1207
 	 * @return string HTML of the active areas
1208 1208
 	 */
1209 1209
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1210
-		if( empty( $template_id ) ) {
1210
+		if ( empty( $template_id ) ) {
1211 1211
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1212 1212
 			return '';
1213 1213
 		}
@@ -1221,12 +1221,12 @@  discard block
 block discarded – undo
1221 1221
 		 */
1222 1222
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1223 1223
 
1224
-		if( empty( $template_areas ) ) {
1224
+		if ( empty( $template_areas ) ) {
1225 1225
 
1226 1226
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1227 1227
 			$output = '<div>';
1228
-			$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>';
1229
-			$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>';
1228
+			$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>';
1229
+			$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>';
1230 1230
 			$output .= '</div>';
1231 1231
 		} else {
1232 1232
 
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
1241 1241
 
1242 1242
 		}
1243 1243
 
1244
-		if( $echo ) {
1244
+		if ( $echo ) {
1245 1245
 			echo $output;
1246 1246
 		}
1247 1247
 
@@ -1270,30 +1270,30 @@  discard block
 block discarded – undo
1270 1270
 		}
1271 1271
 
1272 1272
 		// Add the GV font (with the Astronaut)
1273
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1273
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1274 1274
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1275 1275
 
1276
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1276
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1277 1277
 
1278
-		if( GFForms::get_page() === 'form_list' ) {
1278
+		if ( GFForms::get_page() === 'form_list' ) {
1279 1279
 			wp_enqueue_style( 'gravityview_views_styles' );
1280 1280
 			return;
1281 1281
         }
1282 1282
 
1283 1283
 		// Don't process any scripts below here if it's not a GravityView page.
1284
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1284
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1285 1285
 		    return;
1286 1286
 		}
1287 1287
 
1288 1288
         wp_enqueue_script( 'jquery-ui-datepicker' );
1289
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1289
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1290 1290
 
1291 1291
         // Enqueue scripts
1292 1292
         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 );
1293 1293
 
1294
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1294
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1295 1295
             'cookiepath' => COOKIEPATH,
1296
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1296
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1297 1297
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1298 1298
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1299 1299
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1308,7 +1308,7 @@  discard block
 block discarded – undo
1308 1308
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1309 1309
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1310 1310
             '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' ),
1311
-        ));
1311
+        ) );
1312 1312
 
1313 1313
 		wp_enqueue_style( 'gravityview_views_styles' );
1314 1314
 
@@ -1335,7 +1335,7 @@  discard block
 block discarded – undo
1335 1335
 		);
1336 1336
 
1337 1337
 		if ( wp_is_mobile() ) {
1338
-		    $scripts[] = 'jquery-touch-punch';
1338
+		    $scripts[ ] = 'jquery-touch-punch';
1339 1339
 		}
1340 1340
 
1341 1341
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.