diff --git a/.travis.yml b/.travis.yml index 98a05b6..c7855a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ language: php # PHP version used in first build configuration. php: + - 5.2 - 5.3 - 5.4 - 5.5 diff --git a/aryo-activity-log.php b/aryo-activity-log.php index 091a90a..a41c6fd 100644 --- a/aryo-activity-log.php +++ b/aryo-activity-log.php @@ -162,9 +162,24 @@ final class AAL_Main { ), ) ); + + if ( $this->freemius->is_plugin_update() ) { + $this->freemius->add_filter( 'connect_message', array( &$this, '_freemius_custom_connect_message' ), WP_FS__DEFAULT_PRIORITY, 6 ); + } + } + + public function _freemius_custom_connect_message( $message, $user_first_name, $plugin_title, $user_login, $site_link, $freemius_link ) { + return sprintf( + __( + 'Please help us improve %1$s!
+ If you opt-in, some data about your usage of %1$s will be sent to %2$s. + If you skip this, that\'s okay! %1$s will still work just fine.', + 'aryo-activity-log' + ), + $this->freemius->get_plugin_name(), + $freemius_link + ); } } -AAL_Main::instance(); - -// EOF \ No newline at end of file +AAL_Main::instance(); \ No newline at end of file diff --git a/classes/freemius/assets/css/admin/connect.css b/classes/freemius/assets/css/admin/connect.css index f2e3a57..375645b 100644 --- a/classes/freemius/assets/css/admin/connect.css +++ b/classes/freemius/assets/css/admin/connect.css @@ -1 +1 @@ -#fs_connect{width:480px;-moz-box-shadow:0px 1px 2px rgba(0,0,0,0.3);-webkit-box-shadow:0px 1px 2px rgba(0,0,0,0.3);box-shadow:0px 1px 2px rgba(0,0,0,0.3);margin:20px 0}@media screen and (max-width: 479px){#fs_connect{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;width:auto;margin:0 0 0 -10px}}#fs_connect .fs-content{background:#fff;padding:15px 20px}#fs_connect .fs-content p{margin:0;padding:0;font-size:1.2em}#fs_connect .fs-actions{padding:10px 20px;background:#C0C7CA}#fs_connect .fs-actions .button{padding:0 10px 1px;line-height:35px;height:37px;font-size:16px;margin-bottom:0}#fs_connect .fs-actions .button .dashicons{font-size:37px;margin-left:-8px;margin-right:12px}#fs_connect .fs-actions .button.button-primary{padding-right:15px;padding-left:15px}#fs_connect .fs-actions .button.button-secondary{float:right}#fs_connect.fs-anonymous-disabled .fs-actions .button.button-primary{width:100%}#fs_connect .fs-permissions{padding:10px 20px;background:#FEFEFE;-moz-transition:background 0.5s ease;-o-transition:background 0.5s ease;-ms-transition:background 0.5s ease;-webkit-transition:background 0.5s ease;transition:background 0.5s ease}#fs_connect .fs-permissions .fs-trigger{font-size:0.9em;text-decoration:none;text-align:center;display:block}#fs_connect .fs-permissions ul{height:0;overflow:hidden;margin:0}#fs_connect .fs-permissions ul li{margin-bottom:12px}#fs_connect .fs-permissions ul li:last-child{margin-bottom:0}#fs_connect .fs-permissions ul li i.dashicons{float:left;font-size:40px;width:40px;height:40px}#fs_connect .fs-permissions ul li div{margin-left:55px}#fs_connect .fs-permissions ul li div span{font-weight:bold;text-transform:uppercase;color:#23282d}#fs_connect .fs-permissions ul li div p{margin:2px 0 0 0}#fs_connect .fs-permissions.fs-open{background:#fff}#fs_connect .fs-permissions.fs-open ul{height:auto;margin:20px 20px 10px 20px}@media screen and (max-width: 479px){#fs_connect .fs-permissions{background:#fff}#fs_connect .fs-permissions .fs-trigger{display:none}#fs_connect .fs-permissions ul{height:auto;margin:20px}}#fs_connect .fs-visual{padding:12px;line-height:0;background:#fafafa;height:80px;position:relative}#fs_connect .fs-visual .fs-site-icon{position:absolute;left:20px;top:10px}#fs_connect .fs-visual .fs-connect-logo{position:absolute;right:20px;top:10px}#fs_connect .fs-visual .fs-plugin-icon{position:absolute;top:10px;left:50%;margin-left:-40px}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-site-icon,#fs_connect .fs-visual img,#fs_connect .fs-visual object{width:80px;height:80px}#fs_connect .fs-visual .dashicons-wordpress{font-size:64px;background:#01749a;color:#fff;width:64px;height:64px;padding:8px}#fs_connect .fs-visual .dashicons-plus{position:absolute;top:50%;font-size:30px;margin-top:-10px;color:#bbb}#fs_connect .fs-visual .dashicons-plus.fs-first{left:28%}#fs_connect .fs-visual .dashicons-plus.fs-second{left:65%}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-connect-logo,#fs_connect .fs-visual .fs-site-icon{border:1px solid #ccc;padding:1px;background:#fff}#fs_connect .fs-terms{text-align:center;font-size:0.85em;padding:5px;background:rgba(0,0,0,0.05)}#fs_connect .fs-terms,#fs_connect .fs-terms a{color:#999}#fs_connect .fs-terms a{text-decoration:none} +#fs_connect{width:480px;-moz-box-shadow:0px 1px 2px rgba(0,0,0,0.3);-webkit-box-shadow:0px 1px 2px rgba(0,0,0,0.3);box-shadow:0px 1px 2px rgba(0,0,0,0.3);margin:20px 0}@media screen and (max-width: 479px){#fs_connect{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;width:auto;margin:0 0 0 -10px}}#fs_connect .fs-content{background:#fff;padding:15px 20px}#fs_connect .fs-content p{margin:0;padding:0;font-size:1.2em}#fs_connect .fs-actions{padding:10px 20px;background:#C0C7CA}#fs_connect .fs-actions .button{padding:0 10px 1px;line-height:35px;height:37px;font-size:16px;margin-bottom:0}#fs_connect .fs-actions .button .dashicons{font-size:37px;margin-left:-8px;margin-right:12px}#fs_connect .fs-actions .button.button-primary{padding-right:15px;padding-left:15px}#fs_connect .fs-actions .button.button-primary:after{content:' \279C'}#fs_connect .fs-actions .button.button-secondary{float:right}#fs_connect.fs-anonymous-disabled .fs-actions .button.button-primary{width:100%}#fs_connect .fs-permissions{padding:10px 20px;background:#FEFEFE;-moz-transition:background 0.5s ease;-o-transition:background 0.5s ease;-ms-transition:background 0.5s ease;-webkit-transition:background 0.5s ease;transition:background 0.5s ease}#fs_connect .fs-permissions .fs-trigger{font-size:0.9em;text-decoration:none;text-align:center;display:block}#fs_connect .fs-permissions ul{height:0;overflow:hidden;margin:0}#fs_connect .fs-permissions ul li{margin-bottom:12px}#fs_connect .fs-permissions ul li:last-child{margin-bottom:0}#fs_connect .fs-permissions ul li i.dashicons{float:left;font-size:40px;width:40px;height:40px}#fs_connect .fs-permissions ul li div{margin-left:55px}#fs_connect .fs-permissions ul li div span{font-weight:bold;text-transform:uppercase;color:#23282d}#fs_connect .fs-permissions ul li div p{margin:2px 0 0 0}#fs_connect .fs-permissions.fs-open{background:#fff}#fs_connect .fs-permissions.fs-open ul{height:auto;margin:20px 20px 10px 20px}@media screen and (max-width: 479px){#fs_connect .fs-permissions{background:#fff}#fs_connect .fs-permissions .fs-trigger{display:none}#fs_connect .fs-permissions ul{height:auto;margin:20px}}#fs_connect .fs-visual{padding:12px;line-height:0;background:#fafafa;height:80px;position:relative}#fs_connect .fs-visual .fs-site-icon{position:absolute;left:20px;top:10px}#fs_connect .fs-visual .fs-connect-logo{position:absolute;right:20px;top:10px}#fs_connect .fs-visual .fs-plugin-icon{position:absolute;top:10px;left:50%;margin-left:-40px}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-site-icon,#fs_connect .fs-visual img,#fs_connect .fs-visual object{width:80px;height:80px}#fs_connect .fs-visual .dashicons-wordpress{font-size:64px;background:#01749a;color:#fff;width:64px;height:64px;padding:8px}#fs_connect .fs-visual .dashicons-plus{position:absolute;top:50%;font-size:30px;margin-top:-10px;color:#bbb}#fs_connect .fs-visual .dashicons-plus.fs-first{left:28%}#fs_connect .fs-visual .dashicons-plus.fs-second{left:65%}#fs_connect .fs-visual .fs-plugin-icon,#fs_connect .fs-visual .fs-connect-logo,#fs_connect .fs-visual .fs-site-icon{border:1px solid #ccc;padding:1px;background:#fff}#fs_connect .fs-terms{text-align:center;font-size:0.85em;padding:5px;background:rgba(0,0,0,0.05)}#fs_connect .fs-terms,#fs_connect .fs-terms a{color:#999}#fs_connect .fs-terms a{text-decoration:none}.rtl #fs_connect .fs-actions{padding:10px 20px;background:#C0C7CA}.rtl #fs_connect .fs-actions .button .dashicons{font-size:37px;margin-left:-8px;margin-right:12px}.rtl #fs_connect .fs-actions .button.button-primary:after{content:' \000bb'}.rtl #fs_connect .fs-actions .button.button-secondary{float:left}.rtl #fs_connect .fs-permissions ul li div{margin-right:55px;margin-left:0}.rtl #fs_connect .fs-permissions ul li i.dashicons{float:right}.rtl #fs_connect .fs-visual .fs-site-icon{right:20px;left:auto}.rtl #fs_connect .fs-visual .fs-connect-logo{right:auto;left:20px}.wp-pointer-content #fs_connect{margin:0;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.fs-opt-in-pointer .wp-pointer-content{padding:0}.fs-opt-in-pointer.wp-pointer-top .wp-pointer-arrow{border-bottom-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-top .wp-pointer-arrow-inner{border-bottom-color:#fafafa}.fs-opt-in-pointer.wp-pointer-bottom .wp-pointer-arrow{border-top-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-bottom .wp-pointer-arrow-inner{border-top-color:#fafafa}.fs-opt-in-pointer.wp-pointer-left .wp-pointer-arrow{border-right-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-left .wp-pointer-arrow-inner{border-right-color:#fafafa}.fs-opt-in-pointer.wp-pointer-right .wp-pointer-arrow{border-left-color:#dfdfdf}.fs-opt-in-pointer.wp-pointer-right .wp-pointer-arrow-inner{border-left-color:#fafafa} diff --git a/classes/freemius/assets/img/icon.svg b/classes/freemius/assets/img/icon.svg new file mode 100644 index 0000000..b72a10e --- /dev/null +++ b/classes/freemius/assets/img/icon.svg @@ -0,0 +1,78 @@ + + + + + + + + + ActivityLog + + + + + + + + + + + + + + + + + + + diff --git a/classes/freemius/assets/scss/admin/connect.scss b/classes/freemius/assets/scss/admin/connect.scss index cd2754c..481c674 100644 --- a/classes/freemius/assets/scss/admin/connect.scss +++ b/classes/freemius/assets/scss/admin/connect.scss @@ -4,53 +4,58 @@ $form_width: 480px; #fs_connect { - width: $form_width; - @include box-shadow(0px 1px 2px rgba(0,0,0,0.3)); + width: $form_width; + @include box-shadow(0px 1px 2px rgba(0, 0, 0, 0.3)); margin: 20px 0; @media screen and (max-width: ($form_width - 1)) { @include box-shadow(none); - width: auto; - margin: 0 0 0 -10px; + width: auto; + margin: 0 0 0 -10px; } .fs-content { background: #fff; - padding: 15px 20px; + padding: 15px 20px; p { - margin: 0; - padding: 0; + margin: 0; + padding: 0; font-size: 1.2em; } } .fs-actions { - padding: 10px 20px; + padding: 10px 20px; background: #C0C7CA; .button { - padding: 0 10px 1px; - line-height: 35px; - height: 37px; - font-size: 16px; + padding: 0 10px 1px; + line-height: 35px; + height: 37px; + font-size: 16px; margin-bottom: 0; .dashicons { - font-size: 37px; - margin-left: -8px; + font-size: 37px; + margin-left: -8px; margin-right: 12px; } &.button-primary { padding-right: 15px; - padding-left: 15px; + padding-left: 15px; + + &:after + { + content: ' \279C'; + } } &.button-secondary @@ -59,13 +64,13 @@ $form_width: 480px; } } -// .fs-skip -// { -// line-height: 38px; -// vertical-align: middle; -// text-decoration: none; -// margin-left: 10px; -// } + // .fs-skip + // { + // line-height: 38px; + // vertical-align: middle; + // text-decoration: none; + // margin-left: 10px; + // } } &.fs-anonymous-disabled @@ -148,7 +153,7 @@ $form_width: 480px; } @media screen and (max-width: ($form_width - 1)) { - background: #fff; + background: #fff; .fs-trigger { @@ -169,31 +174,31 @@ $form_width: 480px; .fs-visual { - padding: 12px; + padding: 12px; line-height: 0; - background: #fafafa; - height: $icon_size; - position: relative; + background: #fafafa; + height: $icon_size; + position: relative; .fs-site-icon { position: absolute; - left: 20px; - top: $icons_top; + left: 20px; + top: $icons_top; } .fs-connect-logo { position: absolute; - right: 20px; - top: $icons_top; + right: 20px; + top: $icons_top; } .fs-plugin-icon { - position: absolute; - top: $icons_top; - left: 50%; + position: absolute; + top: $icons_top; + left: 50%; margin-left: - ($icon_size / 2); } @@ -218,11 +223,11 @@ $form_width: 480px; .dashicons-plus { - position: absolute; - top: 50%; - font-size: 30px; + position: absolute; + top: 50%; + font-size: 30px; margin-top: -10px; - color: #bbb; + color: #bbb; &.fs-first { @@ -238,8 +243,8 @@ $form_width: 480px; .fs-connect-logo, .fs-site-icon { - border: 1px solid #ccc; - padding: 1px; + border: 1px solid #ccc; + padding: 1px; background: #fff; } } @@ -247,17 +252,154 @@ $form_width: 480px; .fs-terms { text-align: center; - font-size: 0.85em; - padding: 5px; - background: rgba(0,0,0,0.05); + font-size: 0.85em; + padding: 5px; + background: rgba(0, 0, 0, 0.05); &, a { color: #999; } - a { + a + { text-decoration: none; } } -} \ No newline at end of file +} + +.rtl +{ + #fs_connect + { + .fs-actions + { + padding: 10px 20px; + background: #C0C7CA; + + .button + { + .dashicons + { + font-size: 37px; + margin-left: -8px; + margin-right: 12px; + } + + &.button-primary + { + &:after + { + content: ' \000bb'; + } + } + + &.button-secondary + { + float: left; + } + } + } + + .fs-permissions + { + ul + { + li + { + div + { + margin-right: 55px; + margin-left: 0; + } + + i.dashicons + { + float: right; + } + + } + } + } + + .fs-visual + { + .fs-site-icon + { + right: 20px; + left: auto; + } + + .fs-connect-logo + { + right: auto; + left: 20px; + } + } + } +} + +.wp-pointer-content +{ + #fs_connect + { + margin: 0; + @include box-shadow(none); + } +} + +.fs-opt-in-pointer +{ + .wp-pointer-content + { + padding: 0; + } + + &.wp-pointer-top + { + .wp-pointer-arrow + { + border-bottom-color: #dfdfdf; + } + .wp-pointer-arrow-inner + { + border-bottom-color: #fafafa; + } + } + + &.wp-pointer-bottom + { + .wp-pointer-arrow + { + border-top-color: #dfdfdf; + } + .wp-pointer-arrow-inner + { + border-top-color: #fafafa; + } + } + + &.wp-pointer-left + { + .wp-pointer-arrow + { + border-right-color: #dfdfdf; + } + .wp-pointer-arrow-inner + { + border-right-color: #fafafa; + } + } + + &.wp-pointer-right + { + .wp-pointer-arrow + { + border-left-color: #dfdfdf; + } + .wp-pointer-arrow-inner + { + border-left-color: #fafafa; + } + } +} diff --git a/classes/freemius/config.php b/classes/freemius/config.php index bad7b0e..d401414 100644 --- a/classes/freemius/config.php +++ b/classes/freemius/config.php @@ -39,7 +39,7 @@ */ if ( ! defined( 'WP_FS__LOCALHOST_IP' ) ) { // VVV default public network IP. - define( 'WP_FS__VVV_DEFAULT_PUBLIC_IP', '192.168.50.4' ); + define( 'WP_FS__VVV_DEFAULT_PUBLIC_IP', '192.168.50.1' ); // define( 'WP_FS__LOCALHOST_IP', WP_FS__VVV_DEFAULT_PUBLIC_IP ); } diff --git a/classes/freemius/includes/class-freemius-abstract.php b/classes/freemius/includes/class-freemius-abstract.php index d01f938..19bc7b1 100644 --- a/classes/freemius/includes/class-freemius-abstract.php +++ b/classes/freemius/includes/class-freemius-abstract.php @@ -336,6 +336,16 @@ */ abstract function get_upgrade_url( $period = WP_FS__PERIOD_ANNUALLY ); + /** + * Check if Freemius was first added in a plugin update. + * + * @author Vova Feldman (@svovaf) + * @since 1.1.5 + * + * @return bool + */ + abstract function is_plugin_update(); + #region Marketing ------------------------------------------------------------------ /** diff --git a/classes/freemius/includes/class-freemius.php b/classes/freemius/includes/class-freemius.php index 30fe43e..4c49e34 100644 --- a/classes/freemius/includes/class-freemius.php +++ b/classes/freemius/includes/class-freemius.php @@ -939,7 +939,7 @@ if (isset( $this->_storage->connectivity_test ) ) { if ( $_SERVER['HTTP_HOST'] == $this->_storage->connectivity_test['host'] && - $_SERVER['SERVER_ADDR'] == $this->_storage->connectivity_test['server_ip'] + fs_get_ip() == $this->_storage->connectivity_test['server_ip'] ) { if ( ( $this->_storage->connectivity_test['is_connected'] && $this->_storage->connectivity_test['is_active'] ) || @@ -954,7 +954,7 @@ } } - $is_update = $this->apply_filters( 'is_plugin_update', !$this->is_plugin_new_install() ); + $is_update = $this->apply_filters( 'is_plugin_update', $this->is_plugin_update() ); if ( WP_FS__SIMULATE_NO_API_CONNECTIVITY ) { $is_connected = false; @@ -982,7 +982,7 @@ $this->_storage->connectivity_test = array( 'is_connected' => $is_connected, 'host' => $_SERVER['HTTP_HOST'], - 'server_ip' => $_SERVER['SERVER_ADDR'], + 'server_ip' => fs_get_ip(), 'is_active' => $is_active, 'timestamp' => WP_FS__SCRIPT_START_TIME, // Last version with connectivity attempt. @@ -1387,6 +1387,8 @@ ); } + $server_ip = fs_get_ip(); + // Generate the default email sections. $sections = array( 'sdk' => array( @@ -1413,7 +1415,7 @@ ), 'server_addr' => array( 'SERVER_ADDR', - ( ! empty( $_SERVER['SERVER_ADDR'] ) ? '' . $_SERVER['SERVER_ADDR'] . '' : '' ) + '' . $server_ip . '' ) ) ), @@ -2383,6 +2385,16 @@ $this->_storage->is_plugin_new_install; } + /** + * @author Vova Feldman (@svovaf) + * @since 1.1.5 + * + * @return bool + */ + function is_plugin_update() { + return ! $this->is_plugin_new_install(); + } + /** * Plugin activated hook. * @@ -2549,6 +2561,9 @@ 'timestamp' => WP_FS__SCRIPT_START_TIME, 'version' => $this->get_plugin_version(), ); + + // Update anonymous mode cache. + $this->_is_anonymous = $is_anonymous; } /** @@ -2569,7 +2584,7 @@ $this->_logger->entrance(); $this->_admin_notices->remove_sticky( 'connect_account' ); - + $this->set_anonymous_mode(); // Send anonymous skip event. @@ -4755,6 +4770,11 @@ ); } + $show_pricing = ($this->has_paid_plan() && $this->_menu->is_submenu_item_visible( 'pricing' )); + // If user don't have paid plans, add pricing page + // to support add-ons checkout but don't add the submenu item. + // || (isset( $_GET['page'] ) && $this->_menu->get_slug( 'pricing' ) == $_GET['page']); + // Add upgrade/pricing page. $this->add_submenu_item( ( $this->is_paying() ? __fs( 'pricing' ) : __fs( 'upgrade' ) . '  ➤' ), @@ -4764,9 +4784,7 @@ 'pricing', array( &$this, '_clean_admin_content_section' ), WP_FS__LOWEST_PRIORITY, - // If user don't have paid plans, add pricing page - // to support add-ons checkout but don't add the submenu item. - $this->_menu->is_submenu_item_visible( 'pricing' ) && ( $this->has_paid_plan() || ( isset( $_GET['page'] ) && $this->_menu->get_slug( 'pricing' ) == $_GET['page'] ) ) + $show_pricing ); } } @@ -4883,8 +4901,8 @@ if ( $this->is_registered() ) { if ( $this->_menu->is_submenu_item_visible( 'support' ) ) { $this->add_submenu_link_item( - __fs( 'support-forum' ), - 'https://wordpress.org/support/plugin/' . $this->_slug, + $this->apply_filters( 'support_forum_submenu', __fs( 'support-forum' ) ), + $this->apply_filters( 'support_forum_url', 'https://wordpress.org/support/plugin/' . $this->_slug ), 'wp-support-forum', 'read', 50 @@ -5092,6 +5110,21 @@ add_filter( 'fs_' . $tag . '_' . $this->_slug, $function_to_add, $priority, $accepted_args ); } + /** + * Check if has filter. + * + * @author Vova Feldman (@svovaf) + * @since 1.1.4 + * + * @param string $tag + * @param callable|bool $function_to_check Optional. The callback to check for. Default false. + */ + function has_filter( $tag, $function_to_check = false ) { + $this->_logger->entrance( $tag ); + + return has_filter( 'fs_' . $tag . '_' . $this->_slug, $function_to_check ); + } + /* Account Page ------------------------------------------------------------------------------------------------------------------*/ /** diff --git a/classes/freemius/includes/i18n.php b/classes/freemius/includes/i18n.php index 48662be..454be51 100644 --- a/classes/freemius/includes/i18n.php +++ b/classes/freemius/includes/i18n.php @@ -11,7 +11,7 @@ 'add-ons' => __( 'Add Ons', 'freemius' ), 'upgrade' => _x( 'Upgrade', 'verb', 'freemius' ), 'awesome' => __( 'Awesome', 'freemius' ), - 'pricing' => __( 'Pricing', 'noun', 'freemius' ), + 'pricing' => _x( 'Pricing', 'noun', 'freemius' ), 'price' => _x( 'Price', 'noun', 'freemius' ), 'unlimited-updates' => __( 'Unlimited Updates', 'freemius' ), 'downgrade' => _x( 'Downgrade', 'verb', 'freemius' ), @@ -20,7 +20,7 @@ 'account-details' => __( 'Account Details', 'freemius' ), 'delete' => _x( 'Delete', 'verb', 'freemius' ), 'delete-account' => __( 'Delete Account', 'freemius' ), - 'dismiss' => __( 'Dismiss', 'as close a window', 'freemius' ), + 'dismiss' => _x( 'Dismiss', 'as close a window', 'freemius' ), 'plan' => _x( 'Plan', 'as product pricing plan', 'freemius' ), 'change-plan' => __( 'Change Plan', 'freemius' ), 'download-x-version' => _x( 'Download %s Version', 'as download professional version', 'freemius' ), @@ -217,12 +217,12 @@ 'x-requires-access-to-api' => _x( '%s requires an access to our API.', 'as pluginX requires an access to our API', 'freemius' ), 'squid-blocks-connection-message' => __( 'It looks like your server is using Squid ACL (access control lists), which blocks the connection.', 'freemius' ), 'squid-no-clue-title' => __( 'I don\'t know what is Squid or ACL, help me!', 'freemius' ), - 'squid-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.' ), + 'squid-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.', 'freemius' ), 'sysadmin-title' => __( 'I\'m a system administrator', 'freemius' ), - 'squid-sysadmin-desc' => __( 'Great, please whitelist the following domains: %s. Once you done, deactivate the plugin and activate it again.' ), + 'squid-sysadmin-desc' => __( 'Great, please whitelist the following domains: %s. Once you done, deactivate the plugin and activate it again.', 'freemius' ), 'curl-missing-no-clue-title' => __( 'I don\'t know what is cURL or how to install it, help me!', 'freemius' ), - 'curl-missing-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.' ), - 'curl-missing-sysadmin-desc' => __( 'Great, please install cURL and enable it in your php.ini file. To make sure it was successfully activated, use \'phpinfo()\'. Once activated, deactivate the plugin and reactivate it back again.' ), + 'curl-missing-no-clue-desc' => __( 'We\'ll make sure to contact your hosting company and resolve the issue. You will get a follow-up email to %s once we have an update.', 'freemius' ), + 'curl-missing-sysadmin-desc' => __( 'Great, please install cURL and enable it in your php.ini file. To make sure it was successfully activated, use \'phpinfo()\'. Once activated, deactivate the plugin and reactivate it back again.', 'freemius' ), 'happy-to-resolve-issue-asap' => __( 'We are sure it\'s an issue on our side and more than happy to resolve it for you ASAP if you give us a chance.', 'freemius' ), 'fix-issue-title' => __( 'Yes - I\'m giving you a chance to fix it', 'freemius' ), 'fix-issue-desc' => __( 'We will do our best to whitelist your server and resolve this issue ASAP. You will get a follow-up email to %s once we have an update.', 'freemius' ), diff --git a/classes/freemius/templates/connect.php b/classes/freemius/templates/connect.php index 741f9f1..2484234 100644 --- a/classes/freemius/templates/connect.php +++ b/classes/freemius/templates/connect.php @@ -6,8 +6,8 @@ * @since 1.0.7 */ - $slug = $VARS['slug']; - $fs = freemius( $slug ); + $slug = $VARS['slug']; + $fs = freemius( $slug ); $fs->_enqueue_connect_essentials(); @@ -44,15 +44,22 @@

apply_filters( 'connect_message', sprintf( - __fs( 'hey-x' ) . '
' . - __fs( 'connect-message' ), + echo $fs->apply_filters( 'connect_message', + sprintf( + __fs( 'hey-x' ) . '
' . + __fs( 'connect-message' ), + $first_name, + '' . $fs->get_plugin_name() . '', + '' . $current_user->user_login . '', + '' . $site_url . '', + 'freemius.com' + ), $first_name, - '' . $fs->get_plugin_name() . '', - '' . $current_user->user_login . '', + $fs->get_plugin_name(), + $current_user->user_login, '' . $site_url . '', 'freemius.com' - ) ); + ); ?>

@@ -66,8 +73,7 @@ get_public_key() ) ?> + type="submit">
@@ -118,8 +124,7 @@ + type="submit">
diff --git a/language/aryo-activity-log.pot b/language/aryo-activity-log.pot index e82e4ae..fdb065f 100644 --- a/language/aryo-activity-log.pot +++ b/language/aryo-activity-log.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aryo-activity-log 2.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-14 14:57+0200\n" +"POT-Creation-Date: 2016-01-04 18:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,6 +22,16 @@ msgstr "" msgid "Cheatin’ huh?" msgstr "" +#: aryo-activity-log.php:174 +#, php-format +msgid "" +"Please help us improve %1$s!
\n" +"\t\t \tIf you opt-in, some data about your usage of %1$s will be " +"sent to %2$s.\n" +"\t\t \tIf you skip this, that's okay! %1$s will still work just " +"fine." +msgstr "" + #: classes/class-aal-activity-log-list-table.php:104 msgid "Activities" msgstr "" @@ -446,6 +456,7 @@ msgid "Awesome" msgstr "" #: classes/freemius/includes/i18n.php:14 +msgctxt "noun" msgid "Pricing" msgstr "" @@ -485,6 +496,7 @@ msgid "Delete Account" msgstr "" #: classes/freemius/includes/i18n.php:23 +msgctxt "as close a window" msgid "Dismiss" msgstr ""