Completed
Pull Request — develop (#1316)
by Gennady
19:55
created
includes/fields/class-gravityview-field-sequence.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
39 39
 
40
-		unset ( $field_options['search_filter'] );
40
+		unset ( $field_options[ 'search_filter' ] );
41 41
 
42 42
 		$new_fields = array(
43 43
 			'start' => array(
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 			$total = $context->view->get_entries()->total();
85 85
 			remove_filter( 'gform_gf_query_sql', $callback );
86 86
 
87
-			unset( $sql_query['paginate'] );
87
+			unset( $sql_query[ 'paginate' ] );
88 88
 
89 89
 			global $wpdb;
90 90
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +183 added lines, -183 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
74
+	    if ( ! gravityview()->request->is_view() ) {
75 75
 	        return $localization_data;
76 76
         }
77 77
 
78
-		$localization_data['suggest'] = array(
78
+		$localization_data[ 'suggest' ] = array(
79 79
             '57ef23539033602e61d4a560',
80 80
             '54c67bb9e4b0512429885513',
81 81
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( !is_admin() ) {
99
+		if ( ! is_admin() ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
103
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
104 104
 
105
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
106 106
 			return;
107 107
 		}
108 108
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	function add_view_dropdown() {
120 120
 		$current_screen = get_current_screen();
121 121
 
122
-		if( 'gravityview' !== $current_screen->post_type ) {
122
+		if ( 'gravityview' !== $current_screen->post_type ) {
123 123
 			return;
124 124
 		}
125 125
 
126 126
 		$forms = gravityview_get_forms();
127 127
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
128 128
 		// If there are no forms to select, show no forms.
129
-		if( !empty( $forms ) ) { ?>
129
+		if ( ! empty( $forms ) ) { ?>
130 130
 			<select name="gravityview_form_id" id="gravityview_form_id">
131 131
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
132
-				<?php foreach( $forms as $form ) { ?>
133
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
132
+				<?php foreach ( $forms as $form ) { ?>
133
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
134 134
 				<?php } ?>
135 135
 			</select>
136 136
 		<?php }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
145 145
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
146
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
146
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
147 147
 	}
148 148
 
149 149
 	/**
@@ -168,13 +168,13 @@  discard block
 block discarded – undo
168 168
 
169 169
 		$priority = 0;
170 170
 
171
-		if( 'form_list' === GFForms::get_page() ) {
171
+		if ( 'form_list' === GFForms::get_page() ) {
172 172
 			$priority = 790;
173 173
         }
174 174
 
175
-		if( empty( $connected_views ) ) {
175
+		if ( empty( $connected_views ) ) {
176 176
 
177
-		    $menu_items['gravityview'] = array(
177
+		    $menu_items[ 'gravityview' ] = array(
178 178
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
179 179
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
180 180
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -190,22 +190,22 @@  discard block
 block discarded – undo
190 190
 		$sub_menu_items = array();
191 191
 		foreach ( (array)$connected_views as $view ) {
192 192
 
193
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
193
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
194 194
 				continue;
195 195
 			}
196 196
 
197
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
197
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
198 198
 
199
-			$sub_menu_items[] = array(
199
+			$sub_menu_items[ ] = array(
200 200
 				'label' => esc_attr( $label ),
201
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
201
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
202 202
 			);
203 203
 		}
204 204
 
205 205
 		// If there were no items added, then let's create the parent menu
206
-		if( $sub_menu_items ) {
206
+		if ( $sub_menu_items ) {
207 207
 
208
-		    $sub_menu_items[] = array(
208
+		    $sub_menu_items[ ] = array(
209 209
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
210 210
                 'link_class' => 'gv-create-view',
211 211
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -214,14 +214,14 @@  discard block
 block discarded – undo
214 214
             );
215 215
 
216 216
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
217
-			$sub_menu_items[] = array(
217
+			$sub_menu_items[ ] = array(
218 218
 				'url' => '#',
219 219
 				'label' => '',
220 220
 				'menu_class' => 'hidden',
221 221
 				'capabilities' => '',
222 222
 			);
223 223
 
224
-			$menu_items['gravityview'] = array(
224
+			$menu_items[ 'gravityview' ] = array(
225 225
 				'label'          => __( 'Connected Views', 'gravityview' ),
226 226
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
227 227
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -250,8 +250,8 @@  discard block
 block discarded – undo
250 250
 		$add = array( 'captcha', 'page' );
251 251
 
252 252
 		// Don't allowing editing the following values:
253
-		if( $context === 'edit' ) {
254
-			$add[] = 'post_id';
253
+		if ( $context === 'edit' ) {
254
+			$add[ ] = 'post_id';
255 255
 		}
256 256
 
257 257
 		$return = array_merge( $array, $add );
@@ -274,32 +274,32 @@  discard block
 block discarded – undo
274 274
 		foreach ( $default_args as $key => $arg ) {
275 275
 
276 276
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
277
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
277
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
278 278
 
279 279
 			// By default, use `tooltip` if defined.
280
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
280
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
281 281
 
282 282
 			// Otherwise, use the description as a tooltip.
283
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
284
-				$tooltip = $arg['desc'];
283
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
284
+				$tooltip = $arg[ 'desc' ];
285 285
 			}
286 286
 
287 287
 			// If there's no tooltip set, continue
288
-			if( empty( $tooltip ) ) {
288
+			if ( empty( $tooltip ) ) {
289 289
 				continue;
290 290
 			}
291 291
 
292 292
 			// Add the tooltip
293
-			$gv_tooltips[ 'gv_'.$key ] = array(
294
-				'title'	=> $arg['label'],
293
+			$gv_tooltips[ 'gv_' . $key ] = array(
294
+				'title'	=> $arg[ 'label' ],
295 295
 				'value'	=> $tooltip,
296 296
 			);
297 297
 
298 298
 		}
299 299
 
300
-		$gv_tooltips['gv_css_merge_tags'] = array(
301
-			'title' => __('CSS Merge Tags', 'gravityview'),
302
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
300
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
301
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
302
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
303 303
 		);
304 304
 
305 305
 		/**
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
 
318 318
 		foreach ( $gv_tooltips as $key => $tooltip ) {
319 319
 
320
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
320
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
321 321
 
322
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
322
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
323 323
 		}
324 324
 
325 325
 		return $tooltips;
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 *
334 334
 	 * @return void
335 335
 	 */
336
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
336
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
337 337
 
338 338
 		$output = '';
339 339
 
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
356 356
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
357 357
 
358
-				$output = $template ? $template['label'] : $template_id_pretty;
358
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
359 359
 
360 360
 				break;
361 361
 
@@ -396,44 +396,44 @@  discard block
 block discarded – undo
396 396
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
397 397
 
398 398
 		// Either the form is empty or the form ID is 0, not yet set.
399
-		if( empty( $form ) ) {
399
+		if ( empty( $form ) ) {
400 400
 			return '';
401 401
 		}
402 402
 
403 403
 		// The $form is passed as the form ID
404
-		if( !is_array( $form ) ) {
404
+		if ( ! is_array( $form ) ) {
405 405
 			$form = gravityview_get_form( $form );
406 406
 		}
407 407
 
408
-		$form_id = $form['id'];
408
+		$form_id = $form[ 'id' ];
409 409
 		$links = array();
410 410
 
411
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
411
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
412 412
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
413
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
414
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
413
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
414
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
415 415
 		} else {
416
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
416
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
417 417
 		}
418 418
 
419
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
419
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
420 420
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
421
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
421
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
422 422
 		}
423 423
 
424
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
424
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
425 425
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
426
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
426
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
427 427
 		}
428 428
 
429
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
429
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
430 430
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
431
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
431
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
432 432
 		}
433 433
 
434 434
 		$output = '';
435 435
 
436
-		if( !empty( $include_form_link ) ) {
436
+		if ( ! empty( $include_form_link ) ) {
437 437
 			$output .= $form_link;
438 438
 		}
439 439
 
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 		 */
446 446
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
447 447
 
448
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
448
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
449 449
 
450 450
 		return $output;
451 451
 	}
@@ -459,8 +459,8 @@  discard block
 block discarded – undo
459 459
 		// Get the date column and save it for later to add back in.
460 460
 		// This adds it after the Data Source column.
461 461
 		// This way, we don't need to do array_slice, array_merge, etc.
462
-		$date = $columns['date'];
463
-		unset( $columns['date'] );
462
+		$date = $columns[ 'date' ];
463
+		unset( $columns[ 'date' ] );
464 464
 
465 465
 		$data_source_required_caps = array(
466 466
 			'gravityforms_edit_forms',
@@ -471,14 +471,14 @@  discard block
 block discarded – undo
471 471
 			'gravityforms_preview_forms',
472 472
 		);
473 473
 
474
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
475
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
474
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
475
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
476 476
 		}
477 477
 
478
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
478
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
479 479
 
480 480
 		// Add the date back in.
481
-		$columns['date'] = $date;
481
+		$columns[ 'date' ] = $date;
482 482
 
483 483
 		return $columns;
484 484
 	}
@@ -492,12 +492,12 @@  discard block
 block discarded – undo
492 492
 	 */
493 493
 	function save_postdata( $post_id ) {
494 494
 
495
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
495
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
496 496
 			return;
497 497
 		}
498 498
 
499 499
 		// validate post_type
500
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
500
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
501 501
 			return;
502 502
 		}
503 503
 
@@ -512,65 +512,65 @@  discard block
 block discarded – undo
512 512
 		$statii = array();
513 513
 
514 514
 		// check if this is a start fresh View
515
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
515
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
516 516
 
517
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
517
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
518 518
 			// save form id
519
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
519
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
520 520
 
521 521
 		}
522 522
 
523
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
523
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
524 524
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
525 525
 			return;
526 526
 		}
527 527
 
528 528
 		// Was this a start fresh?
529
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
530
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
529
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
530
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
531 531
 		} else {
532
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
532
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
533 533
 		}
534 534
 
535 535
 		// Check if we have a template id
536
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
536
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
537 537
 
538
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
538
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
539 539
 
540 540
 			// now save template id
541
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
541
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
542 542
 		}
543 543
 
544 544
 
545 545
 		// save View Configuration metabox
546
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
546
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
547 547
 
548 548
 			// template settings
549
-			if( empty( $_POST['template_settings'] ) ) {
550
-				$_POST['template_settings'] = array();
549
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
550
+				$_POST[ 'template_settings' ] = array();
551 551
 			}
552
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
552
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
553 553
 
554 554
 			$fields = array();
555 555
 
556 556
 			// Directory&single Visible Fields
557
-			if( !empty( $preset_fields ) ) {
557
+			if ( ! empty( $preset_fields ) ) {
558 558
 
559 559
 				$fields = $preset_fields;
560 560
 
561
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
561
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
562 562
 				$fields = _gravityview_process_posted_fields();
563 563
 			}
564 564
 
565 565
 			$fields = wp_slash( $fields );
566 566
 
567
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
567
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
568 568
 
569 569
 			// Directory Visible Widgets
570
-			if( empty( $_POST['widgets'] ) ) {
571
-				$_POST['widgets'] = array();
570
+			if ( empty( $_POST[ 'widgets' ] ) ) {
571
+				$_POST[ 'widgets' ] = array();
572 572
 			}
573
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
573
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
574 574
 
575 575
 		} // end save view configuration
576 576
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
581 581
 		 * @since 1.17.2
582 582
 		 */
583
-		do_action('gravityview_view_saved', $post_id, $statii );
583
+		do_action( 'gravityview_view_saved', $post_id, $statii );
584 584
 
585 585
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
586 586
 	}
@@ -624,20 +624,20 @@  discard block
 block discarded – undo
624 624
 
625 625
 		$output = '';
626 626
 
627
-		if( !empty( $fields ) ) {
627
+		if ( ! empty( $fields ) ) {
628 628
 
629
-			foreach( $fields as $id => $details ) {
629
+			foreach ( $fields as $id => $details ) {
630 630
 
631
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
631
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
632 632
 					continue;
633 633
 				}
634 634
 
635 635
 				// Edit mode only allows editing the parent fields, not single inputs.
636
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
636
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
637 637
 					continue;
638 638
 				}
639 639
 
640
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
640
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
641 641
 
642 642
 			} // End foreach
643 643
 		}
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
 		echo $output;
646 646
 
647 647
 		// For the EDIT view we only want to allow the form fields.
648
-		if( $context === 'edit' ) {
648
+		if ( $context === 'edit' ) {
649 649
 			return;
650 650
 		}
651 651
 
@@ -669,16 +669,16 @@  discard block
 block discarded – undo
669 669
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
670 670
 			array(
671 671
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
672
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
672
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
673 673
 				'field_id' => 'all-fields',
674 674
 				'label_type' => 'field',
675 675
 				'input_type' => NULL,
676 676
 				'field_options' => NULL,
677 677
 				'settings_html'	=> NULL,
678 678
 			)
679
-		));
679
+		) );
680 680
 
681
-		if( !empty( $additional_fields )) {
681
+		if ( ! empty( $additional_fields ) ) {
682 682
 			foreach ( (array)$additional_fields as $item ) {
683 683
 
684 684
 				// Prevent items from not having index set
@@ -689,16 +689,16 @@  discard block
 block discarded – undo
689 689
 					'input_type' => NULL,
690 690
 					'field_options' => NULL,
691 691
 					'settings_html'	=> NULL,
692
-				));
692
+				) );
693 693
 
694 694
 				// Backward compat.
695
-				if( !empty( $item['field_options'] ) ) {
695
+				if ( ! empty( $item[ 'field_options' ] ) ) {
696 696
 					// Use settings_html from now on.
697
-					$item['settings_html'] = $item['field_options'];
697
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
698 698
 				}
699 699
 
700 700
 				// Render a label for each of them
701
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
701
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
702 702
 
703 703
 			}
704 704
 		}
@@ -711,54 +711,54 @@  discard block
 block discarded – undo
711 711
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
712 712
 	 * @return array
713 713
 	 */
714
-	function get_entry_default_fields($form, $zone) {
714
+	function get_entry_default_fields( $form, $zone ) {
715 715
 
716 716
 		$entry_default_fields = array();
717 717
 
718
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
718
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
719 719
 
720 720
 			$entry_default_fields = array(
721 721
 				'id' => array(
722
-					'label' => __('Entry ID', 'gravityview'),
722
+					'label' => __( 'Entry ID', 'gravityview' ),
723 723
 					'type' => 'id',
724
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
724
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
725 725
 				),
726 726
 				'date_created' => array(
727
-					'label' => __('Entry Date', 'gravityview'),
728
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
727
+					'label' => __( 'Entry Date', 'gravityview' ),
728
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
729 729
 					'type' => 'date_created',
730 730
 				),
731 731
 				'source_url' => array(
732
-					'label' => __('Source URL', 'gravityview'),
732
+					'label' => __( 'Source URL', 'gravityview' ),
733 733
 					'type' => 'source_url',
734
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
734
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
735 735
 				),
736 736
 				'ip' => array(
737
-					'label' => __('User IP', 'gravityview'),
737
+					'label' => __( 'User IP', 'gravityview' ),
738 738
 					'type' => 'ip',
739
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
739
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
740 740
 				),
741 741
 				'created_by' => array(
742
-					'label' => __('User', 'gravityview'),
742
+					'label' => __( 'User', 'gravityview' ),
743 743
 					'type' => 'created_by',
744
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
744
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
745 745
 				),
746 746
 
747 747
 				/**
748 748
 				 * @since 1.7.2
749 749
 				 */
750 750
 			    'other_entries' => array(
751
-				    'label'	=> __('Other Entries', 'gravityview'),
751
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
752 752
 				    'type'	=> 'other_entries',
753
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
753
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
754 754
 			    ),
755 755
 	        );
756 756
 
757
-			if( 'single' !== $zone) {
757
+			if ( 'single' !== $zone ) {
758 758
 
759
-				$entry_default_fields['entry_link'] = array(
760
-					'label' => __('Link to Entry', 'gravityview'),
761
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
759
+				$entry_default_fields[ 'entry_link' ] = array(
760
+					'label' => __( 'Link to Entry', 'gravityview' ),
761
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
762 762
 					'type' => 'entry_link',
763 763
 				);
764 764
 			}
@@ -768,19 +768,19 @@  discard block
 block discarded – undo
768 768
 		/**
769 769
 		 * @since  1.2
770 770
 		 */
771
-		$entry_default_fields['custom']	= array(
772
-			'label'	=> __('Custom Content', 'gravityview'),
771
+		$entry_default_fields[ 'custom' ] = array(
772
+			'label'	=> __( 'Custom Content', 'gravityview' ),
773 773
 			'type'	=> 'custom',
774
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
774
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
775 775
 		);
776 776
 
777 777
 		/**
778 778
 		 * @since develop
779 779
 		 */
780
-		$entry_default_fields['sequence'] = array(
781
-			'label'	=> __('Result Number', 'gravityview'),
780
+		$entry_default_fields[ 'sequence' ] = array(
781
+			'label'	=> __( 'Result Number', 'gravityview' ),
782 782
 			'type'	=> 'sequence',
783
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
783
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
784 784
 		);
785 785
 
786 786
 		/**
@@ -789,7 +789,7 @@  discard block
 block discarded – undo
789 789
 		 * @param  string|array $form form_ID or form object
790 790
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
791 791
 		 */
792
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
792
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
793 793
 	}
794 794
 
795 795
 	/**
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 	 */
801 801
 	function get_available_fields( $form = '', $zone = NULL ) {
802 802
 
803
-		if( empty( $form ) ) {
803
+		if ( empty( $form ) ) {
804 804
 			gravityview()->log->error( '$form is empty' );
805 805
 			return array();
806 806
 		}
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
 		$fields = gravityview_get_form_fields( $form, true );
810 810
 
811 811
 		// get meta fields ( only if form was already created )
812
-		if( !is_array( $form ) ) {
812
+		if ( ! is_array( $form ) ) {
813 813
 			$meta_fields = gravityview_get_entry_meta( $form );
814 814
 		} else {
815 815
 			$meta_fields = array();
@@ -822,7 +822,7 @@  discard block
 block discarded – undo
822 822
 		$fields = $fields + $meta_fields + $default_fields;
823 823
 
824 824
 		// Move Custom Content to top
825
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
825
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
826 826
 
827 827
 		return $fields;
828 828
 	}
@@ -836,11 +836,11 @@  discard block
 block discarded – undo
836 836
 
837 837
 		$widgets = $this->get_registered_widgets();
838 838
 
839
-		if( !empty( $widgets ) ) {
839
+		if ( ! empty( $widgets ) ) {
840 840
 
841
-			foreach( $widgets as $id => $details ) {
841
+			foreach ( $widgets as $id => $details ) {
842 842
 
843
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
843
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
844 844
 
845 845
 			}
846 846
 		}
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
870 870
 		global $post;
871 871
 
872
-		if( $type === 'widget' ) {
872
+		if ( $type === 'widget' ) {
873 873
 			$button_label = __( 'Add Widget', 'gravityview' );
874 874
 		} else {
875 875
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -881,10 +881,10 @@  discard block
 block discarded – undo
881 881
 		$form_id = null;
882 882
 
883 883
 		// if saved values, get available fields to label everyone
884
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
884
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
885 885
 
886
-			if( !empty( $_POST['template_id'] ) ) {
887
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
886
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
887
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
888 888
 			} else {
889 889
 				$form_id = $form = gravityview_get_form_id( $post->ID );
890 890
 			}
@@ -902,44 +902,44 @@  discard block
 block discarded – undo
902 902
 			}
903 903
 		}
904 904
 
905
-		foreach( $rows as $row ) :
906
-			foreach( $row as $col => $areas ) :
907
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
905
+		foreach ( $rows as $row ) :
906
+			foreach ( $row as $col => $areas ) :
907
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
908 908
 
909 909
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
910 910
 
911
-					<?php foreach( $areas as $area ) : 	?>
911
+					<?php foreach ( $areas as $area ) : 	?>
912 912
 
913
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
914
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
913
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
914
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
915 915
 
916 916
 								<?php // render saved fields
917 917
 
918
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
918
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
919 919
 
920
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
920
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
921 921
 
922 922
 										// Maybe has a form ID
923
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
923
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
924 924
 
925 925
 										$input_type = NULL;
926 926
 
927 927
 										if ( $form_id ) {
928
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
928
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
929 929
                                         } else {
930
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
930
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
931 931
                                         }
932 932
 
933
-										if ( !$original_item ) {
934
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
933
+										if ( ! $original_item ) {
934
+											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) );
935 935
 
936 936
 											$original_item = $field;
937 937
 										} else {
938
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
938
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
939 939
 										}
940 940
 
941 941
 										// Field options dialog box
942
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
942
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
943 943
 
944 944
 										$item = array(
945 945
 											'input_type' => $input_type,
@@ -952,23 +952,23 @@  discard block
 block discarded – undo
952 952
 											$item = wp_parse_args( $item, $original_item );
953 953
 										}
954 954
 
955
-										switch( $type ) {
955
+										switch ( $type ) {
956 956
 											case 'widget':
957
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
957
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
958 958
 												break;
959 959
 											default:
960
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
960
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
961 961
 										}
962 962
 									}
963 963
 
964 964
 								} // End if zone is not empty ?>
965 965
 
966
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
966
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
967 967
 							</div>
968 968
 							<div class="gv-droppable-area-action">
969
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
969
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
970 970
 
971
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
971
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
972 972
 							</div>
973 973
 						</div>
974 974
 
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
992 992
 
993 993
 		$widgets = array();
994
-		if( !empty( $post_id ) ) {
994
+		if ( ! empty( $post_id ) ) {
995 995
 			$widgets = gravityview_get_directory_widgets( $post_id );
996 996
 		}
997 997
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
 		// list of available fields to be shown in the popup
1025 1025
 		$forms = gravityview_get_forms( 'any' );
1026 1026
 
1027
-		$form_ids = array_map( function ($form) { return $form['id']; }, $forms);
1027
+		$form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms );
1028 1028
 
1029 1029
 		foreach ( $form_ids as $form_id ) {
1030 1030
 			$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id );
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
                 </div>
1038 1038
 
1039 1039
                 <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox">
1040
-                <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?>
1040
+                <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?>
1041 1041
                 </div>
1042 1042
 
1043 1043
                 <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div>
@@ -1056,7 +1056,7 @@  discard block
 block discarded – undo
1056 1056
 	 * @return string HTML of the active areas
1057 1057
 	 */
1058 1058
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1059
-		if( empty( $template_id ) ) {
1059
+		if ( empty( $template_id ) ) {
1060 1060
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1061 1061
 			return '';
1062 1062
 		}
@@ -1070,12 +1070,12 @@  discard block
 block discarded – undo
1070 1070
 		 */
1071 1071
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1072 1072
 
1073
-		if( empty( $template_areas ) ) {
1073
+		if ( empty( $template_areas ) ) {
1074 1074
 
1075 1075
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1076 1076
 			$output = '<div>';
1077
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
1078
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
1077
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
1078
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
1079 1079
 			$output .= '</div>';
1080 1080
 		} else {
1081 1081
 
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
1090 1090
 
1091 1091
 		}
1092 1092
 
1093
-		if( $echo ) {
1093
+		if ( $echo ) {
1094 1094
 			echo $output;
1095 1095
 		}
1096 1096
 
@@ -1110,32 +1110,32 @@  discard block
 block discarded – undo
1110 1110
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1111 1111
 
1112 1112
 		// Add the GV font (with the Astronaut)
1113
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1113
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1114 1114
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1115 1115
 
1116
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1116
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1117 1117
 
1118
-		if( GFForms::get_page() === 'form_list' ) {
1118
+		if ( GFForms::get_page() === 'form_list' ) {
1119 1119
 			wp_enqueue_style( 'gravityview_views_styles' );
1120 1120
 			return;
1121 1121
         }
1122 1122
 
1123 1123
 		// Don't process any scripts below here if it's not a GravityView page.
1124
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1124
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1125 1125
 		    return;
1126 1126
 		}
1127 1127
 
1128 1128
         wp_enqueue_script( 'jquery-ui-datepicker' );
1129
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1129
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1130 1130
 
1131
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1131
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1132 1132
 
1133 1133
         //enqueue scripts
1134 1134
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1135 1135
 
1136
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1136
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1137 1137
             'cookiepath' => COOKIEPATH,
1138
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1138
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1139 1139
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1140 1140
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1141 1141
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
1147 1147
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1148 1148
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1149 1149
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1150
-        ));
1150
+        ) );
1151 1151
 
1152 1152
 		wp_enqueue_style( 'gravityview_views_styles' );
1153 1153
 
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 		);
1175 1175
 
1176 1176
 		if ( wp_is_mobile() ) {
1177
-		    $scripts[] = 'jquery-touch-punch';
1177
+		    $scripts[ ] = 'jquery-touch-punch';
1178 1178
 		}
1179 1179
 
1180 1180
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.