Completed
Pull Request — develop (#1492)
by Zack
28:58 queued 09:00
created
class-gravityview-plugin-hooks-gravity-forms-coupon.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		 */
54 54
 		$hide_coupon_fields = apply_filters( 'gravityview/edit_entry/hide-coupon-fields', $has_transaction_data );
55 55
 
56
-		return (bool) $hide_coupon_fields;
56
+		return (bool)$hide_coupon_fields;
57 57
 	}
58 58
 
59 59
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	public function edit_entry_field_blacklist( $blacklist = array(), $entry = array() ) {
70 70
 
71 71
 		if ( $this->should_hide_coupon_fields( $entry ) ) {
72
-			$blacklist[] = 'coupon';
72
+			$blacklist[ ] = 'coupon';
73 73
 		}
74 74
 
75 75
 		return $blacklist;
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 		// No coupons match the codes provided
108 108
 		$discounts = gf_coupons()->get_coupons_by_codes( $coupon_codes, $form );
109 109
 
110
-		if( ! $discounts ) {
110
+		if ( ! $discounts ) {
111 111
 			return $value;
112 112
 		}
113 113
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		 * @see GF_Field_Coupon::get_field_input
117 117
 		 */
118 118
 		$_POST = ! isset( $_POST ) ? array() : $_POST;
119
-		$_POST[ 'gf_coupons_' . $form['id'] ] = json_encode( (array) $discounts );
119
+		$_POST[ 'gf_coupons_' . $form[ 'id' ] ] = json_encode( (array)$discounts );
120 120
 		$_POST[ 'input_' . $field->id ] = implode( ',', $coupon_codes );
121 121
 
122 122
 		return $value;
Please login to merge, or discard this patch.
includes/admin/field-types/type_multiselect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 		?>
14 14
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
15 15
 
16
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
16
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
17 17
 
18 18
 			echo $this->get_tooltip() . $this->get_field_desc();
19 19
 
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 
27 27
 	function render_input( $override_input = null ) {
28 28
 
29
-		if( isset( $override_input ) ) {
29
+		if ( isset( $override_input ) ) {
30 30
 			echo $override_input;
31 31
 			return;
32 32
 		}
33 33
 
34 34
 		?>
35 35
 		<select name="<?php echo esc_attr( $this->name ); ?>[]" id="<?php echo $this->get_field_id(); ?>" multiple="multiple">
36
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
36
+			<?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
37 37
 				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( in_array( $value, (array)$this->value ), true, true ); ?>><?php echo esc_html( $label ); ?></option>
38 38
 			<?php endforeach; ?>
39 39
 		</select>
Please login to merge, or discard this patch.
future/includes/class-gv-collection.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @return void
26 26
 	 */
27 27
 	public function add( $value ) {
28
-		$this->storage []= $value;
28
+		$this->storage [ ] = $value;
29 29
 	}
30 30
 
31 31
 	/**
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * @return void
50 50
 	 */
51 51
 	public function merge( \GV\Collection $collection ) {
52
-		array_map( array( $this, 'add'), $collection->all() );
52
+		array_map( array( $this, 'add' ), $collection->all() );
53 53
 	}
54 54
 
55 55
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-logger.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
      *
37 37
      * @return void
38 38
      */
39
-    public function emergency($message, array $context = array())
39
+    public function emergency( $message, array $context = array() )
40 40
     {
41
-        $this->log(LogLevel::EMERGENCY, $message, $context);
41
+        $this->log( LogLevel::EMERGENCY, $message, $context );
42 42
     }
43 43
 
44 44
     /**
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
      *
53 53
      * @return void
54 54
      */
55
-    public function alert($message, array $context = array())
55
+    public function alert( $message, array $context = array() )
56 56
     {
57
-        $this->log(LogLevel::ALERT, $message, $context);
57
+        $this->log( LogLevel::ALERT, $message, $context );
58 58
     }
59 59
 
60 60
     /**
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
      *
68 68
      * @return void
69 69
      */
70
-    public function critical($message, array $context = array())
70
+    public function critical( $message, array $context = array() )
71 71
     {
72
-        $this->log(LogLevel::CRITICAL, $message, $context);
72
+        $this->log( LogLevel::CRITICAL, $message, $context );
73 73
     }
74 74
 
75 75
     /**
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
      *
82 82
      * @return void
83 83
      */
84
-    public function error($message, array $context = array())
84
+    public function error( $message, array $context = array() )
85 85
     {
86
-        $this->log(LogLevel::ERROR, $message, $context);
86
+        $this->log( LogLevel::ERROR, $message, $context );
87 87
     }
88 88
 
89 89
     /**
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
      *
98 98
      * @return void
99 99
      */
100
-    public function warning($message, array $context = array())
100
+    public function warning( $message, array $context = array() )
101 101
     {
102
-        $this->log(LogLevel::WARNING, $message, $context);
102
+        $this->log( LogLevel::WARNING, $message, $context );
103 103
     }
104 104
 
105 105
     /**
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
      *
111 111
      * @return void
112 112
      */
113
-    public function notice($message, array $context = array())
113
+    public function notice( $message, array $context = array() )
114 114
     {
115
-        $this->log(LogLevel::NOTICE, $message, $context);
115
+        $this->log( LogLevel::NOTICE, $message, $context );
116 116
     }
117 117
 
118 118
     /**
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
      *
126 126
      * @return void
127 127
      */
128
-    public function info($message, array $context = array())
128
+    public function info( $message, array $context = array() )
129 129
     {
130
-        $this->log(LogLevel::INFO, $message, $context);
130
+        $this->log( LogLevel::INFO, $message, $context );
131 131
     }
132 132
 
133 133
     /**
@@ -138,9 +138,9 @@  discard block
 block discarded – undo
138 138
      *
139 139
      * @return void
140 140
      */
141
-    public function debug($message, array $context = array())
141
+    public function debug( $message, array $context = array() )
142 142
     {
143
-        $this->log(LogLevel::DEBUG, $message, $context);
143
+        $this->log( LogLevel::DEBUG, $message, $context );
144 144
     }
145 145
 
146 146
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry-filter-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,10 +55,10 @@
 block discarded – undo
55 55
 						$search_criteria[ $key ] = $field_filters;
56 56
 					}
57 57
 
58
-					if ( ! empty( $b[ $key ]['mode'] ) ) {
59
-						$search_criteria[ $key ]['mode' ] = $b[ $key ]['mode'];
60
-					} else if ( ! empty( $a[ $key ]['mode'] ) ) {
61
-						$search_criteria[ $key ]['mode' ] = $a[ $key ]['mode'];
58
+					if ( ! empty( $b[ $key ][ 'mode' ] ) ) {
59
+						$search_criteria[ $key ][ 'mode' ] = $b[ $key ][ 'mode' ];
60
+					} else if ( ! empty( $a[ $key ][ 'mode' ] ) ) {
61
+						$search_criteria[ $key ][ 'mode' ] = $a[ $key ][ 'mode' ];
62 62
 					}
63 63
 					break;
64 64
 				case 'start_date':
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-date.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,10 +11,10 @@
 block discarded – undo
11 11
 ?>
12 12
 
13 13
 <div class="gv-search-box gv-search-date">
14
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
15
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
14
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
15
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
16 16
 	<?php } ?>
17 17
 	<p>
18
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
18
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
19 19
 	</p>
20 20
 </div>
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-input_text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,10 +10,10 @@
 block discarded – undo
10 10
 
11 11
 ?>
12 12
 <div class="gv-search-box gv-search-field-text">
13
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
14
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
13
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
14
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
15 15
 	<?php } ?>
16 16
 	<p>
17
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>">
17
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>">
18 18
 	</p>
19 19
 </div>
20 20
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-single_checkbox.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@
 block discarded – undo
12 12
 ?>
13 13
 
14 14
 <div class="gv-search-box gv-search-field-single_checkbox">
15
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" class="gv-check-radio">
16
-		<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" <?php checked( '1', $search_field['value'], true ); ?>>
17
-			<?php if( ! gv_empty( $search_field['label'], false, false ) ) { echo esc_html(  $search_field['label'] ); } ?>
15
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" class="gv-check-radio">
16
+		<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" <?php checked( '1', $search_field[ 'value' ], true ); ?>>
17
+			<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { echo esc_html( $search_field[ 'label' ] ); } ?>
18 18
 	</label>
19 19
 </div>
20 20
\ No newline at end of file
Please login to merge, or discard this patch.
includes/class-admin-welcome.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 	 * @since 1.0
35 35
 	 */
36 36
 	public function __construct() {
37
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
37
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
38 38
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
39
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
40
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
39
+		add_action( 'admin_init', array( $this, 'welcome' ) );
40
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
41 41
 	}
42 42
 
43 43
 	/**
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 		// Add help page to GravityView menu
54 54
 		add_submenu_page(
55 55
 			'edit.php?post_type=gravityview',
56
-			__('GravityView: Getting Started', 'gravityview'),
57
-			__('Getting Started', 'gravityview'),
56
+			__( 'GravityView: Getting Started', 'gravityview' ),
57
+			__( 'Getting Started', 'gravityview' ),
58 58
 			$this->minimum_capability,
59 59
 			'gv-getting-started',
60 60
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @return boolean  $is_page   True: yep; false: nope
89 89
 	 */
90
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
90
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
91 91
 		global $plugin_page;
92 92
 
93
-		if($is_page) { return $is_page; }
93
+		if ( $is_page ) { return $is_page; }
94 94
 
95 95
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
96 96
 	}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
109 109
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
110 110
 
111
-		if( !$this->is_dashboard_page() ) { return; }
111
+		if ( ! $this->is_dashboard_page() ) { return; }
112 112
 
113 113
 		?>
114 114
         <style type="text/css" media="screen" xmlns="http://www.w3.org/1999/html">
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		// Don't fetch -beta, etc.
133 133
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
134 134
 
135
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
135
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
136 136
 
137 137
 		echo gravityview_get_floaty( 132 );
138 138
 		?>
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
142 142
 
143 143
 		<h2 class="nav-tab-wrapper clear">
144
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
144
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
145 145
 				<?php _e( "Getting Started", 'gravityview' ); ?>
146 146
 			</a>
147
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
147
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
148 148
 				<?php _e( "List of Changes", 'gravityview' ); ?>
149 149
 			</a>
150
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
150
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
151 151
 				<?php _e( 'Credits', 'gravityview' ); ?>
152 152
 			</a>
153 153
 		</h2>
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 					<h3>Create a View</h3>
183 183
 
184 184
                     <ol class="ol-decimal">
185
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
185
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
186 186
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
187 187
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
188 188
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 					</ul>
465 465
 
466 466
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
467
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
467
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
468 468
 				</div>
469 469
 			</div>
470 470
 
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 		global $plugin_page;
508 508
 
509 509
 		// Bail if we're just editing the plugin
510
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
510
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
511 511
 
512 512
 		// Bail if no activation redirect
513 513
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 		$upgrade = get_option( 'gv_version_upgraded_from' );
519 519
 
520 520
 		// Don't do anything if they've already seen the new version info
521
-		if( $upgrade === GravityView_Plugin::version ) {
521
+		if ( $upgrade === GravityView_Plugin::version ) {
522 522
 			return;
523 523
 		}
524 524
 
@@ -526,10 +526,10 @@  discard block
 block discarded – undo
526 526
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
527 527
 
528 528
 		// Bail if activating from network, or bulk
529
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
529
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
530 530
 
531 531
 		// First time install
532
-		if( ! $upgrade ) {
532
+		if ( ! $upgrade ) {
533 533
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
534 534
 		}
535 535
 		// Update
Please login to merge, or discard this patch.