DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add requesttoken to save xhr in Server.js, fetch correct headers in controller

Browse Source
This commit is contained in:
Jörn Friedrich Dreyer 2013-09-02 14:59:13 +02:00
parent 64e8ea689b
commit fe76963f22
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ajax/controller.php
View File

@ -106,11 +106,12 @@ class Controller {
*/ */
public static function save(){ public static function save(){
$uid = self::preDispatch(); $uid = self::preDispatch();
$esId = @$_POST['es_id']; $sessionID = @$_SERVER['HTTP_WEBODF_SESSION_ID'];
$memberId = @$_POST['member_id']; $memberId = @$_SERVER['HTTP_WEBODF_MEMBER_ID'];
$content = @$_POST['content']; $sessionRevision = @$_SERVER['HTTP_WEBODF_SESSION_REVISION'];
if ($esId && $content){ $content = fopen('php://input','r');
$session = Session::getSession($esId); if ($sessionID && $content){
$session = Session::getSession($sessionID);
$fileInfo = \OC\Files\Cache\Cache::getById($session['file_id']); $fileInfo = \OC\Files\Cache\Cache::getById($session['file_id']);
$path = $fileInfo[1]; $path = $fileInfo[1];
$view = new \OC\Files\View('/' . $session['owner']); $view = new \OC\Files\View('/' . $session['owner']);

1
js/editor/server/pullbox/Server.js
View File

@ -266,6 +266,7 @@ runtime.log("Sending message to server: "+messageString);
// do the request // do the request
xhr.open('POST', args.sessionStateToFileUrl, true); xhr.open('POST', args.sessionStateToFileUrl, true);
xhr.setRequestHeader("requesttoken", oc_requesttoken);
xhr.setRequestHeader("webodf-session-id", sessionId); xhr.setRequestHeader("webodf-session-id", sessionId);
xhr.setRequestHeader("webodf-member-id", memberId); xhr.setRequestHeader("webodf-member-id", memberId);
xhr.setRequestHeader("webodf-session-revision", seqHead); xhr.setRequestHeader("webodf-session-revision", seqHead);