| @@ -1,5 +1,5 @@ | ||
| 1 | -<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName | |
| 1 | +<?php | |
| 2 | 2 | /** |
| 3 | 3 | * Module Name: Notifications |
| 4 | 4 | * Module Description: Receive instant notifications of site comments and likes. |
| 5 | 5 | * Sort Order: 13 |
| @@ -4,115 +4,110 @@ | ||
| 4 | 4 | * Module Description: Receive instant notifications of site comments and likes. |
| 5 | 5 | * Sort Order: 13 |
| 6 | 6 | * First Introduced: 1.9 |
| 7 | 7 | * Requires Connection: Yes |
| 8 | - * Requires User Connection: Yes | |
| 9 | 8 | * Auto Activate: Yes |
| 10 | 9 | * Module Tags: Other |
| 11 | 10 | * Feature: General |
| 12 | 11 | * Additional Search Queries: notification, notifications, toolbar, adminbar, push, comments |
| 13 | - * | |
| 14 | - * @package automattic/jetpack | |
| 15 | 12 | */ |
| 16 | 13 | |
| 17 | -use Automattic\Jetpack\Connection\Manager as Connection_Manager; | |
| 18 | -use Automattic\Jetpack\Status\Host; | |
| 14 | +if ( !defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) ); | |
| 19 | 15 | |
| 20 | -if ( ! defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) { | |
| 21 | - define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) . '-lite' ); | |
| 22 | -} | |
| 23 | - | |
| 24 | -/** | |
| 25 | - * Notifications class. | |
| 26 | - */ | |
| 27 | 16 | class Jetpack_Notifications { |
| 28 | - /** | |
| 29 | - * Jetpack object. | |
| 30 | - * | |
| 31 | - * @var bool|Jetpack Jetpack object. | |
| 32 | - */ | |
| 33 | 17 | public $jetpack = false; |
| 34 | 18 | |
| 35 | 19 | /** |
| 36 | 20 | * Singleton |
| 37 | - * | |
| 38 | 21 | * @static |
| 39 | 22 | */ |
| 40 | 23 | public static function init() { |
| 41 | 24 | static $instance = array(); |
| 42 | 25 | |
| 43 | - if ( ! $instance ) { | |
| 44 | - $instance[0] = new Jetpack_Notifications(); | |
| 26 | + if ( !$instance ) { | |
| 27 | + $instance[0] = new Jetpack_Notifications; | |
| 45 | 28 | } |
| 46 | 29 | |
| 47 | 30 | return $instance[0]; |
| 48 | 31 | } |
| 49 | 32 | |
| 50 | - /** | |
| 51 | - * Constructor. | |
| 52 | - */ | |
| 53 | - private function __construct() { | |
| 33 | + function __construct() { | |
| 54 | 34 | $this->jetpack = Jetpack::init(); |
| 55 | 35 | |
| 56 | - add_action( 'init', array( $this, 'action_init' ) ); | |
| 36 | + add_action( 'init', array( &$this, 'action_init' ) ); | |
| 57 | 37 | } |
| 58 | 38 | |
| 59 | - /** | |
| 60 | - * Adds s0.wp.com to a file path. | |
| 61 | - * | |
| 62 | - * @param string $file File path. | |
| 63 | - * | |
| 64 | - * @return string | |
| 65 | - */ | |
| 66 | - public function wpcom_static_url( $file ) { | |
| 67 | - return 'https://s0.wp.com' . $file; | |
| 39 | + function wpcom_static_url($file) { | |
| 40 | + $i = hexdec( substr( md5( $file ), -1 ) ) % 2; | |
| 41 | + $url = 'http://s' . $i . '.wp.com' . $file; | |
| 42 | + return set_url_scheme( $url ); | |
| 68 | 43 | } |
| 69 | 44 | |
| 70 | - /** | |
| 71 | - * Init the notifications admin bar. | |
| 72 | - * | |
| 73 | - * @return void | |
| 74 | - */ | |
| 75 | - public function action_init() { | |
| 76 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { | |
| 77 | - return; | |
| 45 | + // return the major version of Internet Explorer the viewer is using or false if it's not IE | |
| 46 | + public static function get_internet_explorer_version() { | |
| 47 | + static $version; | |
| 48 | + if ( isset( $version ) ) { | |
| 49 | + return $version; | |
| 78 | 50 | } |
| 79 | 51 | |
| 80 | - if ( ! has_filter( 'show_admin_bar', '__return_true' ) && ! is_user_logged_in() ) { | |
| 81 | - return; | |
| 52 | + $user_agent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : ''; | |
| 53 | + | |
| 54 | + preg_match( '/MSIE (\d+)/', $user_agent, $matches ); | |
| 55 | + $version = empty( $matches[1] ) ? null : $matches[1]; | |
| 56 | + if ( empty( $version ) || !$version ) { | |
| 57 | + return false; | |
| 82 | 58 | } |
| 59 | + return $version; | |
| 60 | + } | |
| 83 | 61 | |
| 84 | - // Do not show notifications in the Site Editor, which is always in fullscreen mode. | |
| 85 | - global $pagenow; | |
| 62 | + public static function current_browser_is_supported() { | |
| 63 | + static $supported; | |
| 86 | 64 | |
| 87 | - // Pre 13.7 pages that still need to be supported if < 13.7 is | |
| 88 | - // still installed. | |
| 89 | - $allowed_old_pages = array( 'admin.php', 'themes.php' ); | |
| 90 | - $is_old_site_editor_page = in_array( $pagenow, $allowed_old_pages, true ) && isset( $_GET['page'] ) && 'gutenberg-edit-site' === $_GET['page']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 91 | - // For Gutenberg > 13.7, the core `site-editor.php` route is used instead | |
| 92 | - $is_site_editor_page = 'site-editor.php' === $pagenow; | |
| 65 | + if ( isset( $supported ) ) { | |
| 66 | + return $supported; | |
| 67 | + } | |
| 93 | 68 | |
| 94 | - if ( $is_site_editor_page || $is_old_site_editor_page ) { | |
| 95 | - return; | |
| 69 | + $ie_version = self::get_internet_explorer_version(); | |
| 70 | + if ( false === $ie_version ) { | |
| 71 | + return $supported = true; | |
| 96 | 72 | } |
| 97 | 73 | |
| 98 | - add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 120 ); | |
| 99 | - add_action( 'wp_head', array( $this, 'styles_and_scripts' ), 120 ); | |
| 100 | - add_action( 'admin_head', array( $this, 'styles_and_scripts' ) ); | |
| 74 | + if ( $ie_version < 8 ) { | |
| 75 | + return $supported = false; | |
| 76 | + } | |
| 77 | + | |
| 78 | + return $supported = true; | |
| 101 | 79 | } |
| 102 | 80 | |
| 103 | - /** | |
| 104 | - * Enqueues and registers styles/scripts for notifications. | |
| 105 | - * | |
| 106 | - * @return void | |
| 107 | - */ | |
| 108 | - public function styles_and_scripts() { | |
| 109 | - if ( self::is_block_editor() ) { | |
| 81 | + function action_init() { | |
| 82 | + //syncing must wait until after init so | |
| 83 | + //post types that support comments | |
| 84 | + $filt_post_types = array(); | |
| 85 | + $all_post_types = get_post_types(); | |
| 86 | + foreach ( $all_post_types as $post_type ) { | |
| 87 | + if ( post_type_supports( $post_type, 'comments' ) ) { | |
| 88 | + $filt_post_types[] = $post_type; | |
| 89 | + } | |
| 90 | + } | |
| 91 | + | |
| 92 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) | |
| 110 | 93 | return; |
| 111 | - } | |
| 94 | + | |
| 95 | + if ( !has_filter( 'show_admin_bar', '__return_true' ) && !is_user_logged_in() ) | |
| 96 | + return; | |
| 97 | + | |
| 98 | + if ( !self::current_browser_is_supported() ) | |
| 99 | + return; | |
| 100 | + | |
| 101 | + add_action( 'admin_bar_menu', array( &$this, 'admin_bar_menu'), 120 ); | |
| 102 | + add_action( 'wp_head', array( &$this, 'styles_and_scripts'), 120 ); | |
| 103 | + add_action( 'admin_head', array( &$this, 'styles_and_scripts') ); | |
| 104 | + } | |
| 105 | + | |
| 106 | + function styles_and_scripts() { | |
| 112 | 107 | $is_rtl = is_rtl(); |
| 113 | 108 | |
| 114 | - if ( ( new Host() )->is_woa_site() ) { | |
| 109 | + if ( Jetpack::is_module_active( 'masterbar' ) ) { | |
| 115 | 110 | /** |
| 116 | 111 | * Can be used to force Notifications to display in RTL style. |
| 117 | 112 | * |
| 118 | 113 | * @module notes |
| @@ -124,60 +119,40 @@ | ||
| 124 | 119 | $is_rtl = apply_filters( 'a8c_wpcom_masterbar_enqueue_rtl_notification_styles', false ); |
| 125 | 120 | } |
| 126 | 121 | |
| 127 | 122 | if ( ! $is_rtl ) { |
| 128 | - wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.css' ), array( 'admin-bar' ), JETPACK_NOTES__CACHE_BUSTER ); | |
| 123 | + wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.css' ), array(), JETPACK_NOTES__CACHE_BUSTER ); | |
| 129 | 124 | } else { |
| 130 | - wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/rtl/admin-bar-v2-rtl.css' ), array( 'admin-bar' ), JETPACK_NOTES__CACHE_BUSTER ); | |
| 125 | + wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/rtl/admin-bar-v2-rtl.css' ), array(), JETPACK_NOTES__CACHE_BUSTER ); | |
| 131 | 126 | } |
| 127 | + wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array(), JETPACK_NOTES__CACHE_BUSTER ); | |
| 132 | 128 | |
| 133 | - wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array( 'wpcom-notes-admin-bar' ), JETPACK_NOTES__CACHE_BUSTER ); | |
| 134 | - | |
| 135 | 129 | $this->print_js(); |
| 136 | 130 | |
| 137 | - $script_handles = array(); | |
| 138 | - wp_register_script( 'wpcom-notes-common', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/notes-common-lite.min.js' ), array(), JETPACK_NOTES__CACHE_BUSTER, true ); | |
| 139 | - $script_handles[] = 'wpcom-notes-common'; | |
| 140 | - wp_enqueue_script( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.js' ), array( 'wpcom-notes-common' ), JETPACK_NOTES__CACHE_BUSTER, true ); | |
| 141 | - $script_handles[] = 'wpcom-notes-admin-bar'; | |
| 131 | + // attempt to use core or plugin libraries if registered | |
| 132 | + if ( !wp_script_is( 'mustache', 'registered' ) ) { | |
| 133 | + wp_register_script( 'mustache', $this->wpcom_static_url( '/wp-content/js/mustache.js' ), null, JETPACK_NOTES__CACHE_BUSTER ); | |
| 134 | + } | |
| 135 | + if ( !wp_script_is( 'underscore', 'registered' ) ) { | |
| 136 | + wp_register_script( 'underscore', $this->wpcom_static_url( '/wp-includes/js/underscore.min.js' ), null, JETPACK_NOTES__CACHE_BUSTER ); | |
| 137 | + } | |
| 138 | + if ( !wp_script_is( 'backbone', 'registered' ) ) { | |
| 139 | + wp_register_script( 'backbone', $this->wpcom_static_url( '/wp-includes/js/backbone.min.js' ), array( 'underscore' ), JETPACK_NOTES__CACHE_BUSTER ); | |
| 140 | + } | |
| 142 | 141 | |
| 143 | - $wp_notes_args = 'var wpNotesArgs = ' . wp_json_encode( array( 'cacheBuster' => JETPACK_NOTES__CACHE_BUSTER ) ) . ';'; | |
| 144 | - wp_add_inline_script( 'wpcom-notes-admin-bar', $wp_notes_args, 'before' ); | |
| 145 | - | |
| 146 | - if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) { | |
| 147 | - add_filter( | |
| 148 | - 'script_loader_tag', | |
| 149 | - function ( $tag, $handle ) use ( $script_handles ) { | |
| 150 | - if ( in_array( $handle, $script_handles, true ) ) { | |
| 151 | - $tag = preg_replace( '/(?<=<script)(?=\s|>)/i', ' data-ampdevmode', $tag ); | |
| 152 | - } | |
| 153 | - return $tag; | |
| 154 | - }, | |
| 155 | - 10, | |
| 156 | - 2 | |
| 157 | - ); | |
| 158 | - } | |
| 142 | + wp_register_script( 'wpcom-notes-common', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/notes-common-v2.js' ), array( 'jquery', 'underscore', 'backbone', 'mustache' ), JETPACK_NOTES__CACHE_BUSTER ); | |
| 143 | + wp_enqueue_script( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.js' ), array( 'wpcom-notes-common' ), JETPACK_NOTES__CACHE_BUSTER ); | |
| 159 | 144 | } |
| 160 | 145 | |
| 161 | - /** | |
| 162 | - * Adds notifications bubble to the admin bar. | |
| 163 | - * | |
| 164 | - * @return void | |
| 165 | - */ | |
| 166 | - public function admin_bar_menu() { | |
| 167 | - global $wp_admin_bar; | |
| 146 | + function admin_bar_menu() { | |
| 147 | + global $wp_admin_bar, $current_blog; | |
| 168 | 148 | |
| 169 | - if ( ! is_object( $wp_admin_bar ) ) { | |
| 149 | + if ( !is_object( $wp_admin_bar ) ) | |
| 170 | 150 | return; |
| 171 | - } | |
| 172 | 151 | |
| 173 | - if ( self::is_block_editor() ) { | |
| 174 | - return; | |
| 175 | - } | |
| 152 | + $wpcom_locale = get_locale(); | |
| 176 | 153 | |
| 177 | - $user_locale = get_user_locale(); | |
| 178 | - | |
| 179 | - if ( ! class_exists( 'GP_Locales' ) ) { | |
| 154 | + if ( !class_exists( 'GP_Locales' ) ) { | |
| 180 | 155 | if ( defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) && file_exists( JETPACK__GLOTPRESS_LOCALES_PATH ) ) { |
| 181 | 156 | require JETPACK__GLOTPRESS_LOCALES_PATH; |
| 182 | 157 | } |
| 183 | 158 | } |
| @@ -182,73 +157,42 @@ | ||
| 182 | 157 | } |
| 183 | 158 | } |
| 184 | 159 | |
| 185 | 160 | if ( class_exists( 'GP_Locales' ) ) { |
| 186 | - $jetpack_locale_object = GP_Locales::by_field( 'slug', $user_locale ); | |
| 187 | - if ( $jetpack_locale_object instanceof GP_Locale ) { | |
| 188 | - $user_locale = $jetpack_locale_object->slug; | |
| 161 | + $wpcom_locale_object = GP_Locales::by_field( 'wp_locale', $wpcom_locale ); | |
| 162 | + if ( $wpcom_locale_object instanceof GP_Locale ) { | |
| 163 | + $wpcom_locale = $wpcom_locale_object->slug; | |
| 189 | 164 | } |
| 190 | 165 | } |
| 191 | 166 | |
| 192 | - $third_party_cookie_check_iframe = '<span style="display:none;"><iframe class="jetpack-notes-cookie-check" src="https://widgets.wp.com/3rd-party-cookie-check/index.html"></iframe></span>'; | |
| 193 | - | |
| 194 | - $title = self::get_notes_markup(); | |
| 195 | - $wp_admin_bar->add_menu( | |
| 196 | - array( | |
| 197 | - 'id' => 'notes', | |
| 198 | - 'title' => $title, | |
| 199 | - 'meta' => array( | |
| 200 | - 'html' => '<div id="wpnt-notes-panel2" class="intrinsic-ignore" style="display:none" lang="' . esc_attr( strtolower( substr( $user_locale, 0, 2 ) ) ) . '" dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __( 'Notifications', 'jetpack' ) . '</span><span class="wpnt-notes-panel-link"></span></div></div>' . $third_party_cookie_check_iframe, | |
| 201 | - 'class' => 'menupop', | |
| 202 | - ), | |
| 203 | - 'parent' => 'top-secondary', | |
| 204 | - 'href' => 'https://wordpress.com/notifications', | |
| 205 | - ) | |
| 206 | - ); | |
| 167 | + $classes = 'wpnt-loading wpn-read'; | |
| 168 | + $wp_admin_bar->add_menu( array( | |
| 169 | + 'id' => 'notes', | |
| 170 | + 'title' => '<span id="wpnt-notes-unread-count" class="' . esc_attr( $classes ) . '"> | |
| 171 | + <span class="noticon noticon-notification"></span> | |
| 172 | + </span>', | |
| 173 | + 'meta' => array( | |
| 174 | + 'html' => '<div id="wpnt-notes-panel2" style="display:none" lang="'. esc_attr( $wpcom_locale ) . '" dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __( 'Notifications', 'jetpack' ) . '</span><span class="wpnt-notes-panel-link"></span></div></div>', | |
| 175 | + 'class' => 'menupop', | |
| 176 | + ), | |
| 177 | + 'parent' => 'top-secondary', | |
| 178 | + ) ); | |
| 207 | 179 | } |
| 208 | 180 | |
| 209 | - /** | |
| 210 | - * Returns the HTML markup for used by notification in top bar | |
| 211 | - * | |
| 212 | - * @return string | |
| 213 | - */ | |
| 214 | - private static function get_notes_markup() { | |
| 215 | - return '<span id="wpnt-notes-unread-count" class="wpnt-loading wpn-read"></span> | |
| 216 | -<span class="noticon noticon-bell ab-icon"></span> | |
| 217 | -<span class="screen-reader-text">' . esc_html__( 'Notifications', 'jetpack' ) . '</span>'; | |
| 218 | - } | |
| 219 | - | |
| 220 | - /** | |
| 221 | - * Echos the Notes JS. | |
| 222 | - * | |
| 223 | - * @return void | |
| 224 | - */ | |
| 225 | - public function print_js() { | |
| 226 | - $link_accounts_url = is_user_logged_in() && ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected() ? Jetpack::admin_url() : false; | |
| 227 | - ?> | |
| 228 | -<script data-ampdevmode type="text/javascript"> | |
| 181 | + function print_js() { | |
| 182 | + $link_accounts_url = is_user_logged_in() && !Jetpack::is_user_connected() ? Jetpack::admin_url() : false; | |
| 183 | +?> | |
| 184 | +<script type="text/javascript"> | |
| 229 | 185 | /* <![CDATA[ */ |
| 230 | 186 | var wpNotesIsJetpackClient = true; |
| 231 | 187 | var wpNotesIsJetpackClientV2 = true; |
| 232 | - <?php if ( $link_accounts_url ) : ?> | |
| 233 | - var wpNotesLinkAccountsURL = '<?php echo esc_url( $link_accounts_url ); ?>'; | |
| 188 | +<?php if ( $link_accounts_url ) : ?> | |
| 189 | + var wpNotesLinkAccountsURL = '<?php print $link_accounts_url; ?>'; | |
| 234 | 190 | <?php endif; ?> |
| 235 | 191 | /* ]]> */ |
| 236 | 192 | </script> |
| 237 | - <?php | |
| 193 | +<?php | |
| 238 | 194 | } |
| 239 | 195 | |
| 240 | - /** | |
| 241 | - * Checks to see if we're in the block editor. | |
| 242 | - */ | |
| 243 | - public static function is_block_editor() { | |
| 244 | - if ( function_exists( 'get_current_screen' ) ) { | |
| 245 | - $current_screen = get_current_screen(); | |
| 246 | - if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) { | |
| 247 | - return true; | |
| 248 | - } | |
| 249 | - } | |
| 250 | - return false; | |
| 251 | - } | |
| 252 | 196 | } |
| 253 | 197 | |
| 254 | 198 | Jetpack_Notifications::init(); |
