From 8ca9f010b0a266b0bb14219f9b0654a90a42b5c9 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 4 Sep 2013 16:59:51 +0300
Subject: [PATCH] Add namespace to otpoll

---
 ajax/otpoll.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index 3a3375b4..31bf8e9d 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -35,18 +35,20 @@
  * @source: http://gitorious.org/webodf/webodf/
  */
 
- OCP\JSON::checkLoggedIn();
- OCP\JSON::checkAppEnabled('documents');
+namespace OCA\Documents;
+
+ \OCP\JSON::checkLoggedIn();
+ \OCP\JSON::checkAppEnabled('documents');
  // session_write_close();
 
 $response = array();
 try{
-	$request = new OCA\Documents\Request();
+	$request = new Request();
 	$command = $request->getParam('command');
 	switch ($command){
 		case 'query_memberdata_list':
 			$ids = $request->getParam('args/member_ids');
-			$members = OCA\Documents\Member::getMembersAsArray($ids);
+			$members = Member::getMembersAsArray($ids);
 			$response["memberdata_list"] = array_map(
 					function($x){
 						$x['display_name'] = \OCP\User::getDisplayName($x['uid']);
@@ -79,15 +81,15 @@ try{
 				$memberId = $request->getParam('args/member_id');
 				$ops = $request->getParam('args/client_ops');
 				$hasOps = is_array($ops) && count($ops)>0;
-				$inactiveMembers = \OCA\Documents\Member::cleanSession($esId);
+				$inactiveMembers = Member::cleanSession($esId);
 				if (is_array($inactiveMembers)){
 					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 {
-					OCA\Documents\Member::updateMemberActivity($memberId);
+					Member::updateMemberActivity($memberId);
 				} catch (\Exception $e){
 					
 				}
@@ -98,7 +100,7 @@ try{
 					if ($hasOps) {
 						// incoming ops without conflict
 						// 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["head_seq"] = $newHead ? $newHead : $currentHead;
 					} else {
@@ -108,7 +110,7 @@ try{
 						$response["head_seq"] = $currentHead;
 					}
 				} else { // HEADs do not match
-					$response["ops"] = OCA\Documents\Op::getOpsAfterJson($esId, $seqHead);
+					$response["ops"] = Op::getOpsAfterJson($esId, $seqHead);
 					$response["head_seq"] = $currentHead;
 					$response["result"] = $hasOps ? 'conflict' : 'new_ops';
 				}