| @@ -180,9 +180,14 @@ | ||
| 180 | 180 | fs_text_inline( 'Agree & Activate License', 'agree-activate-license', $slug ); |
| 181 | 181 | |
| 182 | 182 | $message = $fs->apply_filters( |
| 183 | 183 | 'connect-message_on-premium', |
| 184 | - sprintf( fs_text_inline( 'Welcome to %s! To get started, please enter your license key:', 'thanks-for-purchasing', $slug ), '<b>' . $fs->get_plugin_name() . '</b>' ), | |
| 184 | + ($is_network_upgrade_mode ? | |
| 185 | + '' : | |
| 186 | + /* translators: %s: name (e.g. Hey John,) */ | |
| 187 | + $hey_x_text . '<br>' | |
| 188 | + ) . | |
| 189 | + sprintf( fs_text_inline( 'Thanks for purchasing %s! To get started, please enter your license key:', 'thanks-for-purchasing', $slug ), '<b>' . $fs->get_plugin_name() . '</b>' ), | |
| 185 | 190 | $first_name, |
| 186 | 191 | $fs->get_plugin_name() |
| 187 | 192 | ); |
| 188 | 193 | } else { |
| @@ -341,11 +346,8 @@ | ||
| 341 | 346 | echo ' disabled="disabled"'; |
| 342 | 347 | } ?>><?php echo esc_html( $button_label ) ?></button> |
| 343 | 348 | </form> |
| 344 | 349 | <?php endif ?> |
| 345 | - <?php if ( $require_license_key ) : ?> | |
| 346 | - <a id="license_issues_link" href="<?php echo $fs->apply_filters( 'known_license_issues_url', 'https://freemius.com/help/documentation/wordpress-sdk/license-activation-issues/' ) ?>" target="_blank"><?php fs_esc_html_echo_inline( 'License issues?', 'license-issues', $slug ) ?></a> | |
| 347 | - <?php endif ?> | |
| 348 | 350 | </div><?php |
| 349 | 351 | |
| 350 | 352 | // Set core permission list items. |
| 351 | 353 | $permissions = array(); |
| @@ -364,32 +366,28 @@ | ||
| 364 | 366 | 'priority' => 5, |
| 365 | 367 | ); |
| 366 | 368 | } |
| 367 | 369 | |
| 368 | - $permissions['site'] = array( | |
| 369 | - 'icon-class' => 'dashicons dashicons-admin-settings', | |
| 370 | - 'tooltip' => ( $require_license_key ? sprintf( $fs->get_text_inline( 'So you can manage and control your license remotely from the User Dashboard.', 'permissions-site_tooltip' ), $fs->get_module_type() ) : '' ), | |
| 371 | - 'label' => $fs->get_text_inline( 'Your Site Overview', 'permissions-site' ), | |
| 372 | - 'desc' => $fs->get_text_inline( 'Site URL, WP version, PHP info', 'permissions-site_desc' ), | |
| 373 | - 'priority' => 10, | |
| 374 | - ); | |
| 370 | + $permissions['site'] = array( | |
| 371 | + 'icon-class' => 'dashicons dashicons-admin-settings', | |
| 372 | + 'label' => $fs->get_text_inline( 'Your Site Overview', 'permissions-site' ), | |
| 373 | + 'desc' => $fs->get_text_inline( 'Site URL, WP version, PHP info', 'permissions-site_desc' ), | |
| 374 | + 'priority' => 10, | |
| 375 | + ); | |
| 375 | 376 | |
| 376 | - if ( ! $require_license_key ) { | |
| 377 | - $permissions['notices'] = array( | |
| 378 | - 'icon-class' => 'dashicons dashicons-testimonial', | |
| 379 | - 'label' => $fs->get_text_inline( 'Admin Notices', 'permissions-admin-notices' ), | |
| 380 | - 'desc' => $fs->get_text_inline( 'Updates, announcements, marketing, no spam', 'permissions-newsletter_desc' ), | |
| 381 | - 'priority' => 13, | |
| 382 | - ); | |
| 383 | - } | |
| 377 | + $permissions['notices'] = array( | |
| 378 | + 'icon-class' => 'dashicons dashicons-testimonial', | |
| 379 | + 'label' => $fs->get_text_inline( 'Admin Notices', 'permissions-admin-notices' ), | |
| 380 | + 'desc' => $fs->get_text_inline( 'Updates, announcements, marketing, no spam', 'permissions-newsletter_desc' ), | |
| 381 | + 'priority' => 13, | |
| 382 | + ); | |
| 384 | 383 | |
| 385 | - $permissions['events'] = array( | |
| 386 | - 'icon-class' => 'dashicons dashicons-admin-' . ( $fs->is_plugin() ? 'plugins' : 'appearance' ), | |
| 387 | - 'tooltip' => ( $require_license_key ? sprintf( $fs->get_text_inline( 'So you can reuse the license when the %s is no longer active.', 'permissions-events_tooltip' ), $fs->get_module_type() ) : '' ), | |
| 388 | - 'label' => sprintf( $fs->get_text_inline( 'Current %s Status', 'permissions-events' ), ucfirst( $fs->get_module_type() ) ), | |
| 389 | - 'desc' => $fs->get_text_inline( 'Active, deactivated, or uninstalled', 'permissions-events_desc' ), | |
| 390 | - 'priority' => 20, | |
| 391 | - ); | |
| 384 | + $permissions['events'] = array( | |
| 385 | + 'icon-class' => 'dashicons dashicons-admin-' . ( $fs->is_plugin() ? 'plugins' : 'appearance' ), | |
| 386 | + 'label' => sprintf( $fs->get_text_inline( 'Current %s Events', 'permissions-events' ), ucfirst( $fs->get_module_type() ) ), | |
| 387 | + 'desc' => $fs->get_text_inline( 'Activation, deactivation and uninstall', 'permissions-events_desc' ), | |
| 388 | + 'priority' => 20, | |
| 389 | + ); | |
| 392 | 390 | |
| 393 | 391 | // Add newsletter permissions if enabled. |
| 394 | 392 | if ( $is_gdpr_required || $fs->is_permission_requested( 'newsletter' ) ) { |
| 395 | 393 | $permissions['newsletter'] = array( |
| @@ -399,17 +397,16 @@ | ||
| 399 | 397 | 'priority' => 15, |
| 400 | 398 | ); |
| 401 | 399 | } |
| 402 | 400 | |
| 403 | - $permissions['extensions'] = array( | |
| 401 | + $permissions['extensions'] = array( | |
| 404 | 402 | 'icon-class' => 'dashicons dashicons-menu', |
| 405 | - 'label' => $fs->get_text_inline( 'Plugins & Themes', 'permissions-extensions' ) . ( $require_license_key ? ' (' . $fs->get_text_inline( 'optional' ) . ')' : '' ), | |
| 406 | - 'tooltip' => $fs->get_text_inline( 'To help us troubleshoot any potential issues that may arise from other plugin or theme conflicts.', 'permissions-events_tooltip' ), | |
| 403 | + 'label' => $fs->get_text_inline( 'Plugins & Themes', 'permissions-extensions' ), | |
| 407 | 404 | 'desc' => $fs->get_text_inline( 'Title, slug, version, and is active', 'permissions-extensions_desc' ), |
| 408 | 405 | 'priority' => 25, |
| 409 | 406 | 'optional' => true, |
| 410 | - 'default' => $fs->apply_filters( 'permission_extensions_default', ! $require_license_key ) | |
| 411 | - ); | |
| 407 | + 'default' => $fs->apply_filters( 'permission_extensions_default', true ) | |
| 408 | + ); | |
| 412 | 409 | |
| 413 | 410 | // Allow filtering of the permissions list. |
| 414 | 411 | $permissions = $fs->apply_filters( 'permission_list', $permissions ); |
| 415 | 412 | |
| @@ -419,17 +416,15 @@ | ||
| 419 | 416 | if ( ! empty( $permissions ) ) : ?> |
| 420 | 417 | <div class="fs-permissions"> |
| 421 | 418 | <?php if ( $require_license_key ) : ?> |
| 422 | 419 | <p class="fs-license-sync-disclaimer"><?php |
| 423 | - echo sprintf( | |
| 424 | - fs_esc_html_inline( 'The %1$s will periodically send %2$s to %3$s for security & feature updates delivery, and license management.', 'license-sync-disclaimer', $slug ), | |
| 420 | + echo sprintf( | |
| 421 | + fs_esc_html_inline( 'The %1$s will be periodically sending data to %2$s to check for security and feature updates, and verify the validity of your license.', 'license-sync-disclaimer', $slug ), | |
| 425 | 422 | $fs->get_module_label( true ), |
| 426 | - sprintf('<a class="fs-trigger" href="#" tabindex="1">%s</a>', fs_esc_html_inline('diagnostic data', 'send-data')), | |
| 427 | - '<a class="fs-tooltip-trigger' . (is_rtl() ? ' rtl' : '') . '" href="' . $freemius_site_url . '" target="_blank" rel="noopener" tabindex="1">freemius.com <i class="dashicons dashicons-editor-help" style="text-decoration: none;"><span class="fs-tooltip" style="width: 170px">' . $fs->get_text_inline( 'Freemius is our licensing and software updates engine', 'permissions-extensions_desc' ) . '</span></i></a>' | |
| 423 | + $freemius_link | |
| 428 | 424 | ) ?></p> |
| 429 | - <?php else : ?> | |
| 425 | + <?php endif ?> | |
| 430 | 426 | <a class="fs-trigger" href="#" tabindex="1"><?php fs_esc_html_echo_inline( 'What permissions are being granted?', 'what-permissions', $slug ) ?></a> |
| 431 | - <?php endif ?> | |
| 432 | 427 | <ul><?php |
| 433 | 428 | foreach ( $permissions as $id => $permission ) : ?> |
| 434 | 429 | <li id="fs-permission-<?php echo esc_attr( $id ); ?>" |
| 435 | 430 | class="fs-permission fs-<?php echo esc_attr( $id ); ?>"> |
| @@ -440,9 +435,9 @@ | ||
| 440 | 435 | </div> |
| 441 | 436 | <?php endif ?> |
| 442 | 437 | |
| 443 | 438 | <div class="fs-permission-description"> |
| 444 | - <span<?php if ( ! empty($permission['tooltip']) ) : ?> class="fs-tooltip-trigger"<?php endif ?>><?php echo esc_html( $permission['label'] ); ?><?php if ( ! empty($permission['tooltip']) ) : ?><i class="dashicons dashicons-editor-help"><span class="fs-tooltip" style="width: 200px"><?php echo $permission['tooltip'] ?></span></i><?php endif ?></span> | |
| 439 | + <span><?php echo esc_html( $permission['label'] ); ?></span> | |
| 445 | 440 | |
| 446 | 441 | <p><?php echo esc_html( $permission['desc'] ); ?></p> |
| 447 | 442 | </div> |
| 448 | 443 | </li> |
| @@ -706,18 +701,11 @@ | ||
| 706 | 701 | |
| 707 | 702 | var ajaxOptin = ( requireLicenseKey || isNetworkActive ); |
| 708 | 703 | |
| 709 | 704 | $form.on('submit', function () { |
| 710 | - var $extensionsPermission = $('#fs-permission-extensions .fs-switch'), | |
| 711 | - isExtensionsTrackingAllowed = ($extensionsPermission.length > 0) ? | |
| 712 | - $extensionsPermission.hasClass('fs-on') : | |
| 713 | - null; | |
| 705 | + var isExtensionsTrackingAllowed = $( '#fs-permission-extensions .fs-switch' ).hasClass( 'fs-on' ); | |
| 714 | 706 | |
| 715 | - if (null === isExtensionsTrackingAllowed) { | |
| 716 | - $('input[name=is_extensions_tracking_allowed]').remove(); | |
| 717 | - } else { | |
| 718 | - $('input[name=is_extensions_tracking_allowed]').val(isExtensionsTrackingAllowed ? 1 : 0); | |
| 719 | - } | |
| 707 | + $( 'input[name=is_extensions_tracking_allowed]' ).val( isExtensionsTrackingAllowed ? 1 : 0 ); | |
| 720 | 708 | |
| 721 | 709 | /** |
| 722 | 710 | * @author Vova Feldman (@svovaf) |
| 723 | 711 | * @since 1.1.9 |