Completed
Pull Request — develop (#1687)
by
unknown
16:12
created
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
48 48
 		$this->api_data    = $_api_data;
49 49
 		$this->name        = plugin_basename( $_plugin_file );
50 50
 		$this->slug        = basename( $_plugin_file, '.php' );
51
-		$this->version     = $_api_data['version'];
52
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
53
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
54
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
51
+		$this->version     = $_api_data[ 'version' ];
52
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
53
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
54
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
55 55
 
56 56
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
57 57
 
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 			return;
174 174
 		}
175 175
 
176
-		if( ! current_user_can( 'update_plugins' ) ) {
176
+		if ( ! current_user_can( 'update_plugins' ) ) {
177 177
 			return;
178 178
 		}
179 179
 
180
-		if( ! is_multisite() ) {
180
+		if ( ! is_multisite() ) {
181 181
 			return;
182 182
 		}
183 183
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
270 270
 					esc_html( $version_info->new_version ),
271 271
 					'</a>',
272
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
272
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
273 273
 					'</a>'
274 274
 				);
275 275
 			}
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
354 354
 		}
355 355
 
356
-		if( ! isset( $_data->plugin ) ) {
356
+		if ( ! isset( $_data->plugin ) ) {
357 357
 			$_data->plugin = $this->name;
358 358
 		}
359 359
 
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 
396 396
 		$verify_ssl = $this->verify_ssl();
397 397
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
398
-			$args['sslverify'] = $verify_ssl;
398
+			$args[ 'sslverify' ] = $verify_ssl;
399 399
 		}
400 400
 		return $args;
401 401
 
@@ -423,9 +423,9 @@  discard block
 block discarded – undo
423 423
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
424 424
 			$test_url_parts = parse_url( $this->api_url );
425 425
 
426
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
427
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
428
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
426
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
427
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
428
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
429 429
 
430 430
 			if ( empty( $host ) ) {
431 431
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -442,27 +442,27 @@  discard block
 block discarded – undo
442 442
 
443 443
 		$data = array_merge( $this->api_data, $_data );
444 444
 
445
-		if ( $data['slug'] != $this->slug ) {
445
+		if ( $data[ 'slug' ] != $this->slug ) {
446 446
 			return false;
447 447
 		}
448 448
 
449
-		if ( $this->api_url == trailingslashit ( home_url() ) ) {
449
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
450 450
 			return false; // Don't allow a plugin to ping itself
451 451
 		}
452 452
 
453 453
 		$api_params = array(
454 454
 			'edd_action' => 'get_version',
455
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
456
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
457
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
458
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
459
-			'slug'       => $data['slug'],
460
-			'author'     => $data['author'],
455
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
456
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
457
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
458
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
459
+			'slug'       => $data[ 'slug' ],
460
+			'author'     => $data[ 'author' ],
461 461
 			'url'        => home_url(),
462
-			'beta'       => ! empty( $data['beta'] ),
462
+			'beta'       => ! empty( $data[ 'beta' ] ),
463 463
 		);
464 464
 
465
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
465
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
466 466
 
467 467
 		if ( ! is_wp_error( $request ) ) {
468 468
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -483,8 +483,8 @@  discard block
 block discarded – undo
483 483
 		}
484 484
 
485 485
 		if ( ! empty( $request->sections ) ) {
486
-			foreach( $request->sections as $key => $section ) {
487
-				$request->$key = (array) $section;
486
+			foreach ( $request->sections as $key => $section ) {
487
+				$request->$key = (array)$section;
488 488
 			}
489 489
 		}
490 490
 
@@ -498,35 +498,35 @@  discard block
 block discarded – undo
498 498
 
499 499
 		global $edd_plugin_data;
500 500
 
501
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
501
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
502 502
 			return;
503 503
 		}
504 504
 
505
-		if( empty( $_REQUEST['plugin'] ) ) {
505
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
506 506
 			return;
507 507
 		}
508 508
 
509
-		if( empty( $_REQUEST['slug'] ) ) {
509
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
510 510
 			return;
511 511
 		}
512 512
 
513
-		if( ! current_user_can( 'update_plugins' ) ) {
513
+		if ( ! current_user_can( 'update_plugins' ) ) {
514 514
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
515 515
 		}
516 516
 
517
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
517
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
518 518
 		$version_info = $this->get_cached_version_info();
519 519
 
520
-		if( false === $version_info ) {
520
+		if ( false === $version_info ) {
521 521
 
522 522
 			$api_params = array(
523 523
 				'edd_action' => 'get_version',
524
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
525
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
526
-				'slug'       => $_REQUEST['slug'],
527
-				'author'     => $data['author'],
524
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
525
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
526
+				'slug'       => $_REQUEST[ 'slug' ],
527
+				'author'     => $data[ 'author' ],
528 528
 				'url'        => home_url(),
529
-				'beta'       => ! empty( $data['beta'] )
529
+				'beta'       => ! empty( $data[ 'beta' ] )
530 530
 			);
531 531
 
532 532
 			$verify_ssl = $this->verify_ssl();
@@ -542,22 +542,22 @@  discard block
 block discarded – undo
542 542
 				$version_info = false;
543 543
 			}
544 544
 
545
-			if( ! empty( $version_info ) ) {
546
-				foreach( $version_info->sections as $key => $section ) {
547
-					$version_info->$key = (array) $section;
545
+			if ( ! empty( $version_info ) ) {
546
+				foreach ( $version_info->sections as $key => $section ) {
547
+					$version_info->$key = (array)$section;
548 548
 				}
549 549
 			}
550 550
 
551 551
 			$this->set_version_info_cache( $version_info );
552 552
 
553 553
 			// Delete the unneeded option
554
-			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $this->beta . '_version_info' ) );
554
+			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $this->beta . '_version_info' ) );
555 555
 		}
556 556
 
557 557
 		if ( isset( $version_info->sections ) ) {
558 558
 			$sections = $this->convert_object_to_array( $version_info->sections );
559
-			if ( ! empty( $sections['changelog'] ) ) {
560
-				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections['changelog'] ) . '</div>';
559
+			if ( ! empty( $sections[ 'changelog' ] ) ) {
560
+				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections[ 'changelog' ] ) . '</div>';
561 561
 			}
562 562
 		}
563 563
 
@@ -572,25 +572,25 @@  discard block
 block discarded – undo
572 572
 	 */
573 573
 	public function get_cached_version_info( $cache_key = '' ) {
574 574
 
575
-		if( empty( $cache_key ) ) {
575
+		if ( empty( $cache_key ) ) {
576 576
 			$cache_key = $this->cache_key;
577 577
 		}
578 578
 
579 579
 		$cache = get_option( $cache_key );
580 580
 
581
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
581
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
582 582
 			return false; // Cache is expired
583 583
 		}
584 584
 
585 585
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
586
-		$cache['value'] = json_decode( $cache['value'] );
587
-		if ( ! empty( $cache['value']->icons ) ) {
588
-			$cache['value']->icons = (array) $cache['value']->icons;
589
-		} elseif ( $cache['value'] ) {
590
-			$cache['value']->icons = array();
586
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
587
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
588
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
589
+		} elseif ( $cache[ 'value' ] ) {
590
+			$cache[ 'value' ]->icons = array();
591 591
 		}
592 592
 
593
-		return $cache['value'];
593
+		return $cache[ 'value' ];
594 594
 
595 595
 	}
596 596
 
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
 	 */
603 603
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
604 604
 
605
-		if( empty( $cache_key ) ) {
605
+		if ( empty( $cache_key ) ) {
606 606
 			$cache_key = $this->cache_key;
607 607
 		}
608 608
 
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 		update_option( $cache_key, $data, 'no' );
615 615
 
616 616
 		// Delete the duplicate option
617
-		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ) );
617
+		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ) );
618 618
 	}
619 619
 
620 620
 	/**
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
 	 * @return bool
625 625
 	 */
626 626
 	private function verify_ssl() {
627
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
627
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
628 628
 	}
629 629
 
630 630
 }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-survey.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 
48 48
 		foreach ( $field->choices as $choice ) {
49 49
 			if ( is_array( $value ) && RGFormsModel::choice_value_match( $field, $choice, $value[ $input_id ] ) ) {
50
-				return $choice['score'];
50
+				return $choice[ 'score' ];
51 51
 			} else if ( ! is_array( $value ) && RGFormsModel::choice_value_match( $field, $choice, $value ) ) {
52
-				return $choice['score'];
52
+				return $choice[ 'score' ];
53 53
 			}
54 54
 		}
55 55
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
60 60
 
61
-		unset( $field_options['search_filter'] );
61
+		unset( $field_options[ 'search_filter' ] );
62 62
 
63 63
 		if ( 'edit' === $context ) {
64 64
 			return $field_options;
@@ -80,18 +80,18 @@  discard block
 block discarded – undo
80 80
 				'text' => __( 'Text value of the selected choice', 'gravityview' ) . ( $show_suffix ? '' : $multiple_rows_suffix ),
81 81
 			);
82 82
 
83
-			if( $field->field->gsurveyLikertEnableScoring ) {
84
-				$likert_display_options['score'] = __( 'Score value of the selected choice', 'gravityview' ) . ( $show_suffix ? '' : $multiple_rows_suffix );
83
+			if ( $field->field->gsurveyLikertEnableScoring ) {
84
+				$likert_display_options[ 'score' ] = __( 'Score value of the selected choice', 'gravityview' ) . ( $show_suffix ? '' : $multiple_rows_suffix );
85 85
 			}
86 86
 
87 87
 			// Maintain for back-compatibility
88
-			$add_options['score'] = array(
88
+			$add_options[ 'score' ] = array(
89 89
 				'type' => 'hidden',
90 90
 				'value' => '',
91 91
 				'group' => 'display',
92 92
 			);
93 93
 
94
-			$add_options['choice_display'] = array(
94
+			$add_options[ 'choice_display' ] = array(
95 95
 				'type' => 'radio',
96 96
 				'label' => __( 'What should be displayed:', 'gravityview' ),
97 97
 				'options' => $likert_display_options,
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 			);
104 104
 		}
105 105
 
106
-		if( 'checkbox' === $field->field->inputType && $input_id ) {
107
-			$field_options['choice_display'] = array(
106
+		if ( 'checkbox' === $field->field->inputType && $input_id ) {
107
+			$field_options[ 'choice_display' ] = array(
108 108
 				'type'    => 'radio',
109 109
 				'class'   => 'vertical',
110 110
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		}
121 121
 
122 122
 		if ( 'rating' === $field->field->inputType ) {
123
-			$field_options['choice_display'] = array(
123
+			$field_options[ 'choice_display' ] = array(
124 124
 				'type'    => 'radio',
125 125
 				'class'   => 'vertical',
126 126
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/select-template.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -26,52 +26,52 @@
 block discarded – undo
26 26
 
27 27
 <?php // list all the available templates (type= fresh or custom ) ?>
28 28
 <div class="gv-grid">
29
-	<?php foreach( $templates as $id => $template ) {
29
+	<?php foreach ( $templates as $id => $template ) {
30 30
 		$selected     = ( $id == $current_template ) ? ' gv-selected' : '';
31
-		$placeholder  = ! empty( $template['buy_source'] );
32
-		$is_included  = ! empty( $template['included'] );
31
+		$placeholder  = ! empty( $template[ 'buy_source' ] );
32
+		$is_included  = ! empty( $template[ 'included' ] );
33 33
 		$plugin_data  = GravityView_Admin_Installer::get_wp_plugins_data( \GV\Utils::get( $template, 'textdomain', '' ) );
34 34
 		$button_text  = empty( $plugin_data ) ? esc_html__( 'Install Layout', 'gravityview' ) : esc_html__( 'Activate & Select Layout', 'gravityview' );
35 35
 		$button_class = 'gv-layout-' . ( empty( $plugin_data ) ? 'install' : 'activate' );
36
-		$template_path = isset($plugin_data['path']) ? $plugin_data['path'] : '';
36
+		$template_path = isset( $plugin_data[ 'path' ] ) ? $plugin_data[ 'path' ] : '';
37 37
 
38 38
 		?>
39 39
 		<div class="gv-grid-col-1-4">
40
-			<div class="gv-view-types-module<?php echo $selected; if( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
40
+			<div class="gv-view-types-module<?php echo $selected; if ( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
41 41
 				<div class="gv-view-types-normal">
42
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
43
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
44
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
42
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
43
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
44
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
45 45
 				</div>
46 46
 				<div class="gv-view-types-hover">
47 47
 					<div>
48 48
 						<?php
49
-						if( $is_included ) {
49
+						if ( $is_included ) {
50 50
 						?>
51 51
 							<p><a href="<?php echo esc_url( admin_url( 'edit.php?post_type=gravityview&page=gv-admin-installer' ) ); ?>" class="button button-secondary button-hero <?php echo $button_class; ?>" rel="internal" data-template-path="<?php echo $template_path; ?>"><?php echo $button_text; ?></a></p>
52
-							<?php if( !empty( $template['license'] ) ) { ?>
53
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) ); ?></p>
52
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
53
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) ); ?></p>
54 54
 							<?php } ?>
55 55
 						<?php
56
-						} elseif( $placeholder ) {
57
-							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template['license'] ) . '&utm_content=' . urlencode( $template['slug'] );
56
+						} elseif ( $placeholder ) {
57
+							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template[ 'license' ] ) . '&utm_content=' . urlencode( $template[ 'slug' ] );
58 58
 							?>
59
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
59
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
60 60
 
61
-							<?php if( !empty( $template['preview'] ) ) { ?>
62
-								<p><a href="<?php echo esc_url( $template['preview'] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview'); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
61
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
62
+								<p><a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview' ); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
63 63
 							<?php } ?>
64 64
 
65
-							<?php if( ! empty( $template['license'] ) ) { ?>
66
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://gravityview.co/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) . '</a>' ); ?></p>
65
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
66
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://gravityview.co/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) . '</a>' ); ?></p>
67 67
 							<?php } ?>
68 68
 						<?php }
69 69
 
70
-						if ($placeholder || $is_included) { ?> </div><div class="hidden"> <?php } ?>
70
+						if ( $placeholder || $is_included ) { ?> </div><div class="hidden"> <?php } ?>
71 71
 
72
-                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
73
-                        <?php if( !empty( $template['preview'] ) ) { ?>
74
-                            <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-welcome-view-site" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
72
+                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p>
73
+                        <?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
74
+                            <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-welcome-view-site" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
75 75
                         <?php } ?>
76 76
 					</div>
77 77
 				</div>
Please login to merge, or discard this patch.
future/includes/class-gv-core.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -114,14 +114,14 @@
 block discarded – undo
114 114
 		/** Require critical legacy core files. @todo Deprecate */
115 115
 		require_once $this->plugin->dir( 'includes/import-functions.php' );
116 116
 		require_once $this->plugin->dir( 'includes/helper-functions.php' );
117
-		require_once $this->plugin->dir( 'includes/class-common.php');
118
-		require_once $this->plugin->dir( 'includes/connector-functions.php');
117
+		require_once $this->plugin->dir( 'includes/class-common.php' );
118
+		require_once $this->plugin->dir( 'includes/connector-functions.php' );
119 119
 		require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
120 120
 		require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
121 121
 		require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
122 122
 		require_once $this->plugin->dir( 'includes/class-admin.php' );
123
-		require_once $this->plugin->dir( 'includes/class-post-types.php');
124
-		require_once $this->plugin->dir( 'includes/class-cache.php');
123
+		require_once $this->plugin->dir( 'includes/class-post-types.php' );
124
+		require_once $this->plugin->dir( 'includes/class-cache.php' );
125 125
 
126 126
 		/**
127 127
 		 * GravityView extensions and widgets.
Please login to merge, or discard this patch.
includes/import-functions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
  */
47 47
 function gravityview_import_helper_fix_line_breaks( $postmeta = array(), $post_id = 0, $post = array() ) {
48 48
 
49
-	if ( empty( $post['postmeta'] ) ) {
49
+	if ( empty( $post[ 'postmeta' ] ) ) {
50 50
 		return $postmeta;
51 51
 	}
52 52
 
53
-	if ( 'gravityview' !== $post['post_type'] ) {
53
+	if ( 'gravityview' !== $post[ 'post_type' ] ) {
54 54
 		return $postmeta;
55 55
 	}
56 56
 
@@ -62,27 +62,27 @@  discard block
 block discarded – undo
62 62
 	$performed_fix = false;
63 63
 
64 64
 	foreach ( $postmeta as &$meta ) {
65
-		$key = $meta['key'];
65
+		$key = $meta[ 'key' ];
66 66
 
67 67
 		if ( ! in_array( $key, $keys_to_fix, true ) ) {
68 68
 			continue;
69 69
 		}
70 70
 
71
-		$is_valid_serialized_data = maybe_unserialize( $meta['value'] );
71
+		$is_valid_serialized_data = maybe_unserialize( $meta[ 'value' ] );
72 72
 
73 73
 		// The values are not corrupted serialized data. No need to fix.
74 74
 		if ( false !== $is_valid_serialized_data ) {
75 75
 			continue;
76 76
 		}
77 77
 
78
-		$meta['value'] = str_replace( "\n", "\n\n", $meta['value'] );
78
+		$meta[ 'value' ] = str_replace( "\n", "\n\n", $meta[ 'value' ] );
79 79
 
80 80
 		$performed_fix = true;
81 81
 	}
82 82
 
83 83
 	// Leave a note that this modification has been done. We'll use it later.
84 84
 	if ( $performed_fix ) {
85
-		$postmeta[] = array(
85
+		$postmeta[ ] = array(
86 86
 			'key'   => '_gravityview_fixed_import_serialization',
87 87
 			'value' => 1,
88 88
 		);
Please login to merge, or discard this patch.
trustedlogin/psr/log/Psr/Log/AbstractLogger.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
      *
26 26
      * @return void
27 27
      */
28
-    public function emergency($message, array $context = array())
28
+    public function emergency( $message, array $context = array() )
29 29
     {
30
-        $this->log(LogLevel::EMERGENCY, $message, $context);
30
+        $this->log( LogLevel::EMERGENCY, $message, $context );
31 31
     }
32 32
 
33 33
     /**
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
      *
42 42
      * @return void
43 43
      */
44
-    public function alert($message, array $context = array())
44
+    public function alert( $message, array $context = array() )
45 45
     {
46
-        $this->log(LogLevel::ALERT, $message, $context);
46
+        $this->log( LogLevel::ALERT, $message, $context );
47 47
     }
48 48
 
49 49
     /**
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
      *
57 57
      * @return void
58 58
      */
59
-    public function critical($message, array $context = array())
59
+    public function critical( $message, array $context = array() )
60 60
     {
61
-        $this->log(LogLevel::CRITICAL, $message, $context);
61
+        $this->log( LogLevel::CRITICAL, $message, $context );
62 62
     }
63 63
 
64 64
     /**
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
      *
71 71
      * @return void
72 72
      */
73
-    public function error($message, array $context = array())
73
+    public function error( $message, array $context = array() )
74 74
     {
75
-        $this->log(LogLevel::ERROR, $message, $context);
75
+        $this->log( LogLevel::ERROR, $message, $context );
76 76
     }
77 77
 
78 78
     /**
@@ -86,9 +86,9 @@  discard block
 block discarded – undo
86 86
      *
87 87
      * @return void
88 88
      */
89
-    public function warning($message, array $context = array())
89
+    public function warning( $message, array $context = array() )
90 90
     {
91
-        $this->log(LogLevel::WARNING, $message, $context);
91
+        $this->log( LogLevel::WARNING, $message, $context );
92 92
     }
93 93
 
94 94
     /**
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
      *
100 100
      * @return void
101 101
      */
102
-    public function notice($message, array $context = array())
102
+    public function notice( $message, array $context = array() )
103 103
     {
104
-        $this->log(LogLevel::NOTICE, $message, $context);
104
+        $this->log( LogLevel::NOTICE, $message, $context );
105 105
     }
106 106
 
107 107
     /**
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
      *
115 115
      * @return void
116 116
      */
117
-    public function info($message, array $context = array())
117
+    public function info( $message, array $context = array() )
118 118
     {
119
-        $this->log(LogLevel::INFO, $message, $context);
119
+        $this->log( LogLevel::INFO, $message, $context );
120 120
     }
121 121
 
122 122
     /**
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
      *
128 128
      * @return void
129 129
      */
130
-    public function debug($message, array $context = array())
130
+    public function debug( $message, array $context = array() )
131 131
     {
132
-        $this->log(LogLevel::DEBUG, $message, $context);
132
+        $this->log( LogLevel::DEBUG, $message, $context );
133 133
     }
134 134
 }
Please login to merge, or discard this patch.
trustedlogin/psr/log/Psr/Log/LoggerAwareTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
      *
26 26
      * @param LoggerInterface $logger
27 27
      */
28
-    public function setLogger(LoggerInterface $logger)
28
+    public function setLogger( LoggerInterface $logger )
29 29
     {
30 30
         $this->logger = $logger;
31 31
     }
Please login to merge, or discard this patch.
trustedlogin/psr/log/Psr/Log/LoggerAwareInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,5 +20,5 @@
 block discarded – undo
20 20
      *
21 21
      * @return void
22 22
      */
23
-    public function setLogger(LoggerInterface $logger);
23
+    public function setLogger( LoggerInterface $logger );
24 24
 }
Please login to merge, or discard this patch.
trustedlogin/psr/log/Psr/Log/NullLogger.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
      *
30 30
      * @throws \GravityView\Psr\Log\InvalidArgumentException
31 31
      */
32
-    public function log($level, $message, array $context = array())
32
+    public function log( $level, $message, array $context = array() )
33 33
     {
34 34
         // noop
35 35
     }
Please login to merge, or discard this patch.