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

MemberId, not member

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-08-09 20:30:14 +03:00 committed by Tobias Hintze
parent 1d88fb351c
commit 86952308ce
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ajax/controller.php
View File

@ -61,6 +61,7 @@ class Controller {
if ($esId){ if ($esId){
$session = Session::getSession($esId); $session = Session::getSession($esId);
// !TODO: return member_id here ???
\OCP\JSON::success($session); \OCP\JSON::success($session);
exit(); exit();
} }

8
ajax/otpoll.php
View File

@ -64,9 +64,15 @@ try{
exit(); exit();
break; break;
case 'join-session': case 'join-session':
$response = "true"; // should fail when session is non-existent OCA\Office\Controller::joinSession(array(
'es_id' => $request->getParam('args/es_id')
));
exit();
break; break;
case 'user-list': case 'user-list':
$members = OCA\Office\Member::getMembersByEsId(
$request->getParam('args/es_id')
);
break; break;
case 'sync-ops': case 'sync-ops':
$seqHead = $request->getParam('args/seq_head'); $seqHead = $request->getParam('args/seq_head');

2
appinfo/database.xml
View File

@ -60,7 +60,7 @@
<name>*dbprefix*office_member</name> <name>*dbprefix*office_member</name>
<declaration> <declaration>
<field> <field>
<name>member</name> <name>member_id</name>
<type>integer</type> <type>integer</type>
<default>1</default> <default>1</default>
<notnull>true</notnull> <notnull>true</notnull>

4
lib/member.php
View File

@ -29,7 +29,7 @@ class Member {
} }
public static function getMember($id){ public static function getMember($id){
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member`= ?'); $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`= ?');
$result = $query->execute(array($id)); $result = $query->execute(array($id));
return $result->fetchRow(); return $result->fetchRow();
} }
@ -42,7 +42,7 @@ class Member {
$placeholders = array_fill(0, $memberCount, '?'); $placeholders = array_fill(0, $memberCount, '?');
$stmt = implode(', ', $placeholders); $stmt = implode(', ', $placeholders);
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member`IN (' . $stmt . ')'); $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`IN (' . $stmt . ')');
$result = $query->execute(array($ids)); $result = $query->execute(array($ids));
return $result->fetchAll(); return $result->fetchAll();
} }

1
lib/op.php
View File

@ -60,7 +60,6 @@ class Op {
if ($seq == ""){ if ($seq == ""){
$seq = -1; $seq = -1;
} }
$oplist = array();
$query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*office_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC'); $query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*office_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC');
$result = $query->execute(array($esId, $seq)); $result = $query->execute(array($esId, $seq));
return $result->fetchAll(); return $result->fetchAll();