WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Heartbeat API: add nopriv actions, add JS 'heartbeat-send' event, see #23216 

git-svn-id: http://core.svn.wordpress.org/trunk@23481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2013-02-25 02:32:22 +00:00
parent e91f4bd35f
commit 9c2ebc4c60
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/admin-ajax.php
View File

@ -67,6 +67,7 @@ if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_po
add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
add_action( 'wp_ajax_nopriv_autosave', 'wp_ajax_nopriv_autosave', 1 );
add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
if ( is_user_logged_in() )
do_action( 'wp_ajax_' . $_REQUEST['action'] ); // Authenticated actions

32
wp-admin/includes/ajax-actions.php
View File

@ -2081,12 +2081,12 @@ function wp_ajax_heartbeat() {
check_ajax_referer( 'heartbeat-nonce', '_nonce' );
$response = array();
// screenid is the same as $current_screen->id and the JS global 'pagenow'
// screen_id is the same as $current_screen->id and the JS global 'pagenow'
if ( ! empty($_POST['screenid']) )
$screen_id = sanitize_key($_POST['screenid']);
else
$screen_id = 'site';
if ( ! empty($_POST['data']) ) {
$data = wp_unslash( (array) $_POST['data'] );
// todo: how much to sanitize and preset and what to leave to be accessed from $data or $_POST..?
@ -2106,9 +2106,31 @@ function wp_ajax_heartbeat() {
// send the current time acording to the server
$response['servertime'] = time();
// Change the interval, format: array( speed, ticks )
if ( isset($response['heartbeat_interval']) )
$response['heartbeat_interval'] = (array) $response['heartbeat_interval'];
wp_send_json($response);
}
function wp_ajax_nopriv_heartbeat() {
$response = array();
// screen_id is the same as $current_screen->id and the JS global 'pagenow'
if ( ! empty($_POST['screenid']) )
$screen_id = sanitize_key($_POST['screenid']);
else
$screen_id = 'site';
if ( ! empty($_POST['data']) ) {
$data = wp_unslash( (array) $_POST['data'] );
$response = apply_filters( 'heartbeat_nopriv_received', $response, $data, $screen_id );
}
$response = apply_filters( 'heartbeat_nopriv_send', $response, $screen_id );
// Allow the transport to be replaced with long-polling easily
do_action( 'heartbeat_nopriv_tick', $response, $screen_id );
// send the current time acording to the server
$response['servertime'] = time();
wp_send_json($response);
}

4
wp-includes/general-template.php
View File

@ -2287,6 +2287,8 @@ function __checked_selected_helper( $helper, $current, $echo, $type ) {
* @return array $settings
*/
function wp_heartbeat_settings( $settings ) {
$setting['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
if ( is_user_logged_in() )
$setting['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
return $setting;
}

1
wp-includes/js/heartbeat.js
View File

@ -95,6 +95,7 @@ window.wp = window.wp || {};
tick = time();
data.data = $.extend( {}, queue );
$(document).trigger( 'heartbeat-send', [data.data] );
data.interval = interval / 1000;
data._nonce = nonce;