Completed
Push — develop ( 4df9ef...dbeb5a )
by Zack
18:03
created
future/includes/class-gv-shortcode-gvfield.php 1 patch
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.
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-request-admin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			return true;
31 31
 		}
32 32
 
33
-		$context = $args[1];
33
+		$context = $args[ 1 ];
34 34
 
35 35
 		/**
36 36
 		 * Assume false by default.
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		 * @param[in,out] string|bool $is_page If false, no. If string, the name of the page (`single`, `settings`, or `views`)
53 53
 		 * @param[in] string $hook The name of the page to check against. Is passed to the method.
54 54
 		 */
55
-		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $args[0] );
55
+		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $args[ 0 ] );
56 56
 
57 57
 		// If the current page is the same as the compared page
58 58
 		if ( ! empty( $context ) ) {
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		);
101 101
 
102 102
 		if ( ! empty( $action ) ) {
103
-			$settings['edd_action'] = esc_attr( $action );
103
+			$settings[ 'edd_action' ] = esc_attr( $action );
104 104
 		}
105 105
 
106 106
 		return array_map( 'urlencode', $settings );
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			'format' => 'json',
157 157
 		) );
158 158
 
159
-		if ( $is_ajax && empty( $data['license'] ) ) {
159
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
160 160
 			die( -1 );
161 161
 		}
162 162
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 			// most likely a mistake.
198 198
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
199 199
 
200
-				if ( ! empty( $data['field_id'] ) ) {
200
+				if ( ! empty( $data[ 'field_id' ] ) ) {
201 201
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
202 202
 				}
203 203
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		if ( empty( $license_data ) ) {
225 225
 			$message = '';
226 226
 		} else {
227
-			if( ! empty( $license_data->error ) ) {
227
+			if ( ! empty( $license_data->error ) ) {
228 228
 				$class = 'error';
229 229
 				$string_key = $license_data->error;
230 230
 			} else { $class = $license_data->license;
@@ -250,17 +250,17 @@  discard block
 block discarded – undo
250 250
 	 */
251 251
 	public function license_details( $response = array() ) {
252 252
 
253
-		$response = (array) $response;
253
+		$response = (array)$response;
254 254
 
255 255
 		$return = '';
256 256
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
257 257
 
258
-		if ( ! empty( $response['license_key'] ) ) {
258
+		if ( ! empty( $response[ 'license_key' ] ) ) {
259 259
 			$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>';
260 260
 
261 261
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
262
-				$return .= $this->strings( $response['license'], $response );
263
-			} elseif ( ! empty( $response['license_name'] ) ) {
262
+				$return .= $this->strings( $response[ 'license' ], $response );
263
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
264 264
 				$response_keys = array(
265 265
 					'license_name'   => '',
266 266
 					'license_limit'  => '',
@@ -274,19 +274,19 @@  discard block
 block discarded – undo
274 274
 				// Make sure all the keys are set
275 275
 				$response = wp_parse_args( $response, $response_keys );
276 276
 
277
-				$login_link = sprintf( '<a href="%s" class="howto" 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' ) );
278
-				$local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
277
+				$login_link = sprintf( '<a href="%s" class="howto" 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' ) );
278
+				$local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
279 279
 				$details    = array(
280
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ),
281
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link,
282
-					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text,
283
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
284
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
280
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ),
281
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link,
282
+					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text,
283
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
284
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
285 285
 				);
286 286
 
287
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
288
-					unset( $details['upgrade'] );
289
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
287
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
288
+					unset( $details[ 'upgrade' ] );
289
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
290 290
 				}
291 291
 
292 292
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -312,20 +312,20 @@  discard block
 block discarded – undo
312 312
 		if ( ! empty( $upgrades ) ) {
313 313
 
314 314
 			$locale_parts = explode( '_', get_locale() );
315
-			$is_english = ( 'en' === $locale_parts[0] );
315
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
316 316
 
317 317
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
318 318
 			$output .= '<ul class="ul-disc">';
319 319
 
320 320
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
321
-				$upgrade = (object) $upgrade;
321
+				$upgrade = (object)$upgrade;
322 322
 
323 323
 				$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 ) );
324 324
 
325 325
 				if ( $is_english && isset( $upgrade->description ) ) {
326 326
 					$message = esc_html( $upgrade->description );
327 327
 				} else {
328
-					switch( $upgrade->price_id ) {
328
+					switch ( $upgrade->price_id ) {
329 329
 						// Interstellar
330 330
 						case 1:
331 331
 						default:
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
384 384
 			'missing' => esc_html__( 'Invalid license key.', 'gravityview' ),
385 385
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
386
-			'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>' ),
386
+			'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>' ),
387 387
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
388 388
 
389 389
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 
407 407
 		if ( ! empty( $license_data->renewal_url ) ) {
408 408
 			$renew_license_url = $license_data->renewal_url;
409
-		} elseif( ! empty( $license_data->license_key ) ) {
409
+		} elseif ( ! empty( $license_data->license_key ) ) {
410 410
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
411 411
 		} else {
412 412
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 	 * @return array|WP_Error
424 424
 	 */
425 425
 	private function _license_get_remote_response( $data, $license = '' ) {
426
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
426
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
427 427
 
428 428
 		$url = add_query_arg( $api_params, self::url );
429 429
 
@@ -463,9 +463,9 @@  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'] );
467
-		$settings['license_key_status'] = $license_data->license;
468
-		$settings['license_key_response'] = (array)$license_data;
466
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
467
+		$settings[ 'license_key_status' ] = $license_data->license;
468
+		$settings[ 'license_key_response' ] = (array)$license_data;
469 469
 
470 470
 		$this->settings->update( $settings );
471 471
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 
481 481
 		if ( ! empty( $key ) ) {
482 482
 			$response = $this->settings->get( 'license_key_response' );
483
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
483
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
484 484
 		} else {
485 485
 			$response = array();
486 486
 		}
@@ -522,11 +522,11 @@  discard block
 block discarded – undo
522 522
 
523 523
 		$submit = '<div class="gv-edd-button-wrapper">';
524 524
 		foreach ( $fields as $field ) {
525
-			$field['type'] = 'button';
526
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
527
-			$field['style'] = 'margin-left: 10px;';
528
-			if( $disabled_attribute ) {
529
-				$field['disabled'] = $disabled_attribute;
525
+			$field[ 'type' ] = 'button';
526
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
527
+			$field[ 'style' ] = 'margin-left: 10px;';
528
+			if ( $disabled_attribute ) {
529
+				$field[ 'disabled' ] = $disabled_attribute;
530 530
 			}
531 531
 			$submit .= $this->settings->as_html( $field, $echo );
532 532
 		}
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 				    'url'        => home_url(),
606 606
 				    'site_data'  => $this->get_site_data(),
607 607
 			    ),
608
-			));
608
+			) );
609 609
 
610 610
 			// make sure the response came back okay
611 611
 			if ( is_wp_error( $response ) ) {
@@ -636,45 +636,45 @@  discard block
 block discarded – undo
636 636
 		$theme_data = wp_get_theme();
637 637
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
638 638
 
639
-		$data['gv_version']  = Plugin::$version;
640
-		$data['php_version']  = phpversion();
641
-		$data['wp_version']   = get_bloginfo( 'version' );
642
-		$data['gf_version']  = \GFForms::$version;
643
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
644
-		$data['multisite']    = is_multisite();
645
-		$data['theme']        = $theme;
646
-		$data['url']          = home_url();
647
-		$data['license_key']  = $this->settings->get( 'license_key' );
648
-		$data['beta']         = $this->settings->get( 'beta' );
639
+		$data[ 'gv_version' ]  = Plugin::$version;
640
+		$data[ 'php_version' ]  = phpversion();
641
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
642
+		$data[ 'gf_version' ]  = \GFForms::$version;
643
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
644
+		$data[ 'multisite' ]    = is_multisite();
645
+		$data[ 'theme' ]        = $theme;
646
+		$data[ 'url' ]          = home_url();
647
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
648
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
649 649
 
650 650
 		// View Data
651 651
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
652 652
 
653
-		$data['view_count'] = null;
654
-		$data['view_first'] = null;
655
-		$data['view_latest'] = null;
653
+		$data[ 'view_count' ] = null;
654
+		$data[ 'view_first' ] = null;
655
+		$data[ 'view_latest' ] = null;
656 656
 
657 657
 		if ( $gravityview_posts->publish ) {
658
-			$data['view_count'] = $gravityview_posts->publish;
658
+			$data[ 'view_count' ] = $gravityview_posts->publish;
659 659
 
660 660
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
661 661
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
662 662
 
663 663
 			if ( $first = array_shift( $first ) ) {
664
-				$data['view_first'] = $first->post_date;
664
+				$data[ 'view_first' ] = $first->post_date;
665 665
 			}
666 666
 			if ( $latest = array_pop( $latest ) ) {
667
-				$data['view_latest'] = $latest->post_date;
667
+				$data[ 'view_latest' ] = $latest->post_date;
668 668
 			}
669 669
 		}
670 670
 
671 671
 		// Form counts
672 672
 		if ( class_exists( 'GFFormsModel' ) ) {
673 673
 			$form_data = \GFFormsModel::get_form_count();
674
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
675
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
676
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
677
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
674
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
675
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
676
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
677
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
678 678
 		}
679 679
 
680 680
 		// Retrieve current plugin information
@@ -682,13 +682,13 @@  discard block
 block discarded – undo
682 682
 			include ABSPATH . '/wp-admin/includes/plugin.php';
683 683
 		}
684 684
 
685
-		$data['integrations']     = self::get_related_plugins_and_extensions();
686
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
687
-		$data['inactive_plugins'] = array();
688
-		$data['locale']           = get_locale();
685
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
686
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
687
+		$data[ 'inactive_plugins' ] = array();
688
+		$data[ 'locale' ]           = get_locale();
689 689
 
690 690
 		// Validate request on the GV server
691
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
691
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
692 692
 
693 693
 		return $data;
694 694
 	}
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 
719 719
 				$plugin_data = get_plugin_data( $active_plugin );
720 720
 
721
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
721
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
722 722
 			}
723 723
 
724 724
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
future/includes/class-gv-utils.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 		 * Try subkeys after split.
92 92
 		 */
93 93
 		if ( count( $parts = explode( '/', $key, 2 ) ) > 1 ) {
94
-			return self::get( self::get( $array, $parts[0] ), $parts[1], $default );
94
+			return self::get( self::get( $array, $parts[ 0 ] ), $parts[ 1 ], $default );
95 95
 		}
96 96
 
97 97
 		return $default;
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 1 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.
includes/class-admin.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 
5 5
 	function __construct() {
6 6
 
7
-		if( ! is_admin() ) { return; }
7
+		if ( ! is_admin() ) { return; }
8 8
 
9 9
 		// If Gravity Forms isn't active or compatibile, stop loading
10
-		if( false === GravityView_Compatibility::is_valid() ) {
10
+		if ( false === GravityView_Compatibility::is_valid() ) {
11 11
 			return;
12 12
 		}
13 13
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
49 49
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
50 50
 
51
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
51
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
52 52
 
53 53
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
54 54
 
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public static function no_views_text() {
66 66
 		
67
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
67
+		if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) {
68 68
 			return __( 'No Views found in Trash', 'gravityview' );
69
-		} elseif( ! empty( $_GET['s'] ) ) {
69
+		} elseif ( ! empty( $_GET[ 's' ] ) ) {
70 70
 			return __( 'No Views found.', 'gravityview' );
71 71
 		}
72 72
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			$error .= ' ' . esc_html__( 'or select another form.', 'gravityview' );
111 111
 		}
112 112
 
113
-		if( $error ) {
113
+		if ( $error ) {
114 114
 			?>
115 115
 			<div class="wp-dialog notice-warning inline error wp-clearfix">
116 116
 				<?php echo gravityview_get_floaty(); ?>
@@ -129,22 +129,22 @@  discard block
 block discarded – undo
129 129
 	public function backend_actions() {
130 130
 
131 131
 		/** @define "GRAVITYVIEW_DIR" "../" */
132
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
133
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
134
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' );
135
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' );
136
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' );
137
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
138
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
139
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
140
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
132
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
133
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
134
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' );
135
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' );
136
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' );
137
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
138
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
139
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
140
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
141 141
 
142 142
 		/**
143 143
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
144 144
 		 *
145 145
 		 * Nice place to insert extensions' backend stuff
146 146
 		 */
147
-		do_action('gravityview_include_backend_actions');
147
+		do_action( 'gravityview_include_backend_actions' );
148 148
 	}
149 149
 
150 150
 	/**
@@ -160,12 +160,12 @@  discard block
 block discarded – undo
160 160
 
161 161
 		$actions = array();
162 162
 
163
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
164
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
163
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
164
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
165 165
 		}
166 166
 
167
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
168
-			$actions[] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
167
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
168
+			$actions[ ] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
169 169
 		}
170 170
 
171 171
 		return array_merge( $actions, $links );
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 		// By default, there will only be one item being modified.
194 194
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
195 195
 		// of modified items that will override this array.
196
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
196
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
197 197
 
198 198
 		// If we're starting fresh, a new form was created.
199 199
 		// We should let the user know this is the case.
@@ -201,60 +201,60 @@  discard block
 block discarded – undo
201 201
 
202 202
 		$new_form_text = '';
203 203
 
204
-		if( !empty( $start_fresh ) ) {
204
+		if ( ! empty( $start_fresh ) ) {
205 205
 
206 206
 			// Get the form that was created
207 207
 			$connected_form = gravityview_get_form_id( $post_id );
208 208
 
209
-			if( !empty( $connected_form ) ) {
209
+			if ( ! empty( $connected_form ) ) {
210 210
 				$form = gravityview_get_form( $connected_form );
211
-				$form_name = esc_attr( $form['title'] );
211
+				$form_name = esc_attr( $form[ 'title' ] );
212 212
 				$image = self::get_floaty();
213
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
214
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
213
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
214
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
215 215
 
216 216
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
217
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
217
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
218 218
 				$new_form_text = wpautop( $new_form_text );
219 219
 
220 220
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
221 221
 			}
222 222
 		}
223 223
 
224
-		$messages['gravityview'] = array(
224
+		$messages[ 'gravityview' ] = array(
225 225
 			0  => '', // Unused. Messages start at index 1.
226 226
 			/* translators: %s and %s are HTML tags linking to the View on the website */
227
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
227
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
228 228
 			/* translators: %s and %s are HTML tags linking to the View on the website */
229
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
229
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
230 230
 			3  => __( 'View deleted.', 'gravityview' ),
231 231
 			/* translators: %s and %s are HTML tags linking to the View on the website */
232
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
232
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
233 233
 			/* translators: %s: date and time of the revision */
234
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
234
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
235 235
 			/* translators: %s and %s are HTML tags linking to the View on the website */
236
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
236
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
237 237
 			/* translators: %s and %s are HTML tags linking to the View on the website */
238
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
238
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
239 239
 			8  => __( 'View submitted.', 'gravityview' ),
240 240
 			9  => sprintf(
241 241
 		        /* translators: Date and time the View is scheduled to be published */
242 242
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
243 243
 				// translators: Publish box date format, see http://php.net/date
244
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
244
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
245 245
 			) . $new_form_text,
246 246
 			/* translators: %s and %s are HTML tags linking to the View on the website */
247
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
247
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
248 248
 
249 249
 			/**
250 250
 			 * These apply to `bulk_post_updated_messages`
251 251
 			 * @file wp-admin/edit.php
252 252
 			 */
253
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
254
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
255
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
256
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
257
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
253
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
254
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
255
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
256
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
257
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
258 258
 		);
259 259
 
260 260
 		return $messages;
Please login to merge, or discard this patch.