|
@@ -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
|
|
|
@@ -184,12 +184,12 @@ discard block |
|
|
block discarded – undo |
|
184
|
184
|
|
|
185
|
185
|
$json = json_encode( $license_data ); |
|
186
|
186
|
|
|
187
|
|
- $update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action'); |
|
|
187
|
+ $update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' ); |
|
188
|
188
|
|
|
189
|
189
|
$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
190
|
190
|
|
|
191
|
191
|
if ( 'deactivate_license' === Utils::get( $data, 'edd_action' ) ) { |
|
192
|
|
- do_action('gravityview/admin_installer/delete_downloads_data', true ); |
|
|
192
|
+ do_action( 'gravityview/admin_installer/delete_downloads_data', true ); |
|
193
|
193
|
} |
|
194
|
194
|
|
|
195
|
195
|
if ( $is_check_action_button ) { |
|
@@ -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
|
|
|
@@ -228,7 +228,7 @@ discard block |
|
|
block discarded – undo |
|
228
|
228
|
if ( empty( $license_data ) ) { |
|
229
|
229
|
$message = ''; |
|
230
|
230
|
} else { |
|
231
|
|
- if( ! empty( $license_data->error ) ) { |
|
|
231
|
+ if ( ! empty( $license_data->error ) ) { |
|
232
|
232
|
$class = 'error'; |
|
233
|
233
|
$string_key = $license_data->error; |
|
234
|
234
|
} else { $class = $license_data->license; |
|
@@ -254,17 +254,17 @@ discard block |
|
|
block discarded – undo |
|
254
|
254
|
*/ |
|
255
|
255
|
public function license_details( $response = array() ) { |
|
256
|
256
|
|
|
257
|
|
- $response = (array) $response; |
|
|
257
|
+ $response = (array)$response; |
|
258
|
258
|
|
|
259
|
259
|
$return = ''; |
|
260
|
260
|
$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>'; |
|
261
|
261
|
|
|
262
|
|
- if ( ! empty( $response['license_key'] ) ) { |
|
|
262
|
+ if ( ! empty( $response[ 'license_key' ] ) ) { |
|
263
|
263
|
$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>'; |
|
264
|
264
|
|
|
265
|
265
|
if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) { |
|
266
|
|
- $return .= $this->strings( $response['license'], $response ); |
|
267
|
|
- } elseif ( ! empty( $response['license_name'] ) ) { |
|
|
266
|
+ $return .= $this->strings( $response[ 'license' ], $response ); |
|
|
267
|
+ } elseif ( ! empty( $response[ 'license_name' ] ) ) { |
|
268
|
268
|
$response_keys = array( |
|
269
|
269
|
'license_name' => '', |
|
270
|
270
|
'license_limit' => '', |
|
@@ -278,21 +278,21 @@ discard block |
|
|
block discarded – undo |
|
278
|
278
|
// Make sure all the keys are set |
|
279
|
279
|
$response = wp_parse_args( $response, $response_keys ); |
|
280
|
280
|
|
|
281
|
|
- $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' ) ); |
|
282
|
|
- $local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
283
|
|
- $license_limit = empty( $response['license_limit'] ) ? 'Unlimited' : (int) $response['license_limit']; |
|
|
281
|
+ $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' ) ); |
|
|
282
|
+ $local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
|
283
|
+ $license_limit = empty( $response[ 'license_limit' ] ) ? 'Unlimited' : (int)$response[ 'license_limit' ]; |
|
284
|
284
|
|
|
285
|
|
- $details = array( |
|
286
|
|
- 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ), |
|
287
|
|
- '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, |
|
288
|
|
- 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $license_limit ) ) . $local_text, |
|
289
|
|
- 'expires' => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ), |
|
290
|
|
- 'upgrade' => $this->get_upgrade_html( $response['upgrades'] ), |
|
|
285
|
+ $details = array( |
|
|
286
|
+ 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ), |
|
|
287
|
+ '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, |
|
|
288
|
+ 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . $local_text, |
|
|
289
|
+ 'expires' => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ), |
|
|
290
|
+ 'upgrade' => $this->get_upgrade_html( $response[ 'upgrades' ] ), |
|
291
|
291
|
); |
|
292
|
292
|
|
|
293
|
|
- if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) { |
|
294
|
|
- unset( $details['upgrade'] ); |
|
295
|
|
- $details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
|
293
|
+ if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) { |
|
|
294
|
+ unset( $details[ 'upgrade' ] ); |
|
|
295
|
+ $details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
296
|
296
|
} |
|
297
|
297
|
|
|
298
|
298
|
$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>'; |
|
@@ -318,20 +318,20 @@ discard block |
|
|
block discarded – undo |
|
318
|
318
|
if ( ! empty( $upgrades ) ) { |
|
319
|
319
|
|
|
320
|
320
|
$locale_parts = explode( '_', get_locale() ); |
|
321
|
|
- $is_english = ( 'en' === $locale_parts[0] ); |
|
|
321
|
+ $is_english = ( 'en' === $locale_parts[ 0 ] ); |
|
322
|
322
|
|
|
323
|
323
|
$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>'; |
|
324
|
324
|
$output .= '<ul class="ul-disc">'; |
|
325
|
325
|
|
|
326
|
326
|
foreach ( $upgrades as $upgrade_id => $upgrade ) { |
|
327
|
|
- $upgrade = (object) $upgrade; |
|
|
327
|
+ $upgrade = (object)$upgrade; |
|
328
|
328
|
|
|
329
|
329
|
$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 ) ); |
|
330
|
330
|
|
|
331
|
331
|
if ( $is_english && isset( $upgrade->description ) ) { |
|
332
|
332
|
$message = esc_html( $upgrade->description ); |
|
333
|
333
|
} else { |
|
334
|
|
- switch( $upgrade->price_id ) { |
|
|
334
|
+ switch ( $upgrade->price_id ) { |
|
335
|
335
|
// Interstellar |
|
336
|
336
|
case 1: |
|
337
|
337
|
default: |
|
@@ -390,7 +390,7 @@ discard block |
|
|
block discarded – undo |
|
390
|
390
|
'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), |
|
391
|
391
|
'missing' => esc_html__( 'Invalid license key.', 'gravityview' ), |
|
392
|
392
|
'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ), |
|
393
|
|
- '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>' ), |
|
|
393
|
+ '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>' ), |
|
394
|
394
|
'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ), |
|
395
|
395
|
|
|
396
|
396
|
'verifying_license' => esc_html__( 'Verifying license…', 'gravityview' ), |
|
@@ -419,7 +419,7 @@ discard block |
|
|
block discarded – undo |
|
419
|
419
|
|
|
420
|
420
|
if ( ! empty( $license_data->renewal_url ) ) { |
|
421
|
421
|
$renew_license_url = $license_data->renewal_url; |
|
422
|
|
- } elseif( ! empty( $license_data->license_key ) ) { |
|
|
422
|
+ } elseif ( ! empty( $license_data->license_key ) ) { |
|
423
|
423
|
$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key ); |
|
424
|
424
|
} else { |
|
425
|
425
|
$renew_license_url = 'https://gravityview.co/account/'; |
|
@@ -436,7 +436,7 @@ discard block |
|
|
block discarded – undo |
|
436
|
436
|
* @return array|\WP_Error |
|
437
|
437
|
*/ |
|
438
|
438
|
private function _license_get_remote_response( $data, $license = '' ) { |
|
439
|
|
- $api_params = $this->_get_edd_settings( $data['edd_action'], $license ); |
|
|
439
|
+ $api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license ); |
|
440
|
440
|
|
|
441
|
441
|
$url = add_query_arg( $api_params, self::url ); |
|
442
|
442
|
|
|
@@ -476,9 +476,9 @@ discard block |
|
|
block discarded – undo |
|
476
|
476
|
private function license_call_update_settings( $license_data, $data ) { |
|
477
|
477
|
$settings = array(); |
|
478
|
478
|
|
|
479
|
|
- $settings['license_key'] = $license_data->license_key = trim( $data['license'] ); |
|
480
|
|
- $settings['license_key_status'] = $license_data->license; |
|
481
|
|
- $settings['license_key_response'] = (array)$license_data; |
|
|
479
|
+ $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] ); |
|
|
480
|
+ $settings[ 'license_key_status' ] = $license_data->license; |
|
|
481
|
+ $settings[ 'license_key_response' ] = (array)$license_data; |
|
482
|
482
|
|
|
483
|
483
|
$this->settings->set( $settings ); |
|
484
|
484
|
} |
|
@@ -493,7 +493,7 @@ discard block |
|
|
block discarded – undo |
|
493
|
493
|
|
|
494
|
494
|
if ( ! empty( $key ) ) { |
|
495
|
495
|
$response = $this->settings->get( 'license_key_response' ); |
|
496
|
|
- $response = is_array( $response ) ? (object) $response : json_decode( $response ); |
|
|
496
|
+ $response = is_array( $response ) ? (object)$response : json_decode( $response ); |
|
497
|
497
|
} else { |
|
498
|
498
|
$response = array(); |
|
499
|
499
|
} |
|
@@ -535,11 +535,11 @@ discard block |
|
|
block discarded – undo |
|
535
|
535
|
|
|
536
|
536
|
$submit = '<div class="gv-edd-button-wrapper">'; |
|
537
|
537
|
foreach ( $fields as $field ) { |
|
538
|
|
- $field['type'] = 'button'; |
|
539
|
|
- $field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class; |
|
540
|
|
- $field['style'] = 'margin-left: 10px;'; |
|
541
|
|
- if( $disabled_attribute ) { |
|
542
|
|
- $field['disabled'] = $disabled_attribute; |
|
|
538
|
+ $field[ 'type' ] = 'button'; |
|
|
539
|
+ $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class; |
|
|
540
|
+ $field[ 'style' ] = 'margin-left: 10px;'; |
|
|
541
|
+ if ( $disabled_attribute ) { |
|
|
542
|
+ $field[ 'disabled' ] = $disabled_attribute; |
|
543
|
543
|
} |
|
544
|
544
|
$submit .= $this->settings->as_html( $field, $echo ); |
|
545
|
545
|
} |
|
@@ -618,7 +618,7 @@ discard block |
|
|
block discarded – undo |
|
618
|
618
|
'url' => home_url(), |
|
619
|
619
|
'site_data' => $this->get_site_data(), |
|
620
|
620
|
), |
|
621
|
|
- )); |
|
|
621
|
+ ) ); |
|
622
|
622
|
|
|
623
|
623
|
// make sure the response came back okay |
|
624
|
624
|
if ( is_wp_error( $response ) ) { |
|
@@ -649,45 +649,45 @@ discard block |
|
|
block discarded – undo |
|
649
|
649
|
$theme_data = wp_get_theme(); |
|
650
|
650
|
$theme = $theme_data->Name . ' ' . $theme_data->Version; |
|
651
|
651
|
|
|
652
|
|
- $data['gv_version'] = Plugin::$version; |
|
653
|
|
- $data['php_version'] = phpversion(); |
|
654
|
|
- $data['wp_version'] = get_bloginfo( 'version' ); |
|
655
|
|
- $data['gf_version'] = \GFForms::$version; |
|
656
|
|
- $data['server'] = Utils::get( $_SERVER, 'SERVER_SOFTWARE' ); |
|
657
|
|
- $data['multisite'] = is_multisite(); |
|
658
|
|
- $data['theme'] = $theme; |
|
659
|
|
- $data['url'] = home_url(); |
|
660
|
|
- $data['license_key'] = $this->settings->get( 'license_key' ); |
|
661
|
|
- $data['beta'] = $this->settings->get( 'beta' ); |
|
|
652
|
+ $data[ 'gv_version' ] = Plugin::$version; |
|
|
653
|
+ $data[ 'php_version' ] = phpversion(); |
|
|
654
|
+ $data[ 'wp_version' ] = get_bloginfo( 'version' ); |
|
|
655
|
+ $data[ 'gf_version' ] = \GFForms::$version; |
|
|
656
|
+ $data[ 'server' ] = Utils::get( $_SERVER, 'SERVER_SOFTWARE' ); |
|
|
657
|
+ $data[ 'multisite' ] = is_multisite(); |
|
|
658
|
+ $data[ 'theme' ] = $theme; |
|
|
659
|
+ $data[ 'url' ] = home_url(); |
|
|
660
|
+ $data[ 'license_key' ] = $this->settings->get( 'license_key' ); |
|
|
661
|
+ $data[ 'beta' ] = $this->settings->get( 'beta' ); |
|
662
|
662
|
|
|
663
|
663
|
// View Data |
|
664
|
664
|
$gravityview_posts = wp_count_posts( 'gravityview', 'readable' ); |
|
665
|
665
|
|
|
666
|
|
- $data['view_count'] = null; |
|
667
|
|
- $data['view_first'] = null; |
|
668
|
|
- $data['view_latest'] = null; |
|
|
666
|
+ $data[ 'view_count' ] = null; |
|
|
667
|
+ $data[ 'view_first' ] = null; |
|
|
668
|
+ $data[ 'view_latest' ] = null; |
|
669
|
669
|
|
|
670
|
670
|
if ( $gravityview_posts->publish ) { |
|
671
|
|
- $data['view_count'] = $gravityview_posts->publish; |
|
|
671
|
+ $data[ 'view_count' ] = $gravityview_posts->publish; |
|
672
|
672
|
|
|
673
|
673
|
$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' ); |
|
674
|
674
|
$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' ); |
|
675
|
675
|
|
|
676
|
676
|
if ( $first = array_shift( $first ) ) { |
|
677
|
|
- $data['view_first'] = $first->post_date; |
|
|
677
|
+ $data[ 'view_first' ] = $first->post_date; |
|
678
|
678
|
} |
|
679
|
679
|
if ( $latest = array_pop( $latest ) ) { |
|
680
|
|
- $data['view_latest'] = $latest->post_date; |
|
|
680
|
+ $data[ 'view_latest' ] = $latest->post_date; |
|
681
|
681
|
} |
|
682
|
682
|
} |
|
683
|
683
|
|
|
684
|
684
|
// Form counts |
|
685
|
685
|
if ( class_exists( 'GFFormsModel' ) ) { |
|
686
|
686
|
$form_data = \GFFormsModel::get_form_count(); |
|
687
|
|
- $data['forms_total'] = Utils::get( $form_data, 'total', 0 ); |
|
688
|
|
- $data['forms_active'] = Utils::get( $form_data, 'active', 0 ); |
|
689
|
|
- $data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 ); |
|
690
|
|
- $data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 ); |
|
|
687
|
+ $data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 ); |
|
|
688
|
+ $data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 ); |
|
|
689
|
+ $data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 ); |
|
|
690
|
+ $data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 ); |
|
691
|
691
|
} |
|
692
|
692
|
|
|
693
|
693
|
// Retrieve current plugin information |
|
@@ -695,13 +695,13 @@ discard block |
|
|
block discarded – undo |
|
695
|
695
|
include ABSPATH . '/wp-admin/includes/plugin.php'; |
|
696
|
696
|
} |
|
697
|
697
|
|
|
698
|
|
- $data['integrations'] = self::get_related_plugins_and_extensions(); |
|
699
|
|
- $data['active_plugins'] = get_option( 'active_plugins', array() ); |
|
700
|
|
- $data['inactive_plugins'] = array(); |
|
701
|
|
- $data['locale'] = get_locale(); |
|
|
698
|
+ $data[ 'integrations' ] = self::get_related_plugins_and_extensions(); |
|
|
699
|
+ $data[ 'active_plugins' ] = get_option( 'active_plugins', array() ); |
|
|
700
|
+ $data[ 'inactive_plugins' ] = array(); |
|
|
701
|
+ $data[ 'locale' ] = get_locale(); |
|
702
|
702
|
|
|
703
|
703
|
// Validate request on the GV server |
|
704
|
|
- $data['hash'] = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] ); |
|
|
704
|
+ $data[ 'hash' ] = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] ); |
|
705
|
705
|
|
|
706
|
706
|
return $data; |
|
707
|
707
|
} |
|
@@ -731,7 +731,7 @@ discard block |
|
|
block discarded – undo |
|
731
|
731
|
|
|
732
|
732
|
$plugin_data = get_plugin_data( $active_plugin ); |
|
733
|
733
|
|
|
734
|
|
- $extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] ); |
|
|
734
|
+ $extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] ); |
|
735
|
735
|
} |
|
736
|
736
|
|
|
737
|
737
|
if ( ! empty( $extensions ) ) { |