Completed
Push — master ( 90bb80...5e9bea )
by Zack
42:43 queued 26:59
created
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
66 66
 
67
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
67
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
68 68
 	}
69 69
 
70 70
 	/**
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	function filter_gravityview_back_link( $link ) {
85 85
 		global $wpml_url_filters;
86 86
 
87
-		if( $wpml_url_filters ) {
87
+		if ( $wpml_url_filters ) {
88 88
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
89 89
 		}
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	private function remove_url_hooks() {
102 102
 		global $wpml_url_filters;
103 103
 
104
-		if( ! $wpml_url_filters ) {
104
+		if ( ! $wpml_url_filters ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	private function add_url_hooks() {
130 130
 		global $wpml_url_filters;
131 131
 
132
-		if( ! $wpml_url_filters ) {
132
+		if ( ! $wpml_url_filters ) {
133 133
 			return;
134 134
 		}
135 135
 
@@ -178,10 +178,10 @@  discard block
 block discarded – undo
178 178
 
179 179
 			$this->remove_url_hooks();
180 180
 
181
-			if( $translations ) {
181
+			if ( $translations ) {
182 182
 				foreach ( $languages as $lang_code => $language ) {
183 183
 
184
-					if( ! isset( $translations[ $lang_code ] ) || ! is_object( $translations[ $lang_code ] ) ) {
184
+					if ( ! isset( $translations[ $lang_code ] ) || ! is_object( $translations[ $lang_code ] ) ) {
185 185
 						continue;
186 186
 					}
187 187
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 							break;
216 216
 					}
217 217
 
218
-					$languages[ $lang_code ]['url'] = $entry_link;
218
+					$languages[ $lang_code ][ 'url' ] = $entry_link;
219 219
 				}
220 220
 			}
221 221
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-hidden.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	function edit_entry_fix_hidden_fields( $fields ) {
50 50
 
51 51
 		/** @var GF_Field $field */
52
-		foreach( $fields as &$field ) {
52
+		foreach ( $fields as &$field ) {
53 53
 			if ( 'hidden' === $field->type ) {
54 54
 
55 55
 				/**
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 				 */
61 61
 				$reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', true, $field );
62 62
 
63
-				if( ! $reveal_hidden_field ) {
63
+				if ( ! $reveal_hidden_field ) {
64 64
 					continue;
65 65
 				}
66 66
 
Please login to merge, or discard this patch.
future/lib/class-gamajo-template-loader.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		 *
86 86
 		 * @var array
87 87
 		 */
88
-		private $template_data_var_names = array('data');
88
+		private $template_data_var_names = array( 'data' );
89 89
 
90 90
 		/**
91 91
 		 * Clean up template data.
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 		public function set_template_data( $data, $var_name = 'data' ) {
139 139
 			global $wp_query;
140 140
 
141
-			$wp_query->query_vars[ $var_name ] = (object) $data;
141
+			$wp_query->query_vars[ $var_name ] = (object)$data;
142 142
 
143 143
 			// Add $var_name to custom variable store if not default value
144
-			if( $var_name !== 'data' ) {
145
-				$this->template_data_var_names[] = $var_name;
144
+			if ( $var_name !== 'data' ) {
145
+				$this->template_data_var_names[ ] = $var_name;
146 146
 			}
147 147
 
148 148
 			return $this;
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 
166 166
 			// Remove each custom data reference from $wp_query
167 167
 			foreach ( $custom_var_names as $var ) {
168
-				if ( isset( $wp_query->query_vars[$var] ) ) {
169
-					unset( $wp_query->query_vars[$var] );
168
+				if ( isset( $wp_query->query_vars[ $var ] ) ) {
169
+					unset( $wp_query->query_vars[ $var ] );
170 170
 				}
171 171
 			}
172 172
 
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
186 186
 		protected function get_template_file_names( $slug, $name ) {
187 187
 			$templates = array();
188 188
 			if ( isset( $name ) ) {
189
-				$templates[] = $slug . '-' . $name . '.php';
189
+				$templates[ ] = $slug . '-' . $name . '.php';
190 190
 			}
191
-			$templates[] = $slug . '.php';
191
+			$templates[ ] = $slug . '.php';
192 192
 
193 193
 			/**
194 194
 			 * Allow template choices to be filtered.
@@ -224,18 +224,18 @@  discard block
 block discarded – undo
224 224
 		public function locate_template( $template_names, $load = false, $require_once = true ) {
225 225
 
226 226
 			// Use $template_names as a cache key - either first element of array or the variable itself if it's a string
227
-			$cache_key = is_array( $template_names ) ? $template_names[0] : $template_names;
227
+			$cache_key = is_array( $template_names ) ? $template_names[ 0 ] : $template_names;
228 228
 
229 229
 			// If the key is in the cache array, we've already located this file.
230
-			if ( isset( $this->template_path_cache[$cache_key] ) ) {
231
-				$located = $this->template_path_cache[$cache_key];
230
+			if ( isset( $this->template_path_cache[ $cache_key ] ) ) {
231
+				$located = $this->template_path_cache[ $cache_key ];
232 232
 			} else {
233 233
 
234 234
 				// No file found yet.
235 235
 				$located = false;
236 236
 
237 237
 				// Remove empty entries.
238
-				$template_names = array_filter( (array) $template_names );
238
+				$template_names = array_filter( (array)$template_names );
239 239
 				$template_paths = $this->get_template_paths();
240 240
 
241 241
 				// Try to find a template file.
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 						if ( file_exists( $template_path . $template_name ) ) {
249 249
 							$located = $template_path . $template_name;
250 250
 							// Store the template path in the cache
251
-							$this->template_path_cache[$cache_key] = $located;
251
+							$this->template_path_cache[ $cache_key ] = $located;
252 252
 							break 2;
253 253
 						}
254 254
 					}
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
285 285
 			if ( is_child_theme() ) {
286
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
286
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
287 287
 			}
288 288
 
289 289
 			/**
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
38 38
 		$this->api_data    = $_api_data;
39 39
 		$this->name        = plugin_basename( $_plugin_file );
40 40
 		$this->slug        = basename( $_plugin_file, '.php' );
41
-		$this->version     = $_api_data['version'];
42
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
43
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
44
-		$this->cache_key   = md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
41
+		$this->version     = $_api_data[ 'version' ];
42
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
43
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
44
+		$this->cache_key   = md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
45 45
 
46 46
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
47 47
 
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 			return;
134 134
 		}
135 135
 
136
-		if( ! current_user_can( 'update_plugins' ) ) {
136
+		if ( ! current_user_can( 'update_plugins' ) ) {
137 137
 			return;
138 138
 		}
139 139
 
140
-		if( ! is_multisite() ) {
140
+		if ( ! is_multisite() ) {
141 141
 			return;
142 142
 		}
143 143
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
213 213
 					esc_html( $version_info->new_version ),
214 214
 					'</a>',
215
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
215
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
216 216
 					'</a>'
217 217
 				);
218 218
 			}
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 			)
257 257
 		);
258 258
 
259
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
259
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
260 260
 
261 261
 		// Get the transient where we store the api request for this plugin for 24 hours
262 262
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 
312 312
 		$verify_ssl = $this->verify_ssl();
313 313
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
314
-			$args['sslverify'] = $verify_ssl;
314
+			$args[ 'sslverify' ] = $verify_ssl;
315 315
 		}
316 316
 		return $args;
317 317
 
@@ -334,24 +334,24 @@  discard block
 block discarded – undo
334 334
 
335 335
 		$data = array_merge( $this->api_data, $_data );
336 336
 
337
-		if ( $data['slug'] != $this->slug ) {
337
+		if ( $data[ 'slug' ] != $this->slug ) {
338 338
 			return;
339 339
 		}
340 340
 
341
-		if( $this->api_url == trailingslashit (home_url() ) ) {
341
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
342 342
 			return false; // Don't allow a plugin to ping itself
343 343
 		}
344 344
 
345 345
 		$api_params = array(
346 346
 			'edd_action' => 'get_version',
347
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
348
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
349
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
350
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
351
-			'slug'       => $data['slug'],
352
-			'author'     => $data['author'],
347
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
348
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
349
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
350
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
351
+			'slug'       => $data[ 'slug' ],
352
+			'author'     => $data[ 'author' ],
353 353
 			'url'        => home_url(),
354
-			'beta'       => ! empty( $data['beta'] ),
354
+			'beta'       => ! empty( $data[ 'beta' ] ),
355 355
 		);
356 356
 
357 357
 		$verify_ssl = $this->verify_ssl();
@@ -371,9 +371,9 @@  discard block
 block discarded – undo
371 371
 			$request->banners = maybe_unserialize( $request->banners );
372 372
 		}
373 373
 
374
-		if( ! empty( $request->sections ) ) {
375
-			foreach( $request->sections as $key => $section ) {
376
-				$request->$key = (array) $section;
374
+		if ( ! empty( $request->sections ) ) {
375
+			foreach ( $request->sections as $key => $section ) {
376
+				$request->$key = (array)$section;
377 377
 			}
378 378
 		}
379 379
 
@@ -384,37 +384,37 @@  discard block
 block discarded – undo
384 384
 
385 385
 		global $edd_plugin_data;
386 386
 
387
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
387
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
388 388
 			return;
389 389
 		}
390 390
 
391
-		if( empty( $_REQUEST['plugin'] ) ) {
391
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
392 392
 			return;
393 393
 		}
394 394
 
395
-		if( empty( $_REQUEST['slug'] ) ) {
395
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
396 396
 			return;
397 397
 		}
398 398
 
399
-		if( ! current_user_can( 'update_plugins' ) ) {
399
+		if ( ! current_user_can( 'update_plugins' ) ) {
400 400
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
401 401
 		}
402 402
 
403
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
404
-		$beta         = ! empty( $data['beta'] ) ? true : false;
405
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
403
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
404
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
405
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
406 406
 		$version_info = $this->get_cached_version_info( $cache_key );
407 407
 
408
-		if( false === $version_info ) {
408
+		if ( false === $version_info ) {
409 409
 
410 410
 			$api_params = array(
411 411
 				'edd_action' => 'get_version',
412
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
413
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
414
-				'slug'       => $_REQUEST['slug'],
415
-				'author'     => $data['author'],
412
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
413
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
414
+				'slug'       => $_REQUEST[ 'slug' ],
415
+				'author'     => $data[ 'author' ],
416 416
 				'url'        => home_url(),
417
-				'beta'       => ! empty( $data['beta'] )
417
+				'beta'       => ! empty( $data[ 'beta' ] )
418 418
 			);
419 419
 
420 420
 			$verify_ssl = $this->verify_ssl();
@@ -431,9 +431,9 @@  discard block
 block discarded – undo
431 431
 				$version_info = false;
432 432
 			}
433 433
 
434
-			if( ! empty( $version_info ) ) {
435
-				foreach( $version_info->sections as $key => $section ) {
436
-					$version_info->$key = (array) $section;
434
+			if ( ! empty( $version_info ) ) {
435
+				foreach ( $version_info->sections as $key => $section ) {
436
+					$version_info->$key = (array)$section;
437 437
 				}
438 438
 			}
439 439
 
@@ -441,8 +441,8 @@  discard block
 block discarded – undo
441 441
 
442 442
 		}
443 443
 
444
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
445
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
444
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
445
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
446 446
 		}
447 447
 
448 448
 		exit;
@@ -450,23 +450,23 @@  discard block
 block discarded – undo
450 450
 
451 451
 	public function get_cached_version_info( $cache_key = '' ) {
452 452
 
453
-		if( empty( $cache_key ) ) {
453
+		if ( empty( $cache_key ) ) {
454 454
 			$cache_key = $this->cache_key;
455 455
 		}
456 456
 
457 457
 		$cache = get_option( $cache_key );
458 458
 
459
-		if( empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) {
459
+		if ( empty( $cache[ 'timeout' ] ) || current_time( 'timestamp' ) > $cache[ 'timeout' ] ) {
460 460
 			return false; // Cache is expired
461 461
 		}
462 462
 
463
-		return json_decode( $cache['value'] );
463
+		return json_decode( $cache[ 'value' ] );
464 464
 
465 465
 	}
466 466
 
467 467
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
468 468
 
469
-		if( empty( $cache_key ) ) {
469
+		if ( empty( $cache_key ) ) {
470 470
 			$cache_key = $this->cache_key;
471 471
 		}
472 472
 
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 	 * @return bool
487 487
 	 */
488 488
 	private function verify_ssl() {
489
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
489
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
490 490
 	}
491 491
 
492 492
 }
Please login to merge, or discard this patch.
future/loader.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
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
26 26
 			printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
27 27
 			printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
28
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
28
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
29 29
 			printf( '</body>' );
30 30
 		}
31 31
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 
36 36
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
37
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
37
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
38 38
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
39 39
 
40 40
 /** All looks fine. */
Please login to merge, or discard this patch.
future/_mocks.php 1 patch
Spacing   +49 added lines, -51 removed lines patch added patch discarded remove patch
@@ -96,18 +96,18 @@  discard block
 block discarded – undo
96 96
 		$paging = \GV\Utils::get( $parameters, 'paging' );
97 97
 	} else {
98 98
 		$entries = $form->entries
99
-			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) )
100
-			->offset( $args['offset'] )
101
-			->limit( $criteria['paging']['page_size'] );
99
+			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) )
100
+			->offset( $args[ 'offset' ] )
101
+			->limit( $criteria[ 'paging' ][ 'page_size' ] );
102 102
 
103
-		if ( $criteria['paging']['page_size'] ) {
104
-			$entries = $entries->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
103
+		if ( $criteria[ 'paging' ][ 'page_size' ] ) {
104
+			$entries = $entries->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 );
105 105
 		}
106 106
 
107
-		if ( ! empty( $criteria['sorting'] ) ) {
107
+		if ( ! empty( $criteria[ 'sorting' ] ) ) {
108 108
 			$field = new \GV\Field();
109
-			$field->ID = $criteria['sorting']['key'];
110
-			switch( strtolower( $criteria['sorting']['direction'] ) ) {
109
+			$field->ID = $criteria[ 'sorting' ][ 'key' ];
110
+			switch ( strtolower( $criteria[ 'sorting' ][ 'direction' ] ) ) {
111 111
 				case 'asc':
112 112
 					$direction = \GV\Entry_Sort::ASC;
113 113
 					break;
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 					break;
121 121
 			}
122 122
 
123
-			$mode = $criteria['sorting']['is_numeric'] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
123
+			$mode = $criteria[ 'sorting' ][ 'is_numeric' ] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
124 124
 			$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction, $mode ) );
125 125
 		}
126 126
 
@@ -158,16 +158,16 @@  discard block
 block discarded – undo
158 158
  * @return null|string The value of a field in an entry.
159 159
  */
160 160
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
161
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
161
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
162 162
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
163 163
 		return null;
164 164
 	}
165 165
 
166
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
167
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
166
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
167
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
168 168
 	}
169 169
 
170
-	if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
170
+	if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
171 171
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
172 172
 		return null;
173 173
 	}
@@ -177,18 +177,18 @@  discard block
 block discarded – undo
177 177
 	 *
178 178
 	 * Fields with a numeric ID are Gravity Forms ones.
179 179
 	 */
180
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;;
180
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ;
181 181
 
182 182
 	/** Initialize the future field. */
183 183
 	switch ( $source ):
184 184
 		/** The Gravity Forms backend. */
185 185
 		case \GV\Source::BACKEND_GRAVITYFORMS:
186
-			if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
186
+			if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
187 187
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
188 188
 				return null;
189 189
 			}
190 190
 
191
-			if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) {
191
+			if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) {
192 192
 				return null;
193 193
 			}
194 194
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
 		/** Our internal backend. */
198 198
 		case \GV\Source::BACKEND_INTERNAL:
199
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
199
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
200 200
 				return null;
201 201
 			}
202 202
 
@@ -230,13 +230,13 @@  discard block
 block discarded – undo
230 230
 
231 231
 	/** A bail condition. */
232 232
 	$bail = function( $label, $field_settings, $entry, $force_show_label, $form ) {
233
-		if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) {
233
+		if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) {
234 234
 
235
-			$label = isset( $field_settings['label'] ) ? $field_settings['label'] : '';
235
+			$label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : '';
236 236
 
237 237
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
238
-			if ( ! empty( $field_settings['custom_label'] ) ) {
239
-				$label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry );
238
+			if ( ! empty( $field_settings[ 'custom_label' ] ) ) {
239
+				$label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry );
240 240
 			}
241 241
 
242 242
 			/**
@@ -262,19 +262,19 @@  discard block
 block discarded – undo
262 262
 
263 263
 	$label = '';
264 264
 
265
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
266
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
267
-		if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) {
265
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
266
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
267
+		if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) {
268 268
 			$form = $_form->form;
269 269
 		}
270 270
 	}
271 271
 
272
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
272
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
273 273
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
274 274
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
275 275
 	}
276 276
 
277
-	if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
277
+	if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
278 278
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
279 279
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
280 280
 	}
@@ -286,31 +286,31 @@  discard block
 block discarded – undo
286 286
 	 *
287 287
 	 * Fields with a numeric ID are Gravity Forms ones.
288 288
 	 */
289
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
289
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
290 290
 
291 291
 	/** Initialize the future field. */
292 292
 	switch ( $source ):
293 293
 		/** The Gravity Forms backend. */
294 294
 		case \GV\Source::BACKEND_GRAVITYFORMS:
295
-			if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
295
+			if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
296 296
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
297 297
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
298 298
 			}
299 299
 
300
-			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) {
301
-				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) );
300
+			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) {
301
+				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) );
302 302
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form );
303 303
 			}
304
-			if ( empty( $field_settings['show_label'] ) ) {
304
+			if ( empty( $field_settings[ 'show_label' ] ) ) {
305 305
 				/** The label never wins... */
306
-				$field_settings['label'] = '';
306
+				$field_settings[ 'label' ] = '';
307 307
 			}
308 308
 
309 309
 			break;
310 310
 
311 311
 		/** Our internal backend. */
312 312
 		case \GV\Source::BACKEND_INTERNAL:
313
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
313
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
314 314
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
315 315
 			}
316 316
 			break;
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 			'\GravityView_frontend::entry' => \GravityView_frontend::getInstance()->getEntry(),
454 454
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
455 455
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
456
-			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
456
+			'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ],
457 457
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
458 458
 		);
459 459
 	}
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 					break;
536 536
 				case 'wp_actions[loop_start]':
537 537
 					global $wp_actions;
538
-					$wp_actions['loop_start'] = $value;
538
+					$wp_actions[ 'loop_start' ] = $value;
539 539
 					break;
540 540
 				case 'wp_query::in_the_loop':
541 541
 					global $wp_query;
@@ -613,9 +613,7 @@  discard block
 block discarded – undo
613 613
 				case 'request':
614 614
 					self::thaw( array(
615 615
 						'\GravityView_View::context' => (
616
-							$value->is_entry() ? 'single' :
617
-								( $value->is_edit_entry() ? 'edit' :
618
-									( $value->is_view() ? 'directory': null )
616
+							$value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null )
619 617
 								)
620 618
 						),
621 619
 						'\GravityView_frontend::is_search' => $value->is_search(),
@@ -669,14 +667,14 @@  discard block
 block discarded – undo
669 667
 		global $wp_query, $wp_actions;
670 668
 
671 669
 		$wp_query->in_the_loop = false;
672
-		$wp_actions['loop_start'] = 0;
670
+		$wp_actions[ 'loop_start' ] = 0;
673 671
 	}
674 672
 }
675 673
 
676 674
 
677 675
 /** Add some global fix for field capability discrepancies. */
678 676
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
679
-	if ( empty( $fields  ) ) {
677
+	if ( empty( $fields ) ) {
680 678
 		return $fields;
681 679
 	}
682 680
 
@@ -703,11 +701,11 @@  discard block
 block discarded – undo
703 701
 		}
704 702
 
705 703
 		foreach ( $_fields as $uid => &$_field ) {
706
-			if ( ! isset( $_field['only_loggedin'] ) ) {
704
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
707 705
 				continue;
708 706
 			}
709 707
 			/** If we do not require login, we don't require a cap. */
710
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
708
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
711 709
 		}
712 710
 	}
713 711
 	return $fields;
@@ -738,8 +736,8 @@  discard block
 block discarded – undo
738 736
 		}
739 737
 
740 738
 		foreach ( $_fields as $uid => &$_field ) {
741
-			if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) {
742
-				$_field['form_id'] = $view->form->ID;
739
+			if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) {
740
+				$_field[ 'form_id' ] = $view->form->ID;
743 741
 			}
744 742
 		}
745 743
 	}
@@ -753,25 +751,25 @@  discard block
 block discarded – undo
753 751
 	if ( class_exists( '\GravityView_frontend' ) ) {
754 752
 		global $wp_filter;
755 753
 
756
-		if ( empty( $wp_filter['gravityview_after'] ) ) {
754
+		if ( empty( $wp_filter[ 'gravityview_after' ] ) ) {
757 755
 			return;
758 756
 		}
759 757
 
760 758
 		/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
761
-		if ( is_array( $wp_filter['gravityview_after'] ) ) {
762
-			if ( ! empty( $wp_filter['gravityview_after'][10] ) ) {
763
-				foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) {
759
+		if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) {
760
+			if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) {
761
+				foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) {
764 762
 					if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
765
-						unset( $wp_filter['gravityview_after'][10][ $function_key ] );
763
+						unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] );
766 764
 					}
767 765
 				}
768 766
 			}
769 767
 			return;
770 768
 		}
771 769
 
772
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
770
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
773 771
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
774
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
772
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
775 773
 			}
776 774
 		}
777 775
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-renderer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
 		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
62 62
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
63 63
 
64
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
64
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
65 65
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
66 66
 
67 67
 		echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );
Please login to merge, or discard this patch.
future/includes/class-gv-entry-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
105 105
 	 * @return \GV\Entry|null An instance of this entry or null if not found.
106 106
 	 */
107 107
 	public static function from_entry( $entry ) {
108
-		if ( empty( $entry['id'] ) ) {
108
+		if ( empty( $entry[ 'id' ] ) ) {
109 109
 			return null;
110 110
 		}
111 111
 
112 112
 		$self = new self();
113 113
 		$self->entry = $entry;
114 114
 
115
-		$self->ID = $self->entry['id'];
115
+		$self->ID = $self->entry[ 'id' ];
116 116
 		$self->slug = \GravityView_API::get_entry_slug( $self->ID, $self->as_entry() );
117 117
 
118 118
 		return $self;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @return bool Whether the offset exists or not.
128 128
 	 */
129 129
 	public function offsetExists( $offset ) {
130
-		return isset( $this->entry[$offset] );
130
+		return isset( $this->entry[ $offset ] );
131 131
 	}
132 132
 
133 133
 	/**
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @return mixed The value of the requested entry data.
143 143
 	 */
144 144
 	public function offsetGet( $offset ) {
145
-		return $this->entry[$offset];
145
+		return $this->entry[ $offset ];
146 146
 	}
147 147
 
148 148
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	public static function remove() {
78 78
 		$shortcode = new static();
79
-		unset( self::$shortcodes[$shortcode->name] );
79
+		unset( self::$shortcodes[ $shortcode->name ] );
80 80
 		remove_shortcode( $shortcode->name );
81 81
 	}
82 82
 
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
109 109
 
110 110
 		foreach ( $matches as $shortcode ) {
111
-			$shortcode_name = $shortcode[2];
111
+			$shortcode_name = $shortcode[ 2 ];
112 112
 
113
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
114
-			$shortcode_content = $shortcode[5];
113
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
114
+			$shortcode_content = $shortcode[ 5 ];
115 115
 
116 116
 			/** This is a registered GravityView shortcode. */
117
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
118
-				$shortcode = clone self::$shortcodes[$shortcode_name];
117
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
118
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
119 119
 			} else {
120 120
 				/** This is some generic shortcode. */
121 121
 				$shortcode = new self;
Please login to merge, or discard this patch.