Completed
Pull Request — master (#1162)
by Zack
19:26 queued 15:20
created
includes/class-common.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * Return array of fields' id and label, for a given Form ID
271 271
 	 *
272 272
 	 * @access public
273
-	 * @param string|array $form_id (default: '') or $form object
273
+	 * @param string|array $form (default: '') or $form object
274 274
 	 * @param bool $add_default_properties
275 275
 	 * @param bool $include_parent_field
276 276
 	 * @return array
@@ -1012,7 +1012,7 @@  discard block
 block discarded – undo
1012 1012
 	 *
1013 1013
 	 * @param array $form Gravity Forms form array
1014 1014
 	 * @param string $field_id ID of the field. If an input, full input ID (like `1.3`)
1015
-	 * @param string|array $field_value Raw value of the field.
1015
+	 * @param string $field_value Raw value of the field.
1016 1016
 	 * @return string
1017 1017
 	 */
1018 1018
 	public static function get_field_label( $form = array(), $field_id = '', $field_value = '' ) {
@@ -1515,7 +1515,7 @@  discard block
 block discarded – undo
1515 1515
 	 *
1516 1516
 	 * Do the same than parse_str without max_input_vars limitation:
1517 1517
 	 * Parses $string as if it were the query string passed via a URL and sets variables in the current scope.
1518
-	 * @param $string string string to parse (not altered like in the original parse_str(), use the second parameter!)
1518
+	 * @param string $string string string to parse (not altered like in the original parse_str(), use the second parameter!)
1519 1519
 	 * @param $result array  If the second parameter is present, variables are stored in this variable as array elements
1520 1520
 	 * @return bool true or false if $string is an empty string
1521 1521
 	 * @since  1.5.3
@@ -1750,9 +1750,9 @@  discard block
 block discarded – undo
1750 1750
 	 * @param string $message            Message body (required)
1751 1751
 	 * @param string $from_name          Displayed name of the sender
1752 1752
 	 * @param string $message_format     If "html", sent text as `text/html`. Otherwise, `text/plain`. Default: "html".
1753
-	 * @param string|array $attachments  Optional. Files to attach. {@see wp_mail()} for usage. Default: "".
1753
+	 * @param string $attachments  Optional. Files to attach. {@see wp_mail()} for usage. Default: "".
1754 1754
 	 * @param array|false $entry         Gravity Forms entry array, related to the email. Default: false.
1755
-	 * @param array|false $notification  Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false.
1755
+	 * @param boolean $notification  Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false.
1756 1756
 	 */
1757 1757
 	public static function send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name = '', $message_format = 'html', $attachments = '', $entry = false, $notification = false ) {
1758 1758
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +179 added lines, -179 removed lines patch added patch discarded remove patch
@@ -28,31 +28,31 @@  discard block
 block discarded – undo
28 28
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
29 29
 
30 30
 		// Tooltips
31
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
31
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
32 32
 
33 33
 		// adding styles and scripts
34
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
35
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
38
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
39
-
40
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
41
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
42
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') );
43
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
44
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
45
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
34
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
35
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
38
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
39
+
40
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
41
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
42
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) );
43
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
44
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
45
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
46 46
 
47 47
 		// @todo check if this hook is needed..
48 48
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
49 49
 
50 50
 		// Add Connected Form column
51
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
51
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
52 52
 
53 53
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
74
+	    if ( ! gravityview()->request->is_view() ) {
75 75
 	        return $localization_data;
76 76
         }
77 77
 
78
-		$localization_data['suggest'] = array(
78
+		$localization_data[ 'suggest' ] = array(
79 79
             '57ef23539033602e61d4a560',
80 80
             '54c67bb9e4b0512429885513',
81 81
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( !is_admin() ) {
99
+		if ( ! is_admin() ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
103
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
104 104
 
105
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
106 106
 			return;
107 107
 		}
108 108
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	function add_view_dropdown() {
120 120
 		$current_screen = get_current_screen();
121 121
 
122
-		if( 'gravityview' !== $current_screen->post_type ) {
122
+		if ( 'gravityview' !== $current_screen->post_type ) {
123 123
 			return;
124 124
 		}
125 125
 
126 126
 		$forms = gravityview_get_forms();
127 127
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
128 128
 		// If there are no forms to select, show no forms.
129
-		if( !empty( $forms ) ) { ?>
129
+		if ( ! empty( $forms ) ) { ?>
130 130
 			<select name="gravityview_form_id" id="gravityview_form_id">
131 131
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
132
-				<?php foreach( $forms as $form ) { ?>
133
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
132
+				<?php foreach ( $forms as $form ) { ?>
133
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
134 134
 				<?php } ?>
135 135
 			</select>
136 136
 		<?php }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
145 145
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
146
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
146
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
147 147
 	}
148 148
 
149 149
 	/**
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 
167 167
 		$connected_views = gravityview_get_connected_views( $id, array( 'post_status' => 'any' ) );
168 168
 
169
-		if( empty( $connected_views ) ) {
169
+		if ( empty( $connected_views ) ) {
170 170
 
171
-		    $menu_items['gravityview'] = array(
171
+		    $menu_items[ 'gravityview' ] = array(
172 172
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
173 173
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
174 174
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -184,22 +184,22 @@  discard block
 block discarded – undo
184 184
 		$sub_menu_items = array();
185 185
 		foreach ( (array)$connected_views as $view ) {
186 186
 
187
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
187
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
188 188
 				continue;
189 189
 			}
190 190
 
191
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
191
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
192 192
 
193
-			$sub_menu_items[] = array(
193
+			$sub_menu_items[ ] = array(
194 194
 				'label' => esc_attr( $label ),
195
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
195
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
196 196
 			);
197 197
 		}
198 198
 
199 199
 		// If there were no items added, then let's create the parent menu
200
-		if( $sub_menu_items ) {
200
+		if ( $sub_menu_items ) {
201 201
 
202
-		    $sub_menu_items[] = array(
202
+		    $sub_menu_items[ ] = array(
203 203
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
204 204
                 'link_class' => 'gv-create-view',
205 205
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -208,14 +208,14 @@  discard block
 block discarded – undo
208 208
             );
209 209
 
210 210
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
211
-			$sub_menu_items[] = array(
211
+			$sub_menu_items[ ] = array(
212 212
 				'url' => '#',
213 213
 				'label' => '',
214 214
 				'menu_class' => 'hidden',
215 215
 				'capabilities' => '',
216 216
 			);
217 217
 
218
-			$menu_items['gravityview'] = array(
218
+			$menu_items[ 'gravityview' ] = array(
219 219
 				'label'          => __( 'Connected Views', 'gravityview' ),
220 220
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
221 221
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -244,8 +244,8 @@  discard block
 block discarded – undo
244 244
 		$add = array( 'captcha', 'page' );
245 245
 
246 246
 		// Don't allowing editing the following values:
247
-		if( $context === 'edit' ) {
248
-			$add[] = 'post_id';
247
+		if ( $context === 'edit' ) {
248
+			$add[ ] = 'post_id';
249 249
 		}
250 250
 
251 251
 		$return = array_merge( $array, $add );
@@ -268,32 +268,32 @@  discard block
 block discarded – undo
268 268
 		foreach ( $default_args as $key => $arg ) {
269 269
 
270 270
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
271
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
271
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
272 272
 
273 273
 			// By default, use `tooltip` if defined.
274
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
274
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
275 275
 
276 276
 			// Otherwise, use the description as a tooltip.
277
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
278
-				$tooltip = $arg['desc'];
277
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
278
+				$tooltip = $arg[ 'desc' ];
279 279
 			}
280 280
 
281 281
 			// If there's no tooltip set, continue
282
-			if( empty( $tooltip ) ) {
282
+			if ( empty( $tooltip ) ) {
283 283
 				continue;
284 284
 			}
285 285
 
286 286
 			// Add the tooltip
287
-			$gv_tooltips[ 'gv_'.$key ] = array(
288
-				'title'	=> $arg['label'],
287
+			$gv_tooltips[ 'gv_' . $key ] = array(
288
+				'title'	=> $arg[ 'label' ],
289 289
 				'value'	=> $tooltip,
290 290
 			);
291 291
 
292 292
 		}
293 293
 
294
-		$gv_tooltips['gv_css_merge_tags'] = array(
295
-			'title' => __('CSS Merge Tags', 'gravityview'),
296
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
294
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
295
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
296
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
297 297
 		);
298 298
 
299 299
 		/**
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
 
312 312
 		foreach ( $gv_tooltips as $key => $tooltip ) {
313 313
 
314
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
314
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
315 315
 
316
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
316
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
317 317
 		}
318 318
 
319 319
 		return $tooltips;
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 	 *
328 328
 	 * @return void
329 329
 	 */
330
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
330
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
331 331
 
332 332
 		$output = '';
333 333
 
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
350 350
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
351 351
 
352
-				$output = $template ? $template['label'] : $template_id_pretty;
352
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
353 353
 
354 354
 				break;
355 355
 
@@ -390,44 +390,44 @@  discard block
 block discarded – undo
390 390
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
391 391
 
392 392
 		// Either the form is empty or the form ID is 0, not yet set.
393
-		if( empty( $form ) ) {
393
+		if ( empty( $form ) ) {
394 394
 			return '';
395 395
 		}
396 396
 
397 397
 		// The $form is passed as the form ID
398
-		if( !is_array( $form ) ) {
398
+		if ( ! is_array( $form ) ) {
399 399
 			$form = gravityview_get_form( $form );
400 400
 		}
401 401
 
402
-		$form_id = $form['id'];
402
+		$form_id = $form[ 'id' ];
403 403
 		$links = array();
404 404
 
405
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
405
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
406 406
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
407
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
408
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
407
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
408
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
409 409
 		} else {
410
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
410
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
411 411
 		}
412 412
 
413
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
413
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
414 414
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
415
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
415
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
416 416
 		}
417 417
 
418
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
418
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
419 419
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
420
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
420
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
421 421
 		}
422 422
 
423
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
423
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
424 424
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
425
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
425
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
426 426
 		}
427 427
 
428 428
 		$output = '';
429 429
 
430
-		if( !empty( $include_form_link ) ) {
430
+		if ( ! empty( $include_form_link ) ) {
431 431
 			$output .= $form_link;
432 432
 		}
433 433
 
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 		 */
440 440
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
441 441
 
442
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
442
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
443 443
 
444 444
 		return $output;
445 445
 	}
@@ -453,8 +453,8 @@  discard block
 block discarded – undo
453 453
 		// Get the date column and save it for later to add back in.
454 454
 		// This adds it after the Data Source column.
455 455
 		// This way, we don't need to do array_slice, array_merge, etc.
456
-		$date = $columns['date'];
457
-		unset( $columns['date'] );
456
+		$date = $columns[ 'date' ];
457
+		unset( $columns[ 'date' ] );
458 458
 
459 459
 		$data_source_required_caps = array(
460 460
 			'gravityforms_edit_forms',
@@ -465,14 +465,14 @@  discard block
 block discarded – undo
465 465
 			'gravityforms_preview_forms',
466 466
 		);
467 467
 
468
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
469
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
468
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
469
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
470 470
 		}
471 471
 
472
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
472
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
473 473
 
474 474
 		// Add the date back in.
475
-		$columns['date'] = $date;
475
+		$columns[ 'date' ] = $date;
476 476
 
477 477
 		return $columns;
478 478
 	}
@@ -486,12 +486,12 @@  discard block
 block discarded – undo
486 486
 	 */
487 487
 	function save_postdata( $post_id ) {
488 488
 
489
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
489
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
490 490
 			return;
491 491
 		}
492 492
 
493 493
 		// validate post_type
494
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
494
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
495 495
 			return;
496 496
 		}
497 497
 
@@ -506,65 +506,65 @@  discard block
 block discarded – undo
506 506
 		$statii = array();
507 507
 
508 508
 		// check if this is a start fresh View
509
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
509
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
510 510
 
511
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
511
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
512 512
 			// save form id
513
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
513
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
514 514
 
515 515
 		}
516 516
 
517
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
517
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
518 518
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
519 519
 			return;
520 520
 		}
521 521
 
522 522
 		// Was this a start fresh?
523
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
524
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
523
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
524
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
525 525
 		} else {
526
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
526
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
527 527
 		}
528 528
 
529 529
 		// Check if we have a template id
530
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
530
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
531 531
 
532
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
532
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
533 533
 
534 534
 			// now save template id
535
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
535
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
536 536
 		}
537 537
 
538 538
 
539 539
 		// save View Configuration metabox
540
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
540
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
541 541
 
542 542
 			// template settings
543
-			if( empty( $_POST['template_settings'] ) ) {
544
-				$_POST['template_settings'] = array();
543
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
544
+				$_POST[ 'template_settings' ] = array();
545 545
 			}
546
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
546
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
547 547
 
548 548
 			$fields = array();
549 549
 
550 550
 			// Directory&single Visible Fields
551
-			if( !empty( $preset_fields ) ) {
551
+			if ( ! empty( $preset_fields ) ) {
552 552
 
553 553
 				$fields = $preset_fields;
554 554
 
555
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
555
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
556 556
 				$fields = _gravityview_process_posted_fields();
557 557
 			}
558 558
 
559 559
 			$fields = wp_slash( $fields );
560 560
 
561
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
561
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
562 562
 
563 563
 			// Directory Visible Widgets
564
-			if( empty( $_POST['widgets'] ) ) {
565
-				$_POST['widgets'] = array();
564
+			if ( empty( $_POST[ 'widgets' ] ) ) {
565
+				$_POST[ 'widgets' ] = array();
566 566
 			}
567
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
567
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
568 568
 
569 569
 		} // end save view configuration
570 570
 
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 		 * @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.
575 575
 		 * @since 1.17.2
576 576
 		 */
577
-		do_action('gravityview_view_saved', $post_id, $statii );
577
+		do_action( 'gravityview_view_saved', $post_id, $statii );
578 578
 
579 579
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
580 580
 	}
@@ -618,20 +618,20 @@  discard block
 block discarded – undo
618 618
 
619 619
 		$output = '';
620 620
 
621
-		if( !empty( $fields ) ) {
621
+		if ( ! empty( $fields ) ) {
622 622
 
623
-			foreach( $fields as $id => $details ) {
623
+			foreach ( $fields as $id => $details ) {
624 624
 
625
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
625
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
626 626
 					continue;
627 627
 				}
628 628
 
629 629
 				// Edit mode only allows editing the parent fields, not single inputs.
630
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
630
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
631 631
 					continue;
632 632
 				}
633 633
 
634
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
634
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
635 635
 
636 636
 			} // End foreach
637 637
 		}
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 		echo $output;
640 640
 
641 641
 		// For the EDIT view we only want to allow the form fields.
642
-		if( $context === 'edit' ) {
642
+		if ( $context === 'edit' ) {
643 643
 			return;
644 644
 		}
645 645
 
@@ -663,16 +663,16 @@  discard block
 block discarded – undo
663 663
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
664 664
 			array(
665 665
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
666
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
666
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
667 667
 				'field_id' => 'all-fields',
668 668
 				'label_type' => 'field',
669 669
 				'input_type' => NULL,
670 670
 				'field_options' => NULL,
671 671
 				'settings_html'	=> NULL,
672 672
 			)
673
-		));
673
+		) );
674 674
 
675
-		if( !empty( $additional_fields )) {
675
+		if ( ! empty( $additional_fields ) ) {
676 676
 			foreach ( (array)$additional_fields as $item ) {
677 677
 
678 678
 				// Prevent items from not having index set
@@ -683,16 +683,16 @@  discard block
 block discarded – undo
683 683
 					'input_type' => NULL,
684 684
 					'field_options' => NULL,
685 685
 					'settings_html'	=> NULL,
686
-				));
686
+				) );
687 687
 
688 688
 				// Backward compat.
689
-				if( !empty( $item['field_options'] ) ) {
689
+				if ( ! empty( $item[ 'field_options' ] ) ) {
690 690
 					// Use settings_html from now on.
691
-					$item['settings_html'] = $item['field_options'];
691
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
692 692
 				}
693 693
 
694 694
 				// Render a label for each of them
695
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
695
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
696 696
 
697 697
 			}
698 698
 		}
@@ -705,54 +705,54 @@  discard block
 block discarded – undo
705 705
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
706 706
 	 * @return array
707 707
 	 */
708
-	function get_entry_default_fields($form, $zone) {
708
+	function get_entry_default_fields( $form, $zone ) {
709 709
 
710 710
 		$entry_default_fields = array();
711 711
 
712
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
712
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
713 713
 
714 714
 			$entry_default_fields = array(
715 715
 				'id' => array(
716
-					'label' => __('Entry ID', 'gravityview'),
716
+					'label' => __( 'Entry ID', 'gravityview' ),
717 717
 					'type' => 'id',
718
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
718
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
719 719
 				),
720 720
 				'date_created' => array(
721
-					'label' => __('Entry Date', 'gravityview'),
722
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
721
+					'label' => __( 'Entry Date', 'gravityview' ),
722
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
723 723
 					'type' => 'date_created',
724 724
 				),
725 725
 				'source_url' => array(
726
-					'label' => __('Source URL', 'gravityview'),
726
+					'label' => __( 'Source URL', 'gravityview' ),
727 727
 					'type' => 'source_url',
728
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
728
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
729 729
 				),
730 730
 				'ip' => array(
731
-					'label' => __('User IP', 'gravityview'),
731
+					'label' => __( 'User IP', 'gravityview' ),
732 732
 					'type' => 'ip',
733
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
733
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
734 734
 				),
735 735
 				'created_by' => array(
736
-					'label' => __('User', 'gravityview'),
736
+					'label' => __( 'User', 'gravityview' ),
737 737
 					'type' => 'created_by',
738
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
738
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
739 739
 				),
740 740
 
741 741
 				/**
742 742
 				 * @since 1.7.2
743 743
 				 */
744 744
 			    'other_entries' => array(
745
-				    'label'	=> __('Other Entries', 'gravityview'),
745
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
746 746
 				    'type'	=> 'other_entries',
747
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
747
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
748 748
 			    ),
749 749
 	        );
750 750
 
751
-			if( 'single' !== $zone) {
751
+			if ( 'single' !== $zone ) {
752 752
 
753
-				$entry_default_fields['entry_link'] = array(
754
-					'label' => __('Link to Entry', 'gravityview'),
755
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
753
+				$entry_default_fields[ 'entry_link' ] = array(
754
+					'label' => __( 'Link to Entry', 'gravityview' ),
755
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
756 756
 					'type' => 'entry_link',
757 757
 				);
758 758
 			}
@@ -762,10 +762,10 @@  discard block
 block discarded – undo
762 762
 		/**
763 763
 		 * @since  1.2
764 764
 		 */
765
-		$entry_default_fields['custom']	= array(
766
-			'label'	=> __('Custom Content', 'gravityview'),
765
+		$entry_default_fields[ 'custom' ] = array(
766
+			'label'	=> __( 'Custom Content', 'gravityview' ),
767 767
 			'type'	=> 'custom',
768
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
768
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
769 769
 		);
770 770
 
771 771
 		/**
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 		 * @param  string|array $form form_ID or form object
775 775
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
776 776
 		 */
777
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
777
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
778 778
 	}
779 779
 
780 780
 	/**
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 	 */
786 786
 	function get_available_fields( $form = '', $zone = NULL ) {
787 787
 
788
-		if( empty( $form ) ) {
788
+		if ( empty( $form ) ) {
789 789
 			gravityview()->log->error( '$form is empty' );
790 790
 			return array();
791 791
 		}
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 		$fields = gravityview_get_form_fields( $form, true );
795 795
 
796 796
 		// get meta fields ( only if form was already created )
797
-		if( !is_array( $form ) ) {
797
+		if ( ! is_array( $form ) ) {
798 798
 			$meta_fields = gravityview_get_entry_meta( $form );
799 799
 		} else {
800 800
 			$meta_fields = array();
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
 		$fields = $fields + $meta_fields + $default_fields;
808 808
 
809 809
 		// Move Custom Content to top
810
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
810
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
811 811
 
812 812
 		return $fields;
813 813
 	}
@@ -821,11 +821,11 @@  discard block
 block discarded – undo
821 821
 
822 822
 		$widgets = $this->get_registered_widgets();
823 823
 
824
-		if( !empty( $widgets ) ) {
824
+		if ( ! empty( $widgets ) ) {
825 825
 
826
-			foreach( $widgets as $id => $details ) {
826
+			foreach ( $widgets as $id => $details ) {
827 827
 
828
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
828
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
829 829
 
830 830
 			}
831 831
 		}
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
855 855
 		global $post;
856 856
 
857
-		if( $type === 'widget' ) {
857
+		if ( $type === 'widget' ) {
858 858
 			$button_label = __( 'Add Widget', 'gravityview' );
859 859
 		} else {
860 860
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -866,10 +866,10 @@  discard block
 block discarded – undo
866 866
 		$form_id = null;
867 867
 
868 868
 		// if saved values, get available fields to label everyone
869
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
869
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
870 870
 
871
-			if( !empty( $_POST['template_id'] ) ) {
872
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
871
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
872
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
873 873
 			} else {
874 874
 				$form_id = $form = gravityview_get_form_id( $post->ID );
875 875
 			}
@@ -887,44 +887,44 @@  discard block
 block discarded – undo
887 887
 			}
888 888
 		}
889 889
 
890
-		foreach( $rows as $row ) :
891
-			foreach( $row as $col => $areas ) :
892
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
890
+		foreach ( $rows as $row ) :
891
+			foreach ( $row as $col => $areas ) :
892
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
893 893
 
894 894
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
895 895
 
896
-					<?php foreach( $areas as $area ) : 	?>
896
+					<?php foreach ( $areas as $area ) : 	?>
897 897
 
898
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
899
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
898
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
899
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
900 900
 
901 901
 								<?php // render saved fields
902 902
 
903
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
903
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
904 904
 
905
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
905
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
906 906
 
907 907
 										// Maybe has a form ID
908
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
908
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
909 909
 
910 910
 										$input_type = NULL;
911 911
 
912 912
 										if ( $form_id ) {
913
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
913
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
914 914
                                         } else {
915
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
915
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
916 916
                                         }
917 917
 
918
-										if ( !$original_item ) {
919
-											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 ) ) );
918
+										if ( ! $original_item ) {
919
+											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 ) ) );
920 920
 
921 921
 											$original_item = $field;
922 922
 										} else {
923
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
923
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
924 924
 										}
925 925
 
926 926
 										// Field options dialog box
927
-										$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 );
927
+										$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 );
928 928
 
929 929
 										$item = array(
930 930
 											'input_type' => $input_type,
@@ -937,23 +937,23 @@  discard block
 block discarded – undo
937 937
 											$item = wp_parse_args( $item, $original_item );
938 938
 										}
939 939
 
940
-										switch( $type ) {
940
+										switch ( $type ) {
941 941
 											case 'widget':
942
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
942
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
943 943
 												break;
944 944
 											default:
945
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
945
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
946 946
 										}
947 947
 									}
948 948
 
949 949
 								} // End if zone is not empty ?>
950 950
 
951
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
951
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
952 952
 							</div>
953 953
 							<div class="gv-droppable-area-action">
954
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
954
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
955 955
 
956
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
956
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
957 957
 							</div>
958 958
 						</div>
959 959
 
@@ -975,7 +975,7 @@  discard block
 block discarded – undo
975 975
 		$default_widget_areas = GravityView_Widget::get_default_widget_areas();
976 976
 
977 977
 		$widgets = array();
978
-		if( !empty( $post_id ) ) {
978
+		if ( ! empty( $post_id ) ) {
979 979
 			$widgets = gravityview_get_directory_widgets( $post_id );
980 980
 		}
981 981
 
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
 		// list of available fields to be shown in the popup
1009 1009
 		$forms = gravityview_get_forms( 'any' );
1010 1010
 
1011
-		$form_ids = array_map( function ($form) { return $form['id']; }, $forms);
1011
+		$form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms );
1012 1012
 
1013 1013
 		foreach ( $form_ids as $form_id ) {
1014 1014
 			$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id );
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
                 </div>
1022 1022
 
1023 1023
                 <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox">
1024
-                <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?>
1024
+                <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?>
1025 1025
                 </div>
1026 1026
 
1027 1027
                 <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div>
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
 	 * @return string HTML of the active areas
1041 1041
 	 */
1042 1042
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1043
-		if( empty( $template_id ) ) {
1043
+		if ( empty( $template_id ) ) {
1044 1044
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1045 1045
 			return '';
1046 1046
 		}
@@ -1054,12 +1054,12 @@  discard block
 block discarded – undo
1054 1054
 		 */
1055 1055
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1056 1056
 
1057
-		if( empty( $template_areas ) ) {
1057
+		if ( empty( $template_areas ) ) {
1058 1058
 
1059 1059
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1060 1060
 			$output = '<div>';
1061
-			$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>';
1062
-			$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>';
1061
+			$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>';
1062
+			$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>';
1063 1063
 			$output .= '</div>';
1064 1064
 		} else {
1065 1065
 
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
 
1075 1075
 		}
1076 1076
 
1077
-		if( $echo ) {
1077
+		if ( $echo ) {
1078 1078
 			echo $output;
1079 1079
 		}
1080 1080
 
@@ -1094,26 +1094,26 @@  discard block
 block discarded – undo
1094 1094
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1095 1095
 
1096 1096
 		// Add the GV font (with the Astronaut)
1097
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
1097
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
1098 1098
 
1099
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
1099
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1100 1100
 
1101 1101
 		// Don't process any scripts below here if it's not a GravityView page.
1102
-		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1102
+		if ( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1103 1103
 		    return;
1104 1104
 		}
1105 1105
 
1106 1106
         wp_enqueue_script( 'jquery-ui-datepicker' );
1107
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1107
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
1108 1108
 
1109
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1109
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1110 1110
 
1111 1111
         //enqueue scripts
1112 1112
         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' ), GravityView_Plugin::version );
1113 1113
 
1114
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1114
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1115 1115
             'cookiepath' => COOKIEPATH,
1116
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1116
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1117 1117
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1118 1118
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1119 1119
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1125,9 +1125,9 @@  discard block
 block discarded – undo
1125 1125
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1126 1126
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1127 1127
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1128
-        ));
1128
+        ) );
1129 1129
 
1130
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1130
+        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1131 1131
 
1132 1132
         // Enqueue scripts needed for merge tags
1133 1133
         self::enqueue_gravity_forms_scripts();
@@ -1152,7 +1152,7 @@  discard block
 block discarded – undo
1152 1152
 		);
1153 1153
 
1154 1154
 		if ( wp_is_mobile() ) {
1155
-		    $scripts[] = 'jquery-touch-punch';
1155
+		    $scripts[ ] = 'jquery-touch-punch';
1156 1156
 		}
1157 1157
 
1158 1158
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	// If there's an overriding CSS file in the current template folder, use it.
33 33
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
34 34
 
35
-	if( file_exists( $template_css_path ) ) {
35
+	if ( file_exists( $template_css_path ) ) {
36 36
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
37 37
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
38 38
 	} else {
39 39
 		// Default: use GravityView CSS file
40 40
 
41 41
 		// If no path is provided, assume default plugin templates CSS folder
42
-		if( '' === $dir_path ) {
42
+		if ( '' === $dir_path ) {
43 43
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
44 44
 		}
45 45
 		
46 46
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
47
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
47
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
48 48
 	}
49 49
 
50 50
 	return $path;
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 
83 83
 	$parsed_permalink = parse_url( get_permalink( $id ) );
84 84
 
85
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
85
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
86 86
 
87
-	if( empty( $permalink_args ) ) {
87
+	if ( empty( $permalink_args ) ) {
88 88
 		return array();
89 89
 	}
90 90
 
@@ -109,15 +109,15 @@  discard block
 block discarded – undo
109 109
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
110 110
 
111 111
 	$output = '';
112
-	if( is_array( $current ) ) {
113
-		if( in_array( $value, $current ) ) {
112
+	if ( is_array( $current ) ) {
113
+		if ( in_array( $value, $current ) ) {
114 114
 			$output = __checked_selected_helper( true, true, false, $type );
115 115
 		}
116 116
 	} else {
117 117
 		$output = __checked_selected_helper( $value, $current, false, $type );
118 118
 	}
119 119
 
120
-	if( $echo ) {
120
+	if ( $echo ) {
121 121
 		echo $output;
122 122
 	}
123 123
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 }
126 126
 
127 127
 
128
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
128
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
129 129
 
130 130
 	/**
131 131
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
  */
172 172
 function gravityview_strip_whitespace( $string ) {
173 173
 	$string = normalize_whitespace( $string );
174
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
174
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
175 175
 }
176 176
 
177 177
 /**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  * @return string Included file contents
186 186
  */
187 187
 function gravityview_ob_include( $file_path, $object = NULL ) {
188
-	if( ! file_exists( $file_path ) ) {
188
+	if ( ! file_exists( $file_path ) ) {
189 189
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
190 190
 		return '';
191 191
 	}
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
 	$width = $height * 0.7586206897;
211 211
 
212
-	if( function_exists('is_rtl') && is_rtl() ) {
212
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
213 213
 		$style = 'margin:10px 10px 10px 0;';
214 214
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
215 215
 	} else {
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
218 218
 	}
219 219
 
220
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
220
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
221 221
 }
222 222
 
223 223
 /**
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
 function gravityview_number_format( $number, $decimals = '' ) {
241 241
 	global $wp_locale;
242 242
 
243
-	if( '' === $decimals ) {
243
+	if ( '' === $decimals ) {
244 244
 
245
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
245
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
246 246
 
247 247
 		/**
248 248
 		 * Calculate the position of the decimal point in the number
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 	$parts = parse_url( $value );
272 272
 
273 273
 	// No domain? Strange...show the original text.
274
-	if( empty( $parts['host'] ) ) {
274
+	if ( empty( $parts[ 'host' ] ) ) {
275 275
 		return $value;
276 276
 	}
277 277
 
@@ -284,16 +284,16 @@  discard block
 block discarded – undo
284 284
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
285 285
 	 * If true: `http://example.com => example.com`
286 286
 	 */
287
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
287
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
288 288
 
289
-		if( isset( $parts['scheme'] ) ) {
290
-			$return .= $parts['scheme'];
289
+		if ( isset( $parts[ 'scheme' ] ) ) {
290
+			$return .= $parts[ 'scheme' ];
291 291
 		}
292 292
 
293 293
 	}
294 294
 
295 295
 	// The domain, which may contain a subdomain
296
-	$domain = $parts['host'];
296
+	$domain = $parts[ 'host' ];
297 297
 
298 298
 	/**
299 299
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -301,10 +301,10 @@  discard block
 block discarded – undo
301 301
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
302 302
 	 * If true: `www.example.com => example.com`
303 303
 	 */
304
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
304
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
305 305
 
306
-	if( $strip_www ) {
307
-		$domain = str_replace('www.', '', $domain );
306
+	if ( $strip_www ) {
307
+		$domain = str_replace( 'www.', '', $domain );
308 308
 	}
309 309
 
310 310
 	/**
@@ -314,11 +314,11 @@  discard block
 block discarded – undo
314 314
 	 * If true: `http://demo.example.com => example.com` \n
315 315
 	 * If false: `http://demo.example.com => demo.example.com`
316 316
 	 */
317
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
317
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
318 318
 
319
-	if( $strip_subdomains ) {
319
+	if ( $strip_subdomains ) {
320 320
 
321
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
321
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
322 322
 
323 323
 	}
324 324
 
@@ -332,12 +332,12 @@  discard block
 block discarded – undo
332 332
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
333 333
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
334 334
 	 */
335
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
335
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
336 336
 
337
-	if( empty( $root_only ) ) {
337
+	if ( empty( $root_only ) ) {
338 338
 
339
-		if( isset( $parts['path'] ) ) {
340
-			$return .= $parts['path'];
339
+		if ( isset( $parts[ 'path' ] ) ) {
340
+			$return .= $parts[ 'path' ];
341 341
 		}
342 342
 	}
343 343
 
@@ -347,12 +347,12 @@  discard block
 block discarded – undo
347 347
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
348 348
 	 * If true: `http://example.com/?query=example => example.com`
349 349
 	 */
350
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
350
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
351 351
 
352
-	if( empty( $strip_query_string ) ) {
352
+	if ( empty( $strip_query_string ) ) {
353 353
 
354
-		if( isset( $parts['query'] ) ) {
355
-			$return .= '?'.$parts['query'];
354
+		if ( isset( $parts[ 'query' ] ) ) {
355
+			$return .= '?' . $parts[ 'query' ];
356 356
 		}
357 357
 
358 358
 	}
@@ -369,8 +369,8 @@  discard block
 block discarded – undo
369 369
  */
370 370
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
371 371
 
372
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
373
-		return $matches['domain'];
372
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
373
+		return $matches[ 'domain' ];
374 374
 	} else {
375 375
 		return $string_maybe_has_subdomain;
376 376
 	}
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 
440 440
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
441 441
 			$value = true;
442
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
442
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
443 443
 			$value = false;
444 444
 		}
445 445
 	}
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
  */
469 469
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
470 470
 
471
-	if( ! is_string( $value ) ) {
471
+	if ( ! is_string( $value ) ) {
472 472
 		return $value;
473 473
 	}
474 474
 
@@ -479,12 +479,12 @@  discard block
 block discarded – undo
479 479
 	}
480 480
 
481 481
 	// There was a JSON error (PHP 5.3+)
482
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
482
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
483 483
 		return $value;
484 484
 	}
485 485
 
486 486
 	// It wasn't JSON (PHP < 5.3 fallback)
487
-	if( is_null( $decoded ) ) {
487
+	if ( is_null( $decoded ) ) {
488 488
 		return $value;
489 489
 	}
490 490
 
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 
508 508
 	// Use the original function, if exists.
509 509
 	// Requires WP 4.4+
510
-	if( function_exists( 'map_deep') ) {
510
+	if ( function_exists( 'map_deep' ) ) {
511 511
 		return map_deep( $value, $callback );
512 512
 	}
513 513
 
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 
573 573
 	$exploded = explode( '.', "{$field_id}" );
574 574
 
575
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
575
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
576 576
 }
577 577
 
578 578
 /**
@@ -613,13 +613,13 @@  discard block
 block discarded – undo
613 613
 	 */
614 614
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
615 615
 
616
-	$terms = get_terms( $args['taxonomy'], $args );
616
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
617 617
 
618 618
 	$choices = array();
619 619
 
620 620
 	if ( is_array( $terms ) ) {
621 621
 		foreach ( $terms as $term_id => $term_name ) {
622
-			$choices[] = array(
622
+			$choices[ ] = array(
623 623
 				'text'  => $term_name,
624 624
 				'value' => $term_id
625 625
 			);
@@ -643,21 +643,21 @@  discard block
 block discarded – undo
643 643
 function _gravityview_process_posted_fields() {
644 644
 	$fields = array();
645 645
 
646
-	if( !empty( $_POST['gv_fields'] ) ) {
647
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
646
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
647
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
648 648
 
649 649
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
650 650
 			$fields_holder = array();
651
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
651
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
652 652
 
653
-			if ( isset( $fields_holder['fields'] ) ) {
654
-				$fields = $fields_holder['fields'];
653
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
654
+				$fields = $fields_holder[ 'fields' ];
655 655
 			} else {
656 656
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
657 657
 			}
658 658
 
659 659
 		} else {
660
-			$fields = $_POST['gv_fields'];
660
+			$fields = $_POST[ 'gv_fields' ];
661 661
 		}
662 662
 	}
663 663
 
Please login to merge, or discard this patch.