Completed
Push — develop ( 3404ef...87ac16 )
by Zack
15:50
created
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@  discard block
 block discarded – undo
20 20
 
21 21
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
22 22
 
23
-		unset( $field_options['search_filter'] );
23
+		unset( $field_options[ 'search_filter' ] );
24 24
 
25
-		if( 'edit' === $context ) {
25
+		if ( 'edit' === $context ) {
26 26
 			return $field_options;
27 27
 		}
28 28
 
29
-		$add_options['link_to_file'] = array(
29
+		$add_options[ 'link_to_file' ] = array(
30 30
 			'type' => 'checkbox',
31 31
 			'label' => __( 'Display as a Link:', 'gravityview' ),
32
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
32
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
33 33
 			'value' => false,
34 34
 			'merge_tags' => false,
35 35
 		);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		$output_arr = array();
66 66
 
67 67
 		// Get an array of file paths for the field.
68
-		$file_paths = rgar( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
68
+		$file_paths = rgar( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
69 69
 
70 70
 		// The $value JSON was probably truncated; let's check lead_detail_long.
71 71
 		if ( ! is_array( $file_paths ) ) {
@@ -79,19 +79,19 @@  discard block
 block discarded – undo
79 79
 		}
80 80
 
81 81
 		// Process each file path
82
-		foreach( $file_paths as $file_path ) {
82
+		foreach ( $file_paths as $file_path ) {
83 83
 
84 84
 			// If the site is HTTPS, use HTTPS
85
-			if(function_exists('set_url_scheme')) { $file_path = set_url_scheme($file_path); }
85
+			if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); }
86 86
 
87 87
 			// This is from Gravity Forms's code
88
-			$file_path = esc_attr(str_replace(" ", "%20", $file_path));
88
+			$file_path = esc_attr( str_replace( " ", "%20", $file_path ) );
89 89
 
90 90
 			// If the field is set to link to the single entry, link to it.
91
-			$link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
91
+			$link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
92 92
 
93 93
 			// Get file path information
94
-			$file_path_info = pathinfo($file_path);
94
+			$file_path_info = pathinfo( $file_path );
95 95
 
96 96
 			$html_format = NULL;
97 97
 
@@ -100,30 +100,30 @@  discard block
 block discarded – undo
100 100
 			$disable_wrapped_link = false;
101 101
 
102 102
 			// Is this an image?
103
-			$image = new GravityView_Image(array(
103
+			$image = new GravityView_Image( array(
104 104
 				'src' => $file_path,
105
-				'class' => 'gv-image gv-field-id-'.$field_settings['id'],
106
-				'alt' => $field_settings['label'],
107
-				'width' => (gravityview_get_context() === 'single' ? NULL : 250)
108
-			));
105
+				'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
106
+				'alt' => $field_settings[ 'label' ],
107
+				'width' => ( gravityview_get_context() === 'single' ? NULL : 250 )
108
+			) );
109 109
 
110 110
 			$content = $image->html();
111 111
 
112 112
 			// The new default content is the image, if it exists. If not, use the file name as the content.
113
-			$content = !empty( $content ) ? $content : $file_path_info['basename'];
113
+			$content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ];
114 114
 
115 115
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
116
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
116
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
117 117
 
118 118
 
119
-			switch( true ) {
119
+			switch ( true ) {
120 120
 
121 121
 				// Audio file
122 122
 				case in_array( $extension, wp_get_audio_extensions() ):
123 123
 
124 124
 					$disable_lightbox = true;
125 125
 
126
-					if( shortcode_exists( 'audio' ) ) {
126
+					if ( shortcode_exists( 'audio' ) ) {
127 127
 
128 128
 						$disable_wrapped_link = true;
129 129
 
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 						 */
135 135
 						$audio_settings = apply_filters( 'gravityview_audio_settings', array(
136 136
 							'src' => $file_path,
137
-							'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
138
-						));
137
+							'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
138
+						) );
139 139
 
140 140
 						/**
141 141
 						 * Generate the audio shortcode
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
 					$disable_lightbox = true;
155 155
 
156
-					if( shortcode_exists( 'video' ) ) {
156
+					if ( shortcode_exists( 'video' ) ) {
157 157
 
158 158
 						$disable_wrapped_link = true;
159 159
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 						 */
165 165
 						$video_settings = apply_filters( 'gravityview_video_settings', array(
166 166
 							'src' => $file_path,
167
-							'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
168
-						));
167
+							'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
168
+						) );
169 169
 
170 170
 						/**
171 171
 						 * Generate the video shortcode
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 					break;
188 188
 
189 189
 				// if not image, do not set the lightbox (@since 1.5.3)
190
-				case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
190
+				case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
191 191
 
192 192
 					$disable_lightbox = true;
193 193
 
@@ -197,10 +197,10 @@  discard block
 block discarded – undo
197 197
 
198 198
 			// If using Link to File, override the content.
199 199
 			// (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.)
200
-			if( !empty( $field_settings['link_to_file'] ) ) {
200
+			if ( ! empty( $field_settings[ 'link_to_file' ] ) ) {
201 201
 
202 202
 				// Force the content to be the file name
203
-				$content =  $file_path_info["basename"];
203
+				$content = $file_path_info[ "basename" ];
204 204
 
205 205
 				// Restore the wrapped link
206 206
 				$disable_wrapped_link = false;
@@ -208,13 +208,13 @@  discard block
 block discarded – undo
208 208
 			}
209 209
 
210 210
 			// Whether to use lightbox or not
211
-			if( $disable_lightbox || empty( $gravityview_view->atts['lightbox'] ) || !empty( $field_settings['show_as_link'] ) ) {
211
+			if ( $disable_lightbox || empty( $gravityview_view->atts[ 'lightbox' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) {
212 212
 
213
-				$link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array();
213
+				$link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array();
214 214
 
215 215
 			} else {
216 216
 
217
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
217
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
218 218
 
219 219
 				$link_atts = array(
220 220
 					'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ),
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $gravityview_view->getCurrentField() );
241 241
 
242 242
 			// If the HTML output hasn't been overridden by the switch statement above, use the default format
243
-			if( !empty( $content ) && empty( $disable_wrapped_link ) ) {
243
+			if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) {
244 244
 
245 245
 				/**
246 246
 				 * Modify the link text (defaults to the file name)
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
                 $content = gravityview_get_link( $link, $content, $link_atts );
256 256
 			}
257 257
 
258
-			$output_arr[] = array(
258
+			$output_arr[ ] = array(
259 259
 				'file_path' => $file_path,
260 260
 				'content' => $content
261 261
 			);
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
65 65
 
66
-		if( false === $approved_result || false === $disapproved_result ) {
66
+		if ( false === $approved_result || false === $disapproved_result ) {
67 67
 			do_action( 'gravityview_log_error', __METHOD__ . ': There was an error processing the query.', $wpdb->last_error );
68 68
 		} else {
69 69
 			// All done: Meta values are migrated
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
 		$redux_settings = $this->get_redux_settings();
97 97
 
98 98
 		// No need to process
99
-		if( false === $redux_settings ) {
99
+		if ( false === $redux_settings ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		if( empty(  $redux_settings['license_key_status'] ) ) {
103
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
104 104
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
105 105
 		}
106 106
 
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
115 115
 
116 116
 		// And now remove the previous option, so this is a one-time thing.
117
-		delete_option('gravityview_settings');
118
-		delete_option('gravityview_settings-transients');
117
+		delete_option( 'gravityview_settings' );
118
+		delete_option( 'gravityview_settings-transients' );
119 119
 	}
120 120
 
121 121
 	/**
@@ -131,16 +131,16 @@  discard block
 block discarded – undo
131 131
 
132 132
 		$data = array(
133 133
 			'edd_action' => 'check_license',
134
-			'license' => rgget('license_key', $redux_settings ),
134
+			'license' => rgget( 'license_key', $redux_settings ),
135 135
 			'update' => false,
136 136
 			'format' => 'object',
137 137
 		);
138 138
 
139 139
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
140 140
 
141
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
142
-			$redux_settings['license_key_status'] = $license_call->license;
143
-			$redux_settings['license_key_response'] = json_encode( $license_call );
141
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
142
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
143
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
144 144
 		}
145 145
 
146 146
 		return $redux_settings;
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
 	function get_redux_settings() {
155 155
 
156 156
 		// Previous settings set by Redux
157
-		$redux_option = get_option('gravityview_settings');
157
+		$redux_option = get_option( 'gravityview_settings' );
158 158
 
159 159
 		// No Redux settings? Don't proceed.
160
-		if( false === $redux_option ) {
160
+		if ( false === $redux_option ) {
161 161
 			return false;
162 162
 		}
163 163
 
@@ -167,21 +167,21 @@  discard block
 block discarded – undo
167 167
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
168 168
 		);
169 169
 
170
-		if( $license_array = rgget( 'license', $redux_option ) ) {
170
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
171 171
 
172
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
172
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
173 173
 
174
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
174
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
175 175
 
176 176
 			// This contains the last response for license validation
177
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
177
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
178 178
 
179
-				$saved_license = rgget('license', $saved_values );
179
+				$saved_license = rgget( 'license', $saved_values );
180 180
 
181 181
 				// Only use the last-saved values if they are for the same license
182
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
183
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
184
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
182
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
183
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
184
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
185 185
 				}
186 186
 			}
187 187
 		}
@@ -193,8 +193,8 @@  discard block
 block discarded – undo
193 193
 	/** ----  Migrate from old search widget to new search widget  ---- */
194 194
 	function update_search_on_views() {
195 195
 
196
-		if( !class_exists('GravityView_Widget_Search') ) {
197
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
196
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
197
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
198 198
 		}
199 199
 
200 200
 		// Loop through all the views
@@ -206,20 +206,20 @@  discard block
 block discarded – undo
206 206
 
207 207
 		$views = get_posts( $query_args );
208 208
 
209
-		foreach( $views as $view ) {
209
+		foreach ( $views as $view ) {
210 210
 
211 211
 			$widgets = gravityview_get_directory_widgets( $view->ID );
212 212
 			$search_fields = null;
213 213
 
214
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
214
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
215 215
 
216 216
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
217 217
 
218
-			foreach( $widgets as $area => $ws ) {
219
-				foreach( $ws as $k => $widget ) {
220
-					if( $widget['id'] !== 'search_bar' ) { continue; }
218
+			foreach ( $widgets as $area => $ws ) {
219
+				foreach ( $ws as $k => $widget ) {
220
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
221 221
 
222
-					if( is_null( $search_fields ) ) {
222
+					if ( is_null( $search_fields ) ) {
223 223
 						$search_fields = $this->get_search_fields( $view->ID );
224 224
 					}
225 225
 
@@ -227,24 +227,24 @@  discard block
 block discarded – undo
227 227
 					//  [search_free] => 1
228 228
 			        //  [search_date] => 1
229 229
 			        $search_generic = array();
230
-					if( !empty( $widget['search_free'] ) ) {
231
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
230
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
231
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
232 232
 					}
233
-					if( !empty( $widget['search_date'] ) ) {
234
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
233
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
234
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
235 235
 					}
236 236
 
237 237
 					$search_config = array_merge( $search_generic, $search_fields );
238 238
 
239 239
 					// don't throw '[]' when json_encode an empty array
240
-					if( empty( $search_config ) ) {
240
+					if ( empty( $search_config ) ) {
241 241
 						$search_config = '';
242 242
 					} else {
243 243
 						$search_config = json_encode( $search_config );
244 244
 					}
245 245
 
246
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
247
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
246
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
247
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
248 248
 
249 249
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
250 250
 				}
@@ -272,26 +272,26 @@  discard block
 block discarded – undo
272 272
 		// check view fields' settings
273 273
 		$fields = gravityview_get_directory_fields( $view_id, false );
274 274
 
275
-		if( !empty( $fields ) && is_array( $fields ) ) {
275
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
276 276
 
277
-			foreach( $fields as $t => $fs ) {
277
+			foreach ( $fields as $t => $fs ) {
278 278
 
279
-				foreach( $fs as $k => $field ) {
279
+				foreach ( $fs as $k => $field ) {
280 280
 					// is field a search_filter ?
281
-					if( empty( $field['search_filter'] ) ) { continue; }
281
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
282 282
 
283 283
 					// get field type & calculate the input type (by default)
284
-					$form_field = gravityview_get_field( $form, $field['id'] );
284
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
285 285
 
286
-					if( empty( $form_field['type'] ) ) {
286
+					if ( empty( $form_field[ 'type' ] ) ) {
287 287
 						continue;
288 288
 					}
289 289
 
290 290
 					// depending on the field type assign a group of possible search field types
291
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
291
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
292 292
 
293 293
 					// add field to config
294
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
294
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
295 295
 
296 296
 				}
297 297
 			}
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="http://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="http://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/class-gravityview-entry-approval-status.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -113,16 +113,16 @@  discard block
 block discarded – undo
113 113
 		$new_value = $old_value;
114 114
 
115 115
 		// Meta value does not exist yet
116
-		if( false === $old_value ) {
116
+		if ( false === $old_value ) {
117 117
 			return self::UNAPPROVED;
118 118
 		}
119 119
 
120 120
 		// Meta value does not exist yet
121
-		if( true === $old_value ) {
121
+		if ( true === $old_value ) {
122 122
 			return self::APPROVED;
123 123
 		}
124 124
 
125
-		switch ( (string) $old_value ) {
125
+		switch ( (string)$old_value ) {
126 126
 
127 127
 			// Approved values
128 128
 			case 'Approved':
@@ -247,9 +247,9 @@  discard block
 block discarded – undo
247 247
 		foreach ( $choices as $key => $choice ) {
248 248
 
249 249
 			// Is the passed status value the same as the choice value or key?
250
-			if ( $status === $choice['value'] || $status === $key ) {
250
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
251 251
 
252
-				if( 'key' === $attr_key ) {
252
+				if ( 'key' === $attr_key ) {
253 253
 					return $key;
254 254
 				} else {
255 255
 					return rgar( $choice, $attr_key, false );
Please login to merge, or discard this patch.
includes/class-post-types.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		// Load even when invalid to allow for export
20 20
 		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
21 21
 
22
-		if( GravityView_Compatibility::is_valid() ) {
22
+		if ( GravityView_Compatibility::is_valid() ) {
23 23
 			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
24 24
 		}
25 25
 	}
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 
44 44
 		$supports = array( 'title', 'revisions' );
45 45
 
46
-		if( $is_hierarchical ) {
47
-			$supports[] = 'page-attributes';
46
+		if ( $is_hierarchical ) {
47
+			$supports[ ] = 'page-attributes';
48 48
 		}
49 49
 
50 50
 		/**
Please login to merge, or discard this patch.
includes/class-gravityview-shortcode.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
50 50
 
51 51
 		// Get details about the current View
52
-		if( !empty( $passed_atts['detail'] ) ) {
53
-			return $this->get_view_detail( $passed_atts['detail'] );
52
+		if ( ! empty( $passed_atts[ 'detail' ] ) ) {
53
+			return $this->get_view_detail( $passed_atts[ 'detail' ] );
54 54
 		}
55 55
 
56 56
 		$atts = $this->parse_and_sanitize_atts( $passed_atts );
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
87 87
 
88 88
 		// Only keep the passed attributes after making sure that they're valid pairs
89
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array) $passed_atts, $filtered_atts ) : $filtered_atts;
89
+		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array)$passed_atts, $filtered_atts ) : $filtered_atts;
90 90
 
91 91
 		$atts = array();
92 92
 
93
-		foreach( $filtered_atts as $key => $passed_value ) {
93
+		foreach ( $filtered_atts as $key => $passed_value ) {
94 94
 
95 95
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
96 96
 			$passed_value = GravityView_Merge_Tags::replace_variables( $passed_value );
97 97
 
98
-			switch( $defaults[ $key ]['type'] ) {
98
+			switch ( $defaults[ $key ][ 'type' ] ) {
99 99
 
100 100
 				/**
101 101
 				 * Make sure number fields are numeric.
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
104 104
 				 */
105 105
 				case 'number':
106
-					if( is_numeric( $passed_value ) ) {
106
+					if ( is_numeric( $passed_value ) ) {
107 107
 						$atts[ $key ] = ( $passed_value + 0 );
108 108
 					}
109 109
 					break;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 				 */
119 119
 				case 'select':
120 120
 				case 'radio':
121
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
122
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
121
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
122
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
123 123
 						$atts[ $key ] = $passed_value;
124 124
 					}
125 125
 					break;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 		$gravityview_view = GravityView_View::getInstance();
149 149
 		$return = '';
150 150
 
151
-		switch( $detail ) {
151
+		switch ( $detail ) {
152 152
 			case 'total_entries':
153 153
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
154 154
 				break;
Please login to merge, or discard this patch.
includes/admin/field-types/type_textarea.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 		?>
10 10
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11 11
 
12
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
12
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 		?><div>
15 15
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	}
20 20
 
21 21
 	function render_input( $override_input = null ) {
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
34
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35 35
             	$class .= ' mt-hide_all_fields ';
36 36
             }
37 37
         }
38 38
 		$class .= rgar( $this->field, 'class' );
39 39
 		$placeholder = rgar( $this->field, 'placeholder' );
40 40
 		?>
41
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>
41
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea>
42 42
        	<?php
43 43
 	}
44 44
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 			echo $this->get_tooltip() . $this->get_field_desc();
13 13
 		?><div>
14 14
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 	function render_input( $override_input = null ) {
21 21
 
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33 33
         }
34 34
         $class .= rgar( $this->field, 'class', 'widefat' );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-is-approved.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	function add_default_field( $entry_default_fields, $form, $zone ) {
94 94
 
95
-		if( 'edit' !== $zone ) {
95
+		if ( 'edit' !== $zone ) {
96 96
 			$entry_default_fields[ $this->name ] = array(
97 97
 				'label' => $this->label,
98 98
 				'desc'  => $this->description,
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 
118 118
 		$merge_tags = array(
119 119
 			array(
120
-				'label' => __('Approval Status', 'gravityview'),
120
+				'label' => __( 'Approval Status', 'gravityview' ),
121 121
 				'tag' => '{approval_status}'
122 122
 			),
123 123
 		);
@@ -157,10 +157,10 @@  discard block
 block discarded – undo
157 157
 				do_action( 'gravityview_log_error', __METHOD__ . ': No entry data available. Returning empty string.' );
158 158
 				$replacement = '';
159 159
 			} else {
160
-				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[1] );
160
+				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] );
161 161
 			}
162 162
 
163
-			$return = str_replace( $match[0], $replacement, $return );
163
+			$return = str_replace( $match[ 0 ], $replacement, $return );
164 164
 		}
165 165
 
166 166
 		return $return;
@@ -168,25 +168,25 @@  discard block
 block discarded – undo
168 168
 
169 169
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
170 170
 
171
-		$field_options['approved_label'] = array(
171
+		$field_options[ 'approved_label' ] = array(
172 172
 			'type' => 'text',
173 173
 			'label' => __( 'Approved Label', 'gravityview' ),
174 174
 			'desc' => __( 'If the entry is approved, display this value', 'gravityview' ),
175
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
175
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ),
176 176
 		);
177 177
 
178
-		$field_options['disapproved_label'] = array(
178
+		$field_options[ 'disapproved_label' ] = array(
179 179
 			'type' => 'text',
180 180
 			'label' => __( 'Disapproved Label', 'gravityview' ),
181 181
 			'desc' => __( 'If the entry is not approved, display this value', 'gravityview' ),
182
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
182
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ),
183 183
 		);
184 184
 
185
-		$field_options['unapproved_label'] = array(
185
+		$field_options[ 'unapproved_label' ] = array(
186 186
 			'type' => 'text',
187 187
 			'label' => __( 'Unapproved Label', 'gravityview' ),
188 188
 			'desc' => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ),
189
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
189
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ),
190 190
 		);
191 191
 
192 192
 		return $field_options;
Please login to merge, or discard this patch.