Completed
Pull Request — develop (#1577)
by Zack
15:52
created
includes/admin/metaboxes/views/gravityview-content.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@
 block discarded – undo
19 19
 	 * Loop through the array of registered metaboxes
20 20
 	 * @var GravityView_Metabox_Tab $metabox
21 21
 	 */
22
-	foreach( $metaboxes as $metabox ) {
22
+	foreach ( $metaboxes as $metabox ) {
23 23
 
24
-		echo '<div id="'.esc_attr( $metabox->id ).'">';
24
+		echo '<div id="' . esc_attr( $metabox->id ) . '">';
25 25
 
26 26
 		$metabox->render( $post );
27 27
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_checkbox.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 	function render_setting( $override_input = NULL ) {
17 17
 
18
-		if( $this->get_field_left_label() ) { ?>
18
+		if ( $this->get_field_left_label() ) { ?>
19 19
 
20 20
 			<td scope="row">
21 21
 				<label for="<?php echo $this->get_field_id(); ?>">
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	}
43 43
 
44 44
 	function render_input( $override_input = NULL ) {
45
-		if( isset( $override_input ) ) {
45
+		if ( isset( $override_input ) ) {
46 46
 			echo $override_input;
47 47
 			return;
48 48
 		}
Please login to merge, or discard this patch.
includes/admin/field-types/type_select.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 
@@ -20,13 +20,13 @@  discard block
 block discarded – undo
20 20
 	}
21 21
 
22 22
 	function render_input( $override_input = null ) {
23
-		if( isset( $override_input ) ) {
23
+		if ( isset( $override_input ) ) {
24 24
 			echo $override_input;
25 25
 			return;
26 26
 		}
27 27
 		?>
28 28
 		<select name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>">
29
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
29
+			<?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
30 30
 				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $this->value, true ); ?>><?php echo esc_html( $label ); ?></option>
31 31
 			<?php endforeach; ?>
32 32
 		</select>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/inline-javascript.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
9
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
9
+		if(confirm('<?php echo esc_js( __( "Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview' ) ); ?>')){
10 10
 			var fileIndex = jQuery(deleteButton).parent().index();
11
-			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
11
+			var mysack = new sack("<?php echo admin_url( "admin-ajax.php" )?>");
12 12
 			mysack.execute = 1;
13 13
 			mysack.method = 'POST';
14 14
 			mysack.setVar( "action", "rg_delete_file" );
15
-			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce("rg_delete_file") ?>" );
15
+			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce( "rg_delete_file" ) ?>" );
16 16
 			mysack.setVar( "lead_id", leadId );
17 17
 			mysack.setVar( "field_id", fieldId );
18 18
 			mysack.setVar( "file_index", fileIndex );
19
-			mysack.onError = function() { alert('<?php echo esc_js(__('Ajax error while deleting field.', 'gravityview')) ?>' )};
19
+			mysack.onError = function() { alert('<?php echo esc_js( __( 'Ajax error while deleting field.', 'gravityview' ) ) ?>' )};
20 20
 			mysack.runAJAX();
21 21
 
22 22
 			return true;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/fields/edit_link.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@
 block discarded – undo
7 7
 extract( $gravityview_view->getCurrentField() );
8 8
 
9 9
 // Only show the link to logged-in users.
10
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
10
+if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
14
+$link_text = empty( $field_settings[ 'edit_link' ] ) ? __( 'Edit Entry', 'gravityview' ) : $field_settings[ 'edit_link' ];
15 15
 
16
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
16
+$link_atts = empty( $field_settings[ 'new_window' ] ) ? '' : 'target="_blank"';
17 17
 
18 18
 $output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
19 19
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 3 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * @return void
272 272
 	 */
273
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
273
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
274 274
 
275 275
 		$output = '';
276 276
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	function save_postdata( $post_id ) {
431 431
 
432
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
432
+		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
433 433
 			return;
434 434
 		}
435 435
 
Please login to merge, or discard this patch.
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 		// Enqueue code editor and settings for manipulating HTML.
47 47
 		add_action('admin_enqueue_scripts', function() {
48 48
 
49
-		    $settings = wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
49
+			$settings = wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
50 50
 		});
51 51
 
52 52
 		// @todo check if this hook is needed..
@@ -68,28 +68,28 @@  discard block
 block discarded – undo
68 68
 	}
69 69
 
70 70
 	/**
71
-     * When on the Add/Edit View screen, suggest most popular articles related to that
72
-     *
71
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
72
+	 *
73 73
 	 * @param array $localization_data Data to be passed to the Support Port JS
74 74
 	 *
75 75
 	 * @return array
76 76
 	 */
77 77
 	function suggest_support_articles( $localization_data = array() ) {
78 78
 
79
-	    if( ! gravityview()->request->is_view() ) {
80
-	        return $localization_data;
81
-        }
79
+		if( ! gravityview()->request->is_view() ) {
80
+			return $localization_data;
81
+		}
82 82
 
83 83
 		$localization_data['suggest'] = array(
84
-            '57ef23539033602e61d4a560',
85
-            '54c67bb9e4b0512429885513',
86
-            '54c67bb9e4b0512429885512',
87
-            '54c67bbbe4b07997ea3f3f6b',
88
-            '54d1a33ae4b086c0c0964ce9',
89
-            '57ef253c9033602e61d4a563',
90
-            '552355bfe4b0221aadf2572b',
91
-            '54c67bcde4b051242988553e',
92
-        );
84
+			'57ef23539033602e61d4a560',
85
+			'54c67bb9e4b0512429885513',
86
+			'54c67bb9e4b0512429885512',
87
+			'54c67bbbe4b07997ea3f3f6b',
88
+			'54d1a33ae4b086c0c0964ce9',
89
+			'57ef253c9033602e61d4a563',
90
+			'552355bfe4b0221aadf2572b',
91
+			'54c67bcde4b051242988553e',
92
+		);
93 93
 
94 94
 		return $localization_data;
95 95
 	}
@@ -235,11 +235,11 @@  discard block
 block discarded – undo
235 235
 
236 236
 		if( 'form_list' === GFForms::get_page() ) {
237 237
 			$priority = 790;
238
-        }
238
+		}
239 239
 
240 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' ),
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
 		// If there were no items added, then let's create the parent menu
272 272
 		if( $sub_menu_items ) {
273 273
 
274
-		    $sub_menu_items[] = array(
275
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
276
-			    'icon' => '<span class="dashicons dashicons-plus"></span>',
277
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
278
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
279
-			    'capabilities'   => array( 'edit_gravityviews' ),
280
-            );
274
+			$sub_menu_items[] = array(
275
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
276
+				'icon' => '<span class="dashicons dashicons-plus"></span>',
277
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
278
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
279
+				'capabilities'   => array( 'edit_gravityviews' ),
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 283
 			$sub_menu_items[] = array(
@@ -659,16 +659,16 @@  discard block
 block discarded – undo
659 659
 	/**
660 660
 	 * Render html for displaying available fields based on a Form ID
661 661
 	 *
662
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
662
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
663 663
 	 *
664 664
 	 * @param int $form Gravity Forms Form ID (default: '')
665 665
 	 * @param string $context (default: 'single')
666
-     *
666
+	 *
667 667
 	 * @return void
668 668
 	 */
669 669
 	function render_available_fields( $form = 0, $context = 'single' ) {
670 670
 
671
-	    // Determine if form is a preset and convert it to an array with fields
671
+		// Determine if form is a preset and convert it to an array with fields
672 672
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
673 673
 
674 674
 		/**
@@ -680,7 +680,7 @@  discard block
 block discarded – undo
680 680
 
681 681
 		if ( ! is_array( $blacklist_field_types ) ) {
682 682
 
683
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
683
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
684 684
 
685 685
 			$blacklist_field_types = array();
686 686
 		}
@@ -936,9 +936,9 @@  discard block
 block discarded – undo
936 936
 
937 937
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
938 938
 
939
-                foreach ( $joined_forms as $form ) {
940
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
941
-                }
939
+				foreach ( $joined_forms as $form ) {
940
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
941
+				}
942 942
 			} else {
943 943
 				$available_items[ $form ] = \GV\Widget::registered();
944 944
 			}
@@ -977,9 +977,9 @@  discard block
 block discarded – undo
977 977
 
978 978
 										if ( $form_id ) {
979 979
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
980
-                                        } else {
980
+										} else {
981 981
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
982
-                                        }
982
+										}
983 983
 
984 984
 										if ( !$original_item ) {
985 985
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1229,7 +1229,7 @@  discard block
 block discarded – undo
1229 1229
 		}
1230 1230
 
1231 1231
 		// Add the GV font (with the Astronaut)
1232
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1232
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1233 1233
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1234 1234
 
1235 1235
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1237,43 +1237,43 @@  discard block
 block discarded – undo
1237 1237
 		if( GFForms::get_page() === 'form_list' ) {
1238 1238
 			wp_enqueue_style( 'gravityview_views_styles' );
1239 1239
 			return;
1240
-        }
1240
+		}
1241 1241
 
1242 1242
 		// Don't process any scripts below here if it's not a GravityView page.
1243 1243
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1244
-		    return;
1244
+			return;
1245 1245
 		}
1246 1246
 
1247
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1248
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1249
-
1250
-        // Enqueue scripts
1251
-        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 );
1252
-
1253
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1254
-            'cookiepath' => COOKIEPATH,
1255
-            'admin_cookiepath' => ADMIN_COOKIE_PATH,
1256
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1257
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1258
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1259
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1260
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1261
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1262
-            'label_close' => __( 'Close', 'gravityview' ),
1263
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1264
-            'label_continue' => __( 'Continue', 'gravityview' ),
1265
-            'label_ok' => __( 'Ok', 'gravityview' ),
1266
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1267
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1268
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1269
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1270
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1271
-        ));
1247
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1248
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1249
+
1250
+		// Enqueue scripts
1251
+		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 );
1252
+
1253
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1254
+			'cookiepath' => COOKIEPATH,
1255
+			'admin_cookiepath' => ADMIN_COOKIE_PATH,
1256
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1257
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1258
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1259
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1260
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1261
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1262
+			'label_close' => __( 'Close', 'gravityview' ),
1263
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1264
+			'label_continue' => __( 'Continue', 'gravityview' ),
1265
+			'label_ok' => __( 'Ok', 'gravityview' ),
1266
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1267
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1268
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1269
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1270
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1271
+		));
1272 1272
 
1273 1273
 		wp_enqueue_style( 'gravityview_views_styles' );
1274 1274
 
1275
-        // Enqueue scripts needed for merge tags
1276
-        self::enqueue_gravity_forms_scripts();
1275
+		// Enqueue scripts needed for merge tags
1276
+		self::enqueue_gravity_forms_scripts();
1277 1277
 
1278 1278
 		// 2.5 changed how Merge Tags are enqueued
1279 1279
 		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
@@ -1283,24 +1283,24 @@  discard block
 block discarded – undo
1283 1283
 
1284 1284
 	/**
1285 1285
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1286
-     *
1287
-     * @since 1.0.5-beta
1288
-     *
1289
-     * @return void
1286
+	 *
1287
+	 * @since 1.0.5-beta
1288
+	 *
1289
+	 * @return void
1290 1290
 	 */
1291 1291
 	static function enqueue_gravity_forms_scripts() {
1292 1292
 		GFForms::register_scripts();
1293 1293
 
1294 1294
 		$scripts = array(
1295
-		    'sack',
1296
-		    'gform_gravityforms',
1297
-		    'gform_forms',
1298
-		    'gform_form_admin',
1299
-		    'jquery-ui-autocomplete'
1295
+			'sack',
1296
+			'gform_gravityforms',
1297
+			'gform_forms',
1298
+			'gform_form_admin',
1299
+			'jquery-ui-autocomplete'
1300 1300
 		);
1301 1301
 
1302 1302
 		if ( wp_is_mobile() ) {
1303
-		    $scripts[] = 'jquery-touch-punch';
1303
+			$scripts[] = 'jquery-touch-punch';
1304 1304
 		}
1305 1305
 
1306 1306
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
Spacing   +172 added lines, -172 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 ); ?>">
958
-                            <p class="gv-droppable-area-title" <?php if ( 'widget' === $type && empty( $area['subtitle'] ) ) { echo ' style="margin: 0; padding: 0;"'; } ?>>
959
-								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area['title'] ); ?></strong>
957
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
958
+                            <p class="gv-droppable-area-title" <?php if ( 'widget' === $type && empty( $area[ 'subtitle' ] ) ) { echo ' style="margin: 0; padding: 0;"'; } ?>>
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/widgets/search-widget/templates/search-field-hidden.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,4 +7,4 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $search_field = $gravityview_view->search_field;
10
-?><div><input type="hidden" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>"></div>
11 10
\ No newline at end of file
11
+?><div><input type="hidden" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>"></div>
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-pagination-info.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 	function __construct() {
18 18
 
19
-		$this->widget_description = __('Summary of the number of visible entries out of the total results.', 'gravityview' );
19
+		$this->widget_description = __( 'Summary of the number of visible entries out of the total results.', 'gravityview' );
20 20
 
21 21
 		$default_values = array(
22 22
 			'header' => 1,
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
25 25
 
26 26
 		$settings = array();
27 27
 
28
-		parent::__construct( __( 'Show Pagination Info', 'gravityview' ) , 'page_info', $default_values, $settings );
28
+		parent::__construct( __( 'Show Pagination Info', 'gravityview' ), 'page_info', $default_values, $settings );
29 29
 	}
30 30
 
31
-	public function render_frontend( $widget_args, $content = '', $context = '') {
31
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
32 32
 		$gravityview_view = GravityView_View::getInstance();
33 33
 
34
-		if( !$this->pre_render_frontend() ) {
34
+		if ( ! $this->pre_render_frontend() ) {
35 35
 			return;
36 36
 		}
37 37
 
38
-		if( !empty( $widget_args['title'] ) ) {
39
-			echo $widget_args['title'];
38
+		if ( ! empty( $widget_args[ 'title' ] ) ) {
39
+			echo $widget_args[ 'title' ];
40 40
 		}
41 41
 
42 42
 		$pagination_counts = $gravityview_view->getPaginationCounts();
@@ -45,16 +45,16 @@  discard block
 block discarded – undo
45 45
 
46 46
 		$output = '';
47 47
 
48
-		if( ! empty( $pagination_counts ) ) {
48
+		if ( ! empty( $pagination_counts ) ) {
49 49
 
50
-			$first = $pagination_counts['first'];
51
-			$last = $pagination_counts['last'];
52
-			$total = $pagination_counts['total'];
50
+			$first = $pagination_counts[ 'first' ];
51
+			$last = $pagination_counts[ 'last' ];
52
+			$total = $pagination_counts[ 'total' ];
53 53
 
54
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
54
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
55 55
 			$class = gravityview_sanitize_html_class( $class );
56 56
 
57
-			$output = '<div class="gv-widget-pagination '.$class.'"><p>'. sprintf(__( 'Displaying %1$s - %2$s of %3$s', 'gravityview' ), number_format_i18n( $first ), number_format_i18n( $last ), number_format_i18n( $total ) ) . '</p></div>';
57
+			$output = '<div class="gv-widget-pagination ' . $class . '"><p>' . sprintf( __( 'Displaying %1$s - %2$s of %3$s', 'gravityview' ), number_format_i18n( $first ), number_format_i18n( $last ), number_format_i18n( $total ) ) . '</p></div>';
58 58
 		}
59 59
 
60 60
 		/**
Please login to merge, or discard this patch.
includes/extensions/entry-notes/partials/note-add-note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@
 block discarded – undo
21 21
 		{email_fields}
22 22
 
23 23
 		<div class="gv-note-content-container">
24
-			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings('content-label'); ?></label>
24
+			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings( 'content-label' ); ?></label>
25 25
 			<textarea name="gv-note-content" id="gv-note-content-{entry_slug}"></textarea>
26 26
 		</div>
27 27
 
28
-		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings('add-note'); ?></button>
28
+		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings( 'add-note' ); ?></button>
29 29
 	</div>
30 30
 </form>
31 31
\ No newline at end of file
Please login to merge, or discard this patch.