@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | * Generate the status message box HTML based on the current status |
351 | 351 | * |
352 | 352 | * @since 1.7.4 |
353 | - * @param $message |
|
353 | + * @param string $message |
|
354 | 354 | * @param string $class |
355 | 355 | * |
356 | 356 | * @return string |
@@ -470,6 +470,9 @@ discard block |
||
470 | 470 | $this->settings->set( $settings ); |
471 | 471 | } |
472 | 472 | |
473 | + /** |
|
474 | + * @param boolean $echo |
|
475 | + */ |
|
473 | 476 | public function settings_edd_license_activation( $field, $echo ) { |
474 | 477 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
475 | 478 | |
@@ -569,7 +572,6 @@ discard block |
||
569 | 572 | * Check the GravityView license information |
570 | 573 | * |
571 | 574 | * @since 1.19.3 |
572 | - * @param bool $force Whether to force checking license, even if AJAX |
|
573 | 575 | * |
574 | 576 | * @return void |
575 | 577 | */ |
@@ -100,7 +100,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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…', 'gravityview' ), |
@@ -406,7 +406,7 @@ discard block |
||
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 |
||
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 |
||
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->set( $settings ); |
471 | 471 | } |
@@ -480,7 +480,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 ) ) { |