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

Make sure that cursor/member exists before removal

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-12-06 19:54:30 +03:00
parent bc06816833
commit 40182b061c
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/db/op.php
View File

@ -84,8 +84,10 @@ class Db_Op extends Db {
}
public function removeCursor($esId, $memberId){
$op = '{"optype":"RemoveCursor","memberid":"'. $memberId .'","reason":"server-idle","timestamp":'. time() .'}';
$this->insertOp($esId, $op);
if ($this->hasAddCursor($esId, $memberId)){
$op = '{"optype":"RemoveCursor","memberid":"'. $memberId .'","reason":"server-idle","timestamp":'. time() .'}';
$this->insertOp($esId, $op);
}
}
public function addMember($esId, $memberId, $fullName, $color, $imageUrl){
@ -94,8 +96,10 @@ class Db_Op extends Db {
}
public function removeMember($esId, $memberId){
$op ='{"optype":"RemoveMember","memberid":"'. $memberId .'","timestamp":'. time() .'}';
$this->insertOp($esId, $op);
if ($this->hasAddMember($esId, $memberId)){
$op ='{"optype":"RemoveMember","memberid":"'. $memberId .'","timestamp":'. time() .'}';
$this->insertOp($esId, $op);
}
}
public function updateMember($esId, $memberId, $fullName, $color, $imageUrl){
@ -114,4 +118,22 @@ class Db_Op extends Db {
$op->insert();
}
protected function hasAddMember($esId, $memberId){
$ops = $this->execute(
'SELECT * FROM ' . $this->tableName . ' WHERE `es_id`=? AND `opspec` LIKE \'%"AddMember","memberid":"' . $memberId .'"%\'',
array($esId)
);
$result = $ops->fetchAll();
return is_array($result) && count($result)>0;
}
protected function hasAddCursor($esId, $memberId){
$ops = $this->execute(
'SELECT * FROM ' . $this->tableName . ' WHERE `es_id`=? AND `opspec` LIKE \'%"AddCursor","memberid":"' . $memberId .'"%\'',
array($esId)
);
$result = $ops->fetchAll();
return is_array($result) && count($result)>0;
}
}