Completed
Pull Request — master (#1044)
by Zack
24:05 queued 20:03
created
includes/class-gravityview-merge-tags.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
80 80
 
81
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
81
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
82 82
 		}
83 83
 
84 84
 		foreach ( $modifiers as $passed_modifier ) {
85 85
 
86
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
86
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
87 87
 
88 88
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
89 89
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	private static function modifier_timestamp( $raw_value, $matches ) {
134 134
 
135
-		if( empty( $matches[0] ) ) {
135
+		if ( empty( $matches[ 0 ] ) ) {
136 136
 			return $raw_value;
137 137
 		}
138 138
 
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
163 163
 
164
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
164
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
165 165
 			return $raw_value;
166 166
 		}
167 167
 
168
-		$max = intval( $matches[1] );
168
+		$max = intval( $matches[ 1 ] );
169 169
 
170 170
 		$more_placeholder = '[GVMORE]';
171 171
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
235 235
 
236 236
 		// For JSON-encoded arrays
237
-		if( $json_array = json_decode( $raw_value, true ) ) {
237
+		if ( $json_array = json_decode( $raw_value, true ) ) {
238 238
 			return implode( ' ', $json_array );
239 239
 		}
240 240
 
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
257 257
 
258
-		if( empty( $matches[0] ) ) {
258
+		if ( empty( $matches[ 0 ] ) ) {
259 259
 			return $raw_value;
260 260
 		}
261 261
 
262 262
 		$return = $raw_value;
263 263
 
264
-		switch( $matches[0] ) {
264
+		switch ( $matches[ 0 ] ) {
265 265
 			case 'urlencode':
266 266
 				$return = urlencode( $raw_value );
267 267
 				break;
@@ -343,9 +343,9 @@  discard block
 block discarded – undo
343 343
 		 * @internal Fixed $form['title'] in Gravity Forms
344 344
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
345 345
 		 */
346
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
347
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
348
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
346
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
347
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
348
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
349 349
 
350 350
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
351 351
 	}
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
407 407
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
408 408
 
409
-		if( empty( $matches ) ) {
409
+		if ( empty( $matches ) ) {
410 410
 			return $original_text;
411 411
 		}
412 412
 
@@ -427,18 +427,18 @@  discard block
 block discarded – undo
427 427
 		 * }
428 428
 		 */
429 429
 		foreach ( $matches as $match ) {
430
-			$full_tag = $match[0];
430
+			$full_tag = $match[ 0 ];
431 431
 
432 432
 			$link_args = array(
433 433
 				'return' => 'url',
434
-				'entry_id' => $entry['id'],
434
+				'entry_id' => $entry[ 'id' ],
435 435
 				'post_id' => \GV\Utils::get( $match, 1, null ),
436 436
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
437 437
 			);
438 438
 
439 439
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
440 440
 
441
-			if( $url_encode ) {
441
+			if ( $url_encode ) {
442 442
 				$entry_link = urlencode( $entry_link );
443 443
 			}
444 444
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
476 476
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
477 477
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
478
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
478
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
479 479
 		);
480 480
 
481 481
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -552,8 +552,8 @@  discard block
 block discarded – undo
552 552
 			return $original_text;
553 553
 		}
554 554
 
555
-		foreach ( (array) $matches as $match ) {
556
-			$full_tag = $match[0];
555
+		foreach ( (array)$matches as $match ) {
556
+			$full_tag = $match[ 0 ];
557 557
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
558 558
 
559 559
 			$replacement = false;
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 					$replacement = esc_html( $replacement );
572 572
 				}
573 573
 
574
-				if( $url_encode ) {
574
+				if ( $url_encode ) {
575 575
 					$replacement = urlencode( $replacement );
576 576
 				}
577 577
 
@@ -611,14 +611,14 @@  discard block
 block discarded – undo
611 611
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
612 612
 
613 613
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
614
-		if( empty( $matches ) ) {
614
+		if ( empty( $matches ) ) {
615 615
 			return $text;
616 616
 		}
617 617
 
618 618
 		foreach ( $matches as $match ) {
619 619
 
620
-			$full_tag = $match[0];
621
-			$property = $match[1];
620
+			$full_tag = $match[ 0 ];
621
+			$property = $match[ 1 ];
622 622
 
623 623
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
624 624
 
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
 			 * @since 1.15
643 643
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
644 644
 			 */
645
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
645
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
646 646
 
647 647
 			$value = $esc_html ? esc_html( $value ) : $value;
648 648
 
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 			 * @param[in] array $form Gravity Forms form array
654 654
 			 * @param[in] array $entry Entry array
655 655
 			 */
656
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
656
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
657 657
 
658 658
 			$text = str_replace( $full_tag, $value, $text );
659 659
 		}
Please login to merge, or discard this patch.
includes/class-cache.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		/**
82 82
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
83 83
 		 */
84
-		foreach( $this->lead_db_columns as $column ) {
84
+		foreach ( $this->lead_db_columns as $column ) {
85 85
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
86 86
 		}
87 87
 
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 			return;
115 115
 		}
116 116
 
117
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
117
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
118 118
 
119
-		$this->blacklist_add( $entry['form_id'] );
119
+		$this->blacklist_add( $entry[ 'form_id' ] );
120 120
 	}
121 121
 
122 122
 	/**
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 	 */
130 130
 	public function entry_updated( $form, $lead_id ) {
131 131
 
132
-		gravityview()->log->debug(' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form['id'], 'entry_id' => $lead_id ) );
132
+		gravityview()->log->debug( ' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ) );
133 133
 
134
-		$this->blacklist_add( $form['id'] );
134
+		$this->blacklist_add( $form[ 'id' ] );
135 135
 	}
136 136
 
137 137
 	/**
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function entry_created( $entry, $form ) {
148 148
 
149
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
149
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
150 150
 
151
-		$this->blacklist_add( $form['id'] );
151
+		$this->blacklist_add( $form[ 'id' ] );
152 152
 	}
153 153
 
154 154
 	/**
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 			return;
165 165
 		}
166 166
 
167
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
167
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
168 168
 
169
-		$this->blacklist_add( $form['id'] );
169
+		$this->blacklist_add( $form[ 'id' ] );
170 170
 	}
171 171
 
172 172
 	/**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 		// Normally just one form, but supports multiple forms
186 186
 		//
187 187
 		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
188
-		$forms = 'f:' . implode( '-f:', (array) $form_ids );
188
+		$forms = 'f:' . implode( '-f:', (array)$form_ids );
189 189
 
190 190
 		// Prefix for transient keys
191 191
 		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		) ) );
243 243
 
244 244
 		// Add the passed form IDs
245
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
245
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
246 246
 
247 247
 		// Don't duplicate
248 248
 		$blacklist = array_unique( $blacklist );
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 
266 266
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
267 267
 
268
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
268
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
269 269
 
270 270
 		gravityview()->log->debug( 'Removing form IDs from cache blacklist', array( 'data' => array(
271 271
 			'$form_ids'     => $form_ids,
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			return false;
299 299
 		}
300 300
 
301
-		foreach ( (array) $form_ids as $form_id ) {
301
+		foreach ( (array)$form_ids as $form_id ) {
302 302
 
303 303
 			if ( in_array( $form_id, $blacklist ) ) {
304 304
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
371 371
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
372 372
 			 */
373
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
373
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
374 374
 
375 375
 			gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', array( 'key' => $this->key, 'cache_time' => $cache_time ) );
376 376
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 			return;
407 407
 		}
408 408
 
409
-		foreach ( (array) $form_ids as $form_id ) {
409
+		foreach ( (array)$form_ids as $form_id ) {
410 410
 
411 411
 			$key = '_transient_gv-cache-';
412 412
 
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
 	public function use_cache() {
523 523
 
524 524
 		// Exit early if debugging (unless running PHPUnit)
525
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined('DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
525
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
526 526
 			return apply_filters( 'gravityview_use_cache', false, $this );
527 527
 		}
528 528
 
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
 
531 531
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
532 532
 
533
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
533
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
534 534
 
535 535
 				gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' );
536 536
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 		 */
558 558
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
559 559
 
560
-		return (boolean) $use_cache;
560
+		return (boolean)$use_cache;
561 561
 	}
562 562
 
563 563
 }
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +180 added lines, -180 removed lines patch added patch discarded remove patch
@@ -28,30 +28,30 @@  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_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 );
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_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 
54
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
54
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
55 55
 
56 56
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
57 57
 
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
73
+	    if ( ! gravityview()->request->is_view() ) {
74 74
 	        return $localization_data;
75 75
         }
76 76
 
77
-		$localization_data['suggest'] = array(
77
+		$localization_data[ 'suggest' ] = array(
78 78
             '57ef23539033602e61d4a560',
79 79
             '54c67bb9e4b0512429885513',
80 80
             '54c67bb9e4b0512429885512',
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
96 96
 		global $pagenow;
97 97
 
98
-		if ( !is_admin() ) {
98
+		if ( ! is_admin() ) {
99 99
 			return;
100 100
 		}
101 101
 
102
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
102
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
103 103
 
104
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
104
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -118,18 +118,18 @@  discard block
 block discarded – undo
118 118
 	function add_view_dropdown() {
119 119
 		$current_screen = get_current_screen();
120 120
 
121
-		if( 'gravityview' !== $current_screen->post_type ) {
121
+		if ( 'gravityview' !== $current_screen->post_type ) {
122 122
 			return;
123 123
 		}
124 124
 
125 125
 		$forms = gravityview_get_forms();
126 126
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
127 127
 		// If there are no forms to select, show no forms.
128
-		if( !empty( $forms ) ) { ?>
128
+		if ( ! empty( $forms ) ) { ?>
129 129
 			<select name="gravityview_form_id" id="gravityview_form_id">
130 130
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
131
-				<?php foreach( $forms as $form ) { ?>
132
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
131
+				<?php foreach ( $forms as $form ) { ?>
132
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
133 133
 				<?php } ?>
134 134
 			</select>
135 135
 		<?php }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
144 144
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
145
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
145
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
146 146
 	}
147 147
 
148 148
 	/**
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 
166 166
 		$connected_views = gravityview_get_connected_views( $id, array( 'post_status' => 'any' ) );
167 167
 
168
-		if( empty( $connected_views ) ) {
168
+		if ( empty( $connected_views ) ) {
169 169
 
170
-		    $menu_items['gravityview'] = array(
170
+		    $menu_items[ 'gravityview' ] = array(
171 171
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
172 172
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
173 173
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -183,22 +183,22 @@  discard block
 block discarded – undo
183 183
 		$sub_menu_items = array();
184 184
 		foreach ( (array)$connected_views as $view ) {
185 185
 
186
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
186
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
187 187
 				continue;
188 188
 			}
189 189
 
190
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
190
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
191 191
 
192
-			$sub_menu_items[] = array(
192
+			$sub_menu_items[ ] = array(
193 193
 				'label' => esc_attr( $label ),
194
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
194
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
195 195
 			);
196 196
 		}
197 197
 
198 198
 		// If there were no items added, then let's create the parent menu
199
-		if( $sub_menu_items ) {
199
+		if ( $sub_menu_items ) {
200 200
 
201
-		    $sub_menu_items[] = array(
201
+		    $sub_menu_items[ ] = array(
202 202
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
203 203
                 'link_class' => 'gv-create-view',
204 204
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -207,14 +207,14 @@  discard block
 block discarded – undo
207 207
             );
208 208
 
209 209
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
210
-			$sub_menu_items[] = array(
210
+			$sub_menu_items[ ] = array(
211 211
 				'url' => '#',
212 212
 				'label' => '',
213 213
 				'menu_class' => 'hidden',
214 214
 				'capabilities' => '',
215 215
 			);
216 216
 
217
-			$menu_items['gravityview'] = array(
217
+			$menu_items[ 'gravityview' ] = array(
218 218
 				'label'          => __( 'Connected Views', 'gravityview' ),
219 219
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
220 220
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -243,8 +243,8 @@  discard block
 block discarded – undo
243 243
 		$add = array( 'captcha', 'page' );
244 244
 
245 245
 		// Don't allowing editing the following values:
246
-		if( $context === 'edit' ) {
247
-			$add[] = 'post_id';
246
+		if ( $context === 'edit' ) {
247
+			$add[ ] = 'post_id';
248 248
 		}
249 249
 
250 250
 		$return = array_merge( $array, $add );
@@ -267,32 +267,32 @@  discard block
 block discarded – undo
267 267
 		foreach ( $default_args as $key => $arg ) {
268 268
 
269 269
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
270
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
270
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
271 271
 
272 272
 			// By default, use `tooltip` if defined.
273
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
273
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
274 274
 
275 275
 			// Otherwise, use the description as a tooltip.
276
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
277
-				$tooltip = $arg['desc'];
276
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
277
+				$tooltip = $arg[ 'desc' ];
278 278
 			}
279 279
 
280 280
 			// If there's no tooltip set, continue
281
-			if( empty( $tooltip ) ) {
281
+			if ( empty( $tooltip ) ) {
282 282
 				continue;
283 283
 			}
284 284
 
285 285
 			// Add the tooltip
286
-			$gv_tooltips[ 'gv_'.$key ] = array(
287
-				'title'	=> $arg['label'],
286
+			$gv_tooltips[ 'gv_' . $key ] = array(
287
+				'title'	=> $arg[ 'label' ],
288 288
 				'value'	=> $tooltip,
289 289
 			);
290 290
 
291 291
 		}
292 292
 
293
-		$gv_tooltips['gv_css_merge_tags'] = array(
294
-			'title' => __('CSS Merge Tags', 'gravityview'),
295
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
293
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
294
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
295
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
296 296
 		);
297 297
 
298 298
 		/**
@@ -310,9 +310,9 @@  discard block
 block discarded – undo
310 310
 
311 311
 		foreach ( $gv_tooltips as $key => $tooltip ) {
312 312
 
313
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
313
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
314 314
 
315
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
315
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
316 316
 		}
317 317
 
318 318
 		return $tooltips;
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 	 *
327 327
 	 * @return void
328 328
 	 */
329
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
329
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
330 330
 
331 331
 		$output = '';
332 332
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
349 349
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
350 350
 
351
-				$output = $template ? $template['label'] : $template_id_pretty;
351
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
352 352
 
353 353
 				break;
354 354
 
@@ -389,44 +389,44 @@  discard block
 block discarded – undo
389 389
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
390 390
 
391 391
 		// Either the form is empty or the form ID is 0, not yet set.
392
-		if( empty( $form ) ) {
392
+		if ( empty( $form ) ) {
393 393
 			return '';
394 394
 		}
395 395
 
396 396
 		// The $form is passed as the form ID
397
-		if( !is_array( $form ) ) {
397
+		if ( ! is_array( $form ) ) {
398 398
 			$form = gravityview_get_form( $form );
399 399
 		}
400 400
 
401
-		$form_id = $form['id'];
401
+		$form_id = $form[ 'id' ];
402 402
 		$links = array();
403 403
 
404
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
404
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
405 405
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
406
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
407
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
406
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
407
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
408 408
 		} else {
409
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
409
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
410 410
 		}
411 411
 
412
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
412
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
413 413
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
414
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
414
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
415 415
 		}
416 416
 
417
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
417
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
418 418
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
419
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
419
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
420 420
 		}
421 421
 
422
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
422
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
423 423
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
424
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
424
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
425 425
 		}
426 426
 
427 427
 		$output = '';
428 428
 
429
-		if( !empty( $include_form_link ) ) {
429
+		if ( ! empty( $include_form_link ) ) {
430 430
 			$output .= $form_link;
431 431
 		}
432 432
 
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 		 */
439 439
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
440 440
 
441
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
441
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
442 442
 
443 443
 		return $output;
444 444
 	}
@@ -452,8 +452,8 @@  discard block
 block discarded – undo
452 452
 		// Get the date column and save it for later to add back in.
453 453
 		// This adds it after the Data Source column.
454 454
 		// This way, we don't need to do array_slice, array_merge, etc.
455
-		$date = $columns['date'];
456
-		unset( $columns['date'] );
455
+		$date = $columns[ 'date' ];
456
+		unset( $columns[ 'date' ] );
457 457
 
458 458
 		$data_source_required_caps = array(
459 459
 			'gravityforms_edit_forms',
@@ -464,14 +464,14 @@  discard block
 block discarded – undo
464 464
 			'gravityforms_preview_forms',
465 465
 		);
466 466
 
467
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
468
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
467
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
468
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
469 469
 		}
470 470
 
471
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
471
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
472 472
 
473 473
 		// Add the date back in.
474
-		$columns['date'] = $date;
474
+		$columns[ 'date' ] = $date;
475 475
 
476 476
 		return $columns;
477 477
 	}
@@ -485,12 +485,12 @@  discard block
 block discarded – undo
485 485
 	 */
486 486
 	function save_postdata( $post_id ) {
487 487
 
488
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
488
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
489 489
 			return;
490 490
 		}
491 491
 
492 492
 		// validate post_type
493
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
493
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
494 494
 			return;
495 495
 		}
496 496
 
@@ -505,63 +505,63 @@  discard block
 block discarded – undo
505 505
 		$statii = array();
506 506
 
507 507
 		// check if this is a start fresh View
508
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
508
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
509 509
 
510
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
510
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
511 511
 			// save form id
512
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
512
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
513 513
 
514 514
 		}
515 515
 
516
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
516
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
517 517
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
518 518
 			return;
519 519
 		}
520 520
 
521 521
 		// Was this a start fresh?
522
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
523
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
522
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
523
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
524 524
 		} else {
525
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
525
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
526 526
 		}
527 527
 
528 528
 		// Check if we have a template id
529
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
529
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
530 530
 
531
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
531
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
532 532
 
533 533
 			// now save template id
534
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
534
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
535 535
 		}
536 536
 
537 537
 
538 538
 		// save View Configuration metabox
539
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
539
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
540 540
 
541 541
 			// template settings
542
-			if( empty( $_POST['template_settings'] ) ) {
543
-				$_POST['template_settings'] = array();
542
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
543
+				$_POST[ 'template_settings' ] = array();
544 544
 			}
545
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
545
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
546 546
 
547 547
 			$fields = array();
548 548
 
549 549
 			// Directory&single Visible Fields
550
-			if( !empty( $preset_fields ) ) {
550
+			if ( ! empty( $preset_fields ) ) {
551 551
 
552 552
 				$fields = $preset_fields;
553 553
 
554
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
554
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
555 555
 				$fields = _gravityview_process_posted_fields();
556 556
 			}
557 557
 
558
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
558
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
559 559
 
560 560
 			// Directory Visible Widgets
561
-			if( empty( $_POST['widgets'] ) ) {
562
-				$_POST['widgets'] = array();
561
+			if ( empty( $_POST[ 'widgets' ] ) ) {
562
+				$_POST[ 'widgets' ] = array();
563 563
 			}
564
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
564
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
565 565
 
566 566
 		} // end save view configuration
567 567
 
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 		 * @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.
572 572
 		 * @since 1.17.2
573 573
 		 */
574
-		do_action('gravityview_view_saved', $post_id, $statii );
574
+		do_action( 'gravityview_view_saved', $post_id, $statii );
575 575
 
576 576
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
577 577
 	}
@@ -615,20 +615,20 @@  discard block
 block discarded – undo
615 615
 
616 616
 		$output = '';
617 617
 
618
-		if( !empty( $fields ) ) {
618
+		if ( ! empty( $fields ) ) {
619 619
 
620
-			foreach( $fields as $id => $details ) {
620
+			foreach ( $fields as $id => $details ) {
621 621
 
622
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
622
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
623 623
 					continue;
624 624
 				}
625 625
 
626 626
 				// Edit mode only allows editing the parent fields, not single inputs.
627
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
627
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
628 628
 					continue;
629 629
 				}
630 630
 
631
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
631
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
632 632
 
633 633
 			} // End foreach
634 634
 		}
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 		echo $output;
637 637
 
638 638
 		// For the EDIT view we only want to allow the form fields.
639
-		if( $context === 'edit' ) {
639
+		if ( $context === 'edit' ) {
640 640
 			return;
641 641
 		}
642 642
 
@@ -660,16 +660,16 @@  discard block
 block discarded – undo
660 660
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
661 661
 			array(
662 662
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
663
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
663
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
664 664
 				'field_id' => 'all-fields',
665 665
 				'label_type' => 'field',
666 666
 				'input_type' => NULL,
667 667
 				'field_options' => NULL,
668 668
 				'settings_html'	=> NULL,
669 669
 			)
670
-		));
670
+		) );
671 671
 
672
-		if( !empty( $additional_fields )) {
672
+		if ( ! empty( $additional_fields ) ) {
673 673
 			foreach ( (array)$additional_fields as $item ) {
674 674
 
675 675
 				// Prevent items from not having index set
@@ -680,16 +680,16 @@  discard block
 block discarded – undo
680 680
 					'input_type' => NULL,
681 681
 					'field_options' => NULL,
682 682
 					'settings_html'	=> NULL,
683
-				));
683
+				) );
684 684
 
685 685
 				// Backward compat.
686
-				if( !empty( $item['field_options'] ) ) {
686
+				if ( ! empty( $item[ 'field_options' ] ) ) {
687 687
 					// Use settings_html from now on.
688
-					$item['settings_html'] = $item['field_options'];
688
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
689 689
 				}
690 690
 
691 691
 				// Render a label for each of them
692
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
692
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
693 693
 
694 694
 			}
695 695
 		}
@@ -702,54 +702,54 @@  discard block
 block discarded – undo
702 702
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
703 703
 	 * @return array
704 704
 	 */
705
-	function get_entry_default_fields($form, $zone) {
705
+	function get_entry_default_fields( $form, $zone ) {
706 706
 
707 707
 		$entry_default_fields = array();
708 708
 
709
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
709
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
710 710
 
711 711
 			$entry_default_fields = array(
712 712
 				'id' => array(
713
-					'label' => __('Entry ID', 'gravityview'),
713
+					'label' => __( 'Entry ID', 'gravityview' ),
714 714
 					'type' => 'id',
715
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
715
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
716 716
 				),
717 717
 				'date_created' => array(
718
-					'label' => __('Entry Date', 'gravityview'),
719
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
718
+					'label' => __( 'Entry Date', 'gravityview' ),
719
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
720 720
 					'type' => 'date_created',
721 721
 				),
722 722
 				'source_url' => array(
723
-					'label' => __('Source URL', 'gravityview'),
723
+					'label' => __( 'Source URL', 'gravityview' ),
724 724
 					'type' => 'source_url',
725
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
725
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
726 726
 				),
727 727
 				'ip' => array(
728
-					'label' => __('User IP', 'gravityview'),
728
+					'label' => __( 'User IP', 'gravityview' ),
729 729
 					'type' => 'ip',
730
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
730
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
731 731
 				),
732 732
 				'created_by' => array(
733
-					'label' => __('User', 'gravityview'),
733
+					'label' => __( 'User', 'gravityview' ),
734 734
 					'type' => 'created_by',
735
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
735
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
736 736
 				),
737 737
 
738 738
 				/**
739 739
 				 * @since 1.7.2
740 740
 				 */
741 741
 			    'other_entries' => array(
742
-				    'label'	=> __('Other Entries', 'gravityview'),
742
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
743 743
 				    'type'	=> 'other_entries',
744
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
744
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
745 745
 			    ),
746 746
 	        );
747 747
 
748
-			if( 'single' !== $zone) {
748
+			if ( 'single' !== $zone ) {
749 749
 
750
-				$entry_default_fields['entry_link'] = array(
751
-					'label' => __('Link to Entry', 'gravityview'),
752
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
750
+				$entry_default_fields[ 'entry_link' ] = array(
751
+					'label' => __( 'Link to Entry', 'gravityview' ),
752
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
753 753
 					'type' => 'entry_link',
754 754
 				);
755 755
 			}
@@ -759,10 +759,10 @@  discard block
 block discarded – undo
759 759
 		/**
760 760
 		 * @since  1.2
761 761
 		 */
762
-		$entry_default_fields['custom']	= array(
763
-			'label'	=> __('Custom Content', 'gravityview'),
762
+		$entry_default_fields[ 'custom' ] = array(
763
+			'label'	=> __( 'Custom Content', 'gravityview' ),
764 764
 			'type'	=> 'custom',
765
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
765
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
766 766
 		);
767 767
 
768 768
 		/**
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
 		 * @param  string|array $form form_ID or form object
772 772
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
773 773
 		 */
774
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
774
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
775 775
 	}
776 776
 
777 777
 	/**
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
 	 */
783 783
 	function get_available_fields( $form = '', $zone = NULL ) {
784 784
 
785
-		if( empty( $form ) ) {
785
+		if ( empty( $form ) ) {
786 786
 			gravityview()->log->error( '$form is empty' );
787 787
 			return array();
788 788
 		}
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 		$fields = gravityview_get_form_fields( $form, true );
792 792
 
793 793
 		// get meta fields ( only if form was already created )
794
-		if( !is_array( $form ) ) {
794
+		if ( ! is_array( $form ) ) {
795 795
 			$meta_fields = gravityview_get_entry_meta( $form );
796 796
 		} else {
797 797
 			$meta_fields = array();
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
 		$fields = $fields + $meta_fields + $default_fields;
805 805
 
806 806
 		// Move Custom Content to top
807
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
807
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
808 808
 
809 809
 		return $fields;
810 810
 	}
@@ -818,11 +818,11 @@  discard block
 block discarded – undo
818 818
 
819 819
 		$widgets = $this->get_registered_widgets();
820 820
 
821
-		if( !empty( $widgets ) ) {
821
+		if ( ! empty( $widgets ) ) {
822 822
 
823
-			foreach( $widgets as $id => $details ) {
823
+			foreach ( $widgets as $id => $details ) {
824 824
 
825
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
825
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
826 826
 
827 827
 			}
828 828
 		}
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
852 852
 		global $post;
853 853
 
854
-		if( $type === 'widget' ) {
854
+		if ( $type === 'widget' ) {
855 855
 			$button_label = __( 'Add Widget', 'gravityview' );
856 856
 		} else {
857 857
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -862,15 +862,15 @@  discard block
 block discarded – undo
862 862
 		$view = \GV\View::from_post( $post );
863 863
 
864 864
 		// if saved values, get available fields to label everyone
865
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
865
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
866 866
 
867
-			if( !empty( $_POST['template_id'] ) ) {
868
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
867
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
868
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
869 869
 			} else {
870 870
 				$form = gravityview_get_form_id( $post->ID );
871 871
 			}
872 872
 
873
-			if( 'field' === $type ) {
873
+			if ( 'field' === $type ) {
874 874
 				$available_items = $this->get_available_fields( $form, $zone );
875 875
 			} else {
876 876
 				$available_items = $this->get_registered_widgets();
@@ -878,42 +878,42 @@  discard block
 block discarded – undo
878 878
 
879 879
 		}
880 880
 
881
-		foreach( $rows as $row ) :
882
-			foreach( $row as $col => $areas ) :
883
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
881
+		foreach ( $rows as $row ) :
882
+			foreach ( $row as $col => $areas ) :
883
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
884 884
 
885 885
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
886 886
 
887
-					<?php foreach( $areas as $area ) : 	?>
887
+					<?php foreach ( $areas as $area ) : 	?>
888 888
 
889 889
 						<div class="gv-droppable-area">
890
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
890
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
891 891
 
892 892
 								<?php // render saved fields
893 893
 
894
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
894
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
895 895
 
896
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
896
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
897 897
 
898 898
 										$input_type = NULL;
899
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
899
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
900 900
 
901
-										if( !$original_item ) {
901
+										if ( ! $original_item ) {
902 902
 
903
-											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 ) ) );
903
+											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 ) ) );
904 904
 
905 905
 											$original_item = $field;
906 906
 										} else {
907 907
 
908
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
908
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
909 909
 
910 910
 										}
911 911
 
912 912
 										// Maybe has a form ID
913
-										$form_id = empty( $field['form_id'] ) ? null : $field['form_id'];
913
+										$form_id = empty( $field[ 'form_id' ] ) ? null : $field[ 'form_id' ];
914 914
 
915 915
 										// Field options dialog box
916
-										$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 );
916
+										$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 );
917 917
 
918 918
 										$item = array(
919 919
 											'input_type' => $input_type,
@@ -922,16 +922,16 @@  discard block
 block discarded – undo
922 922
 										);
923 923
 
924 924
 										// Merge the values with the current item to pass things like widget descriptions and original field names
925
-										if( $original_item ) {
925
+										if ( $original_item ) {
926 926
 											$item = wp_parse_args( $item, $original_item );
927 927
 										}
928 928
 
929
-										switch( $type ) {
929
+										switch ( $type ) {
930 930
 											case 'widget':
931
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
931
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
932 932
 												break;
933 933
 											default:
934
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
934
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
935 935
 										}
936 936
 
937 937
 
@@ -941,7 +941,7 @@  discard block
 block discarded – undo
941 941
 
942 942
 								} // End if zone is not empty ?>
943 943
 
944
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
944
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
945 945
 							</div>
946 946
 							<div class="gv-droppable-area-action">
947 947
 								<?php
@@ -951,16 +951,16 @@  discard block
 block discarded – undo
951 951
 												$known_joins = array();
952 952
 												foreach ( $view->joins as $join ) {
953 953
 													if ( ! in_array( $join->join->ID, $known_joins ) ) {
954
-														$known_joins []= $join->join->ID;
954
+														$known_joins [ ] = $join->join->ID;
955 955
 														?>
956
-															<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 esc_attr( $join->join->ID ); ?>"><?php echo '+ '.esc_html( $button_label ); ?> from Form #<?php echo esc_html( $join->join->ID ); ?></a>
956
+															<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 esc_attr( $join->join->ID ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?> from Form #<?php echo esc_html( $join->join->ID ); ?></a>
957 957
 														<?php
958 958
 													}
959 959
 
960 960
 													if ( ! in_array( $join->join_on->ID, $known_joins ) ) {
961
-														$known_joins []= $join->join_on->ID;
961
+														$known_joins [ ] = $join->join_on->ID;
962 962
 														?>
963
-															<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 esc_attr( $join->join_on->ID ); ?>"><?php echo '+ '.esc_html( $button_label ); ?> from Form #<?php echo esc_html( $join->join_on->ID ); ?></a>
963
+															<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 esc_attr( $join->join_on->ID ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?> from Form #<?php echo esc_html( $join->join_on->ID ); ?></a>
964 964
 														<?php
965 965
 													}
966 966
 												}
@@ -968,12 +968,12 @@  discard block
 block discarded – undo
968 968
 										<?php
969 969
 									} else {
970 970
 										?>
971
-											<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>
971
+											<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>
972 972
 										<?php
973 973
 									}
974 974
 								?>
975 975
 
976
-								<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>
976
+								<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>
977 977
 							</div>
978 978
 						</div>
979 979
 
@@ -995,7 +995,7 @@  discard block
 block discarded – undo
995 995
 		$default_widget_areas = GravityView_Widget::get_default_widget_areas();
996 996
 
997 997
 		$widgets = array();
998
-		if( !empty( $post_id ) ) {
998
+		if ( ! empty( $post_id ) ) {
999 999
 			$widgets = gravityview_get_directory_widgets( $post_id );
1000 1000
 		}
1001 1001
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
 	 * @return string HTML of the active areas
1025 1025
 	 */
1026 1026
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1027
-		if( empty( $template_id ) ) {
1027
+		if ( empty( $template_id ) ) {
1028 1028
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1029 1029
 			return '';
1030 1030
 		}
@@ -1038,12 +1038,12 @@  discard block
 block discarded – undo
1038 1038
 		 */
1039 1039
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1040 1040
 
1041
-		if( empty( $template_areas ) ) {
1041
+		if ( empty( $template_areas ) ) {
1042 1042
 
1043 1043
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1044 1044
 			$output = '<div>';
1045
-			$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>';
1046
-			$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>';
1045
+			$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>';
1046
+			$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>';
1047 1047
 			$output .= '</div>';
1048 1048
 		} else {
1049 1049
 
@@ -1058,7 +1058,7 @@  discard block
 block discarded – undo
1058 1058
 
1059 1059
 		}
1060 1060
 
1061
-		if( $echo ) {
1061
+		if ( $echo ) {
1062 1062
 			echo $output;
1063 1063
 		}
1064 1064
 
@@ -1078,26 +1078,26 @@  discard block
 block discarded – undo
1078 1078
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1079 1079
 
1080 1080
 		// Add the GV font (with the Astronaut)
1081
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
1081
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
1082 1082
 
1083
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
1083
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1084 1084
 
1085 1085
 		// Don't process any scripts below here if it's not a GravityView page.
1086
-		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1086
+		if ( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1087 1087
 		    return;
1088 1088
 		}
1089 1089
 
1090 1090
         wp_enqueue_script( 'jquery-ui-datepicker' );
1091
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1091
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
1092 1092
 
1093
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1093
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1094 1094
 
1095 1095
         //enqueue scripts
1096 1096
         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 );
1097 1097
 
1098
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1098
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1099 1099
             'cookiepath' => COOKIEPATH,
1100
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1100
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1101 1101
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1102 1102
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1103 1103
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1109,9 +1109,9 @@  discard block
 block discarded – undo
1109 1109
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1110 1110
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1111 1111
             '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' ),
1112
-        ));
1112
+        ) );
1113 1113
 
1114
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1114
+        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1115 1115
 
1116 1116
         // Enqueue scripts needed for merge tags
1117 1117
         self::enqueue_gravity_forms_scripts();
@@ -1136,7 +1136,7 @@  discard block
 block discarded – undo
1136 1136
 		);
1137 1137
 
1138 1138
 		if ( wp_is_mobile() ) {
1139
-		    $scripts[] = 'jquery-touch-punch';
1139
+		    $scripts[ ] = 'jquery-touch-punch';
1140 1140
 		}
1141 1141
 
1142 1142
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/class-template.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	die;
17 17
 }
18 18
 
19
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
19
+if ( ! class_exists( 'Gamajo_Template_Loader' ) ) {
20 20
 	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
21 21
 }
22 22
 
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 			'atts'	  => NULL,
158 158
 		) );
159 159
 
160
-		foreach ($atts as $key => $value) {
161
-			if( is_null( $value ) ) {
160
+		foreach ( $atts as $key => $value ) {
161
+			if ( is_null( $value ) ) {
162 162
 				continue;
163 163
 			}
164 164
 			$this->{$key} = $value;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	static function getInstance( $passed_post = NULL ) {
190 190
 
191
-		if( empty( self::$instance ) ) {
191
+		if ( empty( self::$instance ) ) {
192 192
 			self::$instance = new self( $passed_post );
193 193
 		}
194 194
 
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 	 */
202 202
 	public function getCurrentField( $key = NULL ) {
203 203
 
204
-		if( !empty( $key ) ) {
205
-			if( isset( $this->_current_field[ $key ] ) ) {
204
+		if ( ! empty( $key ) ) {
205
+			if ( isset( $this->_current_field[ $key ] ) ) {
206 206
 				return $this->_current_field[ $key ];
207 207
 			}
208 208
 			return NULL;
@@ -213,16 +213,16 @@  discard block
 block discarded – undo
213 213
 
214 214
 	public function setCurrentFieldSetting( $key, $value ) {
215 215
 
216
-		if( !empty( $this->_current_field ) ) {
217
-			$this->_current_field['field_settings'][ $key ] = $value;
216
+		if ( ! empty( $this->_current_field ) ) {
217
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
218 218
 		}
219 219
 
220 220
 	}
221 221
 
222 222
 	public function getCurrentFieldSetting( $key ) {
223
-		$settings = $this->getCurrentField('field_settings');
223
+		$settings = $this->getCurrentField( 'field_settings' );
224 224
 
225
-		if( $settings && !empty( $settings[ $key ] ) ) {
225
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
226 226
 			return $settings[ $key ];
227 227
 		}
228 228
 
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function getAtts( $key = NULL ) {
255 255
 
256
-		if( !empty( $key ) ) {
257
-			if( isset( $this->atts[ $key ] ) ) {
256
+		if ( ! empty( $key ) ) {
257
+			if ( isset( $this->atts[ $key ] ) ) {
258 258
 				return $this->atts[ $key ];
259 259
 			}
260 260
 			return NULL;
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
322 322
 
323
-		if( $fields && !empty( $key ) ) {
323
+		if ( $fields && ! empty( $key ) ) {
324 324
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
325 325
 		}
326 326
 
@@ -338,18 +338,18 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function getContextFields( $context = '' ) {
340 340
 
341
-	    if( '' === $context ) {
341
+	    if ( '' === $context ) {
342 342
 	        $context = $this->getContext();
343 343
         }
344 344
 
345 345
 		$fields = $this->getFields();
346 346
 
347
-        foreach ( (array) $fields as $key => $context_fields ) {
347
+        foreach ( (array)$fields as $key => $context_fields ) {
348 348
 
349 349
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350 350
             $matches = explode( '_', $key );
351 351
 
352
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
352
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
353 353
                 return $context_fields;
354 354
             }
355 355
         }
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 	 */
371 371
 	public function getField( $key ) {
372 372
 
373
-		if( !empty( $key ) ) {
374
-			if( isset( $this->fields[ $key ] ) ) {
373
+		if ( ! empty( $key ) ) {
374
+			if ( isset( $this->fields[ $key ] ) ) {
375 375
 				return $this->fields[ $key ];
376 376
 			}
377 377
 		}
@@ -477,8 +477,8 @@  discard block
 block discarded – undo
477 477
 	public function getPaginationCounts() {
478 478
 
479 479
 		$paging = $this->getPaging();
480
-		$offset = $paging['offset'];
481
-		$page_size = $paging['page_size'];
480
+		$offset = $paging[ 'offset' ];
481
+		$page_size = $paging[ 'page_size' ];
482 482
 		$total = $this->getTotalEntries();
483 483
 
484 484
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 		 */
500 500
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
501 501
 
502
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
502
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
503 503
 	}
504 504
 
505 505
 	/**
@@ -595,16 +595,16 @@  discard block
 block discarded – undo
595 595
 	 */
596 596
 	public function getCurrentEntry() {
597 597
 
598
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
598
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
599 599
 			$entries = $this->getEntries();
600
-			$entry = $entries[0];
600
+			$entry = $entries[ 0 ];
601 601
 		} else {
602 602
 			$entry = $this->_current_entry;
603 603
 		}
604 604
 
605 605
 		/** @since 1.16 Fixes DataTables empty entry issue */
606
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
607
-			$entry = $this->_current_field['entry'];
606
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
607
+			$entry = $this->_current_field[ 'entry' ];
608 608
 		}
609 609
 
610 610
 		return $entry;
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
645 645
 
646 646
 		if ( empty( $zone ) ) {
647
-			gravityview()->log->error( 'No zone defined.');
647
+			gravityview()->log->error( 'No zone defined.' );
648 648
 			return NULL;
649 649
 		}
650 650
 
@@ -653,16 +653,16 @@  discard block
 block discarded – undo
653 653
 			'context' => $this->getContext(),
654 654
 			'entry' => $this->getCurrentEntry(),
655 655
 			'form' => $this->getForm(),
656
-			'hide_empty' => $this->getAtts('hide_empty'),
656
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
657 657
 		);
658 658
 
659 659
 		$final_atts = wp_parse_args( $atts, $defaults );
660 660
 
661 661
 		$output = '';
662 662
 
663
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
663
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
664 664
 
665
-		$fields = $this->getField( $final_atts['zone_id'] );
665
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
666 666
 
667 667
 		// Backward compatibility
668 668
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 			 * @param \GravityView_View $this
673 673
 			 * @deprecated Use `gravityview/template/table/fields`
674 674
 			 */
675
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
675
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
676 676
 		}
677 677
 
678 678
 		if ( empty( $fields ) ) {
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 
685 685
 		$field_output = '';
686 686
 		foreach ( $fields as $field ) {
687
-			$final_atts['field'] = $field;
687
+			$final_atts[ 'field' ] = $field;
688 688
 
689 689
 			$field_output .= gravityview_field_output( $final_atts );
690 690
 		}
@@ -701,17 +701,17 @@  discard block
 block discarded – undo
701 701
 			return NULL;
702 702
 		}
703 703
 
704
-		if( !empty( $final_atts['wrapper_class'] ) ) {
705
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
704
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
705
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
706 706
 		}
707 707
 
708 708
 		$output .= $field_output;
709 709
 
710
-		if( !empty( $final_atts['wrapper_class'] ) ) {
710
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
711 711
 			$output .= '</div>';
712 712
 		}
713 713
 
714
-		if( $echo ) {
714
+		if ( $echo ) {
715 715
 			echo $output;
716 716
 		}
717 717
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 	 */
730 730
 	function locate_template( $template_names, $load = false, $require_once = true ) {
731 731
 
732
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
732
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
733 733
 
734 734
 			$located = $this->located_templates[ $template_names ];
735 735
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 			// Set $load to always false so we handle it here.
739 739
 			$located = parent::locate_template( $template_names, false, $require_once );
740 740
 
741
-			if( is_string( $template_names ) ) {
741
+			if ( is_string( $template_names ) ) {
742 742
 				$this->located_templates[ $template_names ] = $located;
743 743
 			}
744 744
 		}
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 * @return mixed|null    The stored data.
757 757
 	 */
758 758
 	public function __get( $name ) {
759
-		if( isset( $this->{$name} ) ) {
759
+		if ( isset( $this->{$name} ) ) {
760 760
 			return $this->{$name};
761 761
 		} else {
762 762
 			return NULL;
@@ -785,17 +785,17 @@  discard block
 block discarded – undo
785 785
 		$additional = array();
786 786
 
787 787
 		// form-19-table-body.php
788
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
788
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
789 789
 
790
-		if( $view_id = $this->getViewId() ) {
790
+		if ( $view_id = $this->getViewId() ) {
791 791
 			// view-3-table-body.php
792
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
792
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
793 793
 		}
794 794
 
795
-		if( $this->getPostId() ) {
795
+		if ( $this->getPostId() ) {
796 796
 
797 797
 			// page-19-table-body.php
798
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
798
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
799 799
 		}
800 800
 
801 801
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 
818 818
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
819 819
 
820
-		if( !empty( $template_file) ) {
820
+		if ( ! empty( $template_file ) ) {
821 821
 
822 822
 			if ( $require_once ) {
823 823
 				require_once( $template_file );
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 
886 886
 		// Prevent being called twice
887 887
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
888
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
888
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
889 889
 			return;
890 890
 		}
891 891
 
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 		 * @param string $zone Current widget zone, either `header` or `footer`
908 908
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
909 909
 		 */
910
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
910
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
911 911
 
912 912
 		$css_class = gravityview_sanitize_html_class( $css_class );
913 913
 
@@ -915,15 +915,15 @@  discard block
 block discarded – undo
915 915
 		?>
916 916
 		<div class="<?php echo $css_class; ?>">
917 917
 			<?php
918
-			foreach( $rows as $row ) {
919
-				foreach( $row as $col => $areas ) {
918
+			foreach ( $rows as $row ) {
919
+				foreach ( $row as $col => $areas ) {
920 920
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
921 921
 				?>
922 922
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
923 923
 						<?php
924 924
 						if ( ! empty( $areas ) ) {
925 925
 							foreach ( $areas as $area ) {
926
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
926
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
927 927
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
928 928
 								}
929 929
 							}
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
 		$approved_count = $disapproved_count = 0;
103 103
 
104 104
 		// Only count if necessary
105
-		if( $include_counts ) {
106
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
105
+		if ( $include_counts ) {
106
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
108 108
 		}
109 109
 
110
-		$filter_links[] = array(
110
+		$filter_links[ ] = array(
111 111
 			'id'            => 'gv_approved',
112 112
 			'field_filters' => $field_filters_approved,
113 113
 			'count'         => $approved_count,
114 114
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
115 115
 		);
116 116
 
117
-		$filter_links[] = array(
117
+		$filter_links[ ] = array(
118 118
 			'id'            => 'gv_disapproved',
119 119
 			'field_filters' => $field_filters_disapproved,
120 120
 			'count'         => $disapproved_count,
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	function tooltips( $tooltips ) {
135 135
 
136
-		$tooltips['form_gravityview_fields'] = array(
137
-			'title' => __('GravityView Fields', 'gravityview'),
138
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
136
+		$tooltips[ 'form_gravityview_fields' ] = array(
137
+			'title' => __( 'GravityView Fields', 'gravityview' ),
138
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
139 139
 		);
140 140
 
141 141
 		return $tooltips;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 
247 247
 		$gv_bulk_action = false;
248 248
 
249
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
249
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
250 250
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
251 251
 		} else {
252 252
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 		}
255 255
 
256 256
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
257
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
257
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
258 258
 			$gv_bulk_action = $bulk_action;
259 259
 		}
260 260
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 		
280 280
 		// gforms_entry_list is the nonce that confirms we're on the right page
281 281
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
282
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
282
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
283 283
 
284 284
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
285 285
 
@@ -297,13 +297,13 @@  discard block
 block discarded – undo
297 297
 			}
298 298
 
299 299
 			// All entries are set to be updated, not just the visible ones
300
-			if ( ! empty( $_POST['all_entries'] ) ) {
300
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
301 301
 
302 302
 				// Convert the current entry search into GF-formatted search criteria
303 303
 				$search = array(
304
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
305
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
306
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
304
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
305
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
306
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
307 307
 				);
308 308
 
309 309
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			} else {
315 315
 
316 316
 				// Changed from 'lead' to 'entry' in 2.0
317
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
317
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
318 318
 
319 319
 			}
320 320
 
@@ -326,15 +326,15 @@  discard block
 block discarded – undo
326 326
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
327 327
 
328 328
 			switch ( $approved_status ) {
329
-				case $this->bulk_action_prefixes['approve']:
329
+				case $this->bulk_action_prefixes[ 'approve' ]:
330 330
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
331 331
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
332 332
 					break;
333
-				case $this->bulk_action_prefixes['unapprove']:
333
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
334 334
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
335 335
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
336 336
 					break;
337
-				case $this->bulk_action_prefixes['disapprove']:
337
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
338 338
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
339 339
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
340 340
 					break;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
      *
357 357
 	 * @return boolean True: It worked; False: it failed
358 358
 	 */
359
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
359
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
360 360
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
361 361
 	}
362 362
 
@@ -386,20 +386,20 @@  discard block
 block discarded – undo
386 386
 	 *
387 387
 	 * @return void
388 388
 	 */
389
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
389
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
390 390
 
391
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
391
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
392 392
 			return;
393 393
 		}
394 394
 
395
-		if( empty( $entry['id'] ) ) {
395
+		if ( empty( $entry[ 'id' ] ) ) {
396 396
 			return;
397 397
 		}
398 398
 
399 399
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
400 400
 
401
-		if( $status_value ) {
402
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
401
+		if ( $status_value ) {
402
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
403 403
 		}
404 404
 	}
405 405
 
@@ -412,10 +412,10 @@  discard block
 block discarded – undo
412 412
 	 */
413 413
 	private function get_form_id() {
414 414
 
415
-		$form_id = GFForms::get('id');
415
+		$form_id = GFForms::get( 'id' );
416 416
 
417 417
 		// If there are no forms identified, use the first form. That's how GF does it.
418
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
418
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
419 419
 			$form_id = $this->get_first_form_id();
420 420
 		}
421 421
 
@@ -435,14 +435,14 @@  discard block
 block discarded – undo
435 435
 
436 436
 		$forms = RGFormsModel::get_forms( null, 'title' );
437 437
 
438
-		if( ! isset( $forms[0] ) ) {
438
+		if ( ! isset( $forms[ 0 ] ) ) {
439 439
 			gravityview()->log->error( 'No forms were found' );
440 440
 			return 0;
441 441
 		}
442 442
 
443
-		$first_form = $forms[0];
443
+		$first_form = $forms[ 0 ];
444 444
 
445
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
445
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
446 446
 
447 447
 		return intval( $form_id );
448 448
 	}
@@ -450,33 +450,33 @@  discard block
 block discarded – undo
450 450
 
451 451
 	function add_scripts_and_styles( $hook ) {
452 452
 
453
-		if( ! class_exists( 'GFForms' ) ) {
453
+		if ( ! class_exists( 'GFForms' ) ) {
454 454
 			gravityview()->log->error( 'GFForms does not exist.' );
455 455
 			return;
456 456
 		}
457 457
 
458 458
 		// enqueue styles & scripts gf_entries
459 459
 		// But only if we're on the main Entries page, not on reports pages
460
-		if( GFForms::get_page() !== 'entry_list' ) {
460
+		if ( GFForms::get_page() !== 'entry_list' ) {
461 461
 			return;
462 462
 		}
463 463
 
464 464
 		$form_id = $this->get_form_id();
465 465
 
466 466
 		// Things are broken; no forms were found
467
-		if( empty( $form_id ) ) {
467
+		if ( empty( $form_id ) ) {
468 468
 			return;
469 469
 		}
470 470
 
471
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
471
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
472 472
 
473
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
473
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
474 474
 
475
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
475
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
476 476
 
477 477
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
478
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
479
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
478
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
479
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
480 480
 			'form_id' => $form_id,
481 481
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
482 482
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
485 485
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
486 486
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
487 487
 			'bulk_message' => $this->bulk_update_message,
488
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
489
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
490
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
491
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
488
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
489
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
490
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
491
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
492 492
 			'column_link' => esc_url( $this->get_sort_link( $form_id ) ),
493 493
 		) );
494 494
 
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 
509 509
 		$approved_column_id = self::get_approved_column( $form_id );
510 510
 
511
-		if( ! $approved_column_id ) {
511
+		if ( ! $approved_column_id ) {
512 512
 		    return '';
513 513
         }
514 514
 
@@ -538,16 +538,16 @@  discard block
 block discarded – undo
538 538
 		$bulk_actions = array(
539 539
 			'GravityView' => array(
540 540
 				array(
541
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
542
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
541
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
542
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
543 543
 				),
544 544
 				array(
545
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
546
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
545
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
546
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
547 547
 				),
548 548
 				array(
549
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
550
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
549
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
550
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
551 551
 				),
552 552
 			),
553 553
 		);
@@ -564,13 +564,13 @@  discard block
 block discarded – undo
564 564
 		// Sanitize the values, just to be sure.
565 565
 		foreach ( $bulk_actions as $key => $group ) {
566 566
 
567
-		    if( empty( $group ) ) {
567
+		    if ( empty( $group ) ) {
568 568
 		        continue;
569 569
 		    }
570 570
 
571 571
 			foreach ( $group as $i => $action ) {
572
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
573
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
572
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
573
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
574 574
 			}
575 575
 		}
576 576
 
@@ -595,13 +595,13 @@  discard block
 block discarded – undo
595 595
 		 * @since 1.7.2
596 596
 		 * @param boolean $hide_if_no_connections
597 597
 		 */
598
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
598
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
599 599
 
600
-		if( $hide_if_no_connections ) {
600
+		if ( $hide_if_no_connections ) {
601 601
 
602 602
 			$connected_views = gravityview_get_connected_views( $form_id );
603 603
 
604
-			if( empty( $connected_views ) ) {
604
+			if ( empty( $connected_views ) ) {
605 605
 				$show_approve_column = false;
606 606
 			}
607 607
 		}
@@ -611,18 +611,18 @@  discard block
 block discarded – undo
611 611
 		 * @param boolean $show_approve_column Whether the column will be shown
612 612
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
613 613
 		 */
614
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
614
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
615 615
 
616 616
 		return $show_approve_column;
617 617
 	}
618 618
 
619 619
 	function register_gform_noconflict_script( $scripts ) {
620
-		$scripts[] = 'gravityview_gf_entries_scripts';
620
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
621 621
 		return $scripts;
622 622
 	}
623 623
 
624 624
 	function register_gform_noconflict_style( $styles ) {
625
-		$styles[] = 'gravityview_entries_list';
625
+		$styles[ ] = 'gravityview_entries_list';
626 626
 		return $styles;
627 627
 	}
628 628
 
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 * @return array
102 102
 	 */
103 103
 	public function modify_app_settings_menu_title( $setting_tabs ) {
104
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
104
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
105 105
 		return $setting_tabs;
106 106
 	}
107 107
 
@@ -304,15 +304,15 @@  discard block
 block discarded – undo
304 304
             </ul>
305 305
             <div class="gv-followup widefat">
306 306
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
307
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
307
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
308 308
             </div>
309 309
             <div class="scale-description">
310 310
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
311 311
                 <ul class="inline">
312 312
 					<?php
313 313
 					$i = 0;
314
-					while( $i < 11 ) {
315
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
314
+					while ( $i < 11 ) {
315
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
316 316
 						$i++;
317 317
 					}
318 318
 					?>
@@ -529,15 +529,15 @@  discard block
 block discarded – undo
529 529
 	 * @return string The HTML
530 530
 	 */
531 531
 	public function as_html( $field, $echo = true ) {
532
-		$field['type']  = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit';
532
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
533 533
 
534 534
 		$attributes    = $this->get_field_attributes( $field );
535 535
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
536
-		$value         = $this->get( $field['name'], $default_value );
536
+		$value         = $this->get( $field[ 'name' ], $default_value );
537 537
 
538 538
 
539
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
540
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
539
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
540
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
541 541
 
542 542
 		if ( empty( $value ) ) {
543 543
 			$value = __( 'Update Settings', 'gravityview' );
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		$attributes = $this->get_field_attributes( $field );
547 547
 
548 548
 		$html = '<input
549
-                    type="' . $field['type'] . '"
549
+                    type="' . $field[ 'type' ] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552 552
 		        implode( ' ', $attributes ) .
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 	public function license_key_notice() {
576 576
 		$license_status = $this->get( 'license_key_status' );
577 577
 		$license_key = $this->get( 'license_key' );
578
-		if( '' === $license_key ) {
578
+		if ( '' === $license_key ) {
579 579
 			$license_status = 'inactive';
580 580
         }
581 581
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		 * but didn't want to mess up the translation strings for the translators.
588 588
 		 */
589 589
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
590
-		$title = __ ( 'Inactive License', 'gravityview');
590
+		$title = __( 'Inactive License', 'gravityview' );
591 591
 		$status = '';
592 592
 		$update_below = false;
593 593
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
618 618
 				break;
619 619
 		}
620
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
620
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
621 621
 
622 622
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
623 623
 		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 	public function scripts() {
660 660
 		$scripts = parent::scripts();
661 661
 
662
-		$scripts[] = array(
662
+		$scripts[ ] = array(
663 663
 			'handle'  => 'gform_tooltip_init',
664 664
 			'enqueue' => array(
665 665
                 array(
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 	public function styles() {
679 679
 		$styles = parent::styles();
680 680
 
681
-		$styles[] = array(
681
+		$styles[ ] = array(
682 682
 			'handle'  => 'gravityview_settings',
683 683
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
684 684
 			'version' => Plugin::$version,
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
 		 * If multisite and not network admin, we don't want the settings to show.
710 710
 		 * @since 1.7.6
711 711
 		 */
712
-		$show_submenu = ( ! is_multisite() ) ||  is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
712
+		$show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
713 713
 
714 714
 		/**
715 715
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -757,26 +757,26 @@  discard block
 block discarded – undo
757 757
 				'label' => __( 'License Key', 'gravityview' ),
758 758
 				'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
759 759
 				'type' => 'edd_license',
760
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
760
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
761 761
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
762
-				'default_value' => $default_settings['license_key'],
762
+				'default_value' => $default_settings[ 'license_key' ],
763 763
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
764 764
 			),
765 765
 			array(
766 766
 				'name' => 'license_key_response',
767
-				'default_value' => $default_settings['license_key_response'],
767
+				'default_value' => $default_settings[ 'license_key_response' ],
768 768
 				'type' => 'hidden',
769 769
 			),
770 770
 			array(
771 771
 				'name' => 'license_key_status',
772
-				'default_value' => $default_settings['license_key_status'],
772
+				'default_value' => $default_settings[ 'license_key_status' ],
773 773
 				'type' => 'hidden',
774 774
 			),
775 775
 			array(
776 776
 				'name' => 'support-email',
777 777
 				'type' => 'text',
778 778
 				'validate' => 'email',
779
-				'default_value' => $default_settings['support-email'],
779
+				'default_value' => $default_settings[ 'support-email' ],
780 780
 				'label' => __( 'Support Email', 'gravityview' ),
781 781
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
782 782
 				'class' => 'code regular-text',
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 				'name' => 'support_port',
789 789
 				'type' => 'radio',
790 790
 				'label' => __( 'Show Support Port?', 'gravityview' ),
791
-				'default_value' => $default_settings['support_port'],
791
+				'default_value' => $default_settings[ 'support_port' ],
792 792
 				'horizontal' => 1,
793 793
 				'choices' => array(
794 794
 					array(
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
 				'name' => 'no-conflict-mode',
808 808
 				'type' => 'radio',
809 809
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
810
-				'default_value' => $default_settings['no-conflict-mode'],
810
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
811 811
 				'horizontal' => 1,
812 812
 				'choices' => array(
813 813
 					array(
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
 					'name' => 'rest_api',
830 830
 					'type' => 'radio',
831 831
 					'label' => __( 'REST API', 'gravityview' ),
832
-					'default_value' => $default_settings['rest_api'],
832
+					'default_value' => $default_settings[ 'rest_api' ],
833 833
 					'horizontal' => 1,
834 834
 					'choices' => array(
835 835
 						array(
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
 				'name' => 'beta',
849 849
 				'type' => 'checkbox',
850 850
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
851
-				'default_value' => $default_settings['beta'],
851
+				'default_value' => $default_settings[ 'beta' ],
852 852
 				'horizontal' => 1,
853 853
 				'choices' => array(
854 854
 					array(
@@ -881,17 +881,17 @@  discard block
 block discarded – undo
881 881
 		 * @since 1.7.4
882 882
 		 */
883 883
 		foreach ( $fields as &$field ) {
884
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
885
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
886
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
887
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
884
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
885
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
886
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
887
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
888 888
 
889 889
 			if ( $disabled_attribute ) {
890
-				$field['disabled']  = $disabled_attribute;
890
+				$field[ 'disabled' ] = $disabled_attribute;
891 891
 			}
892 892
 
893
-			if ( empty( $field['disabled'] ) ) {
894
-				unset( $field['disabled'] );
893
+			if ( empty( $field[ 'disabled' ] ) ) {
894
+				unset( $field[ 'disabled' ] );
895 895
             }
896 896
 		}
897 897
 
@@ -909,7 +909,7 @@  discard block
 block discarded – undo
909 909
         );
910 910
 
911 911
 		if ( $disabled_attribute ) {
912
-			$button['disabled'] = $disabled_attribute;
912
+			$button[ 'disabled' ] = $disabled_attribute;
913 913
 		}
914 914
 
915 915
         /**
@@ -928,20 +928,20 @@  discard block
 block discarded – undo
928 928
 		// If there are extensions, add a section for them
929 929
 		if ( ! empty( $extension_sections ) ) {
930 930
 
931
-			if( $disabled_attribute ) {
931
+			if ( $disabled_attribute ) {
932 932
 				foreach ( $extension_sections as &$section ) {
933
-					foreach ( $section['fields'] as &$field ) {
934
-						$field['disabled'] = $disabled_attribute;
933
+					foreach ( $section[ 'fields' ] as &$field ) {
934
+						$field[ 'disabled' ] = $disabled_attribute;
935 935
 					}
936 936
 				}
937 937
 			}
938 938
 
939
-            $k = count( $extension_sections ) - 1 ;
940
-            $extension_sections[ $k ]['fields'][] = $button;
939
+            $k = count( $extension_sections ) - 1;
940
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
941 941
 			$sections = array_merge( $sections, $extension_sections );
942 942
 		} else {
943 943
             // add the 'update settings' button to the general section
944
-            $sections[0]['fields'][] = $button;
944
+            $sections[ 0 ][ 'fields' ][ ] = $button;
945 945
         }
946 946
 
947 947
 		return $sections;
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
997 997
 	protected function settings_edd_license( $field, $echo = true ) {
998 998
 
999 999
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1000
-		    $field['input_type'] = 'password';
1000
+		    $field[ 'input_type' ] = 'password';
1001 1001
         }
1002 1002
 
1003 1003
 		$text = $this->settings_text( $field, false );
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
1046 1046
 	public function single_setting_row_html( $field ) {
1047 1047
 		?>
1048 1048
 
1049
-        <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1049
+        <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1050 1050
             <td colspan="2">
1051 1051
 				<?php $this->single_setting( $field ); ?>
1052 1052
             </td>
@@ -1064,10 +1064,10 @@  discard block
 block discarded – undo
1064 1064
 	 * @return string
1065 1065
 	 */
1066 1066
 	public function settings_save( $field, $echo = true ) {
1067
-		$field['type']  = 'submit';
1068
-		$field['name']  = 'gform-settings-save';
1069
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
1070
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1067
+		$field[ 'type' ]  = 'submit';
1068
+		$field[ 'name' ]  = 'gform-settings-save';
1069
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
1070
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1071 1071
 
1072 1072
 		$output = $this->settings_submit( $field, false );
1073 1073
 
@@ -1098,8 +1098,8 @@  discard block
 block discarded – undo
1098 1098
      * @return void
1099 1099
 	 */
1100 1100
 	public function single_setting_row( $field ) {
1101
-		$field['gv_description'] = Utils::get( $field, 'description' );
1102
-		$field['description']    = Utils::get( $field, 'subtitle' );
1101
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1102
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1103 1103
 		parent::single_setting_row( $field );
1104 1104
 	}
1105 1105
 
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
 	public function single_setting_label( $field ) {
1112 1112
 		parent::single_setting_label( $field );
1113 1113
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
1114
-			echo '<span class="description">'. $description .'</span>';
1114
+			echo '<span class="description">' . $description . '</span>';
1115 1115
 		}
1116 1116
 	}
1117 1117
 
@@ -1148,9 +1148,9 @@  discard block
 block discarded – undo
1148 1148
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
1149 1149
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1150 1150
 		if ( $local_key !== $response_key ) {
1151
-			unset( $posted_settings['license_key_response'] );
1152
-			unset( $posted_settings['license_key_status'] );
1153
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1151
+			unset( $posted_settings[ 'license_key_response' ] );
1152
+			unset( $posted_settings[ 'license_key_status' ] );
1153
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1154 1154
 		}
1155 1155
 		return $posted_settings;
1156 1156
 	}
Please login to merge, or discard this patch.