|
|
|
@ -11,6 +11,7 @@ use Automattic\Jetpack\Assets;
|
|
|
|
|
use Automattic\Jetpack\Assets\Logo as Jetpack_Logo;
|
|
|
|
|
use Automattic\Jetpack\Connection\Manager as Connection_Manager;
|
|
|
|
|
use Automattic\Jetpack\Status;
|
|
|
|
|
use Automattic\Jetpack\Status\Host;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Jetpack just in time messaging through out the admin
|
|
|
|
@ -20,7 +21,19 @@ use Automattic\Jetpack\Status;
|
|
|
|
|
*/
|
|
|
|
|
class JITM {
|
|
|
|
|
|
|
|
|
|
const PACKAGE_VERSION = '3.1.21';
|
|
|
|
|
const PACKAGE_VERSION = '4.2.7';
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* List of screen IDs where JITMs are allowed to display.
|
|
|
|
|
*
|
|
|
|
|
* @var string[]
|
|
|
|
|
*/
|
|
|
|
|
const APPROVED_SCREEN_IDS = array(
|
|
|
|
|
'jetpack',
|
|
|
|
|
'woo',
|
|
|
|
|
'shop',
|
|
|
|
|
'product',
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* The configuration method that is called from the jetpack-config package.
|
|
|
|
@ -36,7 +49,7 @@ class JITM {
|
|
|
|
|
* @return Post_Connection_JITM|Pre_Connection_JITM JITM instance.
|
|
|
|
|
*/
|
|
|
|
|
public static function get_instance() {
|
|
|
|
|
if ( ( new Connection_Manager() )->is_connected() ) {
|
|
|
|
|
if ( self::is_connected() ) {
|
|
|
|
|
$jitm = new Post_Connection_JITM();
|
|
|
|
|
} else {
|
|
|
|
|
$jitm = new Pre_Connection_JITM();
|
|
|
|
@ -156,7 +169,10 @@ class JITM {
|
|
|
|
|
return (
|
|
|
|
|
$current_screen
|
|
|
|
|
&& $current_screen->id
|
|
|
|
|
&& (bool) preg_match( '/jetpack|woo|shop|product/', $current_screen->id )
|
|
|
|
|
&& (bool) preg_match(
|
|
|
|
|
'/' . implode( '|', self::APPROVED_SCREEN_IDS ) . '/',
|
|
|
|
|
$current_screen->id
|
|
|
|
|
)
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -226,7 +242,7 @@ class JITM {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Only add this to Jetpack or Woo admin pages.
|
|
|
|
|
// Only add this to specifically allowed pages.
|
|
|
|
|
if ( ! $this->is_a8c_admin_page() ) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
@ -255,21 +271,56 @@ class JITM {
|
|
|
|
|
* @param bool $full_jp_logo_exists Is there a big JP logo already displayed on this screen.
|
|
|
|
|
*/
|
|
|
|
|
public function generate_icon( $content_icon, $full_jp_logo_exists ) {
|
|
|
|
|
$date_now = new \DateTime( 'now', wp_timezone() );
|
|
|
|
|
$feb_4_date = new \DateTime( '02-04-2025', wp_timezone() );
|
|
|
|
|
// Don't show the new Woo svg logo until after Feb 4th, 2025
|
|
|
|
|
$show_new_logo = $date_now >= $feb_4_date;
|
|
|
|
|
|
|
|
|
|
switch ( $content_icon ) {
|
|
|
|
|
case 'jetpack':
|
|
|
|
|
$jetpack_logo = new Jetpack_Logo();
|
|
|
|
|
$content_icon = '<div class="jp-emblem">' . ( ( $full_jp_logo_exists ) ? $jetpack_logo->get_jp_emblem() : $jetpack_logo->get_jp_emblem_larger() ) . '</div>';
|
|
|
|
|
break;
|
|
|
|
|
case 'woocommerce':
|
|
|
|
|
$content_icon = '<div class="jp-emblem"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 168 100" xml:space="preserve" enable-background="new 0 0 168 100" width="50" height="30"><style type="text/css">
|
|
|
|
|
.st0{clip-path:url(#SVGID_2_);enable-background:new ;}
|
|
|
|
|
.st1{clip-path:url(#SVGID_4_);}
|
|
|
|
|
.st2{clip-path:url(#SVGID_6_);}
|
|
|
|
|
.st3{clip-path:url(#SVGID_8_);fill:#7F54B3;}
|
|
|
|
|
.st4{clip-path:url(#SVGID_10_);fill:#FFFFFE;}
|
|
|
|
|
.st5{clip-path:url(#SVGID_12_);fill:#FFFFFE;}
|
|
|
|
|
.st6{clip-path:url(#SVGID_14_);fill:#FFFFFE;}
|
|
|
|
|
</style><g><defs><polygon id="SVGID_1_" points="83.8 100 0 100 0 0.3 83.8 0.3 167.6 0.3 167.6 100 "/></defs><clipPath id="SVGID_2_"><use xlink:href="#SVGID_1_" overflow="visible"/></clipPath><g class="st0"><g><defs><rect id="SVGID_3_" width="168" height="100"/></defs><clipPath id="SVGID_4_"><use xlink:href="#SVGID_3_" overflow="visible"/></clipPath><g class="st1"><defs><path id="SVGID_5_" d="M15.6 0.3H152c8.6 0 15.6 7 15.6 15.6v52c0 8.6-7 15.6-15.6 15.6h-48.9l6.7 16.4L80.2 83.6H15.6C7 83.6 0 76.6 0 67.9v-52C0 7.3 7 0.3 15.6 0.3"/></defs><clipPath id="SVGID_6_"><use xlink:href="#SVGID_5_" overflow="visible"/></clipPath><g class="st2"><defs><rect id="SVGID_7_" width="168" height="100"/></defs><clipPath id="SVGID_8_"><use xlink:href="#SVGID_7_" overflow="visible"/></clipPath><rect x="-10" y="-9.7" class="st3" width="187.6" height="119.7"/></g></g></g></g></g><g><defs><path id="SVGID_9_" d="M8.4 14.5c1-1.3 2.4-2 4.3-2.1 3.5-0.2 5.5 1.4 6 4.9 2.1 14.3 4.4 26.4 6.9 36.4l15-28.6c1.4-2.6 3.1-3.9 5.2-4.1 3-0.2 4.9 1.7 5.6 5.7 1.7 9.1 3.9 16.9 6.5 23.4 1.8-17.4 4.8-30 9-37.7 1-1.9 2.5-2.9 4.5-3 1.6-0.1 3 0.3 4.3 1.4 1.3 1 2 2.3 2.1 3.9 0.1 1.2-0.1 2.3-0.7 3.3 -2.7 5-4.9 13.2-6.6 24.7 -1.7 11.1-2.3 19.8-1.9 26.1 0.1 1.7-0.1 3.2-0.8 4.5 -0.8 1.5-2 2.4-3.7 2.5 -1.8 0.1-3.6-0.7-5.4-2.5C52.4 66.7 47.4 57 43.7 44.1c-4.4 8.8-7.7 15.3-9.9 19.7 -4 7.7-7.5 11.7-10.3 11.9 -1.9 0.1-3.5-1.4-4.8-4.7 -3.5-9-7.3-26.3-11.3-52C7.1 17.3 7.5 15.8 8.4 14.5"/></defs><clipPath id="SVGID_10_"><use xlink:href="#SVGID_9_" overflow="visible"/></clipPath><rect x="-2.7" y="-0.6" class="st4" width="90.6" height="86.4"/></g><g><defs><path id="SVGID_11_" d="M155.6 25.2c-2.5-4.3-6.1-6.9-11-7.9 -1.3-0.3-2.5-0.4-3.7-0.4 -6.6 0-11.9 3.4-16.1 10.2 -3.6 5.8-5.3 12.3-5.3 19.3 0 5.3 1.1 9.8 3.3 13.6 2.5 4.3 6.1 6.9 11 7.9 1.3 0.3 2.5 0.4 3.7 0.4 6.6 0 12-3.4 16.1-10.2 3.6-5.9 5.3-12.4 5.3-19.4C159 33.4 157.9 28.9 155.6 25.2zM147 44.2c-0.9 4.5-2.7 7.9-5.2 10.1 -2 1.8-3.9 2.5-5.5 2.2 -1.7-0.3-3-1.8-4-4.4 -0.8-2.1-1.2-4.2-1.2-6.2 0-1.7 0.2-3.4 0.5-5 0.6-2.8 1.8-5.5 3.6-8.1 2.3-3.3 4.7-4.8 7.1-4.2 1.7 0.3 3 1.8 4 4.4 0.8 2.1 1.2 4.2 1.2 6.2C147.5 40.9 147.3 42.6 147 44.2z"/></defs><clipPath id="SVGID_12_"><use xlink:href="#SVGID_11_" overflow="visible"/></clipPath><rect x="109.6" y="6.9" class="st5" width="59.4" height="71.4"/></g><g><defs><path id="SVGID_13_" d="M112.7 25.2c-2.5-4.3-6.1-6.9-11-7.9 -1.3-0.3-2.5-0.4-3.7-0.4 -6.6 0-11.9 3.4-16.1 10.2 -3.5 5.8-5.3 12.3-5.3 19.3 0 5.3 1.1 9.8 3.3 13.6 2.5 4.3 6.1 6.9 11 7.9 1.3 0.3 2.5 0.4 3.7 0.4 6.6 0 12-3.4 16.1-10.2 3.5-5.9 5.3-12.4 5.3-19.4C116 33.4 114.9 28.9 112.7 25.2zM104.1 44.2c-0.9 4.5-2.7 7.9-5.2 10.1 -2 1.8-3.9 2.5-5.5 2.2 -1.7-0.3-3-1.8-4-4.4 -0.8-2.1-1.2-4.2-1.2-6.2 0-1.7 0.2-3.4 0.5-5 0.6-2.8 1.8-5.5 3.6-8.1 2.3-3.3 4.7-4.8 7.1-4.2 1.7 0.3 3 1.8 4 4.4 0.8 2.1 1.2 4.2 1.2 6.2C104.6 40.9 104.4 42.6 104.1 44.2z"/></defs><clipPath id="SVGID_14_"><use xlink:href="#SVGID_13_" overflow="visible"/></clipPath><rect x="66.7" y="6.9" class="st6" width="59.4" height="71.4"/></g></svg></div>';
|
|
|
|
|
// After Feb 4th 2025, we can remove this date condition check ( & filter) and the old svg logo.
|
|
|
|
|
/**
|
|
|
|
|
* Filter to force display the new Woo logo in Woo JITM's, or not.
|
|
|
|
|
*
|
|
|
|
|
* @since 4.0.5
|
|
|
|
|
*
|
|
|
|
|
* @param bool $show_woo_logo Whether to show the new Woo logo or not.
|
|
|
|
|
*/
|
|
|
|
|
$content_icon = apply_filters( 'jetpack_jitm_use_new_woo_logo', $show_new_logo )
|
|
|
|
|
// New Woo logo
|
|
|
|
|
? '<div class="jp-emblem"><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
|
|
|
viewBox="0 0 183.6 47.5" style="enable-background:new 0 0 183.6 47.5;" xml:space="preserve">
|
|
|
|
|
<style type="text/css">
|
|
|
|
|
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#873EFF;}
|
|
|
|
|
.st1{fill-rule:evenodd;clip-rule:evenodd;}
|
|
|
|
|
.st2{fill:#873EFF;}
|
|
|
|
|
.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
|
|
|
|
|
.st4{fill:#FFFFFF;}
|
|
|
|
|
</style>
|
|
|
|
|
<g>
|
|
|
|
|
<path class="st0" d="M77.4,0c-4.3,0-7.1,1.4-9.6,6.1L56.4,27.6V8.5c0-5.7-2.7-8.5-7.7-8.5s-7.1,1.7-9.6,6.5L28.3,27.6V8.7
|
|
|
|
|
c0-6.1-2.5-8.7-8.6-8.7H7.3C2.6,0,0,2.2,0,6.2s2.5,6.4,7.1,6.4h5.1v24.1c0,6.8,4.6,10.8,11.2,10.8s9.6-2.6,12.9-8.7l7.2-13.5v11.4
|
|
|
|
|
c0,6.7,4.4,10.8,11.1,10.8s9.2-2.3,13-8.7l16.6-28C87.8,4.7,85.3,0,77.3,0C77.3,0,77.3,0,77.4,0z"/>
|
|
|
|
|
<path class="st0" d="M108.6,0C95,0,84.7,10.1,84.7,23.8s10.4,23.7,23.9,23.7s23.8-10.1,23.9-23.7C132.5,10.1,122.1,0,108.6,0z
|
|
|
|
|
M108.6,32.9c-5.1,0-8.6-3.8-8.6-9.1s3.5-9.2,8.6-9.2s8.6,3.9,8.6,9.2S113.8,32.9,108.6,32.9z"/>
|
|
|
|
|
<path class="st0" d="M159.7,0c-13.5,0-23.9,10.1-23.9,23.8s10.4,23.7,23.9,23.7s23.9-10.1,23.9-23.7S173.2,0,159.7,0z M159.7,32.9
|
|
|
|
|
c-5.2,0-8.5-3.8-8.5-9.1s3.4-9.2,8.5-9.2s8.6,3.9,8.6,9.2S164.9,32.9,159.7,32.9z"/>
|
|
|
|
|
</g>
|
|
|
|
|
</svg></div>'
|
|
|
|
|
// Old Woo logo
|
|
|
|
|
: '<div class="jp-emblem"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 168 100" xml:space="preserve" enable-background="new 0 0 168 100" width="50" height="30"><style type="text/css">
|
|
|
|
|
.st0{clip-path:url(#SVGID_2_);enable-background:new ;}
|
|
|
|
|
.st1{clip-path:url(#SVGID_4_);}
|
|
|
|
|
.st2{clip-path:url(#SVGID_6_);}
|
|
|
|
|
.st3{clip-path:url(#SVGID_8_);fill:#7F54B3;}
|
|
|
|
|
.st4{clip-path:url(#SVGID_10_);fill:#FFFFFE;}
|
|
|
|
|
.st5{clip-path:url(#SVGID_12_);fill:#FFFFFE;}
|
|
|
|
|
.st6{clip-path:url(#SVGID_14_);fill:#FFFFFE;}
|
|
|
|
|
</style><g><defs><polygon id="SVGID_1_" points="83.8 100 0 100 0 0.3 83.8 0.3 167.6 0.3 167.6 100 "/></defs><clipPath id="SVGID_2_"><use xlink:href="#SVGID_1_" overflow="visible"/></clipPath><g class="st0"><g><defs><rect id="SVGID_3_" width="168" height="100"/></defs><clipPath id="SVGID_4_"><use xlink:href="#SVGID_3_" overflow="visible"/></clipPath><g class="st1"><defs><path id="SVGID_5_" d="M15.6 0.3H152c8.6 0 15.6 7 15.6 15.6v52c0 8.6-7 15.6-15.6 15.6h-48.9l6.7 16.4L80.2 83.6H15.6C7 83.6 0 76.6 0 67.9v-52C0 7.3 7 0.3 15.6 0.3"/></defs><clipPath id="SVGID_6_"><use xlink:href="#SVGID_5_" overflow="visible"/></clipPath><g class="st2"><defs><rect id="SVGID_7_" width="168" height="100"/></defs><clipPath id="SVGID_8_"><use xlink:href="#SVGID_7_" overflow="visible"/></clipPath><rect x="-10" y="-9.7" class="st3" width="187.6" height="119.7"/></g></g></g></g></g><g><defs><path id="SVGID_9_" d="M8.4 14.5c1-1.3 2.4-2 4.3-2.1 3.5-0.2 5.5 1.4 6 4.9 2.1 14.3 4.4 26.4 6.9 36.4l15-28.6c1.4-2.6 3.1-3.9 5.2-4.1 3-0.2 4.9 1.7 5.6 5.7 1.7 9.1 3.9 16.9 6.5 23.4 1.8-17.4 4.8-30 9-37.7 1-1.9 2.5-2.9 4.5-3 1.6-0.1 3 0.3 4.3 1.4 1.3 1 2 2.3 2.1 3.9 0.1 1.2-0.1 2.3-0.7 3.3 -2.7 5-4.9 13.2-6.6 24.7 -1.7 11.1-2.3 19.8-1.9 26.1 0.1 1.7-0.1 3.2-0.8 4.5 -0.8 1.5-2 2.4-3.7 2.5 -1.8 0.1-3.6-0.7-5.4-2.5C52.4 66.7 47.4 57 43.7 44.1c-4.4 8.8-7.7 15.3-9.9 19.7 -4 7.7-7.5 11.7-10.3 11.9 -1.9 0.1-3.5-1.4-4.8-4.7 -3.5-9-7.3-26.3-11.3-52C7.1 17.3 7.5 15.8 8.4 14.5"/></defs><clipPath id="SVGID_10_"><use xlink:href="#SVGID_9_" overflow="visible"/></clipPath><rect x="-2.7" y="-0.6" class="st4" width="90.6" height="86.4"/></g><g><defs><path id="SVGID_11_" d="M155.6 25.2c-2.5-4.3-6.1-6.9-11-7.9 -1.3-0.3-2.5-0.4-3.7-0.4 -6.6 0-11.9 3.4-16.1 10.2 -3.6 5.8-5.3 12.3-5.3 19.3 0 5.3 1.1 9.8 3.3 13.6 2.5 4.3 6.1 6.9 11 7.9 1.3 0.3 2.5 0.4 3.7 0.4 6.6 0 12-3.4 16.1-10.2 3.6-5.9 5.3-12.4 5.3-19.4C159 33.4 157.9 28.9 155.6 25.2zM147 44.2c-0.9 4.5-2.7 7.9-5.2 10.1 -2 1.8-3.9 2.5-5.5 2.2 -1.7-0.3-3-1.8-4-4.4 -0.8-2.1-1.2-4.2-1.2-6.2 0-1.7 0.2-3.4 0.5-5 0.6-2.8 1.8-5.5 3.6-8.1 2.3-3.3 4.7-4.8 7.1-4.2 1.7 0.3 3 1.8 4 4.4 0.8 2.1 1.2 4.2 1.2 6.2C147.5 40.9 147.3 42.6 147 44.2z"/></defs><clipPath id="SVGID_12_"><use xlink:href="#SVGID_11_" overflow="visible"/></clipPath><rect x="109.6" y="6.9" class="st5" width="59.4" height="71.4"/></g><g><defs><path id="SVGID_13_" d="M112.7 25.2c-2.5-4.3-6.1-6.9-11-7.9 -1.3-0.3-2.5-0.4-3.7-0.4 -6.6 0-11.9 3.4-16.1 10.2 -3.5 5.8-5.3 12.3-5.3 19.3 0 5.3 1.1 9.8 3.3 13.6 2.5 4.3 6.1 6.9 11 7.9 1.3 0.3 2.5 0.4 3.7 0.4 6.6 0 12-3.4 16.1-10.2 3.5-5.9 5.3-12.4 5.3-19.4C116 33.4 114.9 28.9 112.7 25.2zM104.1 44.2c-0.9 4.5-2.7 7.9-5.2 10.1 -2 1.8-3.9 2.5-5.5 2.2 -1.7-0.3-3-1.8-4-4.4 -0.8-2.1-1.2-4.2-1.2-6.2 0-1.7 0.2-3.4 0.5-5 0.6-2.8 1.8-5.5 3.6-8.1 2.3-3.3 4.7-4.8 7.1-4.2 1.7 0.3 3 1.8 4 4.4 0.8 2.1 1.2 4.2 1.2 6.2C104.6 40.9 104.4 42.6 104.1 44.2z"/></defs><clipPath id="SVGID_14_"><use xlink:href="#SVGID_13_" overflow="visible"/></clipPath><rect x="66.7" y="6.9" class="st6" width="59.4" height="71.4"/></g></svg></div>';
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
$content_icon = '';
|
|
|
|
@ -344,4 +395,19 @@ class JITM {
|
|
|
|
|
|
|
|
|
|
return $params;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Check if the current site is connected.
|
|
|
|
|
* On WordPress.com Simple, it is always connected.
|
|
|
|
|
*
|
|
|
|
|
* @return bool true if the site is connected, false otherwise.
|
|
|
|
|
*/
|
|
|
|
|
private static function is_connected() {
|
|
|
|
|
if ( ( new Host() )->is_wpcom_simple() ) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$connection = new Connection_Manager();
|
|
|
|
|
return $connection->is_connected();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|