Completed
Push — develop ( f0bc9a...43fa42 )
by Zack
20:25
created
future/includes/class-gv-oembed.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 );
27 27
 		wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true );
28 28
 
29
-		if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) {
29
+		if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
30 30
 			add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) );
31 31
 		}
32 32
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @return void
44 44
 	 */
45 45
 	public static function render_provider_request() {
46
-		if ( ! empty( $_GET['url'] ) ) {
47
-			$url = $_GET['url'];
46
+		if ( ! empty( $_GET[ 'url' ] ) ) {
47
+			$url = $_GET[ 'url' ];
48 48
 		} else {
49 49
 			header( 'HTTP/1.0 404 Not Found' );
50 50
 			exit;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	private static function parse_matches( $matches, $url ) {
113 113
 		// If not using permalinks, re-assign values for matching groups
114
-		if ( ! empty( $matches['entry_slug2'] ) ) {
115
-			$matches['is_cpt'] = $matches['is_cpt2'];
116
-			$matches['slug'] = $matches['slug2'];
117
-			$matches['entry_slug'] = $matches['entry_slug2'];
118
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
114
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
115
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
116
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
117
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
118
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
119 119
 		}
120 120
 
121
-		if ( empty( $matches['entry_slug'] ) ) {
121
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
122 122
 			gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) );
123 123
 			return null;
124 124
 		} else {
125
-			$entry_id = $matches['entry_slug'];
125
+			$entry_id = $matches[ 'entry_slug' ];
126 126
 		}
127 127
 
128 128
 		if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		}
132 132
 
133 133
 		if ( ! $view_id = url_to_postid( $url ) ) {
134
-			$view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) );
134
+			$view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) );
135 135
 		} else {
136 136
 			$view = \GV\View::by_id( $view_id );
137 137
 		}
@@ -163,9 +163,9 @@  discard block
 block discarded – undo
163 163
 
164 164
 		return '
165 165
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
166
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
166
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
167 167
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
168
-				'.$embed_text.'
168
+				'.$embed_text . '
169 169
 			</p>
170 170
 			<br style="clear: both;">
171 171
 		</div>';
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 	private static function render_preview_notice() {
180 180
 		$floaty = \GravityView_Admin::get_floaty();
181 181
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
182
-		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
183
-		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
182
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
183
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
184 184
 	}
185 185
 
186 186
 	/**
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
 			return __( 'You are not allowed to view this content.', 'gravityview' );
200 200
 		}
201 201
 
202
-		if ( $entry && 'active' !== $entry['status'] ) {
202
+		if ( $entry && 'active' !== $entry[ 'status' ] ) {
203 203
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
204 204
 			return __( 'You are not allowed to view this content.', 'gravityview' );
205 205
 		}
206 206
 
207 207
 		if ( $view->settings->get( 'show_only_approved' ) ) {
208
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
208
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
209 209
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
210 210
 				return __( 'You are not allowed to view this content.', 'gravityview' );
211 211
 			}
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 		// Catch either
271 271
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
272 272
 
273
-		return '#'.$match_regex.'#i';
273
+		return '#' . $match_regex . '#i';
274 274
 	}
275 275
 
276 276
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			/** Must be an embed of some sort. */
124 124
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
125 125
 				$permalink = get_permalink( $post->ID );
126
-				$args['gvid'] = $view_id;
126
+				$args[ 'gvid' ] = $view_id;
127 127
 			}
128 128
 		}
129 129
 		
@@ -151,21 +151,21 @@  discard block
 block discarded – undo
151 151
 			 */
152 152
 			$link_parts = explode( '?', $permalink );
153 153
 
154
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
154
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
155 155
 
156
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
156
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
157 157
 		} else {
158 158
 			$args[ $entry_endpoint_name ] = $entry_slug;
159 159
 		}
160 160
 
161 161
 		if ( $track_directory ) {
162
-			if ( ! empty( $_GET['pagenum'] ) ) {
163
-				$args['pagenum'] = intval( $_GET['pagenum'] );
162
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
163
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
164 164
 			}
165 165
 
166 166
 			if ( $sort = Utils::_GET( 'sort' ) ) {
167
-				$args['sort'] = $sort;
168
-				$args['dir'] = Utils::_GET( 'dir' );
167
+				$args[ 'sort' ] = $sort;
168
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
169 169
 			}
170 170
 		}
171 171
 
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Spacing   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
 
403 403
 		// If we've saved the permalink in memory, use it
404 404
 		// @since 1.3
405
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
405
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
406 406
 
407
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
407
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
408 408
 			$link = home_url();
409 409
 		}
410 410
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 			// If not yet saved, cache the permalink.
415 415
 			// @since 1.3
416
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
416
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
417 417
 		}
418 418
 
419 419
 		// Deal with returning to proper pagination for embedded views
@@ -421,13 +421,13 @@  discard block
 block discarded – undo
421 421
 
422 422
 			$args = array();
423 423
 
424
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
-				$args['pagenum'] = intval( $pagenum );
424
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
+				$args[ 'pagenum' ] = intval( $pagenum );
426 426
 			}
427 427
 
428
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
-				$args['sort'] = $sort;
430
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
428
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
+				$args[ 'sort' ] = $sort;
430
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
431 431
 			}
432 432
 
433 433
 			$link = add_query_arg( $args, $link );
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
465 465
 
466 466
 		// Generate an unique hash to use as the default value
467
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
467
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
468 468
 
469 469
 		/**
470 470
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
476 476
 
477 477
 		// Make sure we have something - use the original ID as backup.
478
-		if( empty( $slug ) ) {
478
+		if ( empty( $slug ) ) {
479 479
 			$slug = $id;
480 480
 		}
481 481
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
505 505
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
506 506
 		 */
507
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
507
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
508 508
 
509 509
 		// If we're using custom slug...
510 510
 		if ( $custom ) {
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 			// If it does have a hash set, and the hash is expected, use it.
519 519
 			// This check allows users to change the hash structure using the
520 520
 			// gravityview_entry_hash filter and have the old hashes expire.
521
-			if( empty( $value ) || $value !== $hash ) {
521
+			if ( empty( $value ) || $value !== $hash ) {
522 522
 				gravityview()->log->debug( 'Setting hash for entry {entry}: {hash}', array( 'entry' => $id_or_string, 'hash' => $hash ) );
523 523
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
524 524
 			}
@@ -545,15 +545,15 @@  discard block
 block discarded – undo
545 545
          * @param boolean $custom Should we process the custom entry slug?
546 546
          */
547 547
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
-        if( $custom ) {
548
+        if ( $custom ) {
549 549
             // create the gravityview_unique_id and save it
550 550
 
551 551
             // Get the entry hash
552
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
552
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
553 553
 
554
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
554
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
555 555
 
556
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
556
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
557 557
 
558 558
         }
559 559
     }
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 
573 573
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
574 574
 			$entry = GVCommon::get_entry( $entry );
575
-		} else if( empty( $entry ) ) {
575
+		} else if ( empty( $entry ) ) {
576 576
 			// @deprecated path
577 577
 			$entry = GravityView_frontend::getInstance()->getEntry();
578 578
 		}
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
 
593 593
 		$query_arg_name = \GV\Entry::get_endpoint_name();
594 594
 
595
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
595
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
596 596
 
597
-		if ( get_option('permalink_structure') && !is_preview() ) {
597
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
598 598
 
599 599
 			$args = array();
600 600
 
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 			 */
605 605
 			$link_parts = explode( '?', $directory_link );
606 606
 
607
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
607
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
608 608
 
609
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
609
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
610 610
 
611 611
 		} else {
612 612
 
@@ -618,22 +618,22 @@  discard block
 block discarded – undo
618 618
 		 */
619 619
 		if ( $add_directory_args ) {
620 620
 
621
-			if ( ! empty( $_GET['pagenum'] ) ) {
622
-				$args['pagenum'] = intval( $_GET['pagenum'] );
621
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
622
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
623 623
 			}
624 624
 
625 625
 			/**
626 626
 			 * @since 1.7
627 627
 			 */
628 628
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
629
-				$args['sort'] = $sort;
630
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
629
+				$args[ 'sort' ] = $sort;
630
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
631 631
 			}
632 632
 
633 633
 		}
634 634
 
635 635
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
636
-			$args['gvid'] = gravityview_get_view_id();
636
+			$args[ 'gvid' ] = gravityview_get_view_id();
637 637
 		}
638 638
 
639 639
 		return add_query_arg( $args, $directory_link );
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
 }
655 655
 
656 656
 function gv_class( $field, $form = NULL, $entry = array() ) {
657
-	return GravityView_API::field_class( $field, $form, $entry  );
657
+	return GravityView_API::field_class( $field, $form, $entry );
658 658
 }
659 659
 
660 660
 /**
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 		$view_id = 0;
678 678
 		if ( $context->view ) {
679 679
 			$view_id = $context->view->ID;
680
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
680
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
681 681
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
682 682
 			}
683 683
 		}
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		$default_css_class .= ' gv-container-no-results';
706 706
 	}
707 707
 
708
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
708
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
709 709
 
710 710
 	/**
711 711
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
732 732
 
733 733
 	$value = GravityView_API::field_value( $entry, $field );
734 734
 
735
-	if( $value === '' ) {
735
+	if ( $value === '' ) {
736 736
 		/**
737 737
 		 * @filter `gravityview_empty_value` What to display when a field is empty
738 738
 		 * @param string $value (empty string)
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
  */
840 840
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
841 841
 
842
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
842
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
843 843
 
844 844
 		// For the complete field value as generated by Gravity Forms
845 845
 		return $display_value;
@@ -873,16 +873,16 @@  discard block
 block discarded – undo
873 873
 		$terms = explode( ', ', $value );
874 874
 	}
875 875
 
876
-	foreach ($terms as $term_name ) {
876
+	foreach ( $terms as $term_name ) {
877 877
 
878 878
 		// If we're processing a category,
879
-		if( $taxonomy === 'category' ) {
879
+		if ( $taxonomy === 'category' ) {
880 880
 
881 881
 			// Use rgexplode to prevent errors if : doesn't exist
882 882
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
883 883
 
884 884
 			// The explode was succesful; we have the category ID
885
-			if( !empty( $term_id )) {
885
+			if ( ! empty( $term_id ) ) {
886 886
 				$term = get_term_by( 'id', $term_id, $taxonomy );
887 887
 			} else {
888 888
 			// We have to fall back to the name
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 		}
896 896
 
897 897
 		// There's still a tag/category here.
898
-		if( $term ) {
898
+		if ( $term ) {
899 899
 
900 900
 			$term_link = get_term_link( $term, $taxonomy );
901 901
 
@@ -904,11 +904,11 @@  discard block
 block discarded – undo
904 904
 			    continue;
905 905
 			}
906 906
 
907
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
907
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
908 908
 		}
909 909
 	}
910 910
 
911
-	return implode(', ', $output );
911
+	return implode( ', ', $output );
912 912
 }
913 913
 
914 914
 /**
@@ -922,8 +922,8 @@  discard block
 block discarded – undo
922 922
 
923 923
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
924 924
 
925
-	if( empty( $link ) ) {
926
-		return strip_tags( $output);
925
+	if ( empty( $link ) ) {
926
+		return strip_tags( $output );
927 927
 	}
928 928
 
929 929
 	return $output;
@@ -942,7 +942,7 @@  discard block
 block discarded – undo
942 942
 	$fe = GravityView_frontend::getInstance();
943 943
 
944 944
 	// Solve problem when loading content via admin-ajax.php
945
-	if( ! $fe->getGvOutputData() ) {
945
+	if ( ! $fe->getGvOutputData() ) {
946 946
 
947 947
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
948 948
 
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 	}
951 951
 
952 952
 	// Make 100% sure that we're dealing with a properly called situation
953
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
953
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
954 954
 
955 955
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
956 956
 
@@ -1124,11 +1124,11 @@  discard block
 block discarded – undo
1124 1124
 	 */
1125 1125
 	$is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
1126 1126
 
1127
-	if( $is_edit_entry ) {
1127
+	if ( $is_edit_entry ) {
1128 1128
 		$context = 'edit';
1129
-	} else if( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
1129
+	} else if ( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
1130 1130
 		$context = 'single';
1131
-	} else if( class_exists( 'GravityView_View' ) ) {
1131
+	} else if ( class_exists( 'GravityView_View' ) ) {
1132 1132
 		$context = GravityView_View::getInstance()->getContext();
1133 1133
 	}
1134 1134
 
@@ -1158,12 +1158,12 @@  discard block
 block discarded – undo
1158 1158
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1159 1159
 	/** @define "GRAVITYVIEW_DIR" "../" */
1160 1160
 
1161
-	if( !class_exists( 'GravityView_Field' ) ) {
1162
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1161
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1162
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1163 1163
 	}
1164 1164
 
1165
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1166
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1165
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1166
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1167 1167
 	}
1168 1168
 
1169 1169
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class, $context );
@@ -1262,21 +1262,21 @@  discard block
 block discarded – undo
1262 1262
 	} else {
1263 1263
 		// @deprecated path
1264 1264
 		// Required fields.
1265
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1265
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1266 1266
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1267 1267
 			return '';
1268 1268
 		}
1269 1269
 	}
1270 1270
 
1271 1271
 	if ( $context instanceof \GV\Template_Context ) {
1272
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1273
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1274
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1272
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1273
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1274
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1275 1275
 	} else {
1276 1276
 		// @deprecated path
1277
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1278
-		$field = $args['field'];
1279
-		$form = $args['form'];
1277
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1278
+		$field = $args[ 'field' ];
1279
+		$form = $args[ 'form' ];
1280 1280
 	}
1281 1281
 
1282 1282
 	/**
@@ -1294,46 +1294,46 @@  discard block
 block discarded – undo
1294 1294
 	);
1295 1295
 
1296 1296
 	if ( $context instanceof \GV\Template_Context ) {
1297
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1297
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1298 1298
 	} else {
1299 1299
 		// @deprecated path
1300
-		$placeholders['value'] = gv_value( $entry, $field );
1300
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1301 1301
 	}
1302 1302
 
1303 1303
 	// If the value is empty and we're hiding empty, return empty.
1304
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1304
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1305 1305
 		return '';
1306 1306
 	}
1307 1307
 
1308
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1309
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1308
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1309
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1310 1310
 	}
1311 1311
 
1312 1312
 	// Get width setting, if exists
1313
-	$placeholders['width'] = GravityView_API::field_width( $field );
1313
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1314 1314
 
1315 1315
 	// If replacing with CSS inline formatting, let's do it.
1316
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1316
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1317 1317
 
1318 1318
 	// Grab the Class using `gv_class`
1319
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1320
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1319
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1320
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1321 1321
 
1322 1322
 
1323 1323
 	// Get field label if needed
1324
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
1325
-		$placeholders['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
1324
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
1325
+		$placeholders[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
1326 1326
 	}
1327 1327
 
1328 1328
 	if ( $context instanceof \GV\Template_Context ) {
1329
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1329
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1330 1330
 	} else {
1331 1331
 		// Default Label value
1332
-		$placeholders['label_value'] = gv_label( $field, $entry );
1332
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1333 1333
 	}
1334 1334
 
1335
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1336
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1335
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1336
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1337 1337
 	}
1338 1338
 
1339 1339
 	/**
@@ -1344,7 +1344,7 @@  discard block
 block discarded – undo
1344 1344
 	 * @since 2.0
1345 1345
 	 * @param \GV\Template_Context $context The context.
1346 1346
 	 */
1347
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1347
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1348 1348
 
1349 1349
 	/**
1350 1350
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1371,7 +1371,7 @@  discard block
 block discarded – undo
1371 1371
 	foreach ( $placeholders as $tag => $value ) {
1372 1372
 
1373 1373
 		// If the tag doesn't exist just skip it
1374
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1374
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1375 1375
 			continue;
1376 1376
 		}
1377 1377
 
Please login to merge, or discard this patch.