Completed
Pull Request — develop (#1436)
by
unknown
15:35
created
future/includes/class-gv-wrappers.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@
 block discarded – undo
50 50
 		/**
51 51
 		 * By array.
52 52
 		 */
53
-		if ( is_array( $view ) && ! empty( $view['id'] ) ) {
54
-			return $this->get( $view['id'] );
53
+		if ( is_array( $view ) && ! empty( $view[ 'id' ] ) ) {
54
+			return $this->get( $view[ 'id' ] );
55 55
 		}
56 56
 
57 57
 		/**
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-core.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 		require_once gravityview()->plugin->dir( 'future/includes/rest/class-gv-rest-route.php' );
22 22
 		require_once gravityview()->plugin->dir( 'future/includes/rest/class-gv-rest-views-route.php' );
23 23
 
24
-		self::$routes['views'] = $views = new Views_Route();
24
+		self::$routes[ 'views' ] = $views = new Views_Route();
25 25
 		$views->register_routes();
26 26
 	}
27 27
 
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gvfield.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 		 */
44 44
 		$atts = apply_filters( 'gravityview/shortcodes/gvfield/atts', $atts );
45 45
 
46
-		if ( ! $view = \GV\View::by_id( $atts['view_id'] ) ) {
47
-			gravityview()->log->error( 'View #{view_id} not found', array( 'view_id' => $atts['view_id'] ) );
46
+		if ( ! $view = \GV\View::by_id( $atts[ 'view_id' ] ) ) {
47
+			gravityview()->log->error( 'View #{view_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
48 48
 			return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, null, null, $atts );
49 49
 		}
50 50
 
51
-		switch( $atts['entry_id'] ):
51
+		switch ( $atts[ 'entry_id' ] ):
52 52
 			case 'last':
53 53
 				if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
54 54
 					/**
@@ -57,17 +57,17 @@  discard block
 block discarded – undo
57 57
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
58 58
 					 */
59 59
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
60
-						if ( ! empty( $parameters['sorting'] ) ) {
60
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
61 61
 							/**
62 62
 							 * Reverse existing sorts.
63 63
 							 */
64
-							$sort = &$parameters['sorting'];
65
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
64
+							$sort = &$parameters[ 'sorting' ];
65
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
66 66
 						} else {
67 67
 							/**
68 68
 							 * Otherwise, sort by date_created.
69 69
 							 */
70
-							$parameters['sorting'] = array(
70
+							$parameters[ 'sorting' ] = array(
71 71
 								'key' => 'id',
72 72
 								'direction' => 'ASC',
73 73
 								'is_numeric' => true
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 					/** If a sort already exists, reverse it. */
84 84
 					if ( $sort = end( $entries->sorts ) ) {
85
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
85
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
86 86
 					} else {
87 87
 						/** Otherwise, sort by date_created */
88 88
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -99,20 +99,20 @@  discard block
 block discarded – undo
99 99
 				}
100 100
 				break;
101 101
 			default:
102
-				if ( ! $entry = \GV\GF_Entry::by_id( $atts['entry_id'] ) ) {
103
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
102
+				if ( ! $entry = \GV\GF_Entry::by_id( $atts[ 'entry_id' ] ) ) {
103
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
104 104
 					return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, null, $atts );
105 105
 				}
106 106
 		endswitch;
107 107
 
108
-		$field = is_numeric( $atts['field_id'] ) ? \GV\GF_Field::by_id( $view->form, $atts['field_id'] ) : \GV\Internal_Field::by_id( $atts['field_id'] );
108
+		$field = is_numeric( $atts[ 'field_id' ] ) ? \GV\GF_Field::by_id( $view->form, $atts[ 'field_id' ] ) : \GV\Internal_Field::by_id( $atts[ 'field_id' ] );
109 109
 
110 110
 		if ( ! $field ) {
111
-			gravityview()->log->error( 'Field #{field_id} not found', array( 'view_id' => $atts['field_id'] ) );
111
+			gravityview()->log->error( 'Field #{field_id} not found', array( 'view_id' => $atts[ 'field_id' ] ) );
112 112
 			return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $field, $atts );
113 113
 		}
114 114
 
115
-		if ( $view->form->ID != $entry['form_id'] ) {
115
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
116 116
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
117 117
 			return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $atts );
118 118
 		}
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 			return apply_filters( 'gravityview/shortcodes/gvfield/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
123 123
 		}
124 124
 
125
-		if ( ! $view->form  ) {
125
+		if ( ! $view->form ) {
126 126
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
127 127
 
128 128
 			/**
@@ -145,13 +145,13 @@  discard block
 block discarded – undo
145 145
 		}
146 146
 
147 147
 		/** Unapproved entries. */
148
-		if ( $entry['status'] != 'active' ) {
148
+		if ( $entry[ 'status' ] != 'active' ) {
149 149
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
150 150
 			return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $atts );
151 151
 		}
152 152
 
153 153
 		if ( $view->settings->get( 'show_only_approved' ) ) {
154
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
154
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
155 155
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
156 156
 				return apply_filters( 'gravityview/shortcodes/gvfield/output', '', $view, $entry, $atts );
157 157
 			}
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,6 @@
 block discarded – undo
18 18
 	/**
19 19
 	 * Process and output the [gvfield] shortcode.
20 20
 	 *
21
-	 * @param array $passed_atts The attributes passed.
22 21
 	 * @param string $content The content inside the shortcode.
23 22
 	 * @param string $tag The shortcode tag.
24 23
 	 *
Please login to merge, or discard this patch.
future/includes/class-gv-template-view.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -108,13 +108,13 @@
 block discarded – undo
108 108
 		global $post;
109 109
 
110 110
 		if ( ! $this->request->is_view() && $post ) {
111
-			$specifics []= sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
112
-			$specifics []= sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
111
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
112
+			$specifics [ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
113 113
 		}
114 114
 
115 115
 		
116
-		$specifics []= sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
117
-		$specifics []= sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
116
+		$specifics [ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
117
+		$specifics [ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
118 118
 
119 119
 		return array_merge( $specifics, $templates );
120 120
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 4 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			'author'    => self::author,
97 97
 			'language'  => get_locale(),
98 98
 			'url'       => home_url(),
99
-		    'beta'      => $this->settings->get( 'beta' ),
99
+			'beta'      => $this->settings->get( 'beta' ),
100 100
 		);
101 101
 
102 102
 		if ( ! empty( $action ) ) {
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 	private function license_call_update_settings( $license_data, $data ) {
464 464
 		$settings = array();
465 465
 
466
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
466
+		$settings['license_key'] = $license_data->license_key = trim( $data['license'] );
467 467
 		$settings['license_key_status'] = $license_data->license;
468 468
 		$settings['license_key_response'] = (array)$license_data;
469 469
 
@@ -597,14 +597,14 @@  discard block
 block discarded – undo
597 597
 			// Call the custom API.
598 598
 			$response = wp_remote_post( self::url, array(
599 599
 				'timeout'   => 15,
600
-			    'sslverify' => false,
601
-			    'body'      =>  array(
602
-				    'edd_action' => 'check_license',
603
-				    'license'    => trim( $this->settings->get( 'license_key' ) ),
604
-				    'item_name'  => self::name,
605
-				    'url'        => home_url(),
606
-				    'site_data'  => $this->get_site_data(),
607
-			    ),
600
+				'sslverify' => false,
601
+				'body'      =>  array(
602
+					'edd_action' => 'check_license',
603
+					'license'    => trim( $this->settings->get( 'license_key' ) ),
604
+					'item_name'  => self::name,
605
+					'url'        => home_url(),
606
+					'site_data'  => $this->get_site_data(),
607
+				),
608 608
 			));
609 609
 
610 610
 			// make sure the response came back okay
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -174,7 +174,8 @@  discard block
 block discarded – undo
174 174
 			if ( empty( $license_data ) ) {
175 175
 				if ( $is_ajax ) {
176 176
 					exit( json_encode( array() ) );
177
-				} else { // Non-ajax call
177
+				} else {
178
+// Non-ajax call
178 179
 					return json_encode( array() );
179 180
 				}
180 181
 			}
@@ -207,7 +208,8 @@  discard block
 block discarded – undo
207 208
 
208 209
 		if ( $is_ajax ) {
209 210
 			exit( $json );
210
-		} else { // Non-ajax call
211
+		} else {
212
+// Non-ajax call
211 213
 			return ( Utils::_GET( 'format', Utils::get( $data, 'format' ) ) === 'object' ) ? $license_data : $json;
212 214
 		}
213 215
 	}
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -510,6 +510,9 @@  discard block
 block discarded – undo
510 510
 		$this->settings->set( $settings );
511 511
 	}
512 512
 
513
+	/**
514
+	 * @param boolean $echo
515
+	 */
513 516
 	public function settings_edd_license_activation( $field, $echo ) {
514 517
 
515 518
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
@@ -617,7 +620,6 @@  discard block
 block discarded – undo
617 620
 	 * Check the GravityView license information
618 621
 	 *
619 622
 	 * @since 1.19.3
620
-	 * @param bool $force Whether to force checking license, even if AJAX
621 623
 	 *
622 624
 	 * @return void
623 625
 	 */
Please login to merge, or discard this patch.
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		);
103 103
 
104 104
 		if ( ! empty( $action ) ) {
105
-			$settings['edd_action'] = esc_attr( $action );
105
+			$settings[ 'edd_action' ] = esc_attr( $action );
106 106
 		}
107 107
 
108 108
 		return array_map( 'urlencode', $settings );
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'format' => 'json',
159 159
 		) );
160 160
 
161
-		if ( $is_ajax && empty( $data['license'] ) ) {
161
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
162 162
 			die( -1 );
163 163
 		}
164 164
 
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 			$json = json_encode( $license_data );
188 188
 
189
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
189
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
190 190
 
191 191
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
192 192
 
193
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
193
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
194 194
 
195 195
 			if ( $is_check_action_button ) {
196 196
 				delete_transient( self::status_transient_key );
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			// most likely a mistake.
202 202
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
203 203
 
204
-				if ( ! empty( $data['field_id'] ) ) {
204
+				if ( ! empty( $data[ 'field_id' ] ) ) {
205 205
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
206 206
 				}
207 207
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			$class   = 'hide';
230 230
 			$message = '';
231 231
 		} else {
232
-			if( ! empty( $license_data->error ) ) {
232
+			if ( ! empty( $license_data->error ) ) {
233 233
 				$class = 'error';
234 234
 				$string_key = $license_data->error;
235 235
 			} else { $class = $license_data->license;
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function license_details( $response = array() ) {
255 255
 
256
-		$response = (array) $response;
256
+		$response = (array)$response;
257 257
 
258 258
 		$return  = '';
259 259
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
260 260
 
261
-		if ( ! empty( $response['license_key'] ) ) {
261
+		if ( ! empty( $response[ 'license_key' ] ) ) {
262 262
 			$return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
263 263
 
264 264
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
 					return sprintf( $wrapper, '' ); // Do not show redundant information - invalid/deactivated notice will be displayed by generate_license_box()
267 267
 				}
268 268
 
269
-				$return .= $this->strings( $response['license'], $response );
270
-			} elseif ( ! empty( $response['license_name'] ) ) {
269
+				$return .= $this->strings( $response[ 'license' ], $response );
270
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
271 271
 				$response_keys = array(
272 272
 					'license_name'   => '',
273 273
 					'license_limit'  => '',
@@ -282,22 +282,22 @@  discard block
 block discarded – undo
282 282
 				$response = wp_parse_args( $response, $response_keys );
283 283
 
284 284
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
285
-				$renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) );
286
-				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
287
-				$local_text       = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
288
-				$license_limit    = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
285
+				$renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) );
286
+				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
287
+				$local_text       = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
288
+				$license_limit    = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
289 289
 
290 290
 
291 291
 				$details = array(
292
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
293
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
294
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
295
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
292
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
293
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
294
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
295
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
296 296
 				);
297 297
 
298
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
299
-					unset( $details['upgrade'] );
300
-					$details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
298
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
299
+					unset( $details[ 'upgrade' ] );
300
+					$details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
301 301
 				}
302 302
 
303 303
 				$return .= '<ul>';
@@ -329,20 +329,20 @@  discard block
 block discarded – undo
329 329
 		if ( ! empty( $upgrades ) ) {
330 330
 
331 331
 			$locale_parts = explode( '_', get_locale() );
332
-			$is_english = ( 'en' === $locale_parts[0] );
332
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
333 333
 
334 334
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
335 335
 			$output .= '<ul>';
336 336
 
337 337
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
338
-				$upgrade = (object) $upgrade;
338
+				$upgrade = (object)$upgrade;
339 339
 
340 340
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
341 341
 
342 342
 				if ( $is_english && isset( $upgrade->description ) ) {
343 343
 					$message = esc_html( $upgrade->description );
344 344
 				} else {
345
-					switch( $upgrade->price_id ) {
345
+					switch ( $upgrade->price_id ) {
346 346
 						// Interstellar
347 347
 						case 1:
348 348
 						default:
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
422 422
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
423 423
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
424
-			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
424
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
425 425
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
426 426
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
427 427
 			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 
450 450
 		if ( ! empty( $license_data->renewal_url ) ) {
451 451
 			$renew_license_url = $license_data->renewal_url;
452
-		} elseif( ! empty( $license_data->license_key ) ) {
452
+		} elseif ( ! empty( $license_data->license_key ) ) {
453 453
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
454 454
 		} else {
455 455
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
 	 * @return array|\WP_Error
467 467
 	 */
468 468
 	private function _license_get_remote_response( $data, $license = '' ) {
469
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
469
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
470 470
 
471 471
 		$url = add_query_arg( $api_params, self::url );
472 472
 
@@ -506,9 +506,9 @@  discard block
 block discarded – undo
506 506
 	private function license_call_update_settings( $license_data, $data ) {
507 507
 		$settings = array();
508 508
 
509
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
510
-		$settings['license_key_status'] = $license_data->license;
511
-		$settings['license_key_response'] = (array)$license_data;
509
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
510
+		$settings[ 'license_key_status' ] = $license_data->license;
511
+		$settings[ 'license_key_response' ] = (array)$license_data;
512 512
 
513 513
 		$this->settings->set( $settings );
514 514
 	}
@@ -528,9 +528,9 @@  discard block
 block discarded – undo
528 528
 		$status = trim( $this->settings->get( 'license_key_status' ) );
529 529
 		$key = trim( $this->settings->get( 'license_key' ) );
530 530
 
531
-		if (  !empty( $key ) ) {
531
+		if ( ! empty( $key ) ) {
532 532
 			$response = $this->settings->get( 'license_key_response' );
533
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
533
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
534 534
 		} else {
535 535
 			$response = array();
536 536
 		}
@@ -573,11 +573,11 @@  discard block
 block discarded – undo
573 573
 
574 574
 		$submit = '<div class="gv-edd-button-wrapper">';
575 575
 		foreach ( $fields as $field ) {
576
-			$field['type'] = 'button';
577
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
578
-			$field['style'] = 'margin-left: 10px;';
579
-			if( $disabled_attribute ) {
580
-				$field['disabled'] = $disabled_attribute;
576
+			$field[ 'type' ] = 'button';
577
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
578
+			$field[ 'style' ] = 'margin-left: 10px;';
579
+			if ( $disabled_attribute ) {
580
+				$field[ 'disabled' ] = $disabled_attribute;
581 581
 			}
582 582
 			$submit .= $this->settings->as_html( $field, $echo );
583 583
 		}
@@ -656,7 +656,7 @@  discard block
 block discarded – undo
656 656
 				    'url'        => home_url(),
657 657
 				    'site_data'  => $this->get_site_data(),
658 658
 			    ),
659
-			));
659
+			) );
660 660
 
661 661
 			// make sure the response came back okay
662 662
 			if ( is_wp_error( $response ) ) {
@@ -686,45 +686,45 @@  discard block
 block discarded – undo
686 686
 		$theme_data = wp_get_theme();
687 687
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
688 688
 
689
-		$data['gv_version']  = Plugin::$version;
690
-		$data['php_version']  = phpversion();
691
-		$data['wp_version']   = get_bloginfo( 'version' );
692
-		$data['gf_version']  = \GFForms::$version;
693
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
694
-		$data['multisite']    = is_multisite();
695
-		$data['theme']        = $theme;
696
-		$data['url']          = home_url();
697
-		$data['license_key']  = $this->settings->get( 'license_key' );
698
-		$data['beta']         = $this->settings->get( 'beta' );
689
+		$data[ 'gv_version' ]  = Plugin::$version;
690
+		$data[ 'php_version' ]  = phpversion();
691
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
692
+		$data[ 'gf_version' ]  = \GFForms::$version;
693
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
694
+		$data[ 'multisite' ]    = is_multisite();
695
+		$data[ 'theme' ]        = $theme;
696
+		$data[ 'url' ]          = home_url();
697
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
698
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
699 699
 
700 700
 		// View Data
701 701
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
702 702
 
703
-		$data['view_count'] = null;
704
-		$data['view_first'] = null;
705
-		$data['view_latest'] = null;
703
+		$data[ 'view_count' ] = null;
704
+		$data[ 'view_first' ] = null;
705
+		$data[ 'view_latest' ] = null;
706 706
 
707 707
 		if ( $gravityview_posts->publish ) {
708
-			$data['view_count'] = $gravityview_posts->publish;
708
+			$data[ 'view_count' ] = $gravityview_posts->publish;
709 709
 
710 710
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
711 711
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
712 712
 
713 713
 			if ( $first = array_shift( $first ) ) {
714
-				$data['view_first'] = $first->post_date;
714
+				$data[ 'view_first' ] = $first->post_date;
715 715
 			}
716 716
 			if ( $latest = array_pop( $latest ) ) {
717
-				$data['view_latest'] = $latest->post_date;
717
+				$data[ 'view_latest' ] = $latest->post_date;
718 718
 			}
719 719
 		}
720 720
 
721 721
 		// Form counts
722 722
 		if ( class_exists( 'GFFormsModel' ) ) {
723 723
 			$form_data = \GFFormsModel::get_form_count();
724
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
725
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
726
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
727
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
724
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
725
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
726
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
727
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
728 728
 		}
729 729
 
730 730
 		// Retrieve current plugin information
@@ -732,13 +732,13 @@  discard block
 block discarded – undo
732 732
 			include ABSPATH . '/wp-admin/includes/plugin.php';
733 733
 		}
734 734
 
735
-		$data['integrations']     = self::get_related_plugins_and_extensions();
736
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
737
-		$data['inactive_plugins'] = array();
738
-		$data['locale']           = get_locale();
735
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
736
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
737
+		$data[ 'inactive_plugins' ] = array();
738
+		$data[ 'locale' ]           = get_locale();
739 739
 
740 740
 		// Validate request on the GV server
741
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
741
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
742 742
 
743 743
 		return $data;
744 744
 	}
@@ -768,7 +768,7 @@  discard block
 block discarded – undo
768 768
 
769 769
 				$plugin_data = get_plugin_data( $active_plugin );
770 770
 
771
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
771
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
772 772
 			}
773 773
 
774 774
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
future/includes/class-gv-context-template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,8 @@
 block discarded – undo
86 86
 		 */
87 87
 		$context->view = Utils::get( $template, 'view' );
88 88
 		$context->source = Utils::get( $template, 'source' );
89
-		$context->field = Utils::get( $template, 'field' ) ? : Utils::get( $data, 'field' );
90
-		$context->entry = Utils::get( $template, 'entry' ) ? : Utils::get( $data, 'entry' );
89
+		$context->field = Utils::get( $template, 'field' ) ?: Utils::get( $data, 'field' );
90
+		$context->entry = Utils::get( $template, 'entry' ) ?: Utils::get( $data, 'entry' );
91 91
 		$context->request = Utils::get( $template, 'request' );
92 92
 
93 93
 		$context->entries = Utils::get( $template, 'entries' ) ? $template->entries : null;
Please login to merge, or discard this patch.
future/includes/class-gv-logger-wp-action.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
 	 */
28 28
 	protected function log( $level, $message, $context ) {
29 29
 
30
-		$php_version = ( ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ) ?
31
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
30
+		$php_version = ( ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ) ?
31
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
32 32
 
33 33
 		if ( version_compare( $php_version, '5.4', '>=' ) ) {
34 34
 			$backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 3 );
35
-			$location = $this->interpolate( "{class}{type}{function}", $backtrace[2] );
35
+			$location = $this->interpolate( "{class}{type}{function}", $backtrace[ 2 ] );
36 36
 			$message = $this->interpolate( "[$level, $location] $message", $context );
37 37
 		} else {
38 38
 			$message = "[$level] $message";
@@ -58,14 +58,14 @@  discard block
 block discarded – undo
58 58
 			do_action(
59 59
 				sprintf( 'gravityview_log_%s_test', $action ),
60 60
 				$this->interpolate( $message, $context ),
61
-				empty( $context['data'] ) ? array() : $context['data']
61
+				empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
62 62
 			);
63 63
 		}
64 64
 		
65 65
 		do_action(
66 66
 			sprintf( 'gravityview_log_%s', $action ),
67 67
 			$this->interpolate( $message, $context ),
68
-			empty( $context['data'] ) ? array() : $context['data']
68
+			empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
69 69
 		);
70 70
 	}
71 71
 }
Please login to merge, or discard this patch.
gravityview.php 3 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -237,26 +237,26 @@
 block discarded – undo
237 237
 
238 238
 	/** DEBUG */
239 239
 
240
-    /**
241
-     * Logs messages using Gravity Forms logging add-on
242
-     * @param  string $message log message
243
-     * @param mixed $data Additional data to display
240
+	/**
241
+	 * Logs messages using Gravity Forms logging add-on
242
+	 * @param  string $message log message
243
+	 * @param mixed $data Additional data to display
244 244
 	 * @deprecated use gravityview()->log
245
-     * @return void
246
-     */
247
-    public static function log_debug( $message, $data = null ){
245
+	 * @return void
246
+	 */
247
+	public static function log_debug( $message, $data = null ){
248 248
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
249 249
 		gravityview()->log->debug( $message, $data );
250
-    }
250
+	}
251 251
 
252
-    /**
253
-     * Logs messages using Gravity Forms logging add-on
254
-     * @param  string $message log message
252
+	/**
253
+	 * Logs messages using Gravity Forms logging add-on
254
+	 * @param  string $message log message
255 255
 	 * @deprecated use gravityview()->log
256
-     * @return void
257
-     */
258
-    public static function log_error( $message, $data = null ){
256
+	 * @return void
257
+	 */
258
+	public static function log_error( $message, $data = null ){
259 259
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
260 260
 		gravityview()->log->error( $message, $data );
261
-    }
261
+	}
262 262
 } // end class GravityView_Plugin
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 * @deprecated use gravityview()->log
245 245
      * @return void
246 246
      */
247
-    public static function log_debug( $message, $data = null ){
247
+    public static function log_debug( $message, $data = null ) {
248 248
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
249 249
 		gravityview()->log->debug( $message, $data );
250 250
     }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 * @deprecated use gravityview()->log
256 256
      * @return void
257 257
      */
258
-    public static function log_error( $message, $data = null ){
258
+    public static function log_error( $message, $data = null ) {
259 259
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
260 260
 		gravityview()->log->error( $message, $data );
261 261
     }
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 * @deprecated use gravityview()->log
245 245
      * @return void
246 246
      */
247
-    public static function log_debug( $message, $data = null ){
247
+    public static function log_debug( $message, $data = null ) {
248 248
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
249 249
 		gravityview()->log->debug( $message, $data );
250 250
     }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 * @deprecated use gravityview()->log
256 256
      * @return void
257 257
      */
258
-    public static function log_error( $message, $data = null ){
258
+    public static function log_error( $message, $data = null ) {
259 259
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
260 260
 		gravityview()->log->error( $message, $data );
261 261
     }
Please login to merge, or discard this patch.
includes/class-api.php 5 patches
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -161,20 +161,20 @@  discard block
 block discarded – undo
161 161
 
162 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
-                // We want the merge tag to be formatted as a class. The merge tag may be
169
-                // replaced by a multiple-word value that should be output as a single class.
170
-                // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
168
+				// We want the merge tag to be formatted as a class. The merge tag may be
169
+				// replaced by a multiple-word value that should be output as a single class.
170
+				// "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
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
-                // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
177
-            }
175
+				// And then we want life to return to normal
176
+				remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
177
+			}
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180 180
 			$classes[] = gravityview_sanitize_html_class( $custom_class );
@@ -531,32 +531,32 @@  discard block
 block discarded – undo
531 531
 		return sanitize_title( $slug );
532 532
 	}
533 533
 
534
-    /**
535
-     * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
536
-     *
537
-     * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
538
-     *
539
-     * @param $entry array Gravity Forms entry object
540
-     * @param $form array Gravity Forms form object
541
-     */
542
-    public static function entry_create_custom_slug( $entry, $form ) {
543
-        /**
544
-         * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
545
-         * @param boolean $custom Should we process the custom entry slug?
546
-         */
547
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
-        if( $custom ) {
549
-            // create the gravityview_unique_id and save it
534
+	/**
535
+	 * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
536
+	 *
537
+	 * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
538
+	 *
539
+	 * @param $entry array Gravity Forms entry object
540
+	 * @param $form array Gravity Forms form object
541
+	 */
542
+	public static function entry_create_custom_slug( $entry, $form ) {
543
+		/**
544
+		 * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
545
+		 * @param boolean $custom Should we process the custom entry slug?
546
+		 */
547
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
+		if( $custom ) {
549
+			// create the gravityview_unique_id and save it
550 550
 
551
-            // Get the entry hash
552
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
551
+			// Get the entry hash
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
-        }
559
-    }
558
+		}
559
+	}
560 560
 
561 561
 
562 562
 
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 
900 900
 			// If there was an error, continue to the next term.
901 901
 			if ( is_wp_error( $term_link ) ) {
902
-			    continue;
902
+				continue;
903 903
 			}
904 904
 
905 905
 			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -526,7 +526,7 @@
 block discarded – undo
526 526
 					$column = 'lead_id';
527 527
 				}
528 528
 
529
-				$results = $wpdb->get_results( $wpdb->prepare( "SELECT $column, meta_value FROM $table WHERE form_id = (SELECT form_id FROM $table WHERE $column = %d LIMIT 1) AND meta_key = 'gravityview_unique_id'", $id_or_string ) );
529
+				$results = $wpdb->get_results( $wpdb->prepare( "select $column, meta_value FROM $table WHERE form_id = (SELECT form_id FROM $table WHERE $column = %d LIMIT 1) AND meta_key = 'gravityview_unique_id'", $id_or_string ) );
530 530
 
531 531
 				if ( $results ) {
532 532
 					$cache = array_replace( $cache, array_combine( wp_list_pluck( $results, $column ), wp_list_pluck( $results, 'meta_value' ) ) );
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1380,7 +1380,7 @@  discard block
 block discarded – undo
1380 1380
 	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1381 1381
 	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1382 1382
 
1383
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1383
+	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ) {
1384 1384
 		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1385 1385
 	}
1386 1386
 
@@ -1419,7 +1419,7 @@  discard block
 block discarded – undo
1419 1419
 	foreach ( $placeholders as $tag => $value ) {
1420 1420
 
1421 1421
 		// If the tag doesn't exist just skip it
1422
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1422
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1423 1423
 			continue;
1424 1424
 		}
1425 1425
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -232,7 +232,6 @@  discard block
 block discarded – undo
232 232
 	 * @deprecated Use \GV\Field_Template::render() or the more low-level \GV\Field::get_value()
233 233
 	 *
234 234
 	 * @param array $entry
235
-	 * @param array $field
236 235
 	 * @return null|string
237 236
 	 */
238 237
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
@@ -851,6 +850,9 @@  discard block
 block discarded – undo
851 850
 	return $value;
852 851
 }
853 852
 
853
+/**
854
+ * @param GV\Template_Context $context
855
+ */
854 856
 function gv_directory_link( $post = NULL, $add_pagination = true, $context = null ) {
855 857
 	return GravityView_API::directory_link( $post, $add_pagination, $context );
856 858
 }
@@ -1359,6 +1361,7 @@  discard block
 block discarded – undo
1359 1361
  * @param  array $passed_args Associative array with field data. `field` and `form` are required.
1360 1362
  * @since  2.0
1361 1363
  * @param  \GV\Template_Context The template context.
1364
+ * @param GV\Template_Context $context
1362 1365
  * @return string Field output. If empty value and hide empty is true, return empty.
1363 1366
  */
1364 1367
 function gravityview_field_output( $passed_args, $context = null ) {
Please login to merge, or discard this patch.
Spacing   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 		$form = $gravityview_view->getForm();
32 32
 
33
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
33
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
34 34
 			/** Allow to fall through for back compatibility testing purposes. */
35 35
 		} else {
36 36
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -38,29 +38,29 @@  discard block
 block discarded – undo
38 38
 
39 39
 		$label = '';
40 40
 
41
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
41
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
42 42
 
43
-			$label = $field['label'];
43
+			$label = $field[ 'label' ];
44 44
 
45 45
 			// Support Gravity Forms 1.9+
46
-			if( class_exists( 'GF_Field' ) ) {
46
+			if ( class_exists( 'GF_Field' ) ) {
47 47
 
48
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
48
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
49 49
 
50
-				if( $field_object ) {
50
+				if ( $field_object ) {
51 51
 
52
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
52
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
53 53
 
54 54
 					// This is a complex field, with labels on a per-input basis
55
-					if( $input ) {
55
+					if ( $input ) {
56 56
 
57 57
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
58
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
58
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
59 59
 
60 60
 					} else {
61 61
 
62 62
 						// This is a field with one label
63
-						$label = $field_object->get_field_label( true, $field['label'] );
63
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
64 64
 
65 65
 					}
66 66
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 			}
70 70
 
71 71
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
72
-			if ( !empty( $field['custom_label'] ) ) {
72
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
73 73
 
74
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
74
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
75 75
 
76 76
 			}
77 77
 
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 
134 134
 		$width = NULL;
135 135
 
136
-		if( !empty( $field['width'] ) ) {
137
-			$width = absint( $field['width'] );
136
+		if ( ! empty( $field[ 'width' ] ) ) {
137
+			$width = absint( $field[ 'width' ] );
138 138
 
139 139
 			// If using percentages, limit to 100%
140
-			if( '%d%%' === $format && $width > 100 ) {
140
+			if ( '%d%%' === $format && $width > 100 ) {
141 141
 				$width = 100;
142 142
 			}
143 143
 
@@ -157,42 +157,42 @@  discard block
 block discarded – undo
157 157
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
158 158
 		$classes = array();
159 159
 
160
-		if( !empty( $field['custom_class'] ) ) {
160
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
161 161
 
162
-            $custom_class = $field['custom_class'];
162
+            $custom_class = $field[ 'custom_class' ];
163 163
 
164
-            if( !empty( $entry ) ) {
164
+            if ( ! empty( $entry ) ) {
165 165
 
166 166
                 // We want the merge tag to be formatted as a class. The merge tag may be
167 167
                 // replaced by a multiple-word value that should be output as a single class.
168 168
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
169
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
169
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
170 170
 
171
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
171
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
172 172
 
173 173
                 // And then we want life to return to normal
174
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
174
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
175 175
             }
176 176
 
177 177
 			// And now we want the spaces to be handled nicely.
178
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
178
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
179 179
 
180 180
 		}
181 181
 
182
-		if(!empty($field['id'])) {
183
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
184
-				$form_id = '-'.$form['id'];
182
+		if ( ! empty( $field[ 'id' ] ) ) {
183
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
184
+				$form_id = '-' . $form[ 'id' ];
185 185
 			} else {
186 186
 				// @deprecated path. Form should always be given.
187 187
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
188 188
 				$gravityview_view = GravityView_View::getInstance();
189
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
189
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
190 190
 			}
191 191
 
192
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
192
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
193 193
 		}
194 194
 
195
-		return esc_attr(implode(' ', $classes));
195
+		return esc_attr( implode( ' ', $classes ) );
196 196
 	}
197 197
 
198 198
 	/**
@@ -207,11 +207,11 @@  discard block
 block discarded – undo
207 207
 	 * @return string Sanitized unique HTML `id` attribute for the field
208 208
 	 */
209 209
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
210
-		$id = $field['id'];
210
+		$id = $field[ 'id' ];
211 211
 
212 212
 		if ( ! empty( $id ) ) {
213
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
214
-				$form_id = '-' . $form['id'];
213
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
214
+				$form_id = '-' . $form[ 'id' ];
215 215
 			} else {
216 216
 				// @deprecated path. Form should always be given.
217 217
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
220 220
 			}
221 221
 
222
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
222
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
223 223
 		}
224 224
 
225 225
 		return esc_attr( $id );
@@ -258,14 +258,14 @@  discard block
 block discarded – undo
258 258
 	 */
259 259
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
260 260
 
261
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
261
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
262 262
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
263 263
 			return NULL;
264 264
 		}
265 265
 
266 266
 		$href = self::entry_link( $entry, $base_id );
267 267
 
268
-		if( '' === $href ) {
268
+		if ( '' === $href ) {
269 269
 			return NULL;
270 270
 		}
271 271
 
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 		} else {
303 303
 			$gravityview_view = GravityView_View::getInstance();
304 304
 
305
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
305
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
306 306
 				$is_search = true;
307 307
 			}
308 308
 		}
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 
314 314
 			$output = esc_html__( 'This search returned no results.', 'gravityview' );
315 315
 
316
-			if( $context ) {
316
+			if ( $context ) {
317 317
 				$setting = $context->view->settings->get( 'no_search_results_text', $output );
318 318
 			}
319 319
 
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 			$output = esc_html__( 'No entries match your request.', 'gravityview' );
323 323
 
324
-			if( $context ) {
324
+			if ( $context ) {
325 325
 				$setting = $context->view->settings->get( 'no_results_text', $output );
326 326
 			}
327 327
 		}
@@ -439,9 +439,9 @@  discard block
 block discarded – undo
439 439
 
440 440
 		// If we've saved the permalink in memory, use it
441 441
 		// @since 1.3
442
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
442
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
443 443
 
444
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
444
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
445 445
 			$link = home_url();
446 446
 		}
447 447
 
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 
451 451
 			// If not yet saved, cache the permalink.
452 452
 			// @since 1.3
453
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
453
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
454 454
 		}
455 455
 
456 456
 		// Deal with returning to proper pagination for embedded views
@@ -458,13 +458,13 @@  discard block
 block discarded – undo
458 458
 
459 459
 			$args = array();
460 460
 
461
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
462
-				$args['pagenum'] = intval( $pagenum );
461
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
462
+				$args[ 'pagenum' ] = intval( $pagenum );
463 463
 			}
464 464
 
465
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
466
-				$args['sort'] = $sort;
467
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
465
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
466
+				$args[ 'sort' ] = $sort;
467
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
468 468
 			}
469 469
 
470 470
 			$link = add_query_arg( $args, $link );
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
502 502
 
503 503
 		// Generate an unique hash to use as the default value
504
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
504
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
505 505
 
506 506
 		/**
507 507
 		 * @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}`
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
513 513
 
514 514
 		// Make sure we have something - use the original ID as backup.
515
-		if( empty( $slug ) ) {
515
+		if ( empty( $slug ) ) {
516 516
 			$slug = $id;
517 517
 		}
518 518
 
@@ -606,15 +606,15 @@  discard block
 block discarded – undo
606 606
          * @param boolean $custom Should we process the custom entry slug?
607 607
          */
608 608
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
609
-        if( $custom ) {
609
+        if ( $custom ) {
610 610
             // create the gravityview_unique_id and save it
611 611
 
612 612
             // Get the entry hash
613
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
613
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
614 614
 
615
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
615
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
616 616
 
617
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
617
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
618 618
 
619 619
         }
620 620
     }
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
 
641 641
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
642 642
 			$entry = GVCommon::get_entry( $entry );
643
-		} else if( empty( $entry ) ) {
643
+		} else if ( empty( $entry ) ) {
644 644
 			// @deprecated path
645 645
 			$entry = GravityView_frontend::getInstance()->getEntry();
646 646
 		}
@@ -660,32 +660,32 @@  discard block
 block discarded – undo
660 660
 
661 661
 		$query_arg_name = \GV\Entry::get_endpoint_name();
662 662
 
663
-		if ( ! empty( $entry['_multi'] ) ) {
663
+		if ( ! empty( $entry[ '_multi' ] ) ) {
664 664
 			$entry_slugs = array();
665 665
 
666
-			foreach ( $entry['_multi'] as $_multi ) {
666
+			foreach ( $entry[ '_multi' ] as $_multi ) {
667 667
 
668
-				if( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
669
-					$entry_slugs[] = $gv_multi->get_slug();
668
+				if ( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
669
+					$entry_slugs[ ] = $gv_multi->get_slug();
670 670
 				} else {
671 671
 					// TODO: This path isn't covered by unit tests
672
-					$entry_slugs[] = \GravityView_API::get_entry_slug( $_multi['id'], $_multi );
672
+					$entry_slugs[ ] = \GravityView_API::get_entry_slug( $_multi[ 'id' ], $_multi );
673 673
 				}
674 674
 
675 675
 				unset( $gv_multi );
676 676
 
677
-				$forms[] = $_multi['form_id'];
677
+				$forms[ ] = $_multi[ 'form_id' ];
678 678
 			}
679 679
 
680 680
 			$entry_slug = implode( ',', $entry_slugs );
681 681
 		} else {
682 682
 
683 683
 			// Fallback when
684
-			if( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
684
+			if ( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
685 685
 				$entry_slug = $gv_entry->get_slug();
686 686
 			} else {
687 687
 				// TODO: This path isn't covered by unit tests
688
-				$entry_slug = \GravityView_API::get_entry_slug( $entry['id'], $entry );
688
+				$entry_slug = \GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
689 689
 			}
690 690
 
691 691
 			unset( $gv_entry );
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 			$args = gv_get_query_args();
705 705
 		}
706 706
 
707
-		if ( get_option('permalink_structure') && ! is_preview() ) {
707
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
708 708
 
709 709
 			/**
710 710
 			 * Make sure the $directory_link doesn't contain any query otherwise it will break when adding the entry slug.
@@ -712,13 +712,13 @@  discard block
 block discarded – undo
712 712
 			 */
713 713
 			$link_parts = explode( '?', $directory_link );
714 714
 
715
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
715
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
716 716
 
717
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
717
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
718 718
 
719 719
 		} else {
720 720
 
721
-			$args[] = array( $query_arg_name => $entry_slug );
721
+			$args[ ] = array( $query_arg_name => $entry_slug );
722 722
 		}
723 723
 
724 724
 		/**
@@ -726,21 +726,21 @@  discard block
 block discarded – undo
726 726
 		 */
727 727
 		if ( $add_directory_args ) {
728 728
 
729
-			if ( ! empty( $_GET['pagenum'] ) ) {
730
-				$args['pagenum'] = intval( $_GET['pagenum'] );
729
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
730
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
731 731
 			}
732 732
 
733 733
 			/**
734 734
 			 * @since 1.7
735 735
 			 */
736 736
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
737
-				$args['sort'] = $sort;
738
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
737
+				$args[ 'sort' ] = $sort;
738
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
739 739
 			}
740 740
 
741 741
 		}
742 742
 
743
-		if( $post_id ) {
743
+		if ( $post_id ) {
744 744
 			$passed_post = get_post( $post_id );
745 745
 			$views       = \GV\View_Collection::from_post( $passed_post );
746 746
 			$has_multiple_views = $views->count() > 1;
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 		}
750 750
 
751 751
 		if ( $has_multiple_views ) {
752
-			$args['gvid'] = $view_id ? $view_id : gravityview_get_view_id();
752
+			$args[ 'gvid' ] = $view_id ? $view_id : gravityview_get_view_id();
753 753
 		}
754 754
 
755 755
 		return add_query_arg( $args, $directory_link );
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 }
820 820
 
821 821
 function gv_class( $field, $form = NULL, $entry = array() ) {
822
-	return GravityView_API::field_class( $field, $form, $entry  );
822
+	return GravityView_API::field_class( $field, $form, $entry );
823 823
 }
824 824
 
825 825
 /**
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
 		$view_id = 0;
843 843
 		if ( $context->view ) {
844 844
 			$view_id = $context->view->ID;
845
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
845
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
846 846
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
847 847
 			}
848 848
 		}
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 		$default_css_class .= ' ' . $context->view->settings->get( 'class', '' );
875 875
 	}
876 876
 
877
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
877
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
878 878
 
879 879
 	/**
880 880
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 
902 902
 	$value = GravityView_API::field_value( $entry, $field );
903 903
 
904
-	if( $value === '' ) {
904
+	if ( $value === '' ) {
905 905
 		/**
906 906
 		 * @filter `gravityview_empty_value` What to display when a field is empty
907 907
 		 * @param string $value (empty string)
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
  */
1015 1015
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
1016 1016
 
1017
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
1017
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
1018 1018
 
1019 1019
 		// For the complete field value as generated by Gravity Forms
1020 1020
 		return $display_value;
@@ -1048,16 +1048,16 @@  discard block
 block discarded – undo
1048 1048
 		$terms = explode( ', ', $value );
1049 1049
 	}
1050 1050
 
1051
-	foreach ($terms as $term_name ) {
1051
+	foreach ( $terms as $term_name ) {
1052 1052
 
1053 1053
 		// If we're processing a category,
1054
-		if( $taxonomy === 'category' ) {
1054
+		if ( $taxonomy === 'category' ) {
1055 1055
 
1056 1056
 			// Use rgexplode to prevent errors if : doesn't exist
1057 1057
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
1058 1058
 
1059 1059
 			// The explode was succesful; we have the category ID
1060
-			if( !empty( $term_id )) {
1060
+			if ( ! empty( $term_id ) ) {
1061 1061
 				$term = get_term_by( 'id', $term_id, $taxonomy );
1062 1062
 			} else {
1063 1063
 			// We have to fall back to the name
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
1070 1070
 		}
1071 1071
 
1072 1072
 		// There's still a tag/category here.
1073
-		if( $term ) {
1073
+		if ( $term ) {
1074 1074
 
1075 1075
 			$term_link = get_term_link( $term, $taxonomy );
1076 1076
 
@@ -1079,11 +1079,11 @@  discard block
 block discarded – undo
1079 1079
 			    continue;
1080 1080
 			}
1081 1081
 
1082
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
1082
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
1083 1083
 		}
1084 1084
 	}
1085 1085
 
1086
-	return implode(', ', $output );
1086
+	return implode( ', ', $output );
1087 1087
 }
1088 1088
 
1089 1089
 /**
@@ -1097,8 +1097,8 @@  discard block
 block discarded – undo
1097 1097
 
1098 1098
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
1099 1099
 
1100
-	if( empty( $link ) ) {
1101
-		return strip_tags( $output);
1100
+	if ( empty( $link ) ) {
1101
+		return strip_tags( $output );
1102 1102
 	}
1103 1103
 
1104 1104
 	return $output;
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
 	$fe = GravityView_frontend::getInstance();
1118 1118
 
1119 1119
 	// Solve problem when loading content via admin-ajax.php
1120
-	if( ! $fe->getGvOutputData() ) {
1120
+	if ( ! $fe->getGvOutputData() ) {
1121 1121
 
1122 1122
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
1123 1123
 
@@ -1125,7 +1125,7 @@  discard block
 block discarded – undo
1125 1125
 	}
1126 1126
 
1127 1127
 	// Make 100% sure that we're dealing with a properly called situation
1128
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1128
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1129 1129
 
1130 1130
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
1131 1131
 
@@ -1356,12 +1356,12 @@  discard block
 block discarded – undo
1356 1356
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1357 1357
 	/** @define "GRAVITYVIEW_DIR" "../" */
1358 1358
 
1359
-	if( !class_exists( 'GravityView_Field' ) ) {
1360
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1359
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1360
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1361 1361
 	}
1362 1362
 
1363
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1364
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1363
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1364
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1365 1365
 	}
1366 1366
 
1367 1367
 	if ( is_null( $context ) ) {
@@ -1464,21 +1464,21 @@  discard block
 block discarded – undo
1464 1464
 	} else {
1465 1465
 		// @deprecated path
1466 1466
 		// Required fields.
1467
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1467
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1468 1468
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1469 1469
 			return '';
1470 1470
 		}
1471 1471
 	}
1472 1472
 
1473 1473
 	if ( $context instanceof \GV\Template_Context ) {
1474
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1475
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1476
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1474
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1475
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1476
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1477 1477
 	} else {
1478 1478
 		// @deprecated path
1479
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1480
-		$field = $args['field'];
1481
-		$form = $args['form'];
1479
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1480
+		$field = $args[ 'field' ];
1481
+		$form = $args[ 'form' ];
1482 1482
 	}
1483 1483
 
1484 1484
 	/**
@@ -1498,43 +1498,43 @@  discard block
 block discarded – undo
1498 1498
 	);
1499 1499
 
1500 1500
 	if ( $context instanceof \GV\Template_Context ) {
1501
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1501
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1502 1502
 	} else {
1503 1503
 		// @deprecated path
1504
-		$placeholders['value'] = gv_value( $entry, $field );
1504
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1505 1505
 	}
1506 1506
 
1507 1507
 	// If the value is empty and we're hiding empty, return empty.
1508
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1508
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1509 1509
 		return '';
1510 1510
 	}
1511 1511
 
1512
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1513
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1512
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1513
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1514 1514
 	}
1515 1515
 
1516 1516
 	// Get width setting, if exists
1517
-	$placeholders['width'] = GravityView_API::field_width( $field );
1517
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1518 1518
 
1519 1519
 	// If replacing with CSS inline formatting, let's do it.
1520
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1520
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1521 1521
 
1522 1522
 	// Grab the Class using `gv_class`
1523
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1524
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1523
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1524
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1525 1525
 
1526 1526
 	if ( $context instanceof \GV\Template_Context ) {
1527
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1527
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1528 1528
 	} else {
1529 1529
 		// Default Label value
1530
-		$placeholders['label_value'] = gv_label( $field, $entry );
1530
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1531 1531
 	}
1532 1532
 
1533
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1534
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1533
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1534
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1535 1535
 
1536
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1537
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1536
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1537
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1538 1538
 	}
1539 1539
 
1540 1540
 	/**
@@ -1545,7 +1545,7 @@  discard block
 block discarded – undo
1545 1545
 	 * @since 2.0
1546 1546
 	 * @param \GV\Template_Context $context The context.
1547 1547
 	 */
1548
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1548
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1549 1549
 
1550 1550
 	/**
1551 1551
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1572,7 +1572,7 @@  discard block
 block discarded – undo
1572 1572
 	foreach ( $placeholders as $tag => $value ) {
1573 1573
 
1574 1574
 		// If the tag doesn't exist just skip it
1575
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1575
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1576 1576
 			continue;
1577 1577
 		}
1578 1578
 
Please login to merge, or discard this patch.