PluginProbe
TablePress – Tables in WordPress made easy / 3.4
TablePress – Tables in WordPress made easy v3.4
3.4 3.3.4 3.3.3 3.3.2 3.3.1 trunk 1.12 1.14 1.9.2 2.0.4 2.1.7 2.1.8 2.2 2.2.1 2.2.2 2.2.3 2.2.4 2.2.5 2.3 2.3.1 2.3.2 2.4 2.4.1 2.4.2 2.4.3 All 45 releases
← All changes | libraries/freemius/templates/connect.php +73 -58 2.0.4 → 3.4 View file →
@@ -46,30 +46,27 @@
46 46 if ( false !== $protocol_pos ) {
47 47 $site_url = substr( $site_url, $protocol_pos + 3 );
48 48 }
49 49
50 - $freemius_site_www = 'https://freemius.com';
51 -
52 50 $freemius_usage_tracking_url = $fs->get_usage_tracking_terms_url();
53 51 $freemius_plugin_terms_url = $fs->get_eula_url();
54 52
55 - $freemius_site_url = $fs->is_premium() ?
56 - $freemius_site_www :
57 - $freemius_usage_tracking_url;
53 + $error = fs_request_get( 'error' );
58 54
59 - if ( $fs->is_premium() ) {
60 - $freemius_site_url .= '?' . http_build_query( array(
61 - 'id' => $fs->get_id(),
62 - 'slug' => $slug,
63 - ) );
64 - }
55 + $has_release_on_freemius = $fs->has_release_on_freemius();
65 56
66 - $freemius_link = '<a href="' . $freemius_site_url . '" target="_blank" rel="noopener" tabindex="1">freemius.com</a>';
57 + $require_license_key = $is_premium_only ||
58 + (
59 + $is_freemium &&
60 + ( $is_premium_code || ! $has_release_on_freemius ) &&
61 + fs_request_get_bool( 'require_license', ( $is_premium_code || $has_release_on_freemius ) )
62 + );
67 63
68 - $error = fs_request_get( 'error' );
64 + $freemius_activation_terms_url = ($fs->is_premium() && $require_license_key) ?
65 + $fs->get_license_activation_terms_url() :
66 + $freemius_usage_tracking_url;
69 67
70 - $require_license_key = $is_premium_only ||
71 - ( $is_freemium && $is_premium_code && fs_request_get_bool( 'require_license', true ) );
68 + $freemius_activation_terms_html = '<a href="' . esc_url( $freemius_activation_terms_url ) . '" target="_blank" rel="noopener" tabindex="1">freemius.com</a>';
72 69
73 70 if ( $is_pending_activation ) {
74 71 $require_license_key = false;
75 72 }
@@ -119,20 +116,12 @@
119 116
120 117 /* translators: %s: name (e.g. Hey John,) */
121 118 $hey_x_text = esc_html( sprintf( fs_text_x_inline( 'Hey %s,', 'greeting', 'hey-x', $slug ), $first_name ) );
122 119
123 - $is_gdpr_required = ( ! $is_pending_activation && ! $require_license_key ) ?
124 - FS_GDPR_Manager::instance()->is_required() :
125 - false;
126 -
127 - if ( is_null( $is_gdpr_required ) ) {
128 - $is_gdpr_required = $fs->fetch_and_store_current_user_gdpr_anonymously();
129 - }
130 -
131 120 $activation_state = array(
132 121 'is_license_activation' => $require_license_key,
133 122 'is_pending_activation' => $is_pending_activation,
134 - 'is_gdpr_required' => $is_gdpr_required,
123 + 'is_gdpr_required' => true,
135 124 'is_network_level_activation' => $is_network_level_activation,
136 125 'is_dialog' => $is_optin_dialog,
137 126 );
138 127 ?>
@@ -171,9 +160,8 @@
171 160 );
172 161
173 162 fs_require_once_template( 'plugin-icon.php', $vars );
174 163 ?>
175 - <!-- <img class="fs-connect-logo" width="--><?php //echo $size ?><!--" height="--><?php //echo $size ?><!--" src="//img.freemius.com/logo/connect.svg"/>-->
176 164 </div>
177 165 <div class="fs-box-container">
178 166 <div class="fs-content">
179 167 <?php $fs->do_action( 'connect/before_message', $activation_state ) ?>
@@ -178,9 +166,9 @@
178 166 <div class="fs-content">
179 167 <?php $fs->do_action( 'connect/before_message', $activation_state ) ?>
180 168
181 169 <?php if ( ! empty( $error ) ) : ?>
182 - <p class="fs-error"><?php echo $fs->apply_filters( 'connect_error_esc_html', esc_html( $error ) ) ?></p>
170 + <div class="fs-error"><?php echo $fs->apply_filters( 'connect_error_esc_html', esc_html( $error ) ) ?></div>
183 171 <?php endif ?>
184 172 <?php
185 173 if ( ! $is_pending_activation && ! $require_license_key ) {
186 174 if ( ! $fs->is_plugin_update() ) {
@@ -231,13 +219,15 @@
231 219 } else {
232 220 $filter = 'connect_message';
233 221
234 222 if ( ! $fs->is_plugin_update() ) {
235 - $default_optin_message = esc_html( sprintf( ( $is_gdpr_required ?
236 - /* translators: %s: module type (plugin, theme, or add-on) */
237 - fs_text_inline( 'Opt in to get email notifications for security & feature updates, educational content, and occasional offers, and to share some basic WordPress environment info. This will help us make the %s more compatible with your site and better at doing what you need it to.', 'connect-message', $slug ) :
238 - /* translators: %s: module type (plugin, theme, or add-on) */
239 - fs_text_inline( 'Opt in to get email notifications for security & feature updates, and to share some basic WordPress environment info. This will help us make the %s more compatible with your site and better at doing what you need it to.', 'connect-message', $slug ) ), $fs->get_module_label( true ) ) );
223 + $default_optin_message = esc_html(
224 + sprintf(
225 + /* translators: %s: module type (plugin, theme, or add-on) */
226 + fs_text_inline( 'Opt in to get email notifications for security & feature updates, educational content, and occasional offers, and to share some basic WordPress environment info. This will help us make the %s more compatible with your site and better at doing what you need it to.', 'connect-message', $slug ),
227 + $fs->get_module_label( true )
228 + )
229 + );
240 230 } else {
241 231 // If Freemius was added on a plugin update, set different
242 232 // opt-in message.
243 233
@@ -243,11 +233,9 @@
243 233
244 234 /* translators: %s: module type (plugin, theme, or add-on) */
245 235 $default_optin_message = esc_html( sprintf( fs_text_inline( 'We have introduced this opt-in so you never miss an important update and help us make the %s more compatible with your site and better at doing what you need it to.', 'connect-message_on-update_why' ), $fs->get_module_label( true ) ) );
246 236
247 - $default_optin_message .= '<br><br>' . esc_html( $is_gdpr_required ?
248 - fs_text_inline( 'Opt in to get email notifications for security & feature updates, educational content, and occasional offers, and to share some basic WordPress environment info.', 'connect-message_on-update', $slug ) :
249 - fs_text_inline( 'Opt in to get email notifications for security & feature updates, and to share some basic WordPress environment info.', 'connect-message_on-update', $slug ) );
237 + $default_optin_message .= '<br><br>' . esc_html( fs_text_inline( 'Opt in to get email notifications for security & feature updates, educational content, and occasional offers, and to share some basic WordPress environment info.', 'connect-message_on-update', $slug ) );
250 238
251 239 if ( $fs->is_enable_anonymous() ) {
252 240 $default_optin_message .= ' ' . esc_html( fs_text_inline( 'If you skip this, that\'s okay! %1$s will still work just fine.', 'connect-message_on-update_skip', $slug ) );
253 241 }
@@ -266,16 +254,16 @@
266 254 $default_optin_message,
267 255 '<b>' . esc_html( $fs->get_plugin_name() ) . '</b>',
268 256 '<b>' . $current_user->user_login . '</b>',
269 257 '<a href="' . $site_url . '" target="_blank" rel="noopener noreferrer">' . $site_url . '</a>',
270 - $freemius_link
258 + $freemius_activation_terms_html
271 259 ),
272 260 $first_name,
273 261 $fs->get_plugin_name(),
274 262 $current_user->user_login,
275 263 '<a href="' . $site_url . '" target="_blank" rel="noopener noreferrer">' . $site_url . '</a>',
276 - $freemius_link,
277 - $is_gdpr_required
264 + $freemius_activation_terms_html,
265 + true
278 266 );
279 267 }
280 268
281 269 if ( $is_network_upgrade_mode ) {
@@ -347,8 +335,11 @@
347 335 <span class="fs-input-label"><?php echo $do_not_send_updates_text ?></span>
348 336 </label>
349 337 </div>
350 338 </div>
339 + <div id="fs_orphan_license_message">
340 + <span class="fs-message"><?php fs_echo_inline( "A user has not yet been associated with the license, which is necessary to prevent unauthorized activation. To assign the license to your user, you agree to share your WordPress user's full name and email address." ) ?></span>
341 + </div>
351 342 <?php endif ?>
352 343 <?php if ( $is_network_level_activation ) : ?>
353 344 <?php
354 345 $vars = array(
@@ -375,10 +366,10 @@
375 366 <?php endif ?>
376 367 <?php if ( $activate_with_current_user ) : ?>
377 368 <form action="" method="POST">
378 369 <input type="hidden" name="fs_action"
379 - value="<?php echo $fs->get_unique_affix() ?>_activate_existing">
380 - <?php wp_nonce_field( 'activate_existing_' . $fs->get_public_key() ) ?>
370 + value="<?php echo esc_attr( $fs->get_unique_affix() . '_activate_existing' ) ?>">
371 + <?php wp_nonce_field( $fs->get_unique_affix() . '_activate_existing' ) ?>
381 372 <input type="hidden" name="is_extensions_tracking_allowed" value="1">
382 373 <input type="hidden" name="is_diagnostic_tracking_allowed" value="1">
383 374 <button class="button button-primary" tabindex="1"
384 375 type="submit"><?php echo esc_html( $button_label ) ?></button>
@@ -386,9 +377,9 @@
386 377 <?php else : ?>
387 378 <form method="post" action="<?php echo WP_FS__ADDRESS ?>/action/service/user/install/">
388 379 <?php unset( $optin_params['sites']); ?>
389 380 <?php foreach ( $optin_params as $name => $value ) : ?>
390 - <input type="hidden" name="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>">
381 + <input type="hidden" name="<?php echo esc_attr( $name ) ?>" value="<?php echo esc_attr( $value ) ?>">
391 382 <?php endforeach ?>
392 383 <input type="hidden" name="is_extensions_tracking_allowed" value="1">
393 384 <input type="hidden" name="is_diagnostic_tracking_allowed" value="1">
394 385 <button class="button button-primary" tabindex="1"
@@ -397,9 +388,11 @@
397 388 } ?>><?php echo esc_html( $button_label ) ?></button>
398 389 </form>
399 390 <?php endif ?>
400 391 <?php if ( $require_license_key ) : ?>
401 - <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>
392 + <a id="license_issues_link"
393 + href="<?php echo esc_url( $fs->apply_filters( 'known_license_issues_url', 'https://freemius.com/help/documentation/wordpress-sdk/license-activation-issues/' ) ) ?>"
394 + target="_blank"><?php fs_esc_html_echo_inline( 'License issues?', 'license-issues', $slug ) ?></a>
402 395 <?php endif ?>
403 396
404 397 <?php $fs->do_action( 'connect/after_actions', $activation_state ) ?>
405 398 </div><?php
@@ -408,9 +401,9 @@
408 401 // Set core permission list items.
409 402 $permissions = array();
410 403
411 404 // Add newsletter permissions if enabled.
412 - if ( $is_gdpr_required || $fs->is_permission_requested( 'newsletter' ) ) {
405 + if ( $fs->is_permission_requested( 'newsletter' ) ) {
413 406 $permissions[] = $permission_manager->get_newsletter_permission();
414 407 }
415 408
416 409 $permissions = $permission_manager->get_permissions(
@@ -422,14 +415,14 @@
422 415 <div class="fs-permissions">
423 416 <?php if ( $require_license_key ) : ?>
424 417 <a class="fs-trigger wp-core-ui" href="#" tabindex="1" style="color: inherit;"><?php echo sprintf(
425 418 fs_esc_html_inline( 'For delivery of security & feature updates, and license management, %s needs to', 'license-sync-disclaimer', $slug ) . '<b class="fs-arrow"></b>',
426 - sprintf( '<nobr class="button-link" style="color: inherit;">%s</nobr>', $fs->get_plugin_title() )
419 + sprintf( '<nobr class="button-link" style="color: inherit;">%s</nobr>', esc_html( $fs->get_plugin_title() ) )
427 420 ) ?></a>
428 421 <?php else : ?>
429 422 <a class="fs-trigger wp-core-ui" href="#" tabindex="1" style="color: inherit;"><?php printf(
430 423 fs_esc_html_inline( 'This will allow %s to', 'this-will-allow-x', $slug ) . '<b class="fs-arrow"></b>',
431 - sprintf( '<nobr class="button-link" style="color: inherit;">%s</nobr>', $fs->get_plugin_title() )
424 + sprintf( '<nobr class="button-link" style="color: inherit;">%s</nobr>', esc_html( $fs->get_plugin_title() ) )
432 425 ) ?></a>
433 426 <?php endif ?>
434 427 <ul><?php
435 428 foreach ( $permissions as $permission ) {
@@ -452,14 +445,18 @@
452 445 </div>
453 446 <?php endif ?>
454 447 </div>
455 448 <div class="fs-terms">
456 - <a class="fs-tooltip-trigger<?php echo is_rtl() ? ' rtl' : '' ?>" href="<?php echo $freemius_site_url ?>" target="_blank" rel="noopener" tabindex="1">Powered by Freemius<?php if ( $require_license_key ) : ?> <span class="fs-tooltip" style="width: 170px"><?php echo $fs->get_text_inline( 'Freemius is our licensing and software updates engine', 'permissions-extensions_desc' ) ?></span><?php endif ?></a>
449 + <a class="fs-tooltip-trigger<?php echo is_rtl() ? ' rtl' : '' ?>" href="<?php echo esc_url( $freemius_activation_terms_url ) ?>" target="_blank" rel="noopener" tabindex="1">Powered by Freemius<?php if ( $require_license_key ) : ?> <span class="fs-tooltip" style="width: 170px"><?php echo esc_html( $fs->get_text_inline( 'Freemius is our licensing and software updates engine', 'permissions-extensions_desc' ) ) ?></span><?php endif ?></a>
457 450 &nbsp;&nbsp;-&nbsp;&nbsp;
458 451 <a href="https://freemius.com/privacy/" target="_blank" rel="noopener"
459 452 tabindex="1"><?php fs_esc_html_echo_inline( 'Privacy Policy', 'privacy-policy', $slug ) ?></a>
460 453 &nbsp;&nbsp;-&nbsp;&nbsp;
461 - <a href="<?php echo $require_license_key ? $freemius_plugin_terms_url : $freemius_usage_tracking_url ?>" target="_blank" rel="noopener" tabindex="1"><?php $require_license_key ? fs_echo_inline( 'License Agreement', 'license-agreement', $slug ) : fs_echo_inline( 'Terms of Service', 'tos', $slug ) ?></a>
454 + <?php if ($require_license_key) : ?>
455 + <a href="<?php echo esc_url( $freemius_plugin_terms_url ) ?>" target="_blank" rel="noopener" tabindex="1"><?php fs_echo_inline( 'License Agreement', 'license-agreement', $slug ) ?></a>
456 + <?php else : ?>
457 + <a href="<?php echo esc_url( $freemius_usage_tracking_url ) ?>" target="_blank" rel="noopener" tabindex="1"><?php fs_echo_inline( 'Terms of Service', 'tos', $slug ) ?></a>
458 + <?php endif; ?>
462 459 </div>
463 460 </div>
464 461 <?php
465 462 /**
@@ -744,12 +741,13 @@
744 741
745 742 var
746 743 licenseKey = $licenseKeyInput.val(),
747 744 data = {
748 - action : action,
749 - security : security,
750 - license_key: licenseKey,
751 - module_id : '<?php echo $fs->get_id() ?>'
745 + action : action,
746 + security : security,
747 + license_key : licenseKey,
748 + module_id : '<?php echo $fs->get_id() ?>',
749 + license_owner_id: licenseOwnerIDByLicense[ licenseKey ]
752 750 };
753 751
754 752 if (
755 753 requireLicenseKey &&
@@ -839,9 +837,9 @@
839 837 } else {
840 838 resetLoadingMode();
841 839
842 840 // Show error.
843 - $('.fs-content').prepend('<p class="fs-error">' + (resultObj.error.message ? resultObj.error.message : resultObj.error) + '</p>');
841 + $('.fs-content').prepend('<div class="fs-error">' + (resultObj.error.message ? resultObj.error.message : resultObj.error) + '</div>');
844 842 }
845 843 },
846 844 error: function () {
847 845 resetLoadingMode();
@@ -920,9 +918,9 @@
920 918 }
921 919
922 920 if ('' === key) {
923 921 $primaryCta.attr('disabled', 'disabled');
924 - $marketingOptin.hide();
922 + hideOptinAndLicenseMessage();
925 923 } else {
926 924 $primaryCta.prop('disabled', false);
927 925
928 926 if (32 <= key.length){
@@ -927,9 +925,9 @@
927 925
928 926 if (32 <= key.length){
929 927 fetchIsMarketingAllowedFlagAndToggleOptin();
930 928 } else {
931 - $marketingOptin.hide();
929 + hideOptinAndLicenseMessage();
932 930 }
933 931 }
934 932
935 933 previousLicenseKey = key;
@@ -963,10 +961,12 @@
963 961 //--------------------------------------------------------------------------------
964 962 //region GDPR
965 963 //--------------------------------------------------------------------------------
966 964 var isMarketingAllowedByLicense = {},
967 - $marketingOptin = $('#fs_marketing_optin'),
968 - previousLicenseKey = null;
965 + licenseOwnerIDByLicense = {},
966 + $marketingOptin = $( '#fs_marketing_optin' ),
967 + $orphanLicenseMessage = $( '#fs_orphan_license_message' ),
968 + previousLicenseKey = null;
969 969
970 970 if (requireLicenseKey) {
971 971
972 972 var
@@ -986,8 +986,16 @@
986 986 } else {
987 987 $marketingOptin.hide();
988 988 $primaryCta.focus();
989 989 }
990 +
991 + $orphanLicenseMessage.toggle( false === licenseOwnerIDByLicense[ licenseKey ] );
992 +
993 + if ( false !== licenseOwnerIDByLicense[ licenseKey ] ) {
994 + $( 'input[name=user_firstname]' ).remove();
995 + $( 'input[name=user_lastname]' ).remove();
996 + $( 'input[name=user_email]' ).remove();
997 + }
990 998 },
991 999 /**
992 1000 * @author Leo Fajardo (@leorw)
993 1001 * @since 2.1.0
@@ -995,9 +1003,10 @@
995 1003 fetchIsMarketingAllowedFlagAndToggleOptin = function () {
996 1004 var licenseKey = $licenseKeyInput.val();
997 1005
998 1006 if (licenseKey.length < 32) {
999 - $marketingOptin.hide();
1007 + hideOptinAndLicenseMessage();
1008 +
1000 1009 return;
1001 1010 }
1002 1011
1003 1012 if (isMarketingAllowedByLicense.hasOwnProperty(licenseKey)) {
@@ -1004,10 +1013,9 @@
1004 1013 afterMarketingFlagLoaded();
1005 1014 return;
1006 1015 }
1007 1016
1008 - $marketingOptin.hide();
1009 -
1017 + hideOptinAndLicenseMessage();
1010 1018 setLoadingMode();
1011 1019
1012 1020 $primaryCta.addClass('fs-loading');
1013 1021 $primaryCta.attr('disabled', 'disabled');
@@ -1029,13 +1037,18 @@
1029 1037 result = result.data;
1030 1038
1031 1039 // Cache result.
1032 1040 isMarketingAllowedByLicense[licenseKey] = result.is_marketing_allowed;
1041 + licenseOwnerIDByLicense[ licenseKey ] = result.license_owner_id;
1033 1042 }
1034 1043
1035 1044 afterMarketingFlagLoaded();
1036 1045 }
1037 1046 });
1047 + },
1048 + hideOptinAndLicenseMessage = function() {
1049 + $marketingOptin.hide();
1050 + $orphanLicenseMessage.hide();
1038 1051 };
1039 1052
1040 1053 $marketingOptin.find( 'input' ).click(function() {
1041 1054 $marketingOptin.removeClass( 'error' );
@@ -1044,4 +1057,6 @@
1044 1057
1045 1058 //endregion
1046 1059 })(jQuery);
1047 1060 </script>
1061 +<?php
1062 + fs_require_once_template( 'api-connectivity-message-js.php' );