Merge branch 'improved-ajax' into improved-ajax-moodle
Conflicts: h5p.classes.phppull/17/head
commit
b42193729e
|
@ -2586,6 +2586,91 @@ class H5PCore {
|
|||
|
||||
return $input;
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes it easier to print response when AJAX request succeeds.
|
||||
*
|
||||
* @param mixed $data
|
||||
* @since 1.6.0
|
||||
*/
|
||||
public static function ajaxSuccess($data = NULL) {
|
||||
$response = array(
|
||||
'success' => TRUE
|
||||
);
|
||||
if ($message !== NULL) {
|
||||
$response['data'] = $data;
|
||||
}
|
||||
self::printJson($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes it easier to print response when AJAX request fails.
|
||||
* Will exit after printing error.
|
||||
*
|
||||
* @param string $message
|
||||
* @since 1.6.0
|
||||
*/
|
||||
public static function ajaxError($message = NULL) {
|
||||
$response = array(
|
||||
'success' => FALSE
|
||||
);
|
||||
if ($message !== NULL) {
|
||||
$response['message'] = $message;
|
||||
}
|
||||
self::printJson($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Print JSON headers with UTF-8 charset and json encode response data.
|
||||
* Makes it easier to respond using JSON.
|
||||
*
|
||||
* @param mixed $data
|
||||
*/
|
||||
private static function printJson($data) {
|
||||
header('Cache-Control: no-cache');
|
||||
header('Content-type: application/json; charset=utf-8');
|
||||
print json_encode($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a new H5P security token for the given action.
|
||||
*
|
||||
* @param string $action
|
||||
* @return string token
|
||||
*/
|
||||
public static function createToken($action) {
|
||||
if (!isset($_SESSION['h5p_token'])) {
|
||||
// Create an unique key which is used to create action tokens for this session.
|
||||
$_SESSION['h5p_token'] = uniqid();
|
||||
}
|
||||
|
||||
// Timefactor
|
||||
$time_factor = self::getTimeFactor();
|
||||
|
||||
// Create and return token
|
||||
return substr(hash('md5', $action . $time_factor . $_SESSION['h5p_token']), -16, 13);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a time based number which is unique for each 12 hour.
|
||||
* @return int
|
||||
*/
|
||||
private static function getTimeFactor() {
|
||||
return ceil(time() / (86400 / 2));
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify if the given token is valid for the given action.
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $token
|
||||
* @return boolean valid token
|
||||
*/
|
||||
public static function validToken($action, $token) {
|
||||
$time_factor = self::getTimeFactor();
|
||||
return $token === substr(hash('md5', $action . $time_factor . $_SESSION['h5p_token']), -16, 13) || // Under 12 hours
|
||||
$token === substr(hash('md5', $action . ($time_factor - 1) . $_SESSION['h5p_token']), -16, 13); // Between 12-24 hours
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -139,8 +139,8 @@ H5P.EventDispatcher = (function () {
|
|||
}
|
||||
|
||||
var once = function (event) {
|
||||
self.off(event, once);
|
||||
listener.apply(this, event);
|
||||
self.off(event.type, once);
|
||||
listener.call(this, event);
|
||||
};
|
||||
|
||||
self.on(type, once, thisArg);
|
||||
|
|
|
@ -1616,7 +1616,8 @@ H5P.setFinished = function (contentId, score, maxScore, time) {
|
|||
maxScore: maxScore,
|
||||
opened: toUnix(H5P.opened[contentId]),
|
||||
finished: toUnix(new Date()),
|
||||
time: time
|
||||
time: time,
|
||||
token: H5PIntegration.tokens.result
|
||||
});
|
||||
}
|
||||
};
|
||||
|
@ -1760,7 +1761,8 @@ H5P.createTitle = function (rawTitle, maxLength) {
|
|||
options.data = {
|
||||
data: (data === null ? 0 : data),
|
||||
preload: (preload ? 1 : 0),
|
||||
invalidate: (invalidate ? 1 : 0)
|
||||
invalidate: (invalidate ? 1 : 0),
|
||||
token: H5PIntegration.tokens.contentUserData
|
||||
};
|
||||
}
|
||||
else {
|
||||
|
@ -1772,7 +1774,7 @@ H5P.createTitle = function (rawTitle, maxLength) {
|
|||
};
|
||||
options.success = function (response) {
|
||||
if (!response.success) {
|
||||
done(response.error);
|
||||
done(response.message);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue