← All changes | modules/stats.php +983 -881 12.4.2 → 6.4 View file →

		@@ -1,7 +1,7 @@
1	1	<?php
2	2	/**
3		- * Module Name: Jetpack Stats
	3	+ * Module Name: Site Stats
4	4	* Module Description: Collect valuable traffic stats and insights.
5	5	* Sort Order: 1
6	6	* Recommendation Order: 2
7	7	* First Introduced: 1.1
		@@ -6,42 +6,22 @@
6	6	* Recommendation Order: 2
7	7	* First Introduced: 1.1
8	8	* Requires Connection: Yes
9	9	* Auto Activate: Yes
10		- * Module Tags: Jetpack Stats, Site Stats, Recommended
	10	+ * Module Tags: Site Stats, Recommended
11	11	* Feature: Engagement
12	12	* Additional Search Queries: statistics, tracking, analytics, views, traffic, stats
13	13	*
14		- * @package automattic/jetpack
	14	+ * @package Jetpack
15	15	*/
16	16
17		-use Automattic\Jetpack\Connection\Client;
18		-use Automattic\Jetpack\Connection\Manager as Connection_Manager;
19		-use Automattic\Jetpack\Connection\XMLRPC_Async_Call;
20		-use Automattic\Jetpack\Redirect;
21		-use Automattic\Jetpack\Stats\Main as Stats;
22		-use Automattic\Jetpack\Stats\Options as Stats_Options;
23		-use Automattic\Jetpack\Stats\Tracking_Pixel as Stats_Tracking_Pixel;
24		-use Automattic\Jetpack\Stats\XMLRPC_Provider as Stats_XMLRPC;
25		-use Automattic\Jetpack\Stats_Admin\Dashboard as Stats_Dashboard;
26		-use Automattic\Jetpack\Stats_Admin\Main as Stats_Main;
27		-use Automattic\Jetpack\Stats_Admin\Notices as Stats_Notices;
28		-use Automattic\Jetpack\Status\Host;
29		-use Automattic\Jetpack\Tracking;
30		-
31		-if ( defined( 'STATS_DASHBOARD_SERVER' ) ) {
	17	+if ( defined( 'STATS_VERSION' ) ) {
32	18	return;
33	19	}
34	20
35		-define( 'STATS_DASHBOARD_SERVER', 'dashboard.wordpress.com' );
	21	+define( 'STATS_VERSION', '9' );
	22	+defined( 'STATS_DASHBOARD_SERVER' ) or define( 'STATS_DASHBOARD_SERVER', 'dashboard.wordpress.com' );
36	23
37		-/**
38		- * Stats content markers.
39		- * Used to test for content vs script when parsing server-generated HTML.
40		- */
41		-const STATS_BODY_MARKER = '<div id="statchart"';
42		-const STATS_CONTENT_MARKER = '<div class="gotonewdash">';
43		-
44	24	add_action( 'jetpack_modules_loaded', 'stats_load' );
45	25
46	26	/**
47	27	* Load Stats.
		@@ -50,37 +30,92 @@
50	30	* @return void
51	31	*/
52	32	function stats_load() {
53	33	Jetpack::enable_module_configurable( __FILE__ );
	34	+ Jetpack::module_configuration_load( __FILE__, 'stats_configuration_load' );
	35	+ Jetpack::module_configuration_head( __FILE__, 'stats_configuration_head' );
	36	+ Jetpack::module_configuration_screen( __FILE__, 'stats_configuration_screen' );
54	37
	38	+ // Generate the tracking code after wp() has queried for posts.
	39	+ add_action( 'template_redirect', 'stats_template_redirect', 1 );
	40	+
55	41	add_action( 'wp_head', 'stats_admin_bar_head', 100 );
56	42
	43	+ add_action( 'wp_head', 'stats_hide_smile_css' );
	44	+
57	45	add_action( 'jetpack_admin_menu', 'stats_admin_menu' );
58	46
	47	+ // Map stats caps.
	48	+ add_filter( 'map_meta_cap', 'stats_map_meta_caps', 10, 3 );
	49	+
	50	+ if ( isset( $_GET['oldwidget'] ) ) {
	51	+ // Old one.
	52	+ add_action( 'wp_dashboard_setup', 'stats_register_dashboard_widget' );
	53	+ } else {
	54	+ add_action( 'admin_init', 'stats_merged_widget_admin_init' );
	55	+ }
	56	+
	57	+ add_filter( 'jetpack_xmlrpc_methods', 'stats_xmlrpc_methods' );
	58	+
59	59	add_filter( 'pre_option_db_version', 'stats_ignore_db_version' );
60	60
61		- // Add an icon to see stats in WordPress.com for a particular post.
	61	+ // Add an icon to see stats in WordPress.com for a particular post
62	62	add_action( 'admin_print_styles-edit.php', 'jetpack_stats_load_admin_css' );
63	63	add_filter( 'manage_posts_columns', 'jetpack_stats_post_table' );
64	64	add_filter( 'manage_pages_columns', 'jetpack_stats_post_table' );
65	65	add_action( 'manage_posts_custom_column', 'jetpack_stats_post_table_cell', 10, 2 );
66	66	add_action( 'manage_pages_custom_column', 'jetpack_stats_post_table_cell', 10, 2 );
67		- // Filter for adding the Jetpack plugin version to tracking stats.
68		- add_filter( 'stats_array', 'filter_stats_array_add_jp_version' );
	67	+}
69	68
70		- require_once __DIR__ . '/stats/class-jetpack-stats-upgrade-nudges.php';
71		- add_action( 'updating_jetpack_version', array( 'Jetpack_Stats_Upgrade_Nudges', 'unset_nudges_setting' ) );
	69	+/**
	70	+ * Delay conditional for current_user_can to after init.
	71	+ *
	72	+ * @access public
	73	+ * @return void
	74	+ */
	75	+function stats_merged_widget_admin_init() {
	76	+ if ( current_user_can( 'view_stats' ) ) {
	77	+ add_action( 'load-index.php', 'stats_enqueue_dashboard_head' );
	78	+ add_action( 'wp_dashboard_setup', 'stats_register_widget_control_callback' ); // Hacky but works.
	79	+ add_action( 'jetpack_dashboard_widget', 'stats_jetpack_dashboard_widget' );
	80	+ }
72	81	}
73	82
74	83	/**
	84	+ * Enqueue Stats Dashboard
	85	+ *
	86	+ * @access public
	87	+ * @return void
	88	+ */
	89	+function stats_enqueue_dashboard_head() {
	90	+ add_action( 'admin_head', 'stats_dashboard_head' );
	91	+}
	92	+
	93	+/**
75	94	* Checks if filter is set and dnt is enabled.
76	95	*
77		- * @deprecated 11.5
78	96	* @return bool
79	97	*/
80	98	function jetpack_is_dnt_enabled() {
81		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Main::jetpack_is_dnt_enabled' );
82		- return Stats::jetpack_is_dnt_enabled();
	99	+ /**
	100	+ * Filter the option which decides honor DNT or not.
	101	+ *
	102	+ * @module stats
	103	+ * @since 6.1.0
	104	+ *
	105	+ * @param bool false Honors DNT for clients who don't want to be tracked. Defaults to false. Set to true to enable.
	106	+ */
	107	+ if ( false === apply_filters( 'jetpack_honor_dnt_header_for_stats', false ) ) {
	108	+ return false;
	109	+ }
	110	+
	111	+ foreach ( $_SERVER as $name => $value ) {
	112	+ if ( 'http_dnt' == strtolower( $name ) && 1 == $value ) {
	113	+ return true;
	114	+ }
	115	+ }
	116	+
	117	+ return false;
83	118	}
84	119
85	120	/**
86	121	* Prevent sparkline img requests being redirected to upgrade.php.
		@@ -92,10 +127,10 @@
92	127	*/
93	128	function stats_ignore_db_version( $version ) {
94	129	if (
95	130	is_admin() &&
96		- isset( $_GET['page'] ) && 'stats' === $_GET['page'] && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
97		- isset( $_GET['chart'] ) && strpos( $_GET['chart'], 'admin-bar-hours' ) === 0 // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput
	131	+ isset( $_GET['page'] ) && 'stats' === $_GET['page'] &&
	132	+ isset( $_GET['chart'] ) && strpos($_GET['chart'], 'admin-bar-hours') === 0
98	133	) {
99	134	global $wp_db_version;
100	135	return $wp_db_version;
101	136	}
		@@ -104,10 +139,8 @@
104	139
105	140	/**
106	141	* Maps view_stats cap to read cap as needed.
107	142	*
108		- * @deprecated 11.5
109		- *
110	143	* @access public
111	144	* @param mixed $caps Caps.
112	145	* @param mixed $cap Cap.
113	146	* @param mixed $user_id User ID.
		@@ -113,68 +146,185 @@
113	146	* @param mixed $user_id User ID.
114	147	* @return array Possibly mapped capabilities for meta capability.
115	148	*/
116	149	function stats_map_meta_caps( $caps, $cap, $user_id ) {
117		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Main::map_meta_caps' );
118		- return Stats::map_meta_caps( $caps, $cap, $user_id );
	150	+ // Map view_stats to exists.
	151	+ if ( 'view_stats' === $cap ) {
	152	+ $user = new WP_User( $user_id );
	153	+ $user_role = array_shift( $user->roles );
	154	+ $stats_roles = stats_get_option( 'roles' );
	155	+
	156	+ // Is the users role in the available stats roles?
	157	+ if ( is_array( $stats_roles ) && in_array( $user_role, $stats_roles ) ) {
	158	+ $caps = array( 'read' );
	159	+ }
	160	+ }
	161	+
	162	+ return $caps;
119	163	}
120	164
121	165	/**
122	166	* Stats Template Redirect.
123	167	*
124		- * @deprecated 11.5
125	168	* @access public
126	169	* @return void
127	170	*/
128	171	function stats_template_redirect() {
129		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Main::template_redirect' );
130		- Stats::template_redirect();
	172	+ global $current_user, $rendered_stats_footer;
	173	+
	174	+ if ( is_feed() || is_robots() || is_trackback() || is_preview() || jetpack_is_dnt_enabled() ) {
	175	+ return;
	176	+ }
	177	+
	178	+ // Should we be counting this user's views?
	179	+ if ( ! empty( $current_user->ID ) ) {
	180	+ $count_roles = stats_get_option( 'count_roles' );
	181	+ if ( ! is_array( $count_roles ) || ! array_intersect( $current_user->roles, $count_roles ) ) {
	182	+ return;
	183	+ }
	184	+ }
	185	+
	186	+ add_action( 'wp_footer', 'stats_footer', 101 );
	187	+ add_action( 'wp_head', 'stats_add_shutdown_action' );
	188	+
	189	+ $rendered_stats_footer = false;
131	190	}
132	191
	192	+
133	193	/**
134	194	* Stats Build View Data.
135	195	*
136		- * @deprecated 11.5
137	196	* @access public
138	197	* @return array.
139	198	*/
140	199	function stats_build_view_data() {
141		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Tracking_Pixel::build_view_data' );
142		- return Stats_Tracking_Pixel::build_view_data();
	200	+ global $wp_the_query;
	201	+
	202	+ $blog = Jetpack_Options::get_option( 'id' );
	203	+ $tz = get_option( 'gmt_offset' );
	204	+ $v = 'ext';
	205	+ $blog_url = parse_url( site_url() );
	206	+ $srv = $blog_url['host'];
	207	+ $j = sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION );
	208	+ if ( $wp_the_query->is_single || $wp_the_query->is_page || $wp_the_query->is_posts_page ) {
	209	+ // Store and reset the queried_object and queried_object_id
	210	+ // Otherwise, redirect_canonical() will redirect to home_url( '/' ) for show_on_front = page sites where home_url() is not all lowercase.
	211	+ // Repro:
	212	+ // 1. Set home_url = https://ExamPle.com/
	213	+ // 2. Set show_on_front = page
	214	+ // 3. Set page_on_front = something
	215	+ // 4. Visit https://example.com/ !
	216	+ $queried_object = ( isset( $wp_the_query->queried_object ) ) ? $wp_the_query->queried_object : null;
	217	+ $queried_object_id = ( isset( $wp_the_query->queried_object_id ) ) ? $wp_the_query->queried_object_id : null;
	218	+ $post = $wp_the_query->get_queried_object_id();
	219	+ $wp_the_query->queried_object = $queried_object;
	220	+ $wp_the_query->queried_object_id = $queried_object_id;
	221	+ } else {
	222	+ $post = '0';
	223	+ }
	224	+
	225	+ return compact( 'v', 'j', 'blog', 'post', 'tz', 'srv' );
143	226	}
144	227
145	228	/**
	229	+ * Stats Add Shutdown Action.
	230	+ *
	231	+ * @access public
	232	+ * @return void
	233	+ */
	234	+function stats_add_shutdown_action() {
	235	+ // Just in case wp_footer isn't in your theme.
	236	+ add_action( 'shutdown', 'stats_footer', 101 );
	237	+}
	238	+
	239	+/**
	240	+ * Stats Footer.
	241	+ *
	242	+ * @access public
	243	+ * @return void
	244	+ */
	245	+function stats_footer() {
	246	+ global $rendered_stats_footer;
	247	+
	248	+ if ( ! $rendered_stats_footer ) {
	249	+ $data = stats_build_view_data();
	250	+ if ( Jetpack_AMP_Support::is_amp_request() ) {
	251	+ stats_render_amp_footer( $data );
	252	+ } else {
	253	+ stats_render_footer( $data );
	254	+ }
	255	+ $rendered_stats_footer = true;
	256	+ }
	257	+}
	258	+
	259	+function stats_render_footer( $data ) {
	260	+ $script = 'https://stats.wp.com/e-' . gmdate( 'YW' ) . '.js';
	261	+ $data_stats_array = stats_array( $data );
	262	+
	263	+ $stats_footer = <<<END
	264	+<script type='text/javascript' src='{$script}' async='async' defer='defer'></script>
	265	+<script type='text/javascript'>
	266	+ _stq = window._stq || [];
	267	+ _stq.push([ 'view', {{$data_stats_array}} ]);
	268	+ _stq.push([ 'clickTrackerInit', '{$data['blog']}', '{$data['post']}' ]);
	269	+</script>
	270	+
	271	+END;
	272	+ print $stats_footer;
	273	+}
	274	+
	275	+function stats_render_amp_footer( $data ) {
	276	+ $data['host'] = isset( $_SERVER['HTTP_HOST'] ) ? sanitize_text_field( wp_unslash( $_SERVER['HTTP_HOST'] ) ) : ''; // input var ok.
	277	+ $data['rand'] = 'RANDOM'; // AMP placeholder.
	278	+ $data['ref'] = 'DOCUMENT_REFERRER'; // AMP placeholder.
	279	+ $data = array_map( 'rawurlencode', $data );
	280	+ $pixel_url = add_query_arg( $data, 'https://pixel.wp.com/g.gif' );
	281	+
	282	+ ?>
	283	+ <amp-pixel src="<?php echo esc_url( $pixel_url ); ?>"></amp-pixel>
	284	+ <?php
	285	+}
	286	+
	287	+/**
146	288	* Stats Get Options.
147	289	*
148		- * @deprecated 11.5
149		- *
150	290	* @access public
151	291	* @return array.
152	292	*/
153	293	function stats_get_options() {
154		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Options::get_options' );
155		- return Stats_Options::get_options();
	294	+ $options = get_option( 'stats_options' );
	295	+
	296	+ if ( ! isset( $options['version'] ) || $options['version'] < STATS_VERSION ) {
	297	+ $options = stats_upgrade_options( $options );
	298	+ }
	299	+
	300	+ return $options;
156	301	}
157	302
158	303	/**
159	304	* Get Stats Options.
160	305	*
161		- * @deprecated 11.5
162		- *
163	306	* @access public
164	307	* @param mixed $option Option.
165	308	* @return mixed|null.
166	309	*/
167	310	function stats_get_option( $option ) {
168		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Options::get_option' );
169		- return Stats_Options::get_option( $option );
	311	+ $options = stats_get_options();
	312	+
	313	+ if ( 'blog_id' === $option ) {
	314	+ return Jetpack_Options::get_option( 'id' );
	315	+ }
	316	+
	317	+ if ( isset( $options[ $option ] ) ) {
	318	+ return $options[ $option ];
	319	+ }
	320	+
	321	+ return null;
170	322	}
171	323
172	324	/**
173	325	* Stats Set Options.
174	326	*
175		- * @deprecated 11.5
176		- *
177	327	* @access public
178	328	* @param mixed $option Option.
179	329	* @param mixed $value Value.
180	330	* @return bool.
		@@ -179,41 +329,95 @@
179	329	* @param mixed $value Value.
180	330	* @return bool.
181	331	*/
182	332	function stats_set_option( $option, $value ) {
183		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Options::set_option' );
184		- return Stats_Options::set_option( $option, $value );
	333	+ $options = stats_get_options();
	334	+
	335	+ $options[ $option ] = $value;
	336	+
	337	+ return stats_set_options( $options );
185	338	}
186	339
187	340	/**
188	341	* Stats Set Options.
189	342	*
190		- * @deprecated 11.5
191		- *
192	343	* @access public
193	344	* @param mixed $options Options.
194	345	* @return bool
195	346	*/
196	347	function stats_set_options( $options ) {
197		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Options::set_options' );
198		- return Stats_Options::set_options( $options );
	348	+ return update_option( 'stats_options', $options );
199	349	}
200	350
201	351	/**
202	352	* Stats Upgrade Options.
203	353	*
204		- * @deprecated 11.5
205		- *
206	354	* @access public
207	355	* @param mixed $options Options.
208	356	* @return array|bool
209	357	*/
210	358	function stats_upgrade_options( $options ) {
211		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Automattic\Jetpack\Stats\Options::upgrade_options' );
212		- return Stats_Options::upgrade_options( $options );
	359	+ $defaults = array(
	360	+ 'admin_bar' => true,
	361	+ 'roles' => array( 'administrator' ),
	362	+ 'count_roles' => array(),
	363	+ 'blog_id' => Jetpack_Options::get_option( 'id' ),
	364	+ 'do_not_track' => true, // @todo
	365	+ 'hide_smile' => true,
	366	+ );
	367	+
	368	+ if ( isset( $options['reg_users'] ) ) {
	369	+ if ( ! function_exists( 'get_editable_roles' ) ) {
	370	+ require_once ABSPATH . 'wp-admin/includes/user.php';
	371	+ }
	372	+ if ( $options['reg_users'] ) {
	373	+ $options['count_roles'] = array_keys( get_editable_roles() );
	374	+ }
	375	+ unset( $options['reg_users'] );
	376	+ }
	377	+
	378	+ if ( is_array( $options ) && ! empty( $options ) ) {
	379	+ $new_options = array_merge( $defaults, $options );
	380	+ } else { $new_options = $defaults;
	381	+ }
	382	+
	383	+ $new_options['version'] = STATS_VERSION;
	384	+
	385	+ if ( ! stats_set_options( $new_options ) ) {
	386	+ return false;
	387	+ }
	388	+
	389	+ stats_update_blog();
	390	+
	391	+ return $new_options;
213	392	}
214	393
215	394	/**
	395	+ * Stats Array.
	396	+ *
	397	+ * @access public
	398	+ * @param mixed $kvs KVS.
	399	+ * @return array
	400	+ */
	401	+function stats_array( $kvs ) {
	402	+ /**
	403	+ * Filter the options added to the JavaScript Stats tracking code.
	404	+ *
	405	+ * @module stats
	406	+ *
	407	+ * @since 1.1.0
	408	+ *
	409	+ * @param array $kvs Array of options about the site and page you're on.
	410	+ */
	411	+ $kvs = apply_filters( 'stats_array', $kvs );
	412	+ $kvs = array_map( 'addslashes', $kvs );
	413	+ foreach ( $kvs as $k => $v ) {
	414	+ $jskvs[] = "$k:'$v'";
	415	+ }
	416	+ return join( ',', $jskvs );
	417	+}
	418	+
	419	+/**
216	420	* Admin Pages.
217	421	*
218	422	* @access public
219	423	* @return void
		@@ -222,10 +426,10 @@
222	426	global $pagenow;
223	427
224	428	// If we're at an old Stats URL, redirect to the new one.
225	429	// Don't even bother with caps, menu_page_url(), etc. Just do it.
226		- if ( 'index.php' === $pagenow && isset( $_GET['page'] ) && 'stats' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
227		- $redirect_url = str_replace( array( '/wp-admin/index.php?', '/wp-admin/?' ), '/wp-admin/admin.php?', isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : null );
	430	+ if ( 'index.php' === $pagenow && isset( $_GET['page'] ) && 'stats' === $_GET['page'] ) {
	431	+ $redirect_url = str_replace( array( '/wp-admin/index.php?', '/wp-admin/?' ), '/wp-admin/admin.php?', $_SERVER['REQUEST_URI'] );
228	432	$relative_pos = strpos( $redirect_url, '/wp-admin/' );
229	433	if ( false !== $relative_pos ) {
230	434	wp_safe_redirect( admin_url( substr( $redirect_url, $relative_pos + 10 ) ) );
231	435	exit;
		@@ -231,29 +435,10 @@
231	435	exit;
232	436	}
233	437	}
234	438
235		- // phpcs:ignore WordPress.Security.NonceVerification.Recommended
236		- if ( ! ( new Host() )->is_woa_site() && isset( $_GET['enable_new_stats'] ) && '1' === $_GET['enable_new_stats'] ) {
237		- // Passing true enables Odyssey Stats.
238		- // We're ignorning the return value for now.
239		- Stats_Main::update_new_stats_status( true );
240		- }
241		-
242		- // phpcs:ignore WordPress.Security.NonceVerification.Recommended
243		- if ( ( new Host() )->is_woa_site() || ! Stats_Options::get_option( 'enable_odyssey_stats' ) || isset( $_GET['noheader'] ) ) {
244		- // Show old Jetpack Stats interface for:
245		- // - Atomic sites.
246		- // - When the "enable_odyssey_stats" option is disabled.
247		- // - When being shown in the adminbar outside of wp-admin.
248		- $hook = add_submenu_page( 'jetpack', __( 'Stats', 'jetpack' ), __( 'Stats', 'jetpack' ), 'view_stats', 'stats', 'jetpack_admin_ui_stats_report_page_wrapper' );
249		- add_action( "load-$hook", 'stats_reports_load' );
250		- } else {
251		- // Enable the new Odyssey Stats experience.
252		- $stats_dashboard = new Stats_Dashboard();
253		- $hook = add_submenu_page( 'jetpack', __( 'Stats', 'jetpack' ), __( 'Stats', 'jetpack' ), 'view_stats', 'stats', array( $stats_dashboard, 'render' ) );
254		- add_action( "load-$hook", array( $stats_dashboard, 'admin_init' ) );
255		- }
	439	+ $hook = add_submenu_page( 'jetpack', __( 'Site Stats', 'jetpack' ), __( 'Site Stats', 'jetpack' ), 'view_stats', 'stats', 'stats_reports_page' );
	440	+ add_action( "load-$hook", 'stats_reports_load' );
256	441	}
257	442
258	443	/**
259	444	* Stats Admin Path.
		@@ -271,68 +456,34 @@
271	456	* @access public
272	457	* @return void
273	458	*/
274	459	function stats_reports_load() {
275		- require_once __DIR__ . '/stats/class-jetpack-stats-upgrade-nudges.php';
276		- Jetpack_Stats_Upgrade_Nudges::init();
277		-
278	460	wp_enqueue_script( 'jquery' );
279	461	wp_enqueue_script( 'postbox' );
280	462	wp_enqueue_script( 'underscore' );
281	463
282		- Jetpack_Admin_Page::load_wrapper_styles();
	464	+ $rtl = is_rtl() ? '.rtl' : '';
	465	+ wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
	466	+ wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
	467	+
283	468	add_action( 'admin_print_styles', 'stats_reports_css' );
284	469
285		- if ( ! empty( $_GET['nojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
286		- $parsed = wp_parse_url( admin_url() );
	470	+ if ( isset( $_GET['nojs'] ) && $_GET['nojs'] ) {
	471	+ $parsed = parse_url( admin_url() );
287	472	// Remember user doesn't want JS.
288		- setcookie( 'stnojs', '1', time() + 172800, $parsed['path'], COOKIE_DOMAIN, is_ssl(), true ); // 2 days.
	473	+ setcookie( 'stnojs', '1', time() + 172800, $parsed['path'] ); // 2 days.
289	474	}
290	475
291		- if ( ! empty( $_COOKIE['stnojs'] ) ) {
	476	+ if ( isset( $_COOKIE['stnojs'] ) && $_COOKIE['stnojs'] ) {
292	477	// Detect if JS is on. If so, remove cookie so next page load is via JS.
293	478	add_action( 'admin_print_footer_scripts', 'stats_js_remove_stnojs_cookie' );
294		- } elseif ( ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	479	+ } else if ( ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) ) {
295	480	// Normal page load. Load page content via JS.
296	481	add_action( 'admin_print_footer_scripts', 'stats_js_load_page_via_ajax' );
297		- add_action( 'admin_print_footer_scripts', 'stats_script_dismiss_nudge_handler' );
298	482	}
299	483	}
300	484
301	485	/**
302		- * JavaScript to dismiss the Odyssey nudge.
303		- *
304		- * @access public
305		- * @return void
306		- */
307		-function stats_script_dismiss_nudge_handler() {
308		- ?>
309		- <script type="text/javascript">
310		- function stats_odyssey_dismiss_nudge() {
311		- // Hide the nudge UI, effectively dismissing it.
312		- var element = document.getElementById( "stats-odyssey-nudge-main" );
313		- element.classList.toggle( "is-hidden" );
314		- // Send an AJAX request.
315		- // Note we can provide a 'postponed_for' parameter to set the delay.
316		- // Without a parameter it defaults to 30 days which is what we want here.
317		- let nonce = <?php echo wp_json_encode( wp_create_nonce( 'wp_rest' ) ); ?>;
318		- let url = <?php echo wp_json_encode( rest_url( '/jetpack/v4/stats-app/stats/notices' ) ); ?>;
319		- let data = {
320		- id: 'opt_in_new_stats',
321		- status: 'postponed',
322		- };
323		- jQuery.ajax({
324		- type: "POST",
325		- url: url,
326		- data: data,
327		- headers: { "x-wp-nonce": nonce },
328		- });
329		- }
330		- </script>
331		- <?php
332		-}
333		-
334		-/**
335	486	* Stats Reports CSS.
336	487	*
337	488	* @access public
338	489	* @return void
		@@ -337,11 +488,19 @@
337	488	* @access public
338	489	* @return void
339	490	*/
340	491	function stats_reports_css() {
341		- ?>
	492	+?>
342	493	<style type="text/css">
343		-#jp-stats-wrap, #jp-stats-report-bottom {
	494	+#wpcontent {
	495	+ padding-left: 0 !important;
	496	+}
	497	+
	498	+.jetpack_page_stats {
	499	+ background-color: #f3f6f8;
	500	+}
	501	+
	502	+#jp-stats-wrap {
344	503	max-width: 1040px;
345	504	margin: 0 auto;
346	505	overflow: hidden;
347	506	}
		@@ -348,16 +507,17 @@
348	507
349	508	#stats-loading-wrap p {
350	509	text-align: center;
351	510	font-size: 2em;
352		- margin-bottom: 3em;
	511	+ margin: 7.5em 15px 0 0;
353	512	height: 64px;
354	513	line-height: 64px;
355	514	}
356	515	</style>
357		- <?php
	516	+<?php
358	517	}
359	518
	519	+
360	520	/**
361	521	* Detect if JS is on. If so, remove cookie so next page load is via JS.
362	522	*
363	523	* @access public
		@@ -363,16 +523,16 @@
363	523	* @access public
364	524	* @return void
365	525	*/
366	526	function stats_js_remove_stnojs_cookie() {
367		- $parsed = wp_parse_url( admin_url() );
368		- ?>
	527	+ $parsed = parse_url( admin_url() );
	528	+?>
369	529	<script type="text/javascript">
370	530	/* <![CDATA[ */
371	531	document.cookie = 'stnojs=0; expires=Wed, 9 Mar 2011 16:55:50 UTC; path=<?php echo esc_js( $parsed['path'] ); ?>';
372	532	/* ]]> */
373	533	</script>
374		- <?php
	534	+<?php
375	535	}
376	536
377	537	/**
378	538	* Normal page load. Load page content via JS.
		@@ -380,38 +540,24 @@
380	540	* @access public
381	541	* @return void
382	542	*/
383	543	function stats_js_load_page_via_ajax() {
384		- ?>
	544	+?>
385	545	<script type="text/javascript">
386	546	/* <![CDATA[ */
387	547	if ( -1 == document.location.href.indexOf( 'noheader' ) ) {
388	548	jQuery( function( $ ) {
389		- const loadStatsUrl = new URL( document.location.href );
390		- loadStatsUrl.searchParams.append( 'noheader', 1 );
391		- $.get( loadStatsUrl.toString(), function( responseText ) {
	549	+ $.get( document.location.href + '&noheader', function( responseText ) {
392	550	$( '#stats-loading-wrap' ).replaceWith( responseText );
393		- $( '#jp-stats-wrap' )[0].dispatchEvent( new Event( 'stats-loaded' ) );
394	551	} );
395	552	} );
396	553	}
397	554	/* ]]> */
398	555	</script>
399		- <?php
	556	+<?php
400	557	}
401	558
402	559	/**
403		- * Jetpack Admin Page Wrapper.
404		- */
405		-function jetpack_admin_ui_stats_report_page_wrapper() {
406		- if ( ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) && empty( $_COOKIE['stnojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
407		- Jetpack_Admin_Page::wrap_ui( 'stats_reports_page', array( 'is-wide' => true ) );
408		- } else {
409		- stats_reports_page();
410		- }
411		-}
412		-
413		-/**
414	560	* Stats Report Page.
415	561	*
416	562	* @access public
417	563	* @param bool $main_chart_only (default: false) Main Chart Only.
		@@ -416,36 +562,41 @@
416	562	* @access public
417	563	* @param bool $main_chart_only (default: false) Main Chart Only.
418	564	*/
419	565	function stats_reports_page( $main_chart_only = false ) {
420		- if ( isset( $_GET['dashboard'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	566	+
	567	+ if ( isset( $_GET['dashboard'] ) ) {
421	568	return stats_dashboard_widget_content();
422	569	}
423	570
424		- $blog_id = Stats_Options::get_option( 'blog_id' );
	571	+ $blog_id = stats_get_option( 'blog_id' );
	572	+ $domain = Jetpack::build_raw_urls( get_home_url() );
425	573
426		- if ( ! $main_chart_only && ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) && empty( $_COOKIE['stnojs'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	574	+ $jetpack_admin_url = admin_url() . 'admin.php?page=jetpack';
	575	+
	576	+ if ( ! $main_chart_only && ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) && empty( $_COOKIE['stnojs'] ) ) {
427	577	$nojs_url = add_query_arg( 'nojs', '1' );
428		- $http = is_ssl() ? 'https' : 'http';
	578	+ $http = is_ssl() ? 'https' : 'http';
429	579	// Loading message. No JS fallback message.
430		- ?>
431		-
	580	+?>
	581	+<div id="jp-plugin-container">
	582	+ <div class="jp-masthead">
	583	+ <div class="jp-masthead__inside-container">
	584	+ <div class="jp-masthead__logo-container">
	585	+ <a class="jp-masthead__logo-link" href="<?php echo esc_url( $jetpack_admin_url ); ?>">
	586	+ <svg class="jetpack-logo__masthead" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" height="32" viewBox="0 0 118 32"><path fill="#00BE28" d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z"></path><path d="M41.3,26.6c-0.5-0.7-0.9-1.4-1.3-2.1c2.3-1.4,3-2.5,3-4.6V8h-3V6h6v13.4C46,22.8,45,24.8,41.3,26.6z"></path><path d="M65,18.4c0,1.1,0.8,1.3,1.4,1.3c0.5,0,2-0.2,2.6-0.4v2.1c-0.9,0.3-2.5,0.5-3.7,0.5c-1.5,0-3.2-0.5-3.2-3.1V12H60v-2h2.1V7.1 H65V10h4v2h-4V18.4z"></path><path d="M71,10h3v1.3c1.1-0.8,1.9-1.3,3.3-1.3c2.5,0,4.5,1.8,4.5,5.6s-2.2,6.3-5.8,6.3c-0.9,0-1.3-0.1-2-0.3V28h-3V10z M76.5,12.3 c-0.8,0-1.6,0.4-2.5,1.2v5.9c0.6,0.1,0.9,0.2,1.8,0.2c2,0,3.2-1.3,3.2-3.9C79,13.4,78.1,12.3,76.5,12.3z"></path><path d="M93,22h-3v-1.5c-0.9,0.7-1.9,1.5-3.5,1.5c-1.5,0-3.1-1.1-3.1-3.2c0-2.9,2.5-3.4,4.2-3.7l2.4-0.3v-0.3c0-1.5-0.5-2.3-2-2.3 c-0.7,0-2.3,0.5-3.7,1.1L84,11c1.2-0.4,3-1,4.4-1c2.7,0,4.6,1.4,4.6,4.7L93,22z M90,16.4l-2.2,0.4c-0.7,0.1-1.4,0.5-1.4,1.6 c0,0.9,0.5,1.4,1.3,1.4s1.5-0.5,2.3-1V16.4z"></path><path d="M104.5,21.3c-1.1,0.4-2.2,0.6-3.5,0.6c-4.2,0-5.9-2.4-5.9-5.9c0-3.7,2.3-6,6.1-6c1.4,0,2.3,0.2,3.2,0.5V13 c-0.8-0.3-2-0.6-3.2-0.6c-1.7,0-3.2,0.9-3.2,3.6c0,2.9,1.5,3.8,3.3,3.8c0.9,0,1.9-0.2,3.2-0.7V21.3z"></path><path d="M110,15.2c0.2-0.3,0.2-0.8,3.8-5.2h3.7l-4.6,5.7l5,6.3h-3.7l-4.2-5.8V22h-3V6h3V15.2z"></path><path d="M58.5,21.3c-1.5,0.5-2.7,0.6-4.2,0.6c-3.6,0-5.8-1.8-5.8-6c0-3.1,1.9-5.9,5.5-5.9s4.9,2.5,4.9,4.9c0,0.8,0,1.5-0.1,2h-7.3 c0.1,2.5,1.5,2.8,3.6,2.8c1.1,0,2.2-0.3,3.4-0.7C58.5,19,58.5,21.3,58.5,21.3z M56,15c0-1.4-0.5-2.9-2-2.9c-1.4,0-2.3,1.3-2.4,2.9 C51.6,15,56,15,56,15z"></path></svg>
	587	+ </a>
	588	+ </div>
	589	+ <div class="jp-masthead__nav"><span class="dops-button-group"><a href="<?php echo esc_url( $jetpack_admin_url ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Dashboard', 'jetpack' ); ?></a><a href="<?php echo esc_url( $jetpack_admin_url . '#/settings' ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Settings', 'jetpack' ); ?></a></span></div>
	590	+ </div>
	591	+ </div>
432	592	<div id="jp-stats-wrap">
433		- <div class="wrap">
434		- <h1><?php esc_html_e( 'Jetpack Stats', 'jetpack' ); ?>
435		- <?php
436		- if ( current_user_can( 'jetpack_manage_modules' ) ) :
437		- $i18n_headers = jetpack_get_module_i18n( 'stats' );
438		- ?>
439		- <a
440		- style="font-size:13px;"
441		- href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack#/settings?term=' . rawurlencode( $i18n_headers['name'] ) ) ); ?>"
442		- >
443		- <?php esc_html_e( 'Configure', 'jetpack' ); ?>
444		- </a>
445		- <?php
446		- endif;
447		-
	593	+<div class="wrap">
	594	+ <h2><?php esc_html_e( 'Site Stats', 'jetpack' ); ?> <?php if ( current_user_can( 'jetpack_manage_modules' ) ) : ?><a style="font-size:13px;" href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack&configure=stats' ) ); ?>"><?php esc_html_e( 'Configure', 'jetpack' ); ?></a><?php endif; ?></h2>
	595	+</div>
	596	+<div id="stats-loading-wrap" class="wrap">
	597	+<p class="hide-if-no-js"><img width="32" height="32" alt="<?php esc_attr_e( 'Loading&hellip;', 'jetpack' ); ?>" src="<?php
	598	+ echo esc_url(
448	599	/**
449	600	* Sets external resource URL.
450	601	*
451	602	* @module stats
		@@ -450,37 +601,50 @@
450	601	*
451	602	* @module stats
452	603	*
453	604	* @since 1.4.0
454		- * @todo Clean up various uses of this filter. It's seemingly filtering different types of images in different places.
455	605	*
456	606	* @param string $args URL of external resource.
457	607	*/
458		- $static_url = apply_filters( 'jetpack_static_url', "{$http}://en.wordpress.com/i/loading/loading-64.gif" );
459		- ?>
460		- </h2>
461		- </div>
462		- <div id="stats-loading-wrap" class="wrap">
463		- <p class="hide-if-no-js"><img width="32" height="32" alt="<?php esc_attr_e( 'Loading&hellip;', 'jetpack' ); ?>" src="<?php echo esc_url( $static_url ); ?>" /></p>
464		- <p class="hide-if-js"><?php esc_html_e( 'Jetpack Stats work better with JavaScript enabled.', 'jetpack' ); ?><br />
465		- <a href="<?php echo esc_url( $nojs_url ); ?>"><?php esc_html_e( 'View Jetpack Stats without JavaScript', 'jetpack' ); ?></a>.</p>
466		- </div>
467		- </div>
468		- <?php
	608	+ apply_filters( 'jetpack_static_url', "{$http}://en.wordpress.com/i/loading/loading-64.gif" )
	609	+ ); ?>" /></p>
	610	+<p style="font-size: 11pt; margin: 0;"><a href="https://wordpress.com/stats/<?php echo esc_attr( $domain ); ?>" target="_blank"><?php esc_html_e( 'View stats on WordPress.com right now', 'jetpack' ); ?></a></p>
	611	+<p class="hide-if-js"><?php esc_html_e( 'Your Site Stats work better with JavaScript enabled.', 'jetpack' ); ?><br />
	612	+<a href="<?php echo esc_url( $nojs_url ); ?>"><?php esc_html_e( 'View Site Stats without JavaScript', 'jetpack' ); ?></a>.</p>
	613	+</div>
	614	+</div>
	615	+<div class="jp-footer">
	616	+ <ul class="jp-footer__links">
	617	+ <li class="jp-footer__link-item">
	618	+ <a href="https://jetpack.com" target="_blank" rel="noopener noreferrer" class="jp-footer__link" title="<?php esc_html_e( 'Jetpack version', 'jetpack' ); ?>">Jetpack <?php echo JETPACK__VERSION; ?></a>
	619	+ </li>
	620	+ <li class="jp-footer__link-item">
	621	+ <a href="https://wordpress.com/tos/" target="_blank" rel="noopener noreferrer" title="<?php esc_html__( 'WordPress.com Terms of Service', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Terms', 'Navigation item', 'jetpack' ); ?></a>
	622	+ </li>
	623	+ <li class="jp-footer__link-item">
	624	+ <a href="<?php echo esc_url( $jetpack_admin_url . '#/privacy' ); ?>" rel="noopener noreferrer" title="<?php esc_html_e( 'Automattic\'s Privacy Policy', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Privacy', 'Navigation item', 'jetpack' ); ?></a>
	625	+ </li>
	626	+ <li class="jp-footer__link-item">
	627	+ <a href="<?php echo esc_url( admin_url() . 'admin.php?page=jetpack-debugger' ); ?>" title="<?php esc_html_e( 'Test your site\'s compatibility with Jetpack.', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Debug', 'Navigation item', 'jetpack' ); ?></a>
	628	+ </li>
	629	+ </ul>
	630	+</div>
	631	+</div>
	632	+<?php
469	633	return;
470	634	}
471	635
472		- $day = isset( $_GET['day'] ) && preg_match( '/^\d{4}-\d{2}-\d{2}$/', $_GET['day'] ) ? $_GET['day'] : false; // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput
473		- $q = array(
	636	+ $day = isset( $_GET['day'] ) && preg_match( '/^\d{4}-\d{2}-\d{2}$/', $_GET['day'] ) ? $_GET['day'] : false;
	637	+ $q = array(
474	638	'noheader' => 'true',
475		- 'proxy' => '',
476		- 'page' => 'stats',
477		- 'day' => $day,
478		- 'blog' => $blog_id,
479		- 'charset' => get_option( 'blog_charset' ),
480		- 'color' => get_user_option( 'admin_color' ),
481		- 'ssl' => is_ssl(),
482		- 'j' => sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION ),
	639	+ 'proxy' => '',
	640	+ 'page' => 'stats',
	641	+ 'day' => $day,
	642	+ 'blog' => $blog_id,
	643	+ 'charset' => get_option( 'blog_charset' ),
	644	+ 'color' => get_user_option( 'admin_color' ),
	645	+ 'ssl' => is_ssl(),
	646	+ 'j' => sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION ),
483	647	);
484	648	if ( get_locale() !== 'en_US' ) {
485	649	$q['jp_lang'] = get_locale();
486	650	}
		@@ -485,67 +649,61 @@
485	649	$q['jp_lang'] = get_locale();
486	650	}
487	651	// Only show the main chart, without extra header data, or metaboxes.
488	652	$q['main_chart_only'] = $main_chart_only;
489		- $args = array(
490		- 'view' => array( 'referrers', 'postviews', 'searchterms', 'clicks', 'post', 'table' ),
491		- 'numdays' => 'int',
492		- 'day' => 'date',
493		- 'unit' => array( '1', '7', '31', 'human' ),
494		- 'humanize' => array( 'true' ),
495		- 'num' => 'int',
496		- 'summarize' => null,
497		- 'post' => 'int',
498		- 'width' => 'int',
499		- 'height' => 'int',
500		- 'data' => 'data',
501		- 'blog_subscribers' => 'int',
	653	+ $args = array(
	654	+ 'view' => array( 'referrers', 'postviews', 'searchterms', 'clicks', 'post', 'table' ),
	655	+ 'numdays' => 'int',
	656	+ 'day' => 'date',
	657	+ 'unit' => array( 1, 7, 31, 'human' ),
	658	+ 'humanize' => array( 'true' ),
	659	+ 'num' => 'int',
	660	+ 'summarize' => null,
	661	+ 'post' => 'int',
	662	+ 'width' => 'int',
	663	+ 'height' => 'int',
	664	+ 'data' => 'data',
	665	+ 'blog_subscribers' => 'int',
502	666	'comment_subscribers' => null,
503		- 'type' => array( 'wpcom', 'email', 'pending' ),
504		- 'pagenum' => 'int',
505		- 'masterbar' => null,
	667	+ 'type' => array( 'wpcom', 'email', 'pending' ),
	668	+ 'pagenum' => 'int',
506	669	);
507	670	foreach ( $args as $var => $vals ) {
508		- if ( ! isset( $_REQUEST[ $var ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	671	+ if ( ! isset( $_REQUEST[$var] ) )
509	672	continue;
510		- }
511		- $val = wp_unslash( $_REQUEST[ $var ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
512	673	if ( is_array( $vals ) ) {
513		- if ( in_array( $val, $vals, true ) ) {
514		- $q[ $var ] = $val;
515		- }
	674	+ if ( in_array( $_REQUEST[$var], $vals ) )
	675	+ $q[$var] = $_REQUEST[$var];
516	676	} elseif ( 'int' === $vals ) {
517		- $q[ $var ] = (int) $val;
	677	+ $q[$var] = intval( $_REQUEST[$var] );
518	678	} elseif ( 'date' === $vals ) {
519		- if ( preg_match( '/^\d{4}-\d{2}-\d{2}$/', $val ) ) {
520		- $q[ $var ] = $val;
521		- }
	679	+ if ( preg_match( '/^\d{4}-\d{2}-\d{2}$/', $_REQUEST[$var] ) )
	680	+ $q[$var] = $_REQUEST[$var];
522	681	} elseif ( null === $vals ) {
523		- $q[ $var ] = '';
	682	+ $q[$var] = '';
524	683	} elseif ( 'data' === $vals ) {
525		- if ( 'index.php' === substr( $val, 0, 9 ) ) {
526		- $q[ $var ] = $val;
527		- }
	684	+ if ( 'index.php' === substr( $_REQUEST[$var], 0, 9 ) )
	685	+ $q[$var] = $_REQUEST[$var];
528	686	}
529	687	}
530	688
531		- if ( isset( $_GET['chart'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
532		- if ( preg_match( '/^[a-z0-9-]+$/', $_GET['chart'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput
533		- $chart = sanitize_title( $_GET['chart'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput
534		- $url = 'https://' . STATS_DASHBOARD_SERVER . "/wp-includes/charts/{$chart}.php";
	689	+ if ( isset( $_GET['chart'] ) ) {
	690	+ if ( preg_match( '/^[a-z0-9-]+$/', $_GET['chart'] ) ) {
	691	+ $chart = sanitize_title( $_GET['chart'] );
	692	+ $url = 'https://' . STATS_DASHBOARD_SERVER . "/wp-includes/charts/{$chart}.php";
535	693	}
536	694	} else {
537		- $url = 'https://' . STATS_DASHBOARD_SERVER . '/wp-admin/index.php';
	695	+ $url = 'https://' . STATS_DASHBOARD_SERVER . "/wp-admin/index.php";
538	696	}
539	697
540		- $url = add_query_arg( $q, $url );
541		- $method = 'GET';
	698	+ $url = add_query_arg( $q, $url );
	699	+ $method = 'GET';
542	700	$timeout = 90;
543		- $user_id = 0; // Means use the blog token.
	701	+ $user_id = JETPACK_MASTER_USER; // means send the wp.com user_id
544	702
545		- $get = Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
	703	+ $get = Jetpack_Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
546	704	$get_code = wp_remote_retrieve_response_code( $get );
547		- if ( is_wp_error( $get ) || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
	705	+ if ( is_wp_error( $get ) || ( 2 !== intval( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
548	706	stats_print_wp_remote_error( $get, $url );
549	707	} else {
550	708	if ( ! empty( $get['headers']['content-type'] ) ) {
551	709	$type = $get['headers']['content-type'];
		@@ -552,9 +710,9 @@
552	710	if ( substr( $type, 0, 5 ) === 'image' ) {
553	711	$img = $get['body'];
554	712	header( 'Content-Type: ' . $type );
555	713	header( 'Content-Length: ' . strlen( $img ) );
556		- echo $img; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	714	+ echo $img;
557	715	die();
558	716	}
559	717	}
560	718	$body = stats_convert_post_titles( $get['body'] );
		@@ -560,252 +718,21 @@
560	718	$body = stats_convert_post_titles( $get['body'] );
561	719	$body = stats_convert_chart_urls( $body );
562	720	$body = stats_convert_image_urls( $body );
563	721	$body = stats_convert_admin_urls( $body );
564		-
565		- // The response can contain either the content to display OR
566		- // the scripts for the chart UI. The following calls inspect the
567		- // response, insert the Odyssey nudge as needed, and make sure
568		- // everything is output correctly.
569		- stats_print_header_section( $body );
570		- stats_print_odyssey_nudge( $body );
571		- stats_print_content_section( $body );
572		- stats_print_chart_scripts( $body );
	722	+ echo $body;
573	723	}
574	724
575		- if ( isset( $_GET['page'] ) && 'stats' === $_GET['page'] && ! isset( $_GET['chart'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
576		- $tracking = new Tracking();
577		- $tracking->record_user_event( 'wpa_page_view', array( 'path' => 'old_stats' ) );
	725	+ if ( isset( $_GET['page'] ) && 'stats' === $_GET['page'] && ! isset( $_GET['chart'] ) ) {
	726	+ JetpackTracking::record_user_event( 'wpa_page_view', array( 'path' => 'old_stats' ) );
578	727	}
579	728
580		- if ( isset( $_GET['noheader'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	729	+ if ( isset( $_GET['noheader'] ) ) {
581	730	die;
582	731	}
583	732	}
584	733
585	734	/**
586		- * Legacy Stats: Print Header Section
587		- *
588		- * @access public
589		- * @param mixed $html HTML.
590		- * @return void
591		- */
592		-function stats_print_header_section( $html ) {
593		- $header = stats_parse_header_section( $html );
594		- if ( $header !== '' ) {
595		- echo $header; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
596		- }
597		-}
598		-
599		-/**
600		- * Legacy Stats: Print Content Section
601		- *
602		- * @access public
603		- * @param mixed $html HTML.
604		- * @return void
605		- */
606		-function stats_print_content_section( $html ) {
607		- $content = stats_parse_content_section( $html );
608		- if ( $content !== '' ) {
609		- echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
610		- }
611		-}
612		-
613		-/**
614		- * Legacy Stats: Print Chart Scripts
615		- *
616		- * @access public
617		- * @param mixed $html HTML.
618		- * @return void
619		- */
620		-function stats_print_chart_scripts( $html ) {
621		- if ( is_chart_scripts( $html ) ) {
622		- echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
623		- }
624		-}
625		-
626		-/**
627		- * Legacy Stats: Test for presence of chart scripts
628		- *
629		- * @access public
630		- * @param mixed $html Input HTML that may or may not include the chart scripts.
631		- * @return bool
632		- */
633		-function is_chart_scripts( $html ) {
634		- $pos = strpos( $html, STATS_CONTENT_MARKER );
635		- return $pos === false;
636		-}
637		-
638		-/**
639		- * Legacy Stats: Parse Header Section
640		- *
641		- * Returns the section of the content up to and including the date header.
642		- *
643		- * @access public
644		- * @param mixed $html HTML.
645		- * @return string
646		- */
647		-function stats_parse_header_section( $html ) {
648		- $head = strstr( $html, STATS_CONTENT_MARKER, true );
649		- // Enforce a string result instead of string|false.
650		- if ( $head === false ) {
651		- return '';
652		- }
653		- return $head;
654		-}
655		-
656		-/**
657		- * Legacy Stats: Print Content Section
658		- *
659		- * Returns the section of the content excluding the date header.
660		- *
661		- * @access public
662		- * @param mixed $html HTML.
663		- * @return string
664		- */
665		-function stats_parse_content_section( $html ) {
666		- $body = strstr( $html, STATS_BODY_MARKER );
667		- // Enforce a string result instead of string|false.
668		- if ( $body === false ) {
669		- return '';
670		- }
671		- return $body;
672		-}
673		-
674		-/**
675		- * Legacy Stats: Determine if we need to show the Odyssey upgrade nudge.
676		- *
677		- * @access public
678		- * @return boolean
679		- */
680		-function stats_should_show_odyssey_nudge() {
681		- $stats_notices = ( new Stats_Notices() )->get_notices_to_show();
682		- return isset( $stats_notices[ Stats_Notices::OPT_IN_NEW_STATS_NOTICE_ID ] )
683		- && $stats_notices[ Stats_Notices::OPT_IN_NEW_STATS_NOTICE_ID ];
684		-}
685		-
686		-/**
687		- * Legacy Stats: Print the Odyssey upgrade nudge.
688		- *
689		- * @access public
690		- * @param mixed $html HTML.
691		- * @return void
692		- */
693		-function stats_print_odyssey_nudge( $html ) {
694		- if ( ! stats_should_show_odyssey_nudge() ) {
695		- return;
696		- }
697		- $pos = strpos( $html, STATS_CONTENT_MARKER );
698		- if ( $pos === false ) {
699		- return;
700		- }
701		- $learn_url = Redirect::get_url( 'jetpack-stats-learn-more' );
702		- $redirect_url = admin_url( 'admin.php?page=stats&enable_new_stats=1' );
703		- ?>
704		- <style>
705		- .stats-odyssey-notice {
706		- display: flex;
707		- font-size: var( --font-body );
708		-
709		- border: 1px solid var( --jp-gray-5 );
710		- border-left-color: var( --jp-black );
711		- border-left-width: 6px;
712		- border-radius: 4px;
713		-
714		- margin-top: 24px;
715		- background: white;
716		- position: relative;
717		- }
718		- .stats-odyssey-notice--content {
719		- padding: 24px 0 24px 30px;
720		- font-size: 2em;
721		- width: 100%;
722		- }
723		- .stats-odyssey-notice--content-header {
724		- font-size: 24px;
725		- line-height: 32px;
726		- margin: 0;
727		- margin-bottom: 8px;
728		- }
729		- .stats-odyssey-notice--content-text {
730		- font-size: 16px;
731		- margin: 0;
732		- }
733		- .stats-odyssey-notice--image-container {
734		- background-image: url("/wp-content/plugins/jetpack/images/odyssey-upgrade/background.png"), url("/wp-content/plugins/jetpack/images/odyssey-upgrade/gradient.png");
735		- background-size: cover;
736		- padding-right: 28px;
737		- width: 100%;
738		- }
739		- .stats-odyssey-notice--close-button {
740		- position: absolute;
741		- top: 1rem;
742		- right: 1rem;
743		- background-color: transparent;
744		- border: none;
745		- cursor: pointer;
746		- }
747		- .stats-odyssey-notice--action-bar {
748		- display: flex;
749		- align-items: center;
750		- margin-top: 24px;
751		- }
752		- .stats-odyssey-notice--primary-button {
753		- margin-right: 18px;
754		- padding-left: 20px;
755		- padding-right: 20px;
756		- font-size: 16px;
757		- border-color: black;
758		- background-color: black;
759		- }
760		- .stats-odyssey-notice--primary-button:hover {
761		- border-color: #3c434a;
762		- background-color: #3c434a;
763		- }
764		- .is-primary-link {
765		- color: white;
766		- text-decoration: none;
767		- }
768		- .is-primary-link:active {
769		- color: white;
770		- }
771		- .is-primary-link:focus {
772		- color: white;
773		- box-shadow: none;
774		- outline: none;
775		- }
776		- .is-primary-link:hover {
777		- color: white;
778		- }
779		- .is-secondary-link {
780		- color: black;
781		- font-size: var( --font-body );
782		- }
783		- .is-secondary-link:hover {
784		- color: black;
785		- }
786		- .is-hidden {
787		- display: none;
788		- }
789		- </style>
790		- <div id="stats-odyssey-nudge-main" class="stats-odyssey-notice">
791		- <div class="stats-odyssey-notice--content">
792		- <h2 class="stats-odyssey-notice--content-header"><?php esc_html_e( 'Explore the new Jetpack Stats', 'jetpack' ); ?></h2>
793		- <p class="stats-odyssey-notice--content-text"><?php esc_html_e( "We've added new stats and insights in a more modern and mobile friendly experience to help you grow your site.", 'jetpack' ); ?></p>
794		- <div class="stats-odyssey-notice--action-bar">
795		- <button class="dops-button stats-odyssey-notice--primary-button">
796		- <a class="is-primary-link" href="<?php echo esc_url( $redirect_url ); ?>"><?php esc_html_e( 'Switch to new Stats', 'jetpack' ); ?></a>
797		- </button>
798		- <a class="is-secondary-link" href="<?php echo esc_url( $learn_url ); ?>" rel="noopener noreferrer" target="_blank"><?php esc_html_e( 'Learn about Stats', 'jetpack' ); ?> <svg xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle;" viewBox="0 0 24 24" width="16" height="16" aria-hidden="true" focusable="false"><path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path></svg></a>
799		- </div>
800		- </div>
801		- <div class="stats-odyssey-notice--image-container"></div>
802		- <button class="stats-odyssey-notice--close-button" onclick="stats_odyssey_dismiss_nudge()"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg></button>
803		- </div>
804		- <?php
805		-}
806		-
807		-/**
808	735	* Stats Convert Admin Urls.
809	736	*
810	737	* @access public
811	738	* @param mixed $html HTML.
		@@ -822,9 +749,9 @@
822	749	* @param mixed $html HTML.
823	750	* @return string
824	751	*/
825	752	function stats_convert_image_urls( $html ) {
826		- $url = set_url_scheme( 'https://' . STATS_DASHBOARD_SERVER );
	753	+ $url = set_url_scheme( 'https://' . STATS_DASHBOARD_SERVER );
827	754	$html = preg_replace( '|(["\'])(/i/stats.+)\\1|', '$1' . $url . '$2$1', $html );
828	755	return $html;
829	756	}
830	757
		@@ -832,9 +759,9 @@
832	759	* Callback for preg_replace_callback used in stats_convert_chart_urls()
833	760	*
834	761	* @since 5.6.0
835	762	*
836		- * @param array $matches The matches resulting from the preg_replace_callback call.
	763	+ * @param array $matches The matches resulting from the preg_replace_callback call.
837	764	* @return string The admin url for the chart.
838	765	*/
839	766	function jetpack_stats_convert_chart_urls_callback( $matches ) {
840	767	// If there is a query string, change the beginning '?' to a '&' so it fits into the middle of this query string.
		@@ -871,12 +798,12 @@
871	798	return $html;
872	799	}
873	800	$posts = get_posts(
874	801	array(
875		- 'include' => implode( ',', $matches[1] ),
876		- 'post_type' => 'any',
877		- 'post_status' => 'any',
878		- 'numberposts' => -1,
	802	+ 'include' => implode( ',', $matches[1] ),
	803	+ 'post_type' => 'any',
	804	+ 'post_status' => 'any',
	805	+ 'numberposts' => -1,
879	806	'suppress_filters' => false,
880	807	)
881	808	);
882	809	foreach ( $posts as $post ) {
		@@ -895,25 +822,130 @@
895	822	*/
896	823	function stats_convert_post_title( $matches ) {
897	824	global $stats_posts;
898	825	$post_id = $matches[1];
899		- if ( isset( $stats_posts[ $post_id ] ) ) {
	826	+ if ( isset( $stats_posts[$post_id] ) )
900	827	return '<a href="' . get_permalink( $post_id ) . '" target="_blank">' . get_the_title( $post_id ) . '</a>';
	828	+ return $matches[0];
	829	+}
	830	+
	831	+/**
	832	+ * Stats Configuration Load.
	833	+ *
	834	+ * @access public
	835	+ * @return void
	836	+ */
	837	+function stats_configuration_load() {
	838	+ if ( isset( $_POST['action'] ) && 'save_options' === $_POST['action'] && $_POST['_wpnonce'] === wp_create_nonce( 'stats' ) ) {
	839	+ $options = stats_get_options();
	840	+ $options['admin_bar'] = isset( $_POST['admin_bar'] ) && $_POST['admin_bar'];
	841	+ $options['hide_smile'] = isset( $_POST['hide_smile'] ) && $_POST['hide_smile'];
	842	+
	843	+ $options['roles'] = array( 'administrator' );
	844	+ foreach ( get_editable_roles() as $role => $details ) {
	845	+ if ( isset( $_POST["role_$role"] ) && $_POST["role_$role"] ) {
	846	+ $options['roles'][] = $role;
	847	+ }
	848	+ }
	849	+
	850	+ $options['count_roles'] = array();
	851	+ foreach ( get_editable_roles() as $role => $details ) {
	852	+ if ( isset( $_POST["count_role_$role"] ) && $_POST["count_role_$role"] ) {
	853	+ $options['count_roles'][] = $role;
	854	+ }
	855	+ }
	856	+
	857	+ stats_set_options( $options );
	858	+ stats_update_blog();
	859	+ Jetpack::state( 'message', 'module_configured' );
	860	+ wp_safe_redirect( Jetpack::module_configuration_url( 'stats' ) );
	861	+ exit;
901	862	}
902		- return $matches[0];
903	863	}
904	864
905	865	/**
906		- * CSS to hide the tracking pixel smiley.
907		- * It is now hidden for everyone (used to be visible if you had set the hide_smile option).
	866	+ * Stats Configuration Head.
908	867	*
909	868	* @access public
910	869	* @return void
911	870	*/
	871	+function stats_configuration_head() {
	872	+?>
	873	+ <style type="text/css">
	874	+ #statserror {
	875	+ border: 1px solid #766;
	876	+ background-color: #d22;
	877	+ padding: 1em 3em;
	878	+ }
	879	+ .stats-smiley {
	880	+ vertical-align: 1px;
	881	+ }
	882	+ </style>
	883	+ <?php
	884	+}
	885	+
	886	+/**
	887	+ * Stats Configuration Screen.
	888	+ *
	889	+ * @access public
	890	+ * @return void
	891	+ */
	892	+function stats_configuration_screen() {
	893	+ $options = stats_get_options();
	894	+?>
	895	+ <div class="narrow">
	896	+ <p><?php printf( __( 'Visit <a href="%s">Site Stats</a> to see your stats.', 'jetpack' ), esc_url( menu_page_url( 'stats', false ) ) ); ?></p>
	897	+ <form method="post">
	898	+ <input type='hidden' name='action' value='save_options' />
	899	+ <?php wp_nonce_field( 'stats' ); ?>
	900	+ <table id="menu" class="form-table">
	901	+ <tr valign="top"><th scope="row"><label for="admin_bar"><?php esc_html_e( 'Admin bar' , 'jetpack' ); ?></label></th>
	902	+ <td><label><input type='checkbox'<?php checked( $options['admin_bar'] ); ?> name='admin_bar' id='admin_bar' /> <?php esc_html_e( 'Put a chart showing 48 hours of views in the admin bar.', 'jetpack' ); ?></label></td></tr>
	903	+ <tr valign="top"><th scope="row"><?php esc_html_e( 'Registered users', 'jetpack' ); ?></th>
	904	+ <td>
	905	+ <?php esc_html_e( "Count the page views of registered users who are logged in.", 'jetpack' ); ?><br/>
	906	+ <?php
	907	+ $count_roles = stats_get_option( 'count_roles' );
	908	+ foreach ( get_editable_roles() as $role => $details ) {
	909	+?>
	910	+ <label><input type='checkbox' name='count_role_<?php echo $role; ?>'<?php checked( in_array( $role, $count_roles ) ); ?> /> <?php echo translate_user_role( $details['name'] ); ?></label><br/>
	911	+ <?php
	912	+ }
	913	+?>
	914	+ </td></tr>
	915	+ <tr valign="top"><th scope="row"><?php esc_html_e( 'Smiley' , 'jetpack' ); ?></th>
	916	+ <td><label><input type='checkbox'<?php checked( isset( $options['hide_smile'] ) && $options['hide_smile'] ); ?> name='hide_smile' id='hide_smile' /> <?php esc_html_e( 'Hide the stats smiley face image.', 'jetpack' ); ?></label><br /> <span class="description"><?php echo wp_kses( __( 'The image helps collect stats and <strong>makes the world a better place</strong> but should still work when hidden', 'jetpack' ), array( 'strong' => array() ) ); ?> <img class="stats-smiley" alt="<?php esc_attr_e( 'Smiley face', 'jetpack' ); ?>" src="<?php echo esc_url( plugins_url( 'images/stats-smiley.gif', dirname( __FILE__ ) ) ); ?>" width="6" height="5" /></span></td></tr>
	917	+ <tr valign="top"><th scope="row"><?php esc_html_e( 'Report visibility' , 'jetpack' ); ?></th>
	918	+ <td>
	919	+ <?php esc_html_e( 'Select the roles that will be able to view stats reports.', 'jetpack' ); ?><br/>
	920	+ <?php
	921	+ $stats_roles = stats_get_option( 'roles' );
	922	+ foreach ( get_editable_roles() as $role => $details ) {
	923	+?>
	924	+ <label><input type='checkbox' <?php if ( 'administrator' === $role ) echo "disabled='disabled' "; ?>name='role_<?php echo $role; ?>'<?php checked( 'administrator' === $role || in_array( $role, $stats_roles ) ); ?> /> <?php echo translate_user_role( $details['name'] ); ?></label><br/>
	925	+ <?php
	926	+ }
	927	+?>
	928	+ </td></tr>
	929	+ </table>
	930	+ <p class="submit"><input type='submit' class='button-primary' value='<?php echo esc_attr( __( 'Save configuration', 'jetpack' ) ); ?>' /></p>
	931	+ </form>
	932	+ </div>
	933	+ <?php
	934	+}
	935	+
	936	+/**
	937	+ * Stats Hide Smile.
	938	+ *
	939	+ * @access public
	940	+ * @return void
	941	+ */
912	942	function stats_hide_smile_css() {
913		- ?>
914		-<style>img#wpstats{display:none}</style>
915		- <?php
	943	+ $options = stats_get_options();
	944	+ if ( isset( $options['hide_smile'] ) && $options['hide_smile'] ) {
	945	+?>
	946	+<style type='text/css'>img#wpstats{display:none}</style><?php
	947	+ }
916	948	}
917	949
918	950	/**
919	951	* Stats Admin Bar Head.
		@@ -921,24 +953,22 @@
921	953	* @access public
922	954	* @return void
923	955	*/
924	956	function stats_admin_bar_head() {
925		- if ( ! Stats_Options::get_option( 'admin_bar' ) ) {
	957	+ if ( ! stats_get_option( 'admin_bar' ) )
926	958	return;
927		- }
928	959
929		- if ( ! current_user_can( 'view_stats' ) ) {
	960	+ if ( ! current_user_can( 'view_stats' ) )
930	961	return;
931		- }
932	962
933		- if ( ! is_admin_bar_showing() ) {
	963	+ if ( function_exists( 'is_admin_bar_showing' ) && ! is_admin_bar_showing() ) {
934	964	return;
935	965	}
936	966
937	967	add_action( 'admin_bar_menu', 'stats_admin_bar_menu', 100 );
938		- ?>
	968	+?>
939	969
940		-<style data-ampdevmode type='text/css'>
	970	+<style type='text/css'>
941	971	#wpadminbar .quicklinks li#wp-admin-bar-stats {
942	972	height: 32px;
943	973	}
944	974	#wpadminbar .quicklinks li#wp-admin-bar-stats a {
		@@ -956,40 +986,17 @@
956	986	margin: 0 8px 0 10px;
957	987	}
958	988	#wpadminbar .quicklinks li#wp-admin-bar-stats a img {
959	989	height: 24px;
960		- margin: 4px 0;
	990	+ padding: 4px 0;
961	991	max-width: none;
962	992	border: none;
963	993	}
964	994	</style>
965		- <?php
	995	+<?php
966	996	}
967	997
968	998	/**
969		- * Gets the image source of the given stats chart.
970		- *
971		- * @param string $chart Name of the chart.
972		- * @param array $args Extra list of argument to use in the image source.
973		- * @return string An image source.
974		- */
975		-function stats_get_image_chart_src( $chart, $args = array() ) {
976		- $url = add_query_arg( 'page', 'stats', admin_url( 'admin.php' ) );
977		-
978		- return add_query_arg(
979		- array_merge(
980		- array(
981		- 'noheader' => '',
982		- 'proxy' => '',
983		- 'chart' => $chart,
984		- ),
985		- $args
986		- ),
987		- $url
988		- );
989		-}
990		-
991		-/**
992	999	* Stats AdminBar.
993	1000	*
994	1001	* @access public
995	1002	* @param mixed $wp_admin_bar WPAdminBar.
		@@ -995,67 +1002,122 @@
995	1002	* @param mixed $wp_admin_bar WPAdminBar.
996	1003	* @return void
997	1004	*/
998	1005	function stats_admin_bar_menu( &$wp_admin_bar ) {
999		- $img_src = esc_attr( stats_get_image_chart_src( 'admin-bar-hours-scale' ) );
1000		- $img_src_2x = esc_attr( stats_get_image_chart_src( 'admin-bar-hours-scale-2x' ) );
1001		- $alt = esc_attr( __( 'Stats', 'jetpack' ) );
1002		- $title = esc_attr( __( 'Views over 48 hours. Click for more Jetpack Stats.', 'jetpack' ) );
	1006	+ $url = add_query_arg( 'page', 'stats', admin_url( 'admin.php' ) ); // no menu_page_url() blog-side.
1003	1007
1004		- $menu = array(
1005		- 'id' => 'stats',
1006		- 'href' => add_query_arg( 'page', 'stats', admin_url( 'admin.php' ) ), // no menu_page_url() blog-side.
1007		- 'title' => "<div><img src='$img_src' srcset='$img_src 1x, $img_src_2x 2x' width='112' height='24' alt='$alt' title='$title'></div>",
1008		- );
	1008	+ $img_src = esc_attr( add_query_arg( array( 'noheader' => '', 'proxy' => '', 'chart' => 'admin-bar-hours-scale' ), $url ) );
	1009	+ $img_src_2x = esc_attr( add_query_arg( array( 'noheader' => '', 'proxy' => '', 'chart' => 'admin-bar-hours-scale-2x' ), $url ) );
1009	1010
	1011	+ $alt = esc_attr( __( 'Stats', 'jetpack' ) );
	1012	+
	1013	+ $title = esc_attr( __( 'Views over 48 hours. Click for more Site Stats.', 'jetpack' ) );
	1014	+
	1015	+ $menu = array( 'id' => 'stats', 'title' => "<div><script type='text/javascript'>var src;if(typeof(window.devicePixelRatio)=='undefined'||window.devicePixelRatio<2){src='$img_src';}else{src='$img_src_2x';}document.write('<img src=\''+src+'\' alt=\'$alt\' title=\'$title\' />');</script></div>", 'href' => $url );
	1016	+
1010	1017	$wp_admin_bar->add_menu( $menu );
1011	1018	}
1012	1019
1013	1020	/**
1014		- *
1015		- * Deprecated. The stats module should not update blog details. This is handled by Sync.
1016		- *
1017	1021	* Stats Update Blog.
1018	1022	*
1019	1023	* @access public
1020	1024	* @return void
1021		- *
1022		- * @deprecated since 10.3.
1023	1025	*/
1024	1026	function stats_update_blog() {
1025		- _deprecated_function( __METHOD__, 'jetpack-10.3' );
1026		- XMLRPC_Async_Call::add_call( 'jetpack.updateBlog', 0, stats_get_blog() );
	1027	+ Jetpack::xmlrpc_async_call( 'jetpack.updateBlog', stats_get_blog() );
1027	1028	}
1028	1029
1029	1030	/**
1030	1031	* Stats Get Blog.
1031	1032	*
1032		- * @deprecated 11.5
	1033	+ * @access public
	1034	+ * @return string
	1035	+ */
	1036	+function stats_get_blog() {
	1037	+ $home = parse_url( trailingslashit( get_option( 'home' ) ) );
	1038	+ $blog = array(
	1039	+ 'host' => $home['host'],
	1040	+ 'path' => $home['path'],
	1041	+ 'blogname' => get_option( 'blogname' ),
	1042	+ 'blogdescription' => get_option( 'blogdescription' ),
	1043	+ 'siteurl' => get_option( 'siteurl' ),
	1044	+ 'gmt_offset' => get_option( 'gmt_offset' ),
	1045	+ 'timezone_string' => get_option( 'timezone_string' ),
	1046	+ 'stats_version' => STATS_VERSION,
	1047	+ 'stats_api' => 'jetpack',
	1048	+ 'page_on_front' => get_option( 'page_on_front' ),
	1049	+ 'permalink_structure' => get_option( 'permalink_structure' ),
	1050	+ 'category_base' => get_option( 'category_base' ),
	1051	+ 'tag_base' => get_option( 'tag_base' ),
	1052	+ );
	1053	+ $blog = array_merge( stats_get_options(), $blog );
	1054	+ unset( $blog['roles'], $blog['blog_id'] );
	1055	+ return stats_esc_html_deep( $blog );
	1056	+}
	1057	+
	1058	+/**
	1059	+ * Modified from stripslashes_deep()
1033	1060	*
1034	1061	* @access public
	1062	+ * @param mixed $value Value.
1035	1063	* @return string
1036	1064	*/
1037		-function stats_get_blog() {
1038		- _deprecated_function( __METHOD__, 'jetpack-11.5' );
1039		- return Stats_XMLRPC::init()->get_blog();
	1065	+function stats_esc_html_deep( $value ) {
	1066	+ if ( is_array( $value ) ) {
	1067	+ $value = array_map( 'stats_esc_html_deep', $value );
	1068	+ } elseif ( is_object( $value ) ) {
	1069	+ $vars = get_object_vars( $value );
	1070	+ foreach ( $vars as $key => $data ) {
	1071	+ $value->{$key} = stats_esc_html_deep( $data );
	1072	+ }
	1073	+ } elseif ( is_string( $value ) ) {
	1074	+ $value = esc_html( $value );
	1075	+ }
	1076	+
	1077	+ return $value;
1040	1078	}
1041	1079
1042	1080	/**
	1081	+ * Stats xmlrpc_methods function.
	1082	+ *
	1083	+ * @access public
	1084	+ * @param mixed $methods Methods.
	1085	+ * @return array
	1086	+ */
	1087	+function stats_xmlrpc_methods( $methods ) {
	1088	+ $my_methods = array(
	1089	+ 'jetpack.getBlog' => 'stats_get_blog',
	1090	+ );
	1091	+
	1092	+ return array_merge( $methods, $my_methods );
	1093	+}
	1094	+
	1095	+/**
	1096	+ * Register Stats Dashboard Widget.
	1097	+ *
	1098	+ * @access public
	1099	+ * @return void
	1100	+ */
	1101	+function stats_register_dashboard_widget() {
	1102	+ if ( ! current_user_can( 'view_stats' ) )
	1103	+ return;
	1104	+
	1105	+ // With wp_dashboard_empty: we load in the content after the page load via JS.
	1106	+ wp_add_dashboard_widget( 'dashboard_stats', __( 'Site Stats', 'jetpack' ), 'wp_dashboard_empty', 'stats_dashboard_widget_control' );
	1107	+
	1108	+ add_action( 'admin_head', 'stats_dashboard_head' );
	1109	+}
	1110	+
	1111	+/**
1043	1112	* Stats Dashboard Widget Options.
1044	1113	*
1045		- * TODO: This should be moved into class-jetpack-stats-dashboard-widget.php.
1046		- *
1047	1114	* @access public
1048	1115	* @return array
1049	1116	*/
1050	1117	function stats_dashboard_widget_options() {
1051		- $defaults = array(
1052		- 'chart' => 1,
1053		- 'top' => 1,
1054		- 'search' => 7,
1055		- );
1056		- $options = get_option( 'stats_dashboard_widget' );
1057		- if ( ( ! $options ) || ! is_array( $options ) ) {
	1118	+ $defaults = array( 'chart' => 1, 'top' => 1, 'search' => 7 );
	1119	+ if ( ( ! $options = get_option( 'stats_dashboard_widget' ) ) || ! is_array( $options ) ) {
1058	1120	$options = array();
1059	1121	}
1060	1122
1061	1123	// Ignore obsolete option values.
		@@ -1060,97 +1122,65 @@
1060	1122
1061	1123	// Ignore obsolete option values.
1062	1124	$intervals = array( 1, 7, 31, 90, 365 );
1063	1125	foreach ( array( 'top', 'search' ) as $key ) {
1064		- if ( isset( $options[ $key ] ) && ! in_array( (int) $options[ $key ], $intervals, true ) ) {
	1126	+ if ( isset( $options[ $key ] ) && ! in_array( $options[ $key ], $intervals ) ) {
1065	1127	unset( $options[ $key ] );
1066	1128	}
1067	1129	}
1068	1130
1069		- return array_merge( $defaults, $options );
	1131	+ return array_merge( $defaults, $options );
1070	1132	}
1071	1133
1072	1134	/**
1073	1135	* Stats Dashboard Widget Control.
1074	1136	*
1075		- * TODO: This should be moved into class-jetpack-stats-dashboard-widget.php.
1076		- *
1077	1137	* @access public
1078	1138	* @return void
1079	1139	*/
1080	1140	function stats_dashboard_widget_control() {
1081		- stats_dashboard_widget_controls_handle_submission();
1082	1141	$periods = array(
1083		- '1' => __( 'day', 'jetpack' ),
1084		- '7' => __( 'week', 'jetpack' ),
	1142	+ '1' => __( 'day', 'jetpack' ),
	1143	+ '7' => __( 'week', 'jetpack' ),
1085	1144	'31' => __( 'month', 'jetpack' ),
1086	1145	);
1087	1146	$intervals = array(
1088		- '1' => __( 'the past day', 'jetpack' ),
1089		- '7' => __( 'the past week', 'jetpack' ),
1090		- '31' => __( 'the past month', 'jetpack' ),
1091		- '90' => __( 'the past quarter', 'jetpack' ),
	1147	+ '1' => __( 'the past day', 'jetpack' ),
	1148	+ '7' => __( 'the past week', 'jetpack' ),
	1149	+ '31' => __( 'the past month', 'jetpack' ),
	1150	+ '90' => __( 'the past quarter', 'jetpack' ),
1092	1151	'365' => __( 'the past year', 'jetpack' ),
1093	1152	);
1094		- stats_dashboard_widget_controls_html( $intervals, $periods, stats_dashboard_widget_options() );
1095		-}
1096		-
1097		-/**
1098		- * Handle widget controls form submission.
1099		- *
1100		- * TODO: This should be moved into class-jetpack-stats-dashboard-widget.php.
1101		- *
1102		- * @access public
1103		- * @return void
1104		- */
1105		-function stats_dashboard_widget_controls_handle_submission() {
1106		- $options = stats_dashboard_widget_options();
1107	1153	$defaults = array(
1108		- 'top' => 1,
	1154	+ 'top' => 1,
1109	1155	'search' => 7,
1110	1156	);
1111	1157
1112		- // Check if the correct form was submitted.
1113		- if ( isset( $_POST['stats_id'] ) && 'dashboard_stats' === $_POST['stats_id'] ) {
1114		- // Perform nonce verification.
1115		- if (
1116		- isset( $_POST['dashboard-widget-nonce'] ) &&
1117		- wp_verify_nonce( filter_var( wp_unslash( $_POST['dashboard-widget-nonce'] ) ), 'edit-dashboard-widget_dashboard_stats' )
1118		- ) {
1119		- // Update options.
1120		- $options['chart'] = isset( $_POST['chart'] ) ? (int) $_POST['chart'] : 1;
1121		- foreach ( array( 'top', 'search' ) as $key ) {
1122		- $options[ $key ] = isset( $_POST[ $key ] ) ? (int) $_POST[ $key ] : $defaults[ $key ];
	1158	+ $options = stats_dashboard_widget_options();
	1159	+
	1160	+ if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['widget_id'] ) && 'dashboard_stats' === $_POST['widget_id'] ) {
	1161	+ if ( isset( $periods[ $_POST['chart'] ] ) ) {
	1162	+ $options['chart'] = $_POST['chart'];
	1163	+ }
	1164	+ foreach ( array( 'top', 'search' ) as $key ) {
	1165	+ if ( isset( $intervals[ $_POST[ $key ] ] ) ) {
	1166	+ $options[ $key ] = $_POST[ $key ];
	1167	+ } else { $options[ $key ] = $defaults[ $key ];
1123	1168	}
1124		- update_option( 'stats_dashboard_widget', $options );
1125	1169	}
	1170	+ update_option( 'stats_dashboard_widget', $options );
1126	1171	}
1127		-}
1128		-
1129		-/**
1130		- * Output HTML for widget controls.
1131		- *
1132		- * @param array $intervals Array of intervals.
1133		- * @param array $periods Array of periods.
1134		- * @param array $options Array of options.
1135		- *
1136		- * TODO: This should be moved into class-jetpack-stats-dashboard-widget.php.
1137		- *
1138		- * @access public
1139		- * @return void
1140		- */
1141		-function stats_dashboard_widget_controls_html( $intervals, $periods, $options ) {
1142		- ?>
	1172	+?>
1143	1173	<p>
1144		- <label for="chart"><?php esc_html_e( 'Chart stats by', 'jetpack' ); ?></label>
	1174	+ <label for="chart"><?php esc_html_e( 'Chart stats by' , 'jetpack' ); ?></label>
1145	1175	<select id="chart" name="chart">
1146	1176	<?php
1147	1177	foreach ( $periods as $val => $label ) {
1148		- ?>
1149		- <option value="<?php echo esc_attr( $val ); ?>"<?php selected( $val, $options['chart'] ); ?>><?php echo esc_html( $label ); ?></option>
	1178	+?>
	1179	+ <option value="<?php echo $val; ?>"<?php selected( $val, $options['chart'] ); ?>><?php echo esc_html( $label ); ?></option>
1150	1180	<?php
1151	1181	}
1152		- ?>
	1182	+?>
1153	1183	</select>.
1154	1184	</p>
1155	1185
1156	1186	<p>
		@@ -1157,13 +1187,13 @@
1157	1187	<label for="top"><?php esc_html_e( 'Show top posts over', 'jetpack' ); ?></label>
1158	1188	<select id="top" name="top">
1159	1189	<?php
1160	1190	foreach ( $intervals as $val => $label ) {
1161		- ?>
1162		- <option value="<?php echo esc_attr( $val ); ?>"<?php selected( $val, $options['top'] ); ?>><?php echo esc_html( $label ); ?></option>
	1191	+?>
	1192	+ <option value="<?php echo $val; ?>"<?php selected( $val, $options['top'] ); ?>><?php echo esc_html( $label ); ?></option>
1163	1193	<?php
1164	1194	}
1165		- ?>
	1195	+?>
1166	1196	</select>.
1167	1197	</p>
1168	1198
1169	1199	<p>
		@@ -1170,13 +1200,13 @@
1170	1200	<label for="search"><?php esc_html_e( 'Show top search terms over', 'jetpack' ); ?></label>
1171	1201	<select id="search" name="search">
1172	1202	<?php
1173	1203	foreach ( $intervals as $val => $label ) {
1174		- ?>
1175		- <option value="<?php echo esc_attr( $val ); ?>"<?php selected( $val, $options['search'] ); ?>><?php echo esc_html( $label ); ?></option>
	1204	+?>
	1205	+ <option value="<?php echo $val; ?>"<?php selected( $val, $options['search'] ); ?>><?php echo esc_html( $label ); ?></option>
1176	1206	<?php
1177	1207	}
1178		- ?>
	1208	+?>
1179	1209	</select>.
1180	1210	</p>
1181	1211	<?php
1182	1212	}
		@@ -1183,53 +1213,207 @@
1183	1213
1184	1214	/**
1185	1215	* Jetpack Stats Dashboard Widget.
1186	1216	*
1187		- * TODO: This should be moved into class-jetpack-stats-dashboard-widget.php.
1188		- *
1189	1217	* @access public
1190	1218	* @return void
1191	1219	*/
1192	1220	function stats_jetpack_dashboard_widget() {
1193		- ?>
	1221	+?>
1194	1222	<form id="stats_dashboard_widget_control" action="<?php echo esc_url( admin_url() ); ?>" method="post">
1195	1223	<?php stats_dashboard_widget_control(); ?>
1196	1224	<?php wp_nonce_field( 'edit-dashboard-widget_dashboard_stats', 'dashboard-widget-nonce' ); ?>
1197		- <input type="hidden" name="stats_id" value="dashboard_stats" />
	1225	+ <input type="hidden" name="widget_id" value="dashboard_stats" />
1198	1226	<?php submit_button( __( 'Submit', 'jetpack' ) ); ?>
1199	1227	</form>
1200		- <button type="button" class="handlediv js-toggle-stats_dashboard_widget_control" aria-expanded="true">
1201		- <span class="screen-reader-text"><?php esc_html_e( 'Configure', 'jetpack' ); ?></span>
1202		- <span class="toggle-indicator" aria-hidden="true"></span>
1203		- </button>
1204		- <div id="dashboard_stats" class="is-loading">
	1228	+ <span id="js-toggle-stats_dashboard_widget_control">
	1229	+ <?php esc_html_e( 'Configure', 'jetpack' ); ?>
	1230	+ </span>
	1231	+ <div id="dashboard_stats">
1205	1232	<div class="inside">
1206	1233	<div style="height: 250px;"></div>
1207	1234	</div>
1208	1235	</div>
	1236	+ <script>
	1237	+ jQuery(document).ready(function($){
	1238	+ var $toggle = $('#js-toggle-stats_dashboard_widget_control');
	1239	+
	1240	+ $toggle.parent().prev().append( $toggle );
	1241	+ $toggle.show().click(function(e){
	1242	+ e.preventDefault();
	1243	+ e.stopImmediatePropagation();
	1244	+ $(this).parent().toggleClass('controlVisible');
	1245	+ $('#stats_dashboard_widget_control').slideToggle();
	1246	+ });
	1247	+ });
	1248	+ </script>
	1249	+ <style>
	1250	+ #js-toggle-stats_dashboard_widget_control {
	1251	+ display: none;
	1252	+ float: right;
	1253	+ margin-top: 0.2em;
	1254	+ font-weight: 400;
	1255	+ color: #444;
	1256	+ font-size: .8em;
	1257	+ text-decoration: underline;
	1258	+ cursor: pointer;
	1259	+ }
	1260	+ #stats_dashboard_widget_control {
	1261	+ display: none;
	1262	+ padding: 0 10px;
	1263	+ overflow: hidden;
	1264	+ }
	1265	+ #stats_dashboard_widget_control .button-primary {
	1266	+ float: right;
	1267	+ }
	1268	+ #dashboard_stats {
	1269	+ box-sizing: border-box;
	1270	+ width: 100%;
	1271	+ padding: 0 10px;
	1272	+ }
	1273	+ </style>
1209	1274	<?php
1210	1275	}
1211	1276
1212	1277	/**
	1278	+ * Register Stats Widget Control Callback.
	1279	+ *
	1280	+ * @access public
	1281	+ * @return void
	1282	+ */
	1283	+function stats_register_widget_control_callback() {
	1284	+ $GLOBALS['wp_dashboard_control_callbacks']['dashboard_stats'] = 'stats_dashboard_widget_control';
	1285	+}
	1286	+
	1287	+/**
	1288	+ * JavaScript and CSS for dashboard widget.
	1289	+ *
	1290	+ * @access public
	1291	+ * @return void
	1292	+ */
	1293	+function stats_dashboard_head() { ?>
	1294	+<script type="text/javascript">
	1295	+/* <![CDATA[ */
	1296	+jQuery( function($) {
	1297	+ var dashStats = jQuery( '#dashboard_stats div.inside' );
	1298	+
	1299	+ if ( dashStats.find( '.dashboard-widget-control-form' ).length ) {
	1300	+ return;
	1301	+ }
	1302	+
	1303	+ if ( ! dashStats.length ) {
	1304	+ dashStats = jQuery( '#dashboard_stats div.dashboard-widget-content' );
	1305	+ var h = parseInt( dashStats.parent().height() ) - parseInt( dashStats.prev().height() );
	1306	+ var args = 'width=' + dashStats.width() + '&height=' + h.toString();
	1307	+ } else {
	1308	+ if ( jQuery('#dashboard_stats' ).hasClass('postbox') ) {
	1309	+ var args = 'width=' + ( dashStats.prev().width() * 2 ).toString();
	1310	+ } else {
	1311	+ var args = 'width=' + ( dashStats.width() * 2 ).toString();
	1312	+ }
	1313	+ }
	1314	+
	1315	+ dashStats
	1316	+ .not( '.dashboard-widget-control' )
	1317	+ .load( 'admin.php?page=stats&noheader&dashboard&' + args );
	1318	+
	1319	+ jQuery( window ).one( 'resize', function() {
	1320	+ jQuery( '#stat-chart' ).css( 'width', 'auto' );
	1321	+ } );
	1322	+} );
	1323	+/* ]]> */
	1324	+</script>
	1325	+<style type="text/css">
	1326	+/* <![CDATA[ */
	1327	+#stat-chart {
	1328	+ background: none !important;
	1329	+}
	1330	+#dashboard_stats .inside {
	1331	+ margin: 10px 0 0 0 !important;
	1332	+}
	1333	+#dashboard_stats #stats-graph {
	1334	+ margin: 0;
	1335	+}
	1336	+#stats-info {
	1337	+ border-top: 1px solid #dfdfdf;
	1338	+ margin: 7px -10px 0 -10px;
	1339	+ padding: 10px;
	1340	+ background: #fcfcfc;
	1341	+ -moz-box-shadow:inset 0 1px 0 #fff;
	1342	+ -webkit-box-shadow:inset 0 1px 0 #fff;
	1343	+ box-shadow:inset 0 1px 0 #fff;
	1344	+ overflow: hidden;
	1345	+ border-radius: 0 0 2px 2px;
	1346	+ -webkit-border-radius: 0 0 2px 2px;
	1347	+ -moz-border-radius: 0 0 2px 2px;
	1348	+ -khtml-border-radius: 0 0 2px 2px;
	1349	+}
	1350	+#stats-info #top-posts, #stats-info #top-search {
	1351	+ float: left;
	1352	+ width: 50%;
	1353	+}
	1354	+#stats-info #top-posts {
	1355	+ padding-right: 3%;
	1356	+}
	1357	+#top-posts .stats-section-inner p {
	1358	+ white-space: nowrap;
	1359	+ overflow: hidden;
	1360	+}
	1361	+#top-posts .stats-section-inner p a {
	1362	+ overflow: hidden;
	1363	+ text-overflow: ellipsis;
	1364	+}
	1365	+#stats-info div#active {
	1366	+ border-top: 1px solid #dfdfdf;
	1367	+ margin: 0 -10px;
	1368	+ padding: 10px 10px 0 10px;
	1369	+ -moz-box-shadow:inset 0 1px 0 #fff;
	1370	+ -webkit-box-shadow:inset 0 1px 0 #fff;
	1371	+ box-shadow:inset 0 1px 0 #fff;
	1372	+ overflow: hidden;
	1373	+}
	1374	+#top-search p {
	1375	+ color: #999;
	1376	+}
	1377	+#stats-info h3 {
	1378	+ font-size: 1em;
	1379	+ margin: 0 0 .5em 0 !important;
	1380	+}
	1381	+#stats-info p {
	1382	+ margin: 0 0 .25em;
	1383	+ color: #999;
	1384	+}
	1385	+#stats-info p.widget-loading {
	1386	+ margin: 1em 0 0;
	1387	+ color: #333;
	1388	+}
	1389	+#stats-info p a {
	1390	+ display: block;
	1391	+}
	1392	+#stats-info p a.button {
	1393	+ display: inline;
	1394	+}
	1395	+/* ]]> */
	1396	+</style>
	1397	+<?php
	1398	+}
	1399	+
	1400	+/**
1213	1401	* Stats Dashboard Widget Content.
1214	1402	*
1215		- * TODO: This should be moved into class-jetpack-stats-dashboard-widget.php.
1216		- *
1217	1403	* @access public
1218	1404	* @return void
1219	1405	*/
1220	1406	function stats_dashboard_widget_content() {
1221		- $width = isset( $_GET['width'] ) ? intval( $_GET['width'] ) / 2 : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
1222		- $height = isset( $_GET['height'] ) ? intval( $_GET['height'] ) - 36 : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
1223		- if ( ! $width || $width < 250 ) {
	1407	+ if ( ! isset( $_GET['width'] ) || ( ! $width = (int) ( $_GET['width'] / 2 ) ) || $width < 250 ) {
1224	1408	$width = 370;
1225	1409	}
1226		- if ( ! $height || $height < 230 ) {
	1410	+ if ( ! isset( $_GET['height'] ) || ( ! $height = (int) $_GET['height'] - 36 ) || $height < 230 ) {
1227	1411	$height = 180;
1228	1412	}
1229	1413
1230		- $_width = $width - 5;
1231		- $_height = $height - 5;
	1414	+ $_width = $width - 5;
	1415	+ $_height = $height - ( $GLOBALS['is_winIE'] ? 16 : 5 ); // Hack!
1232	1416
1233	1417	$options = stats_dashboard_widget_options();
1234	1418	$blog_id = Jetpack_Options::get_option( 'id' );
1235	1419
		@@ -1234,50 +1418,48 @@
1234	1418	$blog_id = Jetpack_Options::get_option( 'id' );
1235	1419
1236	1420	$q = array(
1237	1421	'noheader' => 'true',
1238		- 'proxy' => '',
1239		- 'blog' => $blog_id,
1240		- 'page' => 'stats',
1241		- 'chart' => '',
1242		- 'unit' => $options['chart'],
1243		- 'color' => get_user_option( 'admin_color' ),
1244		- 'width' => $_width,
1245		- 'height' => $_height,
1246		- 'ssl' => is_ssl(),
1247		- 'j' => sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION ),
	1422	+ 'proxy' => '',
	1423	+ 'blog' => $blog_id,
	1424	+ 'page' => 'stats',
	1425	+ 'chart' => '',
	1426	+ 'unit' => $options['chart'],
	1427	+ 'color' => get_user_option( 'admin_color' ),
	1428	+ 'width' => $_width,
	1429	+ 'height' => $_height,
	1430	+ 'ssl' => is_ssl(),
	1431	+ 'j' => sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION ),
1248	1432	);
1249	1433
1250		- $url = 'https://' . STATS_DASHBOARD_SERVER . '/wp-admin/index.php';
	1434	+ $url = 'https://' . STATS_DASHBOARD_SERVER . "/wp-admin/index.php";
1251	1435
1252		- $url = add_query_arg( $q, $url );
1253		- $method = 'GET';
	1436	+ $url = add_query_arg( $q, $url );
	1437	+ $method = 'GET';
1254	1438	$timeout = 90;
1255		- $user_id = 0; // Means use the blog token.
	1439	+ $user_id = JETPACK_MASTER_USER;
1256	1440
1257		- $get = Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
	1441	+ $get = Jetpack_Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
1258	1442	$get_code = wp_remote_retrieve_response_code( $get );
1259		- if ( is_wp_error( $get ) || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
	1443	+ if ( is_wp_error( $get ) || ( 2 !== intval( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
1260	1444	stats_print_wp_remote_error( $get, $url );
1261	1445	} else {
1262	1446	$body = stats_convert_post_titles( $get['body'] );
1263	1447	$body = stats_convert_chart_urls( $body );
1264	1448	$body = stats_convert_image_urls( $body );
1265		- echo $body; // phpcs:ignore WordPress.Security.EscapeOutput
	1449	+ echo $body;
1266	1450	}
1267	1451
1268	1452	$post_ids = array();
1269	1453
1270		- $csv_end_date = current_time( 'Y-m-d' );
1271		- $csv_args = array(
1272		- 'top' => "&limit=6&end=$csv_end_date",
1273		- 'search' => "&limit=5&end=$csv_end_date",
1274		- );
	1454	+ $csv_end_date = date( 'Y-m-d', current_time( 'timestamp' ) );
	1455	+ $csv_args = array( 'top' => "&limit=8&end=$csv_end_date", 'search' => "&limit=5&end=$csv_end_date" );
	1456	+ /* Translators: Stats dashboard widget postviews list: "$post_title $views Views". */
	1457	+ $printf = __( '%1$s %2$s Views' , 'jetpack' );
1275	1458
1276		- $top_posts = stats_get_csv( 'postviews', "days=$options[top]$csv_args[top]" );
1277		- foreach ( $top_posts as $i => $post ) {
	1459	+ foreach ( $top_posts = stats_get_csv( 'postviews', "days=$options[top]$csv_args[top]" ) as $i => $post ) {
1278	1460	if ( 0 === $post['post_id'] ) {
1279		- unset( $top_posts[ $i ] );
	1461	+ unset( $top_posts[$i] );
1280	1462	continue;
1281	1463	}
1282	1464	$post_ids[] = $post['post_id'];
1283	1465	}
		@@ -1282,13 +1464,12 @@
1282	1464	$post_ids[] = $post['post_id'];
1283	1465	}
1284	1466
1285	1467	// Cache.
1286		- get_posts( array( 'include' => implode( ',', array_unique( $post_ids ) ) ) );
	1468	+ get_posts( array( 'include' => join( ',', array_unique( $post_ids ) ) ) );
1287	1469
1288		- $searches = array();
1289		- $search_terms = stats_get_csv( 'searchterms', "days=$options[search]$csv_args[search]" );
1290		- foreach ( $search_terms as $search_term ) {
	1470	+ $searches = array();
	1471	+ foreach ( $search_terms = stats_get_csv( 'searchterms', "days=$options[search]$csv_args[search]" ) as $search_term ) {
1291	1472	if ( 'encrypted_search_terms' === $search_term['searchterm'] ) {
1292	1473	continue;
1293	1474	}
1294	1475	$searches[] = esc_html( $search_term['searchterm'] );
		@@ -1293,75 +1474,55 @@
1293	1474	}
1294	1475	$searches[] = esc_html( $search_term['searchterm'] );
1295	1476	}
1296	1477
1297		- ?>
	1478	+?>
	1479	+<a class="button" href="admin.php?page=stats"><?php esc_html_e( 'View All', 'jetpack' ); ?></a>
1298	1480	<div id="stats-info">
1299		- <div id="stats-info-container">
1300		- <div class="stats-info-header">
1301		- <h2><?php esc_html_e( 'Highlights', 'jetpack' ); ?></h2>
1302		- <div class="stats-info-header-right">
1303		- <a href="<?php echo esc_url( admin_url( 'admin.php?page=stats' ) ); ?>" class="button button-primary">
1304		- <?php esc_html_e( 'View detailed stats', 'jetpack' ); ?>
1305		- </a>
1306		- </div>
	1481	+ <div id="top-posts" class='stats-section'>
	1482	+ <div class="stats-section-inner">
	1483	+ <h3 class="heading"><?php esc_html_e( 'Top Posts' , 'jetpack' ); ?></h3>
	1484	+ <?php
	1485	+ if ( empty( $top_posts ) ) {
	1486	+?>
	1487	+ <p class="nothing"><?php esc_html_e( 'Sorry, nothing to report.', 'jetpack' ); ?></p>
	1488	+ <?php
	1489	+ } else {
	1490	+ foreach ( $top_posts as $post ) {
	1491	+ if ( ! get_post( $post['post_id'] ) ) {
	1492	+ continue;
	1493	+ }
	1494	+?>
	1495	+ <p><?php printf(
	1496	+ $printf,
	1497	+ '<a href="' . get_permalink( $post['post_id'] ) . '">' . get_the_title( $post['post_id'] ) . '</a>',
	1498	+ number_format_i18n( $post['views'] )
	1499	+ ); ?></p>
	1500	+ <?php
	1501	+ }
	1502	+ }
	1503	+?>
1307	1504	</div>
1308		- <div class="stats-info-content">
1309		- <div id="top-posts" class="stats-section">
1310		- <div class="stats-section-inner">
1311		- <h3 class="heading"><?php esc_html_e( 'Top Posts', 'jetpack' ); ?></h3>
1312		- <?php
1313		- if ( empty( $top_posts ) ) {
1314		- ?>
1315		- <p class="nothing"><?php esc_html_e( 'Sorry, nothing to report.', 'jetpack' ); ?></p>
1316		- <?php
1317		- } else {
1318		- foreach ( $top_posts as $post ) {
1319		- if ( ! get_post( $post['post_id'] ) ) {
1320		- continue;
1321		- }
1322		- ?>
1323		- <p>
1324		- <?php
1325		- printf(
1326		- esc_html(
1327		- /* Translators: Stats dashboard widget Post list with view count: "Post Title 1 View (or Views if plural)". */
1328		- _n( '%1$s %2$s View', '%1$s %2$s Views', $post['views'], 'jetpack' )
1329		- ),
1330		- '<a href="' . esc_url( get_permalink( $post['post_id'] ) ) . '">' . esc_html( get_the_title( $post['post_id'] ) ) . '</a>',
1331		- esc_html( number_format_i18n( $post['views'] ) )
1332		- );
1333		- ?>
1334		- </p>
1335		- <?php
1336		- }
1337		- }
1338		- ?>
1339		- </div>
1340		- </div>
1341		- <div id="top-search" class="stats-section">
1342		- <div class="stats-section-inner">
1343		- <h3 class="heading"><?php esc_html_e( 'Top Searches', 'jetpack' ); ?></h3>
1344		- <?php
1345		- if ( empty( $searches ) ) {
1346		- ?>
1347		- <p class="nothing"><?php esc_html_e( 'Sorry, nothing to report.', 'jetpack' ); ?></p>
1348		- <?php
1349		- } else {
1350		- foreach ( $searches as $search_term_item ) {
1351		- printf(
1352		- '<p>%s</p>',
1353		- esc_html( $search_term_item )
1354		- );
1355		- }
1356		- }
1357		- ?>
1358		- </div>
1359		- </div>
	1505	+ </div>
	1506	+ <div id="top-search" class='stats-section'>
	1507	+ <div class="stats-section-inner">
	1508	+ <h3 class="heading"><?php esc_html_e( 'Top Searches' , 'jetpack' ); ?></h3>
	1509	+ <?php
	1510	+ if ( empty( $searches ) ) {
	1511	+?>
	1512	+ <p class="nothing"><?php esc_html_e( 'Sorry, nothing to report.', 'jetpack' ); ?></p>
	1513	+ <?php
	1514	+ } else {
	1515	+?>
	1516	+ <p><?php echo join( ',&nbsp; ', $searches );?></p>
	1517	+ <?php
	1518	+ }
	1519	+?>
1360	1520	</div>
1361	1521	</div>
1362	1522	</div>
1363		- <?php
	1523	+<div class="clear"></div>
	1524	+<?php
1364	1525	exit;
1365	1526	}
1366	1527
1367	1528	/**
		@@ -1372,55 +1533,47 @@
1372	1533	* @param mixed $url URL.
1373	1534	* @return void
1374	1535	*/
1375	1536	function stats_print_wp_remote_error( $get, $url ) {
1376		- $state_name = 'stats_remote_error_' . substr( md5( $url ), 0, 8 );
	1537	+ $state_name = 'stats_remote_error_' . substr( md5( $url ), 0, 8 );
1377	1538	$previous_error = Jetpack::state( $state_name );
1378		- $error = md5( wp_json_encode( compact( 'get', 'url' ) ) );
	1539	+ $error = md5( serialize( compact( 'get', 'url' ) ) );
1379	1540	Jetpack::state( $state_name, $error );
1380	1541	if ( $error !== $previous_error ) {
1381		- ?>
1382		- <div class="wrap">
1383		- <p><?php esc_html_e( 'We were unable to get your stats just now. Please reload this page to try again.', 'jetpack' ); ?></p>
1384		- </div>
1385		- <?php
	1542	+?>
	1543	+ <div class="wrap">
	1544	+ <p><?php esc_html_e( 'We were unable to get your stats just now. Please reload this page to try again.', 'jetpack' ); ?></p>
	1545	+ </div>
	1546	+<?php
1386	1547	return;
1387	1548	}
1388		- ?>
	1549	+?>
1389	1550	<div class="wrap">
1390		- <p>
1391		- <?php
1392		- printf(
1393		- /* translators: placeholder is an a href for a support site. */
1394		- esc_html__( 'We were unable to get your stats just now. Please reload this page to try again. If this error persists, please contact %1$s. In your report, please include the information below.', 'jetpack' ),
1395		- sprintf(
1396		- '<a href="https://support.wordpress.com/contact/?jetpack=needs-service">%s</a>',
1397		- esc_html__( 'Jetpack Support', 'jetpack' )
1398		- )
1399		- );
1400		- ?>
1401		- </p>
1402		- <pre class="stats-widget-error">
1403		- User Agent: "<?php echo isset( $_SERVER['HTTP_USER_AGENT'] ) ? esc_html( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized ?>"
1404		- Page URL: "http<?php echo ( is_ssl() ? 's' : '' ) . '://' . esc_html( ( isset( $_SERVER['HTTP_HOST'] ) ? wp_unslash( $_SERVER['HTTP_HOST'] ) : '' ) . ( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '' ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized ?>"
1405		- API URL: "<?php echo esc_url( $url ); ?>"
1406		- <?php
1407		- if ( is_wp_error( $get ) ) {
1408		- foreach ( $get->get_error_codes() as $code ) {
1409		- foreach ( $get->get_error_messages( $code ) as $message ) {
1410		- print esc_html( $code ) . ': "' . esc_html( $message ) . '"';
1411		- }
1412		- }
1413		- } else {
1414		- $get_code = wp_remote_retrieve_response_code( $get );
1415		- $content_length = strlen( wp_remote_retrieve_body( $get ) );
1416		- ?>
1417		- Response code: "<?php print esc_html( $get_code ); ?>"
1418		- Content length: "<?php print esc_html( $content_length ); ?>"
1419		- <?php
	1551	+ <p><?php printf( __( 'We were unable to get your stats just now. Please reload this page to try again. If this error persists, please <a href="%1$s" target="_blank">contact support</a>. In your report please include the information below.', 'jetpack' ), 'https://support.wordpress.com/contact/?jetpack=needs-service' ); ?></p>
	1552	+ <pre>
	1553	+ User Agent: "<?php echo esc_html( $_SERVER['HTTP_USER_AGENT'] ); ?>"
	1554	+ Page URL: "http<?php echo (is_ssl()?'s':'') . '://' . esc_html( $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ); ?>"
	1555	+ API URL: "<?php echo esc_url( $url ); ?>"
	1556	+<?php
	1557	+if ( is_wp_error( $get ) ) {
	1558	+ foreach ( $get->get_error_codes() as $code ) {
	1559	+ foreach ( $get->get_error_messages( $code ) as $message ) {
	1560	+?>
	1561	+<?php print $code . ': "' . $message . '"' ?>
	1562	+
	1563	+<?php
1420	1564	}
1421		- ?>
1422		- </pre>
	1565	+ }
	1566	+} else {
	1567	+ $get_code = wp_remote_retrieve_response_code( $get );
	1568	+ $content_length = strlen( wp_remote_retrieve_body( $get ) );
	1569	+?>
	1570	+Response code: "<?php print $get_code ?>"
	1571	+Content length: "<?php print $content_length ?>"
	1572	+
	1573	+<?php
	1574	+}
	1575	+ ?></pre>
1423	1576	</div>
1424	1577	<?php
1425	1578	}
1426	1579
		@@ -1453,18 +1606,12 @@
1453	1606	* }
1454	1607	* }
1455	1608	*/
1456	1609	function stats_get_csv( $table, $args = null ) {
1457		- $defaults = array(
1458		- 'end' => false,
1459		- 'days' => false,
1460		- 'limit' => 3,
1461		- 'post_id' => false,
1462		- 'summarize' => '',
1463		- );
	1610	+ $defaults = array( 'end' => false, 'days' => false, 'limit' => 3, 'post_id' => false, 'summarize' => '' );
1464	1611
1465		- $args = wp_parse_args( $args, $defaults );
1466		- $args['table'] = $table;
	1612	+ $args = wp_parse_args( $args, $defaults );
	1613	+ $args['table'] = $table;
1467	1614	$args['blog_id'] = Jetpack_Options::get_option( 'id' );
1468	1615
1469	1616	$stats_csv_url = add_query_arg( $args, 'https://stats.wordpress.com/csv.php' );
1470	1617
		@@ -1486,10 +1633,9 @@
1486	1633	}
1487	1634
1488	1635	$stats_rows = array();
1489	1636	do {
1490		- $stats = stats_get_remote_csv( $stats_csv_url );
1491		- if ( ! $stats ) {
	1637	+ if ( ! $stats = stats_get_remote_csv( $stats_csv_url ) ) {
1492	1638	break;
1493	1639	}
1494	1640
1495	1641	$labels = array_shift( $stats );
		@@ -1529,15 +1675,15 @@
1529	1675	* @param mixed $url URL.
1530	1676	* @return array
1531	1677	*/
1532	1678	function stats_get_remote_csv( $url ) {
1533		- $method = 'GET';
	1679	+ $method = 'GET';
1534	1680	$timeout = 90;
1535		- $user_id = 0; // Blog token.
	1681	+ $user_id = JETPACK_MASTER_USER;
1536	1682
1537		- $get = Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
	1683	+ $get = Jetpack_Client::remote_request( compact( 'url', 'method', 'timeout', 'user_id' ) );
1538	1684	$get_code = wp_remote_retrieve_response_code( $get );
1539		- if ( is_wp_error( $get ) || ( 2 !== (int) ( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
	1685	+ if ( is_wp_error( $get ) || ( 2 !== intval( $get_code / 100 ) && 304 !== $get_code ) || empty( $get['body'] ) ) {
1540	1686	return array(); // @todo: return an error?
1541	1687	} else {
1542	1688	return stats_str_getcsv( $get['body'] );
1543	1689	}
		@@ -1543,18 +1689,33 @@
1543	1689	}
1544	1690	}
1545	1691
1546	1692	/**
1547		- * Recursively run str_getcsv on the stats csv.
	1693	+ * Rather than parsing the csv and its special cases, we create a new file and do fgetcsv on it.
1548	1694	*
1549		- * @since 9.7.0 Remove custom handling since str_getcsv is available on all servers running this now.
1550		- *
	1695	+ * @access public
1551	1696	* @param mixed $csv CSV.
1552	1697	* @return array.
1553	1698	*/
1554	1699	function stats_str_getcsv( $csv ) {
1555		- $lines = str_getcsv( $csv, "\n" );
1556		- return array_map( 'str_getcsv', $lines );
	1700	+ if ( function_exists( 'str_getcsv' ) ) {
	1701	+ $lines = str_getcsv( $csv, "\n" ); // phpcs:ignore PHPCompatibility
	1702	+ return array_map( 'str_getcsv', $lines );
	1703	+ }
	1704	+ if ( ! $temp = tmpfile() ) { // The tmpfile() automatically unlinks.
	1705	+ return false;
	1706	+ }
	1707	+
	1708	+ $data = array();
	1709	+
	1710	+ fwrite( $temp, $csv, strlen( $csv ) );
	1711	+ fseek( $temp, 0 );
	1712	+ while ( false !== $row = fgetcsv( $temp, 2000 ) ) {
	1713	+ $data[] = $row;
	1714	+ }
	1715	+ fclose( $temp );
	1716	+
	1717	+ return $data;
1557	1718	}
1558	1719
1559	1720	/**
1560	1721	* Abstract out building the rest api stats path.
		@@ -1563,9 +1724,9 @@
1563	1724	* @return string
1564	1725	*/
1565	1726	function jetpack_stats_api_path( $resource = '' ) {
1566	1727	$resource = ltrim( $resource, '/' );
1567		- return sprintf( '/sites/%d/stats/%s', Stats_Options::get_option( 'blog_id' ), $resource );
	1728	+ return sprintf( '/sites/%d/stats/%s', stats_get_option( 'blog_id' ), $resource );
1568	1729	}
1569	1730
1570	1731	/**
1571	1732	* Fetches stats data from the REST API. Caches locally for 5 minutes.
		@@ -1571,54 +1732,58 @@
1571	1732	* Fetches stats data from the REST API. Caches locally for 5 minutes.
1572	1733	*
1573	1734	* @link: https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/stats/
1574	1735	* @access public
1575		- * @deprecated 11.5 Use WPCOM_Stats available methodsinstead.
1576	1736	* @param array $args (default: array()) The args that are passed to the endpoint.
1577	1737	* @param string $resource (default: '') Optional sub-endpoint following /stats/.
1578	1738	* @return array|WP_Error.
1579	1739	*/
1580	1740	function stats_get_from_restapi( $args = array(), $resource = '' ) {
1581		- _deprecated_function( __METHOD__, 'jetpack-11.5', 'Please checkout the methods available in Automattic\Jetpack\Stats\WPCOM_Stats' );
1582	1741	$endpoint = jetpack_stats_api_path( $resource );
1583	1742	$api_version = '1.1';
1584	1743	$args = wp_parse_args( $args, array() );
1585		- $cache_key = md5( implode( '|', array( $endpoint, $api_version, wp_json_encode( $args ) ) ) );
	1744	+ $cache_key = md5( implode( '|', array( $endpoint, $api_version, serialize( $args ) ) ) );
1586	1745
1587		- $transient_name = "jetpack_restapi_stats_cache_{$cache_key}";
	1746	+ // Get cache.
	1747	+ $stats_cache = Jetpack_Options::get_option( 'restapi_stats_cache', array() );
	1748	+ if ( ! is_array( $stats_cache ) ) {
	1749	+ $stats_cache = array();
	1750	+ }
1588	1751
1589		- $stats_cache = get_transient( $transient_name );
1590		-
1591	1752	// Return or expire this key.
1592		- if ( $stats_cache ) {
1593		- $time = key( $stats_cache );
1594		- $data = $stats_cache[ $time ]; // WP_Error or string (JSON encoded object).
1595		-
1596		- if ( is_wp_error( $data ) ) {
1597		- return $data;
	1753	+ if ( isset( $stats_cache[ $cache_key ] ) ) {
	1754	+ $time = key( $stats_cache[ $cache_key ] );
	1755	+ if ( time() - $time < ( 5 * MINUTE_IN_SECONDS ) ) {
	1756	+ $cached_stats = $stats_cache[ $cache_key ][ $time ];
	1757	+ $cached_stats = (object) array_merge( array( 'cached_at' => $time ), (array) $cached_stats );
	1758	+ return $cached_stats;
1598	1759	}
1599		-
1600		- return (object) array_merge( array( 'cached_at' => $time ), (array) json_decode( $data ) );
	1760	+ unset( $stats_cache[ $cache_key ] );
1601	1761	}
1602	1762
1603	1763	// Do the dirty work.
1604		- $response = Client::wpcom_json_api_request_as_blog( $endpoint, $api_version, $args );
	1764	+ $response = Jetpack_Client::wpcom_json_api_request_as_blog( $endpoint, $api_version, $args );
1605	1765	if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
1606		- // WP_Error.
1607		- $data = is_wp_error( $response ) ? $response : new WP_Error( 'stats_error' );
1608		- // WP_Error.
1609		- $return = $data;
1610		- } else {
1611		- // string (JSON encoded object).
1612		- $data = wp_remote_retrieve_body( $response );
1613		- // object (rare: null on JSON failure).
1614		- $return = json_decode( $data );
	1766	+ // If bad, just return it, don't cache.
	1767	+ return $response;
1615	1768	}
1616	1769
1617		- // To reduce size in storage: store with time as key, store JSON encoded data (unless error).
1618		- set_transient( $transient_name, array( time() => $data ), 5 * MINUTE_IN_SECONDS );
	1770	+ $data = json_decode( wp_remote_retrieve_body( $response ) );
1619	1771
1620		- return $return;
	1772	+ // Expire old keys.
	1773	+ foreach ( $stats_cache as $k => $cache ) {
	1774	+ if ( ! is_array( $cache ) || ( 5 * MINUTE_IN_SECONDS ) < time() - key( $cache ) ) {
	1775	+ unset( $stats_cache[ $k ] );
	1776	+ }
	1777	+ }
	1778	+
	1779	+ // Set cache.
	1780	+ $stats_cache[ $cache_key ] = array(
	1781	+ time() => $data,
	1782	+ );
	1783	+ Jetpack_Options::update_option( 'restapi_stats_cache', $stats_cache, false );
	1784	+
	1785	+ return $data;
1621	1786	}
1622	1787
1623	1788	/**
1624	1789	* Load CSS needed for Stats column width in WP-Admin area.
		@@ -1635,9 +1800,9 @@
1635	1800	<?php
1636	1801	}
1637	1802
1638	1803	/**
1639		- * Set header for column that allows to view an entry's stats.
	1804	+ * Set header for column that allows to go to WordPress.com to see an entry's stats.
1640	1805	*
1641	1806	* @param array $columns An array of column names.
1642	1807	*
1643	1808	* @since 4.7.0
		@@ -1643,41 +1808,17 @@
1643	1808	* @since 4.7.0
1644	1809	*
1645	1810	* @return mixed
1646	1811	*/
1647		-function jetpack_stats_post_table( $columns ) {
1648		- /*
1649		- * Stats can be accessed in wp-admin or in Calypso,
1650		- * depending on what version of the stats screen is enabled on your site.
1651		- *
1652		- * In both cases, the user must be allowed to access stats.
1653		- *
1654		- * If the Odyssey Stats experience isn't enabled, the user will need to go to Calypso,
1655		- * so they need to be connected to WordPress.com to be able to access that page.
1656		- */
1657		- if (
1658		- ! current_user_can( 'view_stats' )
1659		- || (
1660		- ! Stats_Options::get_option( 'enable_odyssey_stats' )
1661		- && ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected()
1662		- )
1663		- ) {
	1812	+function jetpack_stats_post_table( $columns ) { // Adds a stats link on the edit posts page
	1813	+ if ( ! current_user_can( 'view_stats' ) || ! Jetpack::is_user_connected() ) {
1664	1814	return $columns;
1665	1815	}
1666		-
1667		- // Array-Fu to add before comments.
1668		- $pos = array_search( 'comments', array_keys( $columns ), true );
1669		-
1670		- // Fallback to the last position if the post type does not support comments.
	1816	+ // Array-Fu to add before comments
	1817	+ $pos = array_search( 'comments', array_keys( $columns ) );
1671	1818	if ( ! is_int( $pos ) ) {
1672		- $pos = count( $columns );
1673		- }
1674		-
1675		- // Final fallback, if the array was malformed by another plugin for example.
1676		- if ( ! is_int( $pos ) ) {
1677	1819	return $columns;
1678	1820	}
1679		-
1680	1821	$chunks = array_chunk( $columns, $pos, true );
1681	1822	$chunks[0]['stats'] = esc_html__( 'Stats', 'jetpack' );
1682	1823
1683	1824	return call_user_func_array( 'array_merge', $chunks );
		@@ -1683,9 +1824,9 @@
1683	1824	return call_user_func_array( 'array_merge', $chunks );
1684	1825	}
1685	1826
1686	1827	/**
1687		- * Set content for cell with link to an entry's stats in Odyssey Stats.
	1828	+ * Set content for cell with link to an entry's stats in WordPress.com.
1688	1829	*
1689	1830	* @param string $column The name of the column to display.
1690	1831	* @param int $post_id The current post ID.
1691	1832	*
		@@ -1693,58 +1834,19 @@
1693	1834	*
1694	1835	* @return mixed
1695	1836	*/
1696	1837	function jetpack_stats_post_table_cell( $column, $post_id ) {
1697		- if ( 'stats' === $column ) {
1698		- if ( 'publish' !== get_post_status( $post_id ) ) {
	1838	+ if ( 'stats' == $column ) {
	1839	+ if ( 'publish' != get_post_status( $post_id ) ) {
1699	1840	printf(
1700	1841	'<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
1701	1842	esc_html__( 'No stats', 'jetpack' )
1702	1843	);
1703	1844	} else {
1704		- $stats_post_url = ! ( new Host() )->is_woa_site() && Stats_Options::get_option( 'enable_odyssey_stats' )
1705		- ? admin_url( sprintf( 'admin.php?page=stats#!/stats/post/%d/%d', $post_id, Jetpack_Options::get_option( 'id', 0 ) ) )
1706		- : Redirect::get_url(
1707		- 'calypso-stats-post',
1708		- array(
1709		- 'path' => $post_id,
1710		- )
1711		- );
1712		-
1713	1845	printf(
1714	1846	'<a href="%s" title="%s" class="dashicons dashicons-chart-bar" target="_blank"></a>',
1715		- esc_url( $stats_post_url ),
1716		- esc_html__( 'View stats for this post', 'jetpack' )
	1847	+ esc_url( "https://wordpress.com/stats/post/$post_id/" . Jetpack::build_raw_urls( get_home_url() ) ),
	1848	+ esc_html__( 'View stats for this post in WordPress.com', 'jetpack' )
1717	1849	);
1718	1850	}
1719	1851	}
1720		-}
1721		-
1722		-/**
1723		- * Add the Jetpack plugin version to the stats tracking data.
1724		- *
1725		- * @param array $kvs The stats array in key values.
1726		- * @return array
1727		- */
1728		-function filter_stats_array_add_jp_version( $kvs ) {
1729		- $kvs['j'] = sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION );
1730		-
1731		- return $kvs;
1732		-}
1733		-
1734		-/**
1735		- * Convert stats array to object after sanity checking the array is valid.
1736		- *
1737		- * @param array $stats_array The stats array.
1738		- * @return WP_Error|Object|null
1739		- */
1740		-function convert_stats_array_to_object( $stats_array ) {
1741		-
1742		- if ( is_wp_error( $stats_array ) ) {
1743		- return $stats_array;
1744		- }
1745		- $encoded_array = wp_json_encode( $stats_array );
1746		- if ( ! $encoded_array ) {
1747		- return new WP_Error( 'stats_encoding_error', 'Failed to encode stats array' );
1748		- }
1749		- return json_decode( $encoded_array );
1750	1852	}