From 214c6dfa361a91c5850f1a7cd469d28e6c1d021b Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 4 Aug 2014 20:56:24 +0300
Subject: [PATCH] Db_Op -> Db\Op

---
 ajax/otpoll.php         | 4 ++--
 ajax/userController.php | 4 ++--
 appinfo/app.php         | 1 -
 lib/db/op.php           | 8 ++++----
 lib/db/session.php      | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index f7fd940a..476563c0 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -61,7 +61,7 @@ try{
 				$ops = $request->getParam('args/client_ops');
 				$hasOps = is_array($ops) && count($ops)>0;
 
-				$op = new Db_Op();
+				$op = new Db\Op();
 				$currentHead = $op->getHeadSeq($esId);
 				
 				try {
@@ -76,7 +76,7 @@ try{
 					if ($hasOps) {
 						// incoming ops without conflict
 						// Add incoming ops, respond with a new head
-						$newHead = Db_Op::addOpsArray($esId, $memberId, $ops);
+						$newHead = Db\Op::addOpsArray($esId, $memberId, $ops);
 						$response["result"] = 'added';
 						$response["head_seq"] = $newHead ? $newHead : $currentHead;
 					} else {
diff --git a/ajax/userController.php b/ajax/userController.php
index e65dbd76..8eca2fc8 100644
--- a/ajax/userController.php
+++ b/ajax/userController.php
@@ -31,7 +31,7 @@ class UserController extends Controller{
 		if ($esId && $member->hasData()){
 			if ($member->getEsId() === $esId && $member->getStatus() == Db_Member::MEMBER_STATUS_ACTIVE){
 				$member->deactivate(array($args['member_id']));
-				$op = new Db_Op();
+				$op = new Db\Op();
 				$op->removeMember($esId, $args['member_id']);
 			}
 		}
@@ -56,7 +56,7 @@ class UserController extends Controller{
 				$name = $name . ' ' . $guestMark;
 			}
 			
-			$op = new Db_Op();
+			$op = new Db\Op();
 			$op->changeNick($member->getEsId(), $memberId, $name);
 		}
 		\OCP\JSON::success();
diff --git a/appinfo/app.php b/appinfo/app.php
index 80a11026..c0d26978 100755
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -41,7 +41,6 @@ OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.
 OC::$CLASSPATH['OCA\Documents\Download_Simple'] = 'documents/lib/download/simple.php';
 OC::$CLASSPATH['OCA\Documents\Download_Range'] = 'documents/lib/download/range.php';
 OC::$CLASSPATH['OCA\Documents\Db_Member'] = 'documents/lib/db/member.php';
-OC::$CLASSPATH['OCA\Documents\Db_Op'] = 'documents/lib/db/op.php';
 OC::$CLASSPATH['OCA\Documents\Filter_Office'] = 'documents/lib/filter/office.php';
 
 //Script for registering file actions
diff --git a/lib/db/op.php b/lib/db/op.php
index 31ca7d31..4cd37e09 100644
--- a/lib/db/op.php
+++ b/lib/db/op.php
@@ -9,9 +9,9 @@
  * later.
  */
 
-namespace OCA\Documents;
+namespace OCA\Documents\Db;
 
-class Db_Op extends Db {
+class Op extends \OCA\Documents\Db {
 
 	const DB_TABLE = '`*PREFIX*documents_op`';
 	
@@ -21,7 +21,7 @@ class Db_Op extends Db {
 
 	public static function addOpsArray($esId, $memberId, $ops){
 		$lastSeq = "";
-		$opObj = new Db_Op();
+		$opObj = new Op();
 		foreach ($ops as $op) {
 			$opObj->setData(array(
 				$esId, 
@@ -116,7 +116,7 @@ class Db_Op extends Db {
 	}
 	
 	protected function insertOp($esId, $memberId, $op){
-		$op = new Db_Op(array(
+		$op = new Op(array(
 			$esId, 
 			$memberId,
 			$op
diff --git a/lib/db/session.php b/lib/db/session.php
index 53ad6b42..2dab139d 100644
--- a/lib/db/session.php
+++ b/lib/db/session.php
@@ -90,7 +90,7 @@ class Session extends \OCA\Documents\Db {
 			$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db_Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
 			
 			$sessionData['member_id'] = (string) $member->getLastInsertId();
-			$op = new \OCA\Documents\Db_Op();
+			$op = new \OCA\Documents\Db\Op();
 			$op->addMember(
 					$sessionData['es_id'],
 					$sessionData['member_id'],
@@ -115,7 +115,7 @@ class Session extends \OCA\Documents\Db {
 		$member = new \OCA\Documents\Db_Member();
 		$member->deleteBy('es_id', $esId);
 		
-		$op= new \OCA\Documents\Db_Op();
+		$op= new \OCA\Documents\Db\Op();
 		$op->deleteBy('es_id', $esId);
 	}