Completed
Pull Request — develop (#1726)
by
unknown
19:16
created
future/includes/class-gv-settings-view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		if ( ! $detailed ) {
556 556
 			$defaults = array();
557 557
 			foreach ( $default_settings as $key => $value ) {
558
-				$defaults[ $key ] = $value['value'];
558
+				$defaults[ $key ] = $value[ 'value' ];
559 559
 			}
560 560
 			return $defaults;
561 561
 
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 				// If the $group argument is set for the method,
567 567
 				// ignore any settings that aren't in that group.
568 568
 				if ( ! empty( $group ) && is_string( $group ) ) {
569
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
569
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
570 570
 						unset( $default_settings[ $key ] );
571 571
 					}
572 572
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-plugin.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 			return;
305 305
 		}
306 306
 
307
-		$locale = apply_filters( 'plugin_locale', ( ( function_exists('get_user_locale') && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
307
+		$locale = apply_filters( 'plugin_locale', ( ( function_exists( 'get_user_locale' ) && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
308 308
 
309 309
 		gravityview()->log->error( sprintf( 'Unable to load textdomain for %s locale.', $locale ) );
310 310
 	}
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
 	 */
527 527
 	private function get_php_version() {
528 528
 
529
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
530
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
529
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
530
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
531 531
 	}
532 532
 
533 533
 	/**
@@ -539,8 +539,8 @@  discard block
 block discarded – undo
539 539
 	 */
540 540
 	private function get_wordpress_version() {
541 541
 
542
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
543
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
542
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
543
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
544 544
 	}
545 545
 
546 546
 	/**
@@ -552,14 +552,14 @@  discard block
 block discarded – undo
552 552
 	 */
553 553
 	private function get_gravityforms_version() {
554 554
 
555
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
555
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
556 556
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
557 557
 
558 558
 			return null;
559 559
 		}
560 560
 
561
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
562
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
561
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
562
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
563 563
 	}
564 564
 
565 565
 	/**
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 		$items = get_posts( array(
606 606
 			'post_type'   => 'gravityview',
607 607
 			'post_status' => 'any',
608
-			'numberposts' => - 1,
608
+			'numberposts' => -1,
609 609
 			'fields'      => 'ids',
610 610
 		) );
611 611
 
@@ -619,9 +619,9 @@  discard block
 block discarded – undo
619 619
 		$tables = array();
620 620
 
621 621
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
622
-			$tables [] = \GFFormsModel::get_entry_meta_table_name();
622
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
623 623
 		} elseif ( ! $this->is_GF_25() ) {
624
-			$tables [] = \GFFormsModel::get_lead_meta_table_name();
624
+			$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
625 625
 		}
626 626
 
627 627
 		foreach ( $tables as $meta_table ) {
@@ -640,9 +640,9 @@  discard block
 block discarded – undo
640 640
 		$tables = array();
641 641
 
642 642
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
643
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
643
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
644 644
 		} elseif ( ! $this->is_GF_25() ) {
645
-			$tables[] = \GFFormsModel::get_lead_notes_table_name();
645
+			$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
646 646
 		}
647 647
 
648 648
 		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@  discard block
 block discarded – undo
20 20
 <div id="publishing-action">
21 21
 	<?php
22 22
 
23
-    /**
24
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
25
-     * @since 1.11.1
26
-     * @since 2.11 The cancel link now uses history.back() so the $back_link URL matters less.
27
-     * @param string $back_link Existing URL of the Cancel link
28
-     * @param array $form The Gravity Forms form
29
-     * @param array $entry The Gravity Forms entry
30
-     * @param int $view_id The current View ID
31
-     */
32
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
23
+	/**
24
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
25
+	 * @since 1.11.1
26
+	 * @since 2.11 The cancel link now uses history.back() so the $back_link URL matters less.
27
+	 * @param string $back_link Existing URL of the Cancel link
28
+	 * @param array $form The Gravity Forms form
29
+	 * @param array $entry The Gravity Forms entry
30
+	 * @param int $view_id The current View ID
31
+	 */
32
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
33 33
 
34 34
 	/**
35 35
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
 	 * @used-by GravityView_Delete_Entry::add_delete_button()
85 85
 	 *
86 86
 	 * @since 1.5.1
87
-     * @since 2.0.13 Added $post_id
87
+	 * @since 2.0.13 Added $post_id
88 88
 	 * @param array $form The Gravity Forms form
89 89
 	 * @param array $entry The Gravity Forms entry
90 90
 	 * @param int $view_id The current View ID
91
-     * @param int $post_id The current Post ID
91
+	 * @param int $post_id The current Post ID
92 92
 	 */
93 93
 	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id );
94 94
 	?>
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -44,35 +44,35 @@  discard block
 block discarded – undo
44 44
 
45 45
 	if ( $object->show_previous_button ) {
46 46
 		$previous_tabindex = GFCommon::get_tabindex();
47
-		$previous_label = GFCommon::replace_variables( $labels['previous'], $object->form, $object->entry );
47
+		$previous_label = GFCommon::replace_variables( $labels[ 'previous' ], $object->form, $object->entry );
48 48
 		?>
49
-		<input id="gform_previous_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $previous_label ); ?>" name="save" />
49
+		<input id="gform_previous_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $previous_label ); ?>" name="save" />
50 50
 		<?php
51 51
 	}
52 52
 
53 53
 	if ( $object->show_next_button ) {
54
-		$next_tabindex    = GFCommon::get_tabindex();
55
-		$next_label = GFCommon::replace_variables( $labels['next'], $object->form, $object->entry );
54
+		$next_tabindex = GFCommon::get_tabindex();
55
+		$next_label = GFCommon::replace_variables( $labels[ 'next' ], $object->form, $object->entry );
56 56
 		?>
57
-		<input id="gform_next_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $next_label ); ?>" name="save" />
57
+		<input id="gform_next_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $next_label ); ?>" name="save" />
58 58
 		<?php
59 59
 	}
60 60
 
61 61
 	if ( $object->show_update_button ) {
62
-		$update_tabindex  = GFCommon::get_tabindex();
63
-		$update_label = GFCommon::replace_variables( $labels['submit'], $object->form, $object->entry );
62
+		$update_tabindex = GFCommon::get_tabindex();
63
+		$update_label = GFCommon::replace_variables( $labels[ 'submit' ], $object->form, $object->entry );
64 64
 		?>
65
-		<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $update_label ); ?>" name="save" />
65
+		<input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $update_label ); ?>" name="save" />
66 66
 		<?php
67 67
 	}
68 68
 
69
-	$cancel_tabindex   = GFCommon::get_tabindex();
70
-	$cancel_label = GFCommon::replace_variables( $labels['cancel'], $object->form, $object->entry );
69
+	$cancel_tabindex = GFCommon::get_tabindex();
70
+	$cancel_label = GFCommon::replace_variables( $labels[ 'cancel' ], $object->form, $object->entry );
71 71
 
72 72
 	// If the entry has been edited, history.back() will keep pointing to the Edit Entry screen. Go back before editing, please!
73 73
 	// On first visit, will be history.go(-1) because (0 + 1 * -1).
74 74
 	// After updating twice, history.go(-3) because (2 + 1 * -1)
75
-	$update_count = (int) \GV\Utils::_POST( 'update_count', 0 );
75
+	$update_count = (int)\GV\Utils::_POST( 'update_count', 0 );
76 76
 
77 77
 	/**
78 78
 	 * @filter `gravityview/edit_entry/cancel_onclick` Modify the `onclick` attribute for the back link. To remove `onclick` altogether, return an empty string.
@@ -106,5 +106,5 @@  discard block
 block discarded – undo
106 106
 	?>
107 107
 	<input type='hidden' name='update_count' value='<?php echo $update_count + 1; ?>'/>
108 108
 	<input type="hidden" name="action" value="update" />
109
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
109
+	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" />
110 110
 </div>
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 3 patches
Indentation   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -17,118 +17,118 @@
 block discarded – undo
17 17
  */
18 18
 abstract class AbstractLogger implements LoggerInterface
19 19
 {
20
-    /**
21
-     * System is unusable.
22
-     *
23
-     * @param string  $message
24
-     * @param mixed[] $context
25
-     *
26
-     * @return void
27
-     */
28
-    public function emergency($message, array $context = array())
29
-    {
30
-        $this->log(LogLevel::EMERGENCY, $message, $context);
31
-    }
20
+	/**
21
+	 * System is unusable.
22
+	 *
23
+	 * @param string  $message
24
+	 * @param mixed[] $context
25
+	 *
26
+	 * @return void
27
+	 */
28
+	public function emergency($message, array $context = array())
29
+	{
30
+		$this->log(LogLevel::EMERGENCY, $message, $context);
31
+	}
32 32
 
33
-    /**
34
-     * Action must be taken immediately.
35
-     *
36
-     * Example: Entire website down, database unavailable, etc. This should
37
-     * trigger the SMS alerts and wake you up.
38
-     *
39
-     * @param string  $message
40
-     * @param mixed[] $context
41
-     *
42
-     * @return void
43
-     */
44
-    public function alert($message, array $context = array())
45
-    {
46
-        $this->log(LogLevel::ALERT, $message, $context);
47
-    }
33
+	/**
34
+	 * Action must be taken immediately.
35
+	 *
36
+	 * Example: Entire website down, database unavailable, etc. This should
37
+	 * trigger the SMS alerts and wake you up.
38
+	 *
39
+	 * @param string  $message
40
+	 * @param mixed[] $context
41
+	 *
42
+	 * @return void
43
+	 */
44
+	public function alert($message, array $context = array())
45
+	{
46
+		$this->log(LogLevel::ALERT, $message, $context);
47
+	}
48 48
 
49
-    /**
50
-     * Critical conditions.
51
-     *
52
-     * Example: Application component unavailable, unexpected exception.
53
-     *
54
-     * @param string  $message
55
-     * @param mixed[] $context
56
-     *
57
-     * @return void
58
-     */
59
-    public function critical($message, array $context = array())
60
-    {
61
-        $this->log(LogLevel::CRITICAL, $message, $context);
62
-    }
49
+	/**
50
+	 * Critical conditions.
51
+	 *
52
+	 * Example: Application component unavailable, unexpected exception.
53
+	 *
54
+	 * @param string  $message
55
+	 * @param mixed[] $context
56
+	 *
57
+	 * @return void
58
+	 */
59
+	public function critical($message, array $context = array())
60
+	{
61
+		$this->log(LogLevel::CRITICAL, $message, $context);
62
+	}
63 63
 
64
-    /**
65
-     * Runtime errors that do not require immediate action but should typically
66
-     * be logged and monitored.
67
-     *
68
-     * @param string  $message
69
-     * @param mixed[] $context
70
-     *
71
-     * @return void
72
-     */
73
-    public function error($message, array $context = array())
74
-    {
75
-        $this->log(LogLevel::ERROR, $message, $context);
76
-    }
64
+	/**
65
+	 * Runtime errors that do not require immediate action but should typically
66
+	 * be logged and monitored.
67
+	 *
68
+	 * @param string  $message
69
+	 * @param mixed[] $context
70
+	 *
71
+	 * @return void
72
+	 */
73
+	public function error($message, array $context = array())
74
+	{
75
+		$this->log(LogLevel::ERROR, $message, $context);
76
+	}
77 77
 
78
-    /**
79
-     * Exceptional occurrences that are not errors.
80
-     *
81
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
82
-     * that are not necessarily wrong.
83
-     *
84
-     * @param string  $message
85
-     * @param mixed[] $context
86
-     *
87
-     * @return void
88
-     */
89
-    public function warning($message, array $context = array())
90
-    {
91
-        $this->log(LogLevel::WARNING, $message, $context);
92
-    }
78
+	/**
79
+	 * Exceptional occurrences that are not errors.
80
+	 *
81
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
82
+	 * that are not necessarily wrong.
83
+	 *
84
+	 * @param string  $message
85
+	 * @param mixed[] $context
86
+	 *
87
+	 * @return void
88
+	 */
89
+	public function warning($message, array $context = array())
90
+	{
91
+		$this->log(LogLevel::WARNING, $message, $context);
92
+	}
93 93
 
94
-    /**
95
-     * Normal but significant events.
96
-     *
97
-     * @param string  $message
98
-     * @param mixed[] $context
99
-     *
100
-     * @return void
101
-     */
102
-    public function notice($message, array $context = array())
103
-    {
104
-        $this->log(LogLevel::NOTICE, $message, $context);
105
-    }
94
+	/**
95
+	 * Normal but significant events.
96
+	 *
97
+	 * @param string  $message
98
+	 * @param mixed[] $context
99
+	 *
100
+	 * @return void
101
+	 */
102
+	public function notice($message, array $context = array())
103
+	{
104
+		$this->log(LogLevel::NOTICE, $message, $context);
105
+	}
106 106
 
107
-    /**
108
-     * Interesting events.
109
-     *
110
-     * Example: User logs in, SQL logs.
111
-     *
112
-     * @param string  $message
113
-     * @param mixed[] $context
114
-     *
115
-     * @return void
116
-     */
117
-    public function info($message, array $context = array())
118
-    {
119
-        $this->log(LogLevel::INFO, $message, $context);
120
-    }
107
+	/**
108
+	 * Interesting events.
109
+	 *
110
+	 * Example: User logs in, SQL logs.
111
+	 *
112
+	 * @param string  $message
113
+	 * @param mixed[] $context
114
+	 *
115
+	 * @return void
116
+	 */
117
+	public function info($message, array $context = array())
118
+	{
119
+		$this->log(LogLevel::INFO, $message, $context);
120
+	}
121 121
 
122
-    /**
123
-     * Detailed debug information.
124
-     *
125
-     * @param string  $message
126
-     * @param mixed[] $context
127
-     *
128
-     * @return void
129
-     */
130
-    public function debug($message, array $context = array())
131
-    {
132
-        $this->log(LogLevel::DEBUG, $message, $context);
133
-    }
122
+	/**
123
+	 * Detailed debug information.
124
+	 *
125
+	 * @param string  $message
126
+	 * @param mixed[] $context
127
+	 *
128
+	 * @return void
129
+	 */
130
+	public function debug($message, array $context = array())
131
+	{
132
+		$this->log(LogLevel::DEBUG, $message, $context);
133
+	}
134 134
 }
Please login to merge, or discard this 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.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,8 +15,7 @@  discard block
 block discarded – undo
15 15
  * reduce boilerplate code that a simple Logger that does the same thing with
16 16
  * messages regardless of the error level has to implement.
17 17
  */
18
-abstract class AbstractLogger implements LoggerInterface
19
-{
18
+abstract class AbstractLogger implements LoggerInterface {
20 19
     /**
21 20
      * System is unusable.
22 21
      *
@@ -25,8 +24,7 @@  discard block
 block discarded – undo
25 24
      *
26 25
      * @return void
27 26
      */
28
-    public function emergency($message, array $context = array())
29
-    {
27
+    public function emergency($message, array $context = array()) {
30 28
         $this->log(LogLevel::EMERGENCY, $message, $context);
31 29
     }
32 30
 
@@ -41,8 +39,7 @@  discard block
 block discarded – undo
41 39
      *
42 40
      * @return void
43 41
      */
44
-    public function alert($message, array $context = array())
45
-    {
42
+    public function alert($message, array $context = array()) {
46 43
         $this->log(LogLevel::ALERT, $message, $context);
47 44
     }
48 45
 
@@ -56,8 +53,7 @@  discard block
 block discarded – undo
56 53
      *
57 54
      * @return void
58 55
      */
59
-    public function critical($message, array $context = array())
60
-    {
56
+    public function critical($message, array $context = array()) {
61 57
         $this->log(LogLevel::CRITICAL, $message, $context);
62 58
     }
63 59
 
@@ -70,8 +66,7 @@  discard block
 block discarded – undo
70 66
      *
71 67
      * @return void
72 68
      */
73
-    public function error($message, array $context = array())
74
-    {
69
+    public function error($message, array $context = array()) {
75 70
         $this->log(LogLevel::ERROR, $message, $context);
76 71
     }
77 72
 
@@ -86,8 +81,7 @@  discard block
 block discarded – undo
86 81
      *
87 82
      * @return void
88 83
      */
89
-    public function warning($message, array $context = array())
90
-    {
84
+    public function warning($message, array $context = array()) {
91 85
         $this->log(LogLevel::WARNING, $message, $context);
92 86
     }
93 87
 
@@ -99,8 +93,7 @@  discard block
 block discarded – undo
99 93
      *
100 94
      * @return void
101 95
      */
102
-    public function notice($message, array $context = array())
103
-    {
96
+    public function notice($message, array $context = array()) {
104 97
         $this->log(LogLevel::NOTICE, $message, $context);
105 98
     }
106 99
 
@@ -114,8 +107,7 @@  discard block
 block discarded – undo
114 107
      *
115 108
      * @return void
116 109
      */
117
-    public function info($message, array $context = array())
118
-    {
110
+    public function info($message, array $context = array()) {
119 111
         $this->log(LogLevel::INFO, $message, $context);
120 112
     }
121 113
 
@@ -127,8 +119,7 @@  discard block
 block discarded – undo
127 119
      *
128 120
      * @return void
129 121
      */
130
-    public function debug($message, array $context = array())
131
-    {
122
+    public function debug($message, array $context = array()) {
132 123
         $this->log(LogLevel::DEBUG, $message, $context);
133 124
     }
134 125
 }
Please login to merge, or discard this patch.
trustedlogin/psr/log/Psr/Log/LoggerAwareTrait.php 3 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -13,20 +13,20 @@
 block discarded – undo
13 13
  */
14 14
 trait LoggerAwareTrait
15 15
 {
16
-    /**
17
-     * The logger instance.
18
-     *
19
-     * @var LoggerInterface|null
20
-     */
21
-    protected $logger;
16
+	/**
17
+	 * The logger instance.
18
+	 *
19
+	 * @var LoggerInterface|null
20
+	 */
21
+	protected $logger;
22 22
 
23
-    /**
24
-     * Sets a logger.
25
-     *
26
-     * @param LoggerInterface $logger
27
-     */
28
-    public function setLogger(LoggerInterface $logger)
29
-    {
30
-        $this->logger = $logger;
31
-    }
23
+	/**
24
+	 * Sets a logger.
25
+	 *
26
+	 * @param LoggerInterface $logger
27
+	 */
28
+	public function setLogger(LoggerInterface $logger)
29
+	{
30
+		$this->logger = $logger;
31
+	}
32 32
 }
Please login to merge, or discard this 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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,8 +11,7 @@  discard block
 block discarded – undo
11 11
 /**
12 12
  * Basic Implementation of LoggerAwareInterface.
13 13
  */
14
-trait LoggerAwareTrait
15
-{
14
+trait LoggerAwareTrait {
16 15
     /**
17 16
      * The logger instance.
18 17
      *
@@ -25,8 +24,7 @@  discard block
 block discarded – undo
25 24
      *
26 25
      * @param LoggerInterface $logger
27 26
      */
28
-    public function setLogger(LoggerInterface $logger)
29
-    {
27
+    public function setLogger(LoggerInterface $logger) {
30 28
         $this->logger = $logger;
31 29
     }
32 30
 }
Please login to merge, or discard this patch.