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

Inject removeCursor as latest op

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-09-04 20:48:14 +03:00
parent b48d244cf1
commit 93bfd1ab6a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ajax/otpoll.php
View File

@ -81,12 +81,7 @@ try{
$memberId = $request->getParam('args/member_id'); $memberId = $request->getParam('args/member_id');
$ops = $request->getParam('args/client_ops'); $ops = $request->getParam('args/client_ops');
$hasOps = is_array($ops) && count($ops)>0; $hasOps = is_array($ops) && count($ops)>0;
$inactiveMembers = Member::cleanSession($esId);
if (is_array($inactiveMembers)){
foreach ($inactiveMembers as $member){
Op::removeCursor($esId, $member['member_id']);
}
}
$currentHead = Op::getHeadSeq($esId); $currentHead = Op::getHeadSeq($esId);
try { try {
Member::updateMemberActivity($memberId); Member::updateMemberActivity($memberId);
@ -114,6 +109,14 @@ try{
$response["head_seq"] = $currentHead; $response["head_seq"] = $currentHead;
$response["result"] = $hasOps ? 'conflict' : 'new_ops'; $response["result"] = $hasOps ? 'conflict' : 'new_ops';
} }
$inactiveMembers = Member::cleanSession($esId);
if (is_array($inactiveMembers)){
foreach ($inactiveMembers as $member){
Op::removeCursor($esId, $member['member_id']);
}
}
} else { } else {
// Error - no seq_head passed // Error - no seq_head passed
throw new BadRequestException(); throw new BadRequestException();