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

Db_Member -> Db\Member

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-08-04 21:00:58 +03:00
parent 214c6dfa36
commit fbb931c91e
9 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax/documentController.php
View File

@ -112,7 +112,7 @@ class DocumentController extends Controller{
$sessions = $session->getCollectionBy('file_id', $fileIds); $sessions = $session->getCollectionBy('file_id', $fileIds);
$members = array(); $members = array();
$member = new Db_Member(); $member = new Db\Member();
foreach ($sessions as $session) { foreach ($sessions as $session) {
$members[$session['es_id']] = $member->getActiveCollection($session['es_id']); $members[$session['es_id']] = $member->getActiveCollection($session['es_id']);
} }

2
ajax/otpoll.php
View File

@ -35,7 +35,7 @@ try{
$session->load($esId); $session->load($esId);
$memberId = $request->getParam('args/member_id'); $memberId = $request->getParam('args/member_id');
$member = new Db_Member(); $member = new Db\Member();
$member->load($memberId); $member->load($memberId);
if ($member->getIsGuest() || is_null($member->getIsGuest())){ if ($member->getIsGuest() || is_null($member->getIsGuest())){

4
ajax/sessionController.php
View File

@ -71,7 +71,7 @@ class SessionController extends Controller{
} }
$memberId = @$_SERVER['HTTP_WEBODF_MEMBER_ID']; $memberId = @$_SERVER['HTTP_WEBODF_MEMBER_ID'];
$currentMember = new Db_Member(); $currentMember = new Db\Member();
$currentMember->load($memberId); $currentMember->load($memberId);
if (is_null($currentMember->getIsGuest()) || $currentMember->getIsGuest()){ if (is_null($currentMember->getIsGuest()) || $currentMember->getIsGuest()){
self::preDispatchGuest(); self::preDispatchGuest();
@ -119,7 +119,7 @@ class SessionController extends Controller{
} }
} }
$member = new Db_Member(); $member = new Db\Member();
$members = $member->getActiveCollection($esId); $members = $member->getActiveCollection($esId);
$memberIds = array_map( $memberIds = array_map(
function($x){ function($x){

10
ajax/userController.php
View File

@ -26,10 +26,10 @@ class UserController extends Controller{
protected static function disconnect($args){ protected static function disconnect($args){
$esId = @$_POST['esId']; $esId = @$_POST['esId'];
$member = new Db_Member(); $member = new Db\Member();
$member->loadBy('member_id', $args['member_id']); $member->loadBy('member_id', $args['member_id']);
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']);
@ -44,14 +44,14 @@ class UserController extends Controller{
$memberId = Helper::getArrayValueByKey($args, 'member_id'); $memberId = Helper::getArrayValueByKey($args, 'member_id');
$name = Helper::getArrayValueByKey($_POST, 'name'); $name = Helper::getArrayValueByKey($_POST, 'name');
$member = new Db_Member(); $member = new Db\Member();
$member->load($memberId); $member->load($memberId);
if ($member->getEsId() if ($member->getEsId()
&& $member->getStatus() == Db_Member::MEMBER_STATUS_ACTIVE && $member->getStatus() == Db\Member::MEMBER_STATUS_ACTIVE
&& $member->getIsGuest() && $member->getIsGuest()
){ ){
$guestMark = Db_Member::getGuestPostfix(); $guestMark = Db\Member::getGuestPostfix();
if (substr($name, -strlen($guestMark)) !== $guestMark){ if (substr($name, -strlen($guestMark)) !== $guestMark){
$name = $name . ' ' . $guestMark; $name = $name . ' ' . $guestMark;
} }

1
appinfo/app.php
View File

@ -40,7 +40,6 @@ OC::$CLASSPATH['OCA\Documents\SessionController'] = 'documents/ajax/sessionContr
OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.php'; OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.php';
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\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

4
lib/db/member.php
View File

@ -10,7 +10,7 @@
* later. * later.
*/ */
namespace OCA\Documents; namespace OCA\Documents\Db;
/** /**
* @method boolean getIsGuest() * @method boolean getIsGuest()
@ -19,7 +19,7 @@ namespace OCA\Documents;
* @method int getStatus() * @method int getStatus()
*/ */
class Db_Member extends Db{ class Member extends \OCA\Documents\Db{
const DB_TABLE = '`*PREFIX*documents_member`'; const DB_TABLE = '`*PREFIX*documents_member`';

10
lib/db/session.php
View File

@ -70,7 +70,7 @@ class Session extends \OCA\Documents\Db {
; ;
$memberColor = \OCA\Documents\Helper::getMemberColor($uid); $memberColor = \OCA\Documents\Helper::getMemberColor($uid);
$member = new \OCA\Documents\Db_Member(array( $member = new \OCA\Documents\Db\Member(array(
$sessionData['es_id'], $sessionData['es_id'],
$uid, $uid,
$memberColor, $memberColor,
@ -87,7 +87,7 @@ class Session extends \OCA\Documents\Db {
$imageUrl = $uid; $imageUrl = $uid;
} }
$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();
@ -112,7 +112,7 @@ class Session extends \OCA\Documents\Db {
$session = new Session(); $session = new Session();
$session->deleteBy('es_id', $esId); $session->deleteBy('es_id', $esId);
$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();
@ -139,7 +139,7 @@ class Session extends \OCA\Documents\Db {
SELECT `s`.*, COUNT(`m`.`member_id`) AS `users` SELECT `s`.*, COUNT(`m`.`member_id`) AS `users`
FROM ' . $this->tableName . ' AS `s` FROM ' . $this->tableName . ' AS `s`
LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id` LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id`
AND `m`.`status`=' . Db_Member::MEMBER_STATUS_ACTIVE . ' AND `m`.`status`=' . Db\Member::MEMBER_STATUS_ACTIVE . '
AND `m`.`uid` != ? AND `m`.`uid` != ?
WHERE `s`.`es_id` = ? WHERE `s`.`es_id` = ?
GROUP BY `m`.`es_id` GROUP BY `m`.`es_id`
@ -168,7 +168,7 @@ class Session extends \OCA\Documents\Db {
SELECT `s`.*, COUNT(`m`.`member_id`) AS `users` SELECT `s`.*, COUNT(`m`.`member_id`) AS `users`
FROM ' . $this->tableName . ' AS `s` FROM ' . $this->tableName . ' AS `s`
LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id` LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id`
AND `m`.`status`=' . Db_Member::MEMBER_STATUS_ACTIVE . ' AND `m`.`status`=' . Db\Member::MEMBER_STATUS_ACTIVE . '
WHERE `s`.`file_id` ' . $stmt .' WHERE `s`.`file_id` ' . $stmt .'
GROUP BY `m`.`es_id`', GROUP BY `m`.`es_id`',
$fileIds $fileIds

4
lib/storage.php
View File

@ -78,10 +78,10 @@ class Storage {
return; return;
} }
$member = new Db_Member(); $member = new Db\Member();
$sessionMembers = $member->getCollectionBy('es_id', $session->getEsId()); $sessionMembers = $member->getCollectionBy('es_id', $session->getEsId());
foreach ($sessionMembers as $memberData){ foreach ($sessionMembers as $memberData){
if (intval($memberData['status'])===Db_Member::MEMBER_STATUS_ACTIVE){ if (intval($memberData['status'])===Db\Member::MEMBER_STATUS_ACTIVE){
return; return;
} }
} }

2
public.php
View File

@ -43,7 +43,7 @@ if (isset($_GET['t'])) {
$session->loadBy('file_id', $file->getFileId()); $session->loadBy('file_id', $file->getFileId());
if ($session->getEsId()){ if ($session->getEsId()){
$member = new Db_Member(); $member = new Db\Member();
$members = $member->getCollectionBy('es_id', $session->getEsId()); $members = $member->getCollectionBy('es_id', $session->getEsId());
} else { } else {
$members = 0; $members = 0;