|
|
|
@ -90,6 +90,7 @@ class Session extends \OCA\Documents\Db {
|
|
|
|
|
if (!$member->insert()){
|
|
|
|
|
throw new \Exception('Failed to add member into database');
|
|
|
|
|
}
|
|
|
|
|
$sessionData['member_id'] = (string) $member->getLastInsertId();
|
|
|
|
|
|
|
|
|
|
// Do we have OC_Avatar in out disposal?
|
|
|
|
|
if (\OC_Config::getValue('enable_avatars', true) !== true){
|
|
|
|
@ -98,10 +99,11 @@ class Session extends \OCA\Documents\Db {
|
|
|
|
|
$imageUrl = $uid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$displayName = $file->isPublicShare() ? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix() : \OCP\User::getDisplayName($uid);
|
|
|
|
|
$userId = $file->isPublicShare() ? $displayName : \OCP\User::getUser();
|
|
|
|
|
|
|
|
|
|
$sessionData['member_id'] = (string) $member->getLastInsertId();
|
|
|
|
|
$displayName = $file->isPublicShare()
|
|
|
|
|
? $uid . ' ' . \OCA\Documents\Db\Member::getGuestPostfix()
|
|
|
|
|
: \OC::$server->getUserSession()->getUser()->getDisplayName($uid)
|
|
|
|
|
;
|
|
|
|
|
$userId = $file->isPublicShare() ? $displayName : \OC::$server->getUserSession()->getUser()->getUID();
|
|
|
|
|
$op = new \OCA\Documents\Db\Op();
|
|
|
|
|
$op->addMember(
|
|
|
|
|
$sessionData['es_id'],
|
|
|
|
@ -190,10 +192,10 @@ class Session extends \OCA\Documents\Db {
|
|
|
|
|
WHERE `s`.`es_id` = ?
|
|
|
|
|
GROUP BY `m`.`es_id`
|
|
|
|
|
',
|
|
|
|
|
array(
|
|
|
|
|
\OCP\User::getUser(),
|
|
|
|
|
[
|
|
|
|
|
\OC::$server->getUserSession()->getUser()->getUID(),
|
|
|
|
|
$esId
|
|
|
|
|
)
|
|
|
|
|
]
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
$info = $result->fetchRow();
|
|
|
|
|