Completed
Pull Request — master (#1171)
by Gennady
45:40 queued 17:48
created
includes/fields/class-gravityview-field-payment-status.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	 */
24 24
 	public function __construct() {
25 25
 		$this->label = esc_html__( 'Payment Status', 'gravityview' );
26
-		$this->description = esc_html__('The current payment status of the entry (ie "Processing", "Failed", "Cancelled", "Approved").', 'gravityview' );
26
+		$this->description = esc_html__( 'The current payment status of the entry (ie "Processing", "Failed", "Cancelled", "Approved").', 'gravityview' );
27 27
 		parent::__construct();
28 28
 	}
29 29
 }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-calculation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@
 block discarded – undo
37 37
 	public function blacklist_field_types( $field_types = array(), $context = '' ) {
38 38
 
39 39
 		// Allow Calculation field in Edit Entry
40
-		if( 'edit' !== $context ) {
41
-			$field_types[] = $this->name;
40
+		if ( 'edit' !== $context ) {
41
+			$field_types[ ] = $this->name;
42 42
 		}
43 43
 
44 44
 		return $field_types;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-website.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,16 +26,16 @@  discard block
 block discarded – undo
26 26
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
27 27
 
28 28
 		// It makes no sense to use this as the link.
29
-		unset( $field_options['show_as_link'] );
29
+		unset( $field_options[ 'show_as_link' ] );
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35 35
 		/**
36 36
 		 * @since 1.8
37 37
 		 */
38
-		$field_options['anchor_text'] = array(
38
+		$field_options[ 'anchor_text' ] = array(
39 39
 			'type' => 'text',
40 40
 			'label' => __( 'Link Text:', 'gravityview' ),
41 41
 			'desc' => __( 'Define custom link text. Leave blank to display the URL', 'gravityview' ),
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 			'merge_tags' => 'force',
44 44
 		);
45 45
 
46
-		$field_options['truncatelink'] = array(
46
+		$field_options[ 'truncatelink' ] = array(
47 47
 			'type' => 'checkbox',
48 48
 			'value' => true,
49 49
 			'label' => __( 'Shorten Link Display', 'gravityview' ),
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 			'desc' => __( 'Don’t show the full URL, only show the domain.', 'gravityview' )
52 52
 		);
53 53
 
54
-		$field_options['open_same_window'] = array(
54
+		$field_options[ 'open_same_window' ] = array(
55 55
 			'type' => 'checkbox',
56 56
 			'value' => false,
57 57
 			'label' => __( 'Open link in the same window?', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gquiz_score.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
20 20
 
21
-		if( 'edit' === $context ) {
21
+		if ( 'edit' === $context ) {
22 22
 			return $field_options;
23 23
 		}
24 24
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			'quiz_use_max_score' => array(
27 27
 				'type' => 'checkbox',
28 28
 				'label' => __( 'Show Max Score?', 'gravityview' ),
29
-				'desc' => __('Display score as the a fraction: "[score]/[max score]". If unchecked, will display score.', 'gravityview'),
29
+				'desc' => __( 'Display score as the a fraction: "[score]/[max score]". If unchecked, will display score.', 'gravityview' ),
30 30
 				'value' => true,
31 31
 				'merge_tags' => false,
32 32
 			),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-section.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 
42 42
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
43 43
 
44
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
44
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
45 45
 
46 46
 		// Set the default CSS class to gv-section, which applies a border and top/bottom margin
47
-		$field_options['custom_class']['value'] = 'gv-section';
47
+		$field_options[ 'custom_class' ][ 'value' ] = 'gv-section';
48 48
 
49 49
 		return $field_options;
50 50
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-created-by.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -34,23 +34,23 @@  discard block
 block discarded – undo
34 34
 
35 35
 		$merge_tags = array(
36 36
 			array(
37
-				'label' => __('Entry Creator: Display Name', 'gravityview'),
37
+				'label' => __( 'Entry Creator: Display Name', 'gravityview' ),
38 38
 				'tag' => '{created_by:display_name}'
39 39
 			),
40 40
 			array(
41
-				'label' => __('Entry Creator: Email', 'gravityview'),
41
+				'label' => __( 'Entry Creator: Email', 'gravityview' ),
42 42
 				'tag' => '{created_by:user_email}'
43 43
 			),
44 44
 			array(
45
-				'label' => __('Entry Creator: Username', 'gravityview'),
45
+				'label' => __( 'Entry Creator: Username', 'gravityview' ),
46 46
 				'tag' => '{created_by:user_login}'
47 47
 			),
48 48
 			array(
49
-				'label' => __('Entry Creator: User ID', 'gravityview'),
49
+				'label' => __( 'Entry Creator: User ID', 'gravityview' ),
50 50
 				'tag' => '{created_by:ID}'
51 51
 			),
52 52
 			array(
53
-				'label' => __('Entry Creator: Roles', 'gravityview'),
53
+				'label' => __( 'Entry Creator: Roles', 'gravityview' ),
54 54
 				'tag' => '{created_by:roles}'
55 55
 			),
56 56
 		);
@@ -78,19 +78,19 @@  discard block
 block discarded – undo
78 78
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
79 79
 
80 80
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
81
-		if( empty( $entry['created_by'] ) ) {
81
+		if ( empty( $entry[ 'created_by' ] ) ) {
82 82
 			return $text;
83 83
 		}
84 84
 
85 85
 		// Get the creator of the entry
86
-		$entry_creator = new WP_User( $entry['created_by'] );
86
+		$entry_creator = new WP_User( $entry[ 'created_by' ] );
87 87
 
88 88
 		foreach ( $matches as $match ) {
89 89
 
90
-			$full_tag = $match[0];
91
-			$property = $match[1];
90
+			$full_tag = $match[ 0 ];
91
+			$property = $match[ 1 ];
92 92
 
93
-			switch( $property ) {
93
+			switch ( $property ) {
94 94
 				/** @since 1.13.2 */
95 95
 				case 'roles':
96 96
 					$value = implode( ', ', $entry_creator->roles );
@@ -113,18 +113,18 @@  discard block
 block discarded – undo
113 113
 
114 114
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
115 115
 
116
-		if( 'edit' === $context ) {
116
+		if ( 'edit' === $context ) {
117 117
 			return $field_options;
118 118
 		}
119 119
 
120
-		$field_options['name_display'] = array(
120
+		$field_options[ 'name_display' ] = array(
121 121
 			'type' => 'select',
122 122
 			'label' => __( 'User Format', 'gravityview' ),
123
-			'desc' => __( 'How should the User information be displayed?', 'gravityview'),
123
+			'desc' => __( 'How should the User information be displayed?', 'gravityview' ),
124 124
 			'choices' => array(
125
-				'display_name' => __('Display Name (Example: "Ellen Ripley")', 'gravityview'),
126
-				'user_login' => __('Username (Example: "nostromo")', 'gravityview'),
127
-				'ID' => __('User ID # (Example: 426)', 'gravityview'),
125
+				'display_name' => __( 'Display Name (Example: "Ellen Ripley")', 'gravityview' ),
126
+				'user_login' => __( 'Username (Example: "nostromo")', 'gravityview' ),
127
+				'ID' => __( 'User ID # (Example: 426)', 'gravityview' ),
128 128
 			),
129 129
 			'value' => 'display_name'
130 130
 		);
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/select-template.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,27 +22,27 @@
 block discarded – undo
22 22
 
23 23
 <?php // list all the available templates (type= fresh or custom ) ?>
24 24
 <div class="gv-grid">
25
-	<?php foreach( $templates as $id => $template ) {
25
+	<?php foreach ( $templates as $id => $template ) {
26 26
 		$selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?>
27 27
 
28 28
 		<div class="gv-grid-col-1-3">
29
-			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
29
+			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
30 30
 				<div class="gv-view-types-hover">
31 31
 					<div>
32
-						<?php if( !empty( $template['buy_source'] ) ) { ?>
33
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
32
+						<?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?>
33
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
34 34
 						<?php } else { ?>
35
-							<p><a href="#gv_select_template" class="button button-large button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
36
-							<?php if( !empty( $template['preview'] ) ) { ?>
37
-								<a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
35
+							<p><a href="#gv_select_template" class="button button-large button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p>
36
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
37
+								<a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
38 38
 							<?php } ?>
39 39
 						<?php } ?>
40 40
 					</div>
41 41
 				</div>
42 42
 				<div class="gv-view-types-normal">
43
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
44
-					<h5><?php echo esc_attr( $template['label'] ); ?></h5>
45
-					<p class="description"><?php echo esc_attr( $template['description'] ); ?></p>
43
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
44
+					<h5><?php echo esc_attr( $template[ 'label' ] ); ?></h5>
45
+					<p class="description"><?php echo esc_attr( $template[ 'description' ] ); ?></p>
46 46
 				</div>
47 47
 			</div>
48 48
 		</div>
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/sort-filter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 	 */
27 27
 	GravityView_Render_Settings::render_setting_row( 'sort_columns', $current_settings );
28 28
 
29
-	$sort_fields_input = '<select name="template_settings[sort_field]" id="gravityview_sort_field">'.gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] ).'</select>';
29
+	$sort_fields_input = '<select name="template_settings[sort_field]" id="gravityview_sort_field">' . gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] ) . '</select>';
30 30
 
31 31
 	GravityView_Render_Settings::render_setting_row( 'sort_field', $current_settings, $sort_fields_input );
32 32
 
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/gravityview-navigation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
15 15
 	<?php
16 16
 
17
-	foreach( $metaboxes as $metabox ) {
18
-		$class = !isset( $class ) ? 'nav-tab-active' : '';
17
+	foreach ( $metaboxes as $metabox ) {
18
+		$class = ! isset( $class ) ? 'nav-tab-active' : '';
19 19
 	?>
20 20
 	<li class="ui-state-default">
21 21
 		<a class="nav-tab ui-tabs-anchor <?php echo $class; ?>" href="#<?php echo esc_attr( $metabox->id ); ?>">
Please login to merge, or discard this patch.