Completed
Pull Request — develop (#1572)
by Zack
19:45
created
includes/class-admin-views.php 1 patch
Spacing   +171 added lines, -171 removed lines patch added patch discarded remove patch
@@ -27,24 +27,24 @@  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
 		// Enqueue code editor and settings for manipulating HTML.
47
-		add_action('admin_enqueue_scripts', function() {
47
+		add_action( 'admin_enqueue_scripts', function() {
48 48
 
49 49
 		    $settings = wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
50 50
 		});
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
54 54
 
55 55
 		// Add Connected Form column
56
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
56
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
57 57
 
58 58
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
59 59
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
60 60
 
61
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
61
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
62 62
 
63 63
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
64 64
 
@@ -76,11 +76,11 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	function suggest_support_articles( $localization_data = array() ) {
78 78
 
79
-	    if( ! gravityview()->request->is_view() ) {
79
+	    if ( ! gravityview()->request->is_view() ) {
80 80
 	        return $localization_data;
81 81
         }
82 82
 
83
-		$localization_data['suggest'] = array(
83
+		$localization_data[ 'suggest' ] = array(
84 84
             '57ef23539033602e61d4a560',
85 85
             '54c67bb9e4b0512429885513',
86 86
             '54c67bb9e4b0512429885512',
@@ -109,20 +109,20 @@  discard block
 block discarded – undo
109 109
 			return;
110 110
 		}
111 111
 
112
-		if ( ! isset( $query->query_vars['post_type'] ) ) {
112
+		if ( ! isset( $query->query_vars[ 'post_type' ] ) ) {
113 113
 			return;
114 114
 		}
115 115
 
116
-		if ( 'gravityview' !== $query->query_vars['post_type'] ) {
116
+		if ( 'gravityview' !== $query->query_vars[ 'post_type' ] ) {
117 117
 			return;
118 118
 		}
119 119
 
120
-		$form_id = (int) \GV\Utils::_GET( 'gravityview_form_id' );
120
+		$form_id = (int)\GV\Utils::_GET( 'gravityview_form_id' );
121 121
 
122 122
 		$meta_query = array();
123 123
 
124 124
 		if ( $form_id ) {
125
-			$meta_query[] = array(
125
+			$meta_query[ ] = array(
126 126
 					'key'   => '_gravityview_form_id',
127 127
 					'value' => $form_id,
128 128
 			);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		$layout_id = \GV\Utils::_GET( 'gravityview_layout' );
132 132
 
133 133
 		if ( $layout_id ) {
134
-			$meta_query[] = array(
134
+			$meta_query[ ] = array(
135 135
 					'key'   => '_gravityview_directory_template',
136 136
 					'value' => esc_attr( $layout_id ),
137 137
 			);
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	public function add_view_dropdown() {
149 149
 		$current_screen = get_current_screen();
150 150
 
151
-		if( 'gravityview' !== $current_screen->post_type ) {
151
+		if ( 'gravityview' !== $current_screen->post_type ) {
152 152
 			return;
153 153
 		}
154 154
 
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
156 156
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
157 157
 
158 158
 		// If there are no forms to select, show no forms.
159
-		if( ! empty( $forms ) ) { ?>
159
+		if ( ! empty( $forms ) ) { ?>
160 160
 			<label for="gravityview_form_id" class="screen-reader-text"><?php esc_html_e( 'Filter Views by form', 'gravityview' ); ?></label>
161 161
 			<select name="gravityview_form_id" id="gravityview_form_id">
162 162
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
163
-				<?php foreach( $forms as $form ) { ?>
164
-					<option value="<?php echo esc_attr( $form['id'] ); ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
163
+				<?php foreach ( $forms as $form ) { ?>
164
+					<option value="<?php echo esc_attr( $form[ 'id' ] ); ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
165 165
 				<?php } ?>
166 166
 			</select>
167 167
 		<?php }
@@ -170,26 +170,26 @@  discard block
 block discarded – undo
170 170
 		$current_layout = \GV\Utils::_GET( 'gravityview_layout' );
171 171
 
172 172
 		// If there are no forms to select, show no forms.
173
-		if( ! empty( $layouts ) ) { ?>
173
+		if ( ! empty( $layouts ) ) { ?>
174 174
 			<label for="gravityview_layout_name" class="screen-reader-text"><?php esc_html_e( 'Filter Views by layout', 'gravityview' ); ?></label>
175 175
 			<select name="gravityview_layout" id="gravityview_layout_name">
176 176
 				<option value="" <?php selected( '', $current_layout, true ); ?>><?php esc_html_e( 'All layouts', 'gravityview' ); ?></option>
177 177
 				<optgroup label="<?php esc_html_e( 'Layouts', 'gravityview' ); ?>">
178
-				<?php foreach( $layouts as $layout_id => $layout ) {
179
-					if ( in_array( $layout['type'], array( 'preset', 'internal' ), true ) ) {
178
+				<?php foreach ( $layouts as $layout_id => $layout ) {
179
+					if ( in_array( $layout[ 'type' ], array( 'preset', 'internal' ), true ) ) {
180 180
 						continue;
181 181
 					}
182 182
 					?>
183
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
183
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
184 184
 				<?php } ?>
185 185
 				</optgroup>
186 186
 				<optgroup label="<?php esc_html_e( 'Form Presets', 'gravityview' ); ?>">
187
-				<?php foreach( $layouts as $layout_id => $layout ) {
188
-					if ( ! in_array( $layout['type'], array( 'preset' ), true ) ) {
187
+				<?php foreach ( $layouts as $layout_id => $layout ) {
188
+					if ( ! in_array( $layout[ 'type' ], array( 'preset' ), true ) ) {
189 189
 						continue;
190 190
 					}
191 191
 					?>
192
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
192
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
193 193
 				<?php } ?>
194 194
 				</optgroup>
195 195
 			</select>
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 	 */
204 204
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
205 205
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
206
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
206
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
207 207
 	}
208 208
 
209 209
 	/**
@@ -233,13 +233,13 @@  discard block
 block discarded – undo
233 233
 
234 234
 		$priority = 0;
235 235
 
236
-		if( 'form_list' === GFForms::get_page() ) {
236
+		if ( 'form_list' === GFForms::get_page() ) {
237 237
 			$priority = 790;
238 238
         }
239 239
 
240
-		if( empty( $connected_views ) ) {
240
+		if ( empty( $connected_views ) ) {
241 241
 
242
-		    $menu_items['gravityview'] = array(
242
+		    $menu_items[ 'gravityview' ] = array(
243 243
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
244 244
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
245 245
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -255,23 +255,23 @@  discard block
 block discarded – undo
255 255
 		$sub_menu_items = array();
256 256
 		foreach ( (array)$connected_views as $view ) {
257 257
 
258
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
258
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
259 259
 				continue;
260 260
 			}
261 261
 
262
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
262
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
263 263
 
264
-			$sub_menu_items[] = array(
264
+			$sub_menu_items[ ] = array(
265 265
 				'label' => esc_attr( $label ),
266
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
266
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
267 267
 				'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
268 268
 			);
269 269
 		}
270 270
 
271 271
 		// If there were no items added, then let's create the parent menu
272
-		if( $sub_menu_items ) {
272
+		if ( $sub_menu_items ) {
273 273
 
274
-		    $sub_menu_items[] = array(
274
+		    $sub_menu_items[ ] = array(
275 275
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
276 276
 			    'icon' => '<span class="dashicons dashicons-plus"></span>',
277 277
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -280,14 +280,14 @@  discard block
 block discarded – undo
280 280
             );
281 281
 
282 282
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
283
-			$sub_menu_items[] = array(
283
+			$sub_menu_items[ ] = array(
284 284
 				'url' => '#',
285 285
 				'label' => '',
286 286
 				'menu_class' => 'hidden',
287 287
 				'capabilities' => '',
288 288
 			);
289 289
 
290
-			$menu_items['gravityview'] = array(
290
+			$menu_items[ 'gravityview' ] = array(
291 291
 				'label'          => __( 'Connected Views', 'gravityview' ),
292 292
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
293 293
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
315 315
 		$add = array( 'captcha', 'page' );
316 316
 
317 317
 		// Don't allowing editing the following values:
318
-		if( $context === 'edit' ) {
319
-			$add[] = 'post_id';
318
+		if ( $context === 'edit' ) {
319
+			$add[ ] = 'post_id';
320 320
 		}
321 321
 
322 322
 		$return = array_merge( $array, $add );
@@ -339,27 +339,27 @@  discard block
 block discarded – undo
339 339
 		foreach ( $default_args as $key => $arg ) {
340 340
 
341 341
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
342
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
342
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
343 343
 
344 344
 			// By default, use `tooltip` if defined.
345
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
345
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
346 346
 
347 347
 			// If there's no tooltip set, continue
348
-			if( empty( $tooltip ) ) {
348
+			if ( empty( $tooltip ) ) {
349 349
 				continue;
350 350
 			}
351 351
 
352 352
 			// Add the tooltip
353
-			$gv_tooltips[ 'gv_'.$key ] = array(
354
-				'title'	=> $arg['label'],
353
+			$gv_tooltips[ 'gv_' . $key ] = array(
354
+				'title'	=> $arg[ 'label' ],
355 355
 				'value'	=> $tooltip,
356 356
 			);
357 357
 
358 358
 		}
359 359
 
360
-		$gv_tooltips['gv_css_merge_tags'] = array(
361
-			'title' => __('CSS Merge Tags', 'gravityview'),
362
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
360
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
361
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
362
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
363 363
 		);
364 364
 
365 365
 		/**
@@ -377,9 +377,9 @@  discard block
 block discarded – undo
377 377
 
378 378
 		foreach ( $gv_tooltips as $key => $tooltip ) {
379 379
 
380
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
380
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
381 381
 
382
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
382
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
383 383
 		}
384 384
 
385 385
 		return $tooltips;
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 	 *
394 394
 	 * @return void
395 395
 	 */
396
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
396
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
397 397
 
398 398
 		$output = '';
399 399
 
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
416 416
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
417 417
 
418
-				$output = $template ? $template['label'] : $template_id_pretty;
418
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
419 419
 
420 420
 				break;
421 421
 
@@ -456,44 +456,44 @@  discard block
 block discarded – undo
456 456
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
457 457
 
458 458
 		// Either the form is empty or the form ID is 0, not yet set.
459
-		if( empty( $form ) ) {
459
+		if ( empty( $form ) ) {
460 460
 			return '';
461 461
 		}
462 462
 
463 463
 		// The $form is passed as the form ID
464
-		if( !is_array( $form ) ) {
464
+		if ( ! is_array( $form ) ) {
465 465
 			$form = gravityview_get_form( $form );
466 466
 		}
467 467
 
468
-		$form_id = $form['id'];
468
+		$form_id = $form[ 'id' ];
469 469
 		$links = array();
470 470
 
471
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
471
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
472 472
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
473
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
474
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
473
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
474
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
475 475
 		} else {
476
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
476
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
477 477
 		}
478 478
 
479
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
479
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
480 480
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
481
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
481
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
482 482
 		}
483 483
 
484
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
484
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
485 485
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
486
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
486
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
487 487
 		}
488 488
 
489
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
489
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
490 490
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
491
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
491
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
492 492
 		}
493 493
 
494 494
 		$output = '';
495 495
 
496
-		if( !empty( $include_form_link ) ) {
496
+		if ( ! empty( $include_form_link ) ) {
497 497
 			$output .= $form_link;
498 498
 		}
499 499
 
@@ -508,11 +508,11 @@  discard block
 block discarded – undo
508 508
 		$css_class = 'row-actions';
509 509
 
510 510
 		// Is Screen Options > View mode set to "Extended view"? If so, keep actions visible.
511
-		if( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
511
+		if ( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
512 512
 			$css_class = 'row-actions visible';
513 513
 		}
514 514
 
515
-		$output .= '<div class="' . $css_class . '">'. implode( ' | ', $links ) .'</div>';
515
+		$output .= '<div class="' . $css_class . '">' . implode( ' | ', $links ) . '</div>';
516 516
 
517 517
 		return $output;
518 518
 	}
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
 		// Get the date column and save it for later to add back in.
527 527
 		// This adds it after the Data Source column.
528 528
 		// This way, we don't need to do array_slice, array_merge, etc.
529
-		$date = $columns['date'];
530
-		unset( $columns['date'] );
529
+		$date = $columns[ 'date' ];
530
+		unset( $columns[ 'date' ] );
531 531
 
532 532
 		$data_source_required_caps = array(
533 533
 			'gravityforms_edit_forms',
@@ -538,14 +538,14 @@  discard block
 block discarded – undo
538 538
 			'gravityforms_preview_forms',
539 539
 		);
540 540
 
541
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
542
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
541
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
542
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
543 543
 		}
544 544
 
545
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
545
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
546 546
 
547 547
 		// Add the date back in.
548
-		$columns['date'] = $date;
548
+		$columns[ 'date' ] = $date;
549 549
 
550 550
 		return $columns;
551 551
 	}
@@ -558,12 +558,12 @@  discard block
 block discarded – undo
558 558
 	 */
559 559
 	function save_postdata( $post_id ) {
560 560
 
561
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
561
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
562 562
 			return;
563 563
 		}
564 564
 
565 565
 		// validate post_type
566
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
566
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
567 567
 			return;
568 568
 		}
569 569
 
@@ -578,63 +578,63 @@  discard block
 block discarded – undo
578 578
 		$statii = array();
579 579
 
580 580
 		// check if this is a start fresh View
581
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
581
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
582 582
 
583
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
583
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
584 584
 			// save form id
585
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
585
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
586 586
 
587 587
 		}
588 588
 
589
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
589
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
590 590
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
591 591
 			return;
592 592
 		}
593 593
 
594 594
 		// Was this a start fresh?
595
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
596
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
595
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
596
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
597 597
 		} else {
598
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
598
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
599 599
 		}
600 600
 
601 601
 		// Check if we have a template id
602
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
602
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
603 603
 
604
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
604
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
605 605
 
606 606
 			// now save template id
607
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
607
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
608 608
 		}
609 609
 
610 610
 
611 611
 		// save View Configuration metabox
612
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
612
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
613 613
 
614 614
 			// template settings
615
-			if( empty( $_POST['template_settings'] ) ) {
616
-				$_POST['template_settings'] = array();
615
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
616
+				$_POST[ 'template_settings' ] = array();
617 617
 			}
618
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
618
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
619 619
 
620 620
 			// guard against unloaded View configuration page
621
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
621
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
622 622
 				$fields = array();
623 623
 
624
-				if ( ! empty( $_POST['gv_fields'] ) ) {
624
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
625 625
 					$fields = _gravityview_process_posted_fields();
626 626
 				}
627 627
 
628 628
 				$fields = wp_slash( $fields );
629 629
 
630
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
630
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
631 631
 			}
632 632
 
633 633
 			// Directory Visible Widgets
634
-			if( empty( $_POST['widgets'] ) ) {
635
-				$_POST['widgets'] = array();
634
+			if ( empty( $_POST[ 'widgets' ] ) ) {
635
+				$_POST[ 'widgets' ] = array();
636 636
 			}
637
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
637
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
638 638
 
639 639
 		} // end save view configuration
640 640
 
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 		 * @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.
645 645
 		 * @since 1.17.2
646 646
 		 */
647
-		do_action('gravityview_view_saved', $post_id, $statii );
647
+		do_action( 'gravityview_view_saved', $post_id, $statii );
648 648
 
649 649
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
650 650
 	}
@@ -689,20 +689,20 @@  discard block
 block discarded – undo
689 689
 
690 690
 		$output = '';
691 691
 
692
-		if( !empty( $fields ) ) {
692
+		if ( ! empty( $fields ) ) {
693 693
 
694
-			foreach( $fields as $id => $details ) {
694
+			foreach ( $fields as $id => $details ) {
695 695
 
696
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
696
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
697 697
 					continue;
698 698
 				}
699 699
 
700 700
 				// Edit mode only allows editing the parent fields, not single inputs.
701
-				if( $context === 'edit' && ! empty( $details['parent'] ) ) {
701
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
702 702
 					continue;
703 703
 				}
704 704
 
705
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form );
705
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
706 706
 
707 707
 			} // End foreach
708 708
 		}
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
 		echo $output;
711 711
 
712 712
 		// For the EDIT view we only want to allow the form fields.
713
-		if( $context === 'edit' ) {
713
+		if ( $context === 'edit' ) {
714 714
 			return;
715 715
 		}
716 716
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 		$additional_fields = array(
730 730
 			array(
731 731
 				'label_text' => __( 'Add All Form Fields', 'gravityview' ),
732
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
732
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
733 733
 				'field_id' => 'all-fields',
734 734
 				'label_type' => 'field',
735 735
 				'input_type' => null,
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
 		 */
746 746
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
747 747
 
748
-		foreach ( (array) $additional_fields as $item ) {
748
+		foreach ( (array)$additional_fields as $item ) {
749 749
 
750 750
 			// Prevent items from not having index set
751 751
 			$item = wp_parse_args( $item, array(
@@ -756,16 +756,16 @@  discard block
 block discarded – undo
756 756
 				'field_options' => null,
757 757
 				'settings_html'	=> null,
758 758
 				'icon' => null,
759
-			));
759
+			) );
760 760
 
761 761
 			// Backward compat.
762
-			if( !empty( $item['field_options'] ) ) {
762
+			if ( ! empty( $item[ 'field_options' ] ) ) {
763 763
 				// Use settings_html from now on.
764
-				$item['settings_html'] = $item['field_options'];
764
+				$item[ 'settings_html' ] = $item[ 'field_options' ];
765 765
 			}
766 766
 
767 767
 			// Render a label for each of them
768
-			echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
768
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
769 769
 
770 770
 		}
771 771
 
@@ -777,12 +777,12 @@  discard block
 block discarded – undo
777 777
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
778 778
 	 * @return array
779 779
 	 */
780
-	function get_entry_default_fields($form, $zone) {
780
+	function get_entry_default_fields( $form, $zone ) {
781 781
 
782 782
 		$entry_default_fields = array();
783 783
 
784 784
 		// if in zone directory or single
785
-		if( in_array( $zone, array( 'directory', 'single' ), true ) ) {
785
+		if ( in_array( $zone, array( 'directory', 'single' ), true ) ) {
786 786
 
787 787
 			$meta_fields = GravityView_Fields::get_all( array( 'meta', 'gravityview', 'add-ons' ) );
788 788
 
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
 		 * @param  string|array $form form_ID or form object
800 800
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
801 801
 		 */
802
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
802
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
803 803
 	}
804 804
 
805 805
 	/**
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
 	 */
811 811
 	function get_available_fields( $form = '', $zone = NULL ) {
812 812
 
813
-		if( empty( $form ) ) {
813
+		if ( empty( $form ) ) {
814 814
 			gravityview()->log->error( '$form is empty' );
815 815
 			return array();
816 816
 		}
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 		$fields = gravityview_get_form_fields( $form, true );
820 820
 
821 821
 		// get meta fields ( only if form was already created )
822
-		if( !is_array( $form ) ) {
822
+		if ( ! is_array( $form ) ) {
823 823
 			$meta_fields = gravityview_get_entry_meta( $form );
824 824
 		} else {
825 825
 			$meta_fields = array();
@@ -832,8 +832,8 @@  discard block
 block discarded – undo
832 832
 		$fields = $fields + $meta_fields + $default_fields;
833 833
 
834 834
 		// Move Custom Content to top
835
-		if ( isset( $fields['custom'] ) ) {
836
-			$fields = array( 'custom' => $fields['custom'] ) + $fields;
835
+		if ( isset( $fields[ 'custom' ] ) ) {
836
+			$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
837 837
 		}
838 838
 
839 839
 		$gv_fields = GravityView_Fields::get_all();
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 		foreach ( $fields as &$field ) {
842 842
 			foreach ( $gv_fields as $gv_field ) {
843 843
 				if ( \GV\Utils::get( $field, 'type' ) === $gv_field->name ) {
844
-					$field['icon'] = \GV\Utils::get( $gv_field, 'icon' );
844
+					$field[ 'icon' ] = \GV\Utils::get( $gv_field, 'icon' );
845 845
 				}
846 846
 			}
847 847
 		}
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 		}
870 870
 
871 871
 		foreach ( $widgets as $id => $details ) {
872
-			echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
872
+			echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
873 873
 		}
874 874
 
875 875
 	}
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
900 900
 		global $post;
901 901
 
902
-		if( $type === 'widget' ) {
902
+		if ( $type === 'widget' ) {
903 903
 			$button_label = __( 'Add Widget', 'gravityview' );
904 904
 		} else {
905 905
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -925,10 +925,10 @@  discard block
 block discarded – undo
925 925
 		$form_id = null;
926 926
 
927 927
 		// if saved values, get available fields to label everyone
928
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
928
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
929 929
 
930
-			if( !empty( $_POST['template_id'] ) ) {
931
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
930
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
931
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
932 932
 			} else {
933 933
 				$form_id = $form = gravityview_get_form_id( $post->ID );
934 934
 			}
@@ -946,53 +946,53 @@  discard block
 block discarded – undo
946 946
 			}
947 947
 		}
948 948
 
949
-		foreach( $rows as $row ) :
950
-			foreach( $row as $col => $areas ) :
951
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
949
+		foreach ( $rows as $row ) :
950
+			foreach ( $row as $col => $areas ) :
951
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
952 952
 
953 953
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
954 954
 
955
-					<?php foreach( $areas as $area ) : 	?>
955
+					<?php foreach ( $areas as $area ) : 	?>
956 956
 
957
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
957
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
958 958
                             <p class="gv-droppable-area-title">
959
-								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area['title'] ); ?></strong>
959
+								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area[ 'title' ] ); ?></strong>
960 960
 
961 961
 								<?php if ( 'widget' !== $type ) { ?>
962
-									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
962
+									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
963 963
 								<?php } ?>
964 964
 
965
-                                <?php if ( ! empty( $area['subtitle'] ) ) { ?>
966
-									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area['subtitle'] ); ?>"></span></span>
965
+                                <?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?>
966
+									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area[ 'subtitle' ] ); ?>"></span></span>
967 967
 								<?php } ?>
968 968
 							</p>
969 969
 							<div class="active-drop-container active-drop-container-<?php echo esc_attr( $type ); ?>">
970
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php // render saved fields
971
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
970
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php // render saved fields
971
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
972 972
 
973
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
973
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
974 974
 
975 975
 										// Maybe has a form ID
976
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
976
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
977 977
 
978 978
 										$input_type = NULL;
979 979
 
980 980
 										if ( $form_id ) {
981
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
981
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
982 982
                                         } else {
983
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
983
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
984 984
                                         }
985 985
 
986
-										if ( !$original_item ) {
987
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
986
+										if ( ! $original_item ) {
987
+											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 ) ) );
988 988
 
989 989
 											$original_item = $field;
990 990
 										} else {
991
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
991
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
992 992
 										}
993 993
 
994 994
 										// Field options dialog box
995
-										$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 );
995
+										$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 );
996 996
 
997 997
 										$item = array(
998 998
 											'input_type' => $input_type,
@@ -1005,12 +1005,12 @@  discard block
 block discarded – undo
1005 1005
 											$item = wp_parse_args( $item, $original_item );
1006 1006
 										}
1007 1007
 
1008
-										switch( $type ) {
1008
+										switch ( $type ) {
1009 1009
 											case 'widget':
1010
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
1010
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
1011 1011
 												break;
1012 1012
 											default:
1013
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
1013
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
1014 1014
 										}
1015 1015
 									}
1016 1016
 
@@ -1018,7 +1018,7 @@  discard block
 block discarded – undo
1018 1018
 								<div class="gv-droppable-area-action">
1019 1019
 									<a href="#" class="gv-add-field button button-link button-hero" title=""
1020 1020
 									   data-objecttype="<?php echo esc_attr( $type ); ?>"
1021
-									   data-areaid="<?php echo esc_attr( $zone . '_' . $area['areaid'] ); ?>"
1021
+									   data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"
1022 1022
 									   data-context="<?php echo esc_attr( $zone ); ?>"
1023 1023
 									   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>
1024 1024
 								</div>
@@ -1051,7 +1051,7 @@  discard block
 block discarded – undo
1051 1051
 				// This is a new View, prefill the widgets
1052 1052
 				$widgets = array(
1053 1053
 					'header_top' => array(
1054
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1054
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1055 1055
 							'id' => 'search_bar',
1056 1056
 							'label' => __( 'Search Bar', 'gravityview' ),
1057 1057
 							'search_layout' => 'horizontal',
@@ -1126,12 +1126,12 @@  discard block
 block discarded – undo
1126 1126
 		if ( $post ) {
1127 1127
 			$source_form_id = gravityview_get_form_id( $post->ID );
1128 1128
 			if ( $source_form_id ) {
1129
-				$form_ids[] = $source_form_id;
1129
+				$form_ids[ ] = $source_form_id;
1130 1130
 			}
1131 1131
 
1132 1132
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
1133 1133
 			foreach ( $joined_forms as $joined_form ) {
1134
-				$form_ids[] = $joined_form->ID;
1134
+				$form_ids[ ] = $joined_form->ID;
1135 1135
 			}
1136 1136
 		}
1137 1137
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
 	 * @return string HTML of the active areas
1170 1170
 	 */
1171 1171
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1172
-		if( empty( $template_id ) ) {
1172
+		if ( empty( $template_id ) ) {
1173 1173
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1174 1174
 			return '';
1175 1175
 		}
@@ -1183,12 +1183,12 @@  discard block
 block discarded – undo
1183 1183
 		 */
1184 1184
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1185 1185
 
1186
-		if( empty( $template_areas ) ) {
1186
+		if ( empty( $template_areas ) ) {
1187 1187
 
1188 1188
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1189 1189
 			$output = '<div>';
1190
-			$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>';
1191
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
1190
+			$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>';
1191
+			$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>';
1192 1192
 			$output .= '</div>';
1193 1193
 		} else {
1194 1194
 
@@ -1203,7 +1203,7 @@  discard block
 block discarded – undo
1203 1203
 
1204 1204
 		}
1205 1205
 
1206
-		if( $echo ) {
1206
+		if ( $echo ) {
1207 1207
 			echo $output;
1208 1208
 		}
1209 1209
 
@@ -1231,31 +1231,31 @@  discard block
 block discarded – undo
1231 1231
 		}
1232 1232
 
1233 1233
 		// Add the GV font (with the Astronaut)
1234
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1234
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1235 1235
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1236 1236
 
1237
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1237
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1238 1238
 
1239
-		if( GFForms::get_page() === 'form_list' ) {
1239
+		if ( GFForms::get_page() === 'form_list' ) {
1240 1240
 			wp_enqueue_style( 'gravityview_views_styles' );
1241 1241
 			return;
1242 1242
         }
1243 1243
 
1244 1244
 		// Don't process any scripts below here if it's not a GravityView page.
1245
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1245
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1246 1246
 		    return;
1247 1247
 		}
1248 1248
 
1249 1249
         wp_enqueue_script( 'jquery-ui-datepicker' );
1250
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1250
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1251 1251
 
1252 1252
         // Enqueue scripts
1253 1253
         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 );
1254 1254
 
1255
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1255
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1256 1256
             'cookiepath' => COOKIEPATH,
1257 1257
             'admin_cookiepath' => ADMIN_COOKIE_PATH,
1258
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1258
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1259 1259
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1260 1260
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1261 1261
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1270,7 +1270,7 @@  discard block
 block discarded – undo
1270 1270
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1271 1271
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1272 1272
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1273
-        ));
1273
+        ) );
1274 1274
 
1275 1275
 		wp_enqueue_style( 'gravityview_views_styles' );
1276 1276
 
@@ -1278,7 +1278,7 @@  discard block
 block discarded – undo
1278 1278
         self::enqueue_gravity_forms_scripts();
1279 1279
 
1280 1280
 		// 2.5 changed how Merge Tags are enqueued
1281
-		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
1281
+		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript' ) ) ) {
1282 1282
 			GFCommon::output_hooks_javascript();
1283 1283
 		}
1284 1284
 	}
@@ -1302,7 +1302,7 @@  discard block
 block discarded – undo
1302 1302
 		);
1303 1303
 
1304 1304
 		if ( wp_is_mobile() ) {
1305
-		    $scripts[] = 'jquery-touch-punch';
1305
+		    $scripts[ ] = 'jquery-touch-punch';
1306 1306
 		}
1307 1307
 
1308 1308
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$is_table_layout = preg_match( '/table/ism', $template_id );
55 55
 
56
-		if( 'field' === $field_type ) {
56
+		if ( 'field' === $field_type ) {
57 57
 
58 58
 			// Default options - fields
59 59
 			$field_options = array(
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
 			);
106 106
 
107 107
 			// Match Table as well as DataTables
108
-			if( $is_table_layout && 'directory' === $context ) {
109
-				$field_options['width'] = array(
108
+			if ( $is_table_layout && 'directory' === $context ) {
109
+				$field_options[ 'width' ] = array(
110 110
 					'type' => 'number',
111
-					'label' => __('Percent Width', 'gravityview'),
112
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
111
+					'label' => __( 'Percent Width', 'gravityview' ),
112
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
113 113
 					'class' => 'code widefat',
114 114
 					'value' => '',
115 115
 					'priority' => 200,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
 		// Remove suffix ":" from the labels to standardize style. Using trim() instead of rtrim() for i18n.
123 123
 		foreach ( $field_options as $key => $field_option ) {
124
-			$field_options[ $key ]['label'] = trim( $field_options[ $key ]['label'], ':' );
124
+			$field_options[ $key ][ 'label' ] = trim( $field_options[ $key ][ 'label' ], ':' );
125 125
 		}
126 126
 
127 127
 		/**
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 				switch ( $key ) {
157 157
 					case 'show_as_link':
158 158
 						$_group = 'display';
159
-						$field_option['priority'] = 100;
159
+						$field_option[ 'priority' ] = 100;
160 160
 						break;
161 161
 					default:
162 162
 						$_group = \GV\Utils::get( $field_option, 'group', 'display' );
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 			}
172 172
 
173 173
 			$field_options = array();
174
-			foreach ( self::get_field_groups() as $group_key => $group_name  ) {
174
+			foreach ( self::get_field_groups() as $group_key => $group_name ) {
175 175
 				$field_options[ $group_key ] = \GV\Utils::get( $option_groups, $group_key, array() );
176 176
 			}
177 177
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 			return 0;
203 203
 		}
204 204
 
205
-		return ( $a_priority < $b_priority ) ? - 1 : 1;
205
+		return ( $a_priority < $b_priority ) ? -1 : 1;
206 206
 	}
207 207
 
208 208
 	/**
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
 			'manage_options' => __( 'Administrator', 'gravityview' ),
228 228
 		);
229 229
 
230
-		if( is_multisite() ) {
231
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
230
+		if ( is_multisite() ) {
231
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
232 232
 		}
233 233
 
234 234
 		/**
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
242 242
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
243 243
 		 */
244
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
244
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
245 245
 
246 246
 		return $select_cap_choices;
247 247
 	}
@@ -268,9 +268,9 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
270 270
 
271
-		if( empty( $uniqid ) ) {
271
+		if ( empty( $uniqid ) ) {
272 272
 			//generate a unique field id
273
-			$uniqid = uniqid('', false);
273
+			$uniqid = uniqid( '', false );
274 274
 		}
275 275
 
276 276
 		$grouped = ( 'field' === $field_type );
@@ -278,24 +278,24 @@  discard block
 block discarded – undo
278 278
 		// get field/widget options
279 279
 		$option_groups = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id, $grouped );
280 280
 
281
-		if( ! $grouped ) {
281
+		if ( ! $grouped ) {
282 282
 			$option_groups = array( $option_groups );
283 283
 		}
284 284
 
285 285
 		$option_groups = array_filter( $option_groups );
286 286
 
287 287
 		// two different post arrays, depending of the field type
288
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
288
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
289 289
 
290 290
 		// build output
291
-		$hidden_fields  = '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
292
-		$hidden_fields .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
291
+		$hidden_fields  = '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
292
+		$hidden_fields .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
293 293
 
294 294
 		$form_title = '';
295 295
 		if ( $form_id ) {
296
-			$hidden_fields .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
296
+			$hidden_fields .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
297 297
 			$form = GVCommon::get_form( $form_id );
298
-			$form_title = $form['title'];
298
+			$form_title = $form[ 'title' ];
299 299
 		}
300 300
 
301 301
 		// If there are no options, return what we got.
@@ -303,14 +303,14 @@  discard block
 block discarded – undo
303 303
 			return $hidden_fields . '<!-- No Options -->'; // The HTML comment is here for checking if the output is empty in render_label()
304 304
 		}
305 305
 
306
-		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) );
306
+		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) );
307 307
 
308 308
 		$field_details = '';
309 309
 
310 310
 		// Get the pretty name for the input type
311 311
 		$gv_field = GravityView_Fields::get( $input_type );
312 312
 
313
-		if( $gv_field ) {
313
+		if ( $gv_field ) {
314 314
 			$input_type_label = $gv_field->label;
315 315
 		} else {
316 316
 			$input_type_label = $input_type;
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 			}
325 325
 
326 326
 			if ( $grouped ) {
327
-				$group_name     = rgar( self::get_field_groups(), $group_key, '' );
327
+				$group_name = rgar( self::get_field_groups(), $group_key, '' );
328 328
 				$field_settings .= '<fieldset class="item-settings-group item-settings-group-' . esc_attr( $group_key ) . '">';
329 329
 				$field_settings .= '<legend>' . esc_attr( $group_name ) . '</legend>';
330 330
 			}
@@ -341,15 +341,15 @@  discard block
 block discarded – undo
341 341
 				}
342 342
 
343 343
 				$show_if = '';
344
-				if ( ! empty( $option['requires'] ) ) {
345
-					$show_if .= sprintf( ' data-requires="%s"', $option['requires'] );
344
+				if ( ! empty( $option[ 'requires' ] ) ) {
345
+					$show_if .= sprintf( ' data-requires="%s"', $option[ 'requires' ] );
346 346
 				}
347 347
 
348
-				if ( ! empty( $option['requires_not'] ) ) {
349
-					$show_if .= sprintf( ' data-requires-not="%s"', $option['requires_not'] );
348
+				if ( ! empty( $option[ 'requires_not' ] ) ) {
349
+					$show_if .= sprintf( ' data-requires-not="%s"', $option[ 'requires_not' ] );
350 350
 				}
351 351
 
352
-				switch ( $option['type'] ) {
352
+				switch ( $option[ 'type' ] ) {
353 353
 					// Hide hidden fields
354 354
 					case 'hidden':
355 355
 						$field_settings .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
@@ -367,30 +367,30 @@  discard block
 block discarded – undo
367 367
 		$item_details = '';
368 368
 		$subtitle = '';
369 369
 
370
-		if( 'field' === $field_type ) {
371
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle'] . '</div>' : '';
370
+		if ( 'field' === $field_type ) {
371
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
372 372
 
373 373
 			$item_details .= '
374 374
 			<div class="gv-field-details--container">
375
-				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) .' <i class="dashicons dashicons-arrow-down"></i></label>
375
+				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) . ' <i class="dashicons dashicons-arrow-down"></i></label>
376 376
 				<section class="gv-field-details gv-field-details--closed">';
377 377
 
378 378
 				if ( $field_id && is_numeric( $field_id ) ) {
379 379
 				$item_details .= '
380 380
 					<div class="gv-field-detail gv-field-detail--field">
381
-						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
381
+						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) . '</span><span class="gv-field-detail--value">#{{field_id}}</span>
382 382
 					</div>';
383 383
 			    }
384 384
 
385 385
 				$item_details .= '
386 386
 					<div class="gv-field-detail gv-field-detail--type">
387
-						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{input_type_label}}</span>
387
+						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{input_type_label}}</span>
388 388
 					</div>';
389 389
 
390
-				if( $form_id ) {
390
+				if ( $form_id ) {
391 391
 					$item_details .= '
392 392
 					<div class="gv-field-detail gv-field-detail--form">
393
-						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
393
+						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
394 394
 					</div>';
395 395
 				}
396 396
 				$item_details .= '
@@ -398,8 +398,8 @@  discard block
 block discarded – undo
398 398
 			</div>';
399 399
 		} else {
400 400
 			$widget_details_content = rgar( $item, 'description', '' );
401
-			if ( ! empty( $item['subtitle'] ) ) {
402
-				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item['subtitle'] : $item['subtitle'];
401
+			if ( ! empty( $item[ 'subtitle' ] ) ) {
402
+				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item[ 'subtitle' ] : $item[ 'subtitle' ];
403 403
 			}
404 404
 
405 405
 			// Intentionally not escaping to allow HTML.
@@ -455,17 +455,17 @@  discard block
 block discarded – undo
455 455
 		 * @deprecated setting index 'default' was replaced by 'value'
456 456
 		 * @see GravityView_FieldType::get_field_defaults
457 457
 		 */
458
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
459
-			$option['value'] = $option['default'];
460
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
458
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
459
+			$option[ 'value' ] = $option[ 'default' ];
460
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
461 461
 		}
462 462
 
463 463
 		// prepare to render option field type
464
-		if( isset( $option['type'] ) ) {
464
+		if ( isset( $option[ 'type' ] ) ) {
465 465
 
466 466
 			$type_class = self::load_type_class( $option );
467 467
 
468
-			if( class_exists( $type_class ) ) {
468
+			if ( class_exists( $type_class ) ) {
469 469
 
470 470
 				/** @type GravityView_FieldType $render_type */
471 471
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 				 * @param[in,out] string $output field class name
483 483
 				 * @param[in] array $option  option field data
484 484
 				 */
485
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
485
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
486 486
 			}
487 487
 
488 488
 		} // isset option[type]
@@ -517,27 +517,27 @@  discard block
 block discarded – undo
517 517
 		 * @deprecated setting index 'name' was replaced by 'label'
518 518
 		 * @see GravityView_FieldType::get_field_defaults
519 519
 		 */
520
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
521
-			$setting['label'] = $setting['name'];
522
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
520
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
521
+			$setting[ 'label' ] = $setting[ 'name' ];
522
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
523 523
 		}
524 524
 
525 525
 		$name = esc_attr( sprintf( $name, $key ) );
526
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
527
-		$setting['tooltip'] = 'gv_' . $key;
526
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
527
+		$setting[ 'tooltip' ] = 'gv_' . $key;
528 528
 
529 529
 		// Use default if current setting isn't set.
530
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
530
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
531 531
 
532 532
 		// default setting type = text
533
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
533
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
534 534
 
535 535
 		// merge tags
536
-		if( !isset( $setting['merge_tags'] ) ) {
537
-			if( $setting['type'] === 'text' ) {
538
-				$setting['merge_tags'] = true;
536
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
537
+			if ( $setting[ 'type' ] === 'text' ) {
538
+				$setting[ 'merge_tags' ] = true;
539 539
 			} else {
540
-				$setting['merge_tags'] = false;
540
+				$setting[ 'merge_tags' ] = false;
541 541
 			}
542 542
 		}
543 543
 
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
 
546 546
 		// render the setting
547 547
 		$type_class = self::load_type_class( $setting );
548
-		if( class_exists( $type_class ) ) {
548
+		if ( class_exists( $type_class ) ) {
549 549
 			/** @type GravityView_FieldType $render_type */
550 550
 			$render_type = new $type_class( $name, $setting, $curr_value );
551 551
 			ob_start();
@@ -554,25 +554,25 @@  discard block
 block discarded – undo
554 554
 		}
555 555
 
556 556
 		// Check if setting is specific for a template
557
-		if( !empty( $setting['show_in_template'] ) ) {
558
-			if( !is_array( $setting['show_in_template'] ) ) {
559
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
557
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
558
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
559
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
560 560
 			}
561
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
561
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
562 562
 		} else {
563 563
 			$show_if = '';
564 564
 		}
565 565
 
566
-		if( ! empty( $setting['requires'] ) ) {
567
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
566
+		if ( ! empty( $setting[ 'requires' ] ) ) {
567
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
568 568
 		}
569 569
 
570
-		if( ! empty( $setting['requires_not'] ) ) {
571
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
570
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
571
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
572 572
 		}
573 573
 
574 574
 		// output
575
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
575
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
576 576
 
577 577
 	}
578 578
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 	 */
585 585
 	public static function load_type_class( $field = NULL ) {
586 586
 
587
-		if( empty( $field['type'] ) ) {
587
+		if ( empty( $field[ 'type' ] ) ) {
588 588
 			return NULL;
589 589
 		}
590 590
 
@@ -593,9 +593,9 @@  discard block
 block discarded – undo
593 593
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
594 594
 		 * @param array $field   field data
595 595
 		 */
596
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
596
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
597 597
 
598
-		if( class_exists( $type_class ) ) {
598
+		if ( class_exists( $type_class ) ) {
599 599
 			return $type_class;
600 600
 		}
601 601
 
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 		 * @param string  $field_type_include_path field class file path
605 605
 		 * @param array $field  field data
606 606
 		 */
607
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
607
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
608 608
 
609
-		if( $class_file && file_exists( $class_file ) ) {
609
+		if ( $class_file && file_exists( $class_file ) ) {
610 610
 			require_once( $class_file );
611 611
 		}
612 612
 
@@ -628,8 +628,8 @@  discard block
 block discarded – undo
628 628
 
629 629
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
630 630
 
631
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
632
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
631
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
632
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
633 633
 
634 634
 		return $output;
635 635
 	}
@@ -649,22 +649,22 @@  discard block
 block discarded – undo
649 649
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
650 650
 
651 651
 		// Show the merge tags if the field is a list view
652
-		$is_list = ( preg_match( '/_list-/ism', $name ));
652
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
653 653
 
654 654
 		// Or is a single entry view
655
-		$is_single = ( preg_match( '/single_/ism', $name ));
655
+		$is_single = ( preg_match( '/single_/ism', $name ) );
656 656
 		$show = ( $is_single || $is_list );
657 657
 
658 658
 		$class = '';
659 659
 		// and $add_merge_tags is not false
660
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
660
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
661 661
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
662 662
 		}
663 663
 
664
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
665
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
664
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
665
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
666 666
 
667
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
667
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
668 668
 	}
669 669
 
670 670
 	/**
@@ -681,21 +681,21 @@  discard block
 block discarded – undo
681 681
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
682 682
 
683 683
 		// Show the merge tags if the field is a list view
684
-		$is_list = ( preg_match( '/_list-/ism', $name ));
684
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
685 685
 
686 686
 		// Or is a single entry view
687
-		$is_single = ( preg_match( '/single_/ism', $name ));
687
+		$is_single = ( preg_match( '/single_/ism', $name ) );
688 688
 		$show = ( $is_single || $is_list );
689 689
 
690 690
 		$class = '';
691 691
 		// and $add_merge_tags is not false
692
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
692
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
693 693
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
694 694
 		}
695 695
 
696
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
696
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
697 697
 
698
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
698
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
699 699
 	}
700 700
 
701 701
 	/**
@@ -711,9 +711,9 @@  discard block
 block discarded – undo
711 711
 
712 712
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
713 713
 
714
-		$output = '<select name="'. $name .'" id="'. $id .'">';
715
-		foreach( $choices as $value => $label ) {
716
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
714
+		$output = '<select name="' . $name . '" id="' . $id . '">';
715
+		foreach ( $choices as $value => $label ) {
716
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
717 717
 		}
718 718
 		$output .= '</select>';
719 719
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 				continue;
69 69
 			}
70 70
 
71
-			$field_id = intval( floor( $search_field['key'] ) );
72
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
71
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
72
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
73 73
 			$form = GravityView_View::getInstance()->getForm();
74 74
 
75 75
 			/** @type GF_Field_Address $address_field */
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 			$choices = array();
79 79
 
80 80
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
81
-			if( method_exists( $this, $method_name ) ) {
81
+			if ( method_exists( $this, $method_name ) ) {
82 82
 				/**
83 83
 				 * @uses GravityView_Field_Address::get_choices_country()
84 84
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -86,12 +86,12 @@  discard block
 block discarded – undo
86 86
 				$choices = $this->{$method_name}( $address_field, $form );
87 87
 			}
88 88
 
89
-			if( ! empty( $choices ) ) {
90
-				$search_field['choices'] = $choices;
91
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
89
+			if ( ! empty( $choices ) ) {
90
+				$search_field[ 'choices' ] = $choices;
91
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
92 92
 			} else {
93
-				$search_field['type'] = 'text';
94
-				$search_field['input'] = 'input_text';
93
+				$search_field[ 'type' ] = 'text';
94
+				$search_field[ 'input' ] = 'input_text';
95 95
 			}
96 96
 		}
97 97
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		$country_choices = array();
117 117
 
118 118
 		foreach ( $countries as $key => $country ) {
119
-			$country_choices[] = array(
119
+			$country_choices[ ] = array(
120 120
 				'value' => $country,
121 121
 				'text' => $country,
122 122
 			);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	private function get_choices_state( $address_field, $form ) {
143 143
 
144
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
144
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
145 145
 
146 146
 		$state_choices = array();
147 147
 
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
 				$states = GFCommon::get_canadian_provinces();
154 154
 				break;
155 155
 			default:
156
-				$address_types = $address_field->get_address_types( $form['id'] );
157
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
156
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
157
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
158 158
 				break;
159 159
 		}
160 160
 
@@ -163,19 +163,19 @@  discard block
 block discarded – undo
163 163
 				$state_subchoices = array();
164 164
 
165 165
 				foreach ( $state as $key => $substate ) {
166
-					$state_subchoices[] = array(
166
+					$state_subchoices[ ] = array(
167 167
 						'value' => is_numeric( $key ) ? $substate : $key,
168 168
 						'text' => $substate,
169 169
 					);
170 170
 				}
171 171
 
172
-				$state_choices[] = array(
172
+				$state_choices[ ] = array(
173 173
 					'text' => $key,
174 174
 					'value' => $state_subchoices,
175 175
 				);
176 176
 
177 177
 			} else {
178
-				$state_choices[] = array(
178
+				$state_choices[ ] = array(
179 179
 					'value' => is_numeric( $key ) ? $state : $key,
180 180
 					'text' => $state,
181 181
 				);
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
 		// Use the same inputs as the "text" input type allows
200 200
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
201 201
 
202
-		$input_types['street'] = $text_inputs;
203
-		$input_types['street2'] = $text_inputs;
204
-		$input_types['city'] = $text_inputs;
202
+		$input_types[ 'street' ] = $text_inputs;
203
+		$input_types[ 'street2' ] = $text_inputs;
204
+		$input_types[ 'city' ] = $text_inputs;
205 205
 
206
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
207
-		$input_types['zip'] = array( 'input_text' );
208
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
206
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
207
+		$input_types[ 'zip' ] = array( 'input_text' );
208
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
209 209
 
210 210
 		return $input_types;
211 211
 	}
@@ -226,12 +226,12 @@  discard block
 block discarded – undo
226 226
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
227 227
 		$input_id = gravityview_get_input_id_from_id( $field_id );
228 228
 
229
-		if( 'address' !== $field_type && $input_id ) {
229
+		if ( 'address' !== $field_type && $input_id ) {
230 230
 			return $input_type;
231 231
 		}
232 232
 
233 233
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
234
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
234
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
235 235
 			$input_type = $address_field_name;
236 236
 		}
237 237
 
@@ -279,17 +279,17 @@  discard block
 block discarded – undo
279 279
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
280 280
 
281 281
 		// If this is NOT the full address field, return default options.
282
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
282
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
283 283
 			return $field_options;
284 284
 		}
285 285
 
286
-		if( 'edit' === $context ) {
286
+		if ( 'edit' === $context ) {
287 287
 			return $field_options;
288 288
 		}
289 289
 
290 290
 		$add_options = array();
291 291
 
292
-		$add_options['show_map_link'] = array(
292
+		$add_options[ 'show_map_link' ] = array(
293 293
 			'type'       => 'checkbox',
294 294
 			'label'      => __( 'Show Map Link:', 'gravityview' ),
295 295
 			'desc'       => __( 'Display a "Map It" link below the address', 'gravityview' ),
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 
302 302
 		$this->add_field_support( 'new_window', $add_options );
303 303
 
304
-		$add_options['new_window']['requires'] = 'show_map_link';
304
+		$add_options[ 'new_window' ][ 'requires' ] = 'show_map_link';
305 305
 
306 306
 		return $add_options + $field_options;
307 307
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gravatar.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	static public function get_email( $field_settings, $entry ) {
75 75
 
76 76
 		// There was no logged in user.
77
-		switch ( $field_settings['email_field'] ) {
77
+		switch ( $field_settings[ 'email_field' ] ) {
78 78
 			case 'created_by_email':
79 79
 
80 80
 				$created_by = \GV\Utils::get( $entry, 'created_by', null );
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 			return $field_options;
106 106
 		}
107 107
 
108
-		unset( $field_options['new_window'] );
108
+		unset( $field_options[ 'new_window' ] );
109 109
 
110
-		$field_options['email_field'] = array(
110
+		$field_options[ 'email_field' ] = array(
111 111
 			'type'    => 'select',
112 112
 			'label'   => __( 'Email to Use', 'gravityview' ),
113 113
 			'value'   => 'created_by_email',
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 			'group' => 'display',
117 117
 		);
118 118
 
119
-		$field_options['default'] = array(
119
+		$field_options[ 'default' ] = array(
120 120
 			'type'    => 'select',
121 121
 			'label'   => __( 'Default Image', 'gravityview' ),
122 122
 			'desc'    => __( 'Choose the default image to be shown when an email has no Gravatar.', 'gravityview' ) . ' <a href="https://en.gravatar.com/site/implement/images/">' . esc_html( sprintf( __( 'Read more about %s', 'gravityview' ), __( 'Default Image', 'gravityview' ) ) ) . '</a>',
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 			'group' => 'display',
134 134
 		);
135 135
 
136
-		$field_options['size'] = array(
136
+		$field_options[ 'size' ] = array(
137 137
 			'type'  => 'number',
138 138
 			'label' => __( 'Size in Pixels', 'gravityview' ),
139 139
 			'value' => 80,
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 		$email_fields = GFAPI::get_fields_by_type( $form, array( 'email' ) );
169 169
 
170 170
 		foreach ( $email_fields as $email_field ) {
171
-			$email_field_id                   = $email_field['id'];
171
+			$email_field_id                   = $email_field[ 'id' ];
172 172
 			$email_field_label                = GVCommon::get_field_label( $form, $email_field_id );
173 173
 			$email_field_label                = sprintf( __( 'Field: %s', 'gravityview' ), $email_field_label );
174 174
 			$field_choices[ $email_field_id ] = esc_html( $email_field_label );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-category.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
17 17
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 		$entry = GFAPI::get_entry( $entry_id );
47 47
 		$post_id = \GV\Utils::get( $entry, 'post_id' );
48 48
 
49
-		if( empty( $post_id ) ) {
49
+		if ( empty( $post_id ) ) {
50 50
 			return false;
51 51
 		}
52 52
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 		$post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' );
56 56
 
57
-		if( $post_category_fields ) {
57
+		if ( $post_category_fields ) {
58 58
 
59 59
 			$updated_categories = array();
60 60
 
@@ -121,18 +121,18 @@  discard block
 block discarded – undo
121 121
 	 *
122 122
 	 * @return mixed
123 123
 	 */
124
-	function edit_entry_post_category_choices( $choices, $field, $form_id  ) {
124
+	function edit_entry_post_category_choices( $choices, $field, $form_id ) {
125 125
 
126
-		$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
126
+		$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
127 127
 
128 128
 		// $entry['post_id'] should always be set, but we check to make sure.
129
-		if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) {
129
+		if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) {
130 130
 
131 131
 			$post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) );
132 132
 
133 133
 			// Always use the live value
134 134
 			foreach ( $choices as &$choice ) {
135
-				$choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) );
135
+				$choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) );
136 136
 			}
137 137
 		}
138 138
 
@@ -141,15 +141,15 @@  discard block
 block discarded – undo
141 141
 
142 142
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
143 143
 
144
-		if( 'edit' === $context ) {
144
+		if ( 'edit' === $context ) {
145 145
 			return $field_options;
146 146
 		}
147 147
 
148
-		$this->add_field_support('dynamic_data', $field_options );
149
-		$this->add_field_support('link_to_term', $field_options );
150
-		$this->add_field_support('new_window', $field_options );
148
+		$this->add_field_support( 'dynamic_data', $field_options );
149
+		$this->add_field_support( 'link_to_term', $field_options );
150
+		$this->add_field_support( 'new_window', $field_options );
151 151
 
152
-		$field_options['new_window']['requires'] = 'link_to_term';
152
+		$field_options[ 'new_window' ][ 'requires' ] = 'link_to_term';
153 153
 
154 154
 		return $field_options;
155 155
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-number.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,18 +33,18 @@
 block discarded – undo
33 33
 
34 34
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
35 35
 
36
-		$field_options['number_format'] = array(
36
+		$field_options[ 'number_format' ] = array(
37 37
 			'type' => 'checkbox',
38 38
 			'label' => __( 'Format number?', 'gravityview' ),
39
-			'desc' => __('Display numbers with thousands separators.', 'gravityview'),
39
+			'desc' => __( 'Display numbers with thousands separators.', 'gravityview' ),
40 40
 			'value' => false,
41 41
 			'group' => 'field',
42 42
 		);
43 43
 
44
-		$field_options['decimals'] = array(
44
+		$field_options[ 'decimals' ] = array(
45 45
 			'type' => 'number',
46 46
 			'label' => __( 'Decimals', 'gravityview' ),
47
-			'desc' => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
47
+			'desc' => __( 'Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview' ),
48 48
 			'value' => '',
49 49
 			'merge_tags' => false,
50 50
 			'group' => 'field',
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-tags.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
 	var $is_searchable = true;
16 16
 
17
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
17
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
18 18
 
19 19
 	var $_gf_field_class_name = 'GF_Field_Post_Tags';
20 20
 
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
 
30 30
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
31 31
 
32
-		if( 'edit' === $context ) {
32
+		if ( 'edit' === $context ) {
33 33
 			return $field_options;
34 34
 		}
35 35
 
36
-		$this->add_field_support('dynamic_data', $field_options );
37
-		$this->add_field_support('link_to_term', $field_options );
38
-		$this->add_field_support('new_window', $field_options );
36
+		$this->add_field_support( 'dynamic_data', $field_options );
37
+		$this->add_field_support( 'link_to_term', $field_options );
38
+		$this->add_field_support( 'new_window', $field_options );
39 39
 
40
-		$field_options['new_window']['requires'] = 'link_to_term';
40
+		$field_options[ 'new_window' ][ 'requires' ] = 'link_to_term';
41 41
 
42 42
 		return $field_options;
43 43
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-id.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
 	public function __construct() {
24 24
 		$this->label = esc_html__( 'Entry ID', 'gravityview' );
25
-	    $this->description = __('The unique ID of the entry.', 'gravityview');
25
+		$this->description = __('The unique ID of the entry.', 'gravityview');
26 26
 		parent::__construct();
27 27
 	}
28 28
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,18 +22,18 @@
 block discarded – undo
22 22
 
23 23
 	public function __construct() {
24 24
 		$this->label = esc_html__( 'Entry ID', 'gravityview' );
25
-	    $this->description = __('The unique ID of the entry.', 'gravityview');
25
+	    $this->description = __( 'The unique ID of the entry.', 'gravityview' );
26 26
 		parent::__construct();
27 27
 	}
28 28
 
29 29
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35 35
 		if ( 'single' === $context ) {
36
-			unset( $field_options['new_window'] );
36
+			unset( $field_options[ 'new_window' ] );
37 37
 		}
38 38
 
39 39
 		return $field_options;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-phone.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -45,13 +45,13 @@
 block discarded – undo
45 45
 		}
46 46
 
47 47
 		$field_options['link_phone'] = array(
48
-	        'type' => 'checkbox',
49
-	        'label' => __( 'Make Phone Number Clickable', 'gravityview' ),
50
-	        'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'),
51
-	        'value' => true,
52
-	        'group' => 'display',
53
-	        'priority' => 100,
54
-        );
48
+			'type' => 'checkbox',
49
+			'label' => __( 'Make Phone Number Clickable', 'gravityview' ),
50
+			'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'),
51
+			'value' => true,
52
+			'group' => 'display',
53
+			'priority' => 100,
54
+		);
55 55
 
56 56
 		return $field_options;
57 57
 	}
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,14 +40,14 @@
 block discarded – undo
40 40
 	 */
41 41
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
42 42
 
43
-		if( 'edit' === $context ) {
43
+		if ( 'edit' === $context ) {
44 44
 			return $field_options;
45 45
 		}
46 46
 
47
-		$field_options['link_phone'] = array(
47
+		$field_options[ 'link_phone' ] = array(
48 48
 	        'type' => 'checkbox',
49 49
 	        'label' => __( 'Make Phone Number Clickable', 'gravityview' ),
50
-	        'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'),
50
+	        'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview' ),
51 51
 	        'value' => true,
52 52
 	        'group' => 'display',
53 53
 	        'priority' => 100,
Please login to merge, or discard this patch.