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

Add namespace to otpoll

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-09-04 16:59:51 +03:00
parent 34f08eb4c1
commit 8ca9f010b0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ajax/otpoll.php
View File

@ -35,18 +35,20 @@
* @source: http://gitorious.org/webodf/webodf/ * @source: http://gitorious.org/webodf/webodf/
*/ */
OCP\JSON::checkLoggedIn(); namespace OCA\Documents;
OCP\JSON::checkAppEnabled('documents');
\OCP\JSON::checkLoggedIn();
\OCP\JSON::checkAppEnabled('documents');
// session_write_close(); // session_write_close();
$response = array(); $response = array();
try{ try{
$request = new OCA\Documents\Request(); $request = new Request();
$command = $request->getParam('command'); $command = $request->getParam('command');
switch ($command){ switch ($command){
case 'query_memberdata_list': case 'query_memberdata_list':
$ids = $request->getParam('args/member_ids'); $ids = $request->getParam('args/member_ids');
$members = OCA\Documents\Member::getMembersAsArray($ids); $members = Member::getMembersAsArray($ids);
$response["memberdata_list"] = array_map( $response["memberdata_list"] = array_map(
function($x){ function($x){
$x['display_name'] = \OCP\User::getDisplayName($x['uid']); $x['display_name'] = \OCP\User::getDisplayName($x['uid']);
@ -79,15 +81,15 @@ 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 = \OCA\Documents\Member::cleanSession($esId); $inactiveMembers = Member::cleanSession($esId);
if (is_array($inactiveMembers)){ if (is_array($inactiveMembers)){
foreach ($inactiveMembers as $member){ foreach ($inactiveMembers as $member){
\OCA\Documents\Op::removeCursor($esId, $member['member_id']); Op::removeCursor($esId, $member['member_id']);
} }
} }
$currentHead = OCA\Documents\Op::getHeadSeq($esId); $currentHead = Op::getHeadSeq($esId);
try { try {
OCA\Documents\Member::updateMemberActivity($memberId); Member::updateMemberActivity($memberId);
} catch (\Exception $e){ } catch (\Exception $e){
} }
@ -98,7 +100,7 @@ try{
if ($hasOps) { if ($hasOps) {
// incoming ops without conflict // incoming ops without conflict
// Add incoming ops, respond with a new head // Add incoming ops, respond with a new head
$newHead = OCA\Documents\Op::addOpsArray($esId, $memberId, $ops); $newHead = Op::addOpsArray($esId, $memberId, $ops);
$response["result"] = 'added'; $response["result"] = 'added';
$response["head_seq"] = $newHead ? $newHead : $currentHead; $response["head_seq"] = $newHead ? $newHead : $currentHead;
} else { } else {
@ -108,7 +110,7 @@ try{
$response["head_seq"] = $currentHead; $response["head_seq"] = $currentHead;
} }
} else { // HEADs do not match } else { // HEADs do not match
$response["ops"] = OCA\Documents\Op::getOpsAfterJson($esId, $seqHead); $response["ops"] = Op::getOpsAfterJson($esId, $seqHead);
$response["head_seq"] = $currentHead; $response["head_seq"] = $currentHead;
$response["result"] = $hasOps ? 'conflict' : 'new_ops'; $response["result"] = $hasOps ? 'conflict' : 'new_ops';
} }