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

Db_Op -> Db\Op

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-08-04 20:56:24 +03:00
parent 7356dcfae3
commit 214c6dfa36
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ajax/otpoll.php
View File

@ -61,7 +61,7 @@ try{
$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;
$op = new Db_Op(); $op = new Db\Op();
$currentHead = $op->getHeadSeq($esId); $currentHead = $op->getHeadSeq($esId);
try { try {
@ -76,7 +76,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 = Db_Op::addOpsArray($esId, $memberId, $ops); $newHead = Db\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 {

4
ajax/userController.php
View File

@ -31,7 +31,7 @@ class UserController extends Controller{
if ($esId && $member->hasData()){ if ($esId && $member->hasData()){
if ($member->getEsId() === $esId && $member->getStatus() == Db_Member::MEMBER_STATUS_ACTIVE){ if ($member->getEsId() === $esId && $member->getStatus() == Db_Member::MEMBER_STATUS_ACTIVE){
$member->deactivate(array($args['member_id'])); $member->deactivate(array($args['member_id']));
$op = new Db_Op(); $op = new Db\Op();
$op->removeMember($esId, $args['member_id']); $op->removeMember($esId, $args['member_id']);
} }
} }
@ -56,7 +56,7 @@ class UserController extends Controller{
$name = $name . ' ' . $guestMark; $name = $name . ' ' . $guestMark;
} }
$op = new Db_Op(); $op = new Db\Op();
$op->changeNick($member->getEsId(), $memberId, $name); $op->changeNick($member->getEsId(), $memberId, $name);
} }
\OCP\JSON::success(); \OCP\JSON::success();

1
appinfo/app.php
View File

@ -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_Simple'] = 'documents/lib/download/simple.php';
OC::$CLASSPATH['OCA\Documents\Download_Range'] = 'documents/lib/download/range.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_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'; OC::$CLASSPATH['OCA\Documents\Filter_Office'] = 'documents/lib/filter/office.php';
//Script for registering file actions //Script for registering file actions

8
lib/db/op.php
View File

@ -9,9 +9,9 @@
* later. * 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`'; const DB_TABLE = '`*PREFIX*documents_op`';
@ -21,7 +21,7 @@ class Db_Op extends Db {
public static function addOpsArray($esId, $memberId, $ops){ public static function addOpsArray($esId, $memberId, $ops){
$lastSeq = ""; $lastSeq = "";
$opObj = new Db_Op(); $opObj = new Op();
foreach ($ops as $op) { foreach ($ops as $op) {
$opObj->setData(array( $opObj->setData(array(
$esId, $esId,
@ -116,7 +116,7 @@ class Db_Op extends Db {
} }
protected function insertOp($esId, $memberId, $op){ protected function insertOp($esId, $memberId, $op){
$op = new Db_Op(array( $op = new Op(array(
$esId, $esId,
$memberId, $memberId,
$op $op

4
lib/db/session.php
View File

@ -90,7 +90,7 @@ class Session extends \OCA\Documents\Db {
$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db_Member::getGuestPostfix() : \OCP\User::getDisplayName($uid); $displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db_Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
$sessionData['member_id'] = (string) $member->getLastInsertId(); $sessionData['member_id'] = (string) $member->getLastInsertId();
$op = new \OCA\Documents\Db_Op(); $op = new \OCA\Documents\Db\Op();
$op->addMember( $op->addMember(
$sessionData['es_id'], $sessionData['es_id'],
$sessionData['member_id'], $sessionData['member_id'],
@ -115,7 +115,7 @@ class Session extends \OCA\Documents\Db {
$member = new \OCA\Documents\Db_Member(); $member = new \OCA\Documents\Db_Member();
$member->deleteBy('es_id', $esId); $member->deleteBy('es_id', $esId);
$op= new \OCA\Documents\Db_Op(); $op= new \OCA\Documents\Db\Op();
$op->deleteBy('es_id', $esId); $op->deleteBy('es_id', $esId);
} }