Completed
Pull Request — master (#1147)
by Gennady
20:27 queued 16:17
created
includes/class-oembed.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 	static function getInstance() {
43 43
 		gravityview()->log->notice( '\GravityView_oEmbed is deprecated. Use \GV\oEmbed instead.' );
44 44
 
45
-		if( empty( self::$instance ) ) {
45
+		if ( empty( self::$instance ) ) {
46 46
 			self::$instance = new self;
47 47
 			self::$instance->initialize();
48 48
 		}
Please login to merge, or discard this patch.
includes/class-gravityview-entry-list.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 	public function get_output() {
180 180
 
181 181
 		// No Entries
182
-		if( empty( $this->entries ) ) {
183
-			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
182
+		if ( empty( $this->entries ) ) {
183
+			return '<div class="gv-no-results">' . $this->empty_message . '</div>';
184 184
 		}
185 185
 
186 186
 		$output = '';
@@ -191,18 +191,18 @@  discard block
 block discarded – undo
191 191
 			$current_entry = GravityView_View::getInstance()->getCurrentEntry();
192 192
 		}
193 193
 
194
-		$output .= '<'. $this->wrapper_tag .'>';
194
+		$output .= '<' . $this->wrapper_tag . '>';
195 195
 
196
-		foreach( $this->entries as $entry ) {
196
+		foreach ( $this->entries as $entry ) {
197 197
 
198
-			if( $this->skip_entry( $entry, $current_entry ) ) {
198
+			if ( $this->skip_entry( $entry, $current_entry ) ) {
199 199
 				continue;
200 200
 			}
201 201
 
202 202
 			$output .= $this->get_item_output( $entry );
203 203
 		}
204 204
 
205
-		$output .= '</'. $this->wrapper_tag .'>';
205
+		$output .= '</' . $this->wrapper_tag . '>';
206 206
 
207 207
 		/**
208 208
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
@@ -225,15 +225,15 @@  discard block
 block discarded – undo
225 225
 	private function skip_entry( $entry, $current_entry ) {
226 226
 
227 227
 		// If skip entry is off, or there's no current entry, return false
228
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
228
+		if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
229 229
 			return false;
230 230
 		}
231 231
 
232 232
 		// If in Single or Edit mode, $current_entry will be an array.
233
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
233
+		$current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry;
234 234
 
235 235
 		// If the entry ID matches the current entry, yes: skip
236
-		if( $entry['id'] === $current_entry_id ) {
236
+		if ( $entry[ 'id' ] === $current_entry_id ) {
237 237
 			return true;
238 238
 		}
239 239
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
 		$item_output = gravityview_get_link( $link, $this->link_format );
262 262
 
263
-		if( !empty( $this->after_link ) ) {
263
+		if ( ! empty( $this->after_link ) ) {
264 264
 
265 265
 			/**
266 266
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -269,14 +269,14 @@  discard block
 block discarded – undo
269 269
 			 * @param array $entry Gravity Forms entry array
270 270
 			 * @param GravityView_Entry_List $this The current class instance
271 271
 			 */
272
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
272
+			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this );
273 273
 
274 274
 			$item_output .= $after_link;
275 275
 		}
276 276
 
277 277
 		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
278 278
 
279
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
279
+		$item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>';
280 280
 
281 281
 		/**
282 282
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
Please login to merge, or discard this patch.
includes/wordpress-widgets/class-gravityview-search-wp-widget.php 1 patch
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 		$widget_ops = array(
13 13
 			'classname' => 'widget_gravityview_search',
14
-			'description' => __( 'A search form for a specific GravityView.', 'gravityview')
14
+			'description' => __( 'A search form for a specific GravityView.', 'gravityview' )
15 15
 		);
16 16
 
17 17
 		$widget_display = array(
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	}
35 35
 
36 36
 	private function load_required_files() {
37
-		if( !class_exists( 'GravityView_Widget_Search' ) ) {
37
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
38 38
 			gravityview_register_gravityview_widgets();
39 39
 		}
40 40
 	}
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	public function widget( $args, $instance ) {
54 54
 
55 55
 		// Don't show unless a View ID has been set.
56
-		if( empty( $instance['view_id'] ) ) {
56
+		if ( empty( $instance[ 'view_id' ] ) ) {
57 57
 
58 58
 			gravityview()->log->debug( 'No View ID has been defined. Not showing the widget.', array( 'data' => $instance ) );
59 59
 
@@ -61,22 +61,22 @@  discard block
 block discarded – undo
61 61
 		}
62 62
 
63 63
 		/** This filter is documented in wp-includes/default-widgets.php */
64
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
64
+		$title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base );
65 65
 
66
-		echo $args['before_widget'];
66
+		echo $args[ 'before_widget' ];
67 67
 
68 68
 		if ( $title ) {
69
-			echo $args['before_title'] . $title . $args['after_title'];
69
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
70 70
 		}
71 71
 
72 72
 		// @todo Add to the widget configuration form
73
-		$instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
73
+		$instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
74 74
 
75
-		$instance['context'] = 'wp_widget';
75
+		$instance[ 'context' ] = 'wp_widget';
76 76
 
77 77
 		// form
78
-		$instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] );
79
-		$instance['form'] = GVCommon::get_form( $instance['form_id'] );
78
+		$instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] );
79
+		$instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] );
80 80
 
81 81
 		// We don't want to overwrite existing context, etc.
82 82
 		$previous_view = GravityView_View::getInstance();
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		 */
93 93
 		new GravityView_View( $previous_view );
94 94
 
95
-		echo $args['after_widget'];
95
+		echo $args[ 'after_widget' ];
96 96
 	}
97 97
 
98 98
 	/**
@@ -102,27 +102,27 @@  discard block
 block discarded – undo
102 102
 
103 103
 		$instance = $old_instance;
104 104
 
105
-		if( $this->is_preview() ) {
105
+		if ( $this->is_preview() ) {
106 106
 			//Oh! Sorry but still not fully compatible with customizer
107 107
 			return $instance;
108 108
 		}
109 109
 
110
-		$new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() );
110
+		$new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() );
111 111
 
112
-		$instance['title'] = strip_tags( $new_instance['title'] );
113
-		$instance['view_id'] = absint( $new_instance['view_id'] );
114
-		$instance['search_fields'] = $new_instance['search_fields'];
115
-		$instance['post_id'] = $new_instance['post_id'];
116
-		$instance['search_clear'] = $new_instance['search_clear'];
117
-		$instance['search_mode'] = $new_instance['search_mode'];
112
+		$instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] );
113
+		$instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] );
114
+		$instance[ 'search_fields' ] = $new_instance[ 'search_fields' ];
115
+		$instance[ 'post_id' ] = $new_instance[ 'post_id' ];
116
+		$instance[ 'search_clear' ] = $new_instance[ 'search_clear' ];
117
+		$instance[ 'search_mode' ] = $new_instance[ 'search_mode' ];
118 118
 
119
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'], true );
119
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ], true );
120 120
 
121 121
 		//check if post_id is a valid post with embedded View
122
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
122
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
123 123
 
124 124
 		// Share that the widget isn't brand new
125
-		$instance['updated']  = 1;
125
+		$instance[ 'updated' ] = 1;
126 126
 
127 127
 		return $instance;
128 128
 	}
@@ -133,28 +133,28 @@  discard block
 block discarded – undo
133 133
 	public function form( $instance ) {
134 134
 
135 135
 		// @todo Make compatible with Customizer
136
-		if( $this->is_preview() ) {
136
+		if ( $this->is_preview() ) {
137 137
 
138
-			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' );
138
+			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="' . admin_url( 'widgets.php' ) . '">', '</a>' );
139 139
 
140 140
 			echo wpautop( GravityView_Admin::get_floaty() . $warning );
141 141
 
142 142
 			return;
143 143
 		}
144 144
 
145
-		$instance = wp_parse_args( (array) $instance, self::get_defaults() );
145
+		$instance = wp_parse_args( (array)$instance, self::get_defaults() );
146 146
 
147
-		$title    = $instance['title'];
148
-		$view_id  = $instance['view_id'];
149
-		$post_id  = $instance['post_id'];
150
-		$search_fields = $instance['search_fields'];
151
-		$search_clear = $instance['search_clear'];
152
-		$search_mode = $instance['search_mode'];
147
+		$title    = $instance[ 'title' ];
148
+		$view_id  = $instance[ 'view_id' ];
149
+		$post_id  = $instance[ 'post_id' ];
150
+		$search_fields = $instance[ 'search_fields' ];
151
+		$search_clear = $instance[ 'search_clear' ];
152
+		$search_mode = $instance[ 'search_mode' ];
153 153
 
154 154
 		$views = GVCommon::get_all_views();
155 155
 
156 156
 		// If there are no views set up yet, we get outta here.
157
-		if( empty( $views ) ) { ?>
157
+		if ( empty( $views ) ) { ?>
158 158
 			<div id="select_gravityview_view">
159 159
 				<div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div>
160 160
 			</div>
@@ -162,17 +162,17 @@  discard block
 block discarded – undo
162 162
 		}
163 163
 		?>
164 164
 
165
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
165
+		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'gravityview' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
166 166
 
167 167
 		<?php
168 168
 		/**
169 169
 		 * Display errors generated for invalid embed IDs
170 170
 		 * @see GravityView_View_Data::is_valid_embed_id
171 171
 		 */
172
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
172
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
173 173
 			?>
174 174
 			<div class="error inline hide-on-view-change">
175
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
175
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
176 176
 			</div>
177 177
 			<?php
178 178
 			unset ( $error );
@@ -181,12 +181,12 @@  discard block
 block discarded – undo
181 181
 
182 182
 		<p>
183 183
 			<label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label>
184
-			<select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat">
184
+			<select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat">
185 185
 				<option value=""><?php esc_html_e( '&mdash; Select a View &mdash;', 'gravityview' ); ?></option>
186 186
 				<?php
187
-				foreach( $views as $view_option ) {
188
-					$title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title;
189
-					echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>';
187
+				foreach ( $views as $view_option ) {
188
+					$title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title;
189
+					echo '<option value="' . $view_option->ID . '" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>' . esc_html( sprintf( '%s #%d', $title, $view_option->ID ) ) . '</option>';
190 190
 				}
191 191
 				?>
192 192
 			</select>
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
 		 * Display errors generated for invalid embed IDs
199 199
 		 * @see GravityView_View_Data::is_valid_embed_id
200 200
 		 */
201
-		if( !empty( $instance['error_post_id'] ) ) {
201
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
202 202
 			?>
203 203
 			<div class="error inline">
204
-				<p><?php echo $instance['error_post_id']; ?></p>
204
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
205 205
 			</div>
206 206
 			<?php
207 207
 			unset ( $error );
@@ -209,40 +209,40 @@  discard block
 block discarded – undo
209 209
 		?>
210 210
 
211 211
 		<p>
212
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
213
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
212
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
213
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
214 214
 			<span class="howto"><?php
215
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
216
-				echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
215
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
216
+				echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
217 217
 				?></span>
218 218
 		</p>
219 219
 
220 220
 		<p>
221
-			<label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
222
-			<input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0">
223
-			<input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
221
+			<label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
222
+			<input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0">
223
+			<input id="<?php echo $this->get_field_id( 'search_clear' ); ?>" name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
224 224
 		</p>
225 225
 
226 226
 		<p>
227 227
 			<label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label>
228
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_any">
229
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
228
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any">
229
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
230 230
 				<?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?>
231 231
 			</label>
232
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_all">
233
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
232
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all">
233
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
234 234
 				<?php esc_html_e( 'Match All Fields', 'gravityview' ); ?>
235 235
 			</label>
236
-			<span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span
236
+			<span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span
237 237
 		</p>
238 238
 
239 239
 		<hr />
240 240
 
241 241
 		<?php // @todo: move style to CSS ?>
242 242
 		<div style="margin-bottom: 1em;">
243
-			<label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
244
-			<div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>">
245
-				<input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
243
+			<label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
244
+			<div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>">
245
+				<input id="<?php echo $this->get_field_id( 'search_fields' ); ?>" name="<?php echo $this->get_field_name( 'search_fields' ); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
246 246
 			</div>
247 247
 
248 248
 		</div>
Please login to merge, or discard this patch.
includes/class-admin-add-shortcode.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 
21 21
 	function __construct() {
22 22
 
23
-			add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30);
23
+			add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 30 );
24 24
 
25
-			add_action( 'admin_footer',	array( $this, 'add_shortcode_popup') );
25
+			add_action( 'admin_footer', array( $this, 'add_shortcode_popup' ) );
26 26
 
27 27
 			// adding styles and scripts
28
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
28
+			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
29 29
 
30 30
 			// ajax - populate sort fields based on the selected view
31 31
 			add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) );
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	function is_post_editor_screen() {
42 42
 		global $current_screen, $pagenow;
43
-		return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) );
43
+		return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, array( 'post.php', 'post-new.php' ) );
44 44
 	}
45 45
 
46 46
 
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
 		/**
56 56
 		 * @since 1.15.3
57 57
 		 */
58
-		if( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
58
+		if ( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
59 59
 			return;
60 60
 		}
61 61
 
62
-		if( !$this->is_post_editor_screen() ) {
62
+		if ( ! $this->is_post_editor_screen() ) {
63 63
 			return;
64 64
 		}
65 65
 		?>
66
-		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
66
+		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( "Insert View", 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
67 67
 		<?php
68 68
 
69 69
 	}
@@ -79,16 +79,16 @@  discard block
 block discarded – undo
79 79
 	function add_shortcode_popup() {
80 80
 		global $post;
81 81
 
82
-		if( !$this->is_post_editor_screen() ) {
82
+		if ( ! $this->is_post_editor_screen() ) {
83 83
 			return;
84 84
 		}
85 85
 
86
-		$post_type = get_post_type_object($post->post_type);
86
+		$post_type = get_post_type_object( $post->post_type );
87 87
 
88
-		$views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) );
88
+		$views = get_posts( array( 'post_type' => 'gravityview', 'posts_per_page' => -1 ) );
89 89
 
90 90
 		// If there are no views set up yet, we get outta here.
91
-		if( empty( $views ) ) {
91
+		if ( empty( $views ) ) {
92 92
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
93 93
 			return;
94 94
 		}
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 				<div class="wrap">
100 100
 
101 101
 					<h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2>
102
-					<p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
102
+					<p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
103 103
 
104 104
 					<div>
105 105
 						<h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3>
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
 						<select name="gravityview_id" id="gravityview_id">
108 108
 							<option value=""><?php esc_html_e( '&mdash; Select a View to Insert &mdash;', 'gravityview' ); ?></option>
109 109
 							<?php
110
-							foreach( $views as $view ) {
111
-								$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
112
-								echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
110
+							foreach ( $views as $view ) {
111
+								$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
112
+								echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
113 113
 							}
114 114
 							?>
115 115
 						</select>
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
 						foreach ( $settings as $key => $setting ) {
127 127
 
128
-							if( empty( $setting['show_in_shortcode'] ) ) { continue; }
128
+							if ( empty( $setting[ 'show_in_shortcode' ] ) ) { continue; }
129 129
 
130 130
 							GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' );
131 131
 						}
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 					</table>
135 135
 
136 136
 					<div class="submit">
137
-						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
138
-						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" />
137
+						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
138
+						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( "Cancel", 'gravityview' ); ?>" />
139 139
 					</div>
140 140
 
141 141
 				</div>
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 	 */
157 157
 	function add_scripts_and_styles() {
158 158
 
159
-		if( ! $this->is_post_editor_screen() ) {
159
+		if ( ! $this->is_post_editor_screen() ) {
160 160
 			return;
161 161
 		}
162 162
 
@@ -167,22 +167,22 @@  discard block
 block discarded – undo
167 167
 
168 168
 		$protocol = is_ssl() ? 'https://' : 'http://';
169 169
 
170
-		wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
170
+		wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
171 171
 
172 172
 		//enqueue styles
173
-		wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
173
+		wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
174 174
 		wp_enqueue_style( 'gravityview_postedit_styles' );
175 175
 
176
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
176
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
177 177
 
178 178
 		// custom js
179
-		wp_register_script( 'gravityview_postedit_scripts',  plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
179
+		wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
180 180
 		wp_enqueue_script( 'gravityview_postedit_scripts' );
181
-		wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array(
182
-			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'),
181
+		wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', array(
182
+			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode' ),
183 183
 			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
184
-			'alert_1' => esc_html__( 'Please select a View', 'gravityview'),
185
-		));
184
+			'alert_1' => esc_html__( 'Please select a View', 'gravityview' ),
185
+		) );
186 186
 
187 187
 	}
188 188
 
@@ -198,16 +198,16 @@  discard block
 block discarded – undo
198 198
 	function get_sortable_fields() {
199 199
 
200 200
 		// Not properly formatted request
201
-		if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) {
201
+		if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) {
202 202
 			exit( false );
203 203
 		}
204 204
 
205 205
 		// Not valid request
206
-		if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) {
206
+		if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) {
207 207
 			exit( false );
208 208
 		}
209 209
 
210
-		$viewid = (int)$_POST['viewid'];
210
+		$viewid = (int)$_POST[ 'viewid' ];
211 211
 
212 212
 		// fetch form id assigned to the view
213 213
 		$formid = gravityview_get_form_id( $viewid );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-custom.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 				$field_data = array(
110 110
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
111 111
 					'customLabel' => \GV\Utils::get( $edit_field, 'custom_label' ),
112
-				    'content' => \GV\Utils::get( $edit_field, 'content' ),
112
+					'content' => \GV\Utils::get( $edit_field, 'content' ),
113 113
 				);
114 114
 
115 115
 				// Replace merge tags in the content
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
42 42
 
43
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
43
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
44 44
 
45 45
 		$new_fields = array(
46 46
 			'content' => array(
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 		);
69 69
 
70 70
 		if ( 'edit' === $context ) {
71
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] );
71
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] );
72 72
 		}
73 73
 
74 74
 		return $new_fields + $field_options;
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 
103 103
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
104 104
 		// TODO: Make this available to other custom GV field types
105
-		foreach ( (array) $edit_fields as $edit_field ) {
105
+		foreach ( (array)$edit_fields as $edit_field ) {
106 106
 
107
-			if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) {
107
+			if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) {
108 108
 
109 109
 				$field_data = array(
110 110
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
117 117
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry->as_entry(), false, false );
118 118
 				}
119 119
 
120
-				$field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' );
120
+				$field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' );
121 121
 
122
-				$new_fields[] = new GF_Field_HTML( $field_data );
122
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
123 123
 
124 124
 			} else {
125
-				if( isset( $fields[ $i ] ) ) {
126
-					$new_fields[] =  $fields[ $i ];
125
+				if ( isset( $fields[ $i ] ) ) {
126
+					$new_fields[ ] = $fields[ $i ];
127 127
 				}
128 128
 				$i++;
129 129
 			}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-is-starred.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	}
36 36
 
37 37
 	private function add_hooks() {
38
-	    /** @see \GV\Field::get_value_filters */
38
+		/** @see \GV\Field::get_value_filters */
39 39
 		add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 );
40 40
 		add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 );
41 41
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	public function get_content( $output, $template ) {
77 77
 		$entry = $template->entry;
78 78
 
79
-	    $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png';
79
+		$star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png';
80 80
 
81 81
 		$entry_id = '';
82 82
 
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 
95 95
 	/**
96 96
 	 * Add JS to the bottom of the View if there is a star field and user has `gravityview_edit_entries` cap
97
-     *
97
+	 *
98 98
 	 * @param \GV\Template_Context $context The template context
99
-     * @since 2.0
100
-     *
101
-     * @return void
99
+	 * @since 2.0
100
+	 *
101
+	 * @return void
102 102
 	 */
103 103
 	public function print_script( $context ) {
104 104
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 		}
108 108
 
109 109
 		if ( ! GravityView_Roles_Capabilities::has_cap( 'gravityview_edit_entries' ) ) {
110
-            return;
110
+			return;
111 111
 		}
112 112
 
113 113
 		?>
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	private function add_hooks() {
38 38
 	    /** @see \GV\Field::get_value_filters */
39 39
 		add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 );
40
-		add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 );
40
+		add_action( 'gravityview/template/after', array( $this, 'print_script' ), 10, 1 );
41 41
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
42 42
 	}
43 43
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	function add_default_field( $entry_default_fields = array(), $form = array(), $zone = '' ) {
54 54
 
55
-		if( 'edit' !== $zone ) {
55
+		if ( 'edit' !== $zone ) {
56 56
 			$entry_default_fields[ $this->name ] = array(
57 57
 				'label' => $this->label,
58 58
 				'desc'  => $this->description,
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	public function get_content( $output, $template ) {
77 77
 		$entry = $template->entry;
78 78
 
79
-	    $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png';
79
+	    $star_url = GFCommon::get_base_url() . '/images/star' . intval( $entry[ 'is_starred' ] ) . '.png';
80 80
 
81 81
 		$entry_id = '';
82 82
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		}
86 86
 
87 87
 		// if( $show_as_star )
88
-		$output = '<img class="gv-star-image" '.$entry_id.' data-is_starred="'. intval( $entry['is_starred'] ) .'" src="'. esc_attr( $star_url ) .'" />';
88
+		$output = '<img class="gv-star-image" ' . $entry_id . ' data-is_starred="' . intval( $entry[ 'is_starred' ] ) . '" src="' . esc_attr( $star_url ) . '" />';
89 89
 
90 90
 		self::$has_star_field = true;
91 91
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function print_script( $context ) {
104 104
 
105
-		if( ! self::$has_star_field ) {
105
+		if ( ! self::$has_star_field ) {
106 106
 			return;
107 107
 		}
108 108
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-approval.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 		$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
26 26
 
27
-		$this->description =  esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
27
+		$this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
28 28
 
29 29
 		$this->add_hooks();
30 30
 
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
48 48
 
49
-		unset( $field_options['only_loggedin'] );
49
+		unset( $field_options[ 'only_loggedin' ] );
50 50
 
51
-		unset( $field_options['new_window'] );
51
+		unset( $field_options[ 'new_window' ] );
52 52
 
53
-		unset( $field_options['show_as_link'] );
53
+		unset( $field_options[ 'show_as_link' ] );
54 54
 
55 55
 		return $field_options;
56 56
 	}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 		add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
72 72
 
73
-		add_action( 'gravityview_datatables_scripts_styles',  array( $this, 'enqueue_and_localize_script' ) );
73
+		add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
74 74
 
75 75
 		add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
76 76
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	public function maybe_prevent_field_render( $html, $args ) {
93 93
 
94 94
 		// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
95
-		if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
95
+		if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
96 96
 			return '';
97 97
 		}
98 98
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	public function modify_search_parameters( $parameters ) {
123 123
 
124 124
 		if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) {
125
-			$parameters['sorting']['key'] = 'is_approved';
125
+			$parameters[ 'sorting' ][ 'key' ] = 'is_approved';
126 126
 		}
127 127
 
128 128
 		return $parameters;
@@ -138,18 +138,18 @@  discard block
 block discarded – undo
138 138
 	function register_scripts_and_styles() {
139 139
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
140 140
 
141
-		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
141
+		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
142 142
 
143 143
 		$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
144 144
 
145
-		if( class_exists( 'GravityView_View' ) ) {
145
+		if ( class_exists( 'GravityView_View' ) ) {
146 146
 			/**
147 147
 			 * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
148 148
 			 */
149 149
 			$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
150 150
 		}
151 151
 
152
-		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) )  );
152
+		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
153 153
 
154 154
 		/**
155 155
 		 * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		 */
159 159
 		$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
160 160
 
161
-		if( ! empty( $style_url ) ) {
161
+		if ( ! empty( $style_url ) ) {
162 162
 			wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
163 163
 		}
164 164
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	public function enqueue_and_localize_script() {
174 174
 
175 175
 		// The script is already registered and enqueued
176
-		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
176
+		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
177 177
 			return;
178 178
 		}
179 179
 
@@ -183,9 +183,9 @@  discard block
 block discarded – undo
183 183
 
184 184
 		wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
185 185
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
186
-			'nonce' => wp_create_nonce('gravityview_entry_approval'),
186
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
187 187
 			'status' => GravityView_Entry_Approval_Status::get_all(),
188
-		));
188
+		) );
189 189
 
190 190
 	}
191 191
 
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
204 204
 
205
-		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
206
-			$entry_default_fields["{$this->name}"] = array(
205
+		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
206
+			$entry_default_fields[ "{$this->name}" ] = array(
207 207
 				'label' => $this->label,
208 208
 				'desc'  => $this->description,
209 209
 				'type'  => $this->name,
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-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
 	 * @see GFCommon::get_field_filter_settings Gravity Forms suggests checkboxes should just be "contains"
14 14
 	 * @var array
15 15
 	 */
16
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
16
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
17 17
 
18 18
 	var $is_searchable = true;
19 19
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		// Set the $_field_id var
46 46
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
47 47
 
48
-		if( $this->is_choice_value_enabled() ) {
49
-			$field_options['choice_display'] = array(
48
+		if ( $this->is_choice_value_enabled() ) {
49
+			$field_options[ 'choice_display' ] = array(
50 50
 				'type'    => 'radio',
51 51
 				'value'   => 'value',
52 52
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 
61 61
 			if ( 'address' === \GV\Utils::get( $search_field, 'type' ) ) {
62 62
 
63
-				$field_id = intval( floor( $search_field['key'] ) );
64
-				$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
63
+				$field_id = intval( floor( $search_field[ 'key' ] ) );
64
+				$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
65 65
 				$form = GravityView_View::getInstance()->getForm();
66 66
 
67 67
 				/** @var GF_Field_Address $address_field */
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 				$choices = array();
71 71
 
72 72
 				$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
73
-				if( method_exists( $this, $method_name ) ) {
73
+				if ( method_exists( $this, $method_name ) ) {
74 74
 					/**
75 75
 					 * @uses GravityView_Field_Address::get_choices_country()
76 76
 					 * @uses GravityView_Field_Address::get_choices_state()
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 					$choices = $this->{$method_name}( $address_field );
79 79
 				}
80 80
 
81
-				if( ! empty( $choices ) ) {
82
-					$search_field['choices'] = $choices;
83
-					$search_field['type'] = \GV\Utils::get( $search_field, 'input');
81
+				if ( ! empty( $choices ) ) {
82
+					$search_field[ 'choices' ] = $choices;
83
+					$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
84 84
 				} else {
85
-					$search_field['type'] = 'text';
86
-					$search_field['input'] = 'input_text';
85
+					$search_field[ 'type' ] = 'text';
86
+					$search_field[ 'input' ] = 'input_text';
87 87
 				}
88 88
 			}
89 89
 		}
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		$country_choices = array();
110 110
 
111 111
 		foreach ( $countries as $key => $country ) {
112
-			$country_choices[] = array(
112
+			$country_choices[ ] = array(
113 113
 				'value' => $country,
114 114
 				'text' => $country,
115 115
 			);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	private function get_choices_state( $address_field ) {
135 135
 
136
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
136
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
137 137
 
138 138
 		$state_choices = array();
139 139
 
@@ -145,12 +145,12 @@  discard block
 block discarded – undo
145 145
 				$states = GFCommon::get_canadian_provinces();
146 146
 				break;
147 147
 			default:
148
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
148
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
149 149
 				break;
150 150
 		}
151 151
 
152 152
 		foreach ( $states as $key => $state ) {
153
-			$state_choices[] = array(
153
+			$state_choices[ ] = array(
154 154
 				'value' => $state,
155 155
 				'text' => $state,
156 156
 			);
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
 		// Use the same inputs as the "text" input type allows
174 174
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
175 175
 
176
-		$input_types['street'] = $text_inputs;
177
-		$input_types['street2'] = $text_inputs;
178
-		$input_types['city'] = $text_inputs;
176
+		$input_types[ 'street' ] = $text_inputs;
177
+		$input_types[ 'street2' ] = $text_inputs;
178
+		$input_types[ 'city' ] = $text_inputs;
179 179
 
180
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
-		$input_types['zip'] = array( 'input_text' );
182
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
180
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
+		$input_types[ 'zip' ] = array( 'input_text' );
182
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
183 183
 
184 184
 		return $input_types;
185 185
 	}
@@ -200,10 +200,10 @@  discard block
 block discarded – undo
200 200
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
201 201
 		$input_id = gravityview_get_input_id_from_id( $field_id );
202 202
 
203
-		if( 'address' === $field_type && $input_id ) {
203
+		if ( 'address' === $field_type && $input_id ) {
204 204
 
205 205
 			// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
206
-			if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
206
+			if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
207 207
 				$input_type = $address_field_name;
208 208
 			}
209 209
 		}
@@ -252,20 +252,20 @@  discard block
 block discarded – undo
252 252
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
253 253
 
254 254
 		// If this is NOT the full address field, return default options.
255
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
255
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
256 256
 			return $field_options;
257 257
 		}
258 258
 
259
-		if( 'edit' === $context ) {
259
+		if ( 'edit' === $context ) {
260 260
 			return $field_options;
261 261
 		}
262 262
 
263 263
 		$add_options = array();
264 264
 
265
-		$add_options['show_map_link'] = array(
265
+		$add_options[ 'show_map_link' ] = array(
266 266
 			'type' => 'checkbox',
267 267
 			'label' => __( 'Show Map Link:', 'gravityview' ),
268
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
268
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
269 269
 			'value' => true,
270 270
 			'merge_tags' => false,
271 271
 		);
Please login to merge, or discard this patch.